Rebase

helium · Dec 16, 2024 · 6aa412c · 6aa412c
1 parent 2b57e0a
commit 6aa412c
Show file tree

Hide file tree

Showing 3 changed files with 244 additions and 242 deletions.
diff --git a/ios/HeliumWallet.xcodeproj/project.pbxproj b/ios/HeliumWallet.xcodeproj/project.pbxproj
@@ -18,10 +18,10 @@
 		7AA19242A2DE47E8AFC56882 /* Figtree-Italic-VariableFont_wght.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3440BC62530D461681D28DD7 /* Figtree-Italic-VariableFont_wght.ttf */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		9609D00027F4DE8D00CE3F93 /* RCTDateModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9609CFFF27F4DE8D00CE3F93 /* RCTDateModule.mm */; };
-		962862712BDCCAF70073839C /* (null) in Frameworks */ = {isa = PBXBuildFile; };
-		962862722BDCCAF70073839C /* (null) in Frameworks */ = {isa = PBXBuildFile; };
-		962862732BDCCAF70073839C /* (null) in Frameworks */ = {isa = PBXBuildFile; };
-		962862742BDCCAF70073839C /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+		962862712BDCCAF70073839C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
+		962862722BDCCAF70073839C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
+		962862732BDCCAF70073839C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
+		962862742BDCCAF70073839C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
 		96E4147327BEE4C300CE6EC1 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E4147227BEE4C300CE6EC1 /* NotificationService.swift */; };
 		96E4147727BEE4C300CE6EC1 /* OneSignalNotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 96E4147027BEE4C300CE6EC1 /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		9D05C88528527DF0008198FC /* HeliumWalletWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D05C88428527DF0008198FC /* HeliumWalletWidgetProvider.swift */; };
@@ -197,7 +197,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				9DEC730E2CAB265100DA649B /* Mapbox in Frameworks */,
-				962862742BDCCAF70073839C /* (null) in Frameworks */,
+				962862742BDCCAF70073839C /* BuildFile in Frameworks */,
 				B3469F859005A4F164D08293 /* libPods-HeliumWallet-HeliumWalletTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -207,7 +207,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				9DEC730B2CAB265100DA649B /* Mapbox in Frameworks */,
-				962862712BDCCAF70073839C /* (null) in Frameworks */,
+				962862712BDCCAF70073839C /* BuildFile in Frameworks */,
 				31B6D29CFC726A9C37946D71 /* libPods-HeliumWallet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -217,7 +217,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				9DEC730C2CAB265100DA649B /* Mapbox in Frameworks */,
-				962862722BDCCAF70073839C /* (null) in Frameworks */,
+				962862722BDCCAF70073839C /* BuildFile in Frameworks */,
 				C4EB4BD0A9AAABC0002181CC /* libPods-OneSignalNotificationServiceExtension.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -227,7 +227,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				9DEC730D2CAB265100DA649B /* Mapbox in Frameworks */,
-				962862732BDCCAF70073839C /* (null) in Frameworks */,
+				962862732BDCCAF70073839C /* BuildFile in Frameworks */,
 				9D7DB3B02850EC14004D9409 /* SwiftUI.framework in Frameworks */,
 				9D7DB3AF2850EC14004D9409 /* WidgetKit.framework in Frameworks */,
 				9DCA365F28E6781D000F2A66 /* Charts in Frameworks */,
@@ -1208,7 +1208,10 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -1269,7 +1272,10 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
 				MTL_ENABLE_DEBUG_INFO = NO;
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1107,27 +1107,8 @@ PODS:
   - react-native-onesignal (5.2.2):
     - OneSignalXCFramework (= 5.2.2)
     - React (< 1.0.0, >= 0.13.0)
-  - react-native-pager-view (6.3.0):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2024.01.01.00)
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Codegen
+  - react-native-pager-view (6.1.2):
     - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-rendererdebug
-    - React-utils
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - Yoga
   - react-native-randombytes (3.6.1):
     - React-Core
   - react-native-safe-area-context (4.10.8):
@@ -1440,7 +1421,7 @@ PODS:
     - React-utils (= 0.74.5)
   - RNBootSplash (6.3.2):
     - React-Core
-  - RNCAsyncStorage (1.23.1):
+  - RNCAsyncStorage (1.18.1):
     - React-Core
   - RNCCheckbox (0.5.17):
     - BEMCheckBox (~> 1.4)
@@ -1495,20 +1476,20 @@ PODS:
     - React
   - RNLocalize (2.2.3):
     - React-Core
-  - rnmapbox-maps (10.1.33):
+  - rnmapbox-maps (10.1.31):
     - MapboxMaps (= 11.8.0)
     - React
     - React-Core
