fix: error in biometry migration

Author: andreabadesso

src/sagas/wallet.js

@@ -72,6 +72,7 @@ import {
   firstAddressFailure,
   firstAddressSuccess,
   setUseSafeBiometryMode,
+  lockScreen,
 } from '../actions';
 import { fetchTokenData } from './tokens';
 import {
@@ -437,8 +438,8 @@ export function* onPushNotificationDisabled() {
 }
 
 export function* onSafeBiometryToggleChanged() {
-  log.debug('Safe biometry mode feature toggle changed state, reloading wallet.');
-  yield put(reloadWalletRequested());
+  log.debug('Safe biometry mode feature toggle changed state, locking wallet.');
+  yield put(lockScreen());
 }
 
 /**

src/screens/PinScreen.js

@@ -147,15 +147,18 @@ class PinScreen extends React.Component {
     if (this.props.isLockScreen) {
       // in case it's the lock screen, we just have to execute the data migration
       // method an change redux state. No need to execute callback or go back on navigation
+      console.log('inside dismiss');
       await STORE.handleDataMigration(pin);
-      await biometricsMigration(pin, this.props.safeBiometryEnabled);
+      console.log('Will call biometricsMigration');
+      const newPin = await biometricsMigration(pin, this.props.safeBiometryEnabled);
+      console.log('Done migrating biometrics.');
       if (!this.props.wallet) {
         // We have already made sure we have an available accessData
         // The handleDataMigration method ensures we have already migrated if necessary
         // This means the wallet is loaded and the access data is ready to be used.
 
-        const words = await STORE.getWalletWords(pin);
-        this.props.startWalletRequested({ words, pin });
+        const words = await STORE.getWalletWords(newPin);
+        this.props.startWalletRequested({ words, pin: newPin });
       }
       this.props.unlockScreen();
     } else {

src/utils.js

@@ -102,29 +102,44 @@ export async function biometricsMigration(currentPassword, safeBiometryEnabled)
   const safeBiometry = STORE.getItem(IS_BIOMETRY_ENABLED_KEY);
 
   if (safeBiometryEnabled) {
+    console.log('Safe biometry enabled.');
     // Safe biometry mode, need to migrate if old biometry is enabled.
     if (oldBiometry) {
+      console.log('old biometry');
       // currentPassword is the pin, we need to generate a new random password
       // and encrypt the pin.
       const password = generateRandomPassword();
       const storage = STORE.getStorage();
       await changePinOnAccessData(storage, currentPassword, password);
+      console.log('Changed pin on access data.');
       STORE.enableSafeBiometry(currentPassword, password);
       STORE.removeItem(IS_OLD_BIOMETRY_ENABLED_KEY);
+
+      return password;
     }
   } else {
+    console.log('Safe biometry disabled');
     // Old biometry mode, need to migrate if safe biometry is enabled.
     // eslint-disable-next-line no-lonely-if
     if (safeBiometry) {
+      console.log('Will migrate to safe biometry');
       // currentPassword is the random password, we need to decrypt the pin and
       // toggle the old biometry key
       const pin = STORE.disableSafeBiometry(currentPassword);
+      console.log('got pin', pin);
       const storage = STORE.getStorage();
+      console.log('got storage');
       await changePinOnAccessData(storage, currentPassword, pin);
+      console.log('Changed pin on access data.');
       STORE.removeItem(IS_BIOMETRY_ENABLED_KEY);
       STORE.setItem(IS_OLD_BIOMETRY_ENABLED_KEY, true);
+
+      return pin;
     }
   }
+
+  console.log('Done.');
+  return currentPassword;
 }
 
 /**