fix: IOS RN 0.74 fixes

juanky201271 · Feb 12, 2025 · 9a9e30c · 9a9e30c
1 parent 1688f7c
commit 9a9e30c
Show file tree

Hide file tree

Showing 21 changed files with 94 additions and 86 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -107,7 +107,7 @@ android {
         applicationId 'org.ZingoLabs.Zingo' // Real
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 217 // Real
+        versionCode 218 // Real
         versionName "zingo-1.11.0" // Real
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/app/LoadedApp/LoadedApp.tsx b/app/LoadedApp/LoadedApp.tsx
@@ -1189,7 +1189,7 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
           },
           { text: translate('cancel') as string, style: 'cancel' },
         ],
-        { cancelable: false, userInterfaceStyle: 'light' },
+        { cancelable: false },
       );
     } else if (item === MenuItemEnum.TipZingoLabs) {
       const { translate } = this.state;
@@ -1207,7 +1207,7 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
             style: 'cancel',
           },
         ],
-        { cancelable: false, userInterfaceStyle: 'light' },
+        { cancelable: false },
       );
     } else if (item === MenuItemEnum.AddressBook) {
       this.setState({

diff --git a/app/LoadingApp/LoadingApp.tsx b/app/LoadingApp/LoadingApp.tsx
@@ -720,7 +720,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
             onPress: () => reject(),
           },
         ],
-        { cancelable: false, userInterfaceStyle: 'light' },
+        { cancelable: false },
       );
     });
   };
@@ -1243,7 +1243,7 @@ export class LoadingAppClass extends Component<LoadingAppClassProps, LoadingAppC
           },
           { text: this.props.translate('cancel') as string, style: 'cancel' },
         ],
-        { cancelable: false, userInterfaceStyle: 'light' },
+        { cancelable: false },
       );
     }
   };

diff --git a/app/LoadingApp/components/StartMenu.tsx b/app/LoadingApp/components/StartMenu.tsx
@@ -352,7 +352,7 @@ const StartMenu: React.FunctionComponent<StartMenuProps> = ({
                       },
                       { text: translate('cancel') as string, style: 'cancel' },
                     ],
-                    { cancelable: false, userInterfaceStyle: 'light' },
+                    { cancelable: false },
                   );
                 } else {
                   createNewWallet();

diff --git a/app/createAlert.ts b/app/createAlert.ts
@@ -34,7 +34,7 @@ export const createAlert = async (
             },
             { text: translate('cancel') as string, style: 'cancel' },
           ],
-          { cancelable: false, userInterfaceStyle: 'light' },
+          { cancelable: false },
         );
       } else {
         // no email button

diff --git a/app/recoveryWalletInfo.ts b/app/recoveryWalletInfo.ts
@@ -1,7 +1,7 @@
 import * as Keychain from 'react-native-keychain';
 import { GlobalConst, WalletType } from './AppState';
 
-const options = (biometrics: Keychain.BIOMETRY_TYPE | null): Keychain.Options => {
+const options = (biometrics: Keychain.BIOMETRY_TYPE | null): Keychain.BaseOptions => {
   return {
     service: GlobalConst.serviceKeyChain,
     accessControl: Keychain.ACCESS_CONTROL.BIOMETRY_CURRENT_SET_OR_DEVICE_PASSCODE, // for both
@@ -11,8 +11,8 @@ const options = (biometrics: Keychain.BIOMETRY_TYPE | null): Keychain.Options =>
     // with biometrics in the device -> SECURE HARDWARE
     securityLevel: biometrics ? Keychain.SECURITY_LEVEL.SECURE_HARDWARE : Keychain.SECURITY_LEVEL.SECURE_SOFTWARE,
     // with biometrics in the device -> RSA
-    storage: biometrics ? Keychain.STORAGE_TYPE.RSA : Keychain.STORAGE_TYPE.AES,
-  } as Keychain.Options;
+    storage: biometrics ? Keychain.STORAGE_TYPE.RSA : Keychain.STORAGE_TYPE.AES_GCM,
+  } as Keychain.BaseOptions;
 };
 
 export const saveRecoveryWalletInfo = async (keys: WalletType): Promise<void> => {

diff --git a/app/translations/en.json b/app/translations/en.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.11.0 (217)",
+  "version": "zingo-1.11.0 (218)",
   "loading": "loading...",
   "connectingserver": "Connecting to the server...",
   "wait": "Please wait...",

diff --git a/app/translations/es.json b/app/translations/es.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.11.0 (217)",
+  "version": "zingo-1.11.0 (218)",
   "loading": "cargando...",
   "connectingserver": "Conectando con el servidor...",
   "wait": "Por favor espere...",

diff --git a/app/translations/pt.json b/app/translations/pt.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.11.0 (217)",
+  "version": "zingo-1.11.0 (218)",
   "loading": "carregando...",
   "connectingserver": "Conectando-se ao servidor...",
   "wait": "Aguarde um momento...",

diff --git a/app/translations/ru.json b/app/translations/ru.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.11.0 (217)",
+  "version": "zingo-1.11.0 (218)",
   "loading": "загрузка...",
   "connectingserver": "Подключение к серверу...",
   "wait": "Пожалуйста, подождите...",

diff --git a/components/AddressBook/components/AbSummaryLine.tsx b/components/AddressBook/components/AbSummaryLine.tsx
@@ -79,7 +79,7 @@ const AbSummaryLine: React.FunctionComponent<AbSummaryLineProps> = ({
         },
         { text: translate('cancel') as string, style: 'cancel' },
       ],
-      { cancelable: false, userInterfaceStyle: 'light' },
+      { cancelable: false },
     );
   };
 

