group ens names with chain-id (#18001)

Author: qfrank

src/status_im/ens/core.cljs

@@ -91,20 +91,20 @@
                                             {:chainId :chain-id
                                              :removed :removed?})
                           name-details)]
-    {:db (reduce (fn [db {:keys [username removed?] :as name-detail}]
+    {:db (reduce (fn [db {:keys [username removed? chain-id] :as name-detail}]
                    (if removed?
-                     (update-in db [:ens/names] dissoc username)
-                     (let [old (get-in db [:ens/names username])]
-                       (assoc-in db [:ens/names username] (merge old name-detail)))))
+                     (update-in db [:ens/names chain-id] dissoc username)
+                     (let [old (get-in db [:ens/names chain-id username])]
+                       (assoc-in db [:ens/names chain-id username] (merge old name-detail)))))
                  db
                  name-details)}))
 
 (rf/defn save-username
   {:events [:ens/save-username]}
   [{:keys [db] :as cofx} custom-domain? username redirect-to-summary? connected?]
   (let [name     (fullname custom-domain? username)
-        names    (get-in db [:ens/names] [])
-        chain-id (chain/chain-id db)]
+        chain-id (chain/chain-id db)
+        names    (get-in db [:ens/names chain-id] [])]
     (rf/merge cofx
               (cond-> {:dispatch-n [[:ens/update-usernames [{:username name :chain-id chain-id}]]]}
                 connected?           (assoc :json-rpc/call
@@ -240,7 +240,8 @@
   {:events [::set-username-candidate]}
   [{:keys [db]} username]
   (let [{:keys [custom-domain?]} (:ens/registration db)
-        usernames                (into #{} (keys (get-in db [:ens/names])))
+        chain-id                 (chain/chain-id db)
+        usernames                (into #{} (keys (get-in db [:ens/names chain-id])))
         state                    (state custom-domain? username usernames)]
     (reset! resolve-last-id (random/id))
     (merge
@@ -310,20 +311,23 @@
 (rf/defn store-name-address
   {:events [::address-resolved]}
   [{:keys [db]} username address]
-  {:db (assoc-in db [:ens/names username :address] address)})
+  (let [chain-id (chain/chain-id db)]
+    {:db (assoc-in db [:ens/names chain-id username :address] address)}))
 
 (rf/defn store-name-public-key
   {:events [::public-key-resolved]}
   [{:keys [db]} username public-key]
-  {:db (assoc-in db [:ens/names username :public-key] public-key)})
+  (let [chain-id (chain/chain-id db)]
+    {:db (assoc-in db [:ens/names chain-id username :public-key] public-key)}))
 
 (rf/defn store-expiration-date
   {:events [::get-expiration-time-success]}
   [{:keys [now db]} username timestamp]
-  {:db (-> db
-           (assoc-in [:ens/names username :expiration-date]
-                     (datetime/timestamp->year-month-day-date timestamp))
-           (assoc-in [:ens/names username :releasable?] (<= timestamp now)))})
+  (let [chain-id (chain/chain-id db)]
+    {:db (-> db
+             (assoc-in [:ens/names chain-id username :expiration-date]
+                       (datetime/timestamp->year-month-day-date timestamp))
+             (assoc-in [:ens/names chain-id username :releasable?] (<= timestamp now)))}))
 
 (rf/defn navigate-to-name
   {:events [::navigate-to-name]}
@@ -352,7 +356,8 @@
 (rf/defn remove-username
   {:events [::remove-username]}
   [{:keys [db] :as cofx} name]
-  (let [names                       (get-in db [:ens/names] [])
+  (let [chain-id                    (chain/chain-id db)
+        names                       (get-in db [:ens/names chain-id] [])
         preferred-name              (get-in db [:profile/profile :preferred-name])
         new-names                   (remove #(= name %) (keys names))
         {:keys [chain-id username]} (get-in names [name])]

src/status_im/subs/ens.cljs

@@ -60,10 +60,17 @@
    {:state    state
     :username username}))
 
+(re-frame/reg-sub
+ :ens/current-names
+ :<- [:ens/names]
+ :<- [:chain-id]
+ (fn [[all-names chain-id]]
+   (get all-names chain-id)))
+
 (re-frame/reg-sub
  :ens.name/screen
  :<- [:get-screen-params :ens-name-details]
- :<- [:ens/names]
+ :<- [:ens/current-names]
  (fn [[name ens]]
    (let [{:keys [address public-key expiration-date releasable?]} (get ens name)
          pending?                                                 (nil? address)]
@@ -79,7 +86,7 @@
 
 (re-frame/reg-sub
  :ens.main/screen
- :<- [:ens/names]
+ :<- [:ens/current-names]
  :<- [:profile/profile]
  :<- [:ens/preferred-name]
  :<- [:ens/registrations]

src/status_im2/subs/profile.cljs

@@ -276,7 +276,7 @@
 (re-frame/reg-sub
  :profile/profile-with-image
  :<- [:profile/profile]
- :<- [:ens/names]
+ :<- [:ens/current-names]
  :<- [:mediaserver/port]
  :<- [:initials-avatar-font-file]
  (fn [[profile ens-names port font-file] [_ avatar-opts]]