Merge branch 'develop' into bugfix/21636

* Fix `:true` keyword being used in navigation screens.

* Add about screen, terms of use and privacy policy links

* Remove old about app screen

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 straighforward, but there are some small differences. Just like above, we only have to evaluate a dispatch form, as follows:
+This is also straightforward, 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.

fastlane/metadata/android/ar-SA/title.txt

@@ -1 +1 @@
-Status: محفظة إيثريوم كريبتو
+Status: محفظة تشفير اجتماعية

fastlane/metadata/android/en-US/title.txt

@@ -1 +1 @@
-Status: Ethereum Crypto Wallet
+Status: Social Crypto Wallet

fastlane/metadata/android/es-ES/title.txt

@@ -1 +1 @@
-Status: Billetera Ethereum
+Status: Billetera social cripto

fastlane/metadata/android/fr-FR/title.txt

@@ -1 +1 @@
-Status: Portefeuille Ethereum
+Status : Portef. crypto social

fastlane/metadata/android/ja-JP/title.txt

@@ -1 +1 @@
-Status: イーサリアム クリプト ウォレット
+Status: ソーシャル クリプト ウォレット

fastlane/metadata/android/ko-KR/title.txt

@@ -1 +1 @@
-Status: 이더리움 크립토 지갑
+Status: 소셜 크립토 지갑

fastlane/metadata/android/pt-BR/title.txt

@@ -1 +1 @@
-Status: Carteira Ethereum
+Status: Carteira social cripto

fastlane/metadata/android/ru-RU/title.txt

@@ -1 +1 @@
-Status: Ethereum Криптокошелек
+Status: Криптокошелек

fastlane/metadata/android/tr-TR/title.txt

@@ -1 +1 @@
-Status Ethereum Kripto Cüzdanı
+Status:  Sosyal Kripto Cüzdanı

fastlane/metadata/android/uk-UA/title.txt

@@ -1 +1 @@
-Status Ethereum Криптогаманець
+Status: Криптогаманець

fastlane/metadata/android/zh-CN/title.txt

@@ -1 +1 @@
-Status: 以太坊加密钱包
+Status: 可以社交的加密货币钱包

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/).
-  - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.
+  - Configured via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.

resources/terms-of-use.mdwn

@@ -1,10 +1,9 @@
 Status Terms of Use
 
-Last updated: 10 December 2024
+Last updated: 14 August 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.
@@ -15,7 +14,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 and a crypto wallet 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, a crypto wallet, and a Web 3 browser 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.
 
@@ -49,56 +48,57 @@ 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 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 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 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. 
-
-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.
+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.
 
 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. 
- 
-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 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 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. 
+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.
 
-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. 
+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.
 
-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. 
+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.
 
 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 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 Status 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 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. 
+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.
 
+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 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 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.
 
 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 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 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.
 
 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 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 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.
 
 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,35 +145,25 @@ 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, and avoid actions that may harm or disrupt the community of users. 
+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.
 
-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.
+8.2 Limitation on certain uses of and acts in 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.
+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.
 
 
 9. Fees
@@ -262,7 +252,6 @@ 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/legacy/status_im/ui/screens/log_level_settings/views.cljs

@@ -33,9 +33,6 @@
         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"
