logs: temporarily enabling debug log for release build

Co-authored-by: Shivek Khurana <khuranashivek@outlook.com>

.env.release

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -20,4 +20,4 @@ FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
 STATUS_PROXY_STAGE_NAME=prod
 FLAG_WALLET_CONNECT_ENABLED=1
-API_LOGGING_ENABLED=0
+API_LOGGING_ENABLED=1

VERSION

@@ -1 +1 @@
-2.32.0
+2.32.21800

doc/debugging.md

@@ -150,7 +150,7 @@ This one is straightforward, just evaluate a navigation dispatch form from anywh
 
 #### REPL-ing a component
 
-This is also straightforward, but there are some small differences. Just like above, we only have to evaluate a dispatch form, as follows:
+This is also straighforward, but there are some small differences. Just like above, we only have to evaluate a dispatch form, as follows:
 
 ```cljs
 ;; example debugging a quo component, although it could be any other component e.g. from the `status-im2` ns.

logs/README.md

@@ -26,4 +26,4 @@ These log files are uploaded to Jenkins as CI job artifacts on failure using `ar
 * `set_xcode_version.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`.
   - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj` for "Run Script" build Phase.
 * `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/).
-  - Configured via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.
+  - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.

package.json

@@ -66,7 +66,7 @@
     "react-native-shake": "^3.3.1",
     "react-native-share": "10.0.2",
     "react-native-static-safe-area-insets": "^2.2.0",
-    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.6.4",
+    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.6.3",
     "react-native-svg": "13.10.0",
     "react-native-webview": "13.6.3",
     "react-syntax-highlighter": "^15.5.0"

resources/terms-of-use.mdwn

@@ -1,9 +1,10 @@
 Status Terms of Use
 
-Last updated: 14 August 2024
+Last updated: 10 December 2024
 
 1. Introduction
 
+
 1.1 Who we are
 
 Status is developing a set of open source projects that use peer-to-peer technologies to help people transact securely, communicate freely, and organise with confidence. Anyone participating in these projects helps to build technology and tools that empowers people to advance their own sovereign communities.
@@ -14,7 +15,7 @@ Status does not provide any services, such as financial services, to users of St
 
 1.2 About these terms
 
-These terms are a contract between you and Status and apply to your use of Status Software. The term “Status Software” as used herein means a software developed by Status and is composed of a secure messaging tool, a crypto wallet, and a Web 3 browser integrated together.
+These terms are a contract between you and Status and apply to your use of Status Software. The term “Status Software” as used herein means a software developed by Status and is composed of a secure messaging tool and a crypto wallet integrated together.
 
 Please read these terms carefully before using Status Software. By installing or using Status Software on any device, you agree to these terms. If you do not agree, you should not install or use Status Software.
 
@@ -48,57 +49,56 @@ If a dispute arises between you and Status, we will seek to first solve it amica
 
 At Status, we strive to develop open source software that can serve as a secure communication tool that helps to uphold human rights. Status Software is specifically designed to facilitate the free flow of information, protect the right to private, secure communications and promote the sovereignty of individuals.
 
-Status Software is composed of a secure messaging tool, a crypto wallet, and a Web 3 browser integrated together. The software developed by Status in this regard is simply called “Status Software” and you can find more details about its development on Status’ GitHub page.
+Status Software is composed of a secure messaging tool and a crypto wallet integrated together. The software developed by Status in this regard is simply called “Status Software” and you can find more details about its development on Status’ GitHub page.
 
 Status Software is open source client software that is designed to be user-friendly and can be installed or run in a web browser on your local desktop or mobile device. You can use Status Software to interact with and participate in Web 3 protocols, applications and peer to peer networks (referred to in these terms collectively, as “Web 3”). Please note that Status Software is not a blockchain protocol, or a blockchain network, a platform or a web-based platform.
 
-Status develops Status Software and makes it available for you to run in a web browser or for your local use on your desktop or mobile device. This means that you are solely responsible for your activity and any potential risk or loss you may incur through using the Status Software as further detailed below in these terms.
+Status develops Status Software and makes it available for you to run in a web browser or for your local use on your desktop or mobile device. This means that you are solely responsible for your activity and any potential risk or loss you may incur through using the Status Software as further detailed below in these terms. 
+
+As a result of the privacy-first design of Status Software:
+
+1. Status does not store nor have access to user data, messages, or content;
+2. Status cannot associate content or actions with individual users. However, users may choose to disclose certain limited information to Status voluntarily, such as when opting in to share usage analytics. This data, shared only through explicit consent of the user, is processed in accordance with our Privacy Policy;
+3. Status cannot block or ban users from using Status Software features;
+4. Status has no means of monitoring, moderating, removing, modifying or regulating users’ content or activity, except in Community Spaces created and directly managed by Status.
 
 2.1.1 Wallet
 
 Status Software includes a crypto wallet. We will refer to such wallet functionality in these terms as “Wallet”.
 
-The Wallet is your own personal crypto wallet. This type of wallet is sometimes also called “non-custodial”, “self-custodial” or “self-hosted”, which means you are in complete control of the crypto tokens (the “Digital Assets”) in the Wallet. Status will never have access to or control over your seed phrase, private keys or Digital Assets in your Wallet given its design.
+The Wallet is your own personal crypto wallet. This type of wallet is sometimes also called “non-custodial”, “self-custodial” or “self-hosted”, which means you are in complete control of the crypto tokens (the “Digital Assets”) in the Wallet. Status will never have access to or control over your seed phrase, private keys or Digital Assets in your Wallet given its design. 
+ 
+Using the Wallet, you are able to send, receive and store Digital Assets and connect to and interact with third-party services that enable the exchange of Digital Assets for fiat currency and Web 3, including certain blockchain bridges and decentralised exchanges. 
 
-Using the Wallet, you are able to send, receive and store Digital Assets and connect to and interact with third-party services that enable the exchange of Digital Assets for fiat currency and Web 3, including certain blockchain bridges and decentralised exchanges.
+The Wallet contains the latest security standards, anti-phishing mechanisms and locally generated and stored public and private keys to ensure that your Digital Assets are secured to the highest standards. 
 
-The Wallet contains the latest security standards, anti-phishing mechanisms and locally generated and stored public and private keys to ensure that your Digital Assets are secured to the highest standards.
+When generating an account, a randomisation process is started on your own device that generates a key pair. Status does not have visibility of or access to your private keys. You are solely responsible for storing and securing your seed phrase and private keys, and creating, storing and securing their backups. If you fail to maintain the appropriate security measures of your private keys, it may result in you losing access to your Wallet and control of any Digital Assets in your Wallet. If you lose or forget your seed phrase or private keys, Status will not be able to help you recover or replace them and further, Status will not be able to assist you with the recovery of your Digital Assets. 
 
-When generating an account, a randomisation process is started on your own device that generates a key pair. Status does not have visibility of or access to your private keys. You are solely responsible for storing and securing your seed phrase and private keys, and creating, storing and securing their backups. If you fail to maintain the appropriate security measures of your private keys, it may result in you losing access to your Wallet and control of any Digital Assets in your Wallet. If you lose or forget your seed phrase or private keys, Status will not be able to help you recover or replace them and further, Status will not be able to assist you with the recovery of your Digital Assets.
-
-In order to further enhance the security of storing your private keys, you may also choose to store your keys on a keycard, such as the Status Keycard.
+In order to further enhance the security of storing your private keys, you may also choose to store your keys on a keycard, such as the Status Keycard. 
 
 2.1.2 Messaging
 
-Status Software includes messaging functionality that enables secure communication between users. We will refer to the messaging functionality of Status Software and the Status Community Spaces collectively in these terms, as “Messaging”.
+Status Software includes messaging functionality that enables secure communication between users. We will refer to the messaging functionality of Status Software and the Community Spaces collectively in these terms, as “Messaging”.
 
-Messaging uses an open source, peer-to-peer protocol with end-to-end encryption and metadata suppression to protect your messages from third parties (including Status). End-to-end encryption means that only the sender and recipient of a message can read its contents, and no one else. Peer-to-peer communication is accomplished using the Waku peer-to-peer messaging protocol, which relies on a distributed network of nodes instead of a centralised server. This means that there is no central party or server from which messages can be intercepted, modified or blocked. Learn more about Waku and how it works on Waku’s relevant website.
+Messaging uses an open source, peer-to-peer protocol with end-to-end encryption and metadata suppression to protect your messages from third parties (including Status). End-to-end encryption means that only the sender and recipient of a message can read its contents, and no one else. Peer-to-peer communication is accomplished using the Waku peer-to-peer messaging protocol, which relies on a distributed network of nodes instead of a centralised server. This means that there is no central party or server from which messages can be intercepted, modified or blocked. Learn more about Waku and how it works on Waku’s relevant website. 
 
-Within Messaging, you will also be able to participate in Status Community Spaces. This feature allows users to create their own token-gated communities where you can create group chats and engage with your communities, while leveraging the possibilities, functionality and benefits of blockchain technology. You will also be able to create (and join) open and public communities on Status Software that are accessible to other users. We note that content in these open and public communities will be accessible to all other users of Status Software. Nonetheless, all content will still be protected by the same end-to-end encryption utilised in Status Software.
+Within Messaging, you will also be able to participate in Community Spaces. This feature allows users to create and join communities with varying access and discoverability options, which may include token-gated communities, private communities and open and public communities,  where you can create group chats and engage with your communities. We note that content in all Community Spaces will be accessible to the members of those spaces. For open and public communities, content will be accessible to all other users of Status Software. Nonetheless, all content, regardless of the type of community, will still be protected by the same end-to-end encryption utilised in Status Software. 
 
-2.1.2 Web 3 browser
-
-Status Software also includes a Web 3 browser through which you may access and interact with Web 3, exchanges, marketplaces, games and more. We will refer to the Web 3 browser in these terms as the “Web 3 Browser”.
 
 
 3. Privacy
 
-Status uses an open source, peer-to-peer protocol with end-to-end encryption and metadata suppression, which by design, means that Status (and any third party) is unable to and does not collect, store, own, control or have any visibility or means of access to your identity, Wallet, browsing information, any user private keys, Digital Assets, messages, content, history of interactions, user accounts or any other user information.
-
-Therefore, Status does not (and cannot) monetise any users’ data or content, such as messages or browser information and Status does not have any interest in doing so.
-
-Status however processes a limited amount of user data to ensure the technical operation of the Status Software, enhance its functionality, and improve the user experience. For more details on this limited process of user data, please refer to our Privacy Policy.
+Status processes a limited amount of user data to ensure the technical operation of the Status Software, enhance its functionality, and improve the user experience. For more details on this limited process of user data, please refer to our Privacy Policy.
 
 If you use third party services offered through Status Software, your privacy may not be protected and you will be subject to the privacy terms and conditions of such third parties. Please refer to our full terms regarding third party services below.
 
 
 
-
 4. Using third party services and interacting with Web 3
 
 When using Status Software, you may access or use third party products, services or tools (“Third Party Services”) and interact with Web 3. Status Software is only one means of interacting with these Third Party Services and Web 3 and you can independently utilise other means and tools to do so as well.
 
-Your interactions with Web 3 could include many aspects, such as interacting with smart contracts that reside on blockchain networks, for example to swap Digital Assets or use (crypto) bridges, or deploying your own smart contracts through Status Community Spaces. You may also interact with and participate in peer-to-peer networks which could vary in their level of decentralisation, ranging from more centralised networks controlled by a single party to networks governed by decentralised communities.
+Your interactions with Web 3 could include many aspects, such as interacting with smart contracts that reside on blockchain networks, for example to swap Digital Assets or use (crypto) bridges, or deploying your own smart contracts through Community Spaces. You may also interact with and participate in peer-to-peer networks which could vary in their level of decentralisation, ranging from more centralised networks controlled by a single party to networks governed by decentralised communities.
 
 When you use Third Party Services or interact with Web 3, you acknowledge that Status does not control or operate any Third Party Service or Web 3. These products, services, or tools are either controlled, operated, owned, or licensed by the third party providing them, or they may operate autonomously, independently of Status or any other party.
 
@@ -127,7 +127,7 @@ Although security is a top priority for us and many functions of Status Software
 
 7. Content
 
-At Status, we believe in the sovereignty of individuals and we stand for the cause of personal liberty. We aim to promote social, political, and economic freedoms through Status Software, which is built on the principles of the free flow of information and censorship resistance. Through Status Software, particularly when using Messenger and Status Community Spaces, you will be able to create and interact with various content. We consider content to include anything you (or any other user) create, post, distribute or exchange through Status Software (as well as any future functions that may be added to Status Software), whether its text, links, GIFs, emoji, photos or any other media formats.
+At Status, we believe in the sovereignty of individuals and we stand for the cause of personal liberty. We aim to promote social, political, and economic freedoms through Status Software, which is built on the principles of the free flow of information and censorship resistance. Through Status Software, particularly when using Messenger and Community Spaces, you will be able to create and interact with various content. We consider content to include anything you (or any other user) create, post, distribute or exchange through Status Software (as well as any future functions that may be added to Status Software), whether its text, links, GIFs, emoji, photos or any other media formats.
 
 You are solely responsible for any content that you create, post, distribute or submit, messages you exchange or any other activity you may engage in related to your content on or through Status Software and any harm or liability that may result from such content.
 
@@ -145,25 +145,35 @@ You acknowledge that Status has no means of monitoring, moderating, removing, mo
 
 8.1 Adherence to Status Principles
 
-One of Status’ goals is the widespread adoption of the decentralised web while also staying true to our Principles. These terms are designed to reflect our Principles, while providing important legal protections for Status and setting out guidelines and terms for the Status Software community of users. We ask that you use Status Software in a way that promotes and aligns with the Status Principles.
+One of Status’ goals is the widespread adoption of the decentralised web while also staying true to our Principles. These terms are designed to reflect our Principles, while providing important legal protections for Status and setting out guidelines and terms for the Status Software community of users. We ask that you use Status Software in a way that promotes and aligns with the Status Principles, and avoid actions that may harm or disrupt the community of users. 
 
-8.2 Limitation on certain uses of and acts in Status Software
+We strongly encourage users to act responsibly and ethically in their interactions and refrain from (i) inciting harm, violence or illegal activity, (ii) engaging in harassment, abuse or discrimination, and (iii) spreading false or misleading information.
 
-You shall not, nor try to, encourage or assist others using Status Software to:
-1. gain or try to gain unauthorised access to Status Software;
-2. interfere with or disrupt the integrity, safety, security, availability or performance of Status Software;
-3. generate accounts on Status Software through unauthorised means;
-4. install or transmit on or through Status Software, any viruses, worms, malware, Trojan horses, or other harmful or destructive code or content;
-5. use spam, data mining, or other unsolicited promotional methods, machine generated content, or unethical or unwanted commercial content;
-6. engage in phishing, spoofing, or similar fraudulent acts;
-7. knowingly spread misinformation or impersonate another person or legal entity;
-8. incite, commit or threaten, harm or engage in illegal or inappropriate conduct including stalking, bullying, harassment, intimidation or abuse another individual or group;
-9. engage in or organise child sexual exploitation of any kind;
-10. use Status Software, if you are subject to sanctions, or otherwise designated on a list of prohibited or restricted parties as maintained by, the United Nations, the European Union or any of its member states or the Singaporean, Swiss or US government, or intend to interact or transact with such parties;
-11. violate, misappropriate or infringe the rights of Status, other users of Status Software, or any other third parties in any way, including but not limited to privacy, publicity, intellectual property, confidentiality, property or other rights;
-12. engage in any activity through Status Software that may be in violation of applicable law, rules or regulations in your jurisdiction;
-13. interfere, disrupt, negatively affect, or inhibit other users from their use of Status Software; or
-14. engage in any attack, hack, denial-of-service attack, interference, or exploit of any smart contract in connection with use of Status Software.
+If you are a Community Space creator or admin, we encourage you to establish your own guidelines to foster healthy and respectful community environments for your members.
+
+8.2 Community Governance
+
+Community Spaces are self-sovereign environments managed independently by their creators and appointed admins. These users are solely responsible for:
+
+1. establishing and enforcing their own community guidelines;
+2. configuring access controls and permissions;
+3. managing community membership, including accepting or rejecting requests;
+4. moderating content and interactions within their community; and
+5. taking actions against community members who violate their community guidelines or behave disruptively, including the ability to exclude or ban members.
+
+By participating in Community Spaces, you acknowledge that community governance lies solely with community creators and their appointed admins. Status cannot monitor, moderate or intervene in community interactions or governance decisions within any Community Space, except in cases where a Community Space is created and directly managed by Status.
+
+8.3 Limitation on certain uses of and acts in Status Software
+
+You agree not to use Status Software, or attempt or assist others to use it, in a manner that:
+1. uses unauthorised methods to create or gain access to an account on Status Software;
+2. interferes with or disrupts the integrity, safety, security, availability or performance of Status Software;
+3. installs or transmits on or through Status Software, any viruses, worms, malware, Trojan horses, or other harmful or destructive code or content;
+4. use Status Software, if you are subject to sanctions, or otherwise designated on a list of prohibited or restricted parties as maintained by, the United Nations, the European Union or any of its member states or the Singaporean, Swiss or US government, or intend to interact or transact with such parties;
+5. violate, misappropriate or infringe the rights of Status, other users of Status Software, or any other third parties in any way, including but not limited to privacy, publicity, intellectual property, confidentiality, property or other rights;
+6. engage in any activity through Status Software that may be in violation of applicable law, rules or regulations in your jurisdiction;
+7. interfere, disrupt, negatively affect, or inhibit other users from their use of Status Software; or
+8. engage in any attack, hack, denial-of-service attack, interference, or exploit of any smart contract in connection with use of Status Software.
 
 
 9. Fees
@@ -252,6 +262,7 @@ You release Status from all liability related to any claim, cause of action, con
 14. Limitation of liability
 
 Status will not be held liable to you under any contract, negligence, strict liability, or other legal or equitable theory for any lost profits, cost of procurement for substitute services, or any special, incidental, or consequential damages related to, arising from, or in any way connected with these terms, Status, your use of Status Software, particularly where Status has indicated that it is not responsible. This includes without limitation, your use of SNT or other Digital Assets (creating, distributing, transacting in or otherwise) even if Status has been advised of the possibility of such damages.
+
 In any event, Status’ aggregate liability for any claims is limited to EUR 100 (one hundred Euros). This limitation of liability will apply to the extent permitted by applicable law.
 
 

src/keycard/keycard.cljs

@@ -71,10 +71,6 @@
   [callback]
   (.addListener ^js event-emitter "keyCardOnDisconnected" callback))
 
-(defn on-card-new-pairing
-  [callback]
-  (.addListener ^js event-emitter "keyCardNewPairing" callback))
-
 (defn on-nfc-user-cancelled
   [callback]
   (.addListener ^js event-emitter "keyCardOnNFCUserCancelled" callback))

src/legacy/status_im/ui/screens/log_level_settings/views.cljs

@@ -33,6 +33,9 @@
         name]]]]))
 
 (def log-levels
+  "The status-go log library (zap) doesn't support the trace level, so we remove
+  the trace option from the UI. When trace is enabled an error will happen while
+  trying to login (user will see the error 'wrong password')."
   [{:name  "DISABLED"
     :value ""}
    {:name  "ERROR"
@@ -42,9 +45,7 @@
    {:name  "INFO"
     :value "INFO"}
    {:name  "DEBUG"
-    :value "DEBUG"}
-   {:name  "TRACE"
-    :value "TRACE"}])
+    :value "DEBUG"}])
 
 (views/defview log-level-settings
   []

src/status_im/common/standard_authentication/standard_auth/slide_button/view.cljs

@@ -15,7 +15,8 @@
         auth-method          (rf/sub [:auth-method])
         biometric-auth?      (= auth-method constants/auth-method-biometric)
         on-complete-callback (rn/use-callback
-                              (fn []
+                              (fn [reset-slider-fn]
+                                (js/setTimeout #(reset-slider-fn false) 500)
                                 (rf/dispatch [:standard-auth/authorize
                                               {:auth-button-icon-left auth-button-icon-left
                                                :theme                 theme
@@ -25,19 +26,13 @@
                                                :on-auth-fail          on-auth-fail
                                                :auth-button-label     auth-button-label}]))
                               (vec (conj dependencies on-auth-success on-auth-fail)))
-        on-slider-complete   (rn/use-callback
-                              (fn [reset-slider-fn]
-                                (js/setTimeout #(reset-slider-fn false) 500)
-                                (if (fn? on-complete)
-                                  (on-complete)
-                                  (on-complete-callback)))
-                              [on-complete on-complete-callback])
+        on-complete          (or on-complete on-complete-callback)
         biometric-type       (rf/sub [:biometrics/supported-type])]
     [quo/slide-button
      {:container-style     container-style
       :size                size
       :customization-color customization-color
-      :on-complete         on-slider-complete
+      :on-complete         on-complete
       :track-icon          (if biometric-auth?
                              (biometric/get-icon-by-type biometric-type)
                              :password)

src/status_im/contexts/chat/home/chat_list_item/view.cljs

@@ -280,31 +280,17 @@
    {:style (merge style/container {:margin-horizontal 0})}
    [chat-item item]])
 
-(defn- bottom-sheet-options
-  [chat-id chat-type]
-  (cond-> {:content (fn []
-                      (let [chat (rf/sub [:chats/chat-by-id chat-id])]
-                        [actions/chat-actions chat false]))}
-    (= chat-type constants/one-to-one-chat-type)
-    (assoc :selected-item
-           (fn []
-             (let [chat (rf/sub [:chats/chat-by-id chat-id])]
-               [chat-user chat])))))
-
 (defn chat-list-item
-  [{:keys [chat-id]}]
-  (let [{:keys [chat-type]
-         :as   chat}        (rf/sub [:chats/chat-by-id chat-id])
-        customization-color (rf/sub [:profile/customization-color])
-        theme               (quo.theme/use-theme)
-        on-long-press       (rn/use-callback
-                             (fn []
-                               (rf/dispatch [:show-bottom-sheet
-                                             (bottom-sheet-options chat-id chat-type)]))
-                             [chat-id chat-type])]
+  [{:keys [chat-id chat-type]
+    :as   item} theme]
+  (let [customization-color (rf/sub [:profile/customization-color])]
     [rn/touchable-highlight
      {:style          style/container
       :on-press       (open-chat chat-id)
       :underlay-color (colors/resolve-color customization-color theme 5)
-      :on-long-press  on-long-press}
-     [chat-item chat]]))
+      :on-long-press  #(rf/dispatch [:show-bottom-sheet
+                                     (cond-> {:content (fn [] [actions/chat-actions item false])}
+                                       (= chat-type constants/one-to-one-chat-type)
+                                       (assoc :selected-item
+                                              (fn [] [chat-user item])))])}
+     [chat-item item]]))

src/status_im/contexts/chat/home/view.cljs

@@ -23,10 +23,12 @@
   [_ index]
   #js {:length 56 :offset (* 56 index) :index index})
 
-(defn filter-by-tab
+(defn filter-and-sort-items-by-tab
   [tab items]
   (let [k (if (= tab :tab/groups) :group-chat :chat-id)]
-    (filter k items)))
+    (->> items
+         (filter k)
+         (sort-by :timestamp >))))
 
 (defn empty-state-content
   [theme]
@@ -43,43 +45,32 @@
          :description (i18n/label :t/no-messages-description)
          :image       (resources/get-themed-image :cat-in-box theme)}})
 
-(defn on-end-reached
-  []
-  (re-frame/dispatch [:chat/show-more-chats]))
-
-(defn chat-key-fn
-  [chat]
-  (or (:chat-id chat) (:public-key chat) (:id chat)))
-
 (defn chats
   [{:keys [theme selected-tab set-scroll-ref scroll-shared-value]}]
   (let [unfiltered-items (rf/sub [:chats/chats-stack-items])
-        items            (filter-by-tab selected-tab unfiltered-items)
-        on-scroll        (rn/use-callback
-                          (fn [event]
-                            (common.banner/set-scroll-shared-value
-                             {:scroll-input (oops/oget event
-                                                       "nativeEvent.contentOffset.y")
-                              :shared-value scroll-shared-value})))]
+        items            (filter-and-sort-items-by-tab selected-tab unfiltered-items)]
     (if (empty? items)
       [common.empty-state/view
        {:selected-tab selected-tab
         :tab->content (empty-state-content theme)}]
       [reanimated/flat-list
        {:ref                               set-scroll-ref
-        :key-fn                            chat-key-fn
+        :key-fn                            #(or (:chat-id %) (:public-key %) (:id %))
         :content-inset-adjustment-behavior :never
         :header                            [common.header-spacing/view]
         :get-item-layout                   get-item-layout
-        :on-end-reached                    on-end-reached
+        :on-end-reached                    #(re-frame/dispatch [:chat/show-more-chats])
         :keyboard-should-persist-taps      :always
         :data                              items
-        :render-fn                         chat-list-item/chat-list-item
+        :render-fn                         (fn [item]
+                                             (chat-list-item/chat-list-item item theme))
         :scroll-event-throttle             8
         :content-container-style           {:padding-bottom
                                             shell.constants/floating-shell-button-height
                                             :padding-top 8}
-        :on-scroll                         on-scroll}])))
+        :on-scroll                         #(common.banner/set-scroll-shared-value
+                                             {:scroll-input (oops/oget % "nativeEvent.contentOffset.y")
+                                              :shared-value scroll-shared-value})}])))
 
 (defn contact-item-render
   [{:keys [public-key] :as item} theme]

src/status_im/contexts/communities/actions/community_options/component_spec.cljs

@@ -130,12 +130,4 @@
                                                             :role-permissions? true}
                    :profile/test-networks-enabled?         false})
     (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (h/is-truthy (h/get-by-translation-text :t/unmute-community)))
