From 917f10955a188796a10eac0b2ff260805cfc5d58 Mon Sep 17 00:00:00 2001 From: Sean Hagstrom Date: Mon, 19 Aug 2024 13:06:05 +0100 Subject: [PATCH] fix: adjust spacing and verbiage for terms-of-use and privacy-statement onboarding checkbox --- .../contexts/onboarding/intro/style.cljs | 5 +- .../contexts/onboarding/intro/view.cljs | 54 +++++++++---------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/status_im/contexts/onboarding/intro/style.cljs b/src/status_im/contexts/onboarding/intro/style.cljs index e43705e4e9..a65926d6f5 100644 --- a/src/status_im/contexts/onboarding/intro/style.cljs +++ b/src/status_im/contexts/onboarding/intro/style.cljs @@ -13,9 +13,10 @@ :align-self :flex-start}) (def terms-privacy-container - {:gap 8 + {:flex-direction :row :padding-horizontal 20 - :padding-vertical 8}) + :padding-vertical 8 + :gap 8}) (def plain-text {:color colors/white-opa-70}) diff --git a/src/status_im/contexts/onboarding/intro/view.cljs b/src/status_im/contexts/onboarding/intro/view.cljs index 8acebbb414..79ac8af81b 100644 --- a/src/status_im/contexts/onboarding/intro/view.cljs +++ b/src/status_im/contexts/onboarding/intro/view.cljs @@ -21,8 +21,7 @@ :actions :two-vertical-actions :description :top :description-top-text [rn/view - {:style style/terms-privacy-container - :flex-direction :row} + {:style style/terms-privacy-container} [rn/view {:accessibility-label :terms-privacy-checkbox-container} [quo/selectors @@ -30,32 +29,31 @@ :blur? true :checked? terms-accepted? :on-change #(set-terms-accepted? not)}]] - [rn/view {:style {:flex 1}} - [rn/view {:style style/text-container} - [quo/text - {:style style/plain-text - :size :paragraph-2} - (str (i18n/label :t/accept-status-tos-prefix) " ")] - [quo/text - {:on-press #(rf/dispatch [:show-bottom-sheet - {:content terms/terms-of-use - :shell? true}]) - :style style/highlighted-text - :size :paragraph-2 - :weight :medium} - (i18n/label :t/terms-of-service)] - [quo/text - {:style style/plain-text - :size :paragraph-2} - " & "] - [quo/text - {:on-press #(rf/dispatch [:show-bottom-sheet - {:content privacy/privacy-statement - :shell? true}]) - :style style/highlighted-text - :size :paragraph-2 - :weight :medium} - (i18n/label :t/intro-privacy-statement)]]]] + [rn/view {:style style/text-container} + [quo/text + {:style style/plain-text + :size :paragraph-2} + (str (i18n/label :t/accept-status-tos-prefix) " ")] + [quo/text + {:on-press #(rf/dispatch [:show-bottom-sheet + {:content terms/terms-of-use + :shell? true}]) + :style style/highlighted-text + :size :paragraph-2 + :weight :medium} + (i18n/label :t/terms-of-service)] + [quo/text + {:style style/plain-text + :size :paragraph-2} + " " (i18n/label :t/and) " "] + [quo/text + {:on-press #(rf/dispatch [:show-bottom-sheet + {:content privacy/privacy-statement + :shell? true}]) + :style style/highlighted-text + :size :paragraph-2 + :weight :medium} + (i18n/label :t/intro-privacy-statement)]]] :button-one-label (i18n/label :t/sync-or-recover-profile) :button-one-props {:type :dark-grey :disabled? (not terms-accepted?)