From e8008d0aa91e97036597855656f74c810f4bfb80 Mon Sep 17 00:00:00 2001 From: Mohsen Date: Mon, 29 Apr 2024 12:43:51 +0300 Subject: [PATCH] [#19176] fix: onboarding illustration design issue (#19800) --- .../onboarding/enable_notifications/style.cljs | 5 +++++ .../onboarding/enable_notifications/view.cljs | 2 +- src/status_im/contexts/onboarding/welcome/style.cljs | 11 ++++++++--- src/status_im/contexts/onboarding/welcome/view.cljs | 9 ++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/status_im/contexts/onboarding/enable_notifications/style.cljs b/src/status_im/contexts/onboarding/enable_notifications/style.cljs index 1cd27f137c..1c22b88e9d 100644 --- a/src/status_im/contexts/onboarding/enable_notifications/style.cljs +++ b/src/status_im/contexts/onboarding/enable_notifications/style.cljs @@ -13,6 +13,11 @@ {:flex 1 :width width}) +(def page-title + {:margin-top 12 + :margin-horizontal 20 + :margin-bottom 8}) + (def page-heading {:z-index 1}) (defn buttons diff --git a/src/status_im/contexts/onboarding/enable_notifications/view.cljs b/src/status_im/contexts/onboarding/enable_notifications/view.cljs index 0f3b13dd83..f423944f9c 100644 --- a/src/status_im/contexts/onboarding/enable_notifications/view.cljs +++ b/src/status_im/contexts/onboarding/enable_notifications/view.cljs @@ -16,7 +16,7 @@ (defn page-title [] [quo/text-combinations - {:container-style {:margin-top 12 :margin-horizontal 20} + {:container-style style/page-title :title (i18n/label :t/intro-wizard-title6) :title-accessibility-label :notifications-title :description (i18n/label :t/enable-notifications-sub-title) diff --git a/src/status_im/contexts/onboarding/welcome/style.cljs b/src/status_im/contexts/onboarding/welcome/style.cljs index dd1322f541..2858c01820 100644 --- a/src/status_im/contexts/onboarding/welcome/style.cljs +++ b/src/status_im/contexts/onboarding/welcome/style.cljs @@ -9,9 +9,14 @@ (defn page-illustration [width] - {:width width - :margin-top 12 - :margin-bottom 4}) + {:width width + :aspect-ratio 0.7 + :height :auto}) + +(def page-title + {:margin-top 12 + :margin-horizontal 20 + :margin-bottom 8}) (defn buttons [insets] diff --git a/src/status_im/contexts/onboarding/welcome/view.cljs b/src/status_im/contexts/onboarding/welcome/view.cljs index 034b21fc50..70048e3b9f 100644 --- a/src/status_im/contexts/onboarding/welcome/view.cljs +++ b/src/status_im/contexts/onboarding/welcome/view.cljs @@ -16,7 +16,7 @@ [] (let [new-account? (rf/sub [:onboarding/new-account?])] [quo/text-combinations - {:container-style {:margin-top 12 :margin-horizontal 20} + {:container-style style/page-title :title (i18n/label (if new-account? :t/welcome-to-web3 :t/welcome-back)) @@ -45,10 +45,9 @@ :on-press #(rf/dispatch [:navigate-back])}] [page-title] [rn/image - {:style (style/page-illustration (:width window)) - :resize-mode :stretch - :resize-method :scale - :source (resources/get-image :welcome-illustration)}] + {:style (style/page-illustration (:width window)) + :resize-mode :contain + :source (resources/get-image :welcome-illustration)}] [rn/view {:style (style/buttons insets)} (when rn/small-screen? [linear-gradient/linear-gradient