-
-  (h/test "opened community"
-    (h/setup-subs {:communities/my-pending-request-to-join nil
-                   :communities/community                  {:joined    false
-                                                            :spectated true}
-                   :profile/test-networks-enabled?         false})
-    (h/render [options/community-options-bottom-sheet {:id "test"}])
-    (h/is-truthy (h/get-by-translation-text :t/close-community))))
+    (h/is-truthy (h/get-by-translation-text :t/unmute-community))))

src/status_im/contexts/communities/actions/community_options/view.cljs

@@ -125,14 +125,6 @@
    :on-press            #(rf/dispatch [:show-bottom-sheet
                                        {:content (fn [] [leave-menu/leave-sheet id color])}])})
 
-(defn close-community
-  [id]
-  {:icon                :i/close-circle
-   :label               (i18n/label :t/close-community)
-   :accessibility-label :close-community
-   :danger?             true
-   :on-press            #(rf/dispatch [:communities/leave id])})
-
 (defn cancel-request-to-join
   [id request-id]
   {:icon                :i/block
@@ -144,7 +136,7 @@
                                                          request-id])}])})
 
 (defn not-joined-options
-  [{:keys [id join-pending? spectated? token-gated? intro-message test-networks-enabled?]}]
+  [id token-gated? intro-message test-networks-enabled?]
   (let [common   [(show-qr id) (share-community id)]
         specific (cond
                    (and token-gated?
@@ -157,22 +149,19 @@
 
                    (not token-gated?)
                    [(view-members id) (view-rules id intro-message) (invite-contacts id)])]
-    [(concat specific
-             common
-             (when (and spectated? (not join-pending?))
-               [(assoc (close-community id) :add-divider? true)]))]))
+    [(concat specific common)]))
 
 (defn join-request-sent-options
-  [{:keys [id request-id] :as config}]
-  [(conj (first (not-joined-options config))
+  [id token-gated? request-id intro-message test-networks-enabled?]
+  [(conj (first (not-joined-options id token-gated? intro-message test-networks-enabled?))
          (assoc (cancel-request-to-join id request-id) :add-divider? true))])
 
 (defn banned-options
-  [config]
-  (not-joined-options config))
+  [id token-gated? intro-message test-networks-enabled?]
+  (not-joined-options id token-gated? intro-message test-networks-enabled?))
 
 (defn joined-options
-  [{:keys [id token-gated? muted? muted-till color intro-message]}]
+  [id token-gated? muted? muted-till color intro-message]
   [[(view-members id)
     (view-rules id intro-message)
     (when (and token-gated? (ff/enabled? ::ff/community.view-token-requirements))
@@ -188,7 +177,7 @@
    [(assoc (leave-community id color) :add-divider? true)]])
 
 (defn owner-options
-  [{:keys [id token-gated? muted? muted-till intro-message]}]
+  [id token-gated? muted? muted-till intro-message]
   [[(view-members id)
     (view-rules id intro-message)
     (when token-gated? (view-token-gating id))
@@ -201,29 +190,22 @@
 
 (defn get-context-drawers
   [{:keys [id]}]
-  (let [{:keys
-         [id admin joined
-          banList color muted muted-till
-          spectated role-permissions?
-          intro-message]} (rf/sub [:communities/community id])
-        request-id        (rf/sub [:communities/my-pending-request-to-join id])
-        test-networks?    (rf/sub [:profile/test-networks-enabled?])
-        config            {:id             id
-                           :color          color
-                           :muted-till     muted-till
-                           :muted?         muted
-                           :spectated?     spectated
-                           :token-gated?   role-permissions?
-                           :intro-message  intro-message
-                           :test-networks? test-networks?
-                           :join-pending?  (boolean request-id)
-                           :request-id     request-id}]
+  (let [{:keys [role-permissions? admin joined
+                muted banList muted-till color
+                intro-message]} (rf/sub [:communities/community id])
+        request-id              (rf/sub [:communities/my-pending-request-to-join id])
+        test-networks?          (rf/sub [:profile/test-networks-enabled?])]
     (cond
-      admin      (owner-options config)
-      joined     (joined-options config)
-      request-id (join-request-sent-options config)
-      banList    (banned-options config)
-      :else      (not-joined-options config))))
+      admin
+      (owner-options id role-permissions? muted muted-till intro-message)
+      joined
+      (joined-options id role-permissions? muted muted-till color intro-message)
+      request-id
+      (join-request-sent-options id role-permissions? request-id intro-message test-networks?)
+      banList
+      (banned-options id role-permissions? intro-message test-networks?)
+      :else
+      (not-joined-options id role-permissions? intro-message test-networks?))))
 
 (defn community-options-bottom-sheet
   [id]

src/status_im/contexts/keycard/effects.cljs

@@ -8,8 +8,7 @@
             [status-im.contexts.keycard.utils :as keycard.utils]
             [status-im.contexts.profile.config :as profile.config]
             [utils.hex :as hex]
-            [utils.re-frame :as rf]
-            [utils.transforms :as transforms]))
+            [utils.re-frame :as rf]))
 
 (defonce ^:private active-listeners (atom []))
 
@@ -25,7 +24,6 @@
   (reset! active-listeners
     [(keycard/on-card-connected #(rf/dispatch [:keycard/on-card-connected]))
      (keycard/on-card-disconnected #(rf/dispatch [:keycard/on-card-disconnected]))
-     (keycard/on-card-new-pairing #(rf/dispatch [:keycard/on-card-new-pairing (transforms/js->clj %)]))
      (when platform/ios?
        (keycard/on-nfc-user-cancelled #(rf/dispatch [:keycard.ios/on-nfc-user-cancelled])))
      (when platform/ios?

src/status_im/contexts/keycard/events.cljs

@@ -25,22 +25,21 @@
     :fx [(when-let [event (get-in db [:keycard :on-card-disconnected-event-vector])]
            [:dispatch event])]}))
 
-(rf/reg-event-fx :keycard/on-card-new-pairing
- (fn [{:keys [db]} [{:keys [pairing instanceUID]}]]
-   (when (and instanceUID pairing)
-     (let [pairings     (get-in db [:keycard :pairings])
-           new-pairings (assoc pairings
-                               instanceUID
-                               {:pairing   pairing
-                                :paired-on (utils.datetime/timestamp)})]
-       {:db                       (assoc-in db [:keycard :pairings] new-pairings)
-        :keycard/persist-pairings new-pairings}))))
-
 (rf/reg-event-fx :keycard/on-retrieve-pairings-success
  (fn [{:keys [db]} [pairings]]
    {:db (assoc-in db [:keycard :pairings] pairings)
     :fx [[:effects.keycard/set-pairing-to-keycard pairings]]}))
 
+(rf/reg-event-fx :keycard/update-pairings
+ (fn [{:keys [db]} [instance-uid pairing]]
+   (let [pairings     (get-in db [:keycard :pairings])
+         new-pairings (assoc pairings
+                             instance-uid
+                             {:pairing   pairing
+                              :paired-on (utils.datetime/timestamp)})]
+     {:db                       (assoc-in db [:keycard :pairings] new-pairings)
+      :keycard/persist-pairings new-pairings})))
+
 (rf/reg-event-fx :keycard/on-action-with-pin-error
  (fn [{:keys [db]} [error]]
    (let [tag-was-lost?     (keycard.utils/tag-lost? (:error error))
@@ -127,8 +126,10 @@
 (rf/reg-event-fx :keycard/get-application-info
  (fn [_ [{:keys [key-uid on-success on-error]}]]
    {:effects.keycard/get-application-info
-    {:on-success (fn [app-info]
+    {:on-success (fn [{:keys [instance-uid new-pairing] :as app-info}]
                    (rf/dispatch [:keycard/update-application-info app-info])
+                   (when (and instance-uid new-pairing)
+                     (rf/dispatch [:keycard/update-pairings instance-uid new-pairing]))
                    (if-let [error (keycard.utils/validate-application-info key-uid app-info)]
                      (if on-error
                        (on-error error)

src/status_im/contexts/profile/edit/header/events.cljs

@@ -5,9 +5,11 @@
             [utils.re-frame :as rf]))
 
 (rf/reg-event-fx :profile/update-local-picture
- (fn [{:keys [db]} [images]]
+ (fn [{:keys [db now]} [images]]
    {:db (if images
-          (assoc-in db [:profile/profile :images] images)
+          (assoc-in db
+           [:profile/profile :images]
+           (map #(assoc % :clock now) images))
           (update db :profile/profile dissoc :images))}))
 
 (rf/reg-event-fx :profile/edit-profile-picture-success

src/status_im/contexts/profile/settings/events.cljs

@@ -129,8 +129,10 @@
            [:dispatch [:hide-bottom-sheet]]]})))
 
 (rf/reg-event-fx :profile.settings/update-local-picture
- (fn [{:keys [db]} [images]]
-   {:db (assoc-in db [:profile/profile :images] images)}))
+ (fn [{:keys [db now]} [images]]
+   {:db (assoc-in db
+         [:profile/profile :images]
+         (map #(assoc % :clock now) images))}))
 
 (rf/reg-event-fx :profile.settings/mnemonic-was-shown
  (fn [_]

src/status_im/contexts/shell/qr_reader/view.cljs

@@ -10,6 +10,7 @@
             [status-im.feature-flags :as ff]
             [utils.address :as utils-address]
             [utils.debounce :as debounce]
+            [utils.ethereum.eip.eip681 :as eip681]
             [utils.i18n :as i18n]
             [utils.url :as url]))
 
@@ -27,6 +28,13 @@
   (let [index (string/index-of scanned-text "#")]
     (subs scanned-text (inc index))))
 
+(defn eip681-address?
+  [scanned-text]
+  (-> scanned-text
+      eip681/parse-uri
+      :address
+      boolean))
+
 (defn pairing-qr-code?
   [_]
   false)
@@ -80,10 +88,10 @@
       (debounce/debounce-and-dispatch [:generic-scanner/scan-success address] 300)
       (debounce/debounce-and-dispatch [:shell/change-tab :wallet-stack] 300))
 
-    (utils-address/eip-681-address? scanned-text)
+    (eip681-address? scanned-text)
     (do
-      (debounce/debounce-and-dispatch [:generic-scanner/scan-success
-                                       (utils-address/eip-681-address->eth-address scanned-text)]
+      (debounce/debounce-and-dispatch [:wallet-legacy/request-uri-parsed
+                                       (eip681/parse-uri scanned-text)]
                                       300)
       (debounce/debounce-and-dispatch [:shell/change-tab :wallet-stack] 300))
 

src/status_im/contexts/wallet/bridge/bridge_to/view.cljs

@@ -1,5 +1,6 @@
 (ns status-im.contexts.wallet.bridge.bridge-to.view
   (:require
+    [clojure.string :as string]
     [quo.core :as quo]
     [quo.foundations.resources :as quo.resources]
     [quo.theme]
@@ -15,34 +16,27 @@
 (defn- bridge-token-component
   []
   (fn [{:keys [chain-id network-name]} {:keys [supported-networks] :as token}]
-    (let [network                               (rf/sub [:wallet/network-details-by-chain-id chain-id])
-          currency                              (rf/sub [:profile/currency])
-          currency-symbol                       (rf/sub [:profile/currency-symbol])
-          prices-per-token                      (rf/sub [:wallet/prices-per-token])
-          selected-network                      (rf/sub [:wallet/send-network])
-          {selected-network-chain-id :chain-id} selected-network
-          balance                               (utils/calculate-total-token-balance token [chain-id])
-          crypto-value                          (utils/get-standard-crypto-format token
-                                                                                  balance
-                                                                                  prices-per-token)
-          fiat-value                            (utils/calculate-token-fiat-value
-                                                 {:currency         currency
-                                                  :balance          balance
-                                                  :token            token
-                                                  :prices-per-token prices-per-token})
-          fiat-formatted                        (utils/fiat-formatted-for-ui currency-symbol
-                                                                             fiat-value)
-          token-available-on-network?           (network-utils/token-available-on-network?
-                                                 supported-networks
-                                                 chain-id)]
+    (let [network                     (rf/sub [:wallet/network-details-by-chain-id chain-id])
+          currency                    (rf/sub [:profile/currency])
+          currency-symbol             (rf/sub [:profile/currency-symbol])
+          prices-per-token            (rf/sub [:wallet/prices-per-token])
+          balance                     (utils/calculate-total-token-balance token [chain-id])
+          crypto-value                (utils/get-standard-crypto-format token balance prices-per-token)
+          fiat-value                  (utils/calculate-token-fiat-value
+                                       {:currency         currency
+                                        :balance          balance
+                                        :token            token
+                                        :prices-per-token prices-per-token})
+          fiat-formatted              (utils/fiat-formatted-for-ui currency-symbol
+                                                                   fiat-value)
+          token-available-on-network? (network-utils/token-available-on-network? supported-networks
+                                                                                 chain-id)]
       [quo/network-list
        {:label         (name network-name)
         :network-image (quo.resources/get-network (:network-name network))
         :token-value   (str crypto-value " " (:symbol token))
         :fiat-value    fiat-formatted
-        :state         (if (and token-available-on-network? (not= chain-id selected-network-chain-id))
-                         :default
-                         :disabled)
+        :state         (if token-available-on-network? :default :disabled)
         :on-press      #(rf/dispatch [:wallet/select-bridge-network
                                       {:network-chain-id chain-id
                                        :stack-id         :screen/wallet.bridge-to}])}])))
@@ -61,7 +55,8 @@
                            (assoc account-token
                                   :networks           (:networks token)
                                   :supported-networks (:supported-networks token)))
-        bridge-to-title  (i18n/label :t/select-network-to-receive)]
+        bridge-to-title  (i18n/label :t/bridge-to
+                                     {:name (string/upper-case (str token-symbol))})]
 
     (hot-reload/use-safe-unmount #(rf/dispatch [:wallet/clean-bridge-to-selection]))
 

src/status_im/contexts/wallet/bridge/flow_config.cljs

@@ -1,7 +1,9 @@
 (ns status-im.contexts.wallet.bridge.flow-config)
 
 (def steps
-  [{:screen-id  :screen/wallet.bridge-select-asset
+  [{:screen-id  :screen/wallet.select-from
+    :skip-step? (fn [db] (some? (get-in db [:wallet :current-viewing-account-address])))}
+   {:screen-id  :screen/wallet.bridge-select-asset
     :skip-step? (fn [db] (some? (get-in db [:wallet :ui :send :token])))}
    {:screen-id  :screen/wallet.bridge-to
     :skip-step? (fn [db] (some? (get-in db [:wallet :ui :send :bridge-to-chain-id])))}

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

@@ -21,4 +21,5 @@
                                               :stack-id :screen/wallet.bridge-input-amount}]))
      :on-navigate-back       (fn []
                                (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
+                               (rf/dispatch [:wallet/clean-disabled-from-networks])
                                (rf/dispatch [:wallet/clean-send-amount]))}]])

src/status_im/contexts/wallet/common/scan_account/view.cljs

@@ -13,7 +13,7 @@
      {:title           (i18n/label :t/scan-qr)
       :subtitle        (i18n/label :t/scan-an-address-qr-code)
       :error-message   (i18n/label :t/oops-this-qr-does-not-contain-an-address)
-      :validate-fn     #(utils-address/supported-scan-address? %)
+      :validate-fn     #(utils-address/supported-address? %)
       :on-success-scan (fn [result]
                          (let [address (utils-address/supported-address->eth-address result)]
                            (when on-result (on-result address))

src/status_im/contexts/wallet/common/token_value/view.cljs

@@ -77,31 +77,24 @@
 (defn token-value-drawer
   [token watch-only? entry-point]
   (let [token-symbol         (:token token)
-        token-data           (rf/sub [:wallet/token-by-symbol-from-first-available-account-with-balance
-                                      token-symbol])
+        token-data           (rf/sub [:wallet/token-by-symbol token-symbol])
         selected-account     (rf/sub [:wallet/current-viewing-account-address])
         token-owners         (rf/sub [:wallet/operable-addresses-with-token-symbol token-symbol])
         testnet-mode?        (rf/sub [:profile/test-networks-enabled?])
         account-owns-token?  (rf/sub [:wallet/current-account-owns-token token-symbol])
-        network-details      (rf/sub [:wallet/network-details])
         receive-token-symbol (if (= token-symbol "SNT") "ETH" "SNT")
         token-owned?         (if selected-account account-owns-token? (seq token-owners))
         asset-to-receive     (rf/sub [:wallet/token-by-symbol receive-token-symbol])
-        unique-owner?        (= (count token-owners) 1)
-        params               (cond-> {:start-flow?   true
-                                      :owners        token-owners
-                                      :testnet-mode? testnet-mode?}
+        params               (cond-> {:start-flow?      true
+                                      :owners           token-owners
+                                      :testnet-mode?    testnet-mode?
+                                      :asset-to-receive asset-to-receive}
                                selected-account
                                (assoc :token        token-data
                                       :stack-id     :screen/wallet.accounts
                                       :has-balance? (-> (get-in token [:values :fiat-unformatted-value])
                                                         money/above-zero?))
-                               (and (not selected-account) unique-owner?)
-                               (assoc :token-symbol token-symbol
-                                      :token        token-data
-                                      :stack-id     :wallet-stack)
-
-                               (and (not selected-account) (not unique-owner?))
+                               (not selected-account)
                                (assoc :token-symbol token-symbol
                                       :stack-id     :wallet-stack))]
     [quo/action-drawer
@@ -115,13 +108,9 @@
                    (action-send params entry-point))
                  (action-receive selected-account)
                  (when token-owned?
-                   (action-swap (assoc params
-                                       :asset-to-receive
-                                       asset-to-receive)))
+                   (action-swap params))
                  (when token-owned?
                    (action-bridge (assoc params
-                                         :network-details
-                                         network-details
                                          :bridge-disabled?
                                          (send-utils/bridge-disabled? token-symbol))))]))]]))
 
@@ -131,11 +120,7 @@
    (cond-> item
      (or (not watch-only?) (ff/enabled? ::ff/wallet.long-press-watch-only-asset))
      (assoc :on-long-press
-            (fn []
-              (when (= entry-point :wallet-stack)
-                (rf/dispatch [:wallet/close-account-page])
-                (rf/dispatch [:wallet/clean-current-viewing-account]))
-              (rf/dispatch
-               [:show-bottom-sheet
-                {:content       (fn [] [token-value-drawer item watch-only? entry-point])
-                 :selected-item (fn [] [quo/token-value item])}]))))])
+            #(rf/dispatch
+              [:show-bottom-sheet
+               {:content       (fn [] [token-value-drawer item watch-only? entry-point])
+                :selected-item (fn [] [quo/token-value item])}])))])

src/status_im/contexts/wallet/common/utils.cljs

@@ -546,20 +546,14 @@
   (let [priority #(get constants/token-sort-priority (:symbol %) ##Inf)]
     (sort-by (juxt :symbol priority) tokens)))
 
-(defn token-with-balance
-  ([token networks]
-   (token-with-balance token networks nil))
-  ([token networks chain-ids]
-   (assoc token
-          :networks           (network-utils/network-list-with-positive-balance token networks)
-          :supported-networks (network-utils/network-list token networks)
-          :available-balance  (calculate-total-token-balance token)
-          :total-balance      (calculate-total-token-balance token chain-ids))))
-
 (defn tokens-with-balance
   [tokens networks chain-ids]
   (map (fn [token]
-         (token-with-balance token networks chain-ids))
+         (assoc token
+                :networks           (network-utils/network-list-with-positive-balance token networks)
+                :supported-networks (network-utils/network-list token networks)
+                :available-balance  (calculate-total-token-balance token)
+                :total-balance      (calculate-total-token-balance token chain-ids)))
        tokens))
 
 (defn estimated-time-format

src/status_im/contexts/wallet/common/wizard/events.cljs

@@ -1,11 +1,23 @@
 (ns status-im.contexts.wallet.common.wizard.events
-  (:require [status-im.contexts.wallet.common.wizard.utils :as wizard-utils]
+  (:require [status-im.contexts.wallet.bridge.flow-config :as wallet-bridge-flow]
+            [status-im.contexts.wallet.send.flow-config :as wallet-send-flow]
             [utils.re-frame :as rf]))
 
+(defn- wizard-find-next-screen
+  [db flow-id current-screen]
+  (let [flow-config (case flow-id
+                      :wallet-send-flow   wallet-send-flow/steps
+                      :wallet-bridge-flow wallet-bridge-flow/steps
+                      nil)]
+    (first (filter (fn [{:keys [skip-step? screen-id]}]
+                     (and (not= screen-id current-screen)
+                          (not (and (fn? skip-step?) (skip-step? db)))))
+                   flow-config))))
+
 (rf/reg-event-fx
  :wallet/wizard-navigate-forward
  (fn [{:keys [db]} [{:keys [current-screen flow-id start-flow?]}]]
-   (let [next-screen (wizard-utils/wizard-find-next-screen db flow-id current-screen)]
+   (let [next-screen (wizard-find-next-screen db flow-id current-screen)]
      {:fx [[:dispatch
             (if start-flow?
               [:open-modal (:screen-id next-screen)]

src/status_im/contexts/wallet/common/wizard/utils.cljs

@@ -1,14 +0,0 @@
-(ns status-im.contexts.wallet.common.wizard.utils
-  (:require [status-im.contexts.wallet.bridge.flow-config :as wallet-bridge-flow]
-            [status-im.contexts.wallet.send.flow-config :as wallet-send-flow]))
-
-(defn wizard-find-next-screen
-  [db flow-id current-screen]
-  (let [flow-config (case flow-id
-                      :wallet-send-flow   wallet-send-flow/steps
-                      :wallet-bridge-flow wallet-bridge-flow/steps
-                      nil)]
-    (first (filter (fn [{:keys [skip-step? screen-id]}]
-                     (and (not= screen-id current-screen)
-                          (not (and (fn? skip-step?) (skip-step? db)))))
-                   flow-config))))

src/status_im/contexts/wallet/events.cljs

@@ -10,13 +10,11 @@
     [status-im.contexts.settings.wallet.effects]
     [status-im.contexts.settings.wallet.events]
     [status-im.contexts.wallet.common.activity-tab.events]
-    [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.common.utils.external-links :as external-links]
     [status-im.contexts.wallet.common.utils.networks :as network-utils]
     [status-im.contexts.wallet.data-store :as data-store]
     [status-im.contexts.wallet.db :as db]
     [status-im.contexts.wallet.item-types :as item-types]
-    [status-im.contexts.wallet.sheets.network-selection.view :as network-selection]
     [status-im.contexts.wallet.tokens.events]
     [status-im.feature-flags :as ff]
     [taoensso.timbre :as log]
@@ -116,7 +114,7 @@
 (rf/reg-event-fx
  :wallet/fetch-assets-for-address
  (fn [_ [address]]
-   {:fx [[:dispatch [:wallet/get-wallet-token-for-accounts [address]]]
+   {:fx [[:dispatch [:wallet/get-wallet-token-for-account address]]
          [:dispatch [:wallet/request-collectibles-for-account address]]]}))
 
 (defn- reconcile-accounts
@@ -206,42 +204,34 @@
 
 (rf/reg-event-fx :wallet/get-wallet-token-for-all-accounts
  (fn [{:keys [db]}]
-   (let [addresses (->> (get-in db [:wallet :accounts])
-                        (vals)
-                        (keep :address)
-                        (vec))]
-     {:fx [[:dispatch [:wallet/get-wallet-token-for-accounts addresses]]]})))
+   {:fx (->> (get-in db [:wallet :accounts])
+             vals
+             (mapv
+              (fn [{:keys [address]}]
+                [:dispatch [:wallet/get-wallet-token-for-account address]])))}))
 
-(rf/reg-event-fx :wallet/get-wallet-token-for-accounts
- (fn [{:keys [db]} [addresses]]
-   {:db (reduce
-         (fn [db address]
-           (assoc-in db [:wallet :ui :tokens-loading address] true))
-         db
-         addresses)
+(rf/reg-event-fx :wallet/get-wallet-token-for-account
+ (fn [{:keys [db]} [address]]
+   {:db (assoc-in db [:wallet :ui :tokens-loading address] true)
     :fx [[:json-rpc/call
           [{:method     "wallet_fetchOrGetCachedWalletBalances"
-            :params     [addresses true]
-            :on-success [:wallet/store-wallet-token addresses]
-            :on-error   [:wallet/get-wallet-token-for-accounts-failed addresses]}]]]}))
+            :params     [[address] true]
+            :on-success [:wallet/store-wallet-token address]
+            :on-error   [:wallet/get-wallet-token-for-account-failed address]}]]]}))
 
 (rf/reg-event-fx
- :wallet/get-wallet-token-for-accounts-failed
- (fn [{:keys [db]} [addresses error]]
+ :wallet/get-wallet-token-for-account-failed
+ (fn [{:keys [db]} [address error]]
    (log/info "failed to get wallet token "
              {:error  error
-              :event  :wallet/get-wallet-token-for-accounts
-              :params addresses})
+              :event  :wallet/get-wallet-token-for-account
+              :params address})
    {:fx [[:dispatch [:wallet/get-last-wallet-token-update-if-needed]]]
-    :db (reduce
-         (fn [db address]
-           (assoc-in db [:wallet :ui :tokens-loading address] false))
-         db
-         addresses)}))
+    :db (assoc-in db [:wallet :ui :tokens-loading address] false)}))
 
 (rf/reg-event-fx
  :wallet/store-wallet-token
- (fn [{:keys [db]} [addresses raw-tokens-data]]
+ (fn [{:keys [db]} [address raw-tokens-data]]
    (let [supported-chains-by-token-symbol (get-in db [:wallet :tokens :supported-chains-by-symbol])
          profile-currency                 (get-in db [:profile/profile :currency])
          tokens                           (data-store/rpc->tokens raw-tokens-data
@@ -254,18 +244,13 @@
                                                  accounts))
                                              stored-accounts
                                              tokens-per-account))
-         symbols                          (reduce-kv
-                                           (fn [acc _ tokens-data]
-                                             (into acc (map :symbol tokens-data)))
-                                           #{}
-                                           tokens)]
+         symbols                          (reduce-kv (fn [acc _ v]
+                                                       (into acc (map :symbol v)))
+                                                     #{}
+                                                     tokens)]
      {:db (-> db
               (update-in [:wallet :accounts] add-tokens tokens)
-              ((fn [db]
-                 (reduce (fn [db address]
-                           (assoc-in db [:wallet :ui :tokens-loading address] false))
-                         db
-                         addresses))))
+              (assoc-in [:wallet :ui :tokens-loading address] false))
       :fx [[:dispatch [:wallet/get-last-wallet-token-update-if-needed]]
            [:effects.wallet.tokens/fetch-market-values
             {:symbols    symbols
@@ -357,79 +342,19 @@
 (rf/reg-event-fx :wallet/get-keypairs get-keypairs)
 
 (rf/reg-event-fx :wallet/bridge-select-token
- (fn [{:keys [db]}
-      [{:keys [token token-symbol stack-id network owners network-details start-flow?] :as params}]]
-   (let [{:keys [wallet]}             db
-         unique-owner                 (when (= (count owners) 1)
-                                        (first owners))
-         token                        (if (and unique-owner (nil? token))
-                                        (let [token (utils/get-token-from-account db
-                                                                                  token-symbol
-                                                                                  unique-owner)]
-                                          (utils/token-with-balance token network-details))
-                                        token)
-         missing-recipient?           (-> db :wallet :ui :send :to-address nil?)
-         to-address                   (or unique-owner
-                                          (-> db :wallet :current-viewing-account-address)
-                                          (utils/get-default-account (-> db :wallet :accounts)))
-         view-id                      (:view-id db)
-         root-screen?                 (or (= view-id :wallet-stack) (nil? view-id))
-         multi-account-balance?       (-> (utils/get-accounts-with-token-balance (:accounts wallet)
-                                                                                 token)
-                                          (count)
-                                          (> 1))
-         account-not-defined?         (and (not unique-owner) multi-account-balance?)
-         networks-with-balance        (when (and token (:balances-per-chain token))
-                                        (filter #(not= (:balance %) "0")
-                                                (vals (:balances-per-chain token))))
-         balance-in-only-one-network? (when networks-with-balance (= (count networks-with-balance) 1))
-         test-networks-enabled?       (get-in db [:profile/profile :test-networks-enabled?])
-         network-details              (-> (get-in db
-                                                  [:wallet :networks
-                                                   (if test-networks-enabled? :test :prod)])
-                                          (network-utils/sorted-networks-with-details))
-         network                      (if balance-in-only-one-network?
-                                        (first (filter #(= (:chain-id %)
-                                                           (:chain-id (first networks-with-balance)))
-                                                       network-details))
-                                        network)]
+ (fn [{:keys [db]} [{:keys [token token-symbol stack-id start-flow?]}]]
+   (let [missing-recipient? (-> db :wallet :ui :send :to-address nil?)
+         to-address         (-> db :wallet :current-viewing-account-address)]
      {:db (cond-> db
             :always            (assoc-in [:wallet :ui :send :tx-type] :tx/bridge)
             token              (assoc-in [:wallet :ui :send :token] token)
             token-symbol       (assoc-in [:wallet :ui :send :token-symbol] token-symbol)
-            network            (assoc-in [:wallet :ui :send :network] network)
             missing-recipient? (assoc-in [:wallet :ui :send :to-address] to-address))
-      :fx (cond
-            ;; If the token has a balance in more than one account and this was dispatched from the
-            ;; general wallet screen, open the account selection screen.
-            (and account-not-defined? root-screen?)
-            [[:dispatch [:open-modal :screen/wallet.select-from]]]
-
-            ;; If the token has a balance in only one account (or this was dispatched from the
-            ;; account screen) and the network is already set, navigate forward in the bridge flow.
-            (some? network)
-            [[:dispatch
-              [:wallet/wizard-navigate-forward
-               {:current-screen stack-id
-                :start-flow?    start-flow?
-                :flow-id        :wallet-bridge-flow}]]]
-
-            ;; If we know which account to bridge the token from but the network is not set yet,
-            ;; show the network selection drawer.
-            :else
-            [[:dispatch [:wallet/switch-current-viewing-account to-address]]
-             [:dispatch
-              [:show-bottom-sheet
-               {:content (fn []
-                           [network-selection/view
-                            {:title             (i18n/label :t/select-network-to-bridge-from)
-                             :token-symbol      (or token-symbol (:symbol token))
-                             :source            :bridge
-                             :on-select-network (fn [network]
-                                                  (rf/dispatch [:hide-bottom-sheet])
-                                                  (rf/dispatch
-                                                   [:wallet/bridge-select-token
-                                                    (assoc params :network network)]))}])}]]])})))
+      :fx [[:dispatch
+            [:wallet/wizard-navigate-forward
+             {:current-screen stack-id
+              :start-flow?    start-flow?
+              :flow-id        :wallet-bridge-flow}]]]})))
 
 (rf/reg-event-fx :wallet/start-bridge
  (fn [{:keys [db]}]

src/status_im/contexts/wallet/events_test.cljs

@@ -116,19 +116,20 @@
         address-2 "0x2"]
     (reset! rf-db/app-db {:wallet {:accounts {address-1 {:address address-1}
                                               address-2 {:address address-2}}}})
-    (is (match? [[:dispatch [:wallet/get-wallet-token-for-accounts [address-1 address-2]]]]
+    (is (match? [[:dispatch [:wallet/get-wallet-token-for-account address-1]]
+                 [:dispatch [:wallet/get-wallet-token-for-account address-2]]]
                 (:fx (dispatch [event-id]))))))
 
-(h/deftest-event :wallet/get-wallet-token-for-accounts
+(h/deftest-event :wallet/get-wallet-token-for-account
   [event-id dispatch]
   (let [expected-effects {:db {:wallet {:ui {:tokens-loading {address true}}}}
                           :fx [[:json-rpc/call
                                 [{:method     "wallet_fetchOrGetCachedWalletBalances"
                                   :params     [[address] true]
-                                  :on-success [:wallet/store-wallet-token [address]]
-                                  :on-error   [:wallet/get-wallet-token-for-accounts-failed
-                                               [address]]}]]]}]
-    (is (match? expected-effects (dispatch [event-id [address]])))))
+                                  :on-success [:wallet/store-wallet-token address]
+                                  :on-error   [:wallet/get-wallet-token-for-account-failed
+                                               address]}]]]}]
+    (is (match? expected-effects (dispatch [event-id address])))))
 
 (h/deftest-event :wallet/reconcile-keypairs
   [event-id dispatch]

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

@@ -7,7 +7,6 @@
     [status-im.contexts.wallet.common.utils.networks :as network-utils]
     [status-im.contexts.wallet.data-store :as data-store]
     [status-im.contexts.wallet.send.utils :as send-utils]
-    [status-im.contexts.wallet.sheets.network-selection.view :as network-selection]
     [taoensso.timbre :as log]
     [utils.money :as utils.money]
     [utils.number]
@@ -42,42 +41,64 @@
  (fn [{:keys [db]} [suggested-routes-data enough-assets?]]
    (if-not enough-assets?
      {:db (update-in db [:wallet :ui :send] add-not-enough-assets-data (:best suggested-routes-data))}
-     (let [chosen-route                            (:best suggested-routes-data)
+     (let [chosen-route                  (:best suggested-routes-data)
            {:keys [token collectible token-display-name
+                   receiver-networks
                    receiver-network-values
-                   sender-network-values tx-type]} (get-in db [:wallet :ui :send])
-           token-decimals                          (if collectible 0 (:decimals token))
-           native-token?                           (and token (= token-display-name "ETH"))
-           routes-available?                       (pos? (count chosen-route))
-           from-network-amounts-by-chain           (send-utils/network-amounts-by-chain
-                                                    {:route          chosen-route
-                                                     :token-decimals token-decimals
-                                                     :native-token?  native-token?
-                                                     :receiver?      false})
-           to-network-amounts-by-chain             (send-utils/network-amounts-by-chain
-                                                    {:route          chosen-route
-                                                     :token-decimals token-decimals
-                                                     :native-token?  native-token?
-                                                     :receiver?      true})
-           sender-possible-chain-ids               (map :chain-id sender-network-values)
-           sender-network-values                   (if routes-available?
-                                                     (send-utils/network-amounts
-                                                      (if (= tx-type :tx/bridge)
-                                                        from-network-amounts-by-chain
-                                                        (send-utils/add-zero-values-to-network-values
-                                                         from-network-amounts-by-chain
-                                                         sender-possible-chain-ids)))
-                                                     (send-utils/reset-loading-network-amounts-to-zero
-                                                      sender-network-values))
-           receiver-network-values                 (if routes-available?
-                                                     (send-utils/network-amounts
-                                                      to-network-amounts-by-chain)
-                                                     (send-utils/reset-loading-network-amounts-to-zero
-                                                      receiver-network-values))
-           network-links                           (when routes-available?
-                                                     (send-utils/network-links chosen-route
-                                                                               sender-network-values
-                                                                               receiver-network-values))]
+                   sender-network-values tx-type
+                   disabled-from-chain-ids
+                   from-locked-amounts]} (get-in db [:wallet :ui :send])
+           token-decimals                (if collectible 0 (:decimals token))
+           native-token?                 (and token (= token-display-name "ETH"))
+           routes-available?             (pos? (count chosen-route))
+           token-networks                (:supported-networks token)
+           token-networks-ids            (when token-networks
+                                           (map #(:chain-id %) token-networks))
+           from-network-amounts-by-chain (send-utils/network-amounts-by-chain
+                                          {:route          chosen-route
+                                           :token-decimals token-decimals
+                                           :native-token?  native-token?
+                                           :receiver?      false})
+           to-network-amounts-by-chain   (send-utils/network-amounts-by-chain
+                                          {:route          chosen-route
+                                           :token-decimals token-decimals
+                                           :native-token?  native-token?
+                                           :receiver?      true})
+           sender-possible-chain-ids     (map :chain-id sender-network-values)
+           sender-network-values         (if routes-available?
+                                           (send-utils/network-amounts
+                                            {:network-values
+                                             (if (= tx-type :tx/bridge)
+                                               from-network-amounts-by-chain
+                                               (send-utils/add-zero-values-to-network-values
+                                                from-network-amounts-by-chain
+                                                sender-possible-chain-ids))
+                                             :disabled-chain-ids disabled-from-chain-ids
+                                             :receiver-networks receiver-networks
+                                             :token-networks-ids token-networks-ids
+                                             :from-locked-amounts from-locked-amounts
+                                             :tx-type tx-type
+                                             :receiver? false})
+                                           (send-utils/reset-loading-network-amounts-to-zero
+                                            sender-network-values))
+           receiver-network-values       (if routes-available?
+                                           (send-utils/network-amounts
+                                            {:network-values     to-network-amounts-by-chain
+                                             :disabled-chain-ids disabled-from-chain-ids
+                                             :receiver-networks  receiver-networks
+                                             :token-networks-ids token-networks-ids
+                                             :tx-type            tx-type
+                                             :receiver?          true})
+                                           (cond->
+                                             (send-utils/reset-loading-network-amounts-to-zero
+                                              receiver-network-values)
+
+                                             (not= tx-type :tx/bridge)
+                                             send-utils/safe-add-type-edit))
+           network-links                 (when routes-available?
+                                           (send-utils/network-links chosen-route
+                                                                     sender-network-values
+                                                                     receiver-network-values))]
        {:db (update-in db
                        [:wallet :ui :send]
                        assoc
@@ -116,19 +137,34 @@
  (fn [{:keys [db]}]
    {:db (update-in db [:wallet :ui :send] dissoc :amount)}))
 
+(rf/reg-event-fx :wallet/clean-disabled-from-networks
+ (fn [{:keys [db]}]
+   {:db (update-in db [:wallet :ui :send] dissoc :disabled-from-chain-ids)}))
+
+(rf/reg-event-fx :wallet/clean-from-locked-amounts
+ (fn [{:keys [db]}]
+   {:db (update-in db [:wallet :ui :send] dissoc :from-locked-amounts)}))
+
 (rf/reg-event-fx
  :wallet/select-send-address
  (fn [{:keys [db]} [{:keys [address recipient stack-id start-flow?]}]]
-   (let [[_ to-address]   (utils/split-prefix-and-address address)
-         collectible-tx?  (send-utils/tx-type-collectible?
-                           (-> db :wallet :ui :send :tx-type))
-         collectible      (when collectible-tx?
-                            (-> db :wallet :ui :send :collectible))
-         one-collectible? (when collectible-tx?
-                            (= (collectible.utils/collectible-balance collectible) 1))]
+   (let [[prefix to-address] (utils/split-prefix-and-address address)
+         testnet-enabled?    (get-in db [:profile/profile :test-networks-enabled?])
+         receiver-networks   (network-utils/resolve-receiver-networks
+                              {:prefix           prefix
+                               :testnet-enabled? testnet-enabled?})
+         collectible-tx?     (send-utils/tx-type-collectible?
+                              (-> db :wallet :ui :send :tx-type))
+         collectible         (when collectible-tx?
+                               (-> db :wallet :ui :send :collectible))
+         one-collectible?    (when collectible-tx?
+                               (= (collectible.utils/collectible-balance collectible) 1))]
      {:db (-> db
               (assoc-in [:wallet :ui :send :recipient] (or recipient address))
-              (assoc-in [:wallet :ui :send :to-address] to-address))
+              (assoc-in [:wallet :ui :send :to-address] to-address)
+              (assoc-in [:wallet :ui :send :address-prefix] prefix)
+              (assoc-in [:wallet :ui :send :receiver-preferred-networks] receiver-networks)
+              (assoc-in [:wallet :ui :send :receiver-networks] receiver-networks))
       :fx [(when (and collectible-tx? one-collectible?)
              [:dispatch [:wallet/start-get-suggested-routes {:amount 1}]])
            [:dispatch
@@ -146,47 +182,32 @@
 
 (rf/reg-event-fx
  :wallet/set-token-to-send
- (fn [{:keys [db]}
-      [{:keys [token-symbol token network stack-id start-flow? owners] :as params} entry-point]]
+ (fn [{:keys [db]} [{:keys [token-symbol token stack-id start-flow? owners]} entry-point]]
    ;; `token` is a map extracted from the sender, but in the wallet home page we don't know the
    ;; sender yet, so we only provide the `token-symbol`, later in
    ;; `:wallet/select-from-account` the `token` key will be set.
-   (let [{:keys [wallet]}             db
-         unique-owner                 (when (= (count owners) 1)
-                                        (first owners))
-         unique-owner-tokens          (get-in db [:wallet :accounts unique-owner :tokens])
-         token-data                   (or token
-                                          (when (and token-symbol unique-owner)
-                                            (some #(when (= (:symbol %) token-symbol) %)
-                                                  unique-owner-tokens)))
-         view-id                      (:view-id db)
-         root-screen?                 (or (= view-id :wallet-stack) (nil? view-id))
-         multi-account-balance?       (-> (utils/get-accounts-with-token-balance (:accounts wallet)
-                                                                                 token)
-                                          (count)
-                                          (> 1))
-         account-not-defined?         (and (not unique-owner) multi-account-balance?)
-         networks-with-balance        (when (and token-data (:balances-per-chain token))
-                                        (filter #(not= (:balance %) "0")
-                                                (vals (:balances-per-chain token))))
-         balance-in-only-one-network? (when networks-with-balance (= (count networks-with-balance) 1))
-         test-networks-enabled?       (get-in db [:profile/profile :test-networks-enabled?])
-         network-details              (-> (get-in db
-                                                  [:wallet :networks
-                                                   (if test-networks-enabled? :test :prod)])
-                                          (network-utils/sorted-networks-with-details))
-         network                      (if balance-in-only-one-network?
-                                        (first (filter #(= (:chain-id %)
-                                                           (:chain-id (first networks-with-balance)))
-                                                       network-details))
-                                        network)]
-     (println multi-account-balance? "43247329479847392")
+   (let [{:keys [networks]}     token
+         receiver-networks      (get-in db [:wallet :ui :send :receiver-networks])
+         token-networks-ids     (map :chain-id networks)
+         unsupported-token?     (not-any? (set receiver-networks) token-networks-ids)
+         unique-owner           (when (= (count owners) 1)
+                                  (first owners))
+         unique-owner-tokens    (get-in db [:wallet :accounts unique-owner :tokens])
+         token-data             (or token
+                                    (when (and token-symbol unique-owner)
+                                      (some #(when (= (:symbol %) token-symbol) %)
+                                            unique-owner-tokens)))
+         test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
+         network-details        (-> (get-in db
+                                            [:wallet :networks (if test-networks-enabled? :test :prod)])
+                                    (network-utils/sorted-networks-with-details))]
      (when (or token-data token-symbol)
        {:db (cond-> db
-              network      (update-in [:wallet :ui :send]
+              :always      (update-in [:wallet :ui :send]
                                       #(-> %
                                            (dissoc :collectible :tx-type)
-                                           (assoc :network network)))
+                                           (assoc :token-not-supported-in-receiver-networks?
+                                                  unsupported-token?)))
               token-symbol (assoc-in [:wallet :ui :send :token-symbol] token-symbol)
               token-data   (update-in [:wallet :ui :send]
                                       #(assoc %
@@ -195,45 +216,20 @@
                                                                          (network-utils/network-list
                                                                           token-data
                                                                           network-details))
-                                              :token-display-name (:symbol token-data)
-                                              :token-symbol       (:symbol token-data)))
+                                              :token-display-name (:symbol token-data)))
               unique-owner (assoc-in [:wallet :current-viewing-account-address] unique-owner)
               entry-point  (assoc-in [:wallet :ui :send :entry-point] entry-point))
-        :fx (cond
-              ;; If the token has a balance in more than one account and this was dispatched from
-              ;; the general wallet screen, open the account selection screen.
-              (and account-not-defined? root-screen?)
-              [[:dispatch [:open-modal :screen/wallet.select-from]]]
-
-              ;; If the token has a balance in only one account (or this was dispatched from the
-              ;; account screen) and the network is already set, stop and clean suggested routes,
-              ;; then navigate forward in the send flow.
-              (some? network)
-              [[:dispatch [:wallet/stop-and-clean-suggested-routes]]
-               [:dispatch
-                ;; ^:flush-dom allows us to make sure the re-frame DB state is always synced
-                ;; before the navigation occurs, so the new screen is always rendered with
-                ;; the DB state set by this event. By adding the metadata we are omitting
-                ;; a 1-frame blink when the screen is mounted.
-                ^:flush-dom
-                [:wallet/wizard-navigate-forward
-                 {:current-screen stack-id
-                  :start-flow?    start-flow?
-                  :flow-id        :wallet-send-flow}]]]
-
-              ;; If we don't know the network but need to set it, show the network selection drawer.
-              :else
-              [[:dispatch
-                [:show-bottom-sheet
-                 {:content (fn []
-                             [network-selection/view
-                              {:token-symbol      (or token-symbol (:symbol token-data))
-                               :source            :send
-                               :on-select-network (fn [network]
-                                                    (rf/dispatch [:hide-bottom-sheet])
-                                                    (rf/dispatch
-                                                     [:wallet/set-token-to-send
-                                                      (assoc params :network network)]))}])}]]])}))))
+        :fx [[:dispatch [:wallet/stop-and-clean-suggested-routes]]
+             [:dispatch
+              ;; ^:flush-dom allows us to make sure the re-frame DB state is always synced
+              ;; before the navigation occurs, so the new screen is always rendered with
+              ;; the DB state set by this event.  By adding the metadata we are omitting
+              ;; a 1-frame blink when the screen is mounted.
+              ^:flush-dom
+              [:wallet/wizard-navigate-forward
+               {:current-screen stack-id
+                :start-flow?    start-flow?
+                :flow-id        :wallet-send-flow}]]]}))))
 
 (rf/reg-event-fx
  :wallet/edit-token-to-send
@@ -250,7 +246,8 @@
               (assoc-in [:wallet :ui :send :token-not-supported-in-receiver-networks?]
                         token-not-supported-in-receiver-networks?))
       :fx [[:dispatch [:hide-bottom-sheet]]
-           [:dispatch [:wallet/stop-and-clean-suggested-routes]]]})))
+           [:dispatch [:wallet/stop-and-clean-suggested-routes]]
+           [:dispatch [:wallet/clean-from-locked-amounts]]]})))
 
 (rf/reg-event-fx :wallet/clean-selected-token
  (fn [{:keys [db]}]
@@ -370,15 +367,32 @@
  (fn [{:keys [db]}]
    (let [keys-to-remove [:to-values-by-chain :network-links :sender-network-values :route
                          :receiver-network-values :suggested-routes :from-values-by-chain
-                         :loading-suggested-routes? :amount :enough-assets?]]
+                         :loading-suggested-routes? :amount]]
      {:db (update-in db [:wallet :ui :send] #(apply dissoc % keys-to-remove))})))
 
+(rf/reg-event-fx :wallet/disable-from-networks
+ (fn [{:keys [db]} [chain-ids]]
+   {:db (assoc-in db [:wallet :ui :send :disabled-from-chain-ids] chain-ids)}))
+
+(rf/reg-event-fx :wallet/lock-from-amount
+ (fn [{:keys [db]} [chain-id amount]]
+   {:db (assoc-in db [:wallet :ui :send :from-locked-amounts chain-id] amount)}))
+
+(rf/reg-event-fx :wallet/unlock-from-amount
+ (fn [{:keys [db]} [chain-id]]
+   {:db (update-in db [:wallet :ui :send :from-locked-amounts] dissoc chain-id)}))
+
 (rf/reg-event-fx :wallet/reset-network-amounts-to-zero
  (fn [{:keys [db]}]
    (let [sender-network-values   (get-in db [:wallet :ui :send :sender-network-values])
          receiver-network-values (get-in db [:wallet :ui :send :receiver-network-values])
-         sender-network-values   (send-utils/reset-network-amounts-to-zero sender-network-values)
-         receiver-network-values (send-utils/reset-network-amounts-to-zero receiver-network-values)]
+         disabled-from-chain-ids (get-in db [:wallet :ui :send :disabled-from-chain-ids])
+         sender-network-values   (send-utils/reset-network-amounts-to-zero
+                                  {:network-amounts    sender-network-values
+                                   :disabled-chain-ids disabled-from-chain-ids})
+         receiver-network-values (send-utils/reset-network-amounts-to-zero
+                                  {:network-amounts    receiver-network-values
+                                   :disabled-chain-ids []})]
      {:db (-> db
               (assoc-in [:wallet :ui :send :sender-network-values] sender-network-values)
               (assoc-in [:wallet :ui :send :receiver-network-values] receiver-network-values)
@@ -390,62 +404,89 @@
 
 (rf/reg-event-fx :wallet/start-get-suggested-routes
  (fn [{:keys [db]} [{:keys [amount amount-out updated-token] :as args :or {amount-out "0"}}]]
-   (let [wallet-address                (get-in db [:wallet :current-viewing-account-address])
+   (let [wallet-address (get-in db [:wallet :current-viewing-account-address])
          {:keys [token tx-type collectible to-address
-                 network bridge-to-chain-id]
+                 receiver-networks disabled-from-chain-ids
+                 from-locked-amounts bridge-to-chain-id]
           :or   {token updated-token}} (get-in db [:wallet :ui :send])
-         test-networks-enabled?        (get-in db [:profile/profile :test-networks-enabled?])
-         networks                      (get-in db
-                                               [:wallet :networks
-                                                (if test-networks-enabled? :test :prod)])
-         network-chain-ids             (map :chain-id networks)
-         token-decimal                 (when token (:decimals token))
-         token-id                      (utils/format-token-id token collectible)
-         to-token-id                   ""
-         gas-rates                     constants/gas-rate-medium
-         to-hex                        (fn [v] (send-utils/amount-in-hex v (if token token-decimal 0)))
-         amount-in                     (to-hex amount)
-         amount-out                    (to-hex amount-out)
-         from-address                  wallet-address
-         network-chain-id              (if collectible
-                                         (get-in collectible [:id :contract-id :chain-id])
-                                         (:chain-id network))
-         disabled-from-chain-ids       (filter #(not= % network-chain-id) network-chain-ids)
-         disabled-to-chain-ids         (filter #(not= %
-                                                      (if (= tx-type :tx/bridge)
-                                                        bridge-to-chain-id
-                                                        network-chain-id))
-                                               network-chain-ids)
-         send-type                     (case tx-type
-                                         :tx/collectible-erc-721  constants/send-type-erc-721-transfer
-                                         :tx/collectible-erc-1155 constants/send-type-erc-1155-transfer
-                                         :tx/bridge               constants/send-type-bridge
-                                         constants/send-type-transfer)
-         sender-network-values         (when (= tx-type :tx/bridge)
-                                         (send-utils/loading-network-amounts
-                                          {:networks  [network-chain-id]
-                                           :values    {network-chain-id amount}
-                                           :receiver? false}))
-         receiver-network-values       (when (= tx-type :tx/bridge)
-                                         (send-utils/loading-network-amounts
-                                          {:networks  [bridge-to-chain-id]
-                                           :receiver? true}))
-         request-uuid                  (str (random-uuid))
-         params                        [{:uuid                 request-uuid
-                                         :sendType             send-type
-                                         :addrFrom             from-address
-                                         :addrTo               to-address
-                                         :amountIn             amount-in
-                                         :amountOut            amount-out
-                                         :tokenID              token-id
-                                         :toTokenID            to-token-id
-                                         :disabledFromChainIDs disabled-from-chain-ids
-                                         :disabledToChainIDs   disabled-to-chain-ids
-                                         :gasFeeMode           gas-rates
-                                         :fromLockedAmount     {}
-                                         :username             (:username args)
-                                         :publicKey            (:publicKey args)
-                                         :packID               (:packID args)}]]
+         test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
+         networks (get-in db [:wallet :networks (if test-networks-enabled? :test :prod)])
+         network-chain-ids (map :chain-id networks)
+         token-decimal (when token (:decimals token))
+         token-id (utils/format-token-id token collectible)
+         to-token-id ""
+         gas-rates constants/gas-rate-medium
+         to-hex (fn [v] (send-utils/amount-in-hex v (if token token-decimal 0)))
+         amount-in (to-hex amount)
+         amount-out (to-hex amount-out)
+         from-address wallet-address
+         disabled-to-chain-ids (if (= tx-type :tx/bridge)
+                                 (filter #(not= % bridge-to-chain-id) network-chain-ids)
+                                 (filter (fn [chain-id]
+                                           (not (some #(= chain-id %)
+                                                      receiver-networks)))
+                                         network-chain-ids))
+         from-locked-amount (update-vals from-locked-amounts to-hex)
+         send-type (case tx-type
+                     :tx/collectible-erc-721  constants/send-type-erc-721-transfer
+                     :tx/collectible-erc-1155 constants/send-type-erc-1155-transfer
+                     :tx/bridge               constants/send-type-bridge
+                     constants/send-type-transfer)
+         balances-per-chain (when token (:balances-per-chain token))
+         sender-token-available-networks-for-suggested-routes
+         (when token
+           (send-utils/token-available-networks-for-suggested-routes
+            {:balances-per-chain balances-per-chain
+             :disabled-chain-ids disabled-from-chain-ids
+             :only-with-balance? true}))
+         receiver-token-available-networks-for-suggested-routes
+         (when token
+           (send-utils/token-available-networks-for-suggested-routes
+            {:balances-per-chain balances-per-chain
+             :disabled-chain-ids disabled-from-chain-ids
+             :only-with-balance? false}))
+         token-networks-ids (when token (map #(:chain-id %) (:supported-networks token)))
+         sender-network-values (when sender-token-available-networks-for-suggested-routes
+                                 (send-utils/loading-network-amounts
+                                  {:valid-networks
+                                   (if (= tx-type :tx/bridge)
+                                     (remove #(= bridge-to-chain-id %)
+                                             sender-token-available-networks-for-suggested-routes)
+                                     sender-token-available-networks-for-suggested-routes)
+                                   :disabled-chain-ids disabled-from-chain-ids
+                                   :receiver-networks receiver-networks
+                                   :token-networks-ids token-networks-ids
+                                   :tx-type tx-type
+                                   :receiver? false}))
+         receiver-network-values (when receiver-token-available-networks-for-suggested-routes
+                                   (send-utils/loading-network-amounts
+                                    {:valid-networks
+                                     (if (= tx-type :tx/bridge)
+                                       (filter
+                                        #(= bridge-to-chain-id %)
+                                        receiver-token-available-networks-for-suggested-routes)
+                                       receiver-token-available-networks-for-suggested-routes)
+                                     :disabled-chain-ids disabled-from-chain-ids
+                                     :receiver-networks receiver-networks
+                                     :token-networks-ids token-networks-ids
+                                     :tx-type tx-type
+                                     :receiver? true}))
+         request-uuid (str (random-uuid))
+         params [{:uuid                 request-uuid
+                  :sendType             send-type
+                  :addrFrom             from-address
+                  :addrTo               to-address
+                  :amountIn             amount-in
+                  :amountOut            amount-out
+                  :tokenID              token-id
+                  :toTokenID            to-token-id
+                  :disabledFromChainIDs disabled-from-chain-ids
+                  :disabledToChainIDs   disabled-to-chain-ids
+                  :gasFeeMode           gas-rates
+                  :fromLockedAmount     from-locked-amount
+                  :username             (:username args)
+                  :publicKey            (:publicKey args)
+                  :packID               (:packID args)}]]
      (when (and to-address from-address amount-in token-id)
        {:db            (update-in db
                                   [:wallet :ui :send]
@@ -582,6 +623,7 @@
          [:dispatch [:wallet/clean-scanned-address]]
          [:dispatch [:wallet/clean-local-suggestions]]
          [:dispatch [:wallet/clean-send-address]]
+         [:dispatch [:wallet/clean-disabled-from-networks]]
          [:dispatch [:wallet/select-address-tab nil]]]}))
 
 (rf/reg-event-fx :wallet/end-transaction-flow
@@ -670,60 +712,34 @@
 
 (rf/reg-event-fx
  :wallet/select-from-account
- (fn [{db :db} [{:keys [address stack-id network-details network start-flow?] :as params}]]
+ (fn [{db :db} [{:keys [address stack-id network-details start-flow?]}]]
    (let [{:keys [token-symbol
-                 tx-type]}            (-> db :wallet :ui :send)
-         token                        (when token-symbol
-                                        ;; When this flow has started in the wallet home page, we
-                                        ;; know the token or collectible to send, but we don't know
-                                        ;; from which account, so we extract the token data from the
-                                        ;; picked account.
-                                        (let [token (utils/get-token-from-account db
-                                                                                  token-symbol
-                                                                                  address)]
-                                          (utils/token-with-balance token network-details)))
-         bridge-tx?                   (= tx-type :tx/bridge)
-         flow-id                      (if bridge-tx?
-                                        :wallet-bridge-flow
-                                        :wallet-send-flow)
-         networks-with-balance        (when (and token (:balances-per-chain token))
-                                        (filter #(not= (:balance %) "0")
-                                                (vals (:balances-per-chain token))))
-         balance-in-only-one-network? (when networks-with-balance (= (count networks-with-balance) 1))
-         test-networks-enabled?       (get-in db [:profile/profile :test-networks-enabled?])
-         network-details              (-> (get-in db
-                                                  [:wallet :networks
-                                                   (if test-networks-enabled? :test :prod)])
-                                          (network-utils/sorted-networks-with-details))
-         network                      (if balance-in-only-one-network?
-                                        (first (filter #(= (:chain-id %)
-                                                           (:chain-id (first networks-with-balance)))
-                                                       network-details))
-                                        network)]
+                 tx-type]} (-> db :wallet :ui :send)
+         token             (when token-symbol
+                             ;; When this flow has started in the wallet home page, we know the
+                             ;; token or collectible to send, but we don't know from which
+                             ;; account, so we extract the token data from the picked account.
+                             (let [token (utils/get-token-from-account db token-symbol address)]
+                               (assoc token
+                                      :networks (network-utils/network-list-with-positive-balance
+                                                 token
+                                                 network-details)
+                                      :supported-networks (network-utils/network-list token
+                                                                                      network-details)
+                                      :total-balance (utils/calculate-total-token-balance token))))
+         bridge-tx?        (= tx-type :tx/bridge)
+         flow-id           (if bridge-tx?
+                             :wallet-bridge-flow
+                             :wallet-send-flow)]
      {:db (cond-> db
-            network      (assoc-in [:wallet :ui :send :network] network)
             token-symbol (assoc-in [:wallet :ui :send :token] token)
             bridge-tx?   (assoc-in [:wallet :ui :send :to-address] address))
-      :fx (if (some? network)
-            [[:dispatch [:wallet/switch-current-viewing-account address]]
-             [:dispatch
-              [:wallet/wizard-navigate-forward
-               {:current-screen stack-id
-                :start-flow?    (and start-flow? (not balance-in-only-one-network?))
-                :flow-id        flow-id}]]]
-            [[:dispatch [:dismiss-modal :screen/wallet.select-from]]
-             [:dispatch [:wallet/switch-current-viewing-account address]]
-             [:dispatch
-              [:show-bottom-sheet
-               {:content (fn []
-                           [network-selection/view
-                            {:token-symbol      (or token-symbol (:symbol token))
-                             :source            :send
-                             :on-select-network (fn [network]
-                                                  (rf/dispatch [:hide-bottom-sheet])
-                                                  (rf/dispatch
-                                                   [:wallet/select-from-account
-                                                    (assoc params :network network)]))}])}]]])})))
+      :fx [[:dispatch [:wallet/switch-current-viewing-account address]]
+           [:dispatch
+            [:wallet/wizard-navigate-forward
+             {:current-screen stack-id
+              :start-flow?    start-flow?
+              :flow-id        flow-id}]]]})))
 
 (rf/reg-event-fx
  :wallet/transaction-confirmation-navigate-back

src/status_im/contexts/wallet/send/events_test.cljs

@@ -1,9 +1,9 @@
 (ns status-im.contexts.wallet.send.events-test
   (:require
     [cljs.test :refer-macros [is testing]]
-    [matcher-combinators.matchers :as m]
     matcher-combinators.test
     [re-frame.db :as rf-db]
+    [status-im.contexts.wallet.common.utils.networks :as network-utils]
     status-im.contexts.wallet.send.events
     [status-im.contexts.wallet.send.utils :as send-utils]
     [test-helpers.unit :as h]
@@ -40,17 +40,19 @@
         receiver-networks [421614 11155420]]
     (testing "can be called with :token"
       (let [initial-db  {:wallet {:ui {:send {:receiver-networks receiver-networks}}}}
-            expected-db {:wallet {:ui {:send {:token-display-name token-symbol
-                                              :token-symbol       token-symbol}}}}
+            expected-db {:wallet {:ui {:send {:token-display-name                        token-symbol
+                                              :token-not-supported-in-receiver-networks? false}}}}
             _ (reset! rf-db/app-db initial-db)
             result      (dispatch [event-id {:token token}])]
         (is (match? expected-db (:db result)))))
     (testing "can be called with :token-symbol"
-      (let [initial-db  {:wallet {:ui {:send {:receiver-networks receiver-networks}}}}
-            expected-db {:wallet {:ui {:send {:token-symbol token-symbol}}}}
-            _ (reset! rf-db/app-db initial-db)
-            result      (dispatch [event-id {:token-symbol token-symbol}])]
-        (is (match? expected-db (:db result)))))
+      (testing "can be called with :token"
+        (let [initial-db  {:wallet {:ui {:send {:receiver-networks receiver-networks}}}}
+              expected-db {:wallet {:ui {:send {:token-symbol                              token-symbol
+                                                :token-not-supported-in-receiver-networks? true}}}}
+              _ (reset! rf-db/app-db initial-db)
+              result      (dispatch [event-id {:token-symbol token-symbol}])]
+          (is (match? expected-db (:db result))))))
     (testing "shouldn't have changes if called without :token or :token-symbol")
     (let [initial-db  {:wallet {:ui {:send {:receiver-networks receiver-networks}}}}
           expected-db nil
@@ -60,16 +62,16 @@
     (testing "should clean :collectible set"
       (let [initial-db  {:wallet {:ui {:send {:receiver-networks receiver-networks
                                               :collectible       "some-collectible"}}}}
-            expected-db {:wallet {:ui {:send {:token-display-name token-symbol}}}}
+            expected-db {:wallet {:ui {:send {:token-display-name                        token-symbol
+                                              :token-not-supported-in-receiver-networks? false}}}}
             _ (reset! rf-db/app-db initial-db)
-            result      (dispatch [event-id
-                                   {:token   token
-                                    :network "network"}])]
+            result      (dispatch [event-id {:token token}])]
         (is (match? expected-db (:db result)))
         (is (match? nil (get-in result [:db :wallet :ui :send :collectible])))))
     (testing "should set :token-not-supported-in-receiver-networks?"
       (let [initial-db  {:wallet {:ui {:send {:receiver-networks []}}}}
-            expected-db {:wallet {:ui {:send {:token-display-name token-symbol}}}}
+            expected-db {:wallet {:ui {:send {:token-display-name                        token-symbol
+                                              :token-not-supported-in-receiver-networks? true}}}}
             _ (reset! rf-db/app-db initial-db)
             result      (dispatch [event-id {:token token}])]
         (is (match? expected-db (:db result)))))))
@@ -209,6 +211,47 @@
                             :other-props :value}}}})
     (is (match-strict? expected-db (:db (dispatch [event-id]))))))
 
