updated status-go

status-im/status-go@dfdaa72...18105dc
status-im · Jul 18, 2023 · 11abda6 · 11abda6
1 parent b0a5fee
commit 11abda6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/status_im/communities/core.cljs b/src/status_im/communities/core.cljs
@@ -17,7 +17,7 @@
             [taoensso.timbre :as log]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]
-            [utils.datetime :as datetime]
+            [status-im2.common.muting.helpers :refer [format-mute-till]]
             [status-im2.contexts.chat.events :as chat.events]))
 
 (def crop-size 1000)
@@ -980,7 +980,7 @@
                               quo2.colors/success-50)
                  :text       (if muted?
                                (when (some? muted-till)
-                                 (time-string :t/muted-until (datetime/format-mute-till muted-till)))
+                                 (time-string :t/muted-until (format-mute-till muted-till)))
                                (i18n/label :t/community-unmuted))}]}))
 
 

diff --git a/src/status_im2/common/home/actions/view.cljs b/src/status_im2/common/home/actions/view.cljs
@@ -8,7 +8,7 @@
             [status-im2.contexts.contacts.drawers.nickname-drawer.view :as nickname-drawer]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]
-            [status-im2.common.mute-chat-drawer.view :as mute-chat-drawer]
+            [status-im2.common.mute-drawer.view :as mute-drawer]
             [status-im2.common.muting.helpers :refer [format-mute-till]]))
 
 (defn- entry

diff --git a/src/status_im2/contexts/communities/actions/chat/view.cljs b/src/status_im2/contexts/communities/actions/chat/view.cljs
@@ -4,7 +4,7 @@
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]
             [status-im2.common.muting.helpers :refer [format-mute-till]]
-            [status-im2.common.mute-chat-drawer.view :as mute-chat-drawer]))
+            [status-im2.common.mute-drawer.view :as mute-drawer]))
 
 (defn hide-sheet-and-dispatch
   [event]

diff --git a/src/status_im2/contexts/communities/actions/community_options/view.cljs b/src/status_im2/contexts/communities/actions/community_options/view.cljs
@@ -1,12 +1,12 @@
 (ns status-im2.contexts.communities.actions.community-options.view
   (:require [utils.i18n :as i18n]
             [utils.re-frame :as rf]
-            [utils.datetime :as datetime]
             [quo2.core :as quo]
             [status-im2.contexts.communities.actions.see-rules.view :as see-rules]
             [status-im2.contexts.communities.actions.leave.view :as leave-menu]
             [status-im2.common.mute-drawer.view :as mute-options]
             [status-im2.constants :as constants]
+            [status-im2.common.muting.helpers :refer [format-mute-till]]
             [status-im2.contexts.communities.actions.token-gating.view :as token-gating]))
 
 (defn hide-sheet-and-dispatch
@@ -55,7 +55,7 @@
      :accessibility-label (if muted? :unmute-community :mute-community)
      :label               (i18n/label (if muted? :t/unmute-community :t/mute-community))
      :sub-label           (when (and muted? (some? muted-till))
-                            (time-string :t/muted-until (datetime/format-mute-till muted-till)))
+                            (time-string :t/muted-until (format-mute-till muted-till)))
      :right-icon          :i/chevron-right
      :on-press            (if muted?
                             #(hide-sheet-and-dispatch [:community/set-muted id (not muted?)

diff --git a/status-go-version.json b/status-go-version.json
@@ -4,6 +4,6 @@
     "owner": "status-im",
     "repo": "status-go",
     "version": "ft/mute-community",
-    "commit-sha1": "e691c4755229411c7f1b289f26d5b527331ef1da",
-    "src-sha256": "0smjw1b2dnfisjk8fk0hm1gxsp5w5yl2assnf4b673f0i1ql2xma"
+    "commit-sha1": "18105dc89daffe55d8a6705f6dc2cfefe1e73179",
+    "src-sha256": "0njjxi6bbknipcjnzfggxw78sn01rz1cmnxzsr67ra80w181qc9d"
 }