added isLoading selector

AleksArden · May 4, 2023 · bb6c749 · bb6c749
1 parent 6384852
commit bb6c749
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/redux/auth/auth.selectors.js b/src/redux/auth/auth.selectors.js
@@ -6,3 +6,4 @@ export const selectUserPhone = state => state.auth.user.phone;
 export const selectUserTelegram = state => state.auth.user.telegram;
 export const selectUserAvatarURL = state => state.auth.user.avatarURL;
 export const selectUserBirthday = state => state.auth.user.birthday;
+export const selectIsLoading = state => state.auth.isLoading;
diff --git a/src/redux/auth/auth.slice.js b/src/redux/auth/auth.slice.js
@@ -28,16 +28,19 @@ const authSlice = createSlice({
         state.user = payload.user;
         state.token = payload.token;
         state.isLoggedIn = true;
+        state.error = null;
       })
       .addCase(authLogin.pending, state => {
         state.isLoading = true;
       })
       .addCase(authLogin.fulfilled, (state, { payload }) => {
         state.error = null;
+        state.isLoading = false;
         state.user = payload.user;
         state.token = payload.token;
       })
       .addCase(authLogin.rejected, (state, { payload }) => {
+        state.isLoading = false;
         state.error = payload;
       })
       .addCase(authLogout.pending, state => {
@@ -56,13 +59,17 @@ const authSlice = createSlice({
       })
       .addCase(refreshUser.rejected, () => authInitState)
 
-      .addCase(userForm.pending, (state, _) => state)
+      .addCase(userForm.pending, (state, _) => {
+        state.isLoading = true;
+      })
       .addCase(userForm.fulfilled, (state, { payload }) => {
+        state.isLoading = false;
         state.error = null;
         state.user = payload.user;
         state.token = payload.token;
       })
       .addCase(userForm.rejected, (state, { payload }) => {
+        state.isLoading = false;
         state.error = payload;
       });
   },