@@ -45,7 +42,9 @@
    {:name  "INFO"
     :value "INFO"}
    {:name  "DEBUG"
-    :value "DEBUG"}])
+    :value "DEBUG"}
+   {:name  "TRACE"
+    :value "TRACE"}])
 
 (views/defview log-level-settings
   []

src/status_im/contexts/centralized_metrics/tracking.cljs

@@ -53,13 +53,7 @@
       (conj (navigation-event (name view-id)))
 
       (= :screen/onboarding.syncing-results view-id)
-      (conj (key-value-event "onboarding-completed"))
-
-      (= :screen/keycard.migrate.success view-id)
-      (conj (key-value-event "keycard-migration-succeeded"))
-
-      (= :screen/keycard.migrate.fail view-id)
-      (conj (key-value-event "keycard-migration-failed")))))
+      (conj (key-value-event "onboarding-completed")))))
 
 (defn navigated-to-collectibles-tab-event
   [location]

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

@@ -10,73 +10,72 @@
     [status-im.contexts.communities.actions.community-rules.view :as community-rules]
     [status-im.contexts.communities.actions.permissions-sheet.view :as permissions-sheet]
     [status-im.contexts.communities.utils :as communities.utils]
-    [status-im.feature-flags :as ff]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
 (defn view
   []
-  (let [theme                              (quo.theme/use-theme)
-        {id :community-id}                 (rf/sub [:get-screen-params])
+  (let [theme (quo.theme/use-theme)
+        {id :community-id} (rf/sub [:get-screen-params])
         {:keys [name color images joined]} (rf/sub [:communities/community id])
-        has-permissions?                   (rf/sub [:communities/has-permissions? id])
-        airdrop-account                    (rf/sub [:communities/airdrop-account id])
-        revealed-accounts                  (rf/sub [:communities/accounts-to-reveal id])
-        revealed-accounts-count            (count revealed-accounts)
-        wallet-accounts-count              (count (rf/sub [:wallet/operable-accounts]))
-        addresses-shared-text              (if (= revealed-accounts-count wallet-accounts-count)
-                                             (i18n/label :t/all-addresses)
-                                             (i18n/label-pluralize
-                                              revealed-accounts-count
-                                              :t/address-count))
-        {:keys [highest-permission-role]}  (rf/sub [:community/token-gated-overview id])
-        highest-role-text                  (i18n/label (communities.utils/role->translation-key
-                                                        highest-permission-role
-                                                        :t/member))
-        can-edit-addresses?                (rf/sub [:communities/can-edit-shared-addresses? id])
-        navigate-back                      (rn/use-callback #(rf/dispatch [:navigate-back]))
-        show-addresses-for-permissions     (rn/use-callback
-                                            (fn []
-                                              (if can-edit-addresses?
-                                                (rf/dispatch [:open-modal :addresses-for-permissions
-                                                              {:community-id id}])
-                                                (rf/dispatch [:show-bottom-sheet
-                                                              {:community-id id
-                                                               :content
-                                                               addresses-for-permissions/view}])))
-                                            [can-edit-addresses?])
-        show-airdrop-addresses             (rn/use-callback
-                                            (fn []
-                                              (if can-edit-addresses?
-                                                (rf/dispatch [:open-modal :address-for-airdrop
-                                                              {:community-id id}])
-                                                (rf/dispatch [:show-bottom-sheet
-                                                              {:community-id id
-                                                               :content      airdrop-addresses/view}])))
-                                            [can-edit-addresses?])
-        confirm-choices                    (rn/use-callback
-                                            (fn []
-                                              (rf/dispatch
-                                               [:standard-auth/authorize
-                                                {:auth-button-label (if can-edit-addresses?
-                                                                      (i18n/label
-                                                                       :t/edit-shared-addresses)
-                                                                      (i18n/label :t/request-to-join))
-                                                 :on-auth-success
-                                                 (fn [password]
-                                                   (rf/dispatch
-                                                    [:communities/request-to-join-with-addresses
-                                                     {:community-id id
-                                                      :password     password}]))}])
-                                              (navigate-back))
-                                            [can-edit-addresses?])
-        open-permission-sheet              (rn/use-callback
-                                            (fn []
-                                              (rf/dispatch
-                                               [:show-bottom-sheet
-                                                {:content (fn []
-                                                            [permissions-sheet/view id])}]))
-                                            [id])]
+        has-permissions? (rf/sub [:communities/has-permissions? id])
+        airdrop-account (rf/sub [:communities/airdrop-account id])
+        revealed-accounts (rf/sub [:communities/accounts-to-reveal id])
+        revealed-accounts-count (count revealed-accounts)
+        wallet-accounts-count (count (rf/sub [:wallet/operable-accounts]))
+        addresses-shared-text (if (= revealed-accounts-count wallet-accounts-count)
+                                (i18n/label :t/all-addresses)
+                                (i18n/label-pluralize
+                                 revealed-accounts-count
+                                 :t/address-count))
+        {:keys [highest-permission-role]} (rf/sub [:community/token-gated-overview id])
+        highest-role-text (i18n/label (communities.utils/role->translation-key
+                                       highest-permission-role
+                                       :t/member))
+        can-edit-addresses? (rf/sub [:communities/can-edit-shared-addresses? id])
+        navigate-back (rn/use-callback #(rf/dispatch [:navigate-back]))
+
+        show-addresses-for-permissions
+        (rn/use-callback
+         (fn []
+           (if can-edit-addresses?
+             (rf/dispatch [:open-modal :addresses-for-permissions {:community-id id}])
+             (rf/dispatch [:show-bottom-sheet
+                           {:community-id id
+                            :content      (fn [] [addresses-for-permissions/view])}])))
+         [can-edit-addresses?])
+
+        show-airdrop-addresses
+        (rn/use-callback
+         (fn []
+           (if can-edit-addresses?
+             (rf/dispatch [:open-modal :address-for-airdrop {:community-id id}])
+             (rf/dispatch [:show-bottom-sheet
+                           {:community-id id
+                            :content      (fn [] [airdrop-addresses/view])}])))
+         [can-edit-addresses?])
+
+        confirm-choices
+        (rn/use-callback
+         (fn []
+           (rf/dispatch
+            [:standard-auth/authorize
+             {:auth-button-label (if can-edit-addresses?
+                                   (i18n/label :t/edit-shared-addresses)
+                                   (i18n/label :t/request-to-join))
+              :on-auth-success   (fn [password]
+                                   (rf/dispatch
+                                    [:communities/request-to-join-with-addresses
+                                     {:community-id id
+                                      :password     password}]))}])
+           (navigate-back))
+         [can-edit-addresses?])
+
+        open-permission-sheet
+        (rn/use-callback (fn []
+                           (rf/dispatch [:show-bottom-sheet
+                                         {:content (fn [] [permissions-sheet/view id])}]))
+                         [id])]
     (rn/use-mount
      (fn []
        (rf/dispatch [:communities/initialize-permission-addresses id])))
@@ -87,7 +86,7 @@
                :icon-name           :i/close
                :on-press            navigate-back
                :accessibility-label :back-button}
-        (and has-permissions? (ff/enabled? ::ff/community.view-token-requirements))
+        has-permissions?
         (assoc :right-side
                [{:icon-left :i/unlocked
                  :on-press  open-permission-sheet

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

@@ -7,7 +7,6 @@
     [status-im.constants :as constants]
     [status-im.contexts.communities.actions.addresses-for-permissions.style :as style]
     [status-im.contexts.communities.actions.permissions-sheet.view :as permissions-sheet]
-    [status-im.feature-flags :as ff]
     [utils.i18n :as i18n]
     [utils.money :as money]
     [utils.re-frame :as rf]))
@@ -123,23 +122,23 @@
 (defn- page-top
   [{:keys [community-id identical-choices? can-edit-addresses?]}]
   (let [{:keys [name logo color]} (rf/sub [:communities/for-context-tag community-id])
-        has-permissions?          (rf/sub [:communities/has-permissions? community-id])
-        confirm-discard-changes   (rn/use-callback
-                                   (fn []
-                                     (if identical-choices?
-                                       (rf/dispatch [:dismiss-modal :addresses-for-permissions])
-                                       (rf/dispatch [:show-bottom-sheet
-                                                     {:content (fn []
-                                                                 [confirm-discard-drawer
-                                                                  community-id])}])))
-                                   [identical-choices? community-id])
-        open-permission-sheet     (rn/use-callback
-                                   (fn []
-                                     (rf/dispatch [:show-bottom-sheet
-                                                   {:content (fn []
-                                                               [permissions-sheet/view
-                                                                community-id])}]))
-                                   [community-id])]
+        has-permissions? (rf/sub [:communities/has-permissions? community-id])
+        confirm-discard-changes
+        (rn/use-callback
+         (fn []
+           (if identical-choices?
+             (rf/dispatch [:dismiss-modal :addresses-for-permissions])
+             (rf/dispatch [:show-bottom-sheet
+                           {:content (fn [] [confirm-discard-drawer
+                                             community-id])}])))
+         [identical-choices? community-id])
+
+        open-permission-sheet
+        (rn/use-callback (fn []
+                           (rf/dispatch [:show-bottom-sheet
+                                         {:content (fn [] [permissions-sheet/view
+                                                           community-id])}]))
+                         [community-id])]
     [:<>
      (when can-edit-addresses?
        [quo/page-nav
@@ -162,7 +161,7 @@
                  :community-name      name
                  :community-logo      logo
                  :customization-color color}
-          (and has-permissions? (ff/enabled? ::ff/community.view-token-requirements))
+          has-permissions?
           (assoc :button-icon     :i/info
                  :button-type     :grey
                  :on-button-press open-permission-sheet))])]))

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

@@ -130,4 +130,12 @@
                                                             :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/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))))

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

