lint

* add chain id to the request

* add tests

* fix lint issues

* remove OPENSEA_API_KEY

* move subscription to a helper method for chain-ids

Makefile

@@ -282,11 +282,12 @@ SIMULATOR=iPhone 13
 # TODO: fix IOS_STATUS_GO_TARGETS to be either amd64 or arm64 when RN is upgraded
 run-ios: export TARGET := ios
 run-ios: export IOS_STATUS_GO_TARGETS := ios/arm64;iossimulator/amd64
+run-ios: export XCBeautify=$(shell which xcbeautify) # for react-native-cli to pick this up and to auto format output
 run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
-	npx react-native run-ios --simulator="$(SIMULATOR)" | xcbeautify
+	npx react-native run-ios --simulator="$(SIMULATOR)"
 else
-	npx react-native run-ios | xcbeautify
+	npx react-native run-ios
 endif
 
 show-ios-devices: ##@other shows connected ios device and its name

src/quo/components/wallet/token_input/style.cljs

@@ -49,8 +49,12 @@
              :height         "100%")))
 
 (defn text-input
-  [theme]
-  (assoc text-input-dimensions :color (colors/theme-colors colors/neutral-100 colors/white theme)))
+  [theme error?]
+  (assoc text-input-dimensions
+         :color
+         (if error?
+           (colors/resolve-color :danger theme)
+           (colors/theme-colors colors/neutral-100 colors/white theme))))
 
 (defn placeholder-text
   [theme]

src/quo/components/wallet/token_input/view.cljs

@@ -32,9 +32,12 @@
       (crypto-format num-value conversion crypto-decimals token))))
 
 (defn- data-info
-  [{:keys [theme token crypto-decimals conversion networks title crypto? currency amount]}]
+  [{:keys [theme token crypto-decimals conversion networks title crypto? currency amount error?]}]
   [rn/view {:style style/data-container}
-   [network-tag/view {:networks networks :title title}]
+   [network-tag/view
+    {:networks networks
+     :title    title
+     :status   (when error? :error)}]
    [text/text
     {:size   :paragraph-2
      :weight :medium
@@ -80,7 +83,7 @@
                                   (reset! value-atom v))
                                 (when on-change-text
                                   (on-change-text v)))]
-    (fn [{:keys [theme token customization-color show-keyboard? crypto? currency value]
+    (fn [{:keys [theme token customization-color show-keyboard? crypto? currency value error?]
           :or   {show-keyboard? true}}]
       [rn/pressable
        {:on-press focus-input
@@ -90,7 +93,7 @@
          :size  :size-32}]
        [rn/view {:style style/text-input-container}
         [rn/text-input
-         (cond-> {:style                    (style/text-input theme)
+         (cond-> {:style                    (style/text-input theme error?)
                   :placeholder-text-color   (style/placeholder-text theme)
                   :auto-focus               true
                   :ref                      set-ref

src/status_im/common/floating_button_page/view.cljs

@@ -52,7 +52,8 @@
      :remove-listeners    remove-listeners}))
 
 (defn view
-  [{:keys [header footer customization-color gradient-cover?]} &
+  [{:keys [header footer customization-color footer-container-padding gradient-cover?]
+    :or   {footer-container-padding (safe-area/get-top)}} &
    children]
   (reagent/with-let [window-height                (:height (rn/get-window))
                      footer-container-height      (reagent/atom 0)
@@ -94,7 +95,7 @@
                children)]
         [rn/keyboard-avoiding-view
          {:style                    style/keyboard-avoiding-view
-          :keyboard-vertical-offset (if platform/ios? (safe-area/get-top) 0)
+          :keyboard-vertical-offset (if platform/ios? footer-container-padding 0)
           :pointer-events           :box-none}
          [floating-container/view
           {:on-layout       set-footer-container-height

src/status_im/contexts/chat/messenger/composer/handlers.cljs

@@ -127,8 +127,9 @@
 (defn change-text
   "Update `text-value`, update cursor selection, find links, find mentions"
   [text
-   {:keys [input-ref record-reset-fn]}
-   {:keys [text-value cursor-position recording?]}]
+   {:keys [input-ref record-reset-fn] :as props}
+   {:keys [text-value cursor-position recording?]}
+   scroll-to-end]
   (reset! text-value text)
   (reagent/next-tick #(when @input-ref
                         (.setNativeProps ^js @input-ref
@@ -140,6 +141,8 @@
   (rf/dispatch [:chat.ui/set-chat-input-text text])
   (debounce/debounce-and-dispatch [:link-preview/unfurl-urls text]
                                   constants/unfurl-debounce-ms)
+  (when (string/ends-with? text (with-out-str (newline)))
+    (scroll-to-end props))
   (if (string/ends-with? text "@")
     (rf/dispatch [:mention/on-change-text text])
     (debounce/debounce-and-dispatch [:mention/on-change-text text] 300)))

src/status_im/contexts/chat/messenger/composer/style.cljs

@@ -69,17 +69,11 @@
    :min-height constants/input-height})
 
 (defn input-text
-  [{:keys [saved-emoji-kb-extra-height]}
-   {:keys [focused? maximized?]}
-   {:keys [max-height theme]}]
+  [{:keys [maximized?]}
+   {:keys [theme]}]
   (assoc typography/paragraph-1
          :color               (colors/theme-colors :black :white theme)
          :text-align-vertical :top
-         :position            (if @saved-emoji-kb-extra-height :relative :absolute)
-         :top                 0
-         :left                0
-         :right               (when (or focused? platform/ios?) 0)
-         :max-height          max-height
          :padding-bottom      (when @maximized? 0)))
 
 (defn background

src/status_im/contexts/chat/messenger/composer/utils.cljs

@@ -175,7 +175,8 @@
    :record-reset-fn             (atom nil)
    :scroll-y                    (atom 0)
    :selection-event             (atom nil)
-   :selection-manager           (rn/selectable-text-input-manager)})
+   :selection-manager           (rn/selectable-text-input-manager)
+   :composer-scrollview-ref     (atom nil)})
 
 (defn init-reactive-state
   []

src/status_im/contexts/chat/messenger/composer/view.cljs

@@ -68,7 +68,14 @@
         ;; Cursor position, needed to determine where to display the mentions view
         cursor-pos               (utils/cursor-y-position-relative-to-container
                                   props
-                                  state)]
+                                  state)
+        scroll-to-end            (fn []
+                                   ;; Needs to be queued, Otherwise might not be called on the right
+                                   ;; time.
+                                   (js/setTimeout #(when @(:composer-scrollview-ref props)
+                                                     (.scrollToEnd @(:composer-scrollview-ref props)))
+                                                  50))
+        chat-screen-loaded?      (rf/sub [:shell/chat-screen-loaded?])]
     (effects/did-mount props)
     (effects/initialize props
                         state
@@ -90,8 +97,7 @@
       {:style style/composer-sheet-and-jump-to-container}
       [sub-view/shell-button state chat-list-scroll-y window-height]
       [gesture/gesture-detector
-       {:gesture
-        (drag-gesture/drag-gesture props state animations dimensions keyboard-shown)}
+       {:gesture (drag-gesture/drag-gesture props state animations dimensions keyboard-shown)}
        [reanimated/view
         {:style     (style/sheet-container insets state animations theme)
          :on-layout #(handler/layout % state blur-height)}
@@ -112,36 +118,43 @@
           {:ref        #(reset! (:selectable-input-ref props) %)
            :menu-items @(:menu-items state)
            :style      (style/input-view state)}
-          [rn/text-input
-           {:ref                      #(reset! (:input-ref props) %)
-            :default-value            @(:text-value state)
-            :on-focus                 #(handler/focus props state animations dimensions)
-            :on-blur                  #(handler/blur state animations dimensions subscriptions)
-            :on-content-size-change   #(handler/content-size-change %
-                                                                    state
-                                                                    animations
-                                                                    dimensions
-                                                                    (or keyboard-shown
-                                                                        (:edit subscriptions)))
-            :on-scroll                #(handler/scroll % props state animations dimensions)
-            :on-change-text           #(handler/change-text % props state)
-            :on-selection-change      #(handler/selection-change % props state)
-            :on-selection             #(selection/on-selection % props state)
-            :keyboard-appearance      (quo.theme/theme-value :light :dark)
-            :max-font-size-multiplier 1
-            :multiline                true
-            :placeholder              (i18n/label :t/type-something)
-            :placeholder-text-color   (colors/theme-colors colors/neutral-40 colors/neutral-50)
-            :style                    (style/input-text props
-                                                        state
-                                                        {:max-height max-height
-                                                         :theme      theme})
-            :max-length               constants/max-text-size
-            :accessibility-label      :chat-message-input}]]]
-        [:<>
-         [gradients/view props state animations show-bottom-gradient?]
-         [link-preview/view]
-         [images/images-list]]
+          ;; https://github.com/facebook/react-native/issues/39660
+          [rn/scroll-view
+           {:on-scroll                       #(handler/scroll % props state animations dimensions)
+            :keyboard-should-persist-taps    :handled
+            :scroll-event-throttle           64
+            :ref                             #(reset! (:composer-scrollview-ref props) %)
+            :shows-vertical-scroll-indicator false}
+           [rn/text-input
+            {:ref                      #(reset! (:input-ref props) %)
+             :default-value            @(:text-value state)
+             :on-focus                 #(handler/focus props state animations dimensions)
+             :on-blur                  #(handler/blur state animations dimensions subscriptions)
+             :on-change-text           #(handler/change-text % props state scroll-to-end)
+             :on-selection-change      #(handler/selection-change % props state)
+             :on-content-size-change   #(handler/content-size-change %1
+                                                                     state
+                                                                     animations
+                                                                     dimensions
+                                                                     (or keyboard-shown
+                                                                         (:edit subscriptions)))
+             :on-selection             #(selection/on-selection % props state)
+             :keyboard-appearance      (quo.theme/theme-value :light :dark)
+             :max-font-size-multiplier 1
+             :multiline                true
+             :scroll-enabled           false
+             :placeholder              (i18n/label :t/type-something)
+             :placeholder-text-color   (colors/theme-colors colors/neutral-40 colors/neutral-50)
+             :style                    (style/input-text state
+                                                         {:max-height max-height
+                                                          :theme      theme})
+             :max-length               constants/max-text-size
+             :accessibility-label      :chat-message-input}]]]]
+        (when chat-screen-loaded?
+          [:<>
+           [gradients/view props state animations show-bottom-gradient?]
+           [link-preview/view]
+           [images/images-list]])
         [:f> actions/view props state animations window-height insets subscriptions]]]]]))
 
 (defn f-composer

src/status_im/contexts/preview/quo/wallet/token_input.cljs

@@ -21,7 +21,9 @@
    {:key     :currency
     :type    :select
     :options [{:key :usd}
-              {:key :eur}]}])
+              {:key :eur}]}
+   {:key  :error?
+    :type :boolean}])
 
 (defn view
   []

src/status_im/contexts/wallet/add_address_to_watch/view.cljs

@@ -122,17 +122,17 @@
                                 (rf/dispatch [:wallet/clean-scanned-address])
                                 (rf/dispatch [:wallet/clear-address-activity-check])
                                 (rf/dispatch [:navigate-back]))}]
