iOS working

Author: swansontec

ios/Podfile

@@ -11,7 +11,7 @@ node_require('react-native/scripts/react_native_pods.rb')
 node_require('react-native-permissions/scripts/setup.rb')
 
 # Edge addition for Expo:
-require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
+# require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
 
 # Edge addition to disable advertising ID collection:
 $RNFirebaseAnalyticsWithoutAdIdSupport = true
@@ -47,14 +47,14 @@ end
 
 target 'edge' do
   # Edge addition for Expo:
-  use_expo_modules!
-  post_integrate do |installer|
-    begin
-      expo_patch_react_imports!(installer)
-    rescue => e
-      Pod::UI.warn e
-    end
-  end
+  # use_expo_modules!
+  # post_integrate do |installer|
+  #   begin
+  #     expo_patch_react_imports!(installer)
+  #   rescue => e
+  #     Pod::UI.warn e
+  #   end
+  # end
 
   config = use_native_modules!
   use_react_native!(

ios/Podfile.lock

@@ -61,36 +61,6 @@ PODS:
     - React-Core
   - edge-login-ui-rn (3.7.2):
     - React-Core
-  - EXConstants (15.4.5):
-    - ExpoModulesCore
-  - EXFont (11.10.3):
-    - ExpoModulesCore
-  - Expo (50.0.14):
-    - ExpoModulesCore
-  - ExpoFileSystem (16.0.8):
-    - ExpoModulesCore
-  - ExpoKeepAwake (12.8.2):
-    - ExpoModulesCore
-  - ExpoModulesCore (1.11.12):
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Codegen
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTAppDelegate
-    - React-RCTFabric
-    - React-rendererdebug
-    - React-utils
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - Yoga
   - FBLazyVector (0.73.6)
   - Firebase/AnalyticsWithoutAdIdSupport (8.15.0):
     - Firebase/CoreOnly
@@ -187,8 +157,6 @@ PODS:
   - hermes-engine (0.73.6):
     - hermes-engine/Pre-built (= 0.73.6)
   - hermes-engine/Pre-built (0.73.6)
-  - ImageColors (2.4.0):
-    - ExpoModulesCore
   - libevent (2.1.12)
   - libwebp (1.2.1):
     - libwebp/demux (= 1.2.1)
@@ -1918,16 +1886,9 @@ DEPENDENCIES:
   - edge-currency-accountbased (from `../node_modules/edge-currency-accountbased`)
   - edge-exchange-plugins (from `../node_modules/edge-exchange-plugins`)
   - edge-login-ui-rn (from `../node_modules/edge-login-ui-rn`)
-  - EXConstants (from `../node_modules/expo-constants/ios`)
-  - EXFont (from `../node_modules/expo-font/ios`)
-  - Expo (from `../node_modules/expo`)
-  - ExpoFileSystem (from `../node_modules/expo-file-system/ios`)
-  - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
-  - ExpoModulesCore (from `../node_modules/expo-modules-core`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
-  - ImageColors (from `../node_modules/react-native-image-colors/ios`)
   - libevent (~> 2.1.12)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -2093,27 +2054,13 @@ EXTERNAL SOURCES:
     :path: "../node_modules/edge-exchange-plugins"
   edge-login-ui-rn:
     :path: "../node_modules/edge-login-ui-rn"
-  EXConstants:
-    :path: "../node_modules/expo-constants/ios"
-  EXFont:
-    :path: "../node_modules/expo-font/ios"
-  Expo:
-    :path: "../node_modules/expo"
-  ExpoFileSystem:
-    :path: "../node_modules/expo-file-system/ios"
-  ExpoKeepAwake:
-    :path: "../node_modules/expo-keep-awake/ios"
-  ExpoModulesCore:
-    :path: "../node_modules/expo-modules-core"
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   glog:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
   hermes-engine:
     :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
     :tag: hermes-2024-02-20-RNv0.73.5-18f99ace4213052c5e7cdbcd39ee9766cd5df7e4
-  ImageColors:
-    :path: "../node_modules/react-native-image-colors/ios"
   RCT-Folly:
     :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -2313,12 +2260,6 @@ SPEC CHECKSUMS:
   edge-currency-accountbased: c64f86534b11c093f417cc58c56118b3e2bc3405
   edge-exchange-plugins: b826d2e1a4b19e34eea2f737fabdb0951fcbce20
   edge-login-ui-rn: f0887abbc2dcaf65a56ddd40263b724194ce4179
-  EXConstants: 988aa430ca0f76b43cd46b66e7fae3287f9cc2fc
-  EXFont: f20669cb266ef48b004f1eb1f2b20db96cd1df9f
-  Expo: e01a77c6fa4bc80a6d1bb949cda1d12d21044abd
-  ExpoFileSystem: eecaf6796aed0f4dd20042dc2ca2cac6c4bc1185
-  ExpoKeepAwake: 0f5cad99603a3268e50af9a6eb8b76d0d9ac956c
-  ExpoModulesCore: 5ba70816562a205894391952a4997b18d5d777b0
   FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
   Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
   FirebaseABTesting: 10cbce8db9985ae2e3847ea44e9947dd18f94e10
@@ -2335,7 +2276,6 @@ SPEC CHECKSUMS:
   GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
   gRPC-Swift: 74adcaaa62ac5e0a018938840328cb1fdfb09e7b
   hermes-engine: 9cecf9953a681df7556b8cc9c74905de8f3293c0
-  ImageColors: 88be684570585c07ae2750bff34eb7b78bfc53b4
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
@@ -2452,6 +2392,6 @@ SPEC CHECKSUMS:
   ZIPFoundation: b1f0de4eed33e74a676f76e12559ab6b75990197
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 03f6685399abca74db3b218f6fe2e64309a56fff
+PODFILE CHECKSUM: 8bfdeb5ce7b1cbf3183f55d4d017f689b6cab44f
 
 COCOAPODS: 1.15.2

ios/edge.xcodeproj/project.pbxproj

@@ -39,12 +39,10 @@
 		3D5BD9CE2A4D27C400590088 /* SourceSansPro-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3D5BD9B02A4D277B00590088 /* SourceSansPro-Bold.ttf */; };
 		3D5BD9CF2A4D27F300590088 /* custom.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3D5BD9AD2A4D277B00590088 /* custom.ttf */; };
 		3DB299A62BCEF2A600D867B0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3DB299A52BCEF2A600D867B0 /* PrivacyInfo.xcprivacy */; };
