Fix signup order

jahongiry · Mar 7, 2024 · be19c19 · be19c19
1 parent cb25eea
commit be19c19
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/pages/cards/popup/Popup.js b/src/pages/cards/popup/Popup.js
@@ -201,7 +201,13 @@ const PopUp = ({
             ) : (
               <button
                 className='sotib-olish'
-                onClick={() => navigate('/signup')}
+                onClick={() => {
+                  localStorage.setItem(
+                    'redirectToAfterAuth',
+                    window.location.pathname
+                  );
+                  navigate('/signup');
+                }}
               >
                 {translations.popup.buy}
               </button>

diff --git a/src/pages/login/Login.js b/src/pages/login/Login.js
@@ -93,6 +93,11 @@ const Login = () => {
         navigate(lastPath);
         localStorage.removeItem('lastPath');
       }
+      const redirectTo = localStorage.getItem('redirectToAfterAuth');
+      if (redirectTo) {
+        navigate(redirectTo);
+        localStorage.removeItem('redirectToAfterAuth');
+      }
     } catch (error) {
       toast.error(<p className='red-text-important'>{error.message}</p>);
     }

diff --git a/src/pages/signup/confirm/Confirm.js b/src/pages/signup/confirm/Confirm.js
@@ -19,16 +19,19 @@ const Confirm = () => {
       const actionResult = await dispatch(verifyNumber(otp));
       const userData = actionResult.payload;
 
-      if (userData && userData.token) {
+      const redirectTo = localStorage.getItem('redirectToAfterAuth');
+      if (redirectTo) {
+        console.log('Redirecting to:', redirectTo);
+        navigate(redirectTo);
+        localStorage.removeItem('redirectToAfterAuth');
+      } else if (userData && userData.token) {
         const lastPath = localStorage.getItem('lastPath') || '/';
+        console.log('Navigating to last path:', lastPath);
         navigate(lastPath);
         localStorage.removeItem('lastPath');
       } else {
-        // Handle login failure (e.g., show an error message)
       }
-    } catch (error) {
-      // Handle error (e.g., incorrect credentials, server error)
-    }
+    } catch (error) {}
   };
 
   return (