synonymdev · pwltr · Mar 17, 2025 · Mar 13, 2025
diff --git a/e2e/backup.e2e.js b/e2e/backup.e2e.js
@@ -66,10 +66,10 @@ d('Backup', () => {
 		await rpc.generateToAddress(1, await rpc.getNewAddress());
 		await electrum?.waitForSync();
 
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(10000);
-		await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
+		await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
 		await sleep(200); // animation
 
 		// set tag to new tx
@@ -92,7 +92,7 @@ d('Backup', () => {
 		await element(by.id('NavigationClose')).atIndex(0).tap();
 
 		// remove 2 default widgets, leave PriceWidget
-		await element(by.id('HomeScrollView')).scroll(200, 'down', 0);
+		await element(by.id('HomeScrollView')).scroll(200, 'down', 0, 0.5);
 		await element(by.id('WidgetsEdit')).tap();
 		for (const w of ['NewsWidget', 'BlocksWidget']) {
 			await element(by.id('WidgetActionDelete').withAncestor(by.id(w))).tap();
@@ -122,7 +122,7 @@ d('Backup', () => {
 		await sleep(200); // animation
 
 		// check widgets
-		await element(by.id('HomeScrollView')).scroll(300, 'down', 0);
+		await element(by.id('HomeScrollView')).scroll(300, 'down', 0, 0.5);
 		await expect(element(by.id('PriceWidget'))).toExist();
 		await expect(element(by.id('NewsWidget'))).not.toExist();
 		await expect(element(by.id('BlocksWidget'))).not.toExist();

diff --git a/e2e/boost.e2e.js b/e2e/boost.e2e.js
@@ -67,10 +67,10 @@ d('Boost', () => {
 		await rpc.sendToAddress(wAddress, '0.001');
 		await rpc.generateToAddress(1, await rpc.getNewAddress());
 		await electrum?.waitForSync();
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(10000);
-		await element(by.id('NewTxPromptButton')).tap();
+		await element(by.id('ReceivedTransactionButton')).tap();
 		await expect(
 			element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),
 		).toHaveText('100 000');
@@ -178,10 +178,10 @@ d('Boost', () => {
 		await rpc.sendToAddress(wAddress, '0.001');
 		await rpc.generateToAddress(1, await rpc.getNewAddress());
 		await electrum?.waitForSync();
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(10000);
-		await element(by.id('NewTxPromptButton')).tap();
+		await element(by.id('ReceivedTransactionButton')).tap();
 		await expect(
 			element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),
 		).toHaveText('100 000');

diff --git a/e2e/helpers.js b/e2e/helpers.js
@@ -138,10 +138,10 @@ export const receiveOnchainFunds = async (rpc, amount = '0.001') => {
 	await rpc.sendToAddress(wAddress, amount);
 	await rpc.generateToAddress(1, await rpc.getNewAddress());
 
-	await waitFor(element(by.id('NewTxPrompt')))
+	await waitFor(element(by.id('ReceivedTransaction')))
 		.toBeVisible()
 		.withTimeout(10000);
-	await element(by.id('NewTxPrompt')).swipe('down');
+	await element(by.id('ReceivedTransaction')).swipe('down');
 	await sleep(1000);
 };
 

diff --git a/e2e/lightning.e2e.js b/e2e/lightning.e2e.js
@@ -131,10 +131,10 @@ d('Lightning', () => {
 			let { label: invoice1 } = await element(by.id('QRCode')).getAttributes();
 			invoice1 = invoice1.replaceAll(/bitcoin.*=/gi, '').toLowerCase();
 			await lnd.sendPaymentSync({ paymentRequest: invoice1, amt: 50000 });
-			await waitFor(element(by.id('NewTxPrompt')))
+			await waitFor(element(by.id('ReceivedTransaction')))
 				.toBeVisible()
 				.withTimeout(10000);
-			await element(by.id('NewTxPrompt')).swipe('down');
+			await element(by.id('ReceivedTransaction')).swipe('down');
 			await waitFor(
 				element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),
 			)
@@ -153,20 +153,21 @@ d('Lightning', () => {
 			const note1 = 'note 111';
 			await element(by.id('ReceiveNote')).typeText(note1);
 			await element(by.id('ReceiveNote')).tapReturnKey();
-			await sleep(200);
+			await sleep(300); // wait for keyboard to hide
 			await element(by.id('TagsAdd')).tap();
 			await element(by.id('TagInputReceive')).typeText('rtag');
 			await element(by.id('TagInputReceive')).tapReturnKey();
+			await sleep(300); // wait for keyboard to hide
 			await element(by.id('ShowQrReceive')).tap();
 			await element(by.id('QRCode')).swipe('left');
 			const { label: invoice2 } = await element(
 				by.id('ReceiveLightningInvoice'),
 			).getAttributes();
 			await lnd.sendPaymentSync({ paymentRequest: invoice2 });
-			await waitFor(element(by.id('NewTxPrompt')))
+			await waitFor(element(by.id('ReceivedTransaction')))
 				.toBeVisible()
 				.withTimeout(10000);
-			await element(by.id('NewTxPrompt')).swipe('down');
+			await element(by.id('ReceivedTransaction')).swipe('down');
 			await waitFor(
 				element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),
 			)
@@ -232,7 +233,7 @@ d('Lightning', () => {
 				.withTimeout(10000);
 
 			// check tx history
-			await element(by.id('HomeScrollView')).scroll(1000, 'down', 0);
+			await element(by.id('HomeScrollView')).scroll(1000, 'down', 0, 0.5);
 			await expect(
 				element(by.text('1 000').withAncestor(by.id('ActivityShort-1'))),
 			).toBeVisible();
@@ -324,7 +325,7 @@ d('Lightning', () => {
 				.withTimeout(10000);
 
 			// check tx history
-			await element(by.id('HomeScrollView')).scroll(1000, 'down', 0);
+			await element(by.id('HomeScrollView')).scroll(1000, 'down', 0, 0.5);
 			await expect(
 				element(by.text('111').withAncestor(by.id('ActivityShort-2'))),
 			).toBeVisible();
@@ -360,10 +361,10 @@ d('Lightning', () => {
 
 			// TODO: for some reason this doen't work on github actions
 			// wait for onchain payment to arrive
-			// await waitFor(element(by.id('NewTxPrompt')))
+			// await waitFor(element(by.id('ReceivedTransaction')))
 			// 	.toBeVisible()
 			// 	.withTimeout(60000);
-			// await element(by.id('NewTxPrompt')).swipe('down');
+			// await element(by.id('ReceivedTransaction')).swipe('down');
 			// await expect(
 			// 	element(by.id('MoneySign').withAncestor(by.id('ActivityShort-1'))),
 			// ).toHaveText('+');

diff --git a/e2e/lnurl.e2e.js b/e2e/lnurl.e2e.js
@@ -261,10 +261,10 @@ d('LNURL', () => {
 		await element(by.id('DialogConfirm')).tap();
 		await element(by.id('ContinueAmount')).tap();
 		await element(by.id('WithdrawConfirmButton')).tap();
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(10000);
-		await element(by.id('NewTxPrompt')).swipe('down');
+		await element(by.id('ReceivedTransaction')).swipe('down');
 
 		// test lnurl-withdraw, with min !== max amount
 		const withdrawRequest2 = await lnurl.generateNewUrl('withdrawRequest', {
@@ -277,10 +277,10 @@ d('LNURL', () => {
 		await element(by.id('QRInput')).replaceText(withdrawRequest2.encoded);
 		await element(by.id('DialogConfirm')).tap();
 		await element(by.id('WithdrawConfirmButton')).tap();
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(10000);
-		await element(by.id('NewTxPrompt')).swipe('down');
+		await element(by.id('ReceivedTransaction')).swipe('down');
 
 		// test lnurl-auth
 		const loginRequest1 = await lnurl.generateNewUrl('login');

diff --git a/e2e/onchain.e2e.js b/e2e/onchain.e2e.js
@@ -67,16 +67,17 @@ d('Onchain', () => {
 				await element(by.id('TagsAdd')).tap();
 				await element(by.id('TagInputReceive')).typeText(`rtag${i}`);
 				await element(by.id('TagInputReceive')).tapReturnKey();
+				await sleep(300); // wait for keyboard to hide
 				await element(by.id('ShowQrReceive')).tap();
 
 				await rpc.sendToAddress(wAddress, '1');
 				await rpc.generateToAddress(1, await rpc.getNewAddress());
 				await electrum?.waitForSync();
 
-				await waitFor(element(by.id('NewTxPrompt')))
+				await waitFor(element(by.id('ReceivedTransaction')))
 					.toBeVisible()
 					.withTimeout(10000);
-				await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
+				await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
 				await sleep(1000); // animation
 			}
 
@@ -140,7 +141,7 @@ d('Onchain', () => {
 			).toHaveText('0');
 
 			// check Activity
-			await element(by.id('HomeScrollView')).scroll(1000, 'down', 0);
+			await element(by.id('HomeScrollView')).scroll(1000, 'down', 0, 0.5);
 			await expect(element(by.id('ActivityShort-1'))).toBeVisible();
 			await expect(element(by.id('ActivityShort-2'))).toBeVisible();
 			await expect(element(by.id('ActivityShort-3'))).toBeVisible();
@@ -200,7 +201,7 @@ d('Onchain', () => {
 			await element(by.id('Tag-stag-delete')).tap();
 
 			// calendar, previous month, 0 transactions
-			await element(by.id('TimeRangePrompt')).tap();
+			await element(by.id('DatePicker')).tap();
 			await expect(element(by.id('Today'))).toBeVisible();
 			await element(by.id('PrevMonth')).tap();
 			await expect(element(by.id('Today'))).not.toExist();
@@ -210,7 +211,7 @@ d('Onchain', () => {
 			await expect(element(by.id('Activity-1'))).not.toExist();
 
 			// calendar, current date, 3 transactions
-			await element(by.id('TimeRangePrompt')).tap();
+			await element(by.id('DatePicker')).tap();
 			await element(by.id('CalendarClearButton')).tap();
 			await element(by.id('NextMonth')).tap();
 			await element(by.id('Today')).tap();
@@ -237,10 +238,10 @@ d('Onchain', () => {
 			// await rpc.generateToAddress(1, await rpc.getNewAddress());
 			// await electrum?.waitForSync();
 
-			await waitFor(element(by.id('NewTxPrompt')))
+			await waitFor(element(by.id('ReceivedTransaction')))
 				.toBeVisible()
 				.withTimeout(10000);
-			await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
+			await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
 			await sleep(1000); // animation
 
 			const coreAddress = await rpc.getNewAddress();
@@ -307,7 +308,7 @@ d('Onchain', () => {
 			).toHaveText('0');
 
 			// check number of outputs for send tx
-			await element(by.id('HomeScrollView')).scroll(1000, 'down', 0);
+			await element(by.id('HomeScrollView')).scroll(1000, 'down', 0, 0.5);
 			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
@@ -88,13 +88,14 @@ d('Receive', () => {
 		const note = 'iPhone Refurbished';
 		await element(by.id('ReceiveNote')).typeText(note);
 		await element(by.id('ReceiveNote')).tapReturnKey();
-		await sleep(200);
+		await sleep(300); // wait for keyboard to hide
 
 		// Tags
 		const tag = 'test123';
 		await element(by.id('TagsAdd')).tap();
 		await element(by.id('TagInputReceive')).typeText(tag);
 		await element(by.id('ReceiveTagsSubmit')).tap();
+		await sleep(300); // wait for keyboard to hide
 
 		// Show QR
 		await element(by.id('ShowQrReceive')).tap();

diff --git a/e2e/security.e2e.js b/e2e/security.e2e.js
@@ -132,10 +132,10 @@ d('Settings Security And Privacy', () => {
 		await rpc.sendToAddress(wAddress, '1');
 		await rpc.generateToAddress(1, await rpc.getNewAddress());
 		await electrum?.waitForSync();
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(10000);
-		await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
+		await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
 
 		// send, using FaceID
 		const coreAddress = await rpc.getNewAddress();

diff --git a/e2e/send.e2e.js b/e2e/send.e2e.js
@@ -245,10 +245,10 @@ d('Send', () => {
 		let { label: receive } = await element(by.id('QRCode')).getAttributes();
 		receive = receive.replaceAll(/bitcoin.*=/gi, '').toLowerCase();
 		await lnd.sendPaymentSync({ paymentRequest: receive, amt: 50000 });
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(10000);
-		await element(by.id('NewTxPrompt')).swipe('down');
+		await element(by.id('ReceivedTransaction')).swipe('down');
 
 		await waitFor(
 			element(by.id('MoneyText').withAncestor(by.id('TotalBalance'))),

diff --git a/e2e/settings.e2e.js b/e2e/settings.e2e.js
@@ -193,6 +193,7 @@ d('Settings', () => {
 			await expect(element(by.text(tag))).not.toBeVisible();
 			await element(by.id('TagInputReceive')).typeText(tag);
 			await element(by.id('ReceiveTagsSubmit')).tap();
+			await sleep(300); // wait for keyboard to hide
 			await expect(element(by.text(tag))).toBeVisible();
 			await element(by.id('ReceiveScreen')).swipe('down');
 			await sleep(1000);

diff --git a/e2e/slashtags.e2e.js b/e2e/slashtags.e2e.js
@@ -143,12 +143,6 @@ d('Profile and Contacts', () => {
 			await element(by.id('NavigationBack')).tap();
 			await element(by.id('NavigationBack')).tap();
 
-			if (device.getPlatform() === 'ios') {
-				// FIXME: this bottom sheet should not appear
-				// Tap on background to dismiss
-				await element(by.label('Close')).atIndex(0).tap({ x: 10, y: 10 });
-			}
-
 			// Hal
 			await element(by.id('AddContact')).tap();
 			await element(by.id('ContactURLInput')).typeText(hal.url);
@@ -206,10 +200,10 @@ d('Profile and Contacts', () => {
 			await rpc.sendToAddress(wAddress, '1');
 			await rpc.generateToAddress(1, await rpc.getNewAddress());
 			await electrum?.waitForSync();
-			await waitFor(element(by.id('NewTxPrompt')))
+			await waitFor(element(by.id('ReceivedTransaction')))
 				.toBeVisible()
 				.withTimeout(10000);
-			await element(by.id('NewTxPrompt')).swipe('down');
+			await element(by.id('ReceivedTransaction')).swipe('down');
 			await element(by.id('ActivitySavings')).tap();
 			await element(by.id('Activity-1')).tap();
 			await element(by.id('ActivityAssign')).tap();

diff --git a/e2e/transfer.e2e.js b/e2e/transfer.e2e.js
@@ -75,10 +75,10 @@ d('Transfer', () => {
 		await rpc.generateToAddress(1, await rpc.getNewAddress());
 		await electrum?.waitForSync();
 
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(20000);
-		await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
+		await element(by.id('ReceivedTransaction')).swipe('down'); // close Receive screen
 
 		// switch to USD
 		await element(by.id('HeaderMenu')).tap();
@@ -261,10 +261,10 @@ d('Transfer', () => {
 		await rpc.sendToAddress(wAddress, '0.001');
 		await rpc.generateToAddress(1, await rpc.getNewAddress());
 
-		await waitFor(element(by.id('NewTxPrompt')))
+		await waitFor(element(by.id('ReceivedTransaction')))
 			.toBeVisible()
 			.withTimeout(20000);
-		await element(by.id('NewTxPrompt')).swipe('down');
+		await element(by.id('ReceivedTransaction')).swipe('down');
 
 		// Get LDK node id
 		await element(by.id('HeaderMenu')).tap();

diff --git a/e2e/widgets.e2e.js b/e2e/widgets.e2e.js
@@ -35,7 +35,7 @@ d('Widgets', () => {
 		}
 
 		// add price widget
-		await element(by.id('HomeScrollView')).scroll(300, 'down', 0);
+		await element(by.id('HomeScrollView')).scroll(300, 'down', 0, 0.5);
 		await element(by.id('WidgetsAdd')).tap();
 		await element(by.id('WidgetsOnboarding-button')).tap();
 		await element(by.id('WidgetListItem-price')).tap();
@@ -50,7 +50,7 @@ d('Widgets', () => {
 		await element(by.id('WidgetEditField-showSource')).tap();
 		await element(by.id('WidgetEditPreview')).tap();
 		await element(by.id('WidgetSave')).tap();
-		await element(by.id('HomeScrollView')).scroll(200, 'down', 0);
+		await element(by.id('HomeScrollView')).scroll(200, 'down', 0, 0.5);
 		await expect(element(by.id('PriceWidget'))).toBeVisible();
 		await expect(element(by.id('PriceWidgetRow-BTC/EUR'))).toBeVisible();
 		await expect(element(by.id('PriceWidgetSource'))).toBeVisible();

diff --git a/patches/@gorhom+bottom-sheet+4.6.4.patch b/patches/@gorhom+bottom-sheet+4.6.4.patch
@@ -0,0 +1,30 @@
+diff --git a/node_modules/@gorhom/bottom-sheet/lib/typescript/types.d.ts b/node_modules/@gorhom/bottom-sheet/lib/typescript/types.d.ts
+index 27f39a1..914efc6 100644
+--- a/node_modules/@gorhom/bottom-sheet/lib/typescript/types.d.ts
++++ b/node_modules/@gorhom/bottom-sheet/lib/typescript/types.d.ts
+@@ -91,6 +91,10 @@ export interface BottomSheetModalMethods extends BottomSheetMethods {
+    * @see {WithTimingConfig}
+    */
+   dismiss: (animationConfigs?: WithSpringConfig | WithTimingConfig) => void;
++  /**
++   * Check if the bottom sheet modal is open.
++   */
++  isOpen: () => boolean;
+ }
+ //#endregion
+
+diff --git a/node_modules/@gorhom/bottom-sheet/src/components/bottomSheetModal/BottomSheetModal.tsx b/node_modules/@gorhom/bottom-sheet/src/components/bottomSheetModal/BottomSheetModal.tsx
+index 275ce50..2d5ea19 100644
+--- a/node_modules/@gorhom/bottom-sheet/src/components/bottomSheetModal/BottomSheetModal.tsx
++++ b/node_modules/@gorhom/bottom-sheet/src/components/bottomSheetModal/BottomSheetModal.tsx
+@@ -363,6 +363,10 @@ const BottomSheetModalComponent = forwardRef<
+     // internal
+     minimize: handleMinimize,
+     restore: handleRestore,
++    isOpen: () => {
++      // If animateOnMount is disabled, the sheet is open if it's mounted
++      return animateOnMount ? currentIndexRef.current !== -1 : mounted.current;
++    },
+   }));
+   //#endregion
+