feat(ui): update design

synonymdev · Apr 20, 2024 · 4f8244c · 4f8244c
1 parent 7fcd227
commit 4f8244c
Show file tree

Hide file tree

Showing 388 changed files with 5,791 additions and 6,507 deletions.
diff --git a/__tests__/todos.ts b/__tests__/todos.ts
@@ -17,6 +17,10 @@ import {
 	slashtagsProfileTodo,
 	transferPendingTodo,
 	transferClosingChannelTodo,
+	supportTodo,
+	inviteTodo,
+	// fastpayTodo,
+	// discountTodo,
 } from '../src/store/shapes/todos';
 import { createNewWallet } from '../src/utils/startup';
 import { EAvailableNetwork } from '../src/utils/networks';
@@ -41,8 +45,12 @@ describe('Todos selector', () => {
 			backupSeedPhraseTodo,
 			lightningTodo,
 			pinTodo,
-			slashtagsProfileTodo,
 			buyBitcoinTodo,
+			supportTodo,
+			inviteTodo,
+			// fastpayTodo,
+			slashtagsProfileTodo,
+			// discountTodo,
 		]);
 	});
 
@@ -91,9 +99,11 @@ describe('Todos selector', () => {
 			backupSeedPhrase: +new Date(),
 			btFailed: +new Date(),
 			buyBitcoin: +new Date(),
+			invite: +new Date(),
 			lightning: +new Date(),
 			pin: +new Date(),
 			slashtagsProfile: +new Date(),
+			support: +new Date(),
 		};
 
 		assert.deepEqual(todosFullSelector(state), []);
@@ -129,7 +139,7 @@ describe('Todos selector', () => {
 		);
 	});
 