@@ -40,8 +40,7 @@
    :right-icon          :i/chevron-right
    :accessibility-label :view-token-gating
    :on-press            #(rf/dispatch [:show-bottom-sheet
-                                       {:content                 (fn []
-                                                                   [permissions-sheet/view id])
+                                       {:content                 (fn [] [permissions-sheet/view id])
                                         :padding-bottom-override 16}])
    :label               (i18n/label :t/view-token-gating)})
 
@@ -125,6 +124,14 @@
    :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
@@ -136,12 +143,10 @@
                                                          request-id])}])})
 
 (defn not-joined-options
-  [id token-gated? intro-message test-networks-enabled?]
+  [{:keys [id join-pending? spectated? token-gated? intro-message test-networks-enabled?]}]
   (let [common   [(show-qr id) (share-community id)]
         specific (cond
-                   (and token-gated?
-                        (not test-networks-enabled?)
-                        (ff/enabled? ::ff/community.view-token-requirements))
+                   (and token-gated? (not test-networks-enabled?))
                    [(invite-contacts id) (view-token-gating id)]
 
                    token-gated?
@@ -149,23 +154,25 @@
 
                    (not token-gated?)
                    [(view-members id) (view-rules id intro-message) (invite-contacts id)])]
-    [(concat specific common)]))
+    [(concat specific
+             common
+             (when (and spectated? (not join-pending?))
+               [(assoc (close-community id) :add-divider? true)]))]))
 
 (defn join-request-sent-options
-  [id token-gated? request-id intro-message test-networks-enabled?]
-  [(conj (first (not-joined-options id token-gated? intro-message test-networks-enabled?))
+  [{:keys [id request-id] :as config}]
+  [(conj (first (not-joined-options config))
          (assoc (cancel-request-to-join id request-id) :add-divider? true))])
 
 (defn banned-options
-  [id token-gated? intro-message test-networks-enabled?]
-  (not-joined-options id token-gated? intro-message test-networks-enabled?))
+  [config]
+  (not-joined-options config))
 
 (defn joined-options
-  [id token-gated? muted? muted-till color intro-message]
+  [{:keys [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))
-      (view-token-gating id))
+    (when token-gated? (view-token-gating id))
     (when (ff/enabled? ::ff/community.edit-account-selection)
       (edit-shared-addresses id))
     (mark-as-read id)
@@ -177,7 +184,7 @@
    [(assoc (leave-community id color) :add-divider? true)]])
 
 (defn owner-options
-  [id token-gated? muted? muted-till intro-message]
+  [{:keys [id token-gated? muted? muted-till intro-message]}]
   [[(view-members id)
     (view-rules id intro-message)
     (when token-gated? (view-token-gating id))
@@ -190,22 +197,29 @@
 
 (defn get-context-drawers
   [{:keys [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?])]
+  (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}]
     (cond
-      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?))))
+      admin      (owner-options config)
+      joined     (joined-options config)
+      request-id (join-request-sent-options config)
+      banList    (banned-options config)
+      :else      (not-joined-options config))))
 
 (defn community-options-bottom-sheet
   [id]

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

@@ -30,8 +30,7 @@
           {:keys [color name images]} (rf/sub [:communities/community id])
           keycard?                    (rf/sub [:keycard/keycard-profile?])
           keycard-feature-unavailable (rn/use-callback
-                                       #(rf/dispatch [:keycard/feature-unavailable-show
-                                                      {:feature-name :community.request-to-join}]))]
+                                       #(rf/dispatch [:keycard/feature-unavailable-show]))]
       [rn/safe-area-view {:flex 1}
        [gesture/scroll-view {:style style/container}
         [rn/view style/page-container

src/status_im/contexts/communities/overview/view.cljs

@@ -147,8 +147,7 @@
                                    [:show-bottom-sheet {:content token-gated-communities-info}])
      keycard?                    (rf/sub [:keycard/keycard-profile?])
      keycard-feature-unavailable (rn/use-callback
-                                  #(rf/dispatch [:keycard/feature-unavailable-show
-                                                 {:feature-name :community.request-to-join}]))]
+                                  #(rf/dispatch [:keycard/feature-unavailable-show]))]
 
     (cond
       networks-not-supported?

src/status_im/contexts/keycard/feature_unavailable/events.cljs

@@ -1,27 +1,12 @@
 (ns status-im.contexts.keycard.feature-unavailable.events
   (:require
-    [status-im.constants :as constants]
     [status-im.contexts.keycard.feature-unavailable.view :as feature-unavailable]
     [utils.re-frame :as rf]))
 
-(rf/reg-event-fx
- :keycard/feature-unavailable-upvote
- (fn [_ [{:keys [feature-name]}]]
-   {:fx [[:dispatch [:open-url constants/mobile-upvote-link]]
-         [:dispatch
-          [:centralized-metrics/track
-           :metric/feature-unavailable-upvote
-           {:feature-name feature-name}]]]}))
-
 (rf/reg-event-fx
  :keycard/feature-unavailable-show
- (fn [_ [{:keys [feature-name theme] :as options}]]
+ (fn [_ [options]]
    {:fx [[:dispatch
           [:show-bottom-sheet
-           {:theme   theme
-            :content (fn []
-                       (feature-unavailable/view options))}]]
-         [:dispatch
-          [:centralized-metrics/track
-           :metric/feature-unavailable
-           {:feature-name feature-name}]]]}))
+           {:theme   (:theme options)
+            :content feature-unavailable/view}]]]}))

