Remove unnecessary function and use subscription

src/status_im/ui/screens/profile/visibility_status/utils.cljs

@@ -1,6 +1,5 @@
 (ns status-im.ui.screens.profile.visibility-status.utils
-  (:require [clojure.string :as string]
-            [quo.design-system.colors :as colors]
+  (:require [quo.design-system.colors :as colors]
             [quo2.foundations.colors :as quo2.colors]
             [status-im2.constants :as constants]
             [utils.i18n :as i18n]
@@ -77,14 +76,6 @@
   [{:keys [status-type] :or {status-type constants/visibility-status-inactive}}]
   (:color (get visibility-status-type-data status-type)))
 
-(defn visibility-status-update
-  [public-key]
-  (let [my-icon? (or (string/blank? public-key)
-                     (= public-key (rf/sub [:multiaccount/public-key])))]
-    (if my-icon?
-      (rf/sub [:multiaccount/current-user-visibility-status])
-      (rf/sub [:visibility-status-updates/visibility-status-update public-key]))))
-
 (defn icon-dot-accessibility-label
   [dot-color]
   (if (= dot-color quo2.colors/success-50)
@@ -97,7 +88,7 @@
 
 (defn icon-visibility-status-dot
   [public-key container-size]
-  (let [status    (visibility-status-update public-key)
+  (let [status    (rf/sub [:visibility-status-updates/visibility-status-update public-key])
         size      (icon-dot-size container-size)
         margin    -2
         dot-color (icon-dot-color status)
@@ -112,6 +103,6 @@
 
 (defn visibility-status-order
   [public-key]
-  (let [status    (visibility-status-update public-key)
+  (let [status    (rf/sub [:visibility-status-updates/visibility-status-update public-key])
         dot-color (icon-dot-color status)]
     (if (= dot-color colors/color-online) 0 1)))

src/status_im2/subs/general.cljs

@@ -1,5 +1,6 @@
 (ns status-im2.subs.general
   (:require [re-frame.core :as re-frame]
+            [clojure.string :as string]
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.tokens :as tokens]
             [status-im.multiaccounts.model :as multiaccounts.model]
@@ -13,7 +14,7 @@
  :<- [:multiaccount/current-user-visibility-status]
  :<- [:visibility-status-updates]
  (fn [[my-public-key my-status-update status-updates] [_ public-key]]
-   (if (= public-key my-public-key)
+   (if (or (string/blank? public-key) (= public-key my-public-key))
      my-status-update
      (get status-updates public-key))))
 
@@ -94,8 +95,7 @@
  :<- [:waku/v2-flag]
  :<- [:waku/v2-peer-stats]
  (fn [[peers-count wakuv2-flag peer-stats]]
-   ;; If wakuv2 is enabled,
-   ;; then fetch connectivity status from
+   ;; If wakuv2 is enabled, then fetch connectivity status from
    ;; peer-stats (populated from "wakuv2.peerstats" status-go signal)
    ;; Otherwise use peers-count fetched from "discovery.summary" signal
    (if wakuv2-flag (not (:isOnline peer-stats)) (zero? peers-count))))