-	it('should return transferPendingTodo for addtional pending transfers to spending', () => {
+	it('should return lightningSettingUpTodo for addtional pending transfers to spending', () => {
 		const state = cloneDeep(s);
 		const channel1 = {
 			channel_id: 'channel1',
@@ -145,7 +155,7 @@ describe('Todos selector', () => {
 			orderId: 'order1',
 		});
 		expect(todosFullSelector(state)).toEqual(
-			expect.arrayContaining([{ ...transferPendingTodo, duration: 10 }]),
+			expect.arrayContaining([lightningSettingUpTodo]),
 		);
 	});
 

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -7,7 +7,6 @@ module.exports = {
 			[
 				'accounts',
 				'activity',
-				'assets',
 				'backup',
 				'boost',
 				'contacts',

diff --git a/e2e/backup.e2e.js b/e2e/backup.e2e.js
@@ -57,7 +57,6 @@ d('Backup', () => {
 		}
 		// recieve bitcoin
 		await element(by.id('Receive')).tap();
-		await element(by.id('UnderstoodButton')).tap();
 		await sleep(1000); // animation
 		// get address from qrcode
 		let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -75,7 +74,7 @@ d('Backup', () => {
 
 		// set tag to new tx
 		const tag = 'testtag';
-		await element(by.id('BitcoinAsset')).tap();
+		await element(by.id('ActivitySavings')).tap();
 		await element(by.id('Activity-1')).tap();
 		await element(by.id('ActivityTag')).tap();
 		await element(by.id('TagInput')).replaceText(tag);
@@ -108,7 +107,7 @@ d('Backup', () => {
 		}
 
 		await sleep(1000); // animation
-		await element(by.id('AssetsTitle')).swipe('up');
+		await element(by.id('TransferButton')).swipe('up');
 
 		// add headlines widget
 		await element(by.id('WidgetsAdd')).tap();
@@ -156,7 +155,7 @@ d('Backup', () => {
 		await waitFor(element(by.id('SkipIntro'))).toBeVisible();
 		await element(by.id('SkipIntro')).tap();
 		await element(by.id('RestoreWallet')).tap();
-		await element(by.id('MultipleButton')).tap();
+		await element(by.id('MultipleDevices-button')).tap();
 		await element(by.id('Word-0')).replaceText(seed);
 		await element(by.id('WordIndex-4')).swipe('up');
 		await element(by.id('RestoreButton')).tap();
@@ -166,11 +165,11 @@ d('Backup', () => {
 			.withTimeout(300000); // 5 min
 		await element(by.id('GetStartedButton')).tap();
 
-		// wait for AssetsTitle to appear and be accessible
+		// wait for SuggestionsLabel to appear and be accessible
 		for (let i = 0; i < 60; i++) {
 			await sleep(1000);
 			try {
-				await element(by.id('AssetsTitle')).tap();
+				await element(by.id('SuggestionsLabel')).tap();
 				break;
 			} catch (e) {}
 		}
@@ -181,7 +180,7 @@ d('Backup', () => {
 		).toHaveText('£');
 
 		// check metadata
-		await element(by.id('BitcoinAsset')).tap();
+		await element(by.id('ActivitySavings')).tap();
 		await element(by.id('Activity-1')).tap();
 		await expect(
 			element(by.id(`Tag-${tag}`).withAncestor(by.id('ActivityTags'))),

diff --git a/e2e/channels.e2e.js b/e2e/channels.e2e.js
@@ -68,7 +68,6 @@ d('LN Channel Onboarding', () => {
 
 			// receive BTC
 			await element(by.id('Receive')).tap();
-			await element(by.id('UnderstoodButton')).tap();
 			// get address from qrcode
 			let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
 			wAddress = wAddress.replace('bitcoin:', '');
@@ -83,7 +82,8 @@ d('LN Channel Onboarding', () => {
 			await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
 
 			await element(by.id('Suggestion-lightning')).tap();
-			await element(by.id('QuickSetupButton')).tap();
+			await element(by.id('LnIntroduction-button')).tap();
+			await element(by.id('FundTransfer')).tap();
 			// set spending balance to zero
 			await element(by.id('SliderHandle')).swipe('left');
 			const button = element(by.id('QuickSetupContinue'));
@@ -140,9 +140,8 @@ d('LN Channel Onboarding', () => {
 			await waitFor(element(by.id('Suggestion-lightningSettingUp')))
 				.toBeVisible()
 				.withTimeout(10000);
-			await element(by.id('BitcoinAsset')).tap();
 			await element(by.id('TransferButton')).tap();
-			await element(by.id('CustomSetupButton')).tap();
+			await element(by.id('QuickSetupAdvanced')).tap();
 
 			// NumberPad
 			await element(by.id('CustomSetupCustomAmount')).tap();

diff --git a/e2e/helpers.js b/e2e/helpers.js
@@ -74,20 +74,20 @@ export const completeOnboarding = async () => {
 	await element(by.id('NewWallet')).tap();
 
 	// wait for wallet to be created
-	await waitFor(element(by.id('ToGetStartedClose'))).toBeVisible();
+	await waitFor(element(by.id('WalletOnboardingClose'))).toBeVisible();
 	await sleep(1000); // take app some time to load
 
 	// try for 3min before fail
 	for (let i = 0; i < 180; i++) {
 		await sleep(1000);
 		try {
-			await element(by.id('ToGetStartedClose')).tap();
+			await element(by.id('WalletOnboardingClose')).tap();
 			await sleep(3000); // wait for redux-persist to save state
 			return;
 		} catch (e) {}
 	}
 
-	throw new Error('Tapping "ToGetStartedClose" timeout');
+	throw new Error('Tapping "WalletOnboardingClose" timeout');
 };
 
 export const launchAndWait = async () => {
@@ -97,13 +97,13 @@ export const launchAndWait = async () => {
 		permissions: { faceid: 'YES', camera: 'YES' },
 	});
 
-	// wait for AssetsTitle to appear and be accessible
-	await waitFor(element(by.id('AssetsTitle')))
+	// wait for SuggestionsLabel to appear and be accessible
+	await waitFor(element(by.id('SuggestionsLabel')))
 		.toBeVisible()
 		.withTimeout(300000); // 5 min
 	for (let i = 0; i < 60; i++) {
 		try {
-			await element(by.id('AssetsTitle')).tap();
+			await element(by.id('SuggestionsLabel')).tap();
 			await sleep(1000);
 			break;
 		} catch (e) {

diff --git a/e2e/lightning.e2e.js b/e2e/lightning.e2e.js
@@ -153,9 +153,6 @@ d('Lightning', () => {
 
 			// send funds to LDK, 0 invoice
 			await element(by.id('Receive')).tap();
-			try {
-				await element(by.id('UnderstoodButton')).tap();
-			} catch (e) {}
 			let { label: invoice1 } = await element(by.id('QRCode')).getAttributes();
 			invoice1 = invoice1.replaceAll(/bitcoin.*=/gi, '').toLowerCase();
 			await lnd.sendPaymentSync({ paymentRequest: invoice1, amt: 50000 });
@@ -253,7 +250,7 @@ d('Lightning', () => {
 				.withTimeout(10000);
 
 			// check tx history
-			await element(by.id('AssetsTitle')).swipe('up');
+			await element(by.id('TransferButton')).swipe('up');
 			await expect(
 				element(by.text('1 000').withAncestor(by.id('ActivityShort-1'))),
 			).toBeVisible();
@@ -360,7 +357,7 @@ d('Lightning', () => {
 			await waitFor(element(by.id('SkipIntro'))).toBeVisible();
 			await element(by.id('SkipIntro')).tap();
 			await element(by.id('RestoreWallet')).tap();
-			await element(by.id('MultipleButton')).tap();
+			await element(by.id('MultipleDevices-button')).tap();
 			await element(by.id('Word-0')).replaceText(seed);
 			await element(by.id('WordIndex-4')).swipe('up');
 			await element(by.id('RestoreButton')).tap();
@@ -370,11 +367,11 @@ d('Lightning', () => {
 				.withTimeout(300000); // 5 min
 			await element(by.id('GetStartedButton')).tap();
 
-			// wait for AssetsTitle to appear and be accessible
+			// wait for SuggestionsLabel to appear and be accessible
 			for (let i = 0; i < 60; i++) {
 				await sleep(1000);
 				try {
-					await element(by.id('AssetsTitle')).tap();
+					await element(by.id('SuggestionsLabel')).tap();
 					break;
 				} catch (e) {}
 			}
@@ -387,7 +384,7 @@ d('Lightning', () => {
 				.withTimeout(10000);
 
 			// check tx history
-			await element(by.id('AssetsTitle')).swipe('up');
+			await element(by.id('TransferButton')).swipe('up');
 			await expect(
 				element(by.text('111').withAncestor(by.id('ActivityShort-2'))),
 			).toBeVisible();

diff --git a/e2e/numberpad.e2e.js b/e2e/numberpad.e2e.js
@@ -3,7 +3,6 @@ import {
 	markComplete,
 	completeOnboarding,
 	launchAndWait,
-	isVisible,
 } from './helpers';
 
 const d = checkComplete(['numberpad-modern', 'numberpad-classic'])
@@ -39,7 +38,6 @@ d('NumberPad', () => {
 		}
 
 		await element(by.id('Receive')).tap();
-		await element(by.id('UnderstoodButton')).tap();
 		await element(by.id('SpecifyInvoiceButton')).tap();
 		await element(by.id('ReceiveNumberPadTextField')).tap();
 
@@ -94,9 +92,6 @@ d('NumberPad', () => {
 		await element(by.id('NavigationClose')).tap();
 
 		await element(by.id('Receive')).tap();
-		if (await isVisible('UnderstoodButton')) {
-			await element(by.id('UnderstoodButton')).tap();
-		}
 		await element(by.id('SpecifyInvoiceButton')).tap();
 		await element(by.id('ReceiveNumberPadTextField')).tap();
 

diff --git a/e2e/onboarding.e2e.js b/e2e/onboarding.e2e.js
@@ -22,13 +22,12 @@ d('Onboarding', () => {
 		await waitFor(element(by.id('Check1'))).toBeVisible();
 		await element(by.id('Check1')).tap();
 		await element(by.id('Check2')).tap();
-		// await element(by.id('TOS')).scrollTo('bottom'); // taking too long
 		await element(by.id('Continue')).tap();
 		await element(by.id('GetStarted')).tap();
+		await element(by.id('Slide0')).swipe('left');
 		await element(by.id('Slide1')).swipe('left');
 		await element(by.id('Slide2')).swipe('left');
 		await element(by.id('Slide3')).swipe('right');
-		await element(by.id('Slide2')).swipe('left');
 		await element(by.id('SkipButton')).tap();
 
 		// create new wallet with passphrase
@@ -38,20 +37,20 @@ d('Onboarding', () => {
 		await element(by.id('CreateNewWallet')).tap();
 
 		// wait for wallet to be created
-		await waitFor(element(by.id('ToGetStartedClose'))).toBeVisible();
+		await waitFor(element(by.id('WalletOnboardingClose'))).toBeVisible();
 		await sleep(1000); // take app some time to load
 
 		// try for 3min before fail
 		for (let i = 0; i < 180; i++) {
 			await sleep(1000);
 			try {
-				await element(by.id('ToGetStartedClose')).tap();
+				await element(by.id('WalletOnboardingClose')).tap();
 				await sleep(3000); // wait for redux-persist to save state
 				break;
 			} catch (e) {}
 
 			if (i === 179) {
-				throw new Error('Tapping "ToGetStartedClose" timeout');
+				throw new Error('Tapping "WalletOnboardingClose" timeout');
 			}
 		}
 
@@ -70,7 +69,6 @@ d('Onboarding', () => {
 
 		// get receing address
 		await element(by.id('Receive')).tap();
-		await element(by.id('UnderstoodButton')).tap();
 		await waitFor(element(by.id('QRCode')))
 			.toBeVisible()
 			.withTimeout(30000);
@@ -87,7 +85,7 @@ d('Onboarding', () => {
 		await waitFor(element(by.id('SkipIntro'))).toBeVisible();
 		await element(by.id('SkipIntro')).tap();
 		await element(by.id('RestoreWallet')).tap();
-		await element(by.id('MultipleButton')).tap();
+		await element(by.id('MultipleDevices-button')).tap();
 		await element(by.id('Word-0')).replaceText(seed);
 		await element(by.id('WordIndex-4')).swipe('up');
 		await element(by.id('AdvancedButton')).tap();
@@ -100,20 +98,17 @@ d('Onboarding', () => {
 			.withTimeout(300000); // 5 min
 		await element(by.id('GetStartedButton')).tap();
 
-		// wait for AssetsTitle to appear and be accessible
+		// wait for SuggestionsLabel to appear and be accessible
 		for (let i = 0; i < 60; i++) {
 			await sleep(1000);
 			try {
-				await element(by.id('AssetsTitle')).tap();
+				await element(by.id('SuggestionsLabel')).tap();
 				break;
 			} catch (e) {}
 		}
 
 		// get receing address
 		await element(by.id('Receive')).tap();
-		try {
-			await element(by.id('UnderstoodButton')).tap();
-		} catch (e) {}
 		await waitFor(element(by.id('QRCode')))
 			.toBeVisible()
 			.withTimeout(30000);

diff --git a/e2e/onchain.e2e.js b/e2e/onchain.e2e.js
@@ -61,11 +61,6 @@ d('Onchain', () => {
 
 			for (let i = 0; i < 2; i++) {
 				await element(by.id('Receive')).tap();
-				if (i === 0) {
-					try {
-						await element(by.id('UnderstoodButton')).tap();
-					} catch (e) {}
-				}
 				await sleep(1000); // animation
 				// get address from qrcode
 				let { label: wAddress } = await element(
@@ -149,7 +144,7 @@ d('Onchain', () => {
 			).toHaveText('0');
 
 			// check Activity
-			await element(by.id('AssetsTitle')).swipe('up');
+			await element(by.id('TransferButton')).swipe('up');
 			await expect(element(by.id('ActivityShort-1'))).toBeVisible();
 			await expect(element(by.id('ActivityShort-2'))).toBeVisible();
 			await expect(element(by.id('ActivityShort-3'))).toBeVisible();
@@ -235,9 +230,6 @@ d('Onchain', () => {
 			}
 
 			await element(by.id('Receive')).tap();
-			try {
-				await element(by.id('UnderstoodButton')).tap();
-			} catch (e) {}
 			await sleep(1000); // animation
 			// get address from qrcode
 			let { label: wAddress } = await element(by.id('QRCode')).getAttributes();
@@ -316,7 +308,7 @@ d('Onchain', () => {
 			).toHaveText('0');
 
 			// check number of outputs for send tx
-			await element(by.id('AssetsTitle')).swipe('up');
+			await element(by.id('TransferButton')).swipe('up');
 			await expect(element(by.id('ActivityShort-1'))).toBeVisible();
 			await expect(element(by.id('ActivityShort-2'))).toBeVisible();
 			await element(by.id('ActivityShowAll')).tap();

diff --git a/e2e/receive.e2e.js b/e2e/receive.e2e.js
@@ -44,7 +44,6 @@ d('Receive', () => {
 		}
 
 		await element(by.id('Receive')).tap();
-		await element(by.id('UnderstoodButton')).tap();
 		await sleep(1000); // animation
 		// await element(by.id('ReceiveCopyQR')).tap();
 		// await waitFor(element(by.id('ReceiveTooltip1')))