review

Author: OmarBasem

src/status_im/contexts/wallet/create_account/select_keypair/view.cljs

@@ -10,7 +10,7 @@
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
-(defn keypair-options
+(defn- keypair-options
   []
   [quo/action-drawer
    [[{:icon                :i/add
@@ -28,13 +28,13 @@
       :accessibility-label :import-private-key
       :label               (i18n/label :t/import-private-key)}]]])
 
-(defn parse-accounts
+(defn- parse-accounts
   [given-accounts]
   (->> given-accounts
        (filter (fn [{:keys [path]}]
                  (not (string/starts-with? path constants/path-eip1581))))
-       (map (fn [{:keys [colorId emoji name address]}]
-              {:account-props {:customization-color (if (not-empty colorId) (keyword colorId) :blue)
+       (map (fn [{:keys [customization-color emoji name address]}]
+              {:account-props {:customization-color customization-color
                                :size                32
                                :emoji               emoji
                                :type                :default
@@ -46,13 +46,13 @@
                :state         :default
                :action        :none}))))
 
-(defn keypair
+(defn- keypair
   [item index _ {:keys [profile-picture compressed-key]}]
   (let [main-account (first (:accounts item))
-        color        (keyword (:colorId main-account))
+        color        (:customization-color main-account)
         accounts     (parse-accounts (:accounts item))]
     [quo/keypair
-     {:customization-color (if (not-empty (:colorId main-account)) color :blue)
+     {:customization-color (if (not-empty (:customization-color main-account)) color :blue)
       :profile-picture     (when (zero? index) profile-picture)
       :status-indicator    false
       :type                (if (zero? index) :default-keypair :other)
@@ -67,13 +67,12 @@
       :default-selected?   (zero? index)
       :container-style     {:margin-horizontal 20
                             :margin-vertical   8}}]))
-(defn- view-internal
+(defn view
   []
   (let [{:keys [compressed-key customization-color]} (rf/sub [:profile/profile])
         profile-with-image                           (rf/sub [:profile/profile-with-image])
         keypairs                                     (rf/sub [:wallet/keypairs])
         profile-picture                              (profile.utils/photo profile-with-image)]
-    (rn/use-effect #(rf/dispatch [:wallet/get-keypairs]))
     [rn/view {:style {:flex 1}}
      [quo/page-nav
       {:icon-name           :i/close
@@ -101,7 +100,3 @@
        :button-one-props {:disabled?           true
                           :customization-color customization-color}
        :container-style  style/bottom-action-container}]]))
-
-(defn view
-  []
-  [:f> view-internal])

src/status_im/contexts/wallet/create_account/utils.cljs

@@ -0,0 +1,19 @@
+(ns status-im.contexts.wallet.create-account.utils)
+
+(defn prepare-new-keypair
+  [{:keys [new-keypair address account-name account-color emoji derivation-path]}]
+  (assoc new-keypair
+         :name         (:keypair-name new-keypair)
+         :key-uid      (:keyUid new-keypair)
+         :type         :seed
+         :derived-from address
+         :accounts     [{:keypair-name (:keypair-name new-keypair)
+                         :key-uid      (:keyUid new-keypair)
+                         :seed-phrase  (:mnemonic new-keypair)
+                         :public-key   (:publicKey new-keypair)
+                         :name         account-name
+                         :type         :seed
+                         :emoji        emoji
+                         :colorID      account-color
+                         :path         derivation-path
+                         :address      (:address new-keypair)}]))

src/status_im/contexts/wallet/create_account/view.cljs

@@ -12,31 +12,13 @@
     [status-im.constants :as constants]
     [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.create-account.style :as style]
+    [status-im.contexts.wallet.create-account.utils :as create-account.utils]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [utils.responsiveness :refer [iphone-11-Pro-20-pixel-from-width]]
     [utils.security.core :as security]
     [utils.string]))
 
-(defn prepare-new-keypair
-  [{:keys [new-keypair address account-name account-color emoji derivation-path]}]
-  (assoc
-   (assoc new-keypair
-          :name         (:keypair-name new-keypair)
-          :key-uid      (:keyUid new-keypair)
-          :type         :seed
-          :derived-from address)
-   :accounts
-   [{:keypair-name (:keypair-name new-keypair)
-     :key-uid      (:keyUid new-keypair)
-     :seed-phrase  (:mnemonic new-keypair)
-     :public-key   (:publicKey new-keypair)
-     :name         account-name
-     :type         :seed
-     :emoji        emoji
-     :colorID      account-color
-     :path         derivation-path
-     :address      (:address new-keypair)}]))
 
 (defn- get-keypair-data
   [primary-name derivation-path account-color {:keys [keypair-name]}]
@@ -144,16 +126,17 @@
            :on-auth-success     (fn [entered-password]
                                   (if new-keypair
                                     (rf/dispatch
-                                     [:wallet/finalize-new-keypair
+                                     [:wallet/add-keypair-and-create-account
                                       {:sha3-pwd    (security/safe-unmask-data
                                                      entered-password)
-                                       :new-keypair (prepare-new-keypair {:new-keypair new-keypair
-                                                                          :address address
-                                                                          :account-name @account-name
-                                                                          :account-color @account-color
-                                                                          :emoji @emoji
-                                                                          :derivation-path
-                                                                          @derivation-path})}])
+                                       :new-keypair (create-account.utils/prepare-new-keypair
+                                                     {:new-keypair new-keypair
+                                                      :address address
+                                                      :account-name @account-name
+                                                      :account-color @account-color
+                                                      :emoji @emoji
+                                                      :derivation-path
+                                                      @derivation-path})}])
                                     (rf/dispatch [:wallet/derive-address-and-add-account
                                                   {:sha3-pwd     (security/safe-unmask-data
                                                                   entered-password)

src/status_im/contexts/wallet/events.cljs

@@ -1,5 +1,8 @@
 (ns status-im.contexts.wallet.events
   (:require
+    [camel-snake-kebab.core :as csk]
+    [camel-snake-kebab.extras :as cske]
+    [clojure.set :as set]
     [clojure.string :as string]
     [react-native.background-timer :as background-timer]
     [react-native.platform :as platform]
@@ -202,15 +205,15 @@
                                     (first derived-address-details)]))]
      {:fx [[:dispatch [:wallet/create-derived-addresses account-details on-success]]]})))
 
-(defn finalize-new-keypair
+(defn add-keypair-and-create-account
   [_ [{:keys [sha3-pwd new-keypair]}]]
   {:fx [[:json-rpc/call
          [{:method     "accounts_addKeypair"
            :params     [sha3-pwd new-keypair]
-           :on-success [:wallet/add-account-success (string/lower-case (:address new-keypair))]
+           :on-success [:wallet/add-account-success (comp string/lower-case (:address new-keypair))]
            :on-error   #(log/info "failed to create keypair " %)}]]]})
 
-(rf/reg-event-fx :wallet/finalize-new-keypair finalize-new-keypair)
+(rf/reg-event-fx :wallet/add-keypair-and-create-account add-keypair-and-create-account)
 
 (defn get-keypairs
   [_]
@@ -222,9 +225,11 @@
 
 (rf/reg-event-fx :wallet/get-keypairs get-keypairs)
 
+
 (defn get-keypairs-success
   [{:keys [db]} [keypairs]]
-    {:db (assoc-in db [:wallet :keypairs] keypairs)})
+  (let [renamed-data (set/rename-keys keypairs {:colorId :customization-color})]
+    {:db (assoc-in db [:wallet :keypairs] (cske/transform-keys csk/->kebab-case-keyword renamed-data))}))
 
 (rf/reg-event-fx :wallet/get-keypairs-success get-keypairs-success)
 
@@ -397,7 +402,8 @@
  (fn []
    {:fx [[:dispatch [:wallet/start-wallet]]
          [:dispatch [:wallet/get-ethereum-chains]]
-         [:dispatch [:wallet/get-accounts]]]}))
+         [:dispatch [:wallet/get-accounts]]
+         [:dispatch [:wallet/get-keypairs]]]}))
 
 (rf/reg-event-fx :wallet/share-account
  (fn [_ [{:keys [content title]}]]

src/status_im/contexts/wallet/events_test.cljs

@@ -55,14 +55,15 @@
         effects     (events/clear-new-keypair {:db db})]
     (is (match? (:db effects) expected-db))))
 
-(deftest finalize-new-keypair
+(deftest add-keypair-and-create-account
   (let [db          {}
         sha3-pwd    "password"
         new-keypair {:public-key "public_key" :private-key "private_key"}
         expected-db {:wallet {:ui       {:create-account {:new-keypair "test-keypair"}}
                               :keypairs [new-keypair]}}
-        effects     (events/finalize-new-keypair {:db db}
-                                                 [{:sha3-pwd sha3-pwd :new-keypair new-keypair}])
+        effects     (events/add-keypair-and-create-account {:db db}
+                                                           [{:sha3-pwd    sha3-pwd
+                                                             :new-keypair new-keypair}])
         result-db   (:db effects)]
     (is (match? result-db expected-db))))
 

src/status_im/subs/wallet/wallet_test.cljs

@@ -497,3 +497,12 @@
              (get "0x3")
              (assoc :network-preferences-names #{}))]
         (rf/sub [sub-name])))))
+
+(h/deftest-sub :wallet/keypairs
+  [sub-name]
+  (testing "returns all keypairs"
+    (swap! rf-db/app-db
+      #(assoc-in % [:wallet :keypairs] keypairs))
+    (is
+     (= keypairs
+        (rf/sub [sub-name])))))