Clean up wallet persistance

ephemeraHQ · Feb 12, 2024 · f2ea3b8 · f2ea3b8
1 parent 6b9ae95
commit f2ea3b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/context/ClientContext.tsx b/src/context/ClientContext.tsx
@@ -8,7 +8,7 @@ import React, {
   useState,
 } from 'react';
 import {AppConfig} from '../consts/AppConfig';
-import {getClientKeys} from '../services/encryptedStorage';
+import {clearClientKeys, getClientKeys} from '../services/encryptedStorage';
 
 interface ClientContextValue {
   client: Client<unknown> | null;
@@ -34,9 +34,13 @@ export const ClientProvider: FC<PropsWithChildren> = ({children}) => {
     if (status === 'unknown' || status === 'connecting') {
       return;
     }
-    if (!address) {
+    if (status === 'disconnected') {
       return setLoading(false);
     }
+    if (!address) {
+      // Address still shows as undefined even when connected
+      return;
+    }
     getClientKeys(address as `0x${string}`)
       .then(keys => {
         if (!keys) {
@@ -52,6 +56,7 @@ export const ClientProvider: FC<PropsWithChildren> = ({children}) => {
             setLoading(false);
           })
           .catch(() => {
+            clearClientKeys(address as `0x${string}`);
             setLoading(false);
           });
       })

diff --git a/src/navigation/AppNavigation.tsx b/src/navigation/AppNavigation.tsx
@@ -45,7 +45,12 @@ export const AppNavigation = () => {
         </LoadingStack.Navigator>
       )}
       {!loading && !client && (
-        <OnboardingStack.Navigator screenOptions={{headerShown: false}}>
+        <OnboardingStack.Navigator
+          screenOptions={{
+            headerShown: false,
+            // https://github.com/Kureev/react-native-blur/issues/595
+            animation: Platform.OS === 'android' ? 'none' : 'default',
+          }}>
           <OnboardingStack.Screen
             name={ScreenNames.OnboardingConnectWallet}
             component={OnboardingConnectWalletScreen}