From 09e5300afb34dfc55ef073f9a888ec43f764484b Mon Sep 17 00:00:00 2001 From: Krishna Gupta Date: Mon, 15 Apr 2024 01:56:12 +0530 Subject: [PATCH 1/2] fix: Android - No bottom margin under the sign out button. Signed-off-by: Krishna Gupta --- src/pages/settings/InitialSettingsPage.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index a307f6cf6a7f..fbad150f3e66 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -487,8 +487,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa onScroll={onScroll} scrollEventThrottle={16} // We use marginTop to prevent glitching on the initial frame that renders before scrollTo. - contentContainerStyle={[!isAfterOnLayout && !!scrollOffset && {marginTop: -scrollOffset}]} - style={[styles.w100, styles.pt4]} + contentContainerStyle={[!isAfterOnLayout && !!scrollOffset && {marginTop: -scrollOffset}, styles.w100, styles.pt4]} > {headerContent} {accountMenuItems} From 12b2256e5b5cd6a9121c10351b4d7cf2584e49e4 Mon Sep 17 00:00:00 2001 From: Krishna Date: Wed, 17 Apr 2024 00:00:58 +0530 Subject: [PATCH 2/2] Update InitialSettingsPage.tsx --- src/pages/settings/InitialSettingsPage.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index c3e816b633d7..96259ba9ab77 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -485,8 +485,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa ref={scrollViewRef} onScroll={onScroll} scrollEventThrottle={16} - // We use marginTop to prevent glitching on the initial frame that renders before scrollTo. - contentContainerStyle={[!isAfterOnLayout && !!scrollOffset && {marginTop: -scrollOffset}, styles.w100, styles.pt4]} + contentContainerStyle={[styles.w100, styles.pt4]} > {headerContent} {accountMenuItems}