Skip to content

Commit bf707c9

Browse files
authored
fix(wallet-mobile): qr link full read within yoroi (#3682)
1 parent 2ee86b9 commit bf707c9

File tree

6 files changed

+341
-349
lines changed

6 files changed

+341
-349
lines changed

apps/wallet-mobile/.storybook/storybook.requires.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/wallet-mobile/src/WalletNavigator.tsx

+35-38
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
swapStorageMaker,
1111
} from '@yoroi/swap'
1212
import {useTheme} from '@yoroi/theme'
13-
import {TransferProvider} from '@yoroi/transfer'
1413
import {Swap} from '@yoroi/types'
1514
import React from 'react'
1615
import {defineMessages, useIntl} from 'react-intl'
@@ -233,51 +232,49 @@ export const WalletNavigator = () => {
233232
}
234233

235234
return (
236-
<TransferProvider>
237-
<SearchProvider>
238-
<Stack.Navigator
239-
screenOptions={{
240-
...navOptions,
241-
headerLeft: undefined,
235+
<SearchProvider>
236+
<Stack.Navigator
237+
screenOptions={{
238+
...navOptions,
239+
headerLeft: undefined,
240+
}}
241+
>
242+
<Stack.Screen
243+
name="wallet-selection"
244+
options={{
245+
title: strings.walletSelectionScreenHeader,
246+
headerTitle: ({children}) => <NetworkTag directChangeActive>{children}</NetworkTag>,
242247
}}
243-
>
244-
<Stack.Screen
245-
name="wallet-selection"
246-
options={{
247-
title: strings.walletSelectionScreenHeader,
248-
headerTitle: ({children}) => <NetworkTag directChangeActive>{children}</NetworkTag>,
249-
}}
250-
component={SelectWalletFromList}
251-
/>
248+
component={SelectWalletFromList}
249+
/>
252250

253-
<Stack.Screen //
254-
name="setup-wallet"
255-
options={{headerShown: false}}
256-
component={SetupWalletNavigator}
257-
/>
251+
<Stack.Screen //
252+
name="setup-wallet"
253+
options={{headerShown: false}}
254+
component={SetupWalletNavigator}
255+
/>
258256

259-
<Stack.Screen name="main-wallet-routes" options={{headerShown: false}} component={WalletTabNavigator} />
257+
<Stack.Screen name="main-wallet-routes" options={{headerShown: false}} component={WalletTabNavigator} />
260258

261-
<Stack.Screen name="settings" options={{headerShown: false}} component={SettingsScreenNavigator} />
259+
<Stack.Screen name="settings" options={{headerShown: false}} component={SettingsScreenNavigator} />
262260

263-
<Stack.Screen
264-
name="voting-registration"
265-
options={{headerShown: false}}
266-
getComponent={() => CatalystNavigator}
267-
/>
261+
<Stack.Screen
262+
name="voting-registration"
263+
options={{headerShown: false}}
264+
getComponent={() => CatalystNavigator}
265+
/>
268266

269-
<Stack.Screen
270-
name="toggle-analytics-settings"
271-
options={{headerShown: false}}
272-
component={ToggleAnalyticsSettingsNavigator}
273-
/>
267+
<Stack.Screen
268+
name="toggle-analytics-settings"
269+
options={{headerShown: false}}
270+
component={ToggleAnalyticsSettingsNavigator}
271+
/>
274272

275-
<Stack.Screen name="governance" options={{headerShown: false}} component={GovernanceNavigator} />
273+
<Stack.Screen name="governance" options={{headerShown: false}} component={GovernanceNavigator} />
276274

277-
<Stack.Screen name="staking-dashboard" options={{headerShown: false}} component={DashboardNavigator} />
278-
</Stack.Navigator>
279-
</SearchProvider>
280-
</TransferProvider>
275+
<Stack.Screen name="staking-dashboard" options={{headerShown: false}} component={DashboardNavigator} />
276+
</Stack.Navigator>
277+
</SearchProvider>
281278
)
282279
}
283280

apps/wallet-mobile/src/YoroiApp.tsx

+14-11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {AsyncStorageProvider} from '@yoroi/common'
22
import {LinksProvider} from '@yoroi/links'
33
import {SetupWalletProvider} from '@yoroi/setup-wallet'
44
import {ThemeProvider} from '@yoroi/theme'
5+
import {TransferProvider} from '@yoroi/transfer'
56
import React from 'react'
67
import {LogBox, StyleSheet} from 'react-native'
78
import * as RNP from 'react-native-paper'
@@ -58,17 +59,19 @@ const Yoroi = () => {
5859
<LoadingBoundary style={StyleSheet.absoluteFill}>
5960
<LanguageProvider>
6061
<AuthProvider>
61-
<LinksProvider>
62-
<SetupWalletProvider>
63-
<PoolTransitionProvider>
64-
<BrowserProvider>
65-
<AutomaticWalletOpenerProvider>
66-
<InitApp />
67-
</AutomaticWalletOpenerProvider>
68-
</BrowserProvider>
69-
</PoolTransitionProvider>
70-
</SetupWalletProvider>
71-
</LinksProvider>
62+
<TransferProvider>
63+
<LinksProvider>
64+
<SetupWalletProvider>
65+
<PoolTransitionProvider>
66+
<BrowserProvider>
67+
<AutomaticWalletOpenerProvider>
68+
<InitApp />
69+
</AutomaticWalletOpenerProvider>
70+
</BrowserProvider>
71+
</PoolTransitionProvider>
72+
</SetupWalletProvider>
73+
</LinksProvider>
74+
</TransferProvider>
7275
</AuthProvider>
7376
</LanguageProvider>
7477
</LoadingBoundary>

0 commit comments

Comments
 (0)