feature #6843 - wallet redesign - optimal-gas flow

status-im · Jan 30, 2019 · eb80ab2 · eb80ab2
1 parent 09a1a8c
commit eb80ab2
Show file tree

Hide file tree

Showing 4 changed files with 513 additions and 222 deletions.
diff --git a/src/status_im/ui/screens/views.cljs b/src/status_im/ui/screens/views.cljs
@@ -29,8 +29,8 @@
             [status-im.ui.screens.profile.photo-capture.views :refer [profile-photo-capture]]
             [status-im.ui.screens.wallet.main.views :as wallet.main]
             [status-im.ui.screens.wallet.collectibles.views :refer [collectibles-list]]
-            [status-im.ui.screens.wallet.send.views :as send.views
-             :refer [send-transaction send-transaction-modal sign-message-modal]]
+            [status-im.ui.screens.wallet.send.views :as send.views :refer [send-transaction send-transaction-modal]]
+            [status-im.ui.screens.wallet.sign-message.views :as sign-message]
             [status-im.ui.screens.wallet.choose-recipient.views :refer [choose-recipient]]
             [status-im.ui.screens.wallet.request.views :refer [wallet-request-contacts-list request-transaction send-transaction-request]]
             [status-im.ui.screens.wallet.components.views :as wallet.components]
@@ -217,7 +217,7 @@
           :initialRouteName "wallet-onboarding-setup-modal"}}
 
         :wallet-sign-message-modal
-        [:modal sign-message-modal]})
+        [:modal sign-message/sign-message-modal]})
       {:mode             "modal"
        :headerMode       "none"
        :initialRouteName "main-stack"})}
@@ -238,6 +238,7 @@
                                                     :recipient-qr-code       recipient-qr-code
                                                     :wallet-choose-amount    send.views/choose-amount-token
                                                     :wallet-choose-asset     send.views/choose-asset
+                                                    :wallet-txn-overview     send.views/txn-overview
                                                     :wallet-send-assets      wallet.components/send-assets}
                                           :config  {:headerMode "none"}}
 

diff --git a/src/status_im/ui/screens/wallet/send/styles.cljs b/src/status_im/ui/screens/wallet/send/styles.cljs
@@ -160,10 +160,10 @@
 (def centered {:justify-content :center
                :align-items :center})
 
-(def choose-recipient-text-input
+(defstyle choose-recipient-text-input
   {:color             colors/white
    :font-size         30
    :font-weight       :bold
-   :line-height       39
-   :width             236
+   :android {:width "100%"}
+   :ios     {:min-width 236}
    :margin-horizontal 24})