diff --git a/components/Components/PriceFetcher.tsx b/components/Components/PriceFetcher.tsx
@@ -80,7 +80,7 @@ const PriceFetcher: React.FunctionComponent<PriceFetcherProps> = ({ setZecPrice,
         { text: translate('send.fetch-button') as string, onPress: () => onPressFetch() },
         { text: translate('cancel') as string, style: 'cancel' },
       ],
-      { cancelable: false, userInterfaceStyle: 'light' },
+      { cancelable: false },
     );
   };
 

diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx
@@ -424,7 +424,7 @@ const Header: React.FunctionComponent<HeaderProps> = ({
         { text: translate('confirm') as string, onPress: () => shieldFunds() },
         { text: translate('cancel') as string, style: 'cancel' },
       ],
-      { cancelable: false, userInterfaceStyle: 'light' },
+      { cancelable: false },
     );
   };
 

diff --git a/components/Messages/components/MessageList.tsx b/components/Messages/components/MessageList.tsx
@@ -152,7 +152,7 @@ const MessageList: React.FunctionComponent<MessageListProps> = ({
         .trim()
         .split(' ')
         .filter((w: string) => !!w);
-      console.log(words);
+      //console.log(words);
       if (words[0]) {
         initials = words[0].charAt(0).toUpperCase();
       }

diff --git a/components/Seed/Seed.tsx b/components/Seed/Seed.tsx
@@ -167,7 +167,7 @@ const Seed: React.FunctionComponent<SeedProps> = ({
         },
         { text: translate('cancel') as string, onPress: () => onClickCancel(), style: 'cancel' },
       ],
-      { cancelable: false, userInterfaceStyle: 'light' },
+      { cancelable: false },
     );
   };
 

diff --git a/components/Send/Send.tsx b/components/Send/Send.tsx
@@ -1278,7 +1278,7 @@ const Send: React.FunctionComponent<SendProps> = ({
                             },
                             { text: translate('cancel') as string, style: 'cancel' },
                           ],
-                          { cancelable: false, userInterfaceStyle: 'light' },
+                          { cancelable: false },
                         );
                       }
                     }}>
@@ -1371,7 +1371,7 @@ const Send: React.FunctionComponent<SendProps> = ({
                                 },
                                 { text: translate('cancel') as string, style: 'cancel' },
                               ],
-                              { cancelable: false, userInterfaceStyle: 'light' },
+                              { cancelable: false },
                             );
                           }
                         }}>

diff --git a/components/Send/components/ShowAddressAlertAsync.ts b/components/Send/components/ShowAddressAlertAsync.ts
@@ -17,7 +17,7 @@ const ShowAddressAlertAsync = (translate: (key: string) => TranslateType): Promi
           onPress: () => reject(),
         },
       ],
-      { cancelable: false, userInterfaceStyle: 'light' },
+      { cancelable: false },
     );
   });
 };

diff --git a/components/Ufvk/ShowUfvk.tsx b/components/Ufvk/ShowUfvk.tsx
@@ -72,7 +72,7 @@ const ShowUfvk: React.FunctionComponent<ShowUfvkProps> = ({ onClickOK, onClickCa
         },
         { text: translate('cancel') as string, onPress: () => onClickCancel(), style: 'cancel' },
       ],
-      { cancelable: false, userInterfaceStyle: 'light' },
+      { cancelable: false },
     );
   };
 

diff --git a/ios/AppDelegate.swift b/ios/AppDelegate.swift
@@ -8,6 +8,7 @@
 import Foundation
 import UIKit
 import BackgroundTasks
+import Network
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -24,7 +25,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     let jsCodeLocation: URL
 
-    jsCodeLocation = RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index", fallbackExtension: nil)
+    jsCodeLocation = RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index", fallbackExtension: nil)!
     //jsCodeLocation = Bundle.main.url(forResource: "main", withExtension: "jsbundle")!
     let rootView = RCTRootView(bundleURL: jsCodeLocation, moduleName: "Zingo", initialProperties: nil, launchOptions: launchOptions)
     let rootViewController = UIViewController()
-Original file line number
+Diff line change
@@ Expand Up @@
             },
             { text: translate('cancel') as string, style: 'cancel' },
           ],
-          { cancelable: false, userInterfaceStyle: 'light' },
+          { cancelable: false },
         );
       };
@@ Expand Down @@