Merge pull request #6160 from bithyve/fix/2FA-otp

fix: 2FA otp reset
bithyve · Mar 10, 2025 · 402f2ec · 402f2ec
2 parents f317b7e + 0d8a453
commit 402f2ec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/screens/SigningDevices/SetupSigningServer.tsx b/src/screens/SigningDevices/SetupSigningServer.tsx
@@ -60,13 +60,16 @@ function SetupSigningServer({ route }: { route }) {
       if (valid) {
         setIsSetupValidated(valid);
         showValidationModal(false);
+        setOtp('');
       } else {
         showValidationModal(false);
         showToast('Invalid OTP. Please try again!');
+        setOtp('');
       }
     } catch (err) {
       showValidationModal(false);
       showToast(`${err.message}`);
+      setOtp('');
     }
   };
 
@@ -233,6 +236,7 @@ function SetupSigningServer({ route }: { route }) {
           visible={validationModal}
           close={() => {
             showValidationModal(false);
+            setOtp('');
           }}
           title={common.confirm2FACodeTitle}
           subTitle={common.confirm2FACodeSubtitle}

diff --git a/src/screens/Vault/ChoosePolicyNew.tsx b/src/screens/Vault/ChoosePolicyNew.tsx
@@ -222,21 +222,25 @@ function ChoosePolicyNew({ navigation, route }) {
             setDelayModal(true);
             dispatch(setSignerPolicyError('idle'));
             showValidationModal(false);
+            setOtp('');
           }, 100);
         } else {
           // more restrictive policy update - immediate
           setTimeout(() => {
             setConfigureSuccessModal(true);
             dispatch(setSignerPolicyError('idle'));
             showValidationModal(false);
+            setOtp('');
           }, 100);
         }
       } else {
-        setIsLoading(false);
-        dispatch(setSignerPolicyError('idle'));
-        showValidationModal(false);
-        // resetFields();
-        showToast('Something went wrong. Please try again');
+        setTimeout(() => {
+          setIsLoading(false);
+          dispatch(setSignerPolicyError('idle'));
+          showValidationModal(false);
+          setOtp('');
+          showToast('Something went wrong. Please try again');
+        }, 100);
       }
     }
   }, [policyError]);
@@ -402,6 +406,7 @@ function ChoosePolicyNew({ navigation, route }) {
         visible={validationModal}
         close={() => {
           showValidationModal(false);
+          setOtp('');
           // resetFields();
         }}
         title={common.confirm2FACodeTitle}

diff --git a/src/screens/Vault/HardwareModalMap.tsx b/src/screens/Vault/HardwareModalMap.tsx
@@ -2271,8 +2271,10 @@ function HardwareModalMap({
         close={() => {
           if (type === SignerType.POLICY_SERVER && mode === InteracationMode.HEALTH_CHECK) {
             setSigningServerHealthCheckOTPModal(false);
+            setOtp('');
           } else {
             setSigningServerRecoverOTPModal(false);
+            setOtp('');
           }
           close();
         }}