Fix conflicts

status-im · Mar 19, 2024 · 03a98a0 · 03a98a0
1 parent fb3d7d6
commit 03a98a0
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/status_im/contexts/wallet/create_account/view.cljs b/src/status_im/contexts/wallet/create_account/view.cljs
@@ -53,15 +53,15 @@
 
 (defn- f-view
   [_]
-  (let [top                 (safe-area/get-top)
-        bottom              (safe-area/get-bottom)
+  (let [top                   (safe-area/get-top)
+        bottom                (safe-area/get-bottom)
         {window-width :width} (rn/get-window)
-        account-color       (reagent/atom (rand-nth colors/account-colors))
-        emoji               (reagent/atom (emoji-picker.utils/random-emoji))
-        account-name        (reagent/atom "")
-        on-change-text      #(reset! account-name %)
-        show-account-origin #(rf/dispatch [:show-bottom-sheet
-                                           {:content account-origin/view}])]
+        account-color         (reagent/atom (rand-nth colors/account-colors))
+        emoji                 (reagent/atom (emoji-picker.utils/random-emoji))
+        account-name          (reagent/atom "")
+        on-change-text        #(reset! account-name %)
+        show-account-origin   #(rf/dispatch [:show-bottom-sheet
+                                             {:content account-origin/view}])]
     (fn [{:keys [theme]}]
       (let [number-of-accounts                    (count (rf/sub
                                                           [:wallet/accounts-without-watched-accounts]))
@@ -118,7 +118,8 @@
                                       :on-auth-success     (fn [password]
                                                              (if new-keypair
                                                                (create-new-keypair-account password)
-                                                               (create-existing-keypair-account password)))
+                                                               (create-existing-keypair-account
+                                                                password)))
                                       :auth-button-label   (i18n/label :t/confirm)
                                       :disabled?           (empty? @account-name)
                                       :container-style     (style/slide-button-container bottom)}]}