From ec00ddf10e5815d50ea74ee6bf6238aa9ea19334 Mon Sep 17 00:00:00 2001 From: Sean Hagstrom Date: Wed, 5 Jun 2024 14:59:35 +0100 Subject: [PATCH] Fix layout of title for select key-pairs screen (#20270) * fix: ensure standard-title component uses flex-1 styling * fix: adapt settings screens to use flex-0 styling for the standard-title component --- .../text_combinations/standard_title/style.cljs | 3 ++- .../wallet/keypairs_and_accounts/style.cljs | 3 ++- .../wallet/keypairs_and_accounts/view.cljs | 10 +++++----- .../settings/wallet/network_settings/style.cljs | 3 ++- .../settings/wallet/network_settings/view.cljs | 8 ++++---- .../settings/wallet/saved_addresses/style.cljs | 3 ++- .../settings/wallet/saved_addresses/view.cljs | 16 ++++++++-------- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/quo/components/text_combinations/standard_title/style.cljs b/src/quo/components/text_combinations/standard_title/style.cljs index 2f4f9c7a52..9acdb3ef42 100644 --- a/src/quo/components/text_combinations/standard_title/style.cljs +++ b/src/quo/components/text_combinations/standard_title/style.cljs @@ -2,7 +2,8 @@ (:require [quo.foundations.colors :as colors])) (def container - {:flex-direction :row + {:flex 1 + :flex-direction :row :justify-content :space-between}) (def right-counter diff --git a/src/status_im/contexts/settings/wallet/keypairs_and_accounts/style.cljs b/src/status_im/contexts/settings/wallet/keypairs_and_accounts/style.cljs index 8396d0e9ae..cb5deaf7e5 100644 --- a/src/status_im/contexts/settings/wallet/keypairs_and_accounts/style.cljs +++ b/src/status_im/contexts/settings/wallet/keypairs_and_accounts/style.cljs @@ -1,7 +1,8 @@ (ns status-im.contexts.settings.wallet.keypairs-and-accounts.style) (def title-container - {:padding-horizontal 20 + {:flex 0 + :padding-horizontal 20 :margin-vertical 12}) (defn page-wrapper diff --git a/src/status_im/contexts/settings/wallet/keypairs_and_accounts/view.cljs b/src/status_im/contexts/settings/wallet/keypairs_and_accounts/view.cljs index 4f03f0aae7..9178050c15 100644 --- a/src/status_im/contexts/settings/wallet/keypairs_and_accounts/view.cljs +++ b/src/status_im/contexts/settings/wallet/keypairs_and_accounts/view.cljs @@ -106,11 +106,11 @@ :background :blur :icon-name :i/arrow-left :on-press navigate-back}] - [rn/view {:style style/title-container} - [quo/standard-title - {:title (i18n/label :t/keypairs-and-accounts) - :accessibility-label :keypairs-and-accounts-header - :customization-color customization-color}]] + [quo/standard-title + {:title (i18n/label :t/keypairs-and-accounts) + :container-style style/title-container + :accessibility-label :keypairs-and-accounts-header + :customization-color customization-color}] [rn/view {:style style/settings-keypairs-container} (when (seq missing-keypairs) [quo/missing-keypairs diff --git a/src/status_im/contexts/settings/wallet/network_settings/style.cljs b/src/status_im/contexts/settings/wallet/network_settings/style.cljs index 85e7314b30..c33de06704 100644 --- a/src/status_im/contexts/settings/wallet/network_settings/style.cljs +++ b/src/status_im/contexts/settings/wallet/network_settings/style.cljs @@ -2,7 +2,8 @@ (:require [quo.foundations.colors :as colors])) (def title-container - {:padding-horizontal 20 + {:flex 0 + :padding-horizontal 20 :padding-vertical 12}) (defn page-wrapper diff --git a/src/status_im/contexts/settings/wallet/network_settings/view.cljs b/src/status_im/contexts/settings/wallet/network_settings/view.cljs index bbee8f92c1..8f11afc0af 100644 --- a/src/status_im/contexts/settings/wallet/network_settings/view.cljs +++ b/src/status_im/contexts/settings/wallet/network_settings/view.cljs @@ -114,10 +114,10 @@ :background :blur :icon-name :i/arrow-left :on-press navigate-back}] - [rn/view {:style style/title-container} - [quo/standard-title - {:title (i18n/label :t/network-settings) - :accessibility-label :network-settings-header}]] + [quo/standard-title + {:title (i18n/label :t/network-settings) + :container-style style/title-container + :accessibility-label :network-settings-header}] [rn/view {:style (style/settings-container (:bottom insets))} (when networks-by-name [rn/view {:style style/networks-container} diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/style.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/style.cljs index 1c03054ef3..f3d7015ad3 100644 --- a/src/status_im/contexts/settings/wallet/saved_addresses/style.cljs +++ b/src/status_im/contexts/settings/wallet/saved_addresses/style.cljs @@ -1,7 +1,8 @@ (ns status-im.contexts.settings.wallet.saved-addresses.style) (def title-container - {:padding-horizontal 20 + {:flex 0 + :padding-horizontal 20 :margin-top 12 :margin-bottom 16}) diff --git a/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs b/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs index edd713e8e7..0acb718387 100644 --- a/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs +++ b/src/status_im/contexts/settings/wallet/saved_addresses/view.cljs @@ -78,14 +78,14 @@ :background :blur :icon-name :i/arrow-left :on-press navigate-back}] - [rn/view {:style style/title-container} - [quo/standard-title - {:title (i18n/label :t/saved-addresses) - :accessibility-label :saved-addresses-header - :right :action - :on-press add-address-to-save - :customization-color customization-color - :icon :i/add}]] + [quo/standard-title + {:title (i18n/label :t/saved-addresses) + :accessibility-label :saved-addresses-header + :right :action + :on-press add-address-to-save + :customization-color customization-color + :icon :i/add + :container-style style/title-container}] [rn/section-list {:key-fn :title :sticky-section-headers-enabled false