From 1919094b46f68b080d4117133a13053486248905 Mon Sep 17 00:00:00 2001 From: BalogunofAfrica <45393944+BalogunofAfrica@users.noreply.github.com> Date: Fri, 5 Jan 2024 17:17:51 +0100 Subject: [PATCH] fix: community buttons (#18392) --- .../actions/community_rules_list/style.cljs | 5 +- .../actions/community_rules_list/view.cljs | 3 +- .../actions/request_to_join/style.cljs | 33 ++++++----- .../actions/request_to_join/view.cljs | 56 ++++++++++--------- src/status_im/navigation/screens.cljs | 2 +- 5 files changed, 52 insertions(+), 47 deletions(-) diff --git a/src/status_im/contexts/communities/actions/community_rules_list/style.cljs b/src/status_im/contexts/communities/actions/community_rules_list/style.cljs index f656d64b7a..3428630a76 100644 --- a/src/status_im/contexts/communities/actions/community_rules_list/style.cljs +++ b/src/status_im/contexts/communities/actions/community_rules_list/style.cljs @@ -7,8 +7,7 @@ :margin-top 16}) (def community-rule-index - {:margin-left 5}) + {:margin-left 4}) (def community-rule-text - {:margin-left 6 - :flex 1}) + {:flex 1}) diff --git a/src/status_im/contexts/communities/actions/community_rules_list/view.cljs b/src/status_im/contexts/communities/actions/community_rules_list/view.cljs index 722f076def..b26fba10be 100644 --- a/src/status_im/contexts/communities/actions/community_rules_list/view.cljs +++ b/src/status_im/contexts/communities/actions/community_rules_list/view.cljs @@ -44,9 +44,10 @@ (str title ": " content)]]) (defn view - [rules] + [rules scroll-enabled?] [rn/flat-list {:shows-horizontal-scroll-indicator false + :scroll-enabled scroll-enabled? :data rules :separator [rn/view {:margin-top 1}] :render-fn community-rule-item}]) diff --git a/src/status_im/contexts/communities/actions/request_to_join/style.cljs b/src/status_im/contexts/communities/actions/request_to_join/style.cljs index a235d90174..9b32861e04 100644 --- a/src/status_im/contexts/communities/actions/request_to_join/style.cljs +++ b/src/status_im/contexts/communities/actions/request_to_join/style.cljs @@ -11,32 +11,31 @@ :align-items :center :justify-content :space-between}) -(def request-icon - {:height 32 - :width 32 - :align-items :center - :background-color colors/white - :border-color colors/neutral-20 - :border-width 1 - :border-radius 8 - :display :flex - :justify-content :center}) +(def container + {:flex 1}) + +(def community-icon + {:margin-right :auto :margin-top 4}) (def cancel-button {:flex 1 :margin-right 12}) -(defn bottom-container - [] - {:padding-top 32 - :flex-direction :row - :align-items :center - :justify-content :space-evenly}) +(def bottom-container + {:padding-top 32 + :flex-direction :row + :align-items :center + :margin-horizontal 20 + :justify-content :space-evenly}) (def final-disclaimer-container - {:margin-top 12 + {:margin-bottom 7 + :margin-top 12 :padding-horizontal 40}) (def final-disclaimer-text {:color colors/neutral-50 :text-align :center}) + +(def rules-text + {:margin-top 24}) diff --git a/src/status_im/contexts/communities/actions/request_to_join/view.cljs b/src/status_im/contexts/communities/actions/request_to_join/view.cljs index f79040b175..3dfde1dc90 100644 --- a/src/status_im/contexts/communities/actions/request_to_join/view.cljs +++ b/src/status_im/contexts/communities/actions/request_to_join/view.cljs @@ -1,6 +1,8 @@ (ns status-im.contexts.communities.actions.request-to-join.view (:require [quo.core :as quo] + [quo.foundations.colors :as colors] + [quo.theme] [react-native.core :as rn] [react-native.gesture :as gesture] [status-im.common.password-authentication.view :as password-authentication] @@ -18,14 +20,15 @@ {:community-id id :password %}])}]) (rf/dispatch [:navigate-back])) -(defn request-to-join - [] +(defn- view-internal + [{:keys [theme]}] (fn [] (let [{:keys [name id - images]} (rf/sub [:get-screen-params])] - [rn/view {:flex 1} - [gesture/scroll-view {:style {:flex 1}} + images]} (rf/sub [:get-screen-params]) + {:keys [color]} (rf/sub [:communities/community id])] + [rn/safe-area-view {:flex 1} + [gesture/scroll-view {:style style/container} [rn/view style/page-container [rn/view {:style style/title-container} [quo/text @@ -33,33 +36,36 @@ :weight :semi-bold :size :heading-2} (i18n/label :t/request-to-join)]] - [rn/view {:style {:margin-right :auto :margin-top 8}} + [rn/view {:style style/community-icon} [quo/context-tag {:type :community :size 24 :community-logo (:thumbnail images) :community-name name}]] [quo/text - {:style {:margin-top 24} + {:style style/rules-text :accessibility-label :communities-rules-title :weight :semi-bold :size :paragraph-1} (i18n/label :t/community-rules)] - [community-rules/view community-rules/standard-rules] - [rn/view {:style (style/bottom-container)} - [quo/button - {:accessibility-label :cancel - :on-press #(rf/dispatch [:navigate-back]) - :type :grey - :container-style style/cancel-button} - (i18n/label :t/cancel)] - [quo/button - {:accessibility-label :join-community-button - :on-press #(join-community-and-navigate-back id) - :container-style {:flex 1}} - (i18n/label :t/request-to-join)]] - [rn/view {:style style/final-disclaimer-container} - [quo/text - {:size :paragraph-2 - :style style/final-disclaimer-text} - (i18n/label :t/request-to-join-disclaimer)]]]]]))) + [community-rules/view community-rules/standard-rules false]]] + [rn/view {:style style/bottom-container} + [quo/button + {:accessibility-label :cancel + :on-press #(rf/dispatch [:navigate-back]) + :type :grey + :container-style style/cancel-button} + (i18n/label :t/cancel)] + [quo/button + {:accessibility-label :join-community-button + :on-press #(join-community-and-navigate-back id) + :container-style {:flex 1} + :inner-style {:background-color (colors/resolve-color color theme)}} + (i18n/label :t/request-to-join)]] + [rn/view {:style style/final-disclaimer-container} + [quo/text + {:size :paragraph-2 + :style style/final-disclaimer-text} + (i18n/label :t/request-to-join-disclaimer)]]]))) + +(def view (quo.theme/with-theme view-internal)) diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs index 1ad3a8192e..c80c9ec81d 100644 --- a/src/status_im/navigation/screens.cljs +++ b/src/status_im/navigation/screens.cljs @@ -97,7 +97,7 @@ {:name :community-requests-to-join :options {:sheet? true} - :component join-menu/request-to-join} + :component join-menu/view} {:name :community-account-selection :options {:sheet? true}