fix(wallet-mobile): qr link full read within yoroi

Emurgo · Oct 7, 2024 · d33ee2b · d33ee2b
1 parent 2ee86b9
commit d33ee2b
Show file tree

Hide file tree

Showing 6 changed files with 341 additions and 346 deletions.
diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -10,7 +10,6 @@ import {
   swapStorageMaker,
 } from '@yoroi/swap'
 import {useTheme} from '@yoroi/theme'
-import {TransferProvider} from '@yoroi/transfer'
 import {Swap} from '@yoroi/types'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
@@ -233,51 +232,49 @@ export const WalletNavigator = () => {
   }
 
   return (
-    <TransferProvider>
-      <SearchProvider>
-        <Stack.Navigator
-          screenOptions={{
-            ...navOptions,
-            headerLeft: undefined,
+    <SearchProvider>
+      <Stack.Navigator
+        screenOptions={{
+          ...navOptions,
+          headerLeft: undefined,
+        }}
+      >
+        <Stack.Screen
+          name="wallet-selection"
+          options={{
+            title: strings.walletSelectionScreenHeader,
+            headerTitle: ({children}) => <NetworkTag directChangeActive>{children}</NetworkTag>,
           }}
-        >
-          <Stack.Screen
-            name="wallet-selection"
-            options={{
-              title: strings.walletSelectionScreenHeader,
-              headerTitle: ({children}) => <NetworkTag directChangeActive>{children}</NetworkTag>,
-            }}
-            component={SelectWalletFromList}
-          />
+          component={SelectWalletFromList}
+        />
 
-          <Stack.Screen //
-            name="setup-wallet"
-            options={{headerShown: false}}
-            component={SetupWalletNavigator}
-          />
+        <Stack.Screen //
+          name="setup-wallet"
+          options={{headerShown: false}}
+          component={SetupWalletNavigator}
+        />
 
-          <Stack.Screen name="main-wallet-routes" options={{headerShown: false}} component={WalletTabNavigator} />
+        <Stack.Screen name="main-wallet-routes" options={{headerShown: false}} component={WalletTabNavigator} />
 
-          <Stack.Screen name="settings" options={{headerShown: false}} component={SettingsScreenNavigator} />
+        <Stack.Screen name="settings" options={{headerShown: false}} component={SettingsScreenNavigator} />
 
-          <Stack.Screen
-            name="voting-registration"
-            options={{headerShown: false}}
-            getComponent={() => CatalystNavigator}
-          />
+        <Stack.Screen
+          name="voting-registration"
+          options={{headerShown: false}}
+          getComponent={() => CatalystNavigator}
+        />
 
-          <Stack.Screen
-            name="toggle-analytics-settings"
-            options={{headerShown: false}}
-            component={ToggleAnalyticsSettingsNavigator}
-          />
+        <Stack.Screen
+          name="toggle-analytics-settings"
+          options={{headerShown: false}}
+          component={ToggleAnalyticsSettingsNavigator}
+        />
 
-          <Stack.Screen name="governance" options={{headerShown: false}} component={GovernanceNavigator} />
+        <Stack.Screen name="governance" options={{headerShown: false}} component={GovernanceNavigator} />
 
-          <Stack.Screen name="staking-dashboard" options={{headerShown: false}} component={DashboardNavigator} />
-        </Stack.Navigator>
-      </SearchProvider>
-    </TransferProvider>
+        <Stack.Screen name="staking-dashboard" options={{headerShown: false}} component={DashboardNavigator} />
+      </Stack.Navigator>
+    </SearchProvider>
   )
 }
 

diff --git a/apps/wallet-mobile/src/YoroiApp.tsx b/apps/wallet-mobile/src/YoroiApp.tsx
@@ -2,6 +2,7 @@ import {AsyncStorageProvider} from '@yoroi/common'
 import {LinksProvider} from '@yoroi/links'
 import {SetupWalletProvider} from '@yoroi/setup-wallet'
 import {ThemeProvider} from '@yoroi/theme'
+import {TransferProvider} from '@yoroi/transfer'
 import React from 'react'
 import {LogBox, StyleSheet} from 'react-native'
 import * as RNP from 'react-native-paper'
@@ -58,17 +59,19 @@ const Yoroi = () => {
                     <LoadingBoundary style={StyleSheet.absoluteFill}>
                       <LanguageProvider>
                         <AuthProvider>
-                          <LinksProvider>
-                            <SetupWalletProvider>
-                              <PoolTransitionProvider>
-                                <BrowserProvider>
-                                  <AutomaticWalletOpenerProvider>
-                                    <InitApp />
-                                  </AutomaticWalletOpenerProvider>
-                                </BrowserProvider>
-                              </PoolTransitionProvider>
-                            </SetupWalletProvider>
-                          </LinksProvider>
+                          <TransferProvider>
+                            <LinksProvider>
+                              <SetupWalletProvider>
+                                <PoolTransitionProvider>
+                                  <BrowserProvider>
+                                    <AutomaticWalletOpenerProvider>
+                                      <InitApp />
+                                    </AutomaticWalletOpenerProvider>
+                                  </BrowserProvider>
+                                </PoolTransitionProvider>
+                              </SetupWalletProvider>
+                            </LinksProvider>
+                          </TransferProvider>
                         </AuthProvider>
                       </LanguageProvider>
                     </LoadingBoundary>