+(h/deftest-event :wallet/clean-disabled-from-networks
+  [event-id dispatch]
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:disabled-from-chain-ids [:optimism]
+                            :other-props             :value}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))
+
+(h/deftest-event :wallet/clean-from-locked-amounts
+  [event-id dispatch]
+  (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:from-locked-amounts "value"
+                            :other-props         :value}}}})
+    (is (match-strict? expected-db (:db (dispatch [event-id]))))))
+
+(h/deftest-event :wallet/disable-from-networks
+  [event-id dispatch]
+  (let [expected-db {:wallet {:ui {:send {:disabled-from-chain-ids [:optimism]
+                                          :other-props             :value}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:other-props :value}}}})
+    (is (match? expected-db (:db (dispatch [event-id [:optimism]]))))))
+
+(h/deftest-event :wallet/unlock-from-amount
+  [event-id dispatch]
+  (let [expected-db {:wallet {:ui {:send {:other-props         :value
+                                          :from-locked-amounts {}}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:other-props         :value
+                            :from-locked-amounts {:chain-id [1 10]}}}}})
+    (is (match? expected-db (:db (dispatch [event-id :chain-id]))))))
+
+(h/deftest-event :wallet/lock-from-amount
+  [event-id dispatch]
+  (let [expected-db {:wallet {:ui {:send {:other-props         :value
+                                          :from-locked-amounts {:amount 10}}}}}]
+    (reset! rf-db/app-db
+      {:wallet {:ui {:send {:other-props :value}}}})
+    (is (match? expected-db (:db (dispatch [event-id :amount 10]))))))
+
 (h/deftest-event :wallet/clean-selected-token
   [event-id dispatch]
   (let [expected-db {:wallet {:ui {:send {:other-props :value}}}}]
@@ -260,8 +303,13 @@
   (let [sender-network-values   [{:chain-id 1 :total-amount (money/bignumber "100") :type :default}
                                  {:chain-id 10 :total-amount (money/bignumber "200") :type :default}]
         receiver-network-values [{:chain-id 1 :total-amount (money/bignumber "100") :type :loading}]
-        sender-network-zero     (send-utils/reset-network-amounts-to-zero sender-network-values)
-        receiver-network-zero   (send-utils/reset-network-amounts-to-zero receiver-network-values)]
+        disabled-from-chain-ids [:ethereum]
+        sender-network-zero     (send-utils/reset-network-amounts-to-zero
+                                 {:network-amounts    sender-network-values
+                                  :disabled-chain-ids disabled-from-chain-ids})
+        receiver-network-zero   (send-utils/reset-network-amounts-to-zero
+                                 {:network-amounts    receiver-network-values
+                                  :disabled-chain-ids []})]
     (testing "if sender-network-value and receiver-network-value are not empty"
       (let [expected-db {:wallet {:ui {:send {:other-props             :value
                                               :sender-network-values   sender-network-zero
@@ -299,6 +347,7 @@
 (h/deftest-event :wallet/select-send-address
   [event-id dispatch]
   (let [address     "eth:arb1:0x01"
+        prefix      "eth:arb1:"
         to-address  "0x01"
         recipient   {:type  :saved-address
                      :label "0x01...23f"}
@@ -306,20 +355,27 @@
         start-flow? false
         tx-type     :tx/collectible-erc-721]
     (testing "testing when collectible balance is more than 1"
-      (let [collectible      (collectible-with-balance 2)
-            testnet-enabled? false
-            expected-result  {:db {:wallet          {:ui {:send {:other-props :value
-                                                                 :recipient   recipient
-                                                                 :to-address  to-address
-                                                                 :tx-type     tx-type
-                                                                 :collectible collectible}}}
-                                   :profile/profile {:test-networks-enabled? false}}
-                              :fx [nil
-                                   [:dispatch
-                                    [:wallet/wizard-navigate-forward
-                                     {:current-screen stack-id
-                                      :start-flow?    start-flow?
-                                      :flow-id        :wallet-send-flow}]]]}]
+      (let [collectible       (collectible-with-balance 2)
+            testnet-enabled?  false
+            receiver-networks (network-utils/resolve-receiver-networks
+                               {:prefix           prefix
+                                :testnet-enabled? testnet-enabled?})
+            expected-result   {:db {:wallet          {:ui {:send {:other-props :value
+                                                                  :recipient recipient
+                                                                  :to-address to-address
+                                                                  :address-prefix prefix
+                                                                  :receiver-preferred-networks
+                                                                  receiver-networks
+                                                                  :receiver-networks receiver-networks
+                                                                  :tx-type tx-type
+                                                                  :collectible collectible}}}
+                                    :profile/profile {:test-networks-enabled? false}}
+                               :fx [nil
+                                    [:dispatch
+                                     [:wallet/wizard-navigate-forward
+                                      {:current-screen stack-id
+                                       :start-flow?    start-flow?
+                                       :flow-id        :wallet-send-flow}]]]}]
         (reset! rf-db/app-db
           {:wallet          {:ui {:send {:other-props :value
                                          :tx-type     tx-type
@@ -332,20 +388,27 @@
                                 :stack-id    stack-id
                                 :start-flow? start-flow?}])))))
     (testing "testing when collectible balance is 1"
-      (let [collectible      (collectible-with-balance 1)
-            testnet-enabled? false
-            expected-result  {:db {:wallet          {:ui {:send {:other-props :value
-                                                                 :recipient   recipient
-                                                                 :to-address  to-address
-                                                                 :tx-type     tx-type
-                                                                 :collectible collectible}}}
-                                   :profile/profile {:test-networks-enabled? false}}
-                              :fx [[:dispatch [:wallet/start-get-suggested-routes {:amount 1}]]
-                                   [:dispatch
-                                    [:wallet/wizard-navigate-forward
-                                     {:current-screen stack-id
-                                      :start-flow?    start-flow?
-                                      :flow-id        :wallet-send-flow}]]]}]
+      (let [collectible       (collectible-with-balance 1)
+            testnet-enabled?  false
+            receiver-networks (network-utils/resolve-receiver-networks
+                               {:prefix           prefix
+                                :testnet-enabled? testnet-enabled?})
+            expected-result   {:db {:wallet          {:ui {:send {:other-props :value
+                                                                  :recipient recipient
+                                                                  :to-address to-address
+                                                                  :address-prefix prefix
+                                                                  :receiver-preferred-networks
+                                                                  receiver-networks
+                                                                  :receiver-networks receiver-networks
+                                                                  :tx-type tx-type
+                                                                  :collectible collectible}}}
+                                    :profile/profile {:test-networks-enabled? false}}
+                               :fx [[:dispatch [:wallet/start-get-suggested-routes {:amount 1}]]
+                                    [:dispatch
+                                     [:wallet/wizard-navigate-forward
+                                      {:current-screen stack-id
+                                       :start-flow?    start-flow?
+                                       :flow-id        :wallet-send-flow}]]]}]
         (reset! rf-db/app-db
           {:wallet          {:ui {:send {:other-props :value
                                          :tx-type     tx-type
@@ -421,6 +484,7 @@
                                        :networks #{{:chain-id 421614}
                                                    {:chain-id 11155420}
                                                    {:chain-id 11155111}}}
+        token-networks                (:networks token)
         routes-available?             (pos? (count chosen-route))
         sender-network-values         [1 10]
         receiver-network-values       [1 10]
@@ -442,18 +506,37 @@
         to-network-values-for-ui      (send-utils/network-values-for-ui to-network-amounts-by-chain)
         tx-type                       :tx/collectible-erc-1155
         from-network-values-for-ui    (send-utils/network-values-for-ui from-network-amounts-by-chain)
+        disabled-from-chain-ids       [:421614]
+        token-networks-ids            (when token-networks (mapv #(:chain-id %) token-networks))
         sender-possible-chain-ids     (mapv :chain-id sender-network-values)
         receiver-network-values       (if routes-available?
-                                        (send-utils/network-amounts to-network-values-for-ui)
-                                        (send-utils/reset-loading-network-amounts-to-zero
-                                         receiver-network-values))
+                                        (send-utils/network-amounts
+                                         {:network-values     to-network-values-for-ui
+                                          :disabled-chain-ids disabled-from-chain-ids
+                                          :receiver-networks  receiver-networks
+                                          :token-networks-ids token-networks-ids
+                                          :tx-type            tx-type
+                                          :receiver?          true})
+                                        (cond->
+                                          (send-utils/reset-loading-network-amounts-to-zero
+                                           receiver-network-values)
+
+                                          (not= tx-type :tx/bridge)
+                                          send-utils/safe-add-type-edit))
         sender-network-values         (if routes-available?
                                         (send-utils/network-amounts
-                                         (if (= tx-type :tx/bridge)
-                                           from-network-values-for-ui
-                                           (send-utils/add-zero-values-to-network-values
+                                         {:network-values
+                                          (if (= tx-type :tx/bridge)
                                             from-network-values-for-ui
-                                            sender-possible-chain-ids)))
+                                            (send-utils/add-zero-values-to-network-values
+                                             from-network-values-for-ui
+                                             sender-possible-chain-ids))
+                                          :disabled-chain-ids disabled-from-chain-ids
+                                          :receiver-networks receiver-networks
+                                          :token-networks-ids token-networks-ids
+                                          :from-locked-amounts {}
+                                          :tx-type tx-type
+                                          :receiver? false})
                                         (send-utils/reset-loading-network-amounts-to-zero
                                          sender-network-values))
         expected-db                   {:wallet {:ui {:send
@@ -461,6 +544,7 @@
                                                       :suggested-routes suggested-routes-data
                                                       :route chosen-route
                                                       :token token
+                                                      :disabled-from-chain-ids disabled-from-chain-ids
                                                       :suggested-routes-call-timestamp timestamp
                                                       :collectible (collectible-with-balance 1)
                                                       :token-display-name token-symbol
@@ -475,7 +559,8 @@
                                                                         chosen-route
                                                                         sender-network-values
                                                                         receiver-network-values))
-                                                      :loading-suggested-routes? false}}}}]
+                                                      :loading-suggested-routes? false
+                                                      :from-locked-amounts {}}}}}]
     (reset! rf-db/app-db
       {:wallet {:ui {:send {:other-props                     :value
                             :suggested-routes-call-timestamp timestamp
@@ -485,29 +570,17 @@
                             :receiver-networks               receiver-networks
                             :receiver-network-values         [1 10]
                             :sender-network-values           [1 10]
-                            :tx-type                         tx-type}}}})
+                            :tx-type                         tx-type
+                            :disabled-from-chain-ids         disabled-from-chain-ids
+                            :from-locked-amounts             {}}}}})
     (is (match? expected-db (:db (dispatch [event-id suggested-routes timestamp]))))))
 
 (h/deftest-event :wallet/select-from-account
   [event-id dispatch]
   (let [stack-id    :screen/stack
         start-flow? false
-        address     "0x01"
-        network     {:chain-id 1}]
+        address     "0x01"]
     (testing "when tx-type is :tx/bridge and token-symbol is nil"
-      (let [tx-type         :tx/bridge
-            expected-result {:db {:wallet {:ui {:send {:to-address address
-                                                       :tx-type    tx-type}}}}
-                             :fx [[:dispatch [:dismiss-modal :screen/wallet.select-from]]
-                                  [:dispatch [:wallet/switch-current-viewing-account address]]
-                                  [:dispatch [:show-bottom-sheet {:content (m/pred fn?)}]]]}]
-        (reset! rf-db/app-db {:wallet {:ui {:send {:tx-type tx-type}}}})
-        (is (match? expected-result
-                    (dispatch [event-id
-                               {:address     address
-                                :stack-id    stack-id
-                                :start-flow? start-flow?}])))))
-    (testing "when tx-type is :tx/bridge, network is selected and token-symbol is nil"
       (let [flow-id         :wallet-bridge-flow
             tx-type         :tx/bridge
             expected-result {:db {:wallet {:ui {:send {:to-address address
@@ -523,7 +596,6 @@
                     (dispatch [event-id
                                {:address     address
                                 :stack-id    stack-id
-                                :network     network
                                 :start-flow? start-flow?}])))))
     (testing "when tx-type is not :tx/bridge and token-symbol is nil"
       (let [flow-id         :wallet-send-flow
@@ -540,22 +612,42 @@
                     (dispatch [event-id
                                {:address     address
                                 :stack-id    stack-id
-                                :network     network
                                 :start-flow? start-flow?}])))))
     (testing "when tx-type is :tx/bridge and token-symbol is not nil"
-      (let [tx-type         :tx/bridge
-            expected-result {:db {:wallet {:ui {:send {:to-address address
-                                                       :tx-type    tx-type}}}}
-                             :fx [[:dispatch [:dismiss-modal :screen/wallet.select-from]]
-                                  [:dispatch [:wallet/switch-current-viewing-account address]]
-                                  [:dispatch [:show-bottom-sheet {:content (m/pred fn?)}]]]}]
-        (reset! rf-db/app-db {:wallet {:ui {:send {:tx-type      tx-type
-                                                   :token-symbol "ETH"}}}})
+      (let [flow-id         :wallet-bridge-flow
+            tx-type         :tx/bridge
+            tokens          [{:symbol             "ETH"
+                              :chain-id           1
+                              :balances-per-chain {1     {:raw-balance (money/bignumber 100)}
+                                                   10    {:raw-balance (money/bignumber 200)}
+                                                   42161 {:raw-balance (money/bignumber 300)}}
+                              :decimals           2}]
+            network-details #{{:chain-id 1}
+                              {:chain-id 10}
+                              {:chain-id 42161}}
+            expected-result {:db {:wallet {:ui       {:send {:to-address   address
+                                                             :tx-type      tx-type
+                                                             :token-symbol "ETH"
+                                                             :token        (assoc (first tokens)
+                                                                                  :networks #{nil}
+                                                                                  :total-balance
+                                                                                  (money/bignumber 6))}}
+                                           :accounts {address {:tokens tokens}}}}
+                             :fx [[:dispatch [:wallet/switch-current-viewing-account address]]
+                                  [:dispatch
+                                   [:wallet/wizard-navigate-forward
+                                    {:current-screen stack-id
+                                     :start-flow?    start-flow?
+                                     :flow-id        flow-id}]]]}]
+        (reset! rf-db/app-db {:wallet {:ui       {:send {:tx-type      tx-type
+                                                         :token-symbol "ETH"}}
+                                       :accounts {address {:tokens tokens}}}})
         (is (match? expected-result
                     (dispatch [event-id
-                               {:address     address
-                                :stack-id    stack-id
-                                :start-flow? start-flow?}])))))
+                               {:address        address
+                                :stack-id       stack-id
+                                :start-flow?    start-flow?
+                                :netork-details network-details}])))))
     (testing "when tx-type is not :tx/bridge and token-symbol is not nil"
       (let [flow-id         :wallet-send-flow
             tx-type         :tx/collectible-erc-721
@@ -588,6 +680,5 @@
                     (dispatch [event-id
                                {:address        address
                                 :stack-id       stack-id
-                                :network        network
                                 :start-flow?    start-flow?
                                 :netork-details network-details}])))))))

