diff --git a/e2e/backup.e2e.js b/e2e/backup.e2e.js index efc70a20e..ae5390bc3 100644 --- a/e2e/backup.e2e.js +++ b/e2e/backup.e2e.js @@ -122,11 +122,14 @@ d('Backup', () => { await element(by.id('NavigationClose')).atIndex(0).tap(); await sleep(5000); // make sure everything is saved to cloud storage TODO: improve this - console.info('seed: ', seed); - // restore wallet - await device.launchApp({ delete: true }); + // WIPE APP AND RESTORE FROM SEED + await element(by.id('Settings')).tap(); + await element(by.id('BackupSettings')).tap(); + await element(by.id('ResetAndRestore')).tap(); + await element(by.id('ResetButton')).tap(); + await element(by.id('DialogConfirm')).tap(); await waitFor(element(by.id('Check1'))).toBeVisible(); await element(by.id('Check1')).tap(); diff --git a/e2e/lightning.e2e.js b/e2e/lightning.e2e.js index 48c00eb97..9f5ff0140 100644 --- a/e2e/lightning.e2e.js +++ b/e2e/lightning.e2e.js @@ -353,8 +353,12 @@ d('Lightning', () => { await sleep(5000); // make sure everything is saved to cloud storage TODO: improve this console.info('seed: ', seed); - // restore wallet - await device.launchApp({ delete: true }); + // WIPE APP AND RESTORE FROM SEED + await element(by.id('Settings')).tap(); + await element(by.id('BackupSettings')).tap(); + await element(by.id('ResetAndRestore')).tap(); + await element(by.id('ResetButton')).tap(); + await element(by.id('DialogConfirm')).tap(); await waitFor(element(by.id('Check1'))).toBeVisible(); await element(by.id('Check1')).tap(); diff --git a/e2e/onboarding.e2e.js b/e2e/onboarding.e2e.js index f4abf294d..3d4f9c679 100644 --- a/e2e/onboarding.e2e.js +++ b/e2e/onboarding.e2e.js @@ -67,16 +67,21 @@ d('Onboarding', () => { await element(by.id('NavigationClose')).atIndex(0).tap(); console.info('seed: ', seed); - // get receing address + // get receiving address await element(by.id('Receive')).tap(); await waitFor(element(by.id('QRCode'))) .toBeVisible() .withTimeout(30000); const { label: address1 } = await element(by.id('QRCode')).getAttributes(); console.info('address', address1); + await element(by.id('ReceiveSlider')).swipe('down'); // Close Receive sheet - // wipe and restore wallet - await device.launchApp({ delete: true }); + // WIPE APP AND RESTORE FROM SEED + await element(by.id('Settings')).tap(); + await element(by.id('BackupSettings')).tap(); + await element(by.id('ResetAndRestore')).tap(); + await element(by.id('ResetButton')).tap(); + await element(by.id('DialogConfirm')).tap(); await waitFor(element(by.id('Check1'))).toBeVisible(); await element(by.id('Check1')).tap(); @@ -107,7 +112,7 @@ d('Onboarding', () => { } catch (e) {} } - // get receing address + // get receiving address await element(by.id('Receive')).tap(); await waitFor(element(by.id('QRCode'))) .toBeVisible() diff --git a/e2e/settings.e2e.js b/e2e/settings.e2e.js index 1f0782e17..f1b42e6f8 100644 --- a/e2e/settings.e2e.js +++ b/e2e/settings.e2e.js @@ -640,7 +640,6 @@ d('Settings', () => { } await element(by.id('TriggerRenderError')).tap(); - await expect(element(by.id('ErrorClose'))).toBeVisible(); await expect(element(by.id('ErrorReport'))).toBeVisible(); markComplete('settings-dev'); diff --git a/e2e/slashtags.e2e.js b/e2e/slashtags.e2e.js index 955b321bd..7b83fef21 100644 --- a/e2e/slashtags.e2e.js +++ b/e2e/slashtags.e2e.js @@ -218,9 +218,14 @@ d('Profile and Contacts', () => { ).getAttributes(); await element(by.id('SeedContaider')).swipe('down'); console.info('seed: ', seed); + await element(by.id('NavigationClose')).atIndex(0).tap(); - // WIPE APP AND RESTORE FROM THE SEED - await device.launchApp({ delete: true }); + // WIPE APP AND RESTORE FROM SEED + await element(by.id('Settings')).tap(); + await element(by.id('BackupSettings')).tap(); + await element(by.id('ResetAndRestore')).tap(); + await element(by.id('ResetButton')).tap(); + await element(by.id('DialogConfirm')).tap(); await waitFor(element(by.id('Check1'))).toBeVisible(); await element(by.id('Check1')).tap(); diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5caa94b49..0238b4ebc 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1100,8 +1100,6 @@ PODS: - Yoga - react-native-randombytes (3.6.1): - React-Core - - react-native-restart (0.0.27): - - React-Core - react-native-safe-area-context (4.10.1): - React-Core - react-native-skia (1.2.1): @@ -1365,8 +1363,6 @@ PODS: - React-Core - RNDeviceInfo (11.1.0): - React-Core - - RNExitApp (2.0.0): - - React-Core - RNFS (2.20.0): - React-Core - RNGestureHandler (2.15.0): @@ -1530,7 +1526,6 @@ DEPENDENCIES: - react-native-quick-base64 (from `../node_modules/react-native-quick-base64`) - react-native-quick-crypto (from `../node_modules/react-native-quick-crypto`) - react-native-randombytes (from `../node_modules/react-native-randombytes`) - - react-native-restart (from `../node_modules/react-native-restart`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - "react-native-skia (from `../node_modules/@shopify/react-native-skia`)" - react-native-tcp-socket (from `../node_modules/react-native-tcp-socket`) @@ -1560,7 +1555,6 @@ DEPENDENCIES: - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`) - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)" - RNDeviceInfo (from `../node_modules/react-native-device-info`) - - RNExitApp (from `../node_modules/react-native-exit-app`) - RNFS (from `../node_modules/react-native-fs`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNKeychain (from `../node_modules/react-native-keychain`) @@ -1672,8 +1666,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-quick-crypto" react-native-randombytes: :path: "../node_modules/react-native-randombytes" - react-native-restart: - :path: "../node_modules/react-native-restart" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" react-native-skia: @@ -1732,8 +1724,6 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-clipboard/clipboard" RNDeviceInfo: :path: "../node_modules/react-native-device-info" - RNExitApp: - :path: "../node_modules/react-native-exit-app" RNFS: :path: "../node_modules/react-native-fs" RNGestureHandler: @@ -1812,7 +1802,6 @@ SPEC CHECKSUMS: react-native-quick-base64: a74c4b2607b9de016877a8edb776b6ac59785809 react-native-quick-crypto: d3457afaa680f961c7bcf6c382329aafe4abddcd react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846 - react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162 react-native-safe-area-context: dcab599c527c2d7de2d76507a523d20a0b83823d react-native-skia: 4db83b2d44c0869de99b7bd00cf55b1235215224 react-native-tcp-socket: e724380c910c2e704816ec817ed28f1342246ff7 @@ -1842,7 +1831,6 @@ SPEC CHECKSUMS: ReactNativeCameraKit: 71343efc1256720184ce980f164c7eedb78d5c16 RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37 RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e - RNExitApp: 00036cabe7bacbb413d276d5520bf74ba39afa6a RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNGestureHandler: 9b113eb9b7a4cbe66e1dbf4d9914281863ee0703 RNKeychain: bfe3d12bf4620fe488771c414530bf16e88f3678 diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj index 997dda712..00827ca45 100644 --- a/ios/bitkit.xcodeproj/project.pbxproj +++ b/ios/bitkit.xcodeproj/project.pbxproj @@ -8,11 +8,12 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* bitkitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* bitkitTests.m */; }; + 1128A74F810460A15D518CEE /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D360457DC974E8A0F4E43907 /* libPods-bitkit.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 17074219BB5847259EAFC7A6 /* InterTight-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3815D562618543E7A9BC191E /* InterTight-Black.ttf */; }; - 3347C35551B67FCCE8B1773A /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ECB7043E13535BC5EF50F75 /* libPods-bitkit-bitkitTests.a */; }; + 27443CEDF676F14FB66044F4 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4424C2BA306B2916F2FA8E45 /* libPods-bitkit-bitkitTests.a */; }; 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 */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; @@ -20,7 +21,6 @@ 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 */; }; - C338F5BD2B51C01DE6D1DAD4 /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D61AF6BF24D299A178B8DC7 /* libPods-bitkit.a */; }; E2F35FC226645CE623C61C03 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 919FE2A2B4A7605C9F606896 /* PrivacyInfo.xcprivacy */; }; /* End PBXBuildFile section */ @@ -45,19 +45,19 @@ 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 = ""; }; - 1ECB7043E13535BC5EF50F75 /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; + 4424C2BA306B2916F2FA8E45 /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; - 5FAC55534CCBD13AEE03B0C0 /* 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 = ""; }; - 6D61AF6BF24D299A178B8DC7 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = bitkit/LaunchScreen.storyboard; sourceTree = ""; }; 919FE2A2B4A7605C9F606896 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = bitkit/PrivacyInfo.xcprivacy; sourceTree = ""; }; + 9C584811AA5E910F4EC6755B /* 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 = ""; }; 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 = ""; }; - ACADC3C1A08726B90E50E93B /* 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 = ""; }; - C786E233D7BE548DB0912279 /* 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 = ""; }; - C9739B066032F9D4ED1C3E75 /* 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 = ""; }; + A7D65820DBAD0E15491DECC4 /* 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 = ""; }; + BB9B9E28D7D3816B27E41F6B /* 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 = ""; }; 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 = ""; }; + CDE0D96A37941A77D800D9CD /* 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 = ""; }; + D360457DC974E8A0F4E43907 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; 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 = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; @@ -68,7 +68,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3347C35551B67FCCE8B1773A /* libPods-bitkit-bitkitTests.a in Frameworks */, + 27443CEDF676F14FB66044F4 /* libPods-bitkit-bitkitTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,7 +76,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C338F5BD2B51C01DE6D1DAD4 /* libPods-bitkit.a in Frameworks */, + 1128A74F810460A15D518CEE /* libPods-bitkit.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -119,8 +119,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 6D61AF6BF24D299A178B8DC7 /* libPods-bitkit.a */, - 1ECB7043E13535BC5EF50F75 /* libPods-bitkit-bitkitTests.a */, + D360457DC974E8A0F4E43907 /* libPods-bitkit.a */, + 4424C2BA306B2916F2FA8E45 /* libPods-bitkit-bitkitTests.a */, ); name = Frameworks; sourceTree = ""; @@ -183,10 +183,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 5FAC55534CCBD13AEE03B0C0 /* Pods-bitkit.debug.xcconfig */, - ACADC3C1A08726B90E50E93B /* Pods-bitkit.release.xcconfig */, - C786E233D7BE548DB0912279 /* Pods-bitkit-bitkitTests.debug.xcconfig */, - C9739B066032F9D4ED1C3E75 /* Pods-bitkit-bitkitTests.release.xcconfig */, + BB9B9E28D7D3816B27E41F6B /* Pods-bitkit.debug.xcconfig */, + A7D65820DBAD0E15491DECC4 /* Pods-bitkit.release.xcconfig */, + CDE0D96A37941A77D800D9CD /* Pods-bitkit-bitkitTests.debug.xcconfig */, + 9C584811AA5E910F4EC6755B /* Pods-bitkit-bitkitTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -198,12 +198,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "bitkitTests" */; buildPhases = ( - 94E14D47A5E5C3983F72D42D /* [CP] Check Pods Manifest.lock */, + 3565857A8CD444C1D9E359C5 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 663D56031BFDD099E66BA30C /* [CP] Embed Pods Frameworks */, - 1135523BAD784B7706A7E30B /* [CP] Copy Pods Resources */, + 72A1213F8A46844BA6B31376 /* [CP] Embed Pods Frameworks */, + 6271654A3527AFC57481F4EE /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -219,13 +219,13 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "bitkit" */; buildPhases = ( - 2C58267AA9B06372BC9B8360 /* [CP] Check Pods Manifest.lock */, + E05FC1A6993D453082A5B11C /* [CP] Check Pods Manifest.lock */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - 06A8EBFCE2918A4207F014C0 /* [CP] Embed Pods Frameworks */, - 95CD050044FCD8EA1968A908 /* [CP] Copy Pods Resources */, + B55008F98B1037F11CA9BE46 /* [CP] Embed Pods Frameworks */, + 1562EFFD35F59FA5026C4105 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -316,63 +316,63 @@ 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"; }; - 06A8EBFCE2918A4207F014C0 /* [CP] Embed Pods Frameworks */ = { + 1562EFFD35F59FA5026C4105 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 1135523BAD784B7706A7E30B /* [CP] Copy Pods Resources */ = { + 3565857A8CD444C1D9E359C5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + 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-resources-${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-resources.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; }; - 2C58267AA9B06372BC9B8360 /* [CP] Check Pods Manifest.lock */ = { + 6271654A3527AFC57481F4EE /* [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-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; }; - 663D56031BFDD099E66BA30C /* [CP] Embed Pods Frameworks */ = { + 72A1213F8A46844BA6B31376 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -389,43 +389,43 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 94E14D47A5E5C3983F72D42D /* [CP] Check Pods Manifest.lock */ = { + B55008F98B1037F11CA9BE46 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-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-bitkitTests-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-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/Pods-bitkit-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 95CD050044FCD8EA1968A908 /* [CP] Copy Pods Resources */ = { + E05FC1A6993D453082A5B11C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + 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-resources-${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-resources.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; }; /* End PBXShellScriptBuildPhase section */ @@ -461,7 +461,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C786E233D7BE548DB0912279 /* Pods-bitkit-bitkitTests.debug.xcconfig */; + baseConfigurationReference = CDE0D96A37941A77D800D9CD /* 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 = C9739B066032F9D4ED1C3E75 /* Pods-bitkit-bitkitTests.release.xcconfig */; + baseConfigurationReference = 9C584811AA5E910F4EC6755B /* 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 = 5FAC55534CCBD13AEE03B0C0 /* Pods-bitkit.debug.xcconfig */; + baseConfigurationReference = BB9B9E28D7D3816B27E41F6B /* 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 = ACADC3C1A08726B90E50E93B /* Pods-bitkit.release.xcconfig */; + baseConfigurationReference = A7D65820DBAD0E15491DECC4 /* Pods-bitkit.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; diff --git a/package.json b/package.json index 4c5f80690..99288ce0d 100644 --- a/package.json +++ b/package.json @@ -78,9 +78,6 @@ "jdenticon": "3.2.0", "lodash": "4.17.21", "lottie-react-native": "6.7.2", - "mime": "3.0.0", - "process": "0.11.10", - "random-access-web-storage": "2.0.0", "react": "18.3.1", "react-i18next": "14.1.0", "react-native": "0.74.3", @@ -90,7 +87,6 @@ "react-native-device-info": "11.1.0", "react-native-dotenv": "3.4.11", "react-native-draggable-flatlist": "4.0.1", - "react-native-exit-app": "2.0.0", "react-native-fetch-api": "3.0.0", "react-native-fs": "2.20.0", "react-native-gesture-handler": "2.15.0", @@ -110,7 +106,6 @@ "react-native-randombytes": "3.6.1", "react-native-reanimated": "3.9.0", "react-native-reanimated-carousel": "3.5.1", - "react-native-restart": "0.0.27", "react-native-safe-area-context": "4.10.1", "react-native-screens": "3.31.1", "react-native-share": "10.2.0", @@ -123,7 +118,6 @@ "redux": "5.0.1", "redux-logger": "3.0.6", "redux-persist": "6.0.0", - "redux-thunk": "3.1.0", "rn-android-keyboard-adjust": "2.1.2", "rn-qr-generator": "1.4.0", "secp256k1": "4.0.3", @@ -149,7 +143,6 @@ "@types/bip21": "^2.0.3", "@types/jest": "^29.5.12", "@types/lodash": "^4.17.0", - "@types/mime": "^3.0.3", "@types/react": "^18.3.3", "@types/react-native-dotenv": "^0.2.2", "@types/redux-logger": "^3.0.13", diff --git a/src/screens/AppError.tsx b/src/screens/AppError.tsx index 2d17131f7..1c5cbff5a 100644 --- a/src/screens/AppError.tsx +++ b/src/screens/AppError.tsx @@ -8,7 +8,6 @@ import { Image, Platform, } from 'react-native'; -import RNExitApp from 'react-native-exit-app'; import { SafeAreaProvider } from 'react-native-safe-area-context'; import SafeAreaInset from '../components/SafeAreaInset'; @@ -20,10 +19,6 @@ const imageSrc = require('../assets/illustrations/cross.png'); type ReactError = Error & ErrorInfo; const AppError = ({ error }: { error: ReactError }): ReactElement => { - const onClose = (): void => { - RNExitApp.exitApp(); - }; - const onSend = async (): Promise => { const message = `Error: ${error.message} \nComponent Stack: ${error.componentStack} @@ -62,13 +57,6 @@ const AppError = ({ error }: { error: ReactError }): ReactElement => { - - Close Bitkit - { - RNExitApp.exitApp(); - }; - return ( @@ -141,15 +136,6 @@ const Recovery = ({ onPress={onWipeApp} /> - - -