refactor

status-im · Dec 20, 2022 · af16124 · af16124
1 parent 68cd4c4
commit af16124
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/quo2/components/avatars/group_avatar.cljs b/src/quo2/components/avatars/group_avatar.cljs
@@ -21,7 +21,7 @@
                 :align-items      :center
                 :justify-content  :center
                 :border-radius    (/ container-size 2)
-                ;:background-color (colors/custom-color-by-theme color 50 60)
+                ;:background-color (colors/custom-color-by-theme color 50 60) ; TODO: this is temporary only. Issue: https://github.com/status-im/status-mobile/issues/14566
                 :background-color color}
        [icon/icon :i/group {:size  icon-size
                             :color colors/white-opa-70}]])))
diff --git a/src/status_im/group_chats/core.cljs b/src/status_im/group_chats/core.cljs
@@ -43,9 +43,9 @@
 
 (fx/defn remove-members
   {:events [:group-chats.ui/remove-members-pressed]}
-  [{{:keys [current-chat-id]} :db :as cofx}]
+  [{{:keys [current-chat-id] :group-chat/keys [deselected-members]} :db :as cofx}]
   {::json-rpc/call [{:method      "wakuext_removeMembersFromGroupChat"
-                     :params      [nil current-chat-id (get-in cofx [:db :group-chat/deselected-members])]
+                     :params      [nil current-chat-id deselected-members]
                      :js-response true
                      :on-success  #(re-frame/dispatch [:chat-updated % true])
                      :on-error #()}]})
@@ -88,9 +88,9 @@
 (fx/defn add-members
   "Add members to a group chat"
   {:events [:group-chats.ui/add-members-pressed]}
-  [{{:keys [current-chat-id]} :db :as cofx}]
+  [{{:keys [current-chat-id] :group-chat/keys [selected-participants]} :db :as cofx}]
   {::json-rpc/call [{:method      "wakuext_addMembersToGroupChat"
-                     :params      [nil current-chat-id (get-in cofx [:db :group-chat/selected-participants])]
+                     :params      [nil current-chat-id selected-participants]
                      :js-response true
                      :on-success  #(re-frame/dispatch [:chat-updated % true])}]})
 

diff --git a/src/status_im2/setup/db.cljs b/src/status_im2/setup/db.cljs
@@ -1,7 +1,7 @@
 (ns status-im2.setup.db
   (:require
    [react-native.core :as rn]
-   ;; TODO (14/11/22 flexsurfer move to status-im2 namespace
+    ;; TODO (14/11/22 flexsurfer move to status-im2 namespace
    [status-im.fleet.core :as fleet]
    [status-im.wallet.db :as wallet.db]))
 
@@ -11,8 +11,8 @@
              :group/selected-contacts            #{}
              :chats                              {}
              :current-chat-id                    nil
-             :group-chat/selected-participants              #{}
-             :group-chat/deselected-members                 #{}
+             :group-chat/selected-participants   #{}
+             :group-chat/deselected-members      #{}
              :sync-state                         :done
              :link-previews-whitelist            []
              :app-state                          "active"