-		812B284944A10A722B22763D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08ADAD14914ABC9FD7D54456 /* ExpoModulesProvider.swift */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		08ADAD14914ABC9FD7D54456 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-edge/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* Edge.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Edge.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = edge/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = edge/AppDelegate.mm; sourceTree = "<group>"; };
@@ -155,14 +153,6 @@
 			name = Resources;
 			sourceTree = "<group>";
 		};
-		61D03668B43B6EE95C40034D /* ExpoModulesProviders */ = {
-			isa = PBXGroup;
-			children = (
-				DBEBA59143036B1EE984A6FC /* edge */,
-			);
-			name = ExpoModulesProviders;
-			sourceTree = "<group>";
-		};
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
@@ -182,7 +172,6 @@
 				BBD78D7AC51CEA395F1C20DB /* Pods */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 				3D5BD98C2A4D249A00590088 /* Resources */,
-				61D03668B43B6EE95C40034D /* ExpoModulesProviders */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -207,14 +196,6 @@
 			path = Pods;
 			sourceTree = "<group>";
 		};
-		DBEBA59143036B1EE984A6FC /* edge */ = {
-			isa = PBXGroup;
-			children = (
-				08ADAD14914ABC9FD7D54456 /* ExpoModulesProvider.swift */,
-			);
-			name = edge;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -224,7 +205,6 @@
 			buildPhases = (
 				C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */,
 				FD10A7F022414F080027D42C /* Start Packager */,
-				0648866DE23523201A6698B1 /* [Expo] Configure project */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
@@ -345,25 +325,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-edge/Pods-edge-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		0648866DE23523201A6698B1 /* [Expo] Configure project */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "[Expo] Configure project";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-edge/expo-configure-project.sh\"\n";
-		};
 		18D5C87BF6BD4974A24F472D /* Upload source maps to Bugsnag */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -461,7 +422,6 @@
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 				3D5BD9882A4CEFC700590088 /* Base58.swift in Sources */,
 				3D5BD9862A4CEFB900590088 /* EdgeCore.swift in Sources */,
-				812B284944A10A722B22763D /* ExpoModulesProvider.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/edge/AppDelegate.h

@@ -1,7 +1,7 @@
 #import <RCTAppDelegate.h>
-#import <Expo/Expo.h>
+// #import <Expo/Expo.h>
 #import <UIKit/UIKit.h>
 
-@interface AppDelegate : EXAppDelegateWrapper
+@interface AppDelegate : RCTAppDelegate
 
 @end

ios/edge/AppDelegate.mm

@@ -5,7 +5,6 @@
 #import <React/RCTRootView.h>
 
 // Edge additions:
-#import "ExpoModulesCore-Swift.h"
 #import "Edge-Swift.h"
 // #import "RNBootSplash.h"
 #import <Bugsnag/Bugsnag.h>

package.json

@@ -109,7 +109,6 @@
     "edge-info-server": "^2.1.0",
     "edge-login-ui-rn": "^3.7.2",
     "ethers": "^5.7.2",
-    "expo": "^50.0.0",
     "jsrsasign": "^11.1.0",
     "paraswap": "^5.2.0",
     "posthog-js": "^1.88.1",
@@ -134,7 +133,6 @@
     "react-native-gesture-handler": "^2.16.0",
     "react-native-get-random-values": "^1.9.0",
     "react-native-haptic-feedback": "^1.14.0",
-    "react-native-image-colors": "^2.4.0",
     "react-native-image-picker": "^5.6.0",
     "react-native-in-app-review": "^4.3.3",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",

patches/@react-native-community+datetimepicker+7.7.0.patch

@@ -0,0 +1,41 @@
+diff --git a/node_modules/@react-native-community/datetimepicker/ios/fabric/cpp/react/renderer/components/RNDateTimePicker/ComponentDescriptors.h b/node_modules/@react-native-community/datetimepicker/ios/fabric/cpp/react/renderer/components/RNDateTimePicker/ComponentDescriptors.h
+index 4a1a8e2..91aeb9d 100644
+--- a/node_modules/@react-native-community/datetimepicker/ios/fabric/cpp/react/renderer/components/RNDateTimePicker/ComponentDescriptors.h
++++ b/node_modules/@react-native-community/datetimepicker/ios/fabric/cpp/react/renderer/components/RNDateTimePicker/ComponentDescriptors.h
+@@ -18,21 +18,21 @@ class RNDateTimePickerComponentDescriptor final : public ConcreteComponentDescri
+   public:
+     using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+ 
+-    void adopt(ShadowNode::Unshared const &shadowNode) const override {
+-      react_native_assert(std::dynamic_pointer_cast<RNDateTimePickerShadowNode>(shadowNode));
+-      auto pickerShadowNode = std::static_pointer_cast<RNDateTimePickerShadowNode>(shadowNode);
+-
+-      react_native_assert(
+-        std::dynamic_pointer_cast<YogaLayoutableShadowNode>(pickerShadowNode));
+-      auto layoutableShadowNode =
+-        std::static_pointer_cast<YogaLayoutableShadowNode>(pickerShadowNode);
+-
+-      auto state = std::static_pointer_cast<const RNDateTimePickerShadowNode::ConcreteState>(shadowNode->getState());
+-      auto stateData = state->getData();
+-        
+-      if(stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
+-        layoutableShadowNode->setSize(Size{stateData.frameSize.width, stateData.frameSize.height});
+-      }
++    void adopt(ShadowNode &shadowNode) const override {
++//      react_native_assert(std::dynamic_pointer_cast<RNDateTimePickerShadowNode>(shadowNode));
++//      auto pickerShadowNode = std::static_pointer_cast<RNDateTimePickerShadowNode>(shadowNode);
++//
++//      react_native_assert(
++//        std::dynamic_pointer_cast<YogaLayoutableShadowNode>(pickerShadowNode));
++//      auto layoutableShadowNode =
++//        std::static_pointer_cast<YogaLayoutableShadowNode>(pickerShadowNode);
++//
++//      auto state = std::static_pointer_cast<const RNDateTimePickerShadowNode::ConcreteState>(shadowNode->getState());
++//      auto stateData = state->getData();
++//        
++//      if(stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
++//        layoutableShadowNode->setSize(Size{stateData.frameSize.width, stateData.frameSize.height});
++//      }
+ 
+       ConcreteComponentDescriptor::adopt(shadowNode);
+     }

react-native.config.js

@@ -9,11 +9,14 @@ module.exports = {
   project: {
     android: {
       unstable_reactLegacyComponentNames: [
+        'EdgeCoreWebView'
         // list of conponents that needs to be wrapped by the interop layer
       ]
     },
     ios: {
       unstable_reactLegacyComponentNames: [
+        'BVLinearGradient',
+        'EdgeCoreWebView'
         // list of conponents that needs to be wrapped by the interop layer
       ]
     }

src/components/Main.tsx

@@ -3,7 +3,7 @@ import { createDrawerNavigator } from '@react-navigation/drawer'
 import { DefaultTheme, NavigationContainer, useNavigation } from '@react-navigation/native'
 import { createStackNavigator, StackNavigationOptions } from '@react-navigation/stack'
 import * as React from 'react'
-import { Platform } from 'react-native'
+import { Platform, Text, View } from 'react-native'
 
 import { getDeviceSettings } from '../actions/DeviceSettingsActions'
 import { logoutRequest } from '../actions/LoginActions'
@@ -274,20 +274,33 @@ export const Main = () => {
     'setLegacyLanding'
   )
 
+  // return (
+  //   <NavigationContainer theme={reactNavigationTheme}>
+  //     <Stack.Navigator
+  //       initialRouteName="login"
+  //       screenOptions={{
+  //         headerShown: false
+  //       }}
+  //     >
+  //       <Stack.Screen name="login" component={Demo} />
+  //     </Stack.Navigator>
+  //   </NavigationContainer>
+  // )
+
   return (
     <>
       {experimentConfig == null ? (
         <LoadingSplashScreen />
       ) : (
         <NavigationContainer theme={reactNavigationTheme}>
           <Stack.Navigator
-            initialRouteName={ENV.USE_WELCOME_SCREENS ? 'gettingStarted' : 'login'}
+            initialRouteName="login"
             screenOptions={{
               headerShown: false
             }}
           >
             <Stack.Screen name="edgeApp" component={EdgeApp} />
-            <Stack.Screen name="gettingStarted" component={GettingStartedScene} initialParams={{ experimentConfig }} />
+            <Stack.Screen name="gettingStarted" component={Demo} initialParams={{ experimentConfig }} />
             <Stack.Screen name="login" component={LoginScene} initialParams={{ experimentConfig }} options={{ animationEnabled: hasInitialScenesLoaded }} />
           </Stack.Navigator>
         </NavigationContainer>
@@ -296,6 +309,14 @@ export const Main = () => {
   )
 }
 
+const Demo = () => {
+  return (
+    <View>
+      <Text style={{ color: 'red' }}>"We have a core"</Text>
+    </View>
+  )
+}
+
 const EdgeApp = () => {
   const backPressedOnce = React.useRef(false)
   const account = useSelector(state => state.core.account)