Skip to content

Commit 7bcaa3f

Browse files
pwltrpwltr
committed
chore: upgrade nav dependencies
1 parent bfa857b commit 7bcaa3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+398
-381
lines changed

‎ios/Podfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ PODS:
3131
- ReactCommon/turbomodule/bridging
3232
- ReactCommon/turbomodule/core
3333
- Yoga
34-
- MMKV (1.3.7):
35-
- MMKVCore (~> 1.3.7)
36-
- MMKVCore (1.3.7)
34+
- MMKV (2.0.0):
35+
- MMKVCore (~> 2.0.0)
36+
- MMKVCore (2.0.0)
3737
- OpenSSL-Universal (3.3.2000)
3838
- RCT-Folly (2024.01.01.00):
3939
- boost
@@ -1423,7 +1423,7 @@ PODS:
14231423
- Yoga
14241424
- react-native-restart (0.0.27):
14251425
- React-Core
1426-
- react-native-safe-area-context (4.10.9):
1426+
- react-native-safe-area-context (5.0.0):
14271427
- React-Core
14281428
- react-native-skia (1.3.11):
14291429
- DoubleConversion
@@ -1842,7 +1842,7 @@ PODS:
18421842
- ReactCommon/turbomodule/bridging
18431843
- ReactCommon/turbomodule/core
18441844
- Yoga
1845-
- RNScreens (3.34.0):
1845+
- RNScreens (4.3.0):
18461846
- DoubleConversion
18471847
- glog
18481848
- hermes-engine
@@ -2216,8 +2216,8 @@ SPEC CHECKSUMS:
22162216
hermes-engine: 3b6e0717ca847e2fc90a201e59db36caf04dee88
22172217
lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494
22182218
lottie-react-native: 31197e5c65aa7cb59e6affcefaf901588bb708c4
2219-
MMKV: 36a22a9ec84c9bb960613a089ddf6f48be9312b0
2220-
MMKVCore: 158e61c8516401a9fac730288acb29e6fc19bbf9
2219+
MMKV: f7d1d5945c8765f97f39c3d121f353d46735d801
2220+
MMKVCore: c04b296010fcb1d1638f2c69405096aac12f6390
22212221
OpenSSL-Universal: b60a3702c9fea8b3145549d421fdb018e53ab7b4
22222222
RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
22232223
RCTDeprecation: 34cbf122b623037ea9facad2e92e53434c5c7422
@@ -2259,7 +2259,7 @@ SPEC CHECKSUMS:
22592259
react-native-quick-base64: f98f17faf04c9779faf726921a2b389d4775e8b6
22602260
react-native-quick-crypto: 12de8e1666ad3dab6339418c14f4a6de71716194
22612261
react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162
2262-
react-native-safe-area-context: ab8f4a3d8180913bd78ae75dd599c94cce3d5e9a
2262+
react-native-safe-area-context: ab7beb734b0f9f79f55ae144a6c946a6422f55d6
22632263
react-native-skia: 68be40d53b1957f6c276cec19bcd50d293173868
22642264
react-native-tcp-socket: e724380c910c2e704816ec817ed28f1342246ff7
22652265
React-nativeconfig: 57781b79e11d5af7573e6f77cbf1143b71802a6d
@@ -2301,7 +2301,7 @@ SPEC CHECKSUMS:
23012301
RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
23022302
RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9
23032303
RNReanimated: 74413c59c47123d7144db601d065627c75c746a3
2304-
RNScreens: 19719a9c326e925498ac3b2d35c4e50fe87afc06
2304+
RNScreens: b03d696c70cc5235ce4587fcc27ae1a93a48f98c
23052305
RNShare: 554a91f5cfbe4adac4cfe3654826ee8b299fe365
23062306
RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec
23072307
RNZipArchive: 7bb4c70d6aa2dd235212c0a4a3de0a4e237e2569

‎ios/bitkit.xcodeproj/project.pbxproj‎

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"start": "react-native start",
77
"android": "react-native run-android",
8-
"ios": "react-native run-ios --simulator='iPhone 15'",
8+
"ios": "react-native run-ios --simulator='iPhone 16'",
99
"ios:se": "react-native run-ios --simulator='iPhone SE (3rd generation)'",
1010
"test": "jest --forceExit",
1111
"test:coverage": "jest --forceExit --coverage=true",
@@ -42,8 +42,8 @@
4242
"@react-native-clipboard/clipboard": "1.14.1",
4343
"@react-native-community/blur": "4.4.0",
4444
"@react-native-community/netinfo": "11.3.1",
45-
"@react-navigation/native": "6.1.18",
46-
"@react-navigation/native-stack": "6.10.1",
45+
"@react-navigation/native": "7.0.14",
46+
"@react-navigation/native-stack": "7.2.0",
4747
"@reduxjs/toolkit": "2.2.6",
4848
"@shopify/react-native-skia": "1.3.11",
4949
"@synonymdev/blocktank-lsp-http-client": "2.2.0",
@@ -104,8 +104,8 @@
104104
"react-native-reanimated": "3.15.0",
105105
"react-native-reanimated-carousel": "3.5.1",
106106
"react-native-restart": "0.0.27",
107-
"react-native-safe-area-context": "4.10.9",
108-
"react-native-screens": "3.34.0",
107+
"react-native-safe-area-context": "5.0.0",
108+
"react-native-screens": "4.3.0",
109109
"react-native-share": "10.2.0",
110110
"react-native-svg": "15.2.0",
111111
"react-native-tcp-socket": "6.0.6",

