fix: rebase adjusting...

zingolabs · Aug 13, 2024 · 3d54da3 · 3d54da3
1 parent df71e8b
commit 3d54da3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/app/AppState/AppContextLoaded.ts b/app/AppState/AppContextLoaded.ts
@@ -91,6 +91,7 @@ export default interface AppContextLoaded {
   security: SecurityType;
   selectServer: SelectServerEnum;
   rescanMenu: boolean;
+  recoveryWalletInfoOnDevice: boolean;
 
   // snackbar queue
   snackbars: SnackbarType[];

diff --git a/app/AppState/AppContextLoading.ts b/app/AppState/AppContextLoading.ts
@@ -42,6 +42,7 @@ export default interface AppContextLoading {
   security: SecurityType;
   selectServer: SelectServerEnum;
   rescanMenu: boolean;
+  recoveryWalletInfoOnDevice: boolean;
 
   // eslint-disable-next-line semi
 }
diff --git a/app/AppState/AppStateLoading.ts b/app/AppState/AppStateLoading.ts
@@ -15,7 +15,6 @@ export default interface AppStateLoading {
   serverErrorTries: number;
   donationAlert: boolean;
   firstLaunchingMessage: boolean;
-  recoveryWalletInfoOnDevice: boolean;
   hasRecoveryWalletInfoSaved: boolean;
 
   // eslint-disable-next-line semi

diff --git a/app/LoadedApp/LoadedApp.tsx b/app/LoadedApp/LoadedApp.tsx
@@ -1565,6 +1565,7 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
       security: this.state.security,
       selectServer: this.state.selectServer,
       rescanMenu: this.state.rescanMenu,
+      recoveryWalletInfoOnDevice: this.state.recoveryWalletInfoOnDevice,
     };
 
     const menu = <Menu onItemSelected={this.onMenuItemSelected} updateMenuState={this.updateMenuState} />;

diff --git a/app/LoadingApp/LoadingApp.tsx b/app/LoadingApp/LoadingApp.tsx
@@ -383,6 +383,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
       security: props.security,
       selectServer: props.selectServer,
       rescanMenu: props.rescanMenu,
+      recoveryWalletInfoOnDevice: props.recoveryWalletInfoOnDevice,
 
       // state
       appStateStatus: AppState.currentState,
@@ -404,7 +405,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
       serverErrorTries: 0,
       donationAlert: props.donationAlert,
       firstLaunchingMessage: props.firstLaunchingMessage,
-      recoveryWalletInfoOnDevice: props.recoveryWalletInfoOnDevice,
+      hasRecoveryWalletInfoSaved: false,
     };
 
     this.dim = {} as EmitterSubscription;
@@ -1080,6 +1081,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
       security: this.state.security,
       selectServer: this.state.selectServer,
       rescanMenu: this.state.rescanMenu,
+      recoveryWalletInfoOnDevice: this.state.recoveryWalletInfoOnDevice,
     };
 
     return (

diff --git a/app/context/contextAppLoading.tsx b/app/context/contextAppLoading.tsx
@@ -50,7 +50,6 @@ export const defaultAppContextLoading: AppContextLoading = {
   selectServer: SelectServerEnum.auto,
   rescanMenu: false,
   recoveryWalletInfoOnDevice: true,
-  hasRecoveryWalletInfoSaved: false,
 };
 
 export const ContextAppLoading = React.createContext(defaultAppContextLoading);