From 741942f84c7ac26e4d570b2d9b5d15455e9f3e76 Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Thu, 15 Feb 2024 14:50:19 +0100 Subject: [PATCH 1/5] fix transfer money button style --- src/styles/index.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/styles/index.ts b/src/styles/index.ts index 19f5b791a9af..530bfbbf555b 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -3425,8 +3425,10 @@ const styles = (theme: ThemeColors) => }, transferBalance: { - paddingLeft: 20, - paddingRight: 20, + width: 'auto', + marginHorizontal: -32, + paddingLeft: 32, + paddingRight: 32, borderRadius: 0, height: 64, alignItems: 'center', From eed8c41bfa396b93908756129207558597b87da5 Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Thu, 15 Feb 2024 15:18:00 +0100 Subject: [PATCH 2/5] fix pr comments --- src/styles/index.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/styles/index.ts b/src/styles/index.ts index 530bfbbf555b..c0cf33c099db 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -3425,10 +3425,6 @@ const styles = (theme: ThemeColors) => }, transferBalance: { - width: 'auto', - marginHorizontal: -32, - paddingLeft: 32, - paddingRight: 32, borderRadius: 0, height: 64, alignItems: 'center', From 99863416f433a97c5aaa285a2690c886100dac64 Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Thu, 15 Feb 2024 15:18:29 +0100 Subject: [PATCH 3/5] fix PR comments --- src/pages/settings/Wallet/WalletPage/WalletPage.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.js b/src/pages/settings/Wallet/WalletPage/WalletPage.js index fe9b997aadd2..c7d224c1d008 100644 --- a/src/pages/settings/Wallet/WalletPage/WalletPage.js +++ b/src/pages/settings/Wallet/WalletPage/WalletPage.js @@ -400,16 +400,17 @@ function WalletPage({bankAccountList, cardList, fundList, isLoadingPaymentMethod return null; } - if (hasActivatedWallet) { + if (true) { return ( ); } From 2ed0371ba68ca69253604268ddf46d6d996eb620 Mon Sep 17 00:00:00 2001 From: Jakub Szymczak Date: Thu, 15 Feb 2024 15:25:54 +0100 Subject: [PATCH 4/5] fix liner --- src/pages/settings/Wallet/WalletPage/WalletPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.js b/src/pages/settings/Wallet/WalletPage/WalletPage.js index c7d224c1d008..2dbec0f691ed 100644 --- a/src/pages/settings/Wallet/WalletPage/WalletPage.js +++ b/src/pages/settings/Wallet/WalletPage/WalletPage.js @@ -400,7 +400,7 @@ function WalletPage({bankAccountList, cardList, fundList, isLoadingPaymentMethod return null; } - if (true) { + if (hasActivatedWallet) { return ( Date: Thu, 15 Feb 2024 15:37:24 +0100 Subject: [PATCH 5/5] fix PR comments --- src/pages/settings/Wallet/WalletPage/WalletPage.js | 6 +++++- src/styles/index.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.js b/src/pages/settings/Wallet/WalletPage/WalletPage.js index 2dbec0f691ed..ec203f390f90 100644 --- a/src/pages/settings/Wallet/WalletPage/WalletPage.js +++ b/src/pages/settings/Wallet/WalletPage/WalletPage.js @@ -410,7 +410,11 @@ function WalletPage({bankAccountList, cardList, fundList, isLoadingPaymentMethod hoverAndPressStyle={styles.hoveredComponentBG} shouldShowRightIcon disabled={network.isOffline} - wrapperStyle={[styles.transferBalance, styles.sectionMenuItemTopDescription]} + wrapperStyle={[ + styles.transferBalance, + isSmallScreenWidth ? styles.mhn5 : styles.mhn8, + isSmallScreenWidth ? styles.ph5 : styles.ph8, + ]} /> ); } diff --git a/src/styles/index.ts b/src/styles/index.ts index c0cf33c099db..146951404a2a 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -3425,6 +3425,7 @@ const styles = (theme: ThemeColors) => }, transferBalance: { + width: 'auto', borderRadius: 0, height: 64, alignItems: 'center',