fix(restore): #2445 backup card shown after restore

Author: pwltr

__tests__/todos.ts

@@ -32,7 +32,7 @@ describe('Todos selector', () => {
 	let s: RootState;
 
 	beforeAll(async () => {
-		let res = await createNewWallet();
+		const res = await createNewWallet();
 		if (res.isErr()) {
 			throw res.error;
 		}
@@ -67,7 +67,7 @@ describe('Todos selector', () => {
 
 	it('should not return backupSeedPhraseTodo if backup is verified', () => {
 		const state = cloneDeep(s);
-		state.settings.backupVerified = true;
+		state.user.backupVerified = true;
 
 		expect(todosFullSelector(state)).not.toEqual(
 			expect.arrayContaining([backupSeedPhraseTodo]),

src/screens/Onboarding/RestoreFromSeed.tsx

@@ -26,8 +26,7 @@ import VerticalShadow from '../../components/VerticalShadow';
 import Button from '../../components/buttons/Button';
 import { useAppDispatch } from '../../hooks/redux';
 import { OnboardingStackScreenProps } from '../../navigation/types';
-import { verifyBackup } from '../../store/slices/settings';
-import { updateUser } from '../../store/slices/user';
+import { updateUser, verifyBackup } from '../../store/slices/user';
 import {
 	ScrollView,
 	TextInput,

src/screens/Settings/Backup/BackupPrompt.tsx

@@ -10,8 +10,8 @@ import {
 } from '../../../hooks/bottomSheet';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { useBalance } from '../../../hooks/wallet';
-import { backupVerifiedSelector } from '../../../store/reselect/settings';
 import { viewControllersSelector } from '../../../store/reselect/ui';
+import { backupVerifiedSelector } from '../../../store/reselect/user';
 import { ignoreBackupTimestampSelector } from '../../../store/reselect/user';
 import { closeSheet } from '../../../store/slices/ui';
 import { ignoreBackup } from '../../../store/slices/user';

src/screens/Settings/Backup/Success.tsx

@@ -8,7 +8,7 @@ import SafeAreaInset from '../../../components/SafeAreaInset';
 import Button from '../../../components/buttons/Button';
 import { useAppDispatch } from '../../../hooks/redux';
 import { BackupScreenProps } from '../../../navigation/types';
-import { verifyBackup } from '../../../store/slices/settings';
+import { verifyBackup } from '../../../store/slices/user';
 import { BodyM, BodyMB } from '../../../styles/text';
 
 const imageSrc = require('../../../assets/illustrations/check.png');

src/store/reselect/settings.ts

@@ -19,10 +19,6 @@ export const settingsSelector = (state: RootState): TSettings => state.settings;
 const customElectrumPeersState = (state: RootState): TCustomElectrumPeers => {
 	return state.settings.customElectrumPeers;
 };
-
-export const backupVerifiedSelector = (state: RootState): boolean => {
-	return state.settings.backupVerified;
-};
 export const selectedCurrencySelector = (state: RootState): string => {
 	return state.settings.selectedCurrency;
 };

src/store/reselect/todos.ts

@@ -20,9 +20,12 @@ import { ITodo, TTodosState } from '../types/todos';
 import { ETransferType, TTransferToSavings } from '../types/wallet';
 import { blocktankPaidOrdersFullSelector } from './blocktank';
 import { closedChannelsSelector, openChannelsSelector } from './lightning';
-import { backupVerifiedSelector, pinSelector } from './settings';
+import { pinSelector } from './settings';
 import { onboardingProfileStepSelector } from './slashtags';
-import { startCoopCloseTimestampSelector } from './user';
+import {
+	backupVerifiedSelector,
+	startCoopCloseTimestampSelector,
+} from './user';
 import { createShallowEqualSelector } from './utils';
 import { pendingTransfersSelector } from './wallet';
 

src/store/reselect/user.ts

@@ -4,6 +4,9 @@ import { TUser } from '../slices/user';
 
 const userState = (state: RootState): TUser => state.user;
 
+export const backupVerifiedSelector = (state: RootState): boolean => {
+	return state.user.backupVerified;
+};
 export const isGeoBlockedSelector = createSelector(
 	[userState],
 	(user): boolean => user.isGeoBlocked ?? false,

src/store/shapes/settings.ts

@@ -74,7 +74,6 @@ const defaultReceivePreference = [
 ];
 
 export const initialSettingsState: TSettings = {
-	backupVerified: false,
 	enableAutoReadClipboard: false,
 	enableSendAmountWarning: false,
 	enableSwipeToHideBalance: true,

src/store/slices/settings.ts

@@ -14,7 +14,6 @@ import {
 import { EDenomination, EUnit } from '../types/wallet';
 
 export type TSettings = {
-	backupVerified: boolean;
 	enableAutoReadClipboard: boolean;
 	enableSendAmountWarning: boolean;
 	enableSwipeToHideBalance: boolean;
@@ -88,9 +87,6 @@ export const settingsSlice = createSlice({
 		addOrangeTicket: (state, action: PayloadAction<string>) => {
 			state.orangeTickets.push(action.payload);
 		},
-		verifyBackup: (state) => {
-			state.backupVerified = true;
-		},
 		resetSettingsState: () => initialSettingsState,
 	},
 });
@@ -103,7 +99,6 @@ export const {
 	addTreasureChest,
 	updateTreasureChest,
 	addOrangeTicket,
-	verifyBackup,
 	resetSettingsState,
 } = actions;
 

src/store/slices/user.ts

@@ -5,6 +5,7 @@ import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 export const MAX_WARNINGS = 3; // how many times to show high balance warning
 
 export type TUser = {
+	backupVerified: boolean;
 	ignoreAppUpdateTimestamp: number;
 	ignoreBackupTimestamp: number;
 	ignoreHighBalanceCount: number;
@@ -19,6 +20,7 @@ export type TUser = {
 };
 
 export const initialUserState: TUser = {
+	backupVerified: false,
 	ignoreAppUpdateTimestamp: 0,
 	ignoreBackupTimestamp: 0,
 	ignoreHighBalanceCount: 0,
@@ -65,6 +67,9 @@ export const userSlice = createSlice({
 		ignoreSwitchUnitToast: (state) => {
 			state.ignoresSwitchUnitToast = true;
 		},
+		verifyBackup: (state) => {
+			state.backupVerified = true;
+		},
 		resetUserState: () => initialUserState,
 	},
 });
@@ -81,6 +86,7 @@ export const {
 	clearCoopCloseTimer,
 	ignoreHideBalanceToast,
 	ignoreSwitchUnitToast,
+	verifyBackup,
 	resetUserState,
 } = actions;