src/status_im/contexts/wallet/send/flow_config.cljs

@@ -14,7 +14,9 @@
   (-> db :wallet :ui :send :token some?))
 
 (def steps
-  [{:screen-id  :screen/wallet.select-address
+  [{:screen-id  :screen/wallet.select-from
+    :skip-step? (fn [db] (some? (get-in db [:wallet :current-viewing-account-address])))}
+   {:screen-id  :screen/wallet.select-address
     :skip-step? (fn [db] (some? (get-in db [:wallet :ui :send :recipient])))}
    {:screen-id  :screen/wallet.select-asset
     :skip-step? (fn [db] (or (token-selected? db) (collectible-selected? db)))}

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

@@ -1,14 +1,13 @@
 (ns status-im.contexts.wallet.send.from.view
   (:require
-    [clojure.string :as string]
     [quo.core :as quo]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
     [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
     [status-im.contexts.wallet.send.from.style :as style]
+    [status-im.setup.hot-reload :as hot-reload]
     [utils.i18n :as i18n]
-    [utils.money :as money]
     [utils.re-frame :as rf]))
 
 (defn- on-account-press
@@ -16,29 +15,27 @@
   (rf/dispatch [:wallet/select-from-account
                 {:address         address
                  :network-details network-details
-                 :stack-id        :screen/wallet.select-from
-                 :start-flow?     true}]))
+                 :stack-id        :screen/wallet.select-from}]))
+
+(defn- on-close
+  []
+  (rf/dispatch [:wallet/clean-current-viewing-account]))
 
 (defn- render-fn
   [item _ _ {:keys [network-details]}]
-  (let [has-balance (money/above-zero? (string/replace-first (:asset-pay-balance item) "<" ""))]
+  (let [transformed-address (rf/sub [:wallet/account-address (:address item)
+                                     (:network-preferences-names item)])]
     [quo/account-item
-     {:type          (if has-balance :tag :default)
-      :on-press      #(on-account-press (:address item) network-details)
-      :state         (if has-balance :default :disabled)
-      :token-props   {:symbol (:asset-pay-symbol item)
-                      :value  (:asset-pay-balance item)}
+     {:on-press      #(on-account-press (:address item) network-details)
       :account-props (assoc item
-                            :address       (:formatted-address item)
+                            :address       transformed-address
                             :full-address? true)}]))
 
 (defn view
   []
-  (let [token-symbol    (rf/sub [:wallet/send-token-symbol])
-        token           (rf/sub [:wallet/token-by-symbol-from-first-available-account-with-balance
-                                 token-symbol])
-        accounts        (rf/sub [:wallet/accounts-with-balances token])
+  (let [accounts        (rf/sub [:wallet/accounts-with-current-asset])
         network-details (rf/sub [:wallet/network-details])]
+    (hot-reload/use-safe-unmount on-close)
     [floating-button-page/view
      {:footer-container-padding 0
       :header                   [account-switcher/view

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

@@ -12,92 +12,103 @@
 (set! debounce/debounce-and-dispatch #())
 
 (def sub-mocks
-  {:profile/profile                              {:currency :usd}
-   :wallet/selected-network-details              [{:source           525
-                                                   :short-name       "eth"
-                                                   :network-name     :mainnet
-                                                   :chain-id         1
-                                                   :related-chain-id 5}]
-   :wallet/current-viewing-account-address       "0x1"
-   :wallet/current-viewing-account               {:path "m/44'/60'/0'/0/1"
-                                                  :emoji "💎"
-                                                  :key-uid "0x2f5ea39"
-                                                  :address "0x1"
-                                                  :wallet false
-                                                  :name "Account One"
-                                                  :type :generated
-                                                  :watch-only? false
-                                                  :chat false
-                                                  :test-preferred-chain-ids #{5 420 421613}
-                                                  :color :purple
-                                                  :hidden false
-                                                  :prod-preferred-chain-ids #{1 10 42161}
-                                                  :network-preferences-names #{:mainnet :arbitrum
-                                                                               :optimism}
-                                                  :position 1
-                                                  :clock 1698945829328
-                                                  :created-at 1698928839000
-                                                  :operable :fully
-                                                  :mixedcase-address "0x7bcDfc75c431"
-                                                  :public-key "0x04371e2d9d66b82f056bc128064"
-                                                  :removed false}
-   :wallet/current-viewing-account-color         :purple
-   :wallet/wallet-send-enough-assets?            true
-   :wallet/wallet-send-token                     {:symbol             "ETH"
-                                                  :networks           [{:source 879
-                                                                        :short-name "eth"
-                                                                        :network-name :mainnet
-                                                                        :abbreviated-name
-                                                                        "Eth."
-                                                                        :full-name "Mainnet"
-                                                                        :chain-id 1
-                                                                        :related-chain-id 1
-                                                                        :layer 1}]
-                                                  :balances-per-chain {1 {:raw-balance
-                                                                          (money/bignumber
-                                                                           "2500")
-                                                                          :has-error false}}
-                                                  :total-balance      100
-                                                  :available-balance  100}
-   :wallet/wallet-send-loading-suggested-routes? false
-   :wallet/wallet-send-route                     [{:from       {:chainid                1
-                                                                :native-currency-symbol "ETH"}
-                                                   :to         {:chain-id               1
-                                                                :native-currency-symbol "ETH"}
-                                                   :gas-amount "23487"
-                                                   :gas-fees   {:base-fee                 "32.325296406"
-                                                                :max-priority-fee-per-gas "0.011000001"
-                                                                :eip1559-enabled          true}}]
-   :wallet/wallet-send-suggested-routes          nil
-   :wallet/wallet-send-receiver-networks         [1]
-   :view-id                                      :screen/wallet.send-input-amount
-   :wallet/wallet-send-to-address                "0x04371e2d9d66b82f056bc128064"
-   :profile/currency-symbol                      "$"
-   :profile/currency                             :usd
-   :wallet/token-by-symbol                       {:symbol             "ETH"
-                                                  :total-balance      100
-                                                  :available-balance  100
-                                                  :balances-per-chain {1 {:raw-balance
-                                                                          (money/bignumber
-                                                                           "2500")
-                                                                          :has-error false}}}
-   :wallet/wallet-send-from-values-by-chain      {1 (money/bignumber "250")}
-   :wallet/wallet-send-to-values-by-chain        {1 (money/bignumber "250")}
-   :wallet/wallet-send-sender-network-values     nil
-   :wallet/wallet-send-receiver-network-values   nil
-   :wallet/wallet-send-network-links             nil
-   :wallet/send-amount                           nil
-   :wallet/wallet-send-tx-type                   :tx/send
-   :wallet/wallet-send-fee-fiat-formatted        "$5,00"
-   :wallet/sending-collectible?                  false
-   :wallet/selected-keypair-keycard?             false
-   :wallet/send-total-amount-formatted           "250 ETH"
-   :wallet/total-amount                          (money/bignumber "250")
-   :wallet/prices-per-token                      {:ETH {:usd 10}}
-   :wallet/bridge-to-network-details             nil
-   :wallet/send-amount-fixed                     ""
-   :wallet/send-display-token-decimals           5
-   :wallet/send-network                          {:chain-id 1}})
+  {:profile/profile                                {:currency :usd}
+   :wallet/selected-network-details                [{:source           525
+                                                     :short-name       "eth"
+                                                     :network-name     :mainnet
+                                                     :chain-id         1
+                                                     :related-chain-id 5}]
+   :wallet/current-viewing-account-address         "0x1"
+   :wallet/current-viewing-account                 {:path "m/44'/60'/0'/0/1"
+                                                    :emoji "💎"
+                                                    :key-uid "0x2f5ea39"
+                                                    :address "0x1"
+                                                    :wallet false
+                                                    :name "Account One"
+                                                    :type :generated
+                                                    :watch-only? false
+                                                    :chat false
+                                                    :test-preferred-chain-ids #{5 420 421613}
+                                                    :color :purple
+                                                    :hidden false
+                                                    :prod-preferred-chain-ids #{1 10 42161}
+                                                    :network-preferences-names #{:mainnet :arbitrum
+                                                                                 :optimism}
+                                                    :position 1
+                                                    :clock 1698945829328
+                                                    :created-at 1698928839000
+                                                    :operable :fully
+                                                    :mixedcase-address "0x7bcDfc75c431"
+                                                    :public-key "0x04371e2d9d66b82f056bc128064"
+                                                    :removed false}
+   :wallet/current-viewing-account-color           :purple
+   :wallet/wallet-send-enough-assets?              true
+   :wallet/wallet-send-token                       {:symbol             "ETH"
+                                                    :networks           [{:source 879
+                                                                          :short-name "eth"
+                                                                          :network-name :mainnet
+                                                                          :abbreviated-name
+                                                                          "Eth."
+                                                                          :full-name "Mainnet"
+                                                                          :chain-id 1
+                                                                          :related-chain-id 1
+                                                                          :layer 1}]
+                                                    :balances-per-chain {1 {:raw-balance
+                                                                            (money/bignumber
+                                                                             "2500")
+                                                                            :has-error false}}
+                                                    :total-balance      100
+                                                    :available-balance  100}
+   :wallet/wallet-send-loading-suggested-routes?   false
+   :wallet/wallet-send-route                       [{:from       {:chainid                1
+                                                                  :native-currency-symbol "ETH"}
+                                                     :to         {:chain-id               1
+                                                                  :native-currency-symbol "ETH"}
+                                                     :gas-amount "23487"
+                                                     :gas-fees   {:base-fee "32.325296406"
+                                                                  :max-priority-fee-per-gas "0.011000001"
+                                                                  :eip1559-enabled true}}]
+   :wallet/wallet-send-suggested-routes            nil
+   :wallet/wallet-send-receiver-networks           [1]
+   :view-id                                        :screen/wallet.send-input-amount
+   :wallet/wallet-send-to-address                  "0x04371e2d9d66b82f056bc128064"
+   :profile/currency-symbol                        "$"
+   :profile/currency                               :usd
+   :wallet/token-by-symbol                         {:symbol             "ETH"
+                                                    :total-balance      100
+                                                    :available-balance  100
+                                                    :balances-per-chain {1 {:raw-balance
+                                                                            (money/bignumber
+                                                                             "2500")
+                                                                            :has-error false}}}
+   :wallet/wallet-send-disabled-from-chain-ids     []
+   :wallet/wallet-send-from-locked-amounts         {}
+   :wallet/wallet-send-from-values-by-chain        {1 (money/bignumber "250")}
+   :wallet/wallet-send-to-values-by-chain          {1 (money/bignumber "250")}
+   :wallet/wallet-send-sender-network-values       nil
+   :wallet/wallet-send-receiver-network-values     nil
+   :wallet/wallet-send-network-links               nil
+   :wallet/wallet-send-receiver-preferred-networks [1]
+   :wallet/wallet-send-enabled-networks            [{:source           879
+                                                     :short-name       "eth"
+                                                     :network-name     :mainnet
+                                                     :abbreviated-name "Eth."
+                                                     :full-name        "Mainnet"
+                                                     :chain-id         1
+                                                     :related-chain-id 1
+                                                     :layer            1}]
+   :wallet/wallet-send-enabled-from-chain-ids      [1]
+   :wallet/send-amount                             nil
+   :wallet/wallet-send-tx-type                     :tx/send
+   :wallet/wallet-send-fee-fiat-formatted          "$5,00"
+   :wallet/sending-collectible?                    false
+   :wallet/selected-keypair-keycard?               false
+   :wallet/send-total-amount-formatted             "250 ETH"
+   :wallet/total-amount                            (money/bignumber "250")
+   :wallet/prices-per-token                        {:ETH {:usd 10}}
+   :wallet/bridge-to-network-details               nil
+   :wallet/send-amount-fixed                       ""
+   :wallet/send-display-token-decimals             5})
 
 (h/describe "Send > input amount screen"
   (h/setup-restorable-re-frame)

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

@@ -1,7 +1,6 @@
 (ns status-im.contexts.wallet.send.input-amount.estimated-fees
   (:require
     [quo.core :as quo]
-    [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
     [status-im.common.not-implemented :as not-implemented]
@@ -31,40 +30,38 @@
   (let [amount              (rf/sub [:wallet/send-total-amount-formatted])
         tx-type             (rf/sub [:wallet/wallet-send-tx-type])
         {:keys [full-name]} (rf/sub [:wallet/bridge-to-network-details])]
-    (when (= tx-type :tx/bridge)
-      [quo/data-item
-       {:container-style style/amount-data-item
-        :status          (if loading-routes? :loading :default)
-        :size            :small
-        :title-icon      :i/info
-        :title           (i18n/label :t/bridged-to
-                                     {:network full-name})
-        :subtitle        amount
-        :on-press        show-bonder-fee-info}])))
+    [quo/data-item
+     (cond-> {:container-style style/amount-data-item
+              :status          (if loading-routes? :loading :default)
+              :size            :small
+              :title           (i18n/label :t/recipient-gets)
+              :subtitle        amount}
+
+       (= tx-type :tx/bridge)
+       (assoc
+        :title-icon :i/info
+        :title      (i18n/label :t/bridged-to
+                                {:network full-name})
+        :on-press   show-bonder-fee-info))]))
 
 (defn view
-  [{:keys [not-enough-asset? loading-routes? fees]}]
-  (let [theme (quo.theme/use-theme)]
-    [rn/view {:style style/estimated-fees-container}
-     (when (ff/enabled? ::ff/wallet.advanced-sending)
-       [rn/view {:style style/estimated-fees-content-container}
-        [quo/button
-         {:icon-only?          true
-          :type                :outline
-          :size                32
-          :inner-style         {:opacity 1}
-          :accessibility-label :advanced-button
-          :disabled?           loading-routes?
-          :on-press            not-implemented/alert}
-         :i/advanced]])
-     [quo/data-item
-      (cond-> {:container-style style/fees-data-item
-               :status          (if loading-routes? :loading :default)
-               :size            :small
-               :title           (i18n/label :t/max-fees)
-               :subtitle        fees}
-        not-enough-asset? (assoc :subtitle-color
-                                 (colors/theme-colors colors/danger-50
-                                                      colors/danger-60
-                                                      theme)))]
-     [received-amount {:loading-routes? loading-routes?}]]))
+  [{:keys [loading-routes? fees]}]
+  [rn/view {:style style/estimated-fees-container}
+   (when (ff/enabled? ::ff/wallet.advanced-sending)
+     [rn/view {:style style/estimated-fees-content-container}
+      [quo/button
+       {:icon-only?          true
+        :type                :outline
+        :size                32
+        :inner-style         {:opacity 1}
+        :accessibility-label :advanced-button
+        :disabled?           loading-routes?
+        :on-press            not-implemented/alert}
+       :i/advanced]])
+   [quo/data-item
+    {:container-style style/fees-data-item
+     :status          (if loading-routes? :loading :default)
+     :size            :small
+     :title           (i18n/label :t/fees)
+     :subtitle        fees}]
+   [received-amount {:loading-routes? loading-routes?}]])

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

@@ -25,9 +25,10 @@
    :height      40})
 
 (def fees-data-item
-  {:flex             1
-   :height           40
-   :background-color :transparent})
+  {:flex              1
+   :height            40
+   :margin-horizontal 16
+   :background-color  :transparent})
 
 (def amount-data-item
   {:flex             1

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

@@ -2,6 +2,7 @@
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
+    [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
@@ -14,18 +15,29 @@
     [status-im.contexts.wallet.send.input-amount.style :as style]
     [status-im.contexts.wallet.send.routes.view :as routes]
     [status-im.contexts.wallet.sheets.buy-token.view :as buy-token]
+    [status-im.contexts.wallet.sheets.unpreferred-networks-alert.view :as unpreferred-networks-alert]
     [status-im.setup.hot-reload :as hot-reload]
     [utils.debounce :as debounce]
     [utils.i18n :as i18n]
     [utils.money :as money]
     [utils.re-frame :as rf]))
 
+(defn- every-network-value-is-zero?
+  [sender-network-values]
+  (every? (fn [{:keys [total-amount]}]
+            (and
+             total-amount
+             (money/bignumber? total-amount)
+             (money/equal-to total-amount
+                             (money/bignumber "0"))))
+          sender-network-values))
+
 (defn select-asset-bottom-sheet
   [clear-input!]
   (let [{preselected-token-symbol :symbol} (rf/sub [:wallet/wallet-send-token])]
     [:<> ;; Need to be a `:<>` to keep `asset-list` scrollable.
      [quo/drawer-top
-      {:title           (i18n/label :t/select-token)
+      {:title           (i18n/label :t/select-asset)
        :container-style {:padding-bottom 8}}]
      [asset-list/view
       {:content-container-style  {:padding-horizontal 8
@@ -35,6 +47,37 @@
                                    (rf/dispatch [:wallet/edit-token-to-send token])
                                    (clear-input!))}]]))
 
+(defn- token-not-available
+  [token-symbol receiver-networks token-networks]
+  (let [theme              (quo.theme/use-theme)
+        add-token-networks (fn []
+                             (let [chain-ids (concat receiver-networks
+                                                     (mapv #(:chain-id %) token-networks))]
+                               (rf/dispatch [:wallet/update-receiver-networks chain-ids])))]
+    [rn/view {:style (style/token-not-available-container theme)}
+     [rn/view
+      [quo/icon :i/alert
+       {:size  16
+        :color (colors/resolve-color :danger theme)}]]
+     [rn/view {:style style/token-not-available-content-container}
+      [quo/text
+       {:style (style/token-not-available-text theme)
+        :size  :paragraph-2}
+       (i18n/label :t/token-not-available-on-receiver-networks {:token-symbol token-symbol})]
+      [quo/button
+       {:size                24
+        :customization-color (colors/resolve-color :danger theme)
+        :on-press            add-token-networks}
+       (i18n/label :t/add-networks-token-can-be-sent-to {:token-symbol token-symbol})]]]))
+
+(defn- show-unpreferred-networks-alert
+  [on-confirm]
+  (rf/dispatch
+   [:show-bottom-sheet
+    {:content (fn []
+                [unpreferred-networks-alert/view
+                 {:on-confirm on-confirm}])}]))
+
 (defn- no-routes-found
   []
   [rn/view {:style style/no-routes-found-container}
@@ -75,7 +118,8 @@
     (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol])))
 
 (defn- insufficient-asset-amount?
-  [{:keys [token-symbol owned-eth-token input-state limit-exceeded? enough-assets?]}]
+  [{:keys [token-symbol owned-eth-token input-state no-routes-found? limit-exceeded?
+           sender-network-values enough-assets?]}]
   (let [eth-selected?              (= token-symbol (string/upper-case constants/mainnet-short-name))
         zero-owned-eth?            (money/equal-to (:total-balance owned-eth-token) 0)
         input-at-max-owned-amount? (money/equal-to
@@ -84,9 +128,9 @@
         exceeded-input?            (if eth-selected?
                                      input-at-max-owned-amount?
                                      zero-owned-eth?)]
-    (or exceeded-input?
-        limit-exceeded?
-        (false? enough-assets?))))
+    (and (or no-routes-found? limit-exceeded?)
+         (seq sender-network-values)
+         (or exceeded-input? (not enough-assets?)))))
 
 (defn view
   ;; crypto-decimals, limit-crypto and initial-crypto-currency? args are needed
@@ -98,103 +142,122 @@
     button-one-props         :button-one-props
     current-screen-id        :current-screen-id
     initial-crypto-currency? :initial-crypto-currency?
+    enabled-from-chain-ids   :enabled-from-chain-ids
+    from-enabled-networks    :from-enabled-networks
     :or                      {initial-crypto-currency? true}}]
-  (let [view-id                       (rf/sub [:view-id])
-        {fiat-currency :currency}     (rf/sub [:profile/profile])
-        currency                      (rf/sub [:profile/currency])
-        {token-symbol :symbol
-         :as          token}          (rf/sub [:wallet/wallet-send-token])
-        network                       (rf/sub [:wallet/send-network])
-        {:keys [total-balance]
-         :as   token-by-symbol}       (rf/sub [:wallet/token-by-symbol
-                                               (str token-symbol)
-                                               [(:chain-id network)]])
-        currency-symbol               (rf/sub [:profile/currency-symbol])
-        loading-routes?               (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
-        route                         (rf/sub [:wallet/wallet-send-route])
-        current-address               (rf/sub [:wallet/current-viewing-account-address])
-        current-color                 (rf/sub [:wallet/current-viewing-account-color])
-        enough-assets?                (rf/sub [:wallet/wallet-send-enough-assets?])
-        owned-eth-token               (rf/sub [:wallet/token-by-symbol
-                                               (string/upper-case constants/mainnet-short-name)
-                                               [(:chain-id network)]])
-        suggested-routes              (rf/sub [:wallet/wallet-send-suggested-routes])
-        tx-type                       (rf/sub [:wallet/wallet-send-tx-type])
-        token-decimals                (rf/sub [:wallet/send-display-token-decimals])
-        prices-per-token              (rf/sub [:wallet/prices-per-token])
+  (let [view-id                          (rf/sub [:view-id])
+        active-screen?                   (= view-id current-screen-id)
+        bottom                           (safe-area/get-bottom)
         [crypto-currency?
-         set-crypto-currency]         (rn/use-state initial-crypto-currency?)
-        [input-state set-input-state] (rn/use-state controlled-input/init-state)
-        active-screen?                (= view-id current-screen-id)
-        bottom                        (safe-area/get-bottom)
-        token-balance                 (or default-limit-crypto total-balance)
-        usd-conversion-rate           (utils/token-usd-price token prices-per-token)
-        conversion-rate               (utils/token-price-by-symbol prices-per-token
-                                                                   token-symbol
-                                                                   currency)
-        clear-input!                  #(set-input-state controlled-input/delete-all)
-        max-limit                     (if crypto-currency?
-                                        (utils/cut-crypto-decimals-to-fit-usd-cents
-                                         token-balance
-                                         usd-conversion-rate)
-                                        (utils/cut-fiat-balance-to-two-decimals
-                                         (money/crypto->fiat token-balance conversion-rate)))
-        input-value                   (controlled-input/input-value input-state)
-        valid-input?                  (not (or (controlled-input/empty-value? input-state)
-                                               (controlled-input/input-error input-state)))
-        amount-in-crypto              (if crypto-currency?
-                                        input-value
-                                        (rf/sub [:wallet/send-amount-fixed
-                                                 (/ input-value conversion-rate)]))
-        routes-request-uuid           (when suggested-routes
-                                        (:uuid suggested-routes))
-        no-routes-found?              (and
-                                       routes-request-uuid
-                                       (empty? route)
-                                       (not loading-routes?))
-        input-error                   (controlled-input/input-error input-state)
-        limit-exceeded?               (controlled-input/upper-limit-exceeded? input-state)
-        not-enough-asset?             (insufficient-asset-amount?
-                                       {:enough-assets?  enough-assets?
-                                        :token-symbol    token-symbol
-                                        :owned-eth-token owned-eth-token
-                                        :input-state     input-state
-                                        :limit-exceeded? limit-exceeded?})
-        should-try-again?             (and (not limit-exceeded?)
-                                           no-routes-found?
-                                           (not not-enough-asset?))
-        show-no-routes?               (and (or no-routes-found? limit-exceeded?)
-                                           (not not-enough-asset?))
-        confirm-disabled?             (or (nil? route)
-                                          (empty? route)
-                                          (not valid-input?))
-        fee-formatted                 (when (or (not confirm-disabled?) not-enough-asset?)
-                                        (get-fee-formatted route))
-        handle-on-confirm             (fn [amount]
-                                        (rf/dispatch [:wallet/set-token-amount-to-send
-                                                      {:amount   amount
-                                                       :stack-id current-screen-id}]))
-        on-confirm                    (or default-on-confirm handle-on-confirm)
-        show-select-asset-sheet       #(rf/dispatch
-                                        [:show-bottom-sheet
-                                         {:content (fn []
-                                                     [select-asset-bottom-sheet
-                                                      clear-input!])}])
-        request-fetch-routes          (fn [bounce-duration-ms]
-                                        (fetch-routes
-                                         {:amount                 amount-in-crypto
-                                          :valid-input?           valid-input?
-                                          :bounce-duration-ms     bounce-duration-ms
-                                          :token                  token
-                                          :reset-amounts-to-zero? (and limit-exceeded?
-                                                                       (some? route))}))
-        swap-between-fiat-and-crypto  (fn []
-                                        (if crypto-currency?
-                                          (set-input-state
-                                           #(controlled-input/->fiat % conversion-rate))
-                                          (set-input-state
-                                           #(controlled-input/->crypto % conversion-rate)))
-                                        (set-crypto-currency (not crypto-currency?)))]
+         set-crypto-currency]            (rn/use-state initial-crypto-currency?)
+        handle-on-confirm                (fn [amount]
+                                           (rf/dispatch [:wallet/set-token-amount-to-send
+                                                         {:amount   amount
+                                                          :stack-id current-screen-id}]))
+        {fiat-currency :currency}        (rf/sub [:profile/profile])
+        {token-symbol   :symbol
+         token-networks :networks
+         :as            token}           (rf/sub [:wallet/wallet-send-token])
+        send-from-locked-amounts         (rf/sub [:wallet/wallet-send-from-locked-amounts])
+        {:keys [total-balance]
+         :as   token-by-symbol}          (rf/sub [:wallet/token-by-symbol
+                                                  (str token-symbol)
+                                                  enabled-from-chain-ids])
+        token-balance                    (or default-limit-crypto total-balance)
+        prices-per-token                 (rf/sub [:wallet/prices-per-token])
+        usd-conversion-rate              (utils/token-usd-price token prices-per-token)
+        currency                         (rf/sub [:profile/currency])
+        token-decimals                   (rf/sub [:wallet/send-display-token-decimals])
+
+        conversion-rate                  (utils/token-price-by-symbol prices-per-token
+                                                                      token-symbol
+                                                                      currency)
+        [input-state set-input-state]    (rn/use-state controlled-input/init-state)
+        clear-input!                     #(set-input-state controlled-input/delete-all)
+        currency-symbol                  (rf/sub [:profile/currency-symbol])
+        loading-routes?                  (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
+        route                            (rf/sub [:wallet/wallet-send-route])
+        on-confirm                       (or default-on-confirm handle-on-confirm)
+        max-limit                        (if crypto-currency?
+                                           (utils/cut-crypto-decimals-to-fit-usd-cents
+                                            token-balance
+                                            usd-conversion-rate)
+                                           (utils/cut-fiat-balance-to-two-decimals
+                                            (money/crypto->fiat token-balance conversion-rate)))
+        input-value                      (controlled-input/input-value input-state)
+        valid-input?                     (not (or (controlled-input/empty-value? input-state)
+                                                  (controlled-input/input-error input-state)))
+        amount-in-crypto                 (if crypto-currency?
+                                           input-value
+                                           (rf/sub [:wallet/send-amount-fixed
+                                                    (/ input-value conversion-rate)]))
+        show-select-asset-sheet          #(rf/dispatch
+                                           [:show-bottom-sheet
+                                            {:content (fn []
+                                                        [select-asset-bottom-sheet
+                                                         clear-input!])}])
+        sender-network-values            (rf/sub [:wallet/wallet-send-sender-network-values])
+        receiver-network-values          (rf/sub [:wallet/wallet-send-receiver-network-values])
+        tx-type                          (rf/sub [:wallet/wallet-send-tx-type])
+        unsupported-token-in-receiver?   (and (not= tx-type :tx/bridge)
+                                              (->> receiver-network-values
+                                                   (remove #(= (:type %) :add))
+                                                   (every? #(= (:type %) :not-available))))
+        suggested-routes                 (rf/sub [:wallet/wallet-send-suggested-routes])
+        routes                           (when suggested-routes
+                                           (or (:best suggested-routes) []))
+        no-routes-found?                 (and
+                                          (every-network-value-is-zero? sender-network-values)
+                                          (some? routes)
+                                          (not loading-routes?)
+                                          (not unsupported-token-in-receiver?))
+        receiver-networks                (rf/sub [:wallet/wallet-send-receiver-networks])
+        receiver-preferred-networks      (rf/sub [:wallet/wallet-send-receiver-preferred-networks])
+        receiver-preferred-network?      (set receiver-preferred-networks)
+        sending-to-unpreferred-networks? (some (comp not receiver-preferred-network?)
+                                               receiver-networks)
+        input-error                      (controlled-input/input-error input-state)
+        limit-exceeded?                  (controlled-input/upper-limit-exceeded? input-state)
+        current-address                  (rf/sub [:wallet/current-viewing-account-address])
+        current-color                    (rf/sub [:wallet/current-viewing-account-color])
+        enough-assets?                   (rf/sub [:wallet/wallet-send-enough-assets?])
+        owned-eth-token                  (rf/sub [:wallet/token-by-symbol
+                                                  (string/upper-case constants/mainnet-short-name)
+                                                  enabled-from-chain-ids])
+        not-enough-asset?                (insufficient-asset-amount?
+                                          {:enough-assets?        enough-assets?
+                                           :token-symbol          token-symbol
+                                           :owned-eth-token       owned-eth-token
+                                           :input-state           input-state
+                                           :no-routes-found?      no-routes-found?
+                                           :limit-exceeded?       limit-exceeded?
+                                           :sender-network-values sender-network-values})
+        should-try-again?                (and (not limit-exceeded?)
+                                              no-routes-found?
+                                              (not not-enough-asset?))
+        show-no-routes?                  (and (or no-routes-found? limit-exceeded?)
+                                              (not-empty sender-network-values)
+                                              (not not-enough-asset?))
+        confirm-disabled?                (or (nil? route)
+                                             (empty? route)
+                                             (not valid-input?))
+        fee-formatted                    (when (or (not confirm-disabled?) not-enough-asset?)
+                                           (get-fee-formatted route))
+        request-fetch-routes             (fn [bounce-duration-ms]
+                                           (fetch-routes
+                                            {:amount                 amount-in-crypto
+                                             :valid-input?           valid-input?
+                                             :bounce-duration-ms     bounce-duration-ms
+                                             :token                  token
+                                             :reset-amounts-to-zero? (and limit-exceeded?
+                                                                          (some? routes))}))
+        swap-between-fiat-and-crypto     (fn []
+                                           (if crypto-currency?
+                                             (set-input-state
+                                              #(controlled-input/->fiat % conversion-rate))
+                                             (set-input-state
+                                              #(controlled-input/->crypto % conversion-rate)))
+                                           (set-crypto-currency (not crypto-currency?)))]
     (rn/use-effect
      (fn []
        (when active-screen?
@@ -219,13 +282,13 @@
     (rn/use-effect
      (fn []
        (clear-input!)
-       (rf/dispatch [:wallet/stop-and-clean-suggested-routes]))
+       (rf/dispatch [:wallet/stop-and-clean-suggested-routes])
+       (rf/dispatch [:wallet/clean-disabled-from-networks]))
      [current-address])
     (rn/use-effect
      (fn []
-       (when active-screen?
-         (request-fetch-routes 2000)))
-     [amount-in-crypto valid-input?])
+       (request-fetch-routes 0))
+     [send-from-locked-amounts])
     [rn/view
      {:style               style/screen
       :accessibility-label (str "container"
@@ -253,7 +316,7 @@
                                                conversion-rate)
                            conversion-rate))
        :hint-component  [quo/network-tags
-                         {:networks (seq [network])
+                         {:networks (seq from-enabled-networks)
                           :title    (i18n/label
                                      :t/send-limit
                                      {:limit (if crypto-currency?
@@ -265,16 +328,24 @@
                                                                        (controlled-input/upper-limit-bn
                                                                         input-state)))})
                           :status   (when (controlled-input/input-error input-state) :error)}]}]
-     (if (= tx-type :tx/bridge)
-       [routes/view]
-       [rn/view {:style {:flex 1}}])
+     [routes/view
+      {:token                                     token-by-symbol
+       :input-value                               input-value
+       :valid-input?                              valid-input?
+       :token-not-supported-in-receiver-networks? unsupported-token-in-receiver?
+       :current-screen-id                         current-screen-id
+       :request-fetch-routes                      request-fetch-routes}]
+     (when (and (not loading-routes?)
+                sender-network-values
+                unsupported-token-in-receiver?)
+       [token-not-available token-symbol receiver-networks token-networks])
      (when not-enough-asset?
        [not-enough-asset])
-     (when (or loading-routes? route)
+     (when (or (and (not no-routes-found?) (or loading-routes? route))
+               not-enough-asset?)
        [estimated-fees/view
-        {:not-enough-asset? not-enough-asset?
-         :loading-routes?   loading-routes?
-         :fees              fee-formatted}])
+        {:loading-routes? loading-routes?
+         :fees            fee-formatted}])
      (when show-no-routes?
        [no-routes-found])
      [quo/bottom-actions
@@ -288,10 +359,14 @@
                                                           loading-routes?
                                                           (and (not should-try-again?)
                                                                confirm-disabled?))
-                                 :on-press            (if should-try-again?
+                                 :on-press            (cond
+                                                        should-try-again?
                                                         #(rf/dispatch [:wallet/start-get-suggested-routes
                                                                        {:amount        amount-in-crypto
                                                                         :updated-token token-by-symbol}])
+                                                        sending-to-unpreferred-networks?
+                                                        #(show-unpreferred-networks-alert on-confirm)
+                                                        :else
                                                         #(on-confirm amount-in-crypto))
                                  :customization-color current-color}
                                 (when should-try-again?

src/status_im/contexts/wallet/send/routes/style.cljs

@@ -34,3 +34,19 @@
            :top      margin-top}
     inverted?
     (assoc :transform [{:scaleY -1}])))
+
+(def disclaimer
+  {:margin-horizontal 20
+   :margin-top        20
+   :margin-bottom     8})
+
+(def input-container
+  {:margin-top    8
+   :margin-bottom 12})
+
+(defn keyboard-container
+  [bottom]
+  {:padding-bottom bottom})
+
+(def error-box
+  {:margin-horizontal 20})

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

@@ -1,39 +1,122 @@
 (ns status-im.contexts.wallet.send.routes.view
   (:require
     [quo.core :as quo]
-    [quo.theme]
     [react-native.core :as rn]
-    [status-im.contexts.wallet.common.utils :as common-utils]
     [status-im.contexts.wallet.common.utils.networks :as network-utils]
     [status-im.contexts.wallet.send.routes.style :as style]
+    [status-im.contexts.wallet.send.utils :as send-utils]
+    [status-im.contexts.wallet.sheets.network-preferences.view :as network-preferences]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
+
 (def row-height 44)
 (def space-between-rows 11)
 (def network-link-linear-height 10)
 (def network-link-1x-height 56)
 (def network-link-2x-height 111)
 
+
+(defn- open-preferences
+  []
+  (rf/dispatch
+   [:show-bottom-sheet
+    {:content
+     (fn []
+       (let [receiver-networks                        (rf/sub [:wallet/wallet-send-receiver-networks])
+             receiver-preferred-networks              (rf/sub
+                                                       [:wallet/wallet-send-receiver-preferred-networks])
+             {token-symbol   :symbol
+              token-networks :supported-networks}     (rf/sub [:wallet/wallet-send-token])
+             token-chain-ids-set                      (set (mapv #(:chain-id %) token-networks))
+             [selected-receiver-networks
+              set-selected-receiver-networks]         (rn/use-state receiver-networks)
+             receiver-preferred-networks-set          (set receiver-preferred-networks)
+             receiver-selected-preferred-networks     (filter #(contains?
+                                                                receiver-preferred-networks-set
+                                                                %)
+                                                              selected-receiver-networks)
+             receiver-selected-non-preferred-networks (filter #(not (contains?
+                                                                     receiver-preferred-networks-set
+                                                                     %))
+                                                              selected-receiver-networks)
+             not-available-preferred-networks         (filter (fn [preferred-chain-id]
+                                                                (not (contains? token-chain-ids-set
+                                                                                preferred-chain-id)))
+                                                              receiver-selected-preferred-networks)
+             not-available-non-preferred-networks     (filter (fn [preferred-chain-id]
+                                                                (not (contains?
+                                                                      token-chain-ids-set
+                                                                      preferred-chain-id)))
+                                                              receiver-selected-non-preferred-networks)
+             first-section-warning-label              (when (not-empty not-available-preferred-networks)
+                                                        (i18n/label
+                                                         :t/token-not-available-on-networks
+                                                         {:token-symbol token-symbol
+                                                          :networks
+                                                          (network-utils/network-ids->formatted-text
+                                                           not-available-preferred-networks)}))
+             second-section-warning-label             (when (not-empty
+                                                             not-available-non-preferred-networks)
+                                                        (i18n/label
+                                                         :t/token-not-available-on-networks
+                                                         {:token-symbol token-symbol
+                                                          :networks
+                                                          (network-utils/network-ids->formatted-text
+                                                           not-available-non-preferred-networks)}))]
+         [network-preferences/view
+          {:title                        (i18n/label :t/edit-receiver-networks)
+           :first-section-label          (i18n/label :t/preferred-by-receiver)
+           :second-section-label         (i18n/label :t/not-preferred-by-receiver)
+           :selected-networks            (set (map network-utils/id->network
+                                                   receiver-networks))
+           :receiver-preferred-networks  receiver-preferred-networks
+           :button-label                 (i18n/label :t/apply-changes)
+           :first-section-warning-label  first-section-warning-label
+           :second-section-warning-label second-section-warning-label
+           :on-change                    #(set-selected-receiver-networks %)
+           :on-save                      (fn [chain-ids]
+                                           (rf/dispatch [:hide-bottom-sheet])
+                                           (rf/dispatch [:wallet/update-receiver-networks
+                                                         chain-ids]))}]))}]))
+
 (defn render-network-values
-  [{:keys [network-values token-symbol token-decimals receiver?]}]
+  [{:keys [network-values token-symbol on-press on-long-press receiver? loading-routes?
+           token-not-supported-in-receiver-networks?]}]
   [rn/view
    (doall
     (map-indexed (fn [index
                       {chain-id           :chain-id
                        network-value-type :type
                        total-amount       :total-amount}]
-                   (let [amount-formatted (-> total-amount
-                                              (common-utils/sanitized-token-amount-to-display
-                                               token-decimals)
+                   (let [status           (cond (and (= network-value-type :not-available)
+                                                     loading-routes?
+                                                     token-not-supported-in-receiver-networks?)
+                                                :loading
+                                                (= network-value-type :not-available)
+                                                :disabled
+                                                :else network-value-type)
+                         amount-formatted (-> (rf/sub [:wallet/send-amount-fixed total-amount])
                                               (str " " token-symbol))]
                      [rn/view
                       {:key   (str (if receiver? "to" "from") "-" chain-id)
                        :style {:margin-top (if (pos? index) 11 7.5)}}
                       [quo/network-bridge
-                       {:amount  amount-formatted
-                        :network (network-utils/id->network chain-id)
-                        :status  network-value-type}]]))
+                       {:amount        (if (= network-value-type :not-available)
+                                         (i18n/label :t/not-available)
+                                         amount-formatted)
+                        :network       (network-utils/id->network chain-id)
+                        :status        status
+                        :on-press      #(when (not loading-routes?)
+                                          (cond
+                                            (= network-value-type :edit)
+                                            (open-preferences)
+                                            on-press (on-press chain-id total-amount)))
+                        :on-long-press #(when (and (not loading-routes?) (not= status :disabled))
+                                          (cond
+                                            (= network-value-type :add)
+                                            (open-preferences)
+                                            on-long-press (on-long-press chain-id total-amount)))}]]))
                  network-values))])
 
 (defn render-network-links
@@ -73,14 +156,59 @@
             :destination destination}]]]))
     network-links)])
 
+(defn disable-chain
+  [chain-id disabled-from-chain-ids token-available-networks-for-suggested-routes]
+  (let [disabled-chain-ids
+        (if (contains? (set
+                        disabled-from-chain-ids)
+                       chain-id)
+          (vec (remove #(= % chain-id)
+                       disabled-from-chain-ids))
+          (conj disabled-from-chain-ids
+                chain-id))
+        re-enabling-chain?
+        (< (count disabled-chain-ids)
+           (count disabled-from-chain-ids))]
+    (if (or re-enabling-chain?
+            (> (count token-available-networks-for-suggested-routes) 1))
+      (rf/dispatch [:wallet/disable-from-networks
+                    disabled-chain-ids])
+      (rf/dispatch [:toasts/upsert
+                    {:id   :disable-chain-error
+                     :type :negative
+                     :text (i18n/label :t/at-least-one-network-must-be-activated)}]))))
+
 (defn view
-  []
-  (let [token-symbol            (rf/sub [:wallet/wallet-send-token-symbol])
-        sender-network-values   (rf/sub [:wallet/wallet-send-sender-network-values])
-        receiver-network-values (rf/sub [:wallet/wallet-send-receiver-network-values])
-        network-links           (rf/sub [:wallet/wallet-send-network-links])
-        token-decimals          (rf/sub [:wallet/send-display-token-decimals])
-        show-routes?            (not-empty sender-network-values)]
+  [{:keys [token theme valid-input? request-fetch-routes on-press-to-network current-screen-id
+           token-not-supported-in-receiver-networks? input-value]}]
+  (let [token-symbol (:symbol token)
+        nav-current-screen-id (rf/sub [:view-id])
+        active-screen? (= nav-current-screen-id current-screen-id)
+        loading-routes? (rf/sub
+                         [:wallet/wallet-send-loading-suggested-routes?])
+        sender-network-values (rf/sub
+                               [:wallet/wallet-send-sender-network-values])
+        receiver-network-values (rf/sub
+                                 [:wallet/wallet-send-receiver-network-values])
+        network-links (rf/sub [:wallet/wallet-send-network-links])
+        disabled-from-chain-ids (rf/sub
+                                 [:wallet/wallet-send-disabled-from-chain-ids])
+        {token-balances-per-chain :balances-per-chain} (rf/sub [:wallet/wallet-send-token])
+        token-available-networks-for-suggested-routes
+        (send-utils/token-available-networks-for-suggested-routes
+         {:balances-per-chain token-balances-per-chain
+          :disabled-chain-ids disabled-from-chain-ids})
+        show-routes? (not-empty sender-network-values)]
+    (rn/use-effect
+     (fn []
+       (when (and active-screen?
+                  (> (count token-available-networks-for-suggested-routes) 0))
+         (request-fetch-routes 2000)))
+     [input-value valid-input?])
+    (rn/use-effect
+     #(when (and active-screen? (> (count token-available-networks-for-suggested-routes) 0))
+        (request-fetch-routes 0))
+     [disabled-from-chain-ids])
     [rn/scroll-view {:content-container-style style/routes-container}
      (when show-routes?
        [rn/view {:style style/routes-header-container}
@@ -92,16 +220,27 @@
           :container-style style/section-label-right}]])
      [rn/view {:style style/routes-inner-container}
       [render-network-values
-       {:token-symbol   token-symbol
-        :network-values sender-network-values
-        :token-decimals token-decimals
-        :receiver?      false}]
+       {:token-symbol                              token-symbol
+        :network-values                            sender-network-values
+        :on-press                                  (fn [chain-id-to-disable]
+                                                     (disable-chain
+                                                      chain-id-to-disable
+                                                      disabled-from-chain-ids
+                                                      token-available-networks-for-suggested-routes))
+        :receiver?                                 false
+        :theme                                     theme
+        :loading-routes?                           loading-routes?
+        :token-not-supported-in-receiver-networks? false}]
       [render-network-links
        {:network-links         network-links
         :sender-network-values sender-network-values}]
       [render-network-values
-       {:token-symbol   token-symbol
-        :network-values receiver-network-values
-        :token-decimals token-decimals
-        :receiver?      true}]]]))
+       {:token-symbol                              token-symbol
+        :network-values                            receiver-network-values
+        :on-press                                  on-press-to-network
+        :receiver?                                 true
+        :loading-routes?                           loading-routes?
+        :theme                                     theme
+        :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
+        :on-save                                   #(request-fetch-routes 0)}]]]))
 

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

@@ -176,6 +176,7 @@
                          (rf/dispatch [:wallet/clean-local-suggestions])
                          (rf/dispatch [:wallet/clean-selected-collectible])
                          (rf/dispatch [:wallet/clean-send-address])
+                         (rf/dispatch [:wallet/clean-disabled-from-networks])
                          (rf/dispatch [:wallet/select-address-tab nil])
                          (rf/dispatch [:wallet/clean-current-viewing-account
                                        :ignore-just-complete-transaction]))

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