-    - rnmapbox-maps/DynamicLibrary (= 10.1.33)
+    - rnmapbox-maps/DynamicLibrary (= 10.1.31)
     - Turf
-  - rnmapbox-maps/DynamicLibrary (10.1.33):
+  - rnmapbox-maps/DynamicLibrary (10.1.31):
     - MapboxMaps (= 11.8.0)
     - React
     - React-Core
     - Turf
   - RNOS (1.2.6):
     - React
-  - RNPermissions (3.9.2):
+  - RNPermissions (3.9.0):
     - React-Core
   - RNReactNativeSharedGroupPreferences (1.1.24):
     - React
@@ -1568,6 +1549,12 @@ PODS:
     - React
   - Toast (4.0.0)
   - Turf (3.0.0)
+  - VisionCamera (4.5.3):
+    - VisionCamera/Core (= 4.5.3)
+    - VisionCamera/React (= 4.5.3)
+  - VisionCamera/Core (4.5.3)
+  - VisionCamera/React (4.5.3):
+    - React-Core
   - Yoga (0.0.0)
   - ZXingObjC/Core (3.6.9)
   - ZXingObjC/OneD (3.6.9):
@@ -1691,6 +1678,7 @@ DEPENDENCIES:
   - RNSVG (from `../node_modules/react-native-svg`)
   - RNTestFlight (from `../node_modules/react-native-test-flight`)
   - TcpSockets (from `../node_modules/react-native-tcp`)
+  - VisionCamera (from `../node_modules/react-native-vision-camera`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -1934,6 +1922,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-test-flight"
   TcpSockets:
     :path: "../node_modules/react-native-tcp"
+  VisionCamera:
+    :path: "../node_modules/react-native-vision-camera"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -2005,7 +1995,7 @@ SPEC CHECKSUMS:
   react-native-netinfo: 2517ad504b3d303e90d7a431b0fcaef76d207983
   react-native-network-info: d1290ffc0bd0709e11436f5b8d7f605dcc5c4530
   react-native-onesignal: 592184d34780d04ebbea2b9844d5b6088606cb30
-  react-native-pager-view: c1e29e1a6105a02807392ba822ad322447a72f55
+  react-native-pager-view: 54bed894cecebe28cede54c01038d9d1e122de43
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-safe-area-context: b7daa1a8df36095a032dff095a1ea8963cb48371
   react-native-simple-toast: 8ee5d23f0b92b935ab7434cdb65159ce12dfb4b7
@@ -2039,17 +2029,17 @@ SPEC CHECKSUMS:
   React-utils: f242eb7e7889419d979ca0e1c02ccc0ea6e43b29
   ReactCommon: f7da14a8827b72704169a48c929bcde802698361
   RNBootSplash: 3a44c2c3ebfce98254de887ceed22c4941c8c6c5
-  RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
+  RNCAsyncStorage: b90b71f45b8b97be43bc4284e71a6af48ac9f547
   RNCCheckbox: a3ca9978cb0846b981d28da4e9914bd437403d77
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNCMaskedView: da52ec927af4b4c3f3f6b5b5e816a69be62fe642
   RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
   RNGestureHandler: efed690b8493a00b99654043daeb1335276ac4a2
   RNICloudStore: bc6e225811637c09bd1eb055d6cd7448e61cd451
   RNLocalize: a64514b46a01375fdfae9349036b4dc7130333b5
-  rnmapbox-maps: e215d3fe420ef53090d65ecdda5cf8bf4af19c66
+  rnmapbox-maps: bf7989fd36420aabdd12960095a3f84ec298071f
   RNOS: 6f2f9a70895bbbfbdad7196abd952e7b01d45027
-  RNPermissions: 2af759cf053542b2b4b3c4cf9f43874796106f2c
+  RNPermissions: 1d1a8318f659ffd609dd7f81de8a7ecabfb52f10
   RNReactNativeSharedGroupPreferences: 29092869fc2e40d5baca5e15d82fa5c24a668977
   RNReanimated: f4ff116e33e0afc3d127f70efe928847c7c66355
   RNScreens: aa943ad421c3ced3ef5a47ede02b0cbfc43a012e
@@ -2062,6 +2052,7 @@ SPEC CHECKSUMS:
   TcpSockets: 14306fb79f9750ea7d2ddd02d8bed182abb01797
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   Turf: a1604e74adce15c58462c9ae2acdbf049d5be35e
+  VisionCamera: cb84d0d8485b3e67c91b62931d3aa88f49747c92
   Yoga: 950bbfd7e6f04790fdb51149ed51df41f329fcc8
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5