From bec51b7d0e3767848e693d433b92083f396f10a6 Mon Sep 17 00:00:00 2001
From: Ajay Sivan <ajayesivan@gmail.com>
Date: Tue, 26 Dec 2023 21:42:20 +0530
Subject: [PATCH] Add :wallet/accounts-with-customization-color subscription
 (#18302)

---
 .../communities/actions/accounts_selection/view.cljs      | 5 +----
 .../actions/addresses_for_permissions/view.cljs           | 7 ++-----
 .../communities/actions/airdrop_addresses/view.cljs       | 5 +----
 src/status_im/subs/wallet/wallet.cljs                     | 8 ++++++++
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/status_im/contexts/communities/actions/accounts_selection/view.cljs b/src/status_im/contexts/communities/actions/accounts_selection/view.cljs
index bb3f6bac90..a393b71fff 100644
--- a/src/status_im/contexts/communities/actions/accounts_selection/view.cljs
+++ b/src/status_im/contexts/communities/actions/accounts_selection/view.cljs
@@ -36,10 +36,7 @@
   []
   (let [{id :community-id}          (rf/sub [:get-screen-params])
         {:keys [name color images]} (rf/sub [:communities/community id])
-        accounts                    (->> (rf/sub [:wallet])
-                                         :accounts
-                                         vals
-                                         (map #(assoc % :customization-color (:color %))))]
+        accounts                    (rf/sub [:wallet/accounts-with-customization-color])]
     [rn/view {:style style/container}
      [quo/page-nav
       {:text-align          :left
diff --git a/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs b/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs
index e35006f7cf..414da13b7e 100644
--- a/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs
+++ b/src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs
@@ -24,10 +24,7 @@
   []
   (let [{id :community-id}          (rf/sub [:get-screen-params])
         {:keys [name color images]} (rf/sub [:communities/community id])
-        accounts                    (->> (rf/sub [:wallet])
-                                         :accounts
-                                         vals
-                                         (map #(assoc % :customization-color (:color %))))]
+        accounts                    (rf/sub [:wallet/accounts-with-customization-color])]
     [rn/safe-area-view {:style style/container}
 
      [quo/drawer-top
@@ -42,7 +39,7 @@
      [rn/flat-list
       {:render-fn               account-item
        :content-container-style {:padding 20}
-       :key-fn                  :key-uid
+       :key-fn                  :address
        :data                    accounts}]
 
      [rn/view {:style style/buttons}
diff --git a/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs b/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs
index 7052c42075..c859ee4deb 100644
--- a/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs
+++ b/src/status_im/contexts/communities/actions/airdrop_addresses/view.cljs
@@ -27,10 +27,7 @@
   (let [{id :community-id}          (rf/sub [:get-screen-params])
         {:keys [name images color]} (rf/sub [:communities/community id])
         logo-uri                    (get-in images [:thumbnail :uri])
-        accounts                    (->> (rf/sub [:wallet])
-                                         :accounts
-                                         vals
-                                         (map #(assoc % :customization-color (:color %))))]
+        accounts                    (rf/sub [:wallet/accounts-with-customization-color])]
     [:<>
      [quo/drawer-top
       {:type                :context-tag
diff --git a/src/status_im/subs/wallet/wallet.cljs b/src/status_im/subs/wallet/wallet.cljs
index b23ebc9f9c..6669499401 100644
--- a/src/status_im/subs/wallet/wallet.cljs
+++ b/src/status_im/subs/wallet/wallet.cljs
@@ -198,3 +198,11 @@
  (fn [[current-viewing-account network-details]]
    (let [network-preferences-names (:network-preferences-names current-viewing-account)]
      (filter #(contains? network-preferences-names (:network-name %)) network-details))))
+
+(rf/reg-sub
+ :wallet/accounts-with-customization-color
+ :<- [:wallet/accounts]
+ (fn [accounts]
+   (map (fn [{:keys [color] :as account}]
+          (assoc account :customization-color color))
+        accounts)))