Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1719,7 +1719,7 @@ PODS:
- React-Core
- RNFS (2.20.0):
- React-Core
- RNGestureHandler (2.15.0):
- RNGestureHandler (2.21.2):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1777,7 +1777,7 @@ PODS:
- React
- RNReactNativeHapticFeedback (2.2.0):
- React-Core
- RNReanimated (3.15.0):
- RNReanimated (3.16.5):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1797,10 +1797,10 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated (= 3.15.0)
- RNReanimated/worklets (= 3.15.0)
- RNReanimated/reanimated (= 3.16.5)
- RNReanimated/worklets (= 3.16.5)
- Yoga
- RNReanimated/reanimated (3.15.0):
- RNReanimated/reanimated (3.16.5):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1820,8 +1820,30 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated/apple (= 3.16.5)
- Yoga
- RNReanimated/worklets (3.15.0):
- RNReanimated/reanimated/apple (3.16.5):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNReanimated/worklets (3.16.5):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -2292,15 +2314,15 @@ SPEC CHECKSUMS:
RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: e80cae4246813ee7f667a2552012a6b7da5550a1
RNGestureHandler: aa9690789023c9be8f06aa90e10ce637ea788f4d
RNKeychain: 4cfd0dc8634c2dd81a4607c8299ed424bfdee1a7
RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4
RNNotifee: 8e2d3df3f0e9ce8f5d1fe4c967431138190b6175
RNPermissions: 2c0eec471f4de66d04d226c339898d10a6e123c4
RNQrGenerator: 1676221c08bfabec978242989c733810dad20959
RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9
RNReanimated: 74413c59c47123d7144db601d065627c75c746a3
RNReanimated: db4cd0009bf6f07da10d9e3a917f1abe29be6d9b
RNScreens: b03d696c70cc5235ce4587fcc27ae1a93a48f98c
RNShare: 554a91f5cfbe4adac4cfe3654826ee8b299fe365
RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec
Expand Down
124 changes: 62 additions & 62 deletions ios/bitkit.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion metro.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
const path = require('path');
const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
const exclusionList = require('metro-config/src/defaults/exclusionList');
const {
wrapWithReanimatedMetroConfig,
} = require('react-native-reanimated/metro-config');

const defaultConfig = getDefaultConfig(__dirname);
const { assetExts, sourceExts } = defaultConfig.resolver;
Expand Down Expand Up @@ -35,4 +38,6 @@ const config = {
},
};

module.exports = mergeConfig(defaultConfig, config);
const mergedConfig = mergeConfig(defaultConfig, config);

