fix: vault recovery & invalid password error

app/components/Views/ResetPassword/index.js

@@ -18,11 +18,7 @@ import CheckBox from '@react-native-community/checkbox';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { connect } from 'react-redux';
-import {
-  passwordSet,
-  passwordUnset,
-  seedphraseNotBackedUp,
-} from '../../../actions/user';
+import { passwordSet, seedphraseNotBackedUp } from '../../../actions/user';
 import { setLockTime } from '../../../actions/settings';
 import StyledButton from '../../UI/StyledButton';
 import Engine from '../../../core/Engine';
@@ -837,7 +833,6 @@ const mapStateToProps = (state) => ({
 
 const mapDispatchToProps = (dispatch) => ({
   passwordSet: () => dispatch(passwordSet()),
-  passwordUnset: () => dispatch(passwordUnset()),
   setLockTime: (time) => dispatch(setLockTime(time)),
   seedphraseNotBackedUp: () => dispatch(seedphraseNotBackedUp()),
 });

app/core/Authentication/Authentication.ts

@@ -12,7 +12,13 @@ import {
   SEED_PHRASE_HINTS,
 } from '../../constants/storage';
 import Logger from '../../util/Logger';
-import { authSuccess, authError, logIn, logOut } from '../../actions/user';
+import {
+  authSuccess,
+  authError,
+  logIn,
+  logOut,
+  passwordSet,
+} from '../../actions/user';
 import AUTHENTICATION_TYPE from '../../constants/userProperties';
 import { Store } from 'redux';
 import AuthenticationError from './AuthenticationError';
@@ -66,6 +72,16 @@ class AuthenticationService {
     }
   }
 
+  private dispatchPasswordSet(): void {
+    if (this.store) {
+      this.store.dispatch(passwordSet());
+    } else {
+      Logger.log(
+        'Attempted to dispatch passwordSet action but dispatch was not initialized',
+      );
+    }
+  }
+
   private dispatchLogout(): void {
     if (this.store) {
       this.store.dispatch(logOut());
@@ -396,6 +412,7 @@ class AuthenticationService {
       await this.storePassword(password, authData.currentAuthType);
       this.dispatchLogin();
       this.authData = authData;
+      this.dispatchPasswordSet();
     } catch (e: any) {
       this.lockApp(false);
       throw new AuthenticationError(
@@ -435,6 +452,7 @@ class AuthenticationService {
       await this.loginVaultCreation(password, selectedAddress);
       this.dispatchLogin();
       this.store?.dispatch(authSuccess(bioStateMachineId));
+      this.dispatchPasswordSet();
     } catch (e: any) {
       this.store?.dispatch(authError(bioStateMachineId));
       !disableAutoLogout && this.lockApp(false);

app/core/EngineService/EngineService.test.ts

@@ -0,0 +1,18 @@
+import EngineService from './EngineService';
+import Engine from '../Engine';
+import { store } from '../../store';
+
+jest.unmock('../Engine');
+
+describe('EngineService', () => {
+  EngineService.initalizeEngine(store);
+  it('should have Engine initialized', () => {
+    expect(Engine.context).toBeDefined();
+  });
+  it('should have recovered vault on redux store ', async () => {
+    const { success } = await EngineService.initializeVaultFromBackup();
+    expect(success).toBeTruthy();
+    const { KeyringController } = store.getState().engine.backgroundState;
+    expect(KeyringController.vault).toBeDefined();
+  });
+});

app/core/EngineService/EngineService.ts

@@ -110,8 +110,13 @@ class EngineService {
     const Engine = UntypedEngine as any;
     // This ensures we create an entirely new engine
     await Engine.destroyEngine();
+    this.engineInitialized = false;
     if (keyringState) {
-      const instance = Engine.init(state, keyringState);
+      const newKeyringState = {
+        keyrings: [],
+        vault: keyringState.vault,
+      };
+      const instance = Engine.init(state, newKeyringState);
       if (instance) {
         this.updateControllers(importedStore, instance);
         // this is a hack to give the engine time to reinitialize

app/util/test/testSetup.js

@@ -115,7 +115,10 @@ jest.mock('react-native-keychain', () => ({
   setInternetCredentials: jest
     .fn(('server', 'username', 'password'))
     .mockResolvedValue({ service: 'metamask', storage: 'storage' }),
-  resetInternetCredentials: jest.fn(),
+  getInternetCredentials: jest
+    .fn()
+    .mockResolvedValue({ password: 'mock-credentials-password' }),
+  resetInternetCredentials: jest.fn().mockResolvedValue(),
   ACCESSIBLE: {
     WHEN_UNLOCKED: 'AccessibleWhenUnlocked',
     AFTER_FIRST_UNLOCK: 'AccessibleAfterFirstUnlock',