refactor(ui): bottom sheets

Author: pwltr

e2e/backup.e2e.js

@@ -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();

e2e/lightning.e2e.js

@@ -232,7 +232,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 +324,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();

e2e/onchain.e2e.js

@@ -141,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();
@@ -308,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();

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();

src/screens/Activity/ActivityTagsPrompt.tsx

@@ -7,6 +7,7 @@ import SafeAreaInset from '../../components/SafeAreaInset';
 import Tag from '../../components/Tag';
 import Button from '../../components/buttons/Button';
 import { useSnapPoints } from '../../hooks/bottomSheet';
+import { Keyboard } from '../../hooks/keyboard';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
 import { useSheetRef } from '../../navigation/bottom-sheet/SheetRefsProvider';
 import { lastUsedTagsSelector } from '../../store/reselect/metadata';
@@ -32,7 +33,8 @@ const ActivityTagsPrompt = (): ReactElement => {
 		setText('');
 	};
 
-	const closeBottomSheet = (): void => {
+	const closeBottomSheet = async (): Promise<void> => {
+		await Keyboard.dismiss();
 		sheetRef.current?.close();
 		resetText();
 	};

src/screens/Contacts/AddContact.tsx

@@ -60,7 +60,6 @@ const AddContact = ({
 		};
 
 		const onSuccess = async (): Promise<void> => {
-			await Keyboard.dismiss();
 			navigation.navigate('ContactEdit', { url });
 			setUrl('');
 		};

src/screens/Profile/ProfileLink.tsx

@@ -7,11 +7,11 @@ import LabeledInput from '../../components/LabeledInput';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Button from '../../components/buttons/Button';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
+import { useSheetRef } from '../../navigation/bottom-sheet/SheetRefsProvider';
 import { ProfileLinkScreenProps } from '../../navigation/types';
 import { profileLinkSelector } from '../../store/reselect/ui';
 import { addLink } from '../../store/slices/slashtags';
 import { updateProfileLink } from '../../store/slices/ui';
-import { closeSheet } from '../../store/utils/ui';
 import { BodyS, BodySB } from '../../styles/text';
 import { suggestions } from './ProfileLinkSuggestions';
 
@@ -20,10 +20,11 @@ const ProfileLink = ({
 }: ProfileLinkScreenProps<'ProfileLink'>): ReactElement => {
 	const { t } = useTranslation('slashtags');
 	const dispatch = useAppDispatch();
+	const sheetRef = useSheetRef('profileAddDataForm');
 	const form = useAppSelector(profileLinkSelector);
 
-	const onSave = async (): Promise<void> => {
-		closeSheet('profileAddDataForm');
+	const onSave = (): void => {
+		sheetRef.current?.close();
 		dispatch(addLink(form));
 		dispatch(updateProfileLink({ title: '', url: '' }));
 	};