module.exports = wrapWithReanimatedMetroConfig(mergedConfig);
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@formatjs/intl-numberformat": "8.10.1",
"@formatjs/intl-pluralrules": "5.2.12",
"@formatjs/intl-relativetimeformat": "11.2.12",
"@gorhom/bottom-sheet": "4.6.3",
"@gorhom/bottom-sheet": "5.0.6",
"@notifee/react-native": "7.8.2",
"@react-native-clipboard/clipboard": "1.14.1",
"@react-native-community/blur": "4.4.0",
Expand Down Expand Up @@ -86,7 +86,7 @@
"react-native-draggable-flatlist": "4.0.1",
"react-native-fetch-api": "3.0.0",
"react-native-fs": "2.20.0",
"react-native-gesture-handler": "2.15.0",
"react-native-gesture-handler": "2.21.2",
"react-native-haptic-feedback": "2.2.0",
"react-native-image-picker": "7.1.2",
"react-native-keyboard-accessory": "0.1.16",
Expand All @@ -101,7 +101,7 @@
"react-native-quick-base64": "2.1.2",
"react-native-quick-bip39": "0.0.9",
"react-native-quick-crypto": "0.7.1",
"react-native-reanimated": "3.15.0",
"react-native-reanimated": "3.16.5",
"react-native-reanimated-carousel": "3.5.1",
"react-native-restart": "0.0.27",
"react-native-safe-area-context": "5.0.0",
Expand Down
4 changes: 4 additions & 0 deletions src/components/BottomSheetWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,13 @@ const BottomSheetWrapper = forwardRef(
index={index}
snapPoints={snapPoints}
animateOnMount={!reducedMotion && !__E2E__}
enableDynamicSizing={false}
enableOverdrag={false}
enablePanDownToClose={true}
keyboardBlurBehavior="restore"
// @ts-ignore
activeOffsetX={activeOffsetX}
// @ts-ignore
activeOffsetY={activeOffsetY}
onChange={handleSheetChanges}>
<BottomSheetView style={style} testID={testID}>
Expand Down
1 change: 1 addition & 0 deletions src/components/Suggestions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ const Suggestions = (): ReactElement => {
loop={false}
height={170}
width={167}
// @ts-ignore
panGestureHandlerProps={panGestureHandlerProps}
onSnapToItem={setIndex}
renderItem={handleRenderItem}
Expand Down
22 changes: 6 additions & 16 deletions src/screens/Wallets/Receive/ReceiveQR.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -652,10 +652,9 @@ const ReceiveQR = ({
<ActivityIndicator color="white" />
</View>
) : (
<View style={styles.carouselWrapper}>
<View style={{ height: qrMaxHeight + 64 }}>
<Carousel
ref={carouselRef}
style={styles.carousel}
data={slides}
width={dimensions.width}
height={qrMaxHeight + 64}
Expand Down Expand Up @@ -699,17 +698,15 @@ const styles = StyleSheet.create({
loading: {
justifyContent: 'center',
},
carouselWrapper: {
flex: 1,
alignItems: 'center',
},
carousel: {
alignItems: 'center',
},
slide: {
paddingHorizontal: 16,
alignItems: 'center',
},
dots: {
flexDirection: 'row',
alignSelf: 'center',
width: 27,
},
qrCode: {
borderRadius: 10,
position: 'relative',
Expand Down Expand Up @@ -756,13 +753,6 @@ const styles = StyleSheet.create({
divider: {
height: 32,
},
dots: {
flexDirection: 'row',
justifyContent: 'space-between',
alignSelf: 'center',
marginTop: 16,
width: 27,
},
tooltip: {
position: 'absolute',
top: 18,
Expand Down
35 changes: 17 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3303,9 +3303,9 @@ __metadata:
languageName: node
linkType: hard

"@gorhom/bottom-sheet@npm:4.6.3":
version: 4.6.3
resolution: "@gorhom/bottom-sheet@npm:4.6.3"
"@gorhom/bottom-sheet@npm:5.0.6":
version: 5.0.6
resolution: "@gorhom/bottom-sheet@npm:5.0.6"
dependencies:
"@gorhom/portal": 1.0.14
invariant: ^2.2.4
Expand All @@ -3314,14 +3314,14 @@ __metadata:
"@types/react-native": "*"
react: "*"
react-native: "*"
react-native-gesture-handler: ">=1.10.1"
react-native-reanimated: ">=2.2.0"
react-native-gesture-handler: ">=2.16.1"
react-native-reanimated: ">=3.16.0"
peerDependenciesMeta:
"@types/react":
optional: true
"@types/react-native":
optional: true
checksum: 718c55a89b0e18581eae6080d1d21caabf4895088e01f0dfe17b5891835a110d7aee1d0cb1b9e623efc16b598fdb28c2ec929e0ed74bfbca283306191d8a5c41
checksum: 46e25c973763afab7532386b2624e4a6d08c732691dad7c93a2325d9f4f84ba1b65262ee0f43a104f7c01a94a5cfcb4195483784fa7a86609de42c3f4ae0bbd6
languageName: node
linkType: hard

Expand Down Expand Up @@ -6603,7 +6603,7 @@ __metadata:
"@formatjs/intl-numberformat": 8.10.1
"@formatjs/intl-pluralrules": 5.2.12
"@formatjs/intl-relativetimeformat": 11.2.12
"@gorhom/bottom-sheet": 4.6.3
"@gorhom/bottom-sheet": 5.0.6
"@notifee/react-native": 7.8.2
"@ptsecurity/commitlint-config": ^2.0.0
"@radar/lnrpc": ^0.11.1-beta.1
Expand Down Expand Up @@ -6683,7 +6683,7 @@ __metadata:
react-native-draggable-flatlist: 4.0.1
react-native-fetch-api: 3.0.0
react-native-fs: 2.20.0
react-native-gesture-handler: 2.15.0
react-native-gesture-handler: 2.21.2
react-native-haptic-feedback: 2.2.0
react-native-image-picker: 7.1.2
react-native-keyboard-accessory: 0.1.16
Expand All @@ -6698,7 +6698,7 @@ __metadata:
react-native-quick-base64: 2.1.2
react-native-quick-bip39: 0.0.9
react-native-quick-crypto: 0.7.1
react-native-reanimated: 3.15.0
react-native-reanimated: 3.16.5
react-native-reanimated-carousel: 3.5.1
react-native-restart: 0.0.27
react-native-safe-area-context: 5.0.0
Expand Down Expand Up @@ -14334,19 +14334,18 @@ __metadata:
languageName: node
linkType: hard

"react-native-gesture-handler@npm:2.15.0":
version: 2.15.0
resolution: "react-native-gesture-handler@npm:2.15.0"
"react-native-gesture-handler@npm:2.21.2":
version: 2.21.2
resolution: "react-native-gesture-handler@npm:2.21.2"
dependencies:
"@egjs/hammerjs": ^2.0.17
hoist-non-react-statics: ^3.3.0
invariant: ^2.2.4
lodash: ^4.17.21
prop-types: ^15.7.2
peerDependencies:
react: "*"
react-native: "*"
checksum: 4db52e7b38b047bad677ed570a0ef4c2ddfc413bbbce5ed21f487c9d86c60588ee6b2c9f74bb842e5654284b0d1e6a8af81f68000e737d8a7f1e030b6d3fe6b6
checksum: 0a42cedb8860a326b465085d0f7622ba03f038b0f0bdd1b1fe5703e58d62cb08bfb82a686c069a1a1410705c2ae0d82971b0449d83796fdd6d071131cf88e68b
languageName: node
linkType: hard

Expand Down Expand Up @@ -14548,9 +14547,9 @@ __metadata:
languageName: node
linkType: hard

"react-native-reanimated@npm:3.15.0":
version: 3.15.0
resolution: "react-native-reanimated@npm:3.15.0"
"react-native-reanimated@npm:3.16.5":
version: 3.16.5
resolution: "react-native-reanimated@npm:3.16.5"
dependencies:
"@babel/plugin-transform-arrow-functions": ^7.0.0-0
"@babel/plugin-transform-class-properties": ^7.0.0-0
Expand All @@ -14567,7 +14566,7 @@ __metadata:
"@babel/core": ^7.0.0-0
react: "*"
react-native: "*"
checksum: fad4f54d7f005f4fb3d90d983bedcf1ec7de936259b8e286feb35edaa9d1ac16d8b927fcd59eeea7f91446310432b342fd9785301a304955844785fef52a3e31
checksum: 29d28dcf99acb2e3928963106a2860d15c9929712832d8d8437fb563691d0199884a63e925548fe5e4b6fc7a9008eadec3e0294b521d9466c875caf16de9c303
languageName: node
linkType: hard

Expand Down
Loading