@@ -78,7 +78,7 @@
        :on-press      on-close
        :switcher-type :select-account}]
      [quo/page-top
-      {:title                     (i18n/label :t/select-token)
+      {:title                     (i18n/label :t/select-asset)
        :title-accessibility-label :title-label}]
      [quo/segmented-control
       {:size            32

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

@@ -8,8 +8,12 @@
 (defn view
   []
   [input-amount/view
-   {:current-screen-id :screen/wallet.send-input-amount
-    :button-one-label  (i18n/label :t/review-send)
-    :on-navigate-back  (fn []
-                         (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
-                         (rf/dispatch [:wallet/clean-send-amount]))}])
+   {:current-screen-id      :screen/wallet.send-input-amount
+    :button-one-label       (i18n/label :t/review-send)
+    :enabled-from-chain-ids (rf/sub [:wallet/wallet-send-enabled-from-chain-ids])
+    :from-enabled-networks  (rf/sub [:wallet/wallet-send-enabled-networks])
+    :on-navigate-back       (fn []
+                              (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
+                              (rf/dispatch [:wallet/clean-disabled-from-networks])
+                              (rf/dispatch [:wallet/clean-from-locked-amounts])
+                              (rf/dispatch [:wallet/clean-send-amount]))}])

src/status_im/contexts/wallet/send/utils.cljs

@@ -48,10 +48,11 @@
 (defn- path-amount-out
   [path]
   (if (= (:bridge-name path) constants/bridge-name-hop)
-    (let [{:keys [token-fees amount-in]} path]
+    (let [{:keys [token-fees bonder-fees amount-in]} path]
       (-> amount-in
           money/from-hex
-          (money/sub token-fees)))
+          (money/sub token-fees)
+          (money/add bonder-fees)))
     (-> path :amount-out money/from-hex)))
 
 (defn convert-wei-to-eth
@@ -137,6 +138,12 @@
    :optimism 2
    :arbitrum 3})
 
+(defn safe-add-type-edit
+  [network-values]
+  (if (or (empty? network-values) (some #(= (:type %) :edit) network-values))
+    network-values
+    (conj network-values {:type :edit})))
+
 (defn reset-loading-network-amounts-to-zero
   [network-amounts]
   (mapv
@@ -148,39 +155,118 @@
    network-amounts))
 
 (defn reset-network-amounts-to-zero
-  [network-amounts]
+  [{:keys [network-amounts disabled-chain-ids]}]
   (map
    (fn [network-amount]
-     (assoc network-amount
-            :total-amount (money/bignumber "0")
-            :type         :default))
+     (let [disabled-chain-ids-set (set disabled-chain-ids)
+           disabled?              (contains? disabled-chain-ids-set
+                                             (:chain-id network-amount))]
+       (cond-> network-amount
+         (and (not= (:type network-amount) :edit)
+              (not= (:type network-amount) :not-available))
+         (assoc :total-amount (money/bignumber "0")
+                :type         (if disabled? :disabled :default)))))
    network-amounts))
 
 (defn network-amounts
-  [network-values]
-  (->> network-values
-       (map
-        (fn [[chain-id amount]]
-          {:chain-id     chain-id
-           :total-amount amount
-           :type         :default}))
-       (sort-by (fn [network-amount]
-                  (get network-priority-score
-                       (network-utils/id->network (:chain-id network-amount)))))
-       (vec)))
+  [{:keys [network-values disabled-chain-ids receiver-networks token-networks-ids tx-type receiver?
+           from-locked-amounts]}]
+  (let [disabled-set                             (set disabled-chain-ids)
+        receiver-networks-set                    (set receiver-networks)
+        network-values-keys                      (set (keys network-values))
+        routes-found?                            (pos? (count network-values-keys))
+        token-networks-ids-set                   (set token-networks-ids)
+        not-available-networks                   (if receiver?
+                                                   (filter #(not (token-networks-ids-set %))
+                                                           receiver-networks)
+                                                   [])
+        not-available-networks-set               (set not-available-networks)
+        network-values-with-disabled-chains      (when routes-found?
+                                                   (reduce
+                                                    (fn [acc k]
+                                                      (if (or (contains? network-values-keys k)
+                                                              receiver?)
+                                                        acc
+                                                        (assoc acc k (money/bignumber "0"))))
+                                                    network-values
+                                                    disabled-chain-ids))
+        network-values-with-not-available-chains (if (and receiver? routes-found?)
+                                                   (let [network-values-keys
+                                                         (set (keys
+                                                               network-values-with-disabled-chains))]
+                                                     (reduce
+                                                      (fn [acc k]
+                                                        (if (not (contains? network-values-keys k))
+                                                          (assoc acc k nil)
+                                                          acc))
+                                                      network-values-with-disabled-chains
+                                                      not-available-networks))
+                                                   network-values-with-disabled-chains)]
+    (cond-> (->>
+              network-values-with-not-available-chains
+              (map
+               (fn [[chain-id amount]]
+                 {:chain-id     chain-id
+                  :total-amount (get from-locked-amounts chain-id amount)
+                  :type         (cond
+                                  (contains? from-locked-amounts chain-id)                :locked
+                                  (contains? not-available-networks-set chain-id)         :not-available
+                                  (or receiver? (not (contains? disabled-set chain-id)))  :default
+                                  (and (not receiver?) (contains? disabled-set chain-id)) :disabled)}))
+              (sort-by (fn [network-amount]
+                         (get network-priority-score
+                              (network-utils/id->network (:chain-id network-amount)))))
+              (filter
+               (fn [network-amount]
+                 (or (and receiver?
+                          (or (contains? receiver-networks-set (:chain-id network-amount))
+                              (money/above-zero? (:total-amount network-amount))))
+                     (not receiver?))))
+              (vec))
+      (and receiver?
+           routes-found?
+           (not= tx-type :tx/bridge))
+      safe-add-type-edit)))
 
 (defn loading-network-amounts
-  [{:keys [networks values receiver?]}]
-  (->> networks
-       (map
-        (fn [chain-id]
-          (let [network-value (when values (get values chain-id))]
-            (cond-> {:chain-id chain-id
-                     :type     (if network-value :default :loading)}
-              network-value                             (assoc :total-amount
-                                                               (money/bignumber network-value))
-              (and (not network-value) (not receiver?)) (assoc :total-amount (money/bignumber "0"))))))
-       (vec)))
+  [{:keys [valid-networks disabled-chain-ids receiver-networks token-networks-ids tx-type receiver?]}]
+  (let [disabled-set               (set disabled-chain-ids)
+        receiver-networks-set      (set receiver-networks)
+        token-networks-ids-set     (set token-networks-ids)
+        valid-networks-set         (set valid-networks)
+        not-available-networks     (if receiver?
+                                     (filter #(not (token-networks-ids-set %)) receiver-networks)
+                                     [])
+        not-available-networks-set (set not-available-networks)
+        valid-networks             (-> (concat valid-networks
+                                               (when (not (and receiver? (= tx-type :tx/bridge)))
+                                                 disabled-chain-ids)
+                                               (when receiver?
+                                                 (filter #(not (valid-networks-set %))
+                                                         not-available-networks)))
+                                       (distinct))]
+    (->> valid-networks
+         (map
+          (fn [chain-id]
+            (cond->
+              {:chain-id chain-id
+               :type     (cond
+                           (contains? not-available-networks-set chain-id)         :not-available
+                           (or receiver?
+                               (not (contains? disabled-set chain-id)))            :loading
+                           (and (not receiver?) (contains? disabled-set chain-id)) :disabled)}
+              (and (not receiver?) (contains? disabled-set chain-id))
+              (assoc :total-amount (money/bignumber "0")))))
+         (filter
+          (fn [network-amount]
+            (or (and receiver?
+                     (or (= tx-type :tx/bridge)
+                         (contains? receiver-networks-set (:chain-id network-amount))))
+                (not receiver?))))
+         (sort-by (fn [network-amount]
+                    (get network-priority-score
+                         (network-utils/id->network (:chain-id network-amount)))))
+         (vec))))
 
 (defn network-links
   [route from-values-by-chain to-values-by-chain]

src/status_im/contexts/wallet/send/utils_test.cljs

@@ -85,9 +85,11 @@
   (testing "Correctly calculates network (out) amounts for bridge transaction"
     (let [route          [{:bridge-name "Hop"
                            :amount-in   "0xde0b6b3a7640000"
+                           :bonder-fees (money/bignumber "200000000000000")
                            :token-fees  (money/bignumber "230000000000000")
                            :to          {:chain-id 1}}
                           {:bridge-name "Hop"
+                           :bonder-fees (money/bignumber "300000000000000")
                            :token-fees  (money/bignumber "410000000000000")
                            :amount-in   "0xde0b6b3a7640000"
                            :to          {:chain-id 10}}]
@@ -98,8 +100,8 @@
                                                           :token-decimals token-decimals
                                                           :native-token?  native-token?
                                                           :receiver?      receiver?})
-          expected       {1  (money/bignumber "0.99977")
-                          10 (money/bignumber "0.99959")}]
+          expected       {1  (money/bignumber "0.99997")
+                          10 (money/bignumber "0.99989")}]
       (doseq [[chain-id exp-value] expected]
         (is (money/equal-to (get result chain-id) exp-value))))))
 
