Merge pull request #676 from rsksmart/fix-double

rsksmart · May 12, 2021 · 12b3470 · 12b3470
2 parents b284b77 + 04eacf1
commit 12b3470
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/common/storage.js b/src/common/storage.js
@@ -393,11 +393,11 @@ class RNStorage {
 
   getUserPassword = () => RNStorage.secureGet(SECURE_USER_PASSWORD)
 
-  setLastPasscodeAttempt = (timestamp) => RNStorage.secureSet(SECURE_LAST_WRONG_PASSCODE_TIMESTAMP, timestamp);
+  setLastPasscodeAttempt = (timestamp) => RNStorage.secureSet(SECURE_LAST_WRONG_PASSCODE_TIMESTAMP, timestamp.toString());
 
   getLastPasscodeAttempt = () => RNStorage.secureGet(SECURE_LAST_WRONG_PASSCODE_TIMESTAMP);
 
-  setWrongPasscodeCounter = (count) => RNStorage.secureSet(SECURE_WRONG_PASSCODE_COUNTER, count);
+  setWrongPasscodeCounter = (count) => RNStorage.secureSet(SECURE_WRONG_PASSCODE_COUNTER, count.toString());
 
   getWrongPasscodeCounter = () => RNStorage.secureGet(SECURE_WRONG_PASSCODE_COUNTER);
 }

diff --git a/src/components/common/passcode/passcode.modal.verify.js b/src/components/common/passcode/passcode.modal.verify.js
@@ -43,7 +43,12 @@ class VerifyPasscodeModal extends PureComponent {
     if (this.wrongAttemptsCounter < WRONG_ATTEMPTS_STEPS.step1.maxAttempts) {
       return;
     }
-    const lastAttemptTimestamp = parseInt(await storage.getLastPasscodeAttempt(), 10);
+    const lastPasscodeStorage = await storage.getLastPasscodeAttempt();
+    if (!lastPasscodeStorage || lastPasscodeStorage === '0') {
+      return;
+    }
+
+    const lastAttemptTimestamp = parseInt(lastPasscodeStorage, 10);
     const msSinceLastAttempt = Date.now() - lastAttemptTimestamp;
     const { waitingMinutes } = getClosestStep({ numberOfAttempts: this.wrongAttemptsCounter });
     const milliseconds = waitingMinutes * 1000 * 60 - msSinceLastAttempt;

diff --git a/src/components/common/passcode/wrongPasscodeUtils.js b/src/components/common/passcode/wrongPasscodeUtils.js
@@ -21,7 +21,7 @@ export const WRONG_ATTEMPTS_STEPS = {
 
 export const clearWrongAttempts = () => {
   try {
-    storage.setLastPasscodeAttempt();
+    storage.setLastPasscodeAttempt(0);
     storage.setWrongPasscodeCounter(0);
   } catch (error) {
     console.error('Error cleaning wrong attempts', error);