fix(ui): remove exit & restart buttons

synonymdev · Jul 23, 2024 · 92b4b97 · 92b4b97
1 parent 196dcae
commit 92b4b97
Show file tree

Hide file tree

Showing 15 changed files with 105 additions and 282 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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