From 73329897e0148a4920baaa09c3ef135ac6755fad Mon Sep 17 00:00:00 2001 From: Philipp Walter Date: Wed, 1 Jan 2025 13:59:13 +0100 Subject: [PATCH] chore: upgrade bottom-sheet dependency --- ios/Podfile.lock | 38 +++++-- ios/bitkit.xcodeproj/project.pbxproj | 124 +++++++++++----------- metro.config.js | 7 +- package.json | 6 +- src/components/BottomSheetWrapper.tsx | 4 + src/components/Suggestions.tsx | 1 + src/screens/Wallets/Receive/ReceiveQR.tsx | 22 ++-- yarn.lock | 35 +++--- 8 files changed, 129 insertions(+), 108 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 576dae651..2bc78eb17 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -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 @@ -1777,7 +1777,7 @@ PODS: - React - RNReactNativeHapticFeedback (2.2.0): - React-Core - - RNReanimated (3.15.0): + - RNReanimated (3.16.5): - DoubleConversion - glog - hermes-engine @@ -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 @@ -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 @@ -2292,7 +2314,7 @@ SPEC CHECKSUMS: RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37 RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 - RNGestureHandler: e80cae4246813ee7f667a2552012a6b7da5550a1 + RNGestureHandler: aa9690789023c9be8f06aa90e10ce637ea788f4d RNKeychain: 4cfd0dc8634c2dd81a4607c8299ed424bfdee1a7 RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4 RNNotifee: 8e2d3df3f0e9ce8f5d1fe4c967431138190b6175 @@ -2300,7 +2322,7 @@ SPEC CHECKSUMS: RNQrGenerator: 1676221c08bfabec978242989c733810dad20959 RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93 RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9 - RNReanimated: 74413c59c47123d7144db601d065627c75c746a3 + RNReanimated: db4cd0009bf6f07da10d9e3a917f1abe29be6d9b RNScreens: b03d696c70cc5235ce4587fcc27ae1a93a48f98c RNShare: 554a91f5cfbe4adac4cfe3654826ee8b299fe365 RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj index 4af57b0a0..ebdda446e 100644 --- a/ios/bitkit.xcodeproj/project.pbxproj +++ b/ios/bitkit.xcodeproj/project.pbxproj @@ -14,14 +14,14 @@ 17074219BB5847259EAFC7A6 /* InterTight-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3815D562618543E7A9BC191E /* InterTight-Black.ttf */; }; 57072143CA0F49089AE64F61 /* InterTight-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */; }; 6980B602E6DC4429841BE5EE /* InterTight-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */; }; - 789827F8833B093D31DFF806 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F403DA8EBCB4E2689002976 /* libPods-bitkit-bitkitTests.a */; }; + 764B061E24938CD18659CACC /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA559A0A2967628F38BB9A2 /* libPods-bitkit.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; 8BD8301E3A1B44DDA3C8A10D /* Damion-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DEC74C5375A34FFCAEBA0781 /* Damion-Regular.ttf */; }; 925570EA7B1D43CC8AD07B91 /* InterTight-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CA37793F82F144678099A00D /* InterTight-Bold.ttf */; }; 9952E811473D46FB9003A56D /* InterTight-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */; }; B3BE07A9843E4B7DA375B877 /* InterTight-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */; }; - DD512D5C0550FBA9B8E2227E /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B949EEE22FEB061C8CBCB427 /* libPods-bitkit.a */; }; E2F35FC226645CE623C61C03 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 919FE2A2B4A7605C9F606896 /* PrivacyInfo.xcprivacy */; }; + F7F1C33679BFC848852F9F79 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 80435D9A1413030DC62742C9 /* libPods-bitkit-bitkitTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -45,22 +45,22 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = bitkit/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = bitkit/main.m; sourceTree = ""; }; 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = bitkit/PrivacyInfo.xcprivacy; sourceTree = ""; }; - 30A5A1C795205E44CFE0B84E /* Pods-bitkit-bitkitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.debug.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.debug.xcconfig"; sourceTree = ""; }; 3815D562618543E7A9BC191E /* InterTight-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Black.ttf"; path = "../src/assets/fonts/InterTight-Black.ttf"; sourceTree = ""; }; 50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-SemiBold.ttf"; path = "../src/assets/fonts/InterTight-SemiBold.ttf"; sourceTree = ""; }; + 7315A29338DB10EFFE152678 /* Pods-bitkit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.release.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.release.xcconfig"; sourceTree = ""; }; 79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Regular.ttf"; path = "../src/assets/fonts/InterTight-Regular.ttf"; sourceTree = ""; }; + 80435D9A1413030DC62742C9 /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = bitkit/LaunchScreen.storyboard; sourceTree = ""; }; - 8F403DA8EBCB4E2689002976 /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 919FE2A2B4A7605C9F606896 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = bitkit/PrivacyInfo.xcprivacy; sourceTree = ""; }; - 9349F4DDA33D403EE5F67860 /* Pods-bitkit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.debug.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.debug.xcconfig"; sourceTree = ""; }; A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-ExtraBold.ttf"; path = "../src/assets/fonts/InterTight-ExtraBold.ttf"; sourceTree = ""; }; - B949EEE22FEB061C8CBCB427 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B6DD1FF4B7C5DDA54EA425C5 /* Pods-bitkit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.debug.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.debug.xcconfig"; sourceTree = ""; }; + C663D593D895B3402F202C9A /* Pods-bitkit-bitkitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.release.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.release.xcconfig"; sourceTree = ""; }; CA37793F82F144678099A00D /* InterTight-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Bold.ttf"; path = "../src/assets/fonts/InterTight-Bold.ttf"; sourceTree = ""; }; - CCB8F32E739DCE6C35666E96 /* Pods-bitkit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.release.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.release.xcconfig"; sourceTree = ""; }; D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Medium.ttf"; path = "../src/assets/fonts/InterTight-Medium.ttf"; sourceTree = ""; }; + DDA559A0A2967628F38BB9A2 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; }; DEC74C5375A34FFCAEBA0781 /* Damion-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Damion-Regular.ttf"; path = "../src/assets/fonts/Damion-Regular.ttf"; sourceTree = ""; }; + EB0E2FDA5898F97BE487FD9A /* Pods-bitkit-bitkitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.debug.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - FEDDC45B5C30C2E3D09927C7 /* Pods-bitkit-bitkitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.release.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -68,7 +68,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 789827F8833B093D31DFF806 /* libPods-bitkit-bitkitTests.a in Frameworks */, + F7F1C33679BFC848852F9F79 /* libPods-bitkit-bitkitTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,7 +76,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DD512D5C0550FBA9B8E2227E /* libPods-bitkit.a in Frameworks */, + 764B061E24938CD18659CACC /* libPods-bitkit.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -119,8 +119,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - B949EEE22FEB061C8CBCB427 /* libPods-bitkit.a */, - 8F403DA8EBCB4E2689002976 /* libPods-bitkit-bitkitTests.a */, + DDA559A0A2967628F38BB9A2 /* libPods-bitkit.a */, + 80435D9A1413030DC62742C9 /* libPods-bitkit-bitkitTests.a */, ); name = Frameworks; sourceTree = ""; @@ -183,10 +183,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 9349F4DDA33D403EE5F67860 /* Pods-bitkit.debug.xcconfig */, - CCB8F32E739DCE6C35666E96 /* Pods-bitkit.release.xcconfig */, - 30A5A1C795205E44CFE0B84E /* Pods-bitkit-bitkitTests.debug.xcconfig */, - FEDDC45B5C30C2E3D09927C7 /* Pods-bitkit-bitkitTests.release.xcconfig */, + B6DD1FF4B7C5DDA54EA425C5 /* Pods-bitkit.debug.xcconfig */, + 7315A29338DB10EFFE152678 /* Pods-bitkit.release.xcconfig */, + EB0E2FDA5898F97BE487FD9A /* Pods-bitkit-bitkitTests.debug.xcconfig */, + C663D593D895B3402F202C9A /* Pods-bitkit-bitkitTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -198,12 +198,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "bitkitTests" */; buildPhases = ( - 136D8A8120390DDCA7E873DD /* [CP] Check Pods Manifest.lock */, + 8C1C4E86B3891E0DB4128D29 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 5B7437154308FF2AADEBF4A8 /* [CP] Embed Pods Frameworks */, - E65EEF0FBF42B2B3A77B32EB /* [CP] Copy Pods Resources */, + 6DB0C48E3F917A4BD500D791 /* [CP] Embed Pods Frameworks */, + 47566A73BA6075C8C08DC8A3 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -219,13 +219,13 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "bitkit" */; buildPhases = ( - 2DCEAE7D09BBB3F9A35863BF /* [CP] Check Pods Manifest.lock */, + 6F661011B4065F5432815508 /* [CP] Check Pods Manifest.lock */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - 4D3C0F3B99850A226955BC0B /* [CP] Embed Pods Frameworks */, - E7548424844BEE9A03D16B95 /* [CP] Copy Pods Resources */, + A1C7D30DF364179870BC16B0 /* [CP] Embed Pods Frameworks */, + A48636B9B4404DFFAE0C1645 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -316,102 +316,102 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; - 136D8A8120390DDCA7E873DD /* [CP] Check Pods Manifest.lock */ = { + 47566A73BA6075C8C08DC8A3 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-bitkit-bitkitTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 2DCEAE7D09BBB3F9A35863BF /* [CP] Check Pods Manifest.lock */ = { + 6DB0C48E3F917A4BD500D791 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-bitkit-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 4D3C0F3B99850A226955BC0B /* [CP] Embed Pods Frameworks */ = { + 6F661011B4065F5432815508 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-bitkit-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 5B7437154308FF2AADEBF4A8 /* [CP] Embed Pods Frameworks */ = { + 8C1C4E86B3891E0DB4128D29 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-bitkit-bitkitTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E65EEF0FBF42B2B3A77B32EB /* [CP] Copy Pods Resources */ = { + A1C7D30DF364179870BC16B0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E7548424844BEE9A03D16B95 /* [CP] Copy Pods Resources */ = { + A48636B9B4404DFFAE0C1645 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -461,7 +461,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 30A5A1C795205E44CFE0B84E /* Pods-bitkit-bitkitTests.debug.xcconfig */; + baseConfigurationReference = EB0E2FDA5898F97BE487FD9A /* Pods-bitkit-bitkitTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -489,7 +489,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FEDDC45B5C30C2E3D09927C7 /* Pods-bitkit-bitkitTests.release.xcconfig */; + baseConfigurationReference = C663D593D895B3402F202C9A /* Pods-bitkit-bitkitTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -514,7 +514,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9349F4DDA33D403EE5F67860 /* Pods-bitkit.debug.xcconfig */; + baseConfigurationReference = B6DD1FF4B7C5DDA54EA425C5 /* Pods-bitkit.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; @@ -546,7 +546,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CCB8F32E739DCE6C35666E96 /* Pods-bitkit.release.xcconfig */; + baseConfigurationReference = 7315A29338DB10EFFE152678 /* Pods-bitkit.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; diff --git a/metro.config.js b/metro.config.js index e422e503e..707530386 100644 --- a/metro.config.js +++ b/metro.config.js @@ -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; @@ -35,4 +38,6 @@ const config = { }, }; -module.exports = mergeConfig(defaultConfig, config); +const mergedConfig = mergeConfig(defaultConfig, config); + +module.exports = wrapWithReanimatedMetroConfig(mergedConfig); diff --git a/package.json b/package.json index 268c5d2fa..84762d290 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -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", diff --git a/src/components/BottomSheetWrapper.tsx b/src/components/BottomSheetWrapper.tsx index 9149ea34b..a4853bc95 100644 --- a/src/components/BottomSheetWrapper.tsx +++ b/src/components/BottomSheetWrapper.tsx @@ -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}> diff --git a/src/components/Suggestions.tsx b/src/components/Suggestions.tsx index 7d70caa1b..4647ab891 100644 --- a/src/components/Suggestions.tsx +++ b/src/components/Suggestions.tsx @@ -189,6 +189,7 @@ const Suggestions = (): ReactElement => { loop={false} height={170} width={167} + // @ts-ignore panGestureHandlerProps={panGestureHandlerProps} onSnapToItem={setIndex} renderItem={handleRenderItem} diff --git a/src/screens/Wallets/Receive/ReceiveQR.tsx b/src/screens/Wallets/Receive/ReceiveQR.tsx index 08821eeae..f4a5dc2dd 100644 --- a/src/screens/Wallets/Receive/ReceiveQR.tsx +++ b/src/screens/Wallets/Receive/ReceiveQR.tsx @@ -652,10 +652,9 @@ const ReceiveQR = ({ ) : ( - + =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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -14567,7 +14566,7 @@ __metadata: "@babel/core": ^7.0.0-0 react: "*" react-native: "*" - checksum: fad4f54d7f005f4fb3d90d983bedcf1ec7de936259b8e286feb35edaa9d1ac16d8b927fcd59eeea7f91446310432b342fd9785301a304955844785fef52a3e31 + checksum: 29d28dcf99acb2e3928963106a2860d15c9929712832d8d8437fb563691d0199884a63e925548fe5e4b6fc7a9008eadec3e0294b521d9466c875caf16de9c303 languageName: node linkType: hard