Merge pull request #932 from singnet/package-updating

fixed account page and resending verification code
singnet · Aug 13, 2024 · fa615ad · fa615ad
2 parents 9a4d8b9 + 7e56fec
commit fa615ad
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/components/Login/Signup/RenderOTP.js b/src/components/Login/Signup/RenderOTP.js
@@ -33,7 +33,7 @@ const RenderOTP = ({ classes, otp, handleOTP, handleResendOTP, handleConfirmSign
           onChange={handleOTP}
           autoFocus
         />
-        <AlertBox type={alert.type} message={alert.message} />
+        {alert && <AlertBox type={alert.type} message={alert.message} />}
         <div className={classes.buttonsContainer}>
           <StyledButton type="transparent" btnText="Resend" onClick={handleResendOTP} />
           <StyledButton type="blue" btnText="Continue" onClick={handleConfirmSignup} />

diff --git a/src/components/Login/Signup/index.js b/src/components/Login/Signup/index.js
@@ -91,14 +91,13 @@ const SignUp = ({ classes }) => {
       })
       .catch((e) => {
         console.log("e: ", e);
-
         setAlert({ type: alertTypes.ERROR, message: "email confirmation failed. Please try again" });
       });
   };
 
   const handleResendVerificationCode = () => {
     setAlert({});
-    resendSignUpCode(email)
+    resendSignUpCode({ username: email })
       .then(() => {
         setAlert({ type: alertTypes.SUCCESS, message: "code resent successfully" });
       })

diff --git a/src/components/UserProfile/UserProfileAccount/index.js b/src/components/UserProfile/UserProfileAccount/index.js
@@ -30,13 +30,19 @@ const UserProfileAccount = ({ classes }) => {
   const dispatch = useDispatch();
 
   useEffect(() => {
-    const availableWallets = dispatch(fetchAvailableUserWallets());
-    const enhancedWallets = map(availableWallets, ({ address, type }) => {
-      return { address, type, value: address, label: `${type} (${address})` };
-    });
-    setWallets(enhancedWallets);
-    const sdk = dispatch(sdkActions.getSdk());
-    setCurrentAddress(sdk.account.getAddress());
+    const fetchWallets = async () => {
+      const availableWallets = await dispatch(fetchAvailableUserWallets());
+      const enhancedWallets = map(availableWallets, ({ address, type }) => {
+        return { address, type, value: address, label: `${type} (${address})` };
+      });
+      setWallets(enhancedWallets);
+    };
+    const getCurrentMetamaskAddress = async () => {
+      const sdk = await dispatch(sdkActions.getSdk());
+      setCurrentAddress(await sdk.account.getAddress());
+    };
+    getCurrentMetamaskAddress();
+    fetchWallets();
   }, [dispatch]);
 
   const isSameMetaMaskAddress = (address) => {