Merge pull request #67 from Yura-Platonov/ChangePass

add
eTachkaMarketplace · Jan 4, 2024 · 1c0a2e1 · 1c0a2e1
2 parents 995ad91 + eb64313
commit 1c0a2e1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/components/SearchLIstTAB/SearchListTab.styled.js b/src/components/SearchLIstTAB/SearchListTab.styled.js
@@ -2,6 +2,7 @@ import styled from 'styled-components';
 
 export const Div = styled.div`
 display: flex;
+flex-wrap: wrap;
 gap: 8px;
 `
 

diff --git a/src/redux/user/opetations.js b/src/redux/user/opetations.js
@@ -77,10 +77,10 @@ export const acceptCode = createAsyncThunk(
     try {
       const codeApi = `api/users/accept/code/${code}`;
       console.log(codeApi);
-      await instance.put(codeApi);
+      const response = await instance.put(codeApi);
       console.log(codeApi);
       console.log("code accepted")
-      return;
+      return response.data;
     } catch (error) {
       console.log(`Code failed. Try again`);
       return rejectWithValue(error.message);

diff --git a/src/redux/user/userSlice.js b/src/redux/user/userSlice.js
@@ -22,7 +22,7 @@ export const userSlice = createSlice({
       })
       .addCase(getUser.rejected, (state, { payload }) => {
         state.isLoading = false;
-        state.error = payload.error;
+        state.error = payload;
       })
       .addCase(changeUser.fulfilled, state => {
         state.isLoading = false;
@@ -44,7 +44,7 @@ export const userSlice = createSlice({
       })
       .addCase(deleteUser.rejected, (state, { payload }) => {
         state.isLoading = false;
-        state.error = payload.error;
+        state.error = payload;
       })
       .addCase(forgotPass.fulfilled, state => {
         state.isLoading = false;
@@ -66,7 +66,7 @@ export const userSlice = createSlice({
       })
       .addCase(changePass.rejected, (state, { payload }) => {
         state.isLoading = false;
-        state.error = payload.error;
+        state.error = payload;
       })
       .addCase(acceptCode.fulfilled, (state, { payload }) => {
         state.user = payload;
@@ -78,7 +78,7 @@ export const userSlice = createSlice({
       })
       .addCase(acceptCode.rejected, (state, { payload }) => {
         state.isLoading = false;
-        state.error = payload.error;
+        state.error = payload;
       });
   },
 });