self reivew changes

Author: ajayesivan

src/status_im/common/confirmation_drawer/style.cljs

@@ -4,3 +4,7 @@
   {:flex-direction  :row
    :justify-content :space-between
    :margin-top      25})
+
+(def context-tag
+  {:margin-bottom 12
+   :margin-top    4})

src/status_im/common/confirmation_drawer/view.cljs

@@ -49,7 +49,7 @@
            :full-name           display-name
            :group-name          display-name
            :customization-color color
-           :container-style     {:margin-bottom 12 :margin-top 4}
+           :container-style     style/context-tag
            :size                24}]
          [quo/text description]
          [extra-action-view extra-action extra-text extra-action-selected?]

src/status_im/common/contact_list_item/view.cljs

@@ -1,6 +1,7 @@
 (ns status-im.common.contact-list-item.view
   (:require
     [quo.core :as quo]
+    [react-native.core :as rn]
     [status-im.constants :as constants]
     [utils.address :as address]
     [utils.re-frame :as rf]))
@@ -12,7 +13,10 @@
    theme]
   (let [photo-path          (rf/sub [:chats/photo-path public-key])
         online?             (rf/sub [:visibility-status-updates/online? public-key])
-        untrustworthy?      (= constants/contact-trust-status-untrustworthy trust-status)
+        untrustworthy?      (rn/use-memo
+                             (fn []
+                               (= constants/contact-trust-status-untrustworthy trust-status))
+                             [trust-status])
         customization-color (rf/sub [:profile/customization-color])]
     [quo/user
      {:customization-color     customization-color

src/status_im/common/home/actions/view.cljs

@@ -130,14 +130,13 @@
                   :on-press            #(hide-sheet-and-dispatch [:contact/block-contact
                                                                   public-key])}])}]))
 
-(defn mark-as-untrusted-action
-  [item]
+(defn handle-trust-mark-action
+  [{:keys [public-key primary-name trust-status] :as item}]
   (hide-sheet-and-dispatch
-   [:contact/mark-as-untrusted-sheet item]))
-
-(defn remove-untrusted-mark-action
-  [{:keys [public-key primary-name]}]
-  (hide-sheet-and-dispatch [:contact/remove-trust-status public-key primary-name]))
+   (if (= trust-status
+          constants/contact-trust-status-untrustworthy)
+     [:contact/remove-trust-status public-key primary-name]
+     [:contact/mark-as-untrusted-sheet item])))
 
 (defn mute-chat-entry
   [chat-id chat-type muted-till]
@@ -311,21 +310,17 @@
 
 (defn change-trust-status-entry
   [{:keys [trust-status] :as item}]
-  (let [handle-press (if (= trust-status
-                            constants/contact-trust-status-untrustworthy)
-                       remove-untrusted-mark-action
-                       mark-as-untrusted-action)]
-    (entry {:icon                :i/untrustworthy
-            :label               (i18n/label (if (= trust-status
-                                                    constants/contact-trust-status-untrustworthy)
-                                               :t/remove-untrusted-mark
-                                               :t/mark-as-untrusted))
-            :on-press            #(handle-press item)
-            :danger?             true
-            :add-divider?        true
-            :accessibility-label :mark-as-untrusted
-            :sub-label           nil
-            :chevron?            false})))
+  (entry {:icon                :i/untrustworthy
+          :label               (i18n/label (if (= trust-status
+                                                  constants/contact-trust-status-untrustworthy)
+                                             :t/remove-untrusted-mark
+                                             :t/mark-as-untrusted))
+          :on-press            #(handle-trust-mark-action item)
+          :danger?             true
+          :add-divider?        true
+          :accessibility-label :mark-as-untrusted
+          :sub-label           nil
+          :chevron?            false}))
 
 (defn block-user-entry
   [item]

src/status_im/contexts/chat/home/chat_list_item/view.cljs

@@ -251,7 +251,10 @@
                                                     (rf/sub [:contacts/contact-by-address chat-id]))
         unread-messages? (pos? unviewed-messages-count)
         trust-status (rf/sub [:contacts/contact-trust-status chat-id])
-        untrustworthy? (= constants/contact-trust-status-untrustworthy trust-status)]
+        untrustworthy? (rn/use-memo
+                        (fn []
+                          (= constants/contact-trust-status-untrustworthy trust-status))
+                        [trust-status])]
     [rn/view {:style {:flex-direction :row}}
      [avatar-view
       {:contact   contact

src/status_im/contexts/contact/trust/events.cljs

@@ -49,7 +49,6 @@
    {:dispatch
     [:show-bottom-sheet
      {:content (fn []
-                 (tap> item)
                  [confirmation-drawer/confirmation-drawer
                   {:title               (i18n/label :t/mark-as-untrusted)
                    :description         (i18n/label :t/mark-as-untrusted-description
@@ -64,7 +63,7 @@
                                           (rf/dispatch [:contact.ui/remove-contact-pressed item]))
                    :extra-text          (i18n/label :t/remove-contact)
                    :context             item
-                   :accessibility-label :block-user
+                   :accessibility-label :mark-as-untrustworthy
                    :button-text         (i18n/label :t/mark-as-untrusted-button)
                    :on-press            (fn []
                                           (rf/dispatch [:hide-bottom-sheet])

src/status_im/contexts/profile/contact/actions/view.cljs

@@ -65,7 +65,7 @@
                                 (if untrustworthy?
                                   [:contact/remove-trust-status public-key full-name]
                                   [:contact/mark-as-untrusted-sheet contact])))
-                             [untrustworthy? contact])
+                             [untrustworthy? contact full-name public-key])
         on-remove-contact   (rn/use-callback
                              (fn []
                                (rf/dispatch [:hide-bottom-sheet])

src/status_im/contexts/profile/contact/header/view.cljs

@@ -35,17 +35,17 @@
         theme               (quo.context/use-theme)
         contact-status      (rn/use-memo
                              (fn []
-                               (let [is-contact?       (= contact-request-state
-                                                          constants/contact-request-state-mutual)
-                                     is-untrustworthy? (= trust-status
-                                                          constants/contact-trust-status-untrustworthy)]
+                               (let [contact?       (= contact-request-state
+                                                       constants/contact-request-state-mutual)
+                                     untrustworthy? (= trust-status
+                                                       constants/contact-trust-status-untrustworthy)]
                                  (cond
-                                   (and is-contact?
-                                        is-untrustworthy?) :untrustworthy-contact
-                                   blocked?                :blocked
-                                   is-contact?             :contact
-                                   is-untrustworthy?       :untrustworthy
-                                   :else                   nil)))
+                                   (and contact?
+                                        untrustworthy?) :untrustworthy-contact
+                                   blocked?             :blocked
+                                   contact?             :contact
+                                   untrustworthy?       :untrustworthy
+                                   :else                nil)))
                              [blocked? contact-request-state trust-status])
         on-start-chat       (rn/use-callback
                              #(rf/dispatch [:chat.ui/start-chat public-key ens-name])