[#17572] fix: Dismiss joined community notification if user joined an…

…d community is open
status-im · Nov 14, 2023 · 0309ad2 · 0309ad2
1 parent 8d3bd6f
commit 0309ad2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/status_im2/contexts/communities/overview/view.cljs b/src/status_im2/contexts/communities/overview/view.cljs
@@ -358,22 +358,22 @@
 
 (defn community-card-page-view
   [id]
-  (let [{:keys [id]
+  (let [{:keys [id joined]
          :as   community} (rf/sub [:communities/community id])
         pending?          (rf/sub [:communities/my-pending-request-to-join id])]
+    (when joined
+      (rf/dispatch [:activity-center.notifications/dismiss-community-overview id]))
     [community-scroll-page community pending?]))
 
 (defn overview
   [id]
-  (rf/dispatch [:activity-center.notifications/dismiss-community-overview id])
-  (fn [id]
-    (let [id                  (or id (rf/sub [:get-screen-params :community-overview]))
-          customization-color (rf/sub [:profile/customization-color])]
-      [rn/view {:style style/community-overview-container}
-       [community-card-page-view id]
-       [quo/floating-shell-button
-        {:jump-to {:on-press            #(rf/dispatch [:shell/navigate-to-jump-to])
-                   :customization-color customization-color
-                   :label               (i18n/label :t/jump-to)}}
-        {:position :absolute
-         :bottom   34}]])))
+  (let [id                  (or id (rf/sub [:get-screen-params :community-overview]))
+        customization-color (rf/sub [:profile/customization-color])]
+    [rn/view {:style style/community-overview-container}
+     [community-card-page-view id]
+     [quo/floating-shell-button
+      {:jump-to {:on-press            #(rf/dispatch [:shell/navigate-to-jump-to])
+                 :customization-color customization-color
+                 :label               (i18n/label :t/jump-to)}}
+      {:position :absolute
+       :bottom   34}]]))
diff --git a/status-go-version.json b/status-go-version.json
@@ -4,6 +4,6 @@
     "owner": "status-im",
     "repo": "status-go",
     "version": "fix/join-community-notification",
-    "commit-sha1": "4a2a097dd30d533dcff37559695d7bb66c8d3e0d",
-    "src-sha256": "00w5hmafkxr0ni0iqjdg5r7ckpbw96fhbwc03h83bjalxqhi92cz"
+    "commit-sha1": "349e9449abadb9c42d79540c8d472921ec4cc680",
+    "src-sha256": "1iffpch6gk0b9fy7kbvh22z8r96mvm1l0zj6wwfb7kaqb2b9qddk"
 }