Rebase

status-im · Jun 28, 2020 · 31cd596 · 31cd596
1 parent f1e9608
commit 31cd596
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/status_im/ui/screens/profile/contact/views.cljs b/src/status_im/ui/screens/profile/contact/views.cljs
@@ -5,7 +5,6 @@
             [status-im.multiaccounts.core :as multiaccounts]
             [status-im.ui.components.chat-icon.screen :as chat-icon]
             [status-im.ui.components.icons.vector-icons :as icons]
-            [status-im.ui.components.list.views :as list]
             [status-im.ui.components.profile-header.view :as profile-header]
             [status-im.ui.components.react :as react]
             [status-im.ui.screens.profile.components.sheets :as sheets]

diff --git a/src/status_im/ui/screens/signing/views.cljs b/src/status_im/ui/screens/signing/views.cljs
@@ -360,17 +360,21 @@
         :chevron   true
         :accessory (if (or gas-price-loading? gas-loading?)
                      [react/small-loading-indicator]
-                     [react/view {:style               {:flex-direction :row}
-                                  :accessibility-label :custom-gas-fee}
-                      [react/nested-text {:style {:color colors/gray}}
-                       [{:style {:color colors/black}} (utils/format-decimals fee 6)]
-                       " "
-                       fee-display-symbol
-                       " • "]
-                      (if prices-loading?
-                        [react/small-loading-indicator]
-                        [react/text {:style {:color colors/black}} (i18n/format-currency converted-fee-value (:code wallet-currency))])
-                      [react/text {:style {:color colors/gray}} (str " " (:code wallet-currency))]])
+                     (if (= :gas-isnt-set gas-error-state)
+                       [react/text {:style               {:color colors/blue}
+                                    :accessibility-label :custom-gas-fee}
+                        (i18n/label :t/set-custom-fee)]
+                       [react/view {:style               {:flex-direction :row}
+                                    :accessibility-label :custom-gas-fee}
+                        [react/nested-text {:style {:color colors/gray}}
+                         [{:style {:color colors/black}} (utils/format-decimals fee 6)]
+                         " "
+                         fee-display-symbol
+                         " • "]
+                        (if prices-loading?
+                          [react/small-loading-indicator]
+                          [react/text {:style {:color colors/black}} (i18n/format-currency converted-fee-value (:code wallet-currency))])
+                        [react/text {:style {:color colors/gray}} (str " " (:code wallet-currency))]]))
         :on-press  #(re-frame/dispatch
                      [:signing.ui/open-fee-sheet
                       {:content        (fn [] [sheets/fee-bottom-sheet fee-display-symbol])