-         :footer
-         [quo/button
-          {:customization-color customization-color
-           :disabled?           (or (string/blank? @input-value) (some? (validate @input-value)))
-           :on-press            (fn []
-                                  (rf/dispatch [:navigate-to
-                                                :confirm-address-to-watch
-                                                {:address @input-value}])
-                                  (clear-input))
-           :container-style     {:z-index 2}}
-          (i18n/label :t/continue)]}
+         :footer [quo/button
+                  {:customization-color customization-color
+                   :disabled?           (or (string/blank? @input-value)
+                                            (some? (validate @input-value)))
+                   :on-press            (fn []
+                                          (rf/dispatch [:navigate-to
+                                                        :confirm-address-to-watch
+                                                        {:address @input-value}])
+                                          (clear-input))
+                   :container-style     {:z-index 2}}
+                  (i18n/label :t/continue)]}
         [quo/text-combinations
          {:container-style style/header-container
           :title           (i18n/label :t/add-address)

src/status_im/contexts/wallet/events/collectibles.cljs

@@ -2,9 +2,9 @@
   (:require [camel-snake-kebab.core :as csk]
             [camel-snake-kebab.extras :as cske]
             [clojure.string :as string]
-            [re-frame.core :as rf]
             [taoensso.timbre :as log]
             [utils.ethereum.chain :as chain]
+            [utils.re-frame :as rf]
             [utils.transforms :as types]))
 
 (def collectible-data-types
@@ -66,8 +66,9 @@
          data-type           (collectible-data-types :header)
          fetch-criteria      {:fetch-type            (fetch-type :fetch-if-not-cached)
                               :max-cache-age-seconds max-cache-age-seconds}
+         chain-ids           (chain/chain-ids db)
          request-params      [request-id
-                              [(chain/chain-id db)]
+                              chain-ids
                               (keys (get-in db [:wallet :accounts]))
                               collectibles-filter
                               start-at-index

src/status_im/contexts/wallet/send/input_amount/component_spec.cljs

@@ -57,6 +57,7 @@
     (h/is-truthy (h/get-by-text "0"))
     (h/is-truthy (h/get-by-text "ETH"))
     (h/is-truthy (h/get-by-text "$0.00"))
+    (h/is-truthy (h/get-by-label-text :container))
     (h/is-disabled (h/get-by-label-text :button-one)))
 
   (h/test "Fill token input and confirm"
@@ -77,6 +78,7 @@
       (-> (h/wait-for #(h/get-by-text "$1234.50"))
           (.then (fn []
                    (h/is-truthy (h/get-by-label-text :button-one))
+                   (h/is-truthy (h/get-by-label-text :container))
                    (h/fire-event :press (h/get-by-label-text :button-one))
                    (h/was-called on-confirm))))))
 
@@ -99,61 +101,33 @@
       (-> (h/wait-for #(h/get-by-text "$1234.50"))
           (.then (fn []
                    (h/is-truthy (h/get-by-label-text :button-one))
+                   (h/is-truthy (h/get-by-label-text :container))
                    (h/fire-event :press (h/get-by-label-text :button-one))
                    (h/was-called on-confirm))))))
 
   (h/test "Try to fill more than limit"
     (h/setup-subs sub-mocks)
     (h/render [input-amount/view
-               {:crypto-decimals 10
-                :limit-crypto    286}])
+               {:crypto-decimals 1
+                :limit-crypto    1}])
 
     (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
     (h/fire-event :press (h/query-by-label-text :keyboard-key-9))
     (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
 
-    (-> (h/wait-for #(h/is-truthy (h/get-by-text "$290.00")))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-backspace))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-8))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/wait-for #(h/get-by-text "$2850.00"))))))
-
-  (h/test "Try to fill more than limit"
-    (h/setup-subs sub-mocks)
-    (h/render [input-amount/view
-               {:crypto-decimals 10
-                :limit-crypto    286
-                :on-confirm      #()}])
-
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-9))
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-
-    (-> (h/wait-for #(h/get-by-text "$290.00"))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-backspace))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-8))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/wait-for #(h/get-by-text "$2850.00"))))))
+    (h/is-truthy (h/get-by-label-text :container-error)))
 
   (h/test "Switch from crypto to fiat and check limit"
     (h/setup-subs sub-mocks)
     (h/render [input-amount/view
-               {:crypto-decimals 2
-                :limit-crypto    250
+               {:crypto-decimals 1
+                :limit-crypto    1
                 :on-confirm      #()}])
 
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
-    (h/fire-event :press (h/query-by-label-text :keyboard-key-0))
-    (-> (h/wait-for #(h/get-by-text "$200.00"))
+    (h/fire-event :press (h/query-by-label-text :keyboard-key-9))
+    (h/is-truthy (h/get-by-label-text :container-error))
+    (h/fire-event :press (h/query-by-label-text :reorder))
+
+    (-> (h/wait-for #(h/get-by-text "Max: 1000.00 USD"))
         (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :reorder))
-                 (h/wait-for #(h/get-by-text "2.00 ETH"))))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/wait-for #(h/get-by-text "20.50 ETH"))))
-        (.then (fn []
-                 (h/fire-event :press (h/query-by-label-text :keyboard-key-5))
-                 (h/wait-for #(h/get-by-text "20.50 ETH")))))))
+                 (h/wait-for #(h/is-truthy (h/get-by-label-text :container))))))))

src/status_im/contexts/wallet/send/input_amount/view.cljs

@@ -61,6 +61,11 @@
                  (>= (js/parseFloat balance) input-value)))
        (map first)))
 
+(defn- reset-input-error
+  [new-value prev-value input-error]
+  (reset! input-error
+    (> new-value prev-value)))
+
 (defn- f-view-internal
   ;; crypto-decimals and limit-crypto args are needed for component tests only
   [{:keys [crypto-decimals limit-crypto]}]
@@ -75,6 +80,7 @@
         limit-fiat                (.toFixed (* (:total-balance token) conversion-rate) 2)
         crypto-decimals           (or crypto-decimals (utils/get-crypto-decimals-count token))
         input-value               (reagent/atom "")
+        input-error               (reagent/atom false)
         current-limit             (reagent/atom {:amount   limit-crypto
                                                  :currency token-symbol})
         handle-swap               (fn [crypto?]
@@ -84,27 +90,30 @@
                                                                :currency token-symbol}
                                                               {:amount   limit-fiat
                                                                :currency currency}))
-                                      (when (> num-value (:amount @current-limit))
-                                        (reset! input-value ""))))
+                                      (reset-input-error num-value
+                                                         (:amount @current-limit)
+                                                         input-error)))
         handle-keyboard-press     (fn [v]
-                                    (let [current-value @input-value
-                                          new-value     (make-new-input current-value v)
-                                          num-value     (or (parse-double new-value) 0)]
-                                      (when (and (not loading-suggested-routes?)
-                                                 (<= num-value (:amount @current-limit)))
+                                    (let [current-value        @input-value
+                                          new-value            (make-new-input current-value v)
+                                          num-value            (or (parse-double new-value) 0)
+                                          current-limit-amount (:amount @current-limit)]
+                                      (when (not loading-suggested-routes?)
                                         (reset! input-value new-value)
+                                        (reset-input-error num-value current-limit-amount input-error)
                                         (reagent/flush))))
         handle-delete             (fn [_]
                                     (when-not loading-suggested-routes?
-                                      (swap! input-value #(subs % 0 (dec (count %))))
-                                      (reagent/flush)))
+                                      (let [current-limit-amount (:amount @current-limit)]
+                                        (swap! input-value #(subs % 0 (dec (count %))))
+                                        (reset-input-error @input-value current-limit-amount input-error)
+                                        (reagent/flush))))
         handle-on-change          (fn [v]
                                     (when (valid-input? @input-value v)
                                       (let [num-value            (or (parse-double v) 0)
                                             current-limit-amount (:amount @current-limit)]
-                                        (if (> num-value current-limit-amount)
-                                          (reset! input-value (str current-limit-amount))
-                                          (reset! input-value v))
+                                        (reset! input-value v)
+                                        (reset-input-error num-value current-limit-amount input-error)
                                         (reagent/flush))))]
     (fn [{:keys [on-confirm]
           :or   {on-confirm #(rf/dispatch [:wallet/send-select-amount
@@ -119,7 +128,8 @@
                                (empty? @input-value)
                                (<= input-num-value 0)
                                (> input-num-value (:amount @current-limit)))
-            amount            (str @input-value " " token-symbol)]
+            amount            (str @input-value " " token-symbol)
+            {:keys [color]}   (rf/sub [:wallet/current-viewing-account])]
         (rn/use-effect
          (fn []
            (let [dismiss-keyboard-fn   #(when (= % "active") (rn/dismiss-keyboard!))
@@ -135,7 +145,8 @@
                                                            100)))
                        [@input-value])
         [rn/view
-         {:style style/screen}
+         {:style               style/screen
+          :accessibility-label (str "container" (when @input-error "-error"))}
          [account-switcher/view
           {:icon-name     :i/arrow-left
            :on-press      #(rf/dispatch [:navigate-back-within-stack :wallet-send-input-amount])
@@ -145,6 +156,7 @@
            :token           token-symbol
            :currency        currency
            :crypto-decimals crypto-decimals
+           :error?          @input-error
            :networks        (:networks token)
            :title           (i18n/label :t/send-limit {:limit limit-label})
            :conversion      conversion-rate
@@ -159,10 +171,11 @@
            :loading-networks (find-affordable-networks token @input-value)
            :networks         (:networks token)}]
          [quo/bottom-actions
-          {:actions          :1-action
-           :button-one-label (i18n/label :t/confirm)
-           :button-one-props {:disabled? confirm-disabled?
-                              :on-press  on-confirm}}]
+          {:actions             :1-action
+           :button-one-label    (i18n/label :t/confirm)
+           :button-one-props    {:disabled? confirm-disabled?
+                                 :on-press  on-confirm}
+           :customization-color color}]
          [quo/numbered-keyboard
           {:container-style (style/keyboard-container bottom)
            :left-action     :dot

src/status_im/contexts/wallet/send/select_address/view.cljs

@@ -128,26 +128,30 @@
     (fn []
       (let [selected-tab          (or (rf/sub [:wallet/send-tab]) (:id (first tabs-data)))
             token                 (rf/sub [:wallet/wallet-send-token])
-            valid-ens-or-address? (boolean (rf/sub [:wallet/valid-ens-or-address?]))]
+            valid-ens-or-address? (boolean (rf/sub [:wallet/valid-ens-or-address?]))
+            {:keys [color]}       (rf/sub [:wallet/current-viewing-account])]
         (rn/use-effect (fn []
                          (fn []
                            (rf/dispatch [:wallet/clean-scanned-address])
                            (rf/dispatch [:wallet/clean-local-suggestions]))))
         [floating-button-page/view
-         {:header [account-switcher/view
-                   {:on-press      on-close
-                    :margin-top    (safe-area/get-top)
-                    :switcher-type :select-account}]
-          :footer (when (> (count @input-value) 0)
-                    [quo/button
-                     {:accessibility-label :continue-button
-                      :type                :primary
-                      :disabled?           (not valid-ens-or-address?)
-                      :on-press            #(rf/dispatch [:wallet/select-send-address
-                                                          {:address  @input-value
-                                                           :token    token
-                                                           :stack-id :wallet-select-address}])}
-                     (i18n/label :t/continue)])}
+         {:footer-container-padding 0
+          :header                   [account-switcher/view
+                                     {:on-press      on-close
+                                      :margin-top    (safe-area/get-top)
+                                      :switcher-type :select-account}]
+          :footer                   (when (> (count @input-value) 0)
+                                      [quo/button
+                                       {:accessibility-label :continue-button
+                                        :type                :primary
+                                        :disabled?           (not valid-ens-or-address?)
+                                        :on-press            #(rf/dispatch [:wallet/select-send-address
+                                                                            {:address @input-value
+                                                                             :token token
+                                                                             :stack-id
+                                                                             :wallet-select-address}])
+                                        :customization-color color}
+                                       (i18n/label :t/continue)])}
          [quo/text-combinations
           {:title                     (i18n/label :t/send-to)
            :container-style           style/title-container

src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs

@@ -162,28 +162,30 @@
                                    :address   (utils/get-shortened-address to-address)}]
         [rn/view {:style {:flex 1}}
          [floating-button-page/view
-          {:header              [quo/page-nav
-                                 {:icon-name           :i/arrow-left
-                                  :on-press            on-close
-                                  :margin-top          (safe-area/get-top)
-                                  :background          :blur
-                                  :accessibility-label :top-bar
-                                  :right-side          [{:icon-name           :i/advanced
-                                                         :on-press            #(js/alert
-                                                                                "to be implemented")
-                                                         :accessibility-label :advanced-options}]}]
-           :footer              (if route
-                                  [standard-auth/slide-button
-                                   {:size                :size-48
-                                    :track-text          (i18n/label :t/slide-to-send)
-                                    :container-style     {:z-index 2}
-                                    :customization-color account-color
-                                    :on-auth-success     #(rf/dispatch [:wallet/send-transaction
-                                                                        (security/safe-unmask-data %)])
-                                    :auth-button-label   (i18n/label :t/confirm)}]
-                                  [rn/activity-indicator])
-           :gradient-cover?     true
-           :customization-color (:color account)}
+          {:footer-container-padding 0
+           :header                   [quo/page-nav
+                                      {:icon-name           :i/arrow-left
+                                       :on-press            on-close
+                                       :margin-top          (safe-area/get-top)
+                                       :background          :blur
+                                       :accessibility-label :top-bar
+                                       :right-side          [{:icon-name           :i/advanced
+                                                              :on-press            #(js/alert
+                                                                                     "to be implemented")
+                                                              :accessibility-label :advanced-options}]}]
+           :footer                   (if route
+                                       [standard-auth/slide-button
+                                        {:size                :size-48
+                                         :track-text          (i18n/label :t/slide-to-send)
+                                         :container-style     {:z-index 2}
+                                         :customization-color account-color
+                                         :on-auth-success     #(rf/dispatch [:wallet/send-transaction
+                                                                             (security/safe-unmask-data
+                                                                              %)])
+                                         :auth-button-label   (i18n/label :t/confirm)}]
+                                       [rn/activity-indicator])
+           :gradient-cover?          true
+           :customization-color      (:color account)}
           [rn/view
            [transaction-title
             {:token-symbol token-symbol

src/status_im/contexts/wallet/send/transaction_progress/view.cljs

@@ -32,19 +32,20 @@
     (fn []
       (let [transaction-details (rf/sub [:wallet/send-transaction-progress])]
         [floating-button-page/view
-         {:header              [quo/page-nav
-                                {:type                :no-title
-                                 :background          :blur
-                                 :icon-name           :i/close
-                                 :margin-top          (safe-area/get-top)
-                                 :on-press            leave-page
-                                 :accessibility-label :top-bar}]
-          :footer              [quo/button
-                                {:customization-color color
-                                 :on-press            leave-page}
-                                (i18n/label :t/done)]
-          :customization-color color
-          :gradient-cover?     true}
+         {:footer-container-padding 0
+          :header                   [quo/page-nav
+                                     {:type                :no-title
+                                      :background          :blur
+                                      :icon-name           :i/close
+                                      :margin-top          (safe-area/get-top)
+                                      :on-press            leave-page
+                                      :accessibility-label :top-bar}]
+          :footer                   [quo/button
+                                     {:customization-color color
+                                      :on-press            leave-page}
+                                     (i18n/label :t/done)]
+          :customization-color      color
+          :gradient-cover?          true}
          [rn/view {:style style/content-container}
           [rn/image
            {:source (resources/get-image :transaction-progress)

src/status_im/subs/wallet/networks_test.cljs

@@ -12,14 +12,17 @@
            :short-name       "eth"
            :network-name     :ethereum
            :related-chain-id 1
+           :chain-id         3
            :layer            1}
           {:test?            true
            :short-name       "arb1"
            :related-chain-id 42161
+           :chain-id         4
            :layer            2}
           {:test?            true
            :short-name       "opt"
            :related-chain-id 10
+           :chain-id         5
            :layer            2}]
    :prod [{:test?      false
            :short-name "eth"

src/utils/ethereum/chain.cljs

@@ -84,3 +84,10 @@
 (defn chain-id
   [db]
   (network->chain-id (get-current-network db)))
+
+(defn chain-ids
+  [db]
+  (let [test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
+        networks               (get-in db [:wallet :networks])
+        env-networks           (get networks (if test-networks-enabled? :test :prod))]
+    (map :chain-id env-networks)))

src/utils/ethereum/chain_test.cljs

@@ -3,7 +3,21 @@
     [cljs.test :refer-macros [deftest is]]
     [utils.ethereum.chain :as chain]))
 
+(defn chain-ids-db
+  [test-networks-enabled?]
+  {:profile/profile {:test-networks-enabled? test-networks-enabled?}
+   :wallet          {:networks {:test [{:chain-id 3}
+                                       {:chain-id 4}
+                                       {:chain-id 5}]
+                                :prod [{:chain-id 1}
+                                       {:chain-id 42161}
+                                       {:chain-id 10}]}}})
+
 (deftest chain-id->chain-keyword
   (is (= (chain/chain-id->chain-keyword 1) :mainnet))
   (is (= (chain/chain-id->chain-keyword 5) :goerli))
   (is (= (chain/chain-id->chain-keyword 5777) :custom)))
+
+(deftest chain-ids
+  (is (= (chain/chain-ids (chain-ids-db false)) [1 42161 10]))
+  (is (= (chain/chain-ids (chain-ids-db true)) [3 4 5])))