diff --git a/android/app/build.gradle b/android/app/build.gradle index 025b28353..5ac8f983e 100644 --- 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 index 444e0e500..1d95ff122 100644 --- a/app/LoadedApp/LoadedApp.tsx +++ b/app/LoadedApp/LoadedApp.tsx @@ -1189,7 +1189,7 @@ export class LoadedAppClass extends Component reject(), }, ], - { cancelable: false, userInterfaceStyle: 'light' }, + { cancelable: false }, ); }); }; @@ -1243,7 +1243,7 @@ export class LoadingAppClass extends Component = ({ }, { 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 index 47ab2d6cc..8f1286199 100644 --- 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 index d7d9c6cd8..e7351ab60 100644 --- 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 => { diff --git a/app/translations/en.json b/app/translations/en.json index 4cdd82329..a7b7b8d41 100644 --- 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 index a3ca03e16..b55d25664 100644 --- 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 index 5098f8447..dea44d3c7 100644 --- 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 index 9b1d3d9e8..4768969bc 100644 --- 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 index cd941b924..74b930957 100644 --- a/components/AddressBook/components/AbSummaryLine.tsx +++ b/components/AddressBook/components/AbSummaryLine.tsx @@ -79,7 +79,7 @@ const AbSummaryLine: React.FunctionComponent = ({ }, { 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 index 5a4bc759a..00ffb2b92 100644 --- a/components/Components/PriceFetcher.tsx +++ b/components/Components/PriceFetcher.tsx @@ -80,7 +80,7 @@ const PriceFetcher: React.FunctionComponent = ({ 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 index fb5800945..8e8db3ce4 100644 --- a/components/Header/Header.tsx +++ b/components/Header/Header.tsx @@ -424,7 +424,7 @@ const Header: React.FunctionComponent = ({ { 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 index d8ee9506d..ee0bd6872 100644 --- a/components/Messages/components/MessageList.tsx +++ b/components/Messages/components/MessageList.tsx @@ -152,7 +152,7 @@ const MessageList: React.FunctionComponent = ({ .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 index b0d3a578a..6b8edbfe4 100644 --- a/components/Seed/Seed.tsx +++ b/components/Seed/Seed.tsx @@ -167,7 +167,7 @@ const Seed: React.FunctionComponent = ({ }, { 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 index 9dfbaa205..1144da66f 100644 --- a/components/Send/Send.tsx +++ b/components/Send/Send.tsx @@ -1278,7 +1278,7 @@ const Send: React.FunctionComponent = ({ }, { text: translate('cancel') as string, style: 'cancel' }, ], - { cancelable: false, userInterfaceStyle: 'light' }, + { cancelable: false }, ); } }}> @@ -1371,7 +1371,7 @@ const Send: React.FunctionComponent = ({ }, { 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 index c6ebe35ca..195e7d7de 100644 --- 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 index 45e13d15e..e4bc03387 100644 --- a/components/Ufvk/ShowUfvk.tsx +++ b/components/Ufvk/ShowUfvk.tsx @@ -72,7 +72,7 @@ const ShowUfvk: React.FunctionComponent = ({ 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 index 8bc2a983b..5d8ae96e8 100644 --- 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() diff --git a/ios/ZingoMobile.xcodeproj/project.pbxproj b/ios/ZingoMobile.xcodeproj/project.pbxproj index 727ae0781..7bddd1731 100644 --- a/ios/ZingoMobile.xcodeproj/project.pbxproj +++ b/ios/ZingoMobile.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; - 1BF815F58158920218B0B2C5 /* libPods-ZingoMobile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAE910CE97536CFF1E0EC35B /* libPods-ZingoMobile.a */; }; + 1D8EDD3CA2EF2BBAA4532192 /* libPods-ZingoMobile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 710EF587E672BE1EAB50115C /* libPods-ZingoMobile.a */; }; 1F0338192C48782D00A3FC49 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0338182C48782D00A3FC49 /* Constants.swift */; }; 1F03381A2C49575900A3FC49 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0338182C48782D00A3FC49 /* Constants.swift */; }; 1F0893FF2BA4C4380089FD88 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1F0893FE2BA4C4380089FD88 /* PrivacyInfo.xcprivacy */; }; @@ -27,7 +27,7 @@ 1FC1E2172BE443270064963B /* ZingoMobileTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FC1E2162BE443270064963B /* ZingoMobileTest.swift */; }; 1FE8E9AC296B85FC004A256B /* BackgroundTasks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE8E9AB296B85FC004A256B /* BackgroundTasks.framework */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - 86090590A1CEE33E79EBD7D7 /* libPods-ZingoMobile-ZingoMobileTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 86C5C25EDD87B8A50DEA97E0 /* libPods-ZingoMobile-ZingoMobileTests.a */; }; + 8D52D5FE9C2F6AF27E08D93E /* libPods-ZingoMobile-ZingoMobileTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C1E8BEABF0398AE84390D9 /* libPods-ZingoMobile-ZingoMobileTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -43,11 +43,9 @@ /* Begin PBXFileReference section */ 00E356EE1AD99517003FC87E /* ZingoMobileTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ZingoMobileTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 03BD1F8554BA3594B551AD87 /* Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig"; path = "Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* Zingo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Zingo.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ZingoMobile/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ZingoMobile/Info.plist; sourceTree = ""; }; - 1EFBD09D67229102F3391A88 /* Pods-ZingoMobile-ZingoMobileTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZingoMobile-ZingoMobileTests.release.xcconfig"; path = "Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests.release.xcconfig"; sourceTree = ""; }; 1F0338182C48782D00A3FC49 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; 1F0893FE2BA4C4380089FD88 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 1F5569252BBCB4D900F2CD6C /* RPCModule-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RPCModule-Bridging-Header.h"; sourceTree = ""; }; @@ -62,11 +60,13 @@ 1FA935B62BE474CD00117DF5 /* ZingoMobileTest-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ZingoMobileTest-Bridging-Header.h"; sourceTree = ""; }; 1FC1E2162BE443270064963B /* ZingoMobileTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZingoMobileTest.swift; sourceTree = ""; }; 1FE8E9AB296B85FC004A256B /* BackgroundTasks.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BackgroundTasks.framework; path = System/Library/Frameworks/BackgroundTasks.framework; sourceTree = SDKROOT; }; - 585B3655B15433BDD7B45C36 /* Pods-ZingoMobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZingoMobile.debug.xcconfig"; path = "Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile.debug.xcconfig"; sourceTree = ""; }; + 2300F9378F6888F2B352D306 /* Pods-ZingoMobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZingoMobile.debug.xcconfig"; path = "Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile.debug.xcconfig"; sourceTree = ""; }; + 5ED82B2DA0E3FC04E11DE053 /* Pods-ZingoMobile-ZingoMobileTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZingoMobile-ZingoMobileTests.release.xcconfig"; path = "Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests.release.xcconfig"; sourceTree = ""; }; + 710EF587E672BE1EAB50115C /* libPods-ZingoMobile.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ZingoMobile.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ZingoMobile/LaunchScreen.storyboard; sourceTree = ""; }; - 86C5C25EDD87B8A50DEA97E0 /* libPods-ZingoMobile-ZingoMobileTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ZingoMobile-ZingoMobileTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A0EFB1CFD194D312C400A545 /* Pods-ZingoMobile.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZingoMobile.release.xcconfig"; path = "Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile.release.xcconfig"; sourceTree = ""; }; - CAE910CE97536CFF1E0EC35B /* libPods-ZingoMobile.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ZingoMobile.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 84C1E8BEABF0398AE84390D9 /* libPods-ZingoMobile-ZingoMobileTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ZingoMobile-ZingoMobileTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + C9EDB8C151E21F47B87020D3 /* Pods-ZingoMobile.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZingoMobile.release.xcconfig"; path = "Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile.release.xcconfig"; sourceTree = ""; }; + E78EF16A716A833BA581E4C1 /* Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig"; path = "Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -77,7 +77,7 @@ files = ( 1FA935B32BE457B100117DF5 /* SystemConfiguration.framework in Frameworks */, 1FA935B22BE4569D00117DF5 /* libuniffi_zingo.a in Frameworks */, - 86090590A1CEE33E79EBD7D7 /* libPods-ZingoMobile-ZingoMobileTests.a in Frameworks */, + 8D52D5FE9C2F6AF27E08D93E /* libPods-ZingoMobile-ZingoMobileTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -88,7 +88,7 @@ 1FE8E9AC296B85FC004A256B /* BackgroundTasks.framework in Frameworks */, 1F7D321D2B71D44800D2879C /* SystemConfiguration.framework in Frameworks */, 1F8815602BD31176006490E1 /* libuniffi_zingo.a in Frameworks */, - 1BF815F58158920218B0B2C5 /* libPods-ZingoMobile.a in Frameworks */, + 1D8EDD3CA2EF2BBAA4532192 /* libPods-ZingoMobile.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -136,8 +136,8 @@ 1F7D321C2B71D44800D2879C /* SystemConfiguration.framework */, 1FE8E9AB296B85FC004A256B /* BackgroundTasks.framework */, ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - CAE910CE97536CFF1E0EC35B /* libPods-ZingoMobile.a */, - 86C5C25EDD87B8A50DEA97E0 /* libPods-ZingoMobile-ZingoMobileTests.a */, + 710EF587E672BE1EAB50115C /* libPods-ZingoMobile.a */, + 84C1E8BEABF0398AE84390D9 /* libPods-ZingoMobile-ZingoMobileTests.a */, ); name = Frameworks; sourceTree = ""; @@ -179,10 +179,10 @@ 8BB7EBE9935B479E64CBB9A8 /* Pods */ = { isa = PBXGroup; children = ( - 585B3655B15433BDD7B45C36 /* Pods-ZingoMobile.debug.xcconfig */, - A0EFB1CFD194D312C400A545 /* Pods-ZingoMobile.release.xcconfig */, - 03BD1F8554BA3594B551AD87 /* Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig */, - 1EFBD09D67229102F3391A88 /* Pods-ZingoMobile-ZingoMobileTests.release.xcconfig */, + 2300F9378F6888F2B352D306 /* Pods-ZingoMobile.debug.xcconfig */, + C9EDB8C151E21F47B87020D3 /* Pods-ZingoMobile.release.xcconfig */, + E78EF16A716A833BA581E4C1 /* Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig */, + 5ED82B2DA0E3FC04E11DE053 /* Pods-ZingoMobile-ZingoMobileTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -194,12 +194,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "ZingoMobileTests" */; buildPhases = ( - A526B5EB8BA90560386D5342 /* [CP] Check Pods Manifest.lock */, + E5B348545A1D5DFFD52C9057 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - E60DA930995EDB55FC7A5669 /* [CP] Embed Pods Frameworks */, - 9F0CCECDDC0130F50F7D6598 /* [CP] Copy Pods Resources */, + 4066914AC5A4EC685DB7A7BB /* [CP] Embed Pods Frameworks */, + 53FEBB0124E2169596DF07DB /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -215,14 +215,14 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ZingoMobile" */; buildPhases = ( - C56D8E4C929CCAAECAAD225A /* [CP] Check Pods Manifest.lock */, + 5ADB94CDDE911DEC8997BDD5 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - FB14D6F165BA0B65E7D6B792 /* [CP] Embed Pods Frameworks */, - 0C97B7D7BD3ADDF3DC10846A /* [CP] Copy Pods Resources */, + 44B0F2CF79E1E255EB526B03 /* [CP] Embed Pods Frameworks */, + 6D5A742C9332D09645768EFA /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -306,63 +306,58 @@ shellPath = /bin/sh; shellScript = "set -e\n\nexport NODE_BINARY=$(which node)\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; - 0C97B7D7BD3ADDF3DC10846A /* [CP] Copy Pods Resources */ = { + 4066914AC5A4EC685DB7A7BB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 9F0CCECDDC0130F50F7D6598 /* [CP] Copy Pods Resources */ = { + 44B0F2CF79E1E255EB526B03 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - A526B5EB8BA90560386D5342 /* [CP] Check Pods Manifest.lock */ = { + 53FEBB0124E2169596DF07DB /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-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-ZingoMobile-ZingoMobileTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-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-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - C56D8E4C929CCAAECAAD225A /* [CP] Check Pods Manifest.lock */ = { + 5ADB94CDDE911DEC8997BDD5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -384,38 +379,43 @@ 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; }; - E60DA930995EDB55FC7A5669 /* [CP] Embed Pods Frameworks */ = { + 6D5A742C9332D09645768EFA /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZingoMobile-ZingoMobileTests/Pods-ZingoMobile-ZingoMobileTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-resources.sh\"\n"; showEnvVarsInLog = 0; }; - FB14D6F165BA0B65E7D6B792 /* [CP] Embed Pods Frameworks */ = { + E5B348545A1D5DFFD52C9057 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-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-ZingoMobile/Pods-ZingoMobile-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-ZingoMobile-ZingoMobileTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZingoMobile/Pods-ZingoMobile-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; }; FD10A7F022414F080027D42C /* Start Packager */ = { @@ -477,9 +477,8 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 03BD1F8554BA3594B551AD87 /* Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig */; + baseConfigurationReference = E78EF16A716A833BA581E4C1 /* Pods-ZingoMobile-ZingoMobileTests.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; DEVELOPMENT_TEAM = 788KRST4S8; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -513,9 +512,8 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EFBD09D67229102F3391A88 /* Pods-ZingoMobile-ZingoMobileTests.release.xcconfig */; + baseConfigurationReference = 5ED82B2DA0E3FC04E11DE053 /* Pods-ZingoMobile-ZingoMobileTests.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = 788KRST4S8; @@ -546,13 +544,13 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 585B3655B15433BDD7B45C36 /* Pods-ZingoMobile.debug.xcconfig */; + baseConfigurationReference = 2300F9378F6888F2B352D306 /* Pods-ZingoMobile.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements; - CURRENT_PROJECT_VERSION = 217; + CURRENT_PROJECT_VERSION = 218; DEVELOPMENT_TEAM = 788KRST4S8; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -587,13 +585,13 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A0EFB1CFD194D312C400A545 /* Pods-ZingoMobile.release.xcconfig */; + baseConfigurationReference = C9EDB8C151E21F47B87020D3 /* Pods-ZingoMobile.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements; - CURRENT_PROJECT_VERSION = 217; + CURRENT_PROJECT_VERSION = 218; DEVELOPMENT_TEAM = 788KRST4S8; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; @@ -630,6 +628,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CC = ""; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++20"; CLANG_CXX_LIBRARY = "libc++"; @@ -657,6 +656,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + CXX = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -678,6 +678,8 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.5; + LD = ""; + LDPLUSPLUS = ""; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -705,6 +707,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CC = ""; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++20"; CLANG_CXX_LIBRARY = "libc++"; @@ -732,6 +735,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; + CXX = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -749,6 +753,8 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.5; + LD = ""; + LDPLUSPLUS = ""; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", diff --git a/package.json b/package.json index 41d919d78..0a5378f38 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react-native-device-info": "^11.1.0", "react-native-fs": "^2.20.0", "react-native-gesture-handler": "2.20.0", - "react-native-keychain": "^9.0.0", + "react-native-keychain": "^9.2.2", "react-native-localize": "^3.1.0", "react-native-option-menu": "^1.1.3", "react-native-pager-view": "^6.0.1", @@ -79,6 +79,7 @@ "@tsconfig/react-native": "^3.0.5", "@types/i18n-js": "^3.8.3", "@types/jest": "^29.2.4", + "@types/react-native-keychain": "^3.1.0", "@types/lodash": "^4.14.188", "@types/randomcolor": "^0.5.7", "@types/react": "^18.2.6",