Fix component tests

status-im · May 3, 2024 · d55e54c · d55e54c
1 parent 5bde748
commit d55e54c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/src/status_im/contexts/wallet/add_account/add_address/component_spec.cljs b/src/status_im/contexts/wallet/add_account/add_address/component_spec.cljs
@@ -11,25 +11,25 @@
    (fn []
      (h/setup-subs
       {:wallet/scanned-address              nil
-       :wallet/lowercased-addresses         #{"0x12E838Ae1f769147b12956485dc56e57138f3AC8"
-                                              "0x22E838Ae1f769147b12956485dc56e57138f3AC8"}
+       :wallet/lowercased-addresses         #{"0x12e838ae1f769147b12956485dc56e57138f3ac8"
+                                              "0x22e838ae1f769147b12956485dc56e57138f3ac8"}
        :alert-banners/top-margin            0
        :wallet/watch-address-activity-state nil
        :profile/customization-color         :blue
-       :get-screen-params                   {:title :t/add-address-to-watch
+       :wallet/currently-added-address      {:title :t/add-address-to-watch
                                              :description :t/enter-eth
                                              :input-title :t/eth-or-ens
-                                             :confirm-screen
-                                             :screen/wallet.confirm-address
+                                             :screen :screen/wallet.add-address
+                                             :confirm-screen :screen/wallet.confirm-address
+                                             :ens? false
                                              :confirm-screen-props
                                              {:button-label :t/add-watched-address
                                               :address-type :t/watched-address
-                                              :placeholder
-                                              :t/default-watched-address-placeholder}
+                                              :placeholder  :t/default-watched-address-placeholder}
                                              :adding-address-purpose :watch}})))
 
   (h/test "validation messages show for already used addressed"
-    (h/render [add-address-to-watch/view])
+    (h/render-with-theme-provider [add-address-to-watch/view] :dark)
     (h/is-falsy (h/query-by-label-text :error-message))
     (h/fire-event :change-text
                   (h/get-by-label-text :add-address-to-watch)
@@ -39,7 +39,7 @@
                  (h/is-truthy (h/get-by-translation-text :t/address-already-in-use))))))
 
   (h/test "validation messages show for invalid address"
-    (h/render [add-address-to-watch/view])
+    (h/render-with-theme-provider [add-address-to-watch/view] :dark)
     (h/is-falsy (h/query-by-label-text :error-message))
     (h/fire-event :change-text (h/get-by-label-text :add-address-to-watch) "0x12E838Ae1f769147b")
     (-> (h/wait-for #(h/get-by-translation-text :t/invalid-address))

diff --git a/src/status_im/contexts/wallet/add_account/add_address/confirm_address/component_spec.cljs b/src/status_im/contexts/wallet/add_account/add_address/confirm_address/component_spec.cljs
@@ -7,18 +7,20 @@
   (h/setup-restorable-re-frame)
 
   (h/test "Create Account button is disabled while no account name exists"
-    (h/setup-subs {:wallet/watch-only-accounts []
-                   :get-screen-params          {:address "0xmock-address"
-                                                :title :t/add-address-to-watch
-                                                :description :t/enter-eth
-                                                :input-title :t/eth-or-ens
-                                                :confirm-screen :screen/wallet.confirm-address
-                                                :confirm-screen-props
-                                                {:button-label :t/add-watched-address
-                                                 :address-type :t/watched-address
-                                                 :placeholder
-                                                 :t/default-watched-address-placeholder}
-                                                :adding-address-purpose :watch}})
-    (h/render [confirm-address/view])
+    (h/setup-subs {:wallet/watch-only-accounts     []
+                   :alert-banners/top-margin       0
+                   :wallet/currently-added-address {:address "0xmock-address"
+                                                    :title :t/add-address-to-watch
+                                                    :description :t/enter-eth
+                                                    :ens? false
+                                                    :input-title :t/eth-or-ens
+                                                    :screen :screen/wallet.add-address
+                                                    :confirm-screen :screen/wallet.confirm-address
+                                                    :confirm-screen-props
+                                                    {:button-label :t/add-watched-address
+                                                     :address-type :t/watched-address
+                                                     :placeholder :t/default-watched-address-placeholder}
+                                                    :adding-address-purpose :watch}})
+    (h/render-with-theme-provider [confirm-address/view] :dark)
     (h/is-truthy (h/get-by-text "0xmock-address"))
     (h/is-disabled (h/get-by-label-text :confirm-button-label))))
diff --git a/src/status_im/contexts/wallet/add_account/add_address/confirm_address/view.cljs b/src/status_im/contexts/wallet/add_account/add_address/confirm_address/view.cljs
@@ -57,8 +57,7 @@
          {:keys [placeholder
                  address-type
                  button-label]} :confirm-screen-props} (rf/sub [:wallet/currently-added-address])
-        placeholder                                    (when placeholder
-                                                         (i18n/label placeholder))
+        placeholder                                    (i18n/label placeholder)
         [account-name on-change-name]                  (rn/use-state "")
         [account-color on-change-color]                (rn/use-state (rand-nth colors/account-colors))
         [account-emoji on-change-emoji]                (rn/use-state (emoji-picker.utils/random-emoji))]
@@ -77,7 +76,7 @@
         :on-change-emoji     on-change-emoji
         :watch-only?         true
         :top-left-icon       :i/arrow-left
-        :bottom-action-label (or button-label :t/account-created)
+        :bottom-action-label button-label
         :bottom-action-props {:customization-color account-color
                               :disabled?           (string/blank? account-name)
                               :accessibility-label :confirm-button-label
@@ -94,8 +93,7 @@
          :right-icon      :i/advanced
          :icon-right?     true
          :emoji           account-emoji
-         :title           (when address-type
-                            (i18n/label address-type))
+         :title           (i18n/label address-type)
          :subtitle        address
          :status          :default
          :size            :default

diff --git a/src/status_im/contexts/wallet/add_account/add_address/view.cljs b/src/status_im/contexts/wallet/add_account/add_address/view.cljs
@@ -155,8 +155,7 @@
                     (i18n/label :t/continue)]}
           [quo/page-top
            {:container-style  style/header-container
-            :title            (when title
-                                (i18n/label title))
+            :title            (i18n/label title)
             :description      :text
             :description-text (when description
                                 (i18n/label description))}]