From ca2b3abb1c3091712fc2d5e4300185394a6fb77f Mon Sep 17 00:00:00 2001
From: flexsurfer <flexsurfer@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:36:10 +0200
Subject: [PATCH] old wallet fixes (#17697)

---
 src/status_im/ui/components/button/view.cljs        | 13 ++++++-------
 src/status_im/ui/components/text.cljs               |  3 +--
 src/status_im/ui/screens/screens.cljs               |  2 +-
 src/status_im/ui/screens/wallet/account/views.cljs  |  4 ++--
 .../ui/screens/wallet/accounts/styles.cljs          |  2 +-
 .../ui/screens/wallet/transactions/views.cljs       |  5 +++--
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/status_im/ui/components/button/view.cljs b/src/status_im/ui/components/button/view.cljs
index d6f92f34ce..a7e3e78bb8 100644
--- a/src/status_im/ui/components/button/view.cljs
+++ b/src/status_im/ui/components/button/view.cljs
@@ -67,18 +67,17 @@
                  :else    theme)
         {:keys [icon-color background-color text-color border-color]}
         (themes theme')]
-    (println "theme" theme' background-color)
+
     [rn/touchable-without-feedback
-     (merge (when on-press
+     (merge {:disabled            disabled
+             :accessibility-label accessibility-label}
+            (when on-press
               {:on-press on-press})
             (when on-long-press
               {:on-long-press on-long-press}))
      [rn/view
-      (merge {:background-color    background-color
-              :border-radius       border-radius
-              :type                type
-              :disabled            disabled
-              :accessibility-label accessibility-label}
+      (merge {:background-color background-color
+              :border-radius    border-radius}
              (when border-color
                {:border-color border-color
                 :border-width 1}))
diff --git a/src/status_im/ui/components/text.cljs b/src/status_im/ui/components/text.cljs
index 6ef8dcf8ec..eb961ca0e6 100644
--- a/src/status_im/ui/components/text.cljs
+++ b/src/status_im/ui/components/text.cljs
@@ -1,7 +1,6 @@
 (ns status-im.ui.components.text
   (:require
     [react-native.core :as rn]
-    [react-native.reanimated :as animated]
     [reagent.core :as reagent]
     [status-im.ui.components.colors :as colors]
     [status-im.ui.components.typography :as typography]))
@@ -44,7 +43,7 @@
   []
   (let [this      (reagent/current-component)
         props     (reagent/props this)
-        component (if (:animated? props) animated/text rn/text)]
+        component rn/text]
     (into [component
            (merge {:style (text-style props)}
                   (dissoc props
diff --git a/src/status_im/ui/screens/screens.cljs b/src/status_im/ui/screens/screens.cljs
index ba80250fd5..e0ab98d157 100644
--- a/src/status_im/ui/screens/screens.cljs
+++ b/src/status_im/ui/screens/screens.cljs
@@ -152,7 +152,7 @@
     :component wallet.account/account}
    {:name      :add-new-account
     ;;TODO dynamic title
-    :options   {:insets {:top? true}}
+    :options   {:insets {:top? true :bottom? true}}
     :component add-account/add-account-view}
    {:name      :add-new-account-pin
     ;;TODO dynamic title
diff --git a/src/status_im/ui/screens/wallet/account/views.cljs b/src/status_im/ui/screens/wallet/account/views.cljs
index 96c7bf9c98..73b7a0b45d 100644
--- a/src/status_im/ui/screens/wallet/account/views.cljs
+++ b/src/status_im/ui/screens/wallet/account/views.cljs
@@ -211,7 +211,7 @@
     {:style    styles/round-action-button
      :on-press on-press}
     (icons/icon icon {:color colors/white})]
-   [quo/text
+   [components.core/text
     {:color :secondary
      :size  :small
      :style {:margin-top (:tiny spacing/spacing)}}
@@ -348,7 +348,7 @@
                      :margin-top        8
                      :margin-horizontal 67.5
                      :text-align        :center}}
-            [quo/text
+            [components.core/text
              {:color :secondary
               :size  :small
               :style {:text-align :center}}
diff --git a/src/status_im/ui/screens/wallet/accounts/styles.cljs b/src/status_im/ui/screens/wallet/accounts/styles.cljs
index b050578feb..0db7b8ff7b 100644
--- a/src/status_im/ui/screens/wallet/accounts/styles.cljs
+++ b/src/status_im/ui/screens/wallet/accounts/styles.cljs
@@ -145,7 +145,7 @@
    :justify-content :center
    :left            0
    :right           0
-   :bottom          16
+   :bottom          56
    :height          40})
 
 (defn send-button
diff --git a/src/status_im/ui/screens/wallet/transactions/views.cljs b/src/status_im/ui/screens/wallet/transactions/views.cljs
index dc616d28fb..9cf03f45d7 100644
--- a/src/status_im/ui/screens/wallet/transactions/views.cljs
+++ b/src/status_im/ui/screens/wallet/transactions/views.cljs
@@ -244,10 +244,11 @@
            to to-wallet to-contact
            gas-limit gas-price-gwei gas-price-eth gas-used
            fee-cap-gwei tip-cap-gwei
-           cost nonce data]}]
+           cost nonce data]
+    :as   tx}]
   [react/view {:style styles/details-block}
    [details-list-row :t/block block]
-   [details-list-row :t/hash hash]
+   [details-list-row :t/hash (:hash tx)]
    [details-list-row :t/from-capitalized
     [{:accessibility-label (if from-wallet :sender-name-text :sender-address-text)}
      (or from-wallet from-contact from)]