Move address-to-watch events and subs to a different context

Author: ulisesmac

Diff for: src/status_im/contexts/wallet/accounts/add_account/address_to_watch/events.cljs

@@ -0,0 +1,54 @@
+(ns status-im.contexts.wallet.accounts.add-account.address-to-watch.events
+  (:require [clojure.string :as string]
+            [status-im.constants :as constants]
+            [utils.re-frame :as rf]
+            [taoensso.timbre :as log]))
+
+(rf/reg-event-fx
+ :wallet/ens-not-found
+ (fn [{:keys [db]} _]
+   {:db (-> db
+            (assoc-in [:wallet :ui :add-address-to-watch :activity-state] :invalid-ens)
+            (assoc-in [:wallet :ui :add-address-to-watch :validated-address] nil))}))
+
+(rf/reg-event-fx
+ :wallet/store-address-activity
+ (fn [{:keys [db]} [address {:keys [hasActivity]}]]
+   (let [registered-addresses        (-> db :wallet :accounts keys set)
+         address-already-registered? (registered-addresses address)]
+     (if address-already-registered?
+       {:db (-> db
+                (assoc-in [:wallet :ui :add-address-to-watch :activity-state]
+                          :address-already-registered)
+                (assoc-in [:wallet :ui :add-address-to-watch :validated-address] nil))}
+       (let [state (if hasActivity :has-activity :no-activity)]
+         {:db (-> db
+                  (assoc-in [:wallet :ui :add-address-to-watch :activity-state] state)
+                  (assoc-in [:wallet :ui :add-address-to-watch :validated-address] address))})))))
+
+(rf/reg-event-fx
+ :wallet/clear-address-activity
+ (fn [{:keys [db]}]
+   {:db (update-in db [:wallet :ui] dissoc :add-address-to-watch)}))
+
+(rf/reg-event-fx
+ :wallet/get-address-details
+ (fn [{:keys [db]} [address-or-ens]]
+   (let [request-params [constants/ethereum-mainnet-chain-id address-or-ens]
+         ens?           (string/includes? address-or-ens ".")]
+     {:db (-> db
+              (assoc-in [:wallet :ui :add-address-to-watch :activity-state] :scanning)
+              (assoc-in [:wallet :ui :add-address-to-watch :validated-address] nil))
+      :fx [(if ens?
+             [:json-rpc/call
+              [{:method     "ens_addressOf"
+                :params     request-params
+                :on-success [:wallet/get-address-details]
+                :on-error   [:wallet/ens-not-found]}]]
+             [:json-rpc/call
+              [{:method     "wallet_getAddressDetails"
+                :params     request-params
+                :on-success [:wallet/store-address-activity address-or-ens]
+                :on-error   #(log/info "failed to get address details"
+                                       {:error %
+                                        :event :wallet/get-address-details})}]])]})))

Diff for: src/status_im/contexts/wallet/events.cljs

@@ -4,6 +4,7 @@
     [react-native.background-timer :as background-timer]
     [react-native.platform :as platform]
     [status-im.constants :as constants]
+    [status-im.contexts.wallet.accounts.add-account.address-to-watch.events]
     [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.data-store :as data-store]
     [status-im.contexts.wallet.events.collectibles]
@@ -359,54 +360,6 @@
  (fn [{:keys [db]}]
    {:db (assoc db :wallet/valid-ens-or-address? false)}))
 
-(rf/reg-event-fx
- :wallet/ens-not-found
- (fn [{:keys [db]} _]
-   {:db (-> db
-            (assoc-in [:wallet :ui :add-address-to-watch :activity-state] :invalid-ens)
-            (assoc-in [:wallet :ui :add-address-to-watch :validated-address] nil))}))
-
-(rf/reg-event-fx
- :wallet/store-address-activity
- (fn [{:keys [db]} [address {:keys [hasActivity]}]]
-   (let [registered-addresses        (-> db :wallet :accounts keys set)
-         address-already-registered? (registered-addresses address)]
-     (if address-already-registered?
-       {:db (-> db
-                (assoc-in [:wallet :ui :add-address-to-watch :activity-state] :address-already-registered)
-                (assoc-in [:wallet :ui :add-address-to-watch :validated-address] nil))}
-       (let [state (if hasActivity :has-activity :no-activity)]
-         {:db (-> db
-                  (assoc-in [:wallet :ui :add-address-to-watch :activity-state] state)
-                  (assoc-in [:wallet :ui :add-address-to-watch :validated-address] address))})))))
-
-(rf/reg-event-fx
- :wallet/clear-address-activity
- (fn [{:keys [db]}]
-   {:db (update-in db [:wallet :ui] dissoc :add-address-to-watch)}))
-
-(rf/reg-event-fx
- :wallet/get-address-details
- (fn [{:keys [db]} [address-or-ens]]
-   (let [request-params [constants/ethereum-mainnet-chain-id address-or-ens]
-         ens?           (string/includes? address-or-ens ".")]
-     {:db (-> db
-              (assoc-in [:wallet :ui :add-address-to-watch :activity-state] :scanning)
-              (assoc-in [:wallet :ui :add-address-to-watch :validated-address] nil))
-      :fx [(if ens?
-             [:json-rpc/call
-              [{:method     "ens_addressOf"
-                :params     request-params
-                :on-success [:wallet/get-address-details]
-                :on-error   [:wallet/ens-not-found]}]]
-             [:json-rpc/call
-              [{:method     "wallet_getAddressDetails"
-                :params     request-params
-                :on-success [:wallet/store-address-activity address-or-ens]
-                :on-error   #(log/info "failed to get address details"
-                                       {:error %
-                                        :event :wallet/get-address-details})}]])]})))
-
 (rf/reg-event-fx
  :wallet/navigate-to-chain-explorer-from-bottom-sheet
  (fn [_ [explorer-link address]]

Diff for: src/status_im/subs/wallet/add_account/address_to_watch.cljs

@@ -0,0 +1,17 @@
+(ns status-im.subs.wallet.add-account.address-to-watch
+  (:require [re-frame.core :as rf]))
+
+(rf/reg-sub
+ :wallet/add-address-to-watch
+ :<- [:wallet/ui]
+ :-> :add-address-to-watch)
+
+(rf/reg-sub
+ :wallet/watch-address-activity-state
+ :<- [:wallet/add-address-to-watch]
+ :-> :activity-state)
+
+(rf/reg-sub
+ :wallet/watch-address-validated-address
+ :<- [:wallet/add-address-to-watch]
+ :-> :validated-address)

Diff for: src/status_im/subs/wallet/wallet.cljs

@@ -2,6 +2,7 @@
   (:require [clojure.string :as string]
             [re-frame.core :as rf]
             [status-im.contexts.wallet.common.utils :as utils]
+            [status-im.subs.wallet.add-account.address-to-watch]
             [utils.number]))
 
 (defn- filter-networks
@@ -93,21 +94,6 @@
  :<- [:wallet/wallet-send]
  :-> :bridge-to-chain-id)
 
-(rf/reg-sub
- :wallet/add-address-to-watch
- :<- [:wallet/ui]
- :-> :add-address-to-watch)
-
-(rf/reg-sub
- :wallet/watch-address-activity-state
- :<- [:wallet/add-address-to-watch]
- :-> :activity-state)
-
-(rf/reg-sub
- :wallet/watch-address-validated-address
- :<- [:wallet/add-address-to-watch]
- :-> :validated-address)
-
 (rf/reg-sub
  :wallet/keypairs
  :<- [:wallet]