some fixes

status-im · Apr 18, 2024 · c449eba · c449eba
1 parent ab892de
commit c449eba
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/src/status_im/contexts/wallet/send/input_amount/view.cljs b/src/status_im/contexts/wallet/send/input_amount/view.cljs
@@ -147,8 +147,9 @@
                   :section-one-title (i18n/label :t/preferred-by-receiver)
                   :section-two-title (i18n/label :t/not-preferred-by-receiver)
                   :selected-networks (vec (map utils/id->network selected-networks))
+                  :receiver?         true
                   :account           account
-                  :button-label      (i18n/label :t/display)
+                  :button-label      "Apply"
                   :on-save           (fn [chain-ids]
                                        (rf/dispatch [:hide-bottom-sheet])
                                        (rf/dispatch [:wallet/update-receiver-networks chain-ids]))}])}]))

diff --git a/src/status_im/contexts/wallet/sheets/network_preferences/view.cljs b/src/status_im/contexts/wallet/sheets/network_preferences/view.cljs
@@ -11,7 +11,7 @@
             [utils.re-frame :as rf]))
 
 (defn view
-  [{:keys [title section-one-title section-two-title selected-networks account watch-only?]}]
+  [{:keys [title receiver? section-one-title section-two-title selected-networks account watch-only?]}]
   (let [state                               (reagent/atom :default)
         {:keys [color address
                 network-preferences-names]} (or account (rf/sub [:wallet/current-viewing-account]))
@@ -56,24 +56,25 @@
                           (i18n/label :t/network-preferences-desc-1)
                           (i18n/label :t/network-preferences-desc-2))
            :blur?       blur?}]
-         [quo/data-item
-          {:status          :default
-           :size            :default
-           :description     :default
-           :label           :none
-           :blur?           blur?
-           :card?           true
-           :title           (i18n/label :t/address)
-           :custom-subtitle (fn []
-                              [quo/address-text
-                               {:networks current-networks
-                                :address  address
-                                :blur?    blur?
-                                :format   :long}])
-           :container-style (merge style/data-item
-                                   {:background-color (colors/theme-colors colors/neutral-2_5
-                                                                           colors/neutral-90
-                                                                           theme)})}]
+         (when-not receiver?
+           [quo/data-item
+            {:status          :default
+             :size            :default
+             :description     :default
+             :label           :none
+             :blur?           blur?
+             :card?           true
+             :title           (i18n/label :t/address)
+             :custom-subtitle (fn []
+                                [quo/address-text
+                                 {:networks current-networks
+                                  :address  address
+                                  :blur?    blur?
+                                  :format   :long}])
+             :container-style (merge style/data-item
+                                     {:background-color (colors/theme-colors colors/neutral-2_5
+                                                                             colors/neutral-90
+                                                                             theme)})}])
          [quo/category
           {:list-type :settings
            :blur?     blur?
@@ -105,4 +106,4 @@
                               :on-press            (fn []
                                                      (let [chain-ids (map :chain-id current-networks)]
                                                        (on-save chain-ids)))
-                              :customization-color color}}]]))))
+                              :customization-color (or color :blue)}}]]))))