From 1f84128dd7b74ad688eca80d34614f7b569cbc99 Mon Sep 17 00:00:00 2001
From: Jamie Caprani <jamiecaprani@gmail.com>
Date: Tue, 31 Jan 2023 17:11:41 +0000
Subject: [PATCH] fix: hide buttons on community after joining (#14761)

---
 src/status_im/communities/core.cljs               |  2 +-
 .../ui/screens/communities/community.cljs         |  2 +-
 src/status_im2/common/scroll_page/view.cljs       |  2 +-
 .../communities/menus/request_to_join/view.cljs   | 15 +++++++--------
 .../contexts/communities/overview/view.cljs       |  4 ++--
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/status_im/communities/core.cljs b/src/status_im/communities/core.cljs
index bbb6f3b26a..3dc97c5c65 100644
--- a/src/status_im/communities/core.cljs
+++ b/src/status_im/communities/core.cljs
@@ -170,7 +170,7 @@
                                     (re-frame/dispatch [::failed-to-join %]))}]})
 
 (rf/defn request-to-join
-  {:events [::request-to-join]}
+  {:events [:communities/request-to-join]}
   [cofx community-id]
   {:json-rpc/call [{:method      "wakuext_requestToJoinCommunity"
                     :params      [{:communityId community-id}]
diff --git a/src/status_im/ui/screens/communities/community.cljs b/src/status_im/ui/screens/communities/community.cljs
index 2247f2a6a2..8e9027f9b1 100644
--- a/src/status_im/ui/screens/communities/community.cljs
+++ b/src/status_im/ui/screens/communities/community.cljs
@@ -323,7 +323,7 @@
                  [toolbar/toolbar
                   {:show-border? true
                    :center       [quo/button
-                                  {:on-press #(rf/dispatch [::communities/request-to-join id])
+                                  {:on-press #(rf/dispatch [:communities/request-to-join id])
                                    :type     :secondary}
                                   (i18n/label :t/request-access)]}])
                :else
diff --git a/src/status_im2/common/scroll_page/view.cljs b/src/status_im2/common/scroll_page/view.cljs
index aef4373b02..3612a4ed3a 100644
--- a/src/status_im2/common/scroll_page/view.cljs
+++ b/src/status_im2/common/scroll_page/view.cljs
@@ -72,7 +72,7 @@
         :mid-section             {:type            :text-with-description
                                   :main-text       nil
                                   :description-img nil}
-        :right-section-buttons   (:right-section-buttons page-nav)
+        :right-section-buttons   page-nav
         :left-section            {:icon                  :i/close
                                   :icon-background-color (icon-color)
                                   :on-press              #(rf/dispatch [:navigate-back])}}]
diff --git a/src/status_im2/contexts/communities/menus/request_to_join/view.cljs b/src/status_im2/contexts/communities/menus/request_to_join/view.cljs
index 6cb279830f..77805b6a15 100644
--- a/src/status_im2/contexts/communities/menus/request_to_join/view.cljs
+++ b/src/status_im2/contexts/communities/menus/request_to_join/view.cljs
@@ -2,7 +2,6 @@
   (:require [quo.react-native :as rn]
             [quo2.core :as quo]
             [reagent.core :as reagent]
-            [status-im.communities.core :as communities]
             [utils.i18n :as i18n]
             [status-im2.contexts.communities.menus.request-to-join.style :as style]
             [utils.re-frame :as rf]
@@ -121,13 +120,13 @@
          {:accessibility-label :join-community-button
           :on-press            (fn []
                                  (if can-join?
-                                   (do (rf/dispatch [:bottom-sheet/hide])
-                                       (rf/dispatch [::communities/join id]))
                                    (do
-                                     (and can-request-access?
-                                          (not (pos? requested-to-join-at))
-                                          (requests/can-request-access-again? requested-to-join-at))
-                                     (rf/dispatch [::communities/request-to-join id])
-                                     (rf/dispatch [:bottom-sheet/hide]))))
+                                     (rf/dispatch [:communities/join id])
+                                     (rf/dispatch [:bottom-sheet/hide]))
+                                   (do (and can-request-access?
+                                            (not (pos? requested-to-join-at))
+                                            (requests/can-request-access-again? requested-to-join-at))
+                                       (rf/dispatch [:communities/request-to-join id])
+                                       (rf/dispatch [:bottom-sheet/hide]))))
           :disabled            (not @agreed-to-rules?)
           :style               {:flex 1}} (request-to-join-text is-open?)]]])))
diff --git a/src/status_im2/contexts/communities/overview/view.cljs b/src/status_im2/contexts/communities/overview/view.cljs
index c7a0466899..35151a7e3d 100644
--- a/src/status_im2/contexts/communities/overview/view.cljs
+++ b/src/status_im2/contexts/communities/overview/view.cljs
@@ -271,7 +271,7 @@
         {:label            (:label label)
          :chevron-position :left}]])))
 
-(defn community-overview-right-section-buttons
+(defn page-nav-right-section-buttons
   [id]
   [{:icon             :i/options
     :background-color (scroll-page/icon-color)
@@ -291,7 +291,7 @@
     (fn [community]
       [scroll-page/scroll-page
        {:cover-image                    cover
-        :page-nav-right-section-buttons (community-overview-right-section-buttons id)
+        :page-nav-right-section-buttons (page-nav-right-section-buttons id)
         :name                           name
         :on-scroll                      #(reset! scroll-height %)}