Merge pull request #1822 from synonymdev/blackscreen2

fix: backport Black screen fix to beta branch

Author: Jasonvdb

src/App.tsx

@@ -1,11 +1,4 @@
-import React, {
-	memo,
-	ReactElement,
-	useMemo,
-	useEffect,
-	useCallback,
-	useState,
-} from 'react';
+import React, { memo, ReactElement, useMemo, useEffect, useState } from 'react';
 import { Platform, NativeModules } from 'react-native';
 import Toast from 'react-native-toast-message';
 import QuickActions from 'react-native-quick-actions';
@@ -59,45 +52,29 @@ const App = (): ReactElement => {
 		checkForAppUpdate();
 	}, []);
 
-	const RootComponent = useCallback((): ReactElement => {
-		if (!isReady) {
-			return <></>;
-		}
-
-		if (showRecovery) {
-			return <RecoveryNavigator />;
-		}
-
-		if (hasCriticalUpdate) {
-			return <AppUpdate />;
-		}
-
-		if (walletExists) {
-			return (
-				<SlashtagsProvider>
-					<SlashtagsProvider2>
-						{requiresRemoteRestore ? <RestoringScreen /> : <AppOnboarded />}
-					</SlashtagsProvider2>
-				</SlashtagsProvider>
-			);
-		}
-
-		return <OnboardingNavigator />;
-	}, [
-		isReady,
-		showRecovery,
-		hasCriticalUpdate,
-		walletExists,
-		requiresRemoteRestore,
-	]);
-
 	const currentTheme = useMemo(() => getTheme(theme), [theme]);
 
 	return (
 		<ThemeProvider theme={currentTheme}>
 			<SafeAreaProvider>
 				<StatusBar />
-				<RootComponent />
+
+				{!isReady ? (
+					<></>
+				) : showRecovery ? (
+					<RecoveryNavigator />
+				) : hasCriticalUpdate ? (
+					<AppUpdate />
+				) : walletExists ? (
+					<SlashtagsProvider>
+						<SlashtagsProvider2>
+							{requiresRemoteRestore ? <RestoringScreen /> : <AppOnboarded />}
+						</SlashtagsProvider2>
+					</SlashtagsProvider>
+				) : (
+					<OnboardingNavigator />
+				)}
+
 				<Toast config={toastConfig} />
 			</SafeAreaProvider>
 		</ThemeProvider>

src/screens/Onboarding/RestoreFromSeed.tsx

@@ -105,6 +105,9 @@ const RestoreFromSeed = (): ReactElement => {
 		setIsRestoringWallet(true);
 		dispatch(verifyBackup());
 
+		// Tells component within slashtags provider that it needs to handle restoring from remote backup
+		dispatch(updateUser({ requiresRemoteRestore: true }));
+
 		const res = await restoreSeed({
 			mnemonic: seed.join(' '),
 			bip39Passphrase,
@@ -117,9 +120,6 @@ const RestoreFromSeed = (): ReactElement => {
 			});
 			return;
 		}
-
-		//Tells component within slashtags provider that it needs to handle restoring from remote backup
-		dispatch(updateUser({ requiresRemoteRestore: true }));
 	};
 
 	const handleAdvanced = (): void => {

src/store/actions/wallet.ts

@@ -120,13 +120,16 @@ export const createWallet = async ({
 
 export const createDefaultWalletStructure = async ({
 	walletName = 'wallet0',
+	seedHash,
 }: {
 	walletName?: TWalletName;
+	seedHash: string;
 }): Promise<Result<string>> => {
 	try {
 		const payload: IWallets = {
 			[walletName]: getDefaultWalletShape(),
 		};
+		payload[walletName].seedHash = seedHash;
 		dispatch({
 			type: actions.CREATE_WALLET,
 			payload,

src/utils/wallet/index.ts

@@ -813,7 +813,10 @@ export const createDefaultWallet = async ({
 		const seed = await bip39.mnemonicToSeed(mnemonic, bip39Passphrase);
 		await setKeychainSlashtagsPrimaryKey(seed);
 
-		await createDefaultWalletStructure({ walletName });
+		await createDefaultWalletStructure({
+			walletName,
+			seedHash: seedHash(seed),
+		});
 
 		let gapLimitOptions = getDefaultGapLimitOptions();
 		if (restore) {