‎src/components/NavigationHeader.tsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { Subtitle, Title } from '../styles/text';
1212
import { BackIcon, XIcon } from '../styles/icons';
1313
import { Keyboard } from '../hooks/keyboard';
1414
import { Pressable } from '../styles/components';
15+
import { RootNavigationProp } from '../navigation/types';
1516

1617
export const HEADER_HEIGHT = 46;
1718

@@ -71,7 +72,7 @@ const NavigationHeader = ({
7172
onClosePress,
7273
onActionPress,
7374
}: NavigationHeaderProps): ReactElement => {
74-
const navigation = useNavigation<any>();
75+
const navigation = useNavigation<RootNavigationProp>();
7576

7677
const handleBackPress = useCallback(async () => {
7778
onBackPress?.();
@@ -92,8 +93,10 @@ const NavigationHeader = ({
9293
[size, style],
9394
);
9495

95-
// TODO: this doesn't have the right navigator
96-
const showBack = Boolean(displayBackButton && navigation.canGoBack());
96+
const state = navigation.getState?.();
97+
const parent = navigation.getParent?.();
98+
const canGoBack = state?.routes.length > 1 || parent;
99+
const showBack = displayBackButton && canGoBack;
97100

98101
const numberOfActions = useMemo(() => {
99102
if (actionIcon && onClosePress) {

‎src/navigation/bottom-sheet/BackupNavigation.tsx‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import React, { ReactElement, memo } from 'react';
2-
import { useAppSelector } from '../../hooks/redux';
2+
import { NavigationIndependentTree } from '@react-navigation/native';
33
import {
44
createNativeStackNavigator,
55
NativeStackNavigationOptions,
66
NativeStackNavigationProp,
77
} from '@react-navigation/native-stack';
88

9+
import { NavigationContainer } from '../../styles/components';
910
import BottomSheetWrapper from '../../components/BottomSheetWrapper';
1011
import ShowMnemonic from '../../screens/Settings/Backup/ShowMnemonic';
1112
import ShowPassphrase from '../../screens/Settings/Backup/ShowPassphrase';
@@ -15,8 +16,8 @@ import Success from '../../screens/Settings/Backup/Success';
1516
import Warning from '../../screens/Settings/Backup/Warning';
1617
import MultipleDevices from '../../screens/Settings/Backup/MultipleDevices';
1718
import Metadata from '../../screens/Settings/Backup/Metadata';
18-
import { NavigationContainer } from '../../styles/components';
1919
import { useSnapPoints } from '../../hooks/bottomSheet';
20+
import { useAppSelector } from '../../hooks/redux';
2021
import { viewControllerIsOpenSelector } from '../../store/reselect/ui';
2122
import { __E2E__ } from '../../constants/env';
2223

@@ -49,9 +50,9 @@ const BackupNavigation = (): ReactElement => {
4950

5051
return (
5152
<BottomSheetWrapper view="backupNavigation" snapPoints={snapPoints}>
52-
<NavigationContainer key={isOpen.toString()}>
53-
<Stack.Navigator screenOptions={navOptions}>
54-
<Stack.Group screenOptions={navOptions}>
53+
<NavigationIndependentTree>
54+
<NavigationContainer key={isOpen.toString()}>
55+
<Stack.Navigator screenOptions={navOptions}>
5556
<Stack.Screen name="ShowMnemonic" component={ShowMnemonic} />
5657
<Stack.Screen name="ShowPassphrase" component={ShowPassphrase} />
5758
<Stack.Screen name="ConfirmMnemonic" component={ConfirmMnemonic} />
@@ -63,9 +64,9 @@ const BackupNavigation = (): ReactElement => {
6364
<Stack.Screen name="Success" component={Success} />
6465
<Stack.Screen name="MultipleDevices" component={MultipleDevices} />
6566
<Stack.Screen name="Metadata" component={Metadata} />
66-
</Stack.Group>
67-
</Stack.Navigator>
68-
</NavigationContainer>
67+
</Stack.Navigator>
68+
</NavigationContainer>
69+
</NavigationIndependentTree>
6970
</BottomSheetWrapper>
7071
);
7172
};

‎src/navigation/bottom-sheet/LNURLWithdrawNavigation.tsx‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
import React, { ReactElement, memo } from 'react';
2-
import { useAppSelector } from '../../hooks/redux';
2+
import { LNURLWithdrawParams } from 'js-lnurl';
3+
import { NavigationIndependentTree } from '@react-navigation/native';
34
import {
45
NativeStackNavigationOptions,
56
NativeStackNavigationProp,
67
createNativeStackNavigator,
78
} from '@react-navigation/native-stack';
8-
import { LNURLWithdrawParams } from 'js-lnurl';
99

10+
import { NavigationContainer } from '../../styles/components';
1011
import BottomSheetWrapper from '../../components/BottomSheetWrapper';
11-
import { __E2E__ } from '../../constants/env';
12-
import { useSnapPoints } from '../../hooks/bottomSheet';
1312
import Amount from '../../screens/Wallets/LNURLWithdraw/Amount';
1413
import Confirm from '../../screens/Wallets/LNURLWithdraw/Confirm';
14+
import { useSnapPoints } from '../../hooks/bottomSheet';
15+
import { useAppSelector } from '../../hooks/redux';
1516
import { viewControllerSelector } from '../../store/reselect/ui';
16-
import { NavigationContainer } from '../../styles/components';
17+
import { __E2E__ } from '../../constants/env';
1718

1819
export type LNURLWithdrawNavigationProp =
1920
NativeStackNavigationProp<LNURLWithdrawStackParamList>;
@@ -46,22 +47,24 @@ const LNURLWithdrawNavigation = (): ReactElement => {
4647

4748
return (
4849
<BottomSheetWrapper view="lnurlWithdraw" snapPoints={snapPoints}>
49-
<NavigationContainer key={isOpen.toString()}>
50-
<Stack.Navigator
51-
screenOptions={screenOptions}
52-
initialRouteName={initialRouteName}>
53-
<Stack.Screen
54-
name="Amount"
55-
component={Amount}
56-
initialParams={{ wParams }}
57-
/>
58-
<Stack.Screen
59-
name="Confirm"
60-
component={Confirm}
61-
initialParams={{ wParams, amount: wParams.minWithdrawable }}
62-
/>
63-
</Stack.Navigator>
64-
</NavigationContainer>
50+
<NavigationIndependentTree>
51+
<NavigationContainer key={isOpen.toString()}>
52+
<Stack.Navigator
53+
screenOptions={screenOptions}
54+
initialRouteName={initialRouteName}>
55+
<Stack.Screen
56+
name="Amount"
57+
component={Amount}
58+
initialParams={{ wParams }}
59+
/>
60+
<Stack.Screen
61+
name="Confirm"
62+
component={Confirm}
63+
initialParams={{ wParams, amount: wParams.minWithdrawable }}
64+
/>
65+
</Stack.Navigator>
66+
</NavigationContainer>
67+
</NavigationIndependentTree>
6568
</BottomSheetWrapper>
6669
);
6770
};

‎src/navigation/bottom-sheet/OrangeTicketNavigation.tsx‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import React, {
66
useState,
77
} from 'react';
88
import { ldk } from '@synonymdev/react-native-ldk';
9+
import { NavigationIndependentTree } from '@react-navigation/native';
910
import {
1011
createNativeStackNavigator,
1112
NativeStackNavigationProp,
@@ -157,27 +158,29 @@ const OrangeTicket = (): ReactElement => {
157158

158159
return (
159160
<BottomSheetWrapper view="orangeTicket" snapPoints={snapPoints}>
160-
<NavigationContainer key={isOpen.toString()}>
161-
<Stack.Navigator
162-
initialRouteName={initialScreen}
163-
screenOptions={screenOptions}>
164-
<Stack.Screen
165-
name="Prize"
166-
component={Prize}
167-
initialParams={{ ticketId, amount }}
168-
/>
169-
<Stack.Screen
170-
name="UsedCard"
171-
component={UsedCard}
172-
initialParams={{ amount }}
173-
/>
174-
<Stack.Screen
175-
name="Error"
176-
component={Error}
177-
initialParams={{ errorCode }}
178-
/>
179-
</Stack.Navigator>
180-
</NavigationContainer>
161+
<NavigationIndependentTree>
162+
<NavigationContainer key={isOpen.toString()}>
163+
<Stack.Navigator
164+
initialRouteName={initialScreen}
165+
screenOptions={screenOptions}>
166+
<Stack.Screen
167+
name="Prize"
168+
component={Prize}
169+
initialParams={{ ticketId, amount }}
170+
/>
171+
<Stack.Screen
172+
name="UsedCard"
173+
component={UsedCard}
174+
initialParams={{ amount }}
175+
/>
176+
<Stack.Screen
177+
name="Error"
178+
component={Error}
179+
initialParams={{ errorCode }}
180+
/>
181+
</Stack.Navigator>
182+
</NavigationContainer>
183+
</NavigationIndependentTree>
181184
</BottomSheetWrapper>
182185
);
183186
};

‎src/navigation/bottom-sheet/PINNavigation.tsx‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { ReactElement, memo } from 'react';
22
import { useAppSelector } from '../../hooks/redux';
33
import { BiometryType } from 'react-native-biometrics';
4+
import { NavigationIndependentTree } from '@react-navigation/native';
45
import {
56
createNativeStackNavigator,
67
NativeStackNavigationOptions,
@@ -41,14 +42,19 @@ const PINNavigation = (): ReactElement => {
4142

4243
return (
4344
<BottomSheetWrapper view="PINNavigation" snapPoints={snapPoints}>
44-
<NavigationContainer key={isOpen.toString()}>
45-
<Stack.Navigator screenOptions={screenOptions}>
46-
<Stack.Screen name="PINPrompt" component={PINPrompt} />
47-
<Stack.Screen name="ChoosePIN" component={ChoosePIN} />
48-
<Stack.Screen name="AskForBiometrics" component={AskForBiometrics} />
49-
<Stack.Screen name="Result" component={Result} />
50-
</Stack.Navigator>
51-
</NavigationContainer>
45+
<NavigationIndependentTree>
46+
<NavigationContainer key={isOpen.toString()}>
47+
<Stack.Navigator screenOptions={screenOptions}>
48+
<Stack.Screen name="PINPrompt" component={PINPrompt} />
49+
<Stack.Screen name="ChoosePIN" component={ChoosePIN} />
50+
<Stack.Screen
51+
name="AskForBiometrics"
52+
component={AskForBiometrics}
53+
/>
54+
<Stack.Screen name="Result" component={Result} />
55+
</Stack.Navigator>
56+
</NavigationContainer>
57+
</NavigationIndependentTree>
5258
</BottomSheetWrapper>
5359
);
5460
};

‎src/navigation/bottom-sheet/ProfileLinkNavigation.tsx‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
import React, { ReactElement, memo } from 'react';
2-
import { useAppSelector } from '../../hooks/redux';
2+
import { NavigationIndependentTree } from '@react-navigation/native';
33
import {
44
NativeStackNavigationOptions,
55
NativeStackNavigationProp,
66
createNativeStackNavigator,
77
} from '@react-navigation/native-stack';
88

9+
import { NavigationContainer } from '../../styles/components';
910
import BottomSheetWrapper from '../../components/BottomSheetWrapper';
10-
import { __E2E__ } from '../../constants/env';
11-
import { useSnapPoints } from '../../hooks/bottomSheet';
1211
import ProfileLink from '../../screens/Profile/ProfileLink';
1312
import ProfileLinkSuggestions from '../../screens/Profile/ProfileLinkSuggestions';
13+
import { useAppSelector } from '../../hooks/redux';
14+
import { useSnapPoints } from '../../hooks/bottomSheet';
1415
import { viewControllerIsOpenSelector } from '../../store/reselect/ui';
15-
import { NavigationContainer } from '../../styles/components';
16+
import { __E2E__ } from '../../constants/env';
1617

1718
export type ProfileLinkNavigationProp =
1819
NativeStackNavigationProp<ProfileLinkStackParamList>;
@@ -37,15 +38,17 @@ const ProfileLinkNavigation = (): ReactElement => {
3738

3839
return (
3940
<BottomSheetWrapper view="profileAddDataForm" snapPoints={snapPoints}>
40-
<NavigationContainer key={isOpen.toString()}>
41-
<Stack.Navigator screenOptions={screenOptions}>
42-
<Stack.Screen name="ProfileLink" component={ProfileLink} />
43-
<Stack.Screen
44-
name="ProfileLinkSuggestions"
45-
component={ProfileLinkSuggestions}
46-
/>
47-
</Stack.Navigator>
48-
</NavigationContainer>
41+
<NavigationIndependentTree>
42+
<NavigationContainer key={isOpen.toString()}>
43+
<Stack.Navigator screenOptions={screenOptions}>
44+
<Stack.Screen name="ProfileLink" component={ProfileLink} />
45+
<Stack.Screen
46+
name="ProfileLinkSuggestions"
47+
component={ProfileLinkSuggestions}
48+
/>
49+
</Stack.Navigator>
50+
</NavigationContainer>
51+
</NavigationIndependentTree>
4952
</BottomSheetWrapper>
5053
);
5154
};

0 commit comments

Comments
 (0)