@@ -348,12 +350,171 @@
       (is (every? identity comparisons)))))
 
 (deftest network-amounts-test
-  (testing "Handles network values with one chain"
-    (let [network-values {10 (money/bignumber "200")}
-          expected       [{:chain-id     10
-                           :total-amount (money/bignumber "200")
-                           :type         :default}]
-          result         (utils/network-amounts network-values)]
+  (testing "Handles disabled and receiver networks correctly when receiver? is true"
+    (let [network-values     {10 (money/bignumber "200")}
+          disabled-chain-ids [1]
+          receiver-networks  [10]
+          token-networks-ids [1 10 42161]
+          receiver?          true
+          expected           [{:chain-id     10
+                               :total-amount (money/bignumber "200")
+                               :type         :default}
+                              {:type :edit}]
+          tx-type            :tx/send
+          result             (utils/network-amounts {:network-values     network-values
+                                                     :disabled-chain-ids disabled-chain-ids
+                                                     :receiver-networks  receiver-networks
+                                                     :token-networks-ids token-networks-ids
+                                                     :tx-type            tx-type
+                                                     :receiver?          receiver?})]
+      (is (every? identity (map #(map/deep-compare %1 %2) expected result)))))
+
+  (testing "Adds default amount for non-disabled non-receiver networks when receiver? is false"
+    (let [network-values     {1 (money/bignumber "100")}
+          disabled-chain-ids [10]
+          receiver-networks  []
+          token-networks-ids [1 10 42161]
+          receiver?          false
+          expected           [{:chain-id     1
+                               :total-amount (money/bignumber "100")
+                               :type         :default}
+                              {:chain-id     10
+                               :total-amount (money/bignumber "0")
+                               :type         :disabled}]
+          tx-type            :tx/send
+          result             (utils/network-amounts {:network-values     network-values
+                                                     :disabled-chain-ids disabled-chain-ids
+                                                     :receiver-networks  receiver-networks
+                                                     :token-networks-ids token-networks-ids
+                                                     :tx-type            tx-type
+                                                     :receiver?          receiver?})]
+      (is (every? identity (map #(map/deep-compare %1 %2) expected result)))))
+
+  (testing "Handles empty inputs correctly"
+    (let [network-values     {}
+          disabled-chain-ids []
+          receiver-networks  []
+          token-networks-ids []
+          receiver?          true
+          expected           []
+          tx-type            :tx/send
+          result             (utils/network-amounts {:network-values     network-values
+                                                     :disabled-chain-ids disabled-chain-ids
+                                                     :receiver-networks  receiver-networks
+                                                     :token-networks-ids token-networks-ids
+                                                     :tx-type            tx-type
+                                                     :receiver?          receiver?})]
+      (is (= expected result))))
+
+  (testing "Processes case with multiple network interactions"
+    (let [network-values     {1     (money/bignumber "300")
+                              10    (money/bignumber "400")
+                              42161 (money/bignumber "500")}
+          disabled-chain-ids [1 42161]
+          receiver-networks  [10]
+          token-networks-ids [1 10 42161]
+          receiver?          true
+          expected           [{:chain-id     1
+                               :total-amount (money/bignumber "300")
+                               :type         :default}
+                              {:chain-id     10
+                               :total-amount (money/bignumber "400")
+                               :type         :default}
+                              {:chain-id     42161
+                               :total-amount (money/bignumber "500")
+                               :type         :default}
+                              {:type :edit}]
+          tx-type            :tx/send
+          result             (utils/network-amounts {:network-values     network-values
+                                                     :disabled-chain-ids disabled-chain-ids
+                                                     :receiver-networks  receiver-networks
+                                                     :token-networks-ids token-networks-ids
+                                                     :tx-type            tx-type
+                                                     :receiver?          receiver?})]
+      (is (every? identity (map #(map/deep-compare %1 %2) expected result)))))
+
+  (testing "Does not assign :not-available type when receiver? is false"
+    (let [network-values     {1 (money/bignumber "100")}
+          disabled-chain-ids [10]
+          receiver-networks  [1]
+          token-networks-ids [1 10]
+          receiver?          false
+          expected           [{:chain-id     1
+                               :total-amount (money/bignumber "100")
+                               :type         :default}
+                              {:chain-id     10
+                               :total-amount (money/bignumber "0")
+                               :type         :disabled}]
+          tx-type            :tx/send
+          result             (utils/network-amounts {:network-values     network-values
+                                                     :disabled-chain-ids disabled-chain-ids
+                                                     :receiver-networks  receiver-networks
+                                                     :token-networks-ids token-networks-ids
+                                                     :tx-type            tx-type
+                                                     :receiver?          receiver?})]
+      (is (every? identity (map #(map/deep-compare %1 %2) expected result)))))
+
+  (testing
+    "Assigns :not-available type to networks not available in token-networks-ids when receiver? is true"
+    (let [network-values     {1 (money/bignumber "100")}
+          disabled-chain-ids []
+          receiver-networks  [1 10]
+          token-networks-ids [1]
+          receiver?          false
+          expected           [{:chain-id     1
+                               :total-amount (money/bignumber "100")
+                               :type         :default}
+                              {:chain-id     10
+                               :total-amount nil
+                               :type         :not-available}]
+          tx-type            :tx/send
+          result             (utils/network-amounts {:network-values     network-values
+                                                     :disabled-chain-ids disabled-chain-ids
+                                                     :receiver-networks  receiver-networks
+                                                     :token-networks-ids token-networks-ids
+                                                     :tx-type            tx-type
+                                                     :receiver?          receiver?})]
+      (is (every? identity (map #(map/deep-compare %1 %2) expected result)))))
+
+  (testing
+    "Handles disabled and receiver networks correctly when receiver? is false and tx-type is :tx/bridge"
+    (let [network-values     {10 (money/bignumber "200")}
+          disabled-chain-ids [1]
+          receiver-networks  [10]
+          token-networks-ids [1 10]
+          tx-type            :tx/bridge
+          receiver?          false
+          expected           [{:chain-id     1
+                               :total-amount (money/bignumber "0")
+                               :type         :disabled}
+                              {:chain-id     10
+                               :total-amount (money/bignumber "200")
+                               :type         :default}]
+          result             (utils/network-amounts {:network-values     network-values
+                                                     :disabled-chain-ids disabled-chain-ids
+                                                     :receiver-networks  receiver-networks
+                                                     :token-networks-ids token-networks-ids
+                                                     :tx-type            tx-type
+                                                     :receiver?          receiver?})]
+      (is (every? identity (map #(map/deep-compare %1 %2) expected result)))))
+
+  (testing
+    "Handles disabled and receiver networks correctly when receiver? is true and tx-type is :tx/bridge"
+    (let [network-values     {10 (money/bignumber "200")}
+          disabled-chain-ids [1]
+          receiver-networks  [10]
+          token-networks-ids [1 10]
+          tx-type            :tx/bridge
+          receiver?          true
+          expected           [{:chain-id     10
+                               :total-amount (money/bignumber "200")
+                               :type         :default}]
+          result             (utils/network-amounts {:network-values     network-values
+                                                     :disabled-chain-ids disabled-chain-ids
+                                                     :receiver-networks  receiver-networks
+                                                     :token-networks-ids token-networks-ids
+                                                     :tx-type            tx-type
+                                                     :receiver?          receiver?})]
       (is (every? identity (map #(map/deep-compare %1 %2) expected result))))))
 
 (deftest loading-network-amounts-test
@@ -377,6 +538,27 @@
                                   result)]
       (is (every? identity comparisons))))
 
+  (testing "Assigns :disabled type with zero total-amount to disabled networks when receiver? is false"
+    (let [valid-networks     [1 10 42161]
+          disabled-chain-ids [10 42161]
+          receiver-networks  [1]
+          token-networks-ids [1 10 42161]
+          receiver?          false
+          expected           [{:chain-id 1 :type :loading}
+                              {:chain-id 10 :type :disabled :total-amount (money/bignumber "0")}
+                              {:chain-id 42161 :type :disabled :total-amount (money/bignumber "0")}]
+          tx-type            :tx/send
+          result             (utils/loading-network-amounts {:valid-networks     valid-networks
+                                                             :disabled-chain-ids disabled-chain-ids
+                                                             :receiver-networks  receiver-networks
+                                                             :token-networks-ids token-networks-ids
+                                                             :tx-type            tx-type
+                                                             :receiver?          receiver?})
+          comparisons        (map #(map/deep-compare %1 %2)
+                                  expected
+                                  result)]
+      (is (every? identity comparisons))))
+
   (testing "Filters out networks not in receiver networks when receiver? is true"
     (let [valid-networks     [1 10 42161 59144]
           disabled-chain-ids [10]

src/status_im/contexts/wallet/sheets/network_selection/view.cljs

@@ -8,14 +8,12 @@
             [utils.re-frame :as rf]))
 
 (defn- network-item
-  [{:keys [network on-select-network source]}]
-  (let [{:keys [network-name chain-id]} network
+  [{:keys [network on-select-network]}]
+  (let [{:keys [network-name
+                chain-id]}        network
         {balance-in-crypto :crypto
-         balance-in-fiat   :fiat} (if (= source :swap)
-                                    (rf/sub [:wallet/swap-asset-to-pay-network-balance chain-id])
-                                    (rf/sub [:wallet/send-token-network-balance chain-id]))
-        mainnet?
-        (= network-name constants/mainnet-network-name)]
+         balance-in-fiat   :fiat} (rf/sub [:wallet/swap-asset-to-pay-network-balance chain-id])
+        mainnet?                  (= network-name constants/mainnet-network-name)]
     [quo/network-list
      {:label           (name network-name)
       :network-image   (quo.resources/get-network network-name)
@@ -25,24 +23,21 @@
       :container-style (style/network-list-container mainnet?)}]))
 
 (defn view
-  [{:keys [token-symbol on-select-network source title]
-    :or   {source :swap
-           title  (i18n/label :t/select-network)}}]
-  (let [{mainnet-network  :mainnet-network
-         layer-2-networks :layer-2-networks} (if (= source :swap)
-                                               (rf/sub [:wallet/swap-asset-to-pay-networks])
-                                               (rf/sub [:wallet/send-token-grouped-networks]))
+  [{:keys [on-select-network]}]
+  (let [token-symbol                         (rf/sub [:wallet/swap-asset-to-pay-token-symbol])
+        {mainnet-network  :mainnet-network
+         layer-2-networks :layer-2-networks} (rf/sub [:wallet/swap-asset-to-pay-networks])
         render-fn                            (rn/use-callback (fn [network]
                                                                 [network-item
-                                                                 {:network           network
-                                                                  :on-select-network on-select-network
-                                                                  :source            source}]))]
+                                                                 {:network network
+                                                                  :on-select-network
+                                                                  on-select-network}]))]
     [:<>
      [rn/view {:style style/header-container}
       [quo/text
        {:size   :heading-2
         :weight :semi-bold}
-       title]
+       (i18n/label :t/select-network)]
       [quo/context-tag
        {:type            :token
         :size            24
@@ -51,8 +46,7 @@
      (when mainnet-network
        [network-item
         {:network           mainnet-network
-         :on-select-network on-select-network
-         :source            source}])
+         :on-select-network on-select-network}])
      [quo/divider-label {:container-style style/divider-label}
       (i18n/label :t/layer-2)]
      [rn/flat-list

src/status_im/contexts/wallet/swap/select_account/view.cljs

@@ -34,8 +34,7 @@
 
 (defn view
   []
-  (let [asset-to-pay (rf/sub [:wallet/swap-asset-to-pay])
-        accounts     (rf/sub [:wallet/accounts-with-balances asset-to-pay])]
+  (let [accounts (rf/sub [:wallet/accounts-with-balances])]
     [floating-button-page/view
      {:footer-container-padding 0
       :header                   [quo/page-nav

src/status_im/subs/chats.cljs

@@ -53,18 +53,22 @@
  (fn [[{:keys [chats]}] [_ community-id chat-id]]
    (get chats (string/replace chat-id community-id ""))))
 
-(re-frame/reg-sub :chats/home-list-chats
+(re-frame/reg-sub
+ :chats/home-list-chats
  :<- [:chats/chats]
  :<- [:chats-home-list]
- (fn [[chats active-chats-ids]]
-   (->> active-chats-ids
-        (keep #(get chats %))
-        (sort-by :timestamp >)
-        (map (fn [{:keys [chat-id id public-key group-chat]}]
-               {:chat-id    chat-id
-                :group-chat group-chat
-                :id         id
-                :public-key public-key})))))
+ :<- [:multiaccount/public-key]
+ (fn [[chats active-chats my-public-key]]
+   (reduce #(if-let [item (get chats %2)]
+              (let [group-chat-member? (and (chat.events/group-chat? item)
+                                            (group-chats.db/member? my-public-key item))]
+                (conj %1
+                      (assoc item
+                             :group-chat-member?
+                             group-chat-member?)))
+              %1)
+           []
+           active-chats)))
 
 (re-frame/reg-sub
  :chats/chat-by-id
@@ -387,58 +391,3 @@
    (re-frame/subscribe [:chats/chat chat-id]))
  :->
  :image)
-
-(comment
-  ;; Create a large list of chats
-  (def total-chats 200)
-  (def chat' (first (vals (:chats @re-frame.db/app-db))))
-
-  (let [new-chats (->> (repeat total-chats chat')
-                       (map (fn [chat]
-                              (-> chat
-                                  (assoc :chat-id (str (random-uuid)))
-                                  (assoc-in [:last-message :content :text]
-                                            (str "Initial " (str (random-uuid)))))))
-                       (utils.collection/index-by :chat-id))]
-    (swap! re-frame.db/app-db assoc
-      :chats           new-chats
-      :chats-home-list (set (keys new-chats))))
-
-  ;; Check the update works for one.
-  (swap! re-frame.db/app-db assoc-in
-    [:chats
-     (:chat-id (nth (vals (:chats @re-frame.db/app-db)) 0))
-     :last-message
-     :content
-     :text]
-    (str (rand-int 10000)))
-
-  ;; Randomly update individual chats.
-  (def interval-id
-    (atom
-     (js/setInterval
-      (fn []
-        (let [chats      (vals (:chats @re-frame.db/app-db))
-              rand-index (rand-int (dec (count chats)))
-              rand-chat  (nth chats rand-index)]
-          (swap! re-frame.db/app-db
-            (fn [db]
-              (-> db
-                  (assoc-in [:chats
-                             (:chat-id rand-chat)
-                             :last-message
-                             :content
-                             :text]
-                            (str (rand-int 10000)))
-                  (assoc-in [:chats
-                             (:chat-id rand-chat)
-                             :timestamp]
-                            (utils.datetime/timestamp)))))))
-      ;; Exagerate the frequency of updates, but even longer delays will cause problems in
-      ;; `develop`.
-      1000)))
-
-  (do
-    (js/clearInterval @interval-id)
-    (reset! interval-id nil))
-)

src/status_im/subs/profile.cljs

@@ -65,6 +65,7 @@
  (fn [[profiles port font-file theme] [_ target-key-uid]]
    (let [{:keys [images ens-name? customization-color] :as profile} (get profiles target-key-uid)
          image-name                                                 (-> images first :type)
+         image-clock                                                (-> images first :clock)
          override-ring?                                             (when ens-name? false)]
      (when (and profile port)
        {:config
@@ -75,6 +76,7 @@
                      :image-name     image-name
                      :key-uid        target-key-uid
                      :theme          theme
+                     :clock          image-clock
                      :override-ring? override-ring?}}
           {:type    :initials
            :options {:port                port
@@ -281,7 +283,10 @@
                 customization-color]} profile
         ens-name?                     (or ens-name? (seq ens-names))
         avatar-opts                   (assoc avatar-opts :override-ring? (when ens-name? false))
-        images-with-uri               (mapv (fn [{key-uid :keyUid image-name :type :as image}]
+        images-with-uri               (mapv (fn [{key-uid     :keyUid
+                                                  image-name  :type
+                                                  image-clock :clock
+                                                  :as         image}]
                                               (assoc image
                                                      :config
                                                      {:type    :account
@@ -289,6 +294,7 @@
                                                                 {:port       port
                                                                  :ratio      pixel-ratio/ratio
                                                                  :image-name image-name
+                                                                 :clock      image-clock
                                                                  :key-uid    key-uid
                                                                  :theme      theme}
                                                                 avatar-opts)}))

src/status_im/subs/wallet/networks.cljs

@@ -56,12 +56,12 @@
 (re-frame/reg-sub
  :wallet/network-values
  :<- [:wallet/wallet-send]
- (fn [{:keys [from-values-by-chain to-values-by-chain token-display-name token] :as send-data}
+ :<- [:wallet/send-display-token-decimals]
+ (fn [[{:keys [from-values-by-chain to-values-by-chain token-display-name] :as send-data} token-decimals]
       [_ to-values?]]
    (let [network-values (if to-values? to-values-by-chain from-values-by-chain)
          token-symbol   (or token-display-name
-                            (-> send-data :token :symbol))
-         token-decimals (:decimals token)]
+                            (-> send-data :token :symbol))]
      (reduce-kv
       (fn [acc chain-id amount]
         (let [network-name (network-utils/id->network chain-id)

src/status_im/subs/wallet/send.cljs

@@ -2,7 +2,7 @@
   (:require
     [re-frame.core :as rf]
     [status-im.constants :as constants]
-    [status-im.contexts.wallet.common.activity-tab.constants :as activity-tab-constants]
+    [status-im.contexts.wallet.common.activity-tab.constants :as activity-constants]
     [status-im.contexts.wallet.common.utils :as common-utils]
     [status-im.contexts.wallet.send.utils :as send-utils]
     [utils.money :as money]
@@ -34,11 +34,6 @@
  :<- [:wallet/wallet-send]
  :-> :token)
 
-(rf/reg-sub
- :wallet/send-token-symbol
- :<- [:wallet/wallet-send]
- :-> :token-symbol)
-
 (rf/reg-sub
  :wallet/send-transaction-ids
  :<- [:wallet/wallet-send]
@@ -59,11 +54,6 @@
  :<- [:wallet/wallet-send]
  :-> :tx-type)
 
-(rf/reg-sub
- :wallet/send-network
- :<- [:wallet/wallet-send]
- :-> :network)
-
 (rf/reg-sub
  :wallet/sending-collectible?
  :<- [:wallet/send-tx-type]
@@ -87,7 +77,7 @@
      (->> address-activity
           (sort :timestamp)
           (keep (fn [{:keys [activity-type recipient]}]
-                  (when (= activity-tab-constants/wallet-activity-type-send activity-type)
+                  (when (= activity-constants/wallet-activity-type-send activity-type)
                     recipient)))
           (distinct)))))
 
@@ -183,39 +173,3 @@
                (= (:chain-id network) bridge-to-chain-id)
                network))
            networks))))
-
-(rf/reg-sub
- :wallet/send-token-grouped-networks
- :<- [:wallet/wallet-send-token]
- (fn [token]
-   (let [{token-networks :networks} token
-         grouped-networks           (group-by :layer
-                                              token-networks)
-         mainnet-network            (first (get grouped-networks constants/layer-1-network))
-         layer-2-networks           (get grouped-networks constants/layer-2-network)]
-     {:mainnet-network  mainnet-network
-      :layer-2-networks layer-2-networks})))
-
-(rf/reg-sub
- :wallet/send-token-network-balance
- :<- [:wallet/wallet-send-token]
- :<- [:profile/currency]
- :<- [:profile/currency-symbol]
- :<- [:wallet/prices-per-token]
- (fn [[token currency currency-symbol prices-per-token] [_ chain-id]]
-   (let [{:keys [balances-per-chain
-                 decimals]} token
-         balance-for-chain  (get balances-per-chain chain-id)
-         total-balance      (money/token->unit (:raw-balance balance-for-chain) decimals)
-         fiat-value         (common-utils/calculate-token-fiat-value
-                             {:currency         currency
-                              :balance          total-balance
-                              :token            token
-                              :prices-per-token prices-per-token})
-         crypto-formatted   (common-utils/get-standard-crypto-format token
-                                                                     total-balance
-                                                                     prices-per-token)
-         fiat-formatted     (common-utils/fiat-formatted-for-ui currency-symbol
-                                                                fiat-value)]
-     {:crypto (str crypto-formatted " " (:symbol token))
-      :fiat   fiat-formatted})))

src/status_im/subs/wallet/swap.cljs

@@ -3,6 +3,7 @@
             [re-frame.core :as rf]
             [status-im.constants :as constants]
             [status-im.contexts.wallet.common.utils :as utils]
+            [status-im.contexts.wallet.common.utils.networks :as network-utils]
             [status-im.contexts.wallet.send.utils :as send-utils]
             [utils.money :as money]
             [utils.number :as number]))
@@ -333,3 +334,24 @@
                           :token            token-for-fees
                           :prices-per-token prices-per-token})]
      fee-in-fiat)))
+
+(rf/reg-sub
+ :wallet/accounts-with-balances
+ :<- [:wallet/operable-accounts]
+ :<- [:wallet/swap-asset-to-pay]
+ (fn [[accounts asset-to-pay]]
+   (let [token-symbol (:symbol asset-to-pay)]
+     (map
+      (fn [account]
+        (let [tokens            (:tokens account)
+              filtered-tokens   (filter #(= (:symbol %) token-symbol) tokens)
+              asset-pay-balance (utils/calculate-total-token-balance filtered-tokens)
+              formatted-address (network-utils/format-address (:address account)
+                                                              (:network-preferences-names account))]
+          (assoc account
+                 :formatted-address formatted-address
+                 :asset-pay-balance (utils/sanitized-token-amount-to-display
+                                     asset-pay-balance
+                                     constants/min-token-decimals-to-display)
+                 :asset-pay-symbol  token-symbol)))
+      accounts))))

src/status_im/subs/wallet/wallet.cljs

@@ -152,11 +152,21 @@
  :<- [:wallet/wallet-send]
  :-> :to-address)
 
+(rf/reg-sub
+ :wallet/wallet-send-address-prefix
+ :<- [:wallet/wallet-send]
+ :-> :address-prefix)
+
 (rf/reg-sub
  :wallet/wallet-send-receiver-networks
  :<- [:wallet/wallet-send]
  :-> :receiver-networks)
 
+(rf/reg-sub
+ :wallet/wallet-send-receiver-preferred-networks
+ :<- [:wallet/wallet-send]
+ :-> :receiver-preferred-networks)
+
 (rf/reg-sub
  :wallet/wallet-send-route
  :<- [:wallet/wallet-send]
@@ -171,11 +181,14 @@
  :wallet/wallet-send-token
  :<- [:wallet/wallet-send]
  :<- [:wallet/network-details]
- (fn [[wallet-send networks]]
-   (let [token                  (:token wallet-send)
-         enabled-from-chain-ids (->> networks
-                                     (map :chain-id)
-                                     set)]
+ :<- [:wallet/wallet-send-disabled-from-chain-ids]
+ (fn [[wallet-send networks disabled-from-chain-ids]]
+   (let [token                    (:token wallet-send)
+         disabled-from-chain-ids? (set disabled-from-chain-ids)
+         enabled-from-chain-ids   (->> networks
+                                       (map :chain-id)
+                                       (remove disabled-from-chain-ids?)
+                                       set)]
      (some-> token
              (assoc :networks           (network-utils/network-list-with-positive-balance token networks)
                     :supported-networks (network-utils/network-list token networks)
@@ -190,6 +203,16 @@
  (fn [{:keys [token-symbol token]}]
    (or token-symbol (:symbol token))))
 
+(rf/reg-sub
+ :wallet/wallet-send-disabled-from-chain-ids
+ :<- [:wallet/wallet-send]
+ :-> :disabled-from-chain-ids)
+
+(rf/reg-sub
+ :wallet/wallet-send-from-locked-amounts
+ :<- [:wallet/wallet-send]
+ :-> :from-locked-amounts)
+
 (rf/reg-sub
  :wallet/wallet-send-from-values-by-chain
  :<- [:wallet/wallet-send]
@@ -555,28 +578,6 @@
                     (string/lower-case token-symbol)))
         first)))
 
-(rf/reg-sub
- :wallet/token-by-symbol-from-first-available-account-with-balance
- :<- [:wallet/accounts]
- :<- [:wallet/current-viewing-account-or-default]
- :<- [:wallet/network-details]
- (fn [[accounts {:keys [tokens]} networks] [_ token-symbol chain-ids]]
-   (when token-symbol
-     (or
-      (->> (utils/tokens-with-balance tokens networks chain-ids)
-           (filter #(and (= (string/lower-case (:symbol %))
-                            (string/lower-case token-symbol))
-                         (money/greater-than (:total-balance %) 0)))
-           first)
-      (some
-       (fn [{:keys [tokens]}]
-         (->> (utils/tokens-with-balance tokens networks chain-ids)
-              (filter #(and (= (string/lower-case (:symbol %))
-                               (string/lower-case token-symbol))
-                            (money/greater-than (:total-balance %) 0)))
-              first))
-       accounts)))))
-
 (rf/reg-sub
  :wallet/accounts-without-current-viewing-account
  :<- [:wallet/accounts]
@@ -830,6 +831,22 @@
  :<- [:wallet/create-account]
  :-> :public-address)
 
+(rf/reg-sub
+ :wallet/wallet-send-enabled-networks
+ :<- [:wallet/wallet-send-token]
+ :<- [:wallet/wallet-send-disabled-from-chain-ids]
+ (fn [[{:keys [networks]} disabled-from-chain-ids]]
+   (->> networks
+        (filter #(not (contains? (set disabled-from-chain-ids)
+                                 (:chain-id %))))
+        set)))
+
+(rf/reg-sub
+ :wallet/wallet-send-enabled-from-chain-ids
+ :<- [:wallet/wallet-send-enabled-networks]
+ (fn [send-enabled-networks]
+   (map :chain-id send-enabled-networks)))
+
 (rf/reg-sub
  :wallet/wallet-send-fee-fiat-formatted
  :<- [:wallet/current-viewing-account]
@@ -892,23 +909,3 @@
  :<- [:wallet/accounts-without-current-viewing-account]
  (fn [accounts]
    (get-emoji-and-colors-from-accounts accounts)))
-
-(rf/reg-sub
- :wallet/accounts-with-balances
- :<- [:wallet/operable-accounts]
- (fn [accounts [_ token]]
-   (let [token-symbol (:symbol token)]
-     (map
-      (fn [account]
-        (let [tokens            (:tokens account)
-              filtered-tokens   (filter #(= (:symbol %) token-symbol) tokens)
-              asset-pay-balance (utils/calculate-total-token-balance filtered-tokens)
-              formatted-address (network-utils/format-address (:address account)
-                                                              (:network-preferences-names account))]
-          (assoc account
-                 :formatted-address formatted-address
-                 :asset-pay-balance (utils/sanitized-token-amount-to-display
-                                     asset-pay-balance
-                                     constants/min-token-decimals-to-display)
-                 :asset-pay-symbol  token-symbol)))
-      accounts))))

src/utils/address.cljs

@@ -2,8 +2,7 @@
   (:require
     [clojure.string :as string]
     [native-module.core :as native-module]
-    [utils.ethereum.eip.eip55 :as eip55]
-    [utils.ethereum.eip.eip681 :as eip681]))
+    [utils.ethereum.eip.eip55 :as eip55]))
 
 
 (def hex-prefix "0x")
@@ -106,23 +105,11 @@
   [address]
   (re-find regx-eip-3770-address address))
 
-(defn eip-681-address?
-  [scanned-text]
-  (-> scanned-text
-      eip681/parse-uri
-      :address
-      boolean))
-
 (defn supported-address?
   [s]
   (boolean (or (eip-3770-address? s)
                (metamask-address? s))))
 
-(defn supported-scan-address?
-  [s]
-  (boolean (or (eip-681-address? s)
-               (supported-address? s))))
-
 (defn metamask-address->eip-3770-address
   [metamask-address]
   (when-let [[_ address metamask-network-suffix] (split-metamask-address metamask-address)]
@@ -142,18 +129,9 @@
   [eip-3770-address]
   (extract-address-without-chains-info eip-3770-address))
 
-(defn eip-681-address->eth-address
-  [eip-681-address]
-  (-> eip-681-address
-      eip681/parse-uri
-      :address))
-
 (defn supported-address->eth-address
   [address]
   (cond
-    (eip-681-address? address)
-    (eip-681-address->eth-address address)
-
     (eip-3770-address? address)
     (eip-3770-address->eth-address address)
 

src/utils/datetime.cljs

@@ -160,16 +160,15 @@
 ;;;; Timestamp formatters
 (defn- to-str
   [ms old-fmt-fn yesterday-fmt-fn today-fmt-fn]
-  (if-let [date (t.coerce/from-long ms)]
-    (let [;; NOTE(edge-case): this is wrong, it uses the current timezone offset, regardless of DST.
-          local     (t/plus date time-zone-offset)
-          today     (t/minus (t/today-at-midnight) time-zone-offset)
-          yesterday (t/plus today (t/days -1))]
-      (cond
-        (t/before? date yesterday) (old-fmt-fn local)
-        (t/before? date today)     (yesterday-fmt-fn local)
-        :else                      (today-fmt-fn local)))
-    ""))
+  (let [date      (t.coerce/from-long ms)
+        ;; NOTE(edge-case): this is wrong, it uses the current timezone offset, regardless of DST.
+        local     (t/plus date time-zone-offset)
+        today     (t/minus (t/today-at-midnight) time-zone-offset)
+        yesterday (t/plus today (t/days -1))]
+    (cond
+      (t/before? date yesterday) (old-fmt-fn local)
+      (t/before? date today)     (yesterday-fmt-fn local)
+      :else                      (today-fmt-fn local))))
 
 (defn to-short-str
   [ms]

src/utils/ethereum/eip/eip681.cljs

@@ -6,7 +6,7 @@
    e.g. ethereum:0x1234@1/transfer?to=0x5678&value=1e18&gas=5000"
   (:require
     [clojure.string :as string]
-    [native-module.core :as native-module]
+    [utils.address :as address]
     [utils.ens.core :as utils.ens]
     [utils.ethereum.chain :as chain]))
 
@@ -18,10 +18,6 @@
 (def parameter-separator "&")
 (def key-value-separator "=")
 
-(defn- address?
-  [address]
-  (native-module/address? address))
-
 (def uri-pattern
   (re-pattern (str scheme scheme-separator "([^" query-separator "]*)(?:\\" query-separator "(.*))?")))
 (def authority-path-pattern
@@ -67,16 +63,16 @@
    Invalid URI will be parsed as `nil`."
   [s]
   (when (string? s)
-    (if (address? s)
+    (if (address/address? s)
       {:address s}
       (let [[_ authority-path query] (re-find uri-pattern s)]
         (when authority-path
           (let [[_ raw-address chain-id function-name] (re-find authority-path-pattern authority-path)]
-            (when (or (or (utils.ens/is-valid-eth-name? raw-address) (address? raw-address))
+            (when (or (or (utils.ens/is-valid-eth-name? raw-address) (address/address? raw-address))
                       (when (string/starts-with? raw-address "pay-")
                         (let [pay-address (string/replace-first raw-address "pay-" "")]
                           (or (utils.ens/is-valid-eth-name? pay-address)
-                              (address? pay-address)))))
+                              (address/address? pay-address)))))
               (let [address (if (string/starts-with? raw-address "pay-")
                               (string/replace-first raw-address "pay-" "")
                               raw-address)]
@@ -84,7 +80,7 @@
                   (let [contract-address (get-in arguments [:function-arguments :address])]
                     (if-not (or (not contract-address)
                                 (or (utils.ens/is-valid-eth-name? contract-address)
-                                    (address? contract-address)))
+                                    (address/address? contract-address)))
                       nil
                       (merge {:address  address
                               :chain-id (if chain-id
@@ -102,7 +98,7 @@
   "Generate a EIP 681 URI based on `address` and a map (keywords / {bignumbers/strings} ) of extra properties.
    No validation of address format is performed."
   [address {:keys [chain-id function-name function-arguments] :as m}]
-  (when (address? address)
+  (when (address/address? address)
     (let [parameters (dissoc (into {} (filter second m)) :chain-id)] ;; filter nil values
       (str scheme
            scheme-separator

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v7.0.0",
-    "commit-sha1": "84493728d9ac41553297e8084943c1429cdfe59a",
-    "src-sha256": "11dwdlk9svmc6f8wmya43fis9jfigvh5idxpiwmia9gkad1zal6y"
+    "version": "release/7.1.x",
+    "commit-sha1": "d3fd630db9223207d36144371bd6b0c85ee24d62",
+    "src-sha256": "00fwhk69i1hkblsykkfqvfid3icx6n77pkmxng5dhq4yc0775l8x"
 }

test/appium/tests/activity_center/test_activity_center.py

@@ -148,6 +148,14 @@ class TestActivityCenterContactRequestMultipleDevicePR(MultipleSharedDeviceTestC
 
     @marks.testrail_id(702777)
     def test_add_contact_field_validation(self):
+        # Profile link encoded data validation
+        encoded_data = re.findall("u/(.*)#", self.profile_link_2)[0]
+        decoded_string = base64.b64decode(encoded_data).decode("utf-8", "ignore")
+        decoded_username = re.sub('[^A-Za-z0-9]+', '', decoded_string)
+        if decoded_username != self.username_2:
+            self.errors.append(
+                "Can't find username '%s' in data which profile link '%s' contains. String '%s' is found instead" % (
+                    self.username_2, self.profile_link_2, decoded_username))
         public_key_2 = self.profile_link_2.split("#")[-1]
 
         def _device_1_creates_user():

test/appium/tests/critical/chats/test_group_chat.py

@@ -453,7 +453,7 @@ class TestGroupChatMultipleDeviceMergedNewUI(MultipleSharedDeviceTestCase):
         current_time = datetime.datetime.strptime(device_time, "%Y-%m-%dT%H:%M:%S%z")
         expected_times = [current_time + datetime.timedelta(minutes=i) for i in range(479, 482)]
         expected_texts = [
-            "Muted until %s %s" % (exp_time.strftime('%H:%M'), "today" if current_time.hour < 16 else "tomorrow") for
+            "Muted until %s %s" % (exp_time.strftime('%H:%M'), "today" if current_time.hour < 23 else "tomorrow") for
             exp_time in expected_times]
         chat = self.homes[1].get_chat(self.chat_name)
         chat.long_press_element()
@@ -483,7 +483,7 @@ class TestGroupChatMultipleDeviceMergedNewUI(MultipleSharedDeviceTestCase):
         if after_mute_counter > initial_counter:
             self.errors.append("New messages counter near chats tab button is %s after mute, but should be %s" % (
                 after_mute_counter, initial_counter))
-        if not chat.chat_preview.text.startswith("%s: %s" % (self.usernames[0], muted_message[:25])):
+        if not chat.chat_preview.text.startswith("%s: %s" % (self.usernames[0], muted_message)):
             self.errors.append("Message text '%s' is not shown in chat preview after mute" % muted_message)
         chat.click()
         if not self.chats[1].chat_element_by_text(muted_message).is_element_displayed(30):

test/appium/tests/critical/chats/test_public_chat_browsing.py

@@ -1021,8 +1021,6 @@ class TestCommunityMultipleDeviceMergedTwo(MultipleSharedDeviceTestCase):
             self.errors.append('Community is still shown in the list after leave')
         self.errors.verify_no_errors()
 
-    @marks.xfail(reason="Can't navigate to a community channel before joining the community, "
-                        "https://github.com/status-im/status-mobile/issues/21776")
     @marks.testrail_id(702948)
     def test_community_hashtag_links_to_community_channels(self):
         for home in self.homes:
@@ -1123,8 +1121,6 @@ class TestCommunityMultipleDeviceMergedTwo(MultipleSharedDeviceTestCase):
 
         self.errors.verify_no_errors()
 
-    @marks.xfail(reason="Can't navigate to a community channel before joining the community, "
-                        "https://github.com/status-im/status-mobile/issues/21776")
     @marks.testrail_id(703629)
     def test_community_join_when_node_owner_offline(self):
         for home in self.homes:

test/appium/tests/critical/test_deep_and_universal_links.py

@@ -89,7 +89,7 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
             self.home.get_chat(snt_community_name, community=True).click()
         snt_community_url = self.community_view.copy_community_link()
         self.home.reopen_app(sign_in=False)
-        self.sign_in.create_user(first_user=False)
+        self.sign_in.create_user(username="second user", first_user=False)
         self.home.browser_tab.click()
 
         old, new = "https://status.app/", "status-app://"

test/appium/tests/critical/test_fallback.py

@@ -226,7 +226,7 @@ class TestFallbackMultipleDevice(MultipleSharedDeviceTestCase):
         self.profile_2.click_system_back_button(times=3)
 
         wallet_2.just_fyi("Device 2: check wallet balance")
-        wallet_2.set_network_in_wallet(network_name='Arbitrum')
+        wallet_2.select_network(network_name='Arbitrum')
         expected_balance = self.network_api.get_balance(key_pair_account_address)
         shown_balance = wallet_2.get_asset(asset_name='Ether').get_amount()
         if shown_balance != round(expected_balance, 5):
@@ -269,7 +269,7 @@ class TestFallbackMultipleDevice(MultipleSharedDeviceTestCase):
         self.sign_in_2.passphrase_edit_box.clear()
         self.sign_in_2.passphrase_edit_box.send_keys(transaction_senders['A']['passphrase'])
         self.sign_in_2.continue_button.click()
-        if not self.sign_in_2.password_input.is_element_displayed():
+        if not self.sign_in_2.profile_title_input.is_element_displayed():
             self.errors.append("Can't recover an access with a valid passphrase")
         self.sign_in_2.click_system_back_button()
 

test/appium/tests/critical/test_wallet.py

@@ -32,7 +32,6 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
         self.wallet_1, self.wallet_2 = self.sign_in_1.get_wallet_view(), self.sign_in_2.get_wallet_view()
         self.wallet_1.wallet_tab.click()
         self.wallet_2.wallet_tab.click()
-        self.network = "Arbitrum"
 
     def _get_balances_before_tx(self):
         sender_balance = self.network_api.get_balance(self.sender['wallet_address'])
@@ -60,19 +59,19 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
 
         def wait_for_wallet_balance_to_update(wallet_view, user_name, initial_eth_amount):
             wallet_view.just_fyi("Getting ETH amount in the wallet of the %s after transaction" % user_name)
-            if user_name == self.sender_username:
+            if user_name == 'sender':
                 exp_amount = round(initial_eth_amount - amount_to_send, 4)
             else:
                 exp_amount = round(initial_eth_amount + amount_to_send, 4)
 
             # for _ in range(12):  # ToDo: 120 sec wait time, enable when autoupdate feature is ready
             new_eth_amount = round(wallet_view.get_asset(asset_name='Ether').get_amount(), 4)
-            if user_name == self.sender_username and new_eth_amount <= exp_amount:
+            if user_name == 'sender' and new_eth_amount <= exp_amount:
                 return
-            if user_name == self.receiver_username and new_eth_amount >= exp_amount:
+            if user_name == 'receiver' and new_eth_amount >= exp_amount:
                 return
             self.errors.append(
-                "Eth amount in the %s's wallet is %s but should be %s" % (user_name, new_eth_amount, exp_amount))
+                "Eth amount in the %ss wallet is %s but should be %s" % (user_name, new_eth_amount, exp_amount))
 
         # ToDo: disable relogin when autoupdate feature is ready
         self.home_1.just_fyi("Relogin for getting an updated balance")
@@ -86,8 +85,8 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
                              (self.home_2.reopen_app, {'user_name': self.receiver_username}))))
         self.wallet_1.wallet_tab.wait_and_click()
         self.wallet_2.wallet_tab.wait_and_click()
-        self.wallet_1.set_network_in_wallet(network_name=self.network)
-        self.wallet_2.set_network_in_wallet(network_name=self.network)
+        self.wallet_1.select_network(network_name='Arbitrum')
+        self.wallet_2.select_network(network_name='Arbitrum')
         self.loop.run_until_complete(
             run_in_parallel(((wait_for_wallet_balance_to_update, {'wallet_view': self.wallet_1,
                                                                   'user_name': self.sender_username,
@@ -124,8 +123,8 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
 
     @marks.testrail_id(727229)
     def test_wallet_send_eth(self):
-        self.wallet_1.set_network_in_wallet(network_name=self.network)
-        self.wallet_2.set_network_in_wallet(network_name=self.network)
+        self.wallet_1.select_network(network_name='Arbitrum')
+        self.wallet_2.select_network(network_name='Arbitrum')
         sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
 
         self.wallet_2.close_account_button.click()
@@ -136,8 +135,7 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
         device_time_before_sending = self.wallet_1.driver.device_time
         self.wallet_1.send_asset(address='arb1:' + self.receiver['wallet_address'],
                                  asset_name='Ether',
-                                 amount=amount_to_send,
-                                 network_name=self.network)
+                                 amount=amount_to_send)
         self.network_api.wait_for_confirmation_of_transaction(address=self.sender['wallet_address'],
                                                               tx_time=device_time_before_sending)
 
@@ -169,8 +167,7 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
         device_time_before_sending = self.wallet_1.driver.device_time
         self.wallet_1.send_asset_from_drawer(address='arb1:' + self.receiver['wallet_address'],
                                              asset_name='Ether',
-                                             amount=amount_to_send,
-                                             network_name=self.network)
+                                             amount=amount_to_send)
         self.network_api.wait_for_confirmation_of_transaction(address=self.sender['wallet_address'],
                                                               tx_time=device_time_before_sending)
         device_time_after_sending = self.wallet_1.driver.device_time
@@ -237,7 +234,7 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
 
         for network in expected_balances:
             self.wallet_view.just_fyi("Checking total balance on %s network" % network)
-            self.wallet_view.set_network_in_wallet(network)
+            self.wallet_view.select_network(network)
             real_balance = {}
             for asset in expected_balances[network]:
                 real_balance[asset] = self.wallet_view.get_asset(asset).get_amount()
@@ -245,7 +242,7 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
                 if real_balance[asset] != expected_balances[network][asset]:
                     self.errors.append("For the %s the wrong value %s is shown, expected %s on %s" %
                                        (asset, real_balance[asset], expected_balances[network][asset], network))
-            self.wallet_view.set_network_in_wallet(network)
+            self.wallet_view.select_network(network)
 
         self.errors.verify_no_errors()
 

test/appium/views/home_view.py

@@ -626,7 +626,6 @@ class HomeView(BaseView):
         return element.text
 
     def get_username(self):
-        self.toast_content_element.wait_for_invisibility_of_element()
         profile_view = self.get_profile_view()
         profile_view = self.profile_button.click_until_presence_of_element(profile_view.default_username_text)
         profile_view.default_username_text.wait_for_element(3)

test/appium/views/sign_in_view.py

@@ -361,10 +361,8 @@ class SignInView(BaseView):
     def get_user_profile_by_name(self, username: str):
         self.driver.info("Getting username card by '%s'" % username)
         expected_element = UserProfileElement(self.driver, username=username)
-        if expected_element.is_element_displayed(10):
-            return expected_element
-        else:
-            raise NoSuchElementException(msg="User %s is not found!" % username)
+        return expected_element if expected_element.is_element_displayed(10) else self.driver.fail(
+            "User %s is not found!" % username)
 
     def get_user_profile_by_index(self, index: int):
         self.driver.info("Getting username card by index %s" % index)

test/appium/views/wallet_view.py

@@ -113,7 +113,7 @@ class WalletView(BaseView):
         self.key_pair_name_input = EditBox(
             self.driver, xpath="//*[@text='Key pair name']/..//following-sibling::*/*[@content-desc='input']")
 
-    def set_network_in_wallet(self, network_name: str):
+    def select_network(self, network_name: str):
         self.network_drop_down.click()
         Button(self.driver, accessibility_id="%s, label-component" % network_name.capitalize()).click()
         self.network_drop_down.click()
@@ -127,12 +127,8 @@ class WalletView(BaseView):
         return element
 
     def select_asset(self, asset_name: str):
-        Button(driver=self.driver,
-               xpath="//*[@content-desc='token-network']/android.widget.TextView[@text='%s']" % asset_name).click()
-
-    def select_network(self, network_name: str):
-        Button(driver=self.driver,
-               xpath="//*[@content-desc='network-list']/*[@text='%s']" % network_name).click()
+        return Button(driver=self.driver,
+                      xpath="//*[@content-desc='token-network']/android.widget.TextView[@text='%s']" % asset_name)
 
     def slide_and_confirm_with_password(self):
         self.slide_button_track.slide()
@@ -152,23 +148,27 @@ class WalletView(BaseView):
         for i in '{:f}'.format(amount).rstrip('0'):
             Button(self.driver, accessibility_id='keyboard-key-%s' % i).click()
 
-    def send_asset(self, address: str, asset_name: str, amount: float, network_name: str):
+    def disable_mainnet_in_from_network(self):
+        if self.from_network_text.text == 'Mainnet':
+            self.from_network_text.click()
+
+    def send_asset(self, address: str, asset_name: str, amount: float):
         self.send_button.click()
         self.address_text_input.send_keys(address)
         self.continue_button.click()
-        self.select_asset(asset_name)
-        self.select_network(network_name)
+        self.select_asset(asset_name).click()
         self.set_amount(amount)
+        self.disable_mainnet_in_from_network()
         self.confirm_transaction()
 
-    def send_asset_from_drawer(self, address: str, asset_name: str, amount: float, network_name: str):
+    def send_asset_from_drawer(self, address: str, asset_name: str, amount: float):
         asset_element = self.get_asset(asset_name)
         asset_element.long_press_element()
         self.send_from_drawer_button.click()
-        self.select_network(network_name)
         self.address_text_input.send_keys(address)
         self.continue_button.click()
         self.set_amount(amount)
+        self.disable_mainnet_in_from_network()
         self.confirm_transaction()
 
     def add_regular_account(self, account_name: str):

translations/en.json

@@ -395,7 +395,6 @@
   "close-app-title": "Warning!",
   "close-chat": "Close chat",
   "close-chat-confirmation": "This conversation will disappear from the list.\nIt will appear again if the contact sends a new message.",
-  "close-community": "Close community",
   "close-contact-search": "Close contact search",
   "code-snippet": "Code snippet",
   "collectibles": "Collectibles",
@@ -799,6 +798,7 @@
   "do-not-cheat": "Don't try to cheat",
   "do-not-cheat-description": "These 12 words give access to all of your funds so it is important that you write them in the correct order, take it seriously.",
   "do-not-quit": "Do not quit the application or turn off your device. Doing so will lead to data corruption, loss of your Status profile and the inability to use Status.",
+
   "do-not-share": "Do not share",
   "documents": "Documents",
   "done": "Done",
@@ -2286,11 +2286,8 @@
   "select-chat": "Select chat to start messaging",
   "select-network": "Select network",
   "select-network-for-buying": "Select network for buying",
-  "select-network-to-bridge-from": "Select network to bridge from",
-  "select-network-to-receive": "Select network to receive",
   "select-networks": "Select networks",
   "select-new-location-for-keys": "Select a new location to save your private key(s)",
-  "select-token": "Select token",
   "select-token-to-receive": "Select token to receive",
   "select-token-to-swap": "Select token to Swap",
   "selected": "Selected",

yarn.lock

@@ -9584,9 +9584,9 @@ react-native-static-safe-area-insets@^2.2.0:
   resolved "https://registry.yarnpkg.com/react-native-static-safe-area-insets/-/react-native-static-safe-area-insets-2.2.0.tgz#dd86b6a38f43964fac8df8c0e6bc8e062527786c"
   integrity sha512-TLTW2e2kRK3COSK8gMZzwp4wHguFCtcO18itDLn5av/xQblXt9ylu84o+qD9aKJCBfvtNzGOvqqTKqC5GJRZ/g==
 
-"react-native-status-keycard@git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.6.4":
+"react-native-status-keycard@git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.6.3":
   version "2.6.2"
-  resolved "git+https://github.com/status-im/react-native-status-keycard.git#e78f46de10d65cfef2df2f62b6f41e64e0c332b9"
+  resolved "git+https://github.com/status-im/react-native-status-keycard.git#735bed7f9838b87712f1fd2978208186d28ea61c"
 
 react-native-svg@13.10.0:
   version "13.10.0"