src/status_im/contexts/keycard/feature_unavailable/view.cljs

@@ -1,15 +1,16 @@
 (ns status-im.contexts.keycard.feature-unavailable.view
   (:require
     [quo.core :as quo]
+    [status-im.constants :as constants]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
 (defn on-upvote
-  [feature-name]
-  (rf/dispatch [:keycard/feature-unavailable-upvote {:feature-name feature-name}]))
+  []
+  (rf/dispatch [:open-url constants/mobile-upvote-link]))
 
 (defn view
-  [{:keys [feature-name]}]
+  []
   [:<>
    [quo/drawer-top
     {:title       (i18n/label :t/feature-unavailable)
@@ -23,5 +24,5 @@
      [quo/text
       {:style    {:text-decoration-line :underline}
        :size     :paragraph-2
-       :on-press #(on-upvote feature-name)}
+       :on-press on-upvote}
       (i18n/label :t/upvote-it)]]]])

src/status_im/contexts/keycard/migrate/fail/view.cljs

@@ -13,7 +13,7 @@
         customization-color (rf/sub [:profile/customization-color])]
     [:<>
      [quo/page-top
-      {:title           (i18n/label :t/something-didnt-go-as-planned)
+      {:title           (i18n/label :t/failed-to-migrate-key-pair)
        :description     :context-tag
        :context-tag     {:full-name           profile-name
                          :profile-picture     profile-picture
@@ -24,9 +24,9 @@
        {:resize-mode :contain
         :source      (resources/get-image :keycard-migration-failed)}]]
      [quo/divider-label (i18n/label :t/what-you-can-do)]
-     [quo/markdown-list {:description (i18n/label :t/keycard-migration-failed-instruction-1)}]
-     [quo/markdown-list {:description (i18n/label :t/keycard-migration-failed-instruction-2)}]
+     [quo/markdown-list {:description (i18n/label :t/log-out-remove-profile)}]
+     [quo/markdown-list {:description (i18n/label :t/recover-status-profile)}]
      [quo/bottom-actions
       {:actions          :one-action
-       :button-one-label (i18n/label :t/logout)
+       :button-one-label (i18n/label :t/log-out-remove)
        :button-one-props {:on-press #(rf/dispatch [:profile/logout])}}]]))

src/status_im/contexts/onboarding/share_usage/learn_more_sheet.cljs

@@ -4,7 +4,7 @@
     [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
-    [status-im.common.privacy.view :as privacy]
+    [status-im.common.terms.view :as terms]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -26,7 +26,7 @@
     [quo/text
      {:size     :paragraph-2
       :weight   :bold
-      :on-press #(rf/dispatch [:show-bottom-sheet {:content privacy/privacy-statement :shell? true}])}
+      :on-press #(rf/dispatch [:show-bottom-sheet {:content terms/terms-of-use :shell? true}])}
      (i18n/label :t/more-details-in-privacy-policy-2)]]])
 
 (defn- bullet-points

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

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

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

@@ -47,8 +47,7 @@
                                               settings
                                               {:log-level log-level}))
                                 (assoc-in [:activity-center :loading?] true)
-                                (dissoc :centralized-metrics/onboarding-enabled?))
-         keycard?           (get-in new-db [:profile/profile :keycard-pairing])]
+                                (dissoc :centralized-metrics/onboarding-enabled?))]
      {:db (cond-> new-db
             pairing-completed? (dissoc :syncing))
       :fx (into [[:json-rpc/call
@@ -76,10 +75,8 @@
                    [:effects.chat/open-last-chat (:key-uid profile-overview)])
 
                  (when (:centralized-metrics/onboarding-enabled? db)
-                   [:dispatch [:profile.settings/toggle-telemetry true]])
+                   [:dispatch [:profile.settings/toggle-telemetry true]])]
 
-                 (when keycard?
-                   [:dispatch [:centralized-metrics/track :metric/keycard-login]])]
                 (cond
                   pairing-completed?
                   [[:dispatch [:update-theme-and-init-root :screen/onboarding.syncing-results]]]

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

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

src/status_im/contexts/profile/settings/screens/password/view.cljs

@@ -10,9 +10,7 @@
   [button-label theme keycard-profile?]
   (fn []
     (if keycard-profile?
-      (rf/dispatch [:keycard/feature-unavailable-show
-                    {:theme        :dark
-                     :feature-name :settings.enable-biometrics}])
+      (rf/dispatch [:keycard/feature-unavailable-show {:theme :dark}])
       (rf/dispatch
        [:standard-auth/authorize-with-password
         {:blur?             true

src/status_im/contexts/syncing/syncing_devices_list/view.cljs

@@ -41,10 +41,8 @@
                                                      other-devices)
         keycard?                                    (rf/sub [:keycard/keycard-profile?])
         keycard-feature-unavailable                 (rn/use-callback
-                                                     #(rf/dispatch
-                                                       [:keycard/feature-unavailable-show
-                                                        {:theme        :dark
-                                                         :feature-name :settings.setup-syncing}]))]
+                                                     #(rf/dispatch [:keycard/feature-unavailable-show
+                                                                    {:theme :dark}]))]
     [quo/overlay {:type :shell :top-inset? true}
      [quo/page-nav
       {:type       :no-title

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

@@ -48,8 +48,7 @@
                               {:icon-name :i/dapps
                                :on-press  #(rf/dispatch
                                             (if keycard?
-                                              [:keycard/feature-unavailable-show
-                                               {:feature-name :wallet.show-connected-dapps}]
+                                              [:keycard/feature-unavailable-show]
                                               [:navigate-to :screen/wallet.connected-dapps]))})
                             (when-not sending-collectible?
                               {:content-type        :account-switcher

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

@@ -404,15 +404,13 @@
                                                     :market-values-per-token market-values-per-token}))
         calculated-tokens (map calculate-token tokens)]
     (sort-by (fn [token]
-               (let [fiat-value (get-in token [:values :fiat-unformatted-value])
-                     priority   (get constants/token-sort-priority (:token token) ##Inf)]
-                 [(- fiat-value) priority]))
+               (let [fiat-value (get-in token [:values :fiat-unformatted-value])]
+                 [(- fiat-value)]))
              calculated-tokens)))
 
 (defn sort-tokens
   [tokens]
-  (let [priority #(get constants/token-sort-priority (:symbol %) ##Inf)]
-    (sort-by (juxt (comp - :balance) priority) tokens)))
+  (sort-by (fn [token] (- (:balance token))) tokens))
 
 (defn- transaction-data
   [{:keys [from-address to-address token-address route data eth-transfer?]}]
@@ -543,8 +541,7 @@
 
 (defn sort-tokens-by-name
   [tokens]
-  (let [priority #(get constants/token-sort-priority (:symbol %) ##Inf)]
-    (sort-by (juxt :symbol priority) tokens)))
+  (sort-by :symbol tokens))
 
 (defn tokens-with-balance
   [tokens networks chain-ids]

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

@@ -15,24 +15,19 @@
 
 (defn new-account
   []
-  (let [keycard? (rf/sub [:keycard/keycard-profile?])]
-    [quo/action-drawer
-     [[{:icon                :i/add
-        :accessibility-label :start-a-new-chat
-        :label               (i18n/label :t/add-account)
-        :sub-label           (i18n/label :t/add-account-description)
-        :on-press            (fn []
-                               (if keycard?
-                                 (rf/dispatch [:keycard/feature-unavailable-show
-                                               {:feature-name :wallet.new-account}])
-                                 (rf/dispatch [:navigate-to :screen/wallet.create-account])))}
-       (when (ff/enabled? ::ff/wallet.add-watched-address)
-         {:icon                :i/reveal
-          :accessibility-label :add-a-contact
-          :label               (i18n/label :t/add-address-to-watch)
-          :sub-label           (i18n/label :t/add-address-to-watch-description)
-          :on-press            #(rf/dispatch [:navigate-to :screen/wallet.add-address-to-watch])
-          :add-divider?        true})]]]))
+  [quo/action-drawer
+   [[{:icon                :i/add
+      :accessibility-label :start-a-new-chat
+      :label               (i18n/label :t/add-account)
+      :sub-label           (i18n/label :t/add-account-description)
+      :on-press            #(rf/dispatch [:navigate-to :screen/wallet.create-account])}
+     (when (ff/enabled? ::ff/wallet.add-watched-address)
+       {:icon                :i/reveal
+        :accessibility-label :add-a-contact
+        :label               (i18n/label :t/add-address-to-watch)
+        :sub-label           (i18n/label :t/add-address-to-watch-description)
+        :on-press            #(rf/dispatch [:navigate-to :screen/wallet.add-address-to-watch])
+        :add-divider?        true})]]])
 
 (defn- new-account-card-data
   []

src/status_im/contexts/wallet/wallet_connect/events/session_proposals.cljs

@@ -36,9 +36,7 @@
      (cond
 
        keycard?
-       {:fx [[:dispatch
-              [:keycard/feature-unavailable-show
-               {:feature-name :wallet.scan-dapp-connection}]]]}
+       {:fx [[:dispatch [:keycard/feature-unavailable-show]]]}
 
        (or (not valid-wc-uri?)
            (not version-supported?)

src/status_im/feature_flags.cljs

@@ -11,13 +11,13 @@
 
 (def ^:private initial-flags
   {::community.edit-account-selection   (enabled-in-env? :FLAG_EDIT_ACCOUNT_SELECTION_ENABLED)
-   ::community.view-token-requirements  (enabled-in-env? :FLAG_VIEW_TOKEN_REQUIREMENTS)
 
    ;; Feature toggled (off by default) because the desktop app disabled this
    ;; feature and we want both clients in sync. We keep the code because it
    ;; works and we may re-enable it by default.
    ::profile-pictures-visibility        (enabled-in-env? :FLAG_PROFILE_PICTURES_VISIBILITY_ENABLED)
-   ::settings.import-all-keypairs       (enabled-in-env? :FLAG_WALLET_SETTINGS_IMPORT_ALL_KEYPAIRS)
+   ::settings.import-all-keypairs       (enabled-in-env?
+                                         :FLAG_WALLET_SETTINGS_IMPORT_ALL_KEYPAIRS)
    ::wallet.add-watched-address         (enabled-in-env? :FLAG_ADD_WATCHED_ADDRESS)
    ::wallet.advanced-sending            (enabled-in-env? :FLAG_ADVANCED_SENDING)
    ::wallet.assets-modal-hide           (enabled-in-env? :FLAG_ASSETS_MODAL_HIDE)

src/status_im/subs/profile.cljs

@@ -65,7 +65,6 @@
  (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
@@ -76,7 +75,6 @@
                      :image-name     image-name
                      :key-uid        target-key-uid
                      :theme          theme
-                     :clock          image-clock
                      :override-ring? override-ring?}}
           {:type    :initials
            :options {:port                port
@@ -283,10 +281,7 @@
                 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
-                                                  image-clock :clock
-                                                  :as         image}]
+        images-with-uri               (mapv (fn [{key-uid :keyUid image-name :type :as image}]
                                               (assoc image
                                                      :config
                                                      {:type    :account
@@ -294,7 +289,6 @@
                                                                 {:port       port
                                                                  :ratio      pixel-ratio/ratio
                                                                  :image-name image-name
-                                                                 :clock      image-clock
                                                                  :key-uid    key-uid
                                                                  :theme      theme}
                                                                 avatar-opts)}))

status-go-version.json

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

test/appium/tests/activity_center/test_activity_center.py

@@ -148,14 +148,6 @@ 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 < 23 else "tomorrow") for
+            "Muted until %s %s" % (exp_time.strftime('%H:%M'), "today" if current_time.hour < 16 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)):
+        if not chat.chat_preview.text.startswith("%s: %s" % (self.usernames[0], muted_message[:25])):
             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,6 +1021,8 @@ 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:
@@ -1121,6 +1123,8 @@ 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(username="second user", first_user=False)
+        self.sign_in.create_user(first_user=False)
         self.home.browser_tab.click()
 
         old, new = "https://status.app/", "status-app://"

test/appium/tests/critical/test_fallback.py

@@ -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.profile_title_input.is_element_displayed():
+        if not self.sign_in_2.password_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

@@ -59,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 == 'sender':
+            if user_name == self.sender_username:
                 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 == 'sender' and new_eth_amount <= exp_amount:
+            if user_name == self.sender_username and new_eth_amount <= exp_amount:
                 return
-            if user_name == 'receiver' and new_eth_amount >= exp_amount:
+            if user_name == self.receiver_username and new_eth_amount >= exp_amount:
                 return
             self.errors.append(
-                "Eth amount in the %ss wallet is %s but should be %s" % (user_name, new_eth_amount, exp_amount))
+                "Eth amount in the %s's 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")

test/appium/views/home_view.py

@@ -626,6 +626,7 @@ 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,8 +361,10 @@ 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)
-        return expected_element if expected_element.is_element_displayed(10) else self.driver.fail(
-            "User %s is not found!" % username)
+        if expected_element.is_element_displayed(10):
+            return expected_element
+        else:
+            raise NoSuchElementException(msg="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)

translations/en.json

@@ -395,6 +395,7 @@
   "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",
@@ -1386,8 +1387,6 @@
   "keycard-is-frozen-reset": "Reset with PUK",
   "keycard-is-frozen-title": "Keycard is frozen",
   "keycard-locked": "Keycard is locked",
-  "keycard-migration-failed-instruction-1": "Try logging out and logging back in with Keycard; everything might work fine.",
-  "keycard-migration-failed-instruction-2": "If the key pair hasn’t migrated to Keycard, remove your profile, and recover it using your recovery phrase.",
   "keycard-not-empty": "Keycard is not empty",
   "keycard-onboarding-finishing-header": "Finishing up",
   "keycard-onboarding-intro-header": "Store your keys on Keycard",
@@ -2429,7 +2428,6 @@
   "slippage-should-be-more-than-0": "Slippage should be more than 0",
   "slow": "Slow",
   "something-about-you": "Something about you",
-  "something-didnt-go-as-planned": "Something didn't go as planned",
   "something-went-wrong": "Something went wrong",
   "something-went-wrong-please-try-again-later": "Something went wrong. Modify swap parameters or try again later.",
   "soon": "Soon",