chore: status-go fix to avoid log flooding in case of DNS failure

https://github.com/status-im/status-go/compare/cba3ac57...6581f75c

.env.release

@@ -19,5 +19,4 @@ MAX_IMAGES_BATCH=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
-STATUS_PROXY_STAGE_NAME=prod
 FLAG_WALLET_CONNECT_ENABLED=1

Makefile

@@ -436,10 +436,11 @@ android-clean: ##@prepare Clean Gradle state
 	rm -rf ~/.gradle
 
 
-android-ports: export FLOWSTORM_PORT := 7722
+android-ports: export FLOWSTORM_PORT ?= 7722
 android-ports: export TARGET := android-sdk
+android-ports: export RCT_METRO_PORT ?= 8081
 android-ports: ##@other Add proxies to Android Device/Simulator
-	adb reverse tcp:8081 tcp:8081 && \
+	adb reverse tcp:$(RCT_METRO_PORT) tcp:$(RCT_METRO_PORT) && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
 	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \

VERSION

@@ -1 +1 @@
-2.30.0
+2.29.0

nix/mobile/android/build.nix

@@ -17,6 +17,7 @@
   hermesEnabled ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_hermesEnabled" "true",
   buildUrl ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_buildUrl" null,
   statusGoSrcOverride ? lib.getEnvWithDefault "STATUS_GO_SRC_OVERRIDE" null,
+  reactMetroPort ? lib.getEnvWithDefault "RCT_METRO_PORT" 8081,
   # If APKs should be split based on architectures
   androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "true",
   # Android architectures to build for
@@ -158,6 +159,7 @@ in stdenv.mkDerivation rec {
       --no-build-cache \
       --parallel \
       -Dmaven.repo.local='${deps.gradle}' \
+      -PreactNativeDevServerPort=${toString reactMetroPort} \
       assemble${gradleBuildType}
     '';
   in

resources/privacy.mdwn

@@ -1,54 +0,0 @@
-Last updated: 2023-09-22
-
-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.
-
-Whenever “Status” or “we” or “us” or any similar variation, are used in these terms, we’re referring to Status Research & Development GmbH, a Swiss company with its registered office at Baarerstrasse 10, Zug, Switzerland, and includes its “representatives”, which means Status’ affiliates, directors, officers, employees, agents and any other representatives of Status. For the purposes of these terms, “representatives” also includes Status core contributors without prejudice to the other legal categories mentioned.
-
-Status does not provide any services, such as financial services, to users of Status Software or any third party. Status is not an intermediary, agent, advisor, or custodian, and does not owe you any fiduciary duty.
-
-
-Status Software
-
-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.
-
-
-Our role in your privacy
-
-This Privacy Statement applies to you as a user of Status Software.
-
-Under the relevant data protection legislation, we would be under certain obligations if we process any personal data when you use Status Software. Personal data means all information by which a person can be directly or indirectly identified, in line with the definitions of the General Data Protection Regulation (GDPR), the Swiss Federal Act on Data Protection of June 19, 1992 (DPA) (as amended from time to time) and its ordinances, and other relevant legislation on the protection of personal data. When we refer to privacy legislation in this Privacy Statement, we mean GDPR and all such relevant legislation.
-
-However, since we do not collect or process any of your personal data when you use Status Software, we have decided to inform you of the following instead:
-
-- Ethereum is a public blockchain:
-Ethereum is the community-run technology powering the cryptocurrency ether (ETH) and thousands of decentralized applications (DApps). Status Software provides a mobile portal and streamlined access to Ethereum’s growing ecosystem of decentralized applications.
-
-The Ethereum public network is accessible to anyone in the world with an internet connection. Anyone can read or create transactions on a public blockchain and validate the transactions being executed. Therefore, information you share on the Ethereum blockchain is public, whether or not you use Status Software.
-
-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.
-
-Ethereum Name Service (ENS) allows Ethereum addresses to be replaced by custom text-based names. Anyone can register a stateofus.eth username by staking the required Status Network Tokens (SNT) from within the profile tab on Status Software. When you register an ENS name with a given wallet address, that address becomes associated with the username, reducing the privacy of that account.
-
-- Offering secure, private messaging:
-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 will then be given display name options to choose from (derived from this key pair). Your display name will only be shared if you choose to share it by chatting with Status or other users.
-
-Within Status Software, you can create a list of trusted contacts based on the chat keys you choose to trust. Your trusted contacts are also stored locally on your own device. This means that Status has no access to your contact list and does not collect or process any personal data in this respect.
-
-On Status Software, you can exchange messages with other users, including photos and audio messages. Only the recipient of a message can decrypt the message by opening it on their own device. This means that Status can never access any user messages in private chats.
-
-Messaging on Status Software 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. This protocol, known as Waku, relies on a distributed network of nodes instead of a centralised server which 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 website.
-
-- A quick bite on cookies:
-We do not set any cookies for the use of Status Software. However, the Web 3.0 browser embedded within Status Software technically supports the use of cookies set by third party websites. Status is not responsible for nor is it able to influence whether such cookies are set by such third party websites and you should consult the relevant privacy policies of such third party websites.
-
-
-Changes to Status Privacy Statement
-It is unlikely that this Privacy Statement will change because we do not intend to collect or process your personal data, ever. That said, we reserve the right to modify or replace any part of this Privacy Statement at any time and in our sole discretion.
-
-If you have any questions about the Status Software Privacy Statement, please contact us at legal@status.im or through the appropriate means of communication indicated on Status’ website.
-
-This document is CC-BY-SA.

resources/terms-of-use.mdwn

@@ -38,7 +38,7 @@ You not only release Status’ liability on a number of items, but also agree th
 
 - Arbitration
 If a dispute arises between you and Status, we will seek to first solve it amicably with you before proceeding to the use of an arbitration administered by the Swiss Chambers’ Arbitration Institution.
-
+ 
 
 2. About Status Software
 
@@ -77,7 +77,7 @@ Within Messaging, you will also be able to participate in Status Community Space
 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
 
@@ -95,7 +95,7 @@ If you use third party services offered through Status Software, your privacy ma
 
 
 Learn more about how we protect your data on Status Software by reading the Status Privacy Statement and relevant security page on the Status website.
-
+ 
 
 4. Using third party services and interacting with Web 3
 
@@ -114,19 +114,19 @@ You are solely responsible for your use of Third Party Services and your interac
 In principle, Status does not provide any advice, recommendation, support or endorse Third Party Services you may use or any aspect of Web 3 that you may interact with through Status Software. Their integration or availability through Status Software does not imply any support or endorsement by Status. Status may also receive a fee from certain third parties who provide the Third Party Services.
 
 Please also note that Status participates in the development of other open source projects that utilise peer-to-peer technologies, which you can find more details about on Status’ GitHub page.
-
+ 
 
 5. Nodes
 
 The use of Status Software on your device will turn it into a node that supports the Waku network.
 
 In general, by participating in or interacting with Web 3 networks, you may choose or be required to operate a node or perform other functions in support of such a network. Status is not responsible for the operation or functioning of such nodes.
-
+ 
 
 6. Security
 
 Although security is a top priority for us and many functions of Status Software are privacy-mode by default, we cannot guarantee the full security of Status Software and we are not responsible for alerting you to potential security risks. We intend to continuously update the security measures of Status Software and we will from time to time post updates on the security of Status Software through our communication channels.
-
+ 
 
 7. Content
 
@@ -142,7 +142,7 @@ You acknowledge that Status has no means of monitoring, moderating, removing, mo
 1. could be offensive, indecent, or otherwise objectionable;
 2. contains technical inaccuracies, typographical mistakes, and other errors; or
 3. could violate others’ rights, including but not limited to privacy, publicity, intellectual property, or other proprietary rights.
-
+ 
 
 8. Acceptable use of Status software
 
@@ -167,12 +167,12 @@ You shall not, nor try to, encourage or assist others using Status Software to:
 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
 
 When you use Status Software to interact with Third Party Services or Web 3, you may incur costs and may have to pay various fees, such as service fees, transfer fees, transaction fees, swap fees, bridge fees or network fees. You will be solely liable for any such fees, costs and expenses. Status has no control over and is unable to influence these fees in any manner.
-
+ 
 
 10. Intellectual property and branding
 
@@ -187,7 +187,7 @@ Status (and its affiliates as the case may be) owns all the rights to Status bra
 We love to see creative work from the Status community, but please let us know in advance and in writing if you want to use trademarks, logos, or graphics or modify them from our standard colours and designs. If you write articles, blogs, create websites, or talk about Status, please make sure it is clear that you are not speaking for, on behalf of, or under endorsement by Status.
 
 To request permission to use our copyrighted material or trademarks or any other intellectual property, such as logos, please contact: marketing@status.im. If we grant you permission, you must follow our guidelines and instructions for using our intellectual property.
-
+ 
 
 11. Risks
 
@@ -222,7 +222,7 @@ With Status Software, you can interact with and transact in Digital Assets and t
 You acknowledge that there may be legal and regulatory implications applicable to you while using Status Software and interacting with Web 3 and that may also adversely impact your use of Status Software.
 
 You are solely responsible for evaluating the legal and regulatory implications and taking appropriate actions, which could include obtaining any necessary licences, permits or approvals. Additionally, you are solely responsible for any tax implications, such as the payment of any taxes, resulting from your activities conducted through Status Software, including any transactions in Digital Assets.
-
+ 
 
 12. Disclaimers
 
@@ -233,7 +233,7 @@ Status Software is provided on an “as is” basis. Status does not make any ex
 4. regarding the value, utility or legality of any Digital Asset;
 5. regarding the completeness, accuracy, legality, utility, suitability, functionality, security or availability of any smart contract that you may interact with or deploy; or
 6. regarding the completeness, accuracy, legality, utility, reliability, suitability or availability of any user content.
-
+ 
 
 13. Releases you should read closely
 
@@ -250,13 +250,13 @@ You release Status from all liability related to any claim, cause of action, con
 10. your content or other users’ content;
 11. any unauthorised third party activities, including without limitation the use of viruses, phishing, brute forcing, or other means of attack against Status Software; and
 12. any risks identified in these terms or any that a reasonable person should have been aware of in relation to using Status Software.
-
+ 
 
 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.
-
+ 
 
 15. Indemnity
 
@@ -268,7 +268,7 @@ You shall indemnify and hold harmless Status from and against any and all claims
 5. your harm to or violation of the rights of any third party, including any privacy, intellectual property, publicity, confidentiality, property or any other rights;
 6. your use of Third Party Services or any aspect of Web 3; or
 7. any misrepresentation or fraudulent statements made by you.
-
+ 
 
 16. Restricted jurisdictions
 
@@ -277,7 +277,7 @@ Status is a Swiss company which makes Status Software available through third pa
 You acknowledge that Status Software is not intended for use or distribution in any jurisdiction where such use or distribution of software that is similar or identical to Status Software is prohibited or restricted in any way. Your use of Status Software does not and will not subject Status to such jurisdiction under any circumstance, particularly if there are any prohibitions or restrictions on the use of such software. Status reserves the right to limit the availability of Status Software in any jurisdiction.
 
 Status does not conduct any business activities (i.e. activities undertaken for the purpose of earning a profit) within the United States of America, District of Columbia, Puerto Rico, the U.S. Virgin Islands, and all other U.S. territories and possessions, as well as all Swiss embargoed countries.
-
+ 
 
 17. Materials provided are solely for informational purposes
 
@@ -286,7 +286,7 @@ Status provides materials and other information through Status Software for info
 You should always conduct your own research and seek independent professional advice if necessary. The materials and other information that Status may provide through Status Software does not constitute financial, legal, tax, or other advice and should not be treated as such.
 
 Additionally, Status is not responsible for any information, content, or services contained on any third party websites accessible or linked through the Status Software. By linking such third party websites, Status does not represent or imply that it endorses or supports such third party websites or content therein, or that it believes such third party websites and content therein to be accurate, useful or non-harmful. Status has no control over such third party websites and will not be liable for your use of or activities on any third party websites accessed through Status Software. The terms and conditions, including privacy policies, of such third party websites govern your use of their websites.If you access such third party websites through Status Software, it is at your own risk and you are solely responsible for your activities on such third party websites.
-
+ 
 
 18. Governing law and dispute resolution
 
@@ -305,14 +305,14 @@ If a (potential) dispute arises, you must first use your reasonable efforts to r
 If you and Status are unable to further resolve this dispute within sixty (60) calendar days of Status receiving this notice of dispute, then any such dispute will be referred to and finally resolved by you and Status through an arbitration administered by the Swiss Chambers’ Arbitration Institution in accordance with the Swiss Rules of International Arbitration for the time being in force, which rules are deemed to be incorporated herein by reference. The arbitral decision may be enforced in any court. The arbitration will be held in Zug, Switzerland, and may be conducted via video conference virtual/online methods if possible. The tribunal will consist of one arbitrator, and all proceedings as well as communications between the parties will be kept confidential. The language of the arbitration will be in English. Payment of all relevant fees in respect of the arbitration, including filing, administration and arbitrator fees will be in accordance with the Swiss Rules of International Arbitration.
 
 Regardless of any applicable statute of limitations, you must bring any claims within one year after the claim arose or the time when you should have reasonably known about the claim. You also waive the right to participate in a class action lawsuit or a classwide arbitration against Status.
-
+ 
 
 19. What happens if you stop using Status Software
 
 If, at any time, you no longer agree to these terms, you must immediately stop using Status Software and uninstall it from all your devices. You acknowledge that even after uninstalling Status Software from all your devices, messages (including content) you have sent may still remain on the recipient’s device, blockchain transactions you have may still be recorded on the blockchain, and any smart contracts you have deployed to a blockchain may still remain deployed.
 
 Even after you have stopped using Status Software, all provisions of these terms which by their nature should survive termination shall survive termination. These provisions include, but are not limited to, warranty disclaimers, indemnity, limitations of liability, dispute resolution, and governing law.
-
+ 
 
 20. General provisions
 

scripts/check-metro-shadow-process.sh

@@ -6,7 +6,7 @@ if pgrep -f 'shadow-cljs watch mobile' > /dev/null; then
     exit 1
 fi
 
-if pgrep -f 'react-native start' > /dev/null; then
+if pgrep -f "react-native start --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
     echo "Error: make run-metro is already running in another terminal" >&2
     echo "Please close that terminal before running this command." >&2
     exit 1

scripts/run-metro.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-if pgrep -f 'react-native start' > /dev/null; then
+if pgrep -f "react-native start --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
     echo "Info: metro is already running in another terminal"
 else
     echo "Info: starting a new metro terminal"
-    react-native start --reset-cache
+    react-native start --port=${RCT_METRO_PORT:-8081} --reset-cache
 fi

scripts/wait-for-metro-port.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 TIMEOUT=10 # Metro should not take this long to start.
 
 while [ "${TIMEOUT}" -gt 0 ]; do
-  if ! lsof -i:8081 &> /dev/null; then
+  if ! lsof -i:"${RCT_METRO_PORT:-8081}" &> /dev/null; then
     echo "."
     sleep 1
     ((TIMEOUT--))

src/quo/components/drawers/bottom_actions/view.cljs

@@ -20,7 +20,7 @@
       [:actions [:maybe [:enum :one-action :two-actions :two-vertical-actions]]]
       [:description {:optional true} [:maybe [:enum :top :bottom :top-error]]]
       [:description-text {:optional true} [:maybe [:or :string :schema.common/hiccup]]]
-      [:description-top-text {:optional true} [:maybe [:or :string :schema.common/hiccup]]]
+      [:description-top-text {:optional true} [:maybe :string]]
       [:error-message {:optional true} [:maybe :string]]
       [:role {:optional true} [:maybe [:enum :admin :member :token-master :owner]]]
       [:context-tag-props {:optional true} [:maybe context-tag.schema/?schema]]
@@ -58,23 +58,20 @@
           :style {:color (colors/theme-colors colors/danger-50 colors/danger-60 theme)}}
          error-message]])
 
-     (when (= description :top)
-       (if (vector? description-top-text)
-         description-top-text
-         (when (or role context-tag-props)
-           [rn/view {:style style/description-top}
-            [text/text
-             {:size  :paragraph-2
-              :style (style/description-top-text scroll? blur? theme)}
-             (or description-top-text (i18n/label :t/eligible-to-join-as))]
-            [context-tag/view
-             (if role
-               {:type    :icon
-                :size    24
-                :icon    (role role-icon)
-                :blur?   blur?
-                :context (i18n/label (keyword "t" role))}
-               context-tag-props)]])))
+     (when (and (= description :top) (or role context-tag-props))
+       [rn/view {:style style/description-top}
+        [text/text
+         {:size  :paragraph-2
+          :style (style/description-top-text scroll? blur? theme)}
+         (or description-top-text (i18n/label :t/eligible-to-join-as))]
+        [context-tag/view
+         (if role
+           {:type    :icon
+            :size    24
+            :icon    (role role-icon)
+            :blur?   blur?
+            :context (i18n/label (keyword "t" role))}
+           context-tag-props)]])
 
      [rn/view {:style (style/buttons-container actions buttons-container-style)}
       (when (or (= actions :two-actions)

src/status_im/common/home/title_column/view.cljs

@@ -3,30 +3,14 @@
     [quo.core :as quo]
     [react-native.core :as rn]
     [status-im.common.home.title-column.style :as style]
-    [status-im.common.plus-button.view :as plus-button]
-    [utils.i18n :as i18n]))
+    [status-im.common.plus-button.view :as plus-button]))
 
 (defn view
-  [{:keys [beta? label handler accessibility-label customization-color]}]
+  [{:keys [label handler accessibility-label customization-color]}]
   [rn/view style/title-column
-   [rn/view
-    {:style {:flex           1
-             :align-items    :center
-             :flex-direction :row}}
+   [rn/view {:flex 1}
     [quo/text style/title-column-text
-     label]
-    (when beta?
-      [rn/view
-       {:style {:padding-top    6
-                :padding-bottom 2}}
-       [quo/tag
-        {:accessibility-label :communities-chat-beta-tag
-         :size                32
-         :type                :label
-         :label               (i18n/label :t/beta)
-         :labelled?           true
-         :blurred?            false}]])]
-
+     label]]
    (when handler
      [plus-button/plus-button
       {:on-press            handler

src/status_im/config.cljs

@@ -48,7 +48,6 @@
 
 (def opensea-api-key OPENSEA_API_KEY)
 (def status-proxy-enabled? true)
-(def status-proxy-stage-name (get-config :STATUS_PROXY_STAGE_NAME "test"))
 (def bootnodes-settings-enabled? (enabled? (get-config :BOOTNODES_SETTINGS_ENABLED "1")))
 (def mailserver-confirmations-enabled? (enabled? (get-config :MAILSERVER_CONFIRMATIONS_ENABLED)))
 (def pairing-popup-disabled? (enabled? (get-config :PAIRING_POPUP_DISABLED "0")))

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

@@ -118,8 +118,7 @@
 (defn- banner-data
   [profile-link]
   {:title-props
-   {:beta?               true
-    :label               (i18n/label :t/messages)
+   {:label               (i18n/label :t/messages)
     :handler             #(rf/dispatch
                            [:show-bottom-sheet {:content chat.actions.view/new-chat}])
     :accessibility-label :new-chat-button}

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

@@ -64,8 +64,7 @@
 
 (def ^:private banner-data
   {:title-props
-   {:beta?               true
-    :label               (i18n/label :t/communities)
+   {:label               (i18n/label :t/communities)
     :handler             (when config/fast-create-community-enabled?
                            #(rf/dispatch [:show-bottom-sheet {:content actions.home-plus/view}]))
     :accessibility-label :new-communities-button}

src/status_im/contexts/onboarding/intro/style.cljs

@@ -7,21 +7,16 @@
    :justify-content :flex-end})
 
 (def text-container
-  {:flex           1
-   :flex-direction :row
-   :flex-wrap      :wrap
-   :align-self     :center})
-
-(def terms-privacy-container
-  {:gap                8
-   :padding-horizontal 20
-   :padding-vertical   8})
+  {:text-align :center
+   :margin-top 4
+   :flex-wrap  :wrap})
 
 (def plain-text
   {:color colors/white-opa-70})
 
 (def highlighted-text
-  {:color colors/white})
+  {:flex  1
+   :color colors/white})
 
 (defn bottom-actions-container
   [bottom-insets]

src/status_im/contexts/onboarding/intro/view.cljs

@@ -6,73 +6,45 @@
     [status-im.contexts.onboarding.common.background.view :as background]
     [status-im.contexts.onboarding.common.overlay.view :as overlay]
     [status-im.contexts.onboarding.intro.style :as style]
-    [status-im.contexts.onboarding.privacy.view :as privacy]
     [status-im.contexts.onboarding.terms.view :as terms]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
 (defn view
   []
-  (let [[terms-accepted? set-terms-accepted?] (rn/use-state false)]
-    [rn/view {:style style/page-container}
-     [background/view false]
-     [quo/bottom-actions
-      {:container-style      (style/bottom-actions-container (safe-area/get-bottom))
-       :actions              :two-vertical-actions
-       :description          :top
-       :description-top-text [rn/view
-                              {:style          style/terms-privacy-container
-                               :flex-direction :row}
-                              [rn/view
-                               {:accessibility-label :terms-privacy-checkbox-container}
-                               [quo/selectors
-                                {:type      :checkbox
-                                 :blur?     true
-                                 :checked?  terms-accepted?
-                                 :on-change #(set-terms-accepted? not)}]]
-                              [rn/view {:style {:flex 1}}
-                               [rn/view {:style style/text-container}
-                                [quo/text
-                                 {:style style/plain-text
-                                  :size  :paragraph-2}
-                                 (str (i18n/label :t/accept-status-tos-prefix) " ")]
-                                [quo/text
-                                 {:on-press #(rf/dispatch [:show-bottom-sheet
-                                                           {:content (fn [] [terms/terms-of-use])
-                                                            :shell?  true}])
-                                  :style    style/highlighted-text
-                                  :size     :paragraph-2
-                                  :weight   :medium}
-                                 (i18n/label :t/terms-of-service)]
-                                [quo/text
-                                 {:style style/plain-text
-                                  :size  :paragraph-2}
-                                 " & "]
-                                [quo/text
-                                 {:on-press #(rf/dispatch [:show-bottom-sheet
-                                                           {:content (fn [] [privacy/privacy-statement])
-                                                            :shell?  true}])
-                                  :style    style/highlighted-text
-                                  :size     :paragraph-2
-                                  :weight   :medium}
-                                 (i18n/label :t/intro-privacy-statement)]]]]
-       :button-one-label     (i18n/label :t/sync-or-recover-profile)
-       :button-one-props     {:type                :dark-grey
-                              :disabled?           (not terms-accepted?)
-                              :accessibility-label :already-use-status-button
-                              :on-press            (fn []
-                                                     (when-let [blur-show-fn @overlay/blur-show-fn-atom]
-                                                       (blur-show-fn))
-                                                     (rf/dispatch
-                                                      [:open-modal
-                                                       :screen/onboarding.sync-or-recover-profile]))}
-       :button-two-label     (i18n/label :t/create-profile)
-       :button-two-props     {:accessibility-label :new-to-status-button
-                              :disabled? (not terms-accepted?)
-                              :on-press
-                              (fn []
-                                (when-let [blur-show-fn @overlay/blur-show-fn-atom]
-                                  (blur-show-fn))
-                                (rf/dispatch
-                                 [:open-modal :screen/onboarding.new-to-status]))}}]
-     [overlay/view]]))
+  [rn/view {:style style/page-container}
+   [background/view false]
+   [quo/bottom-actions
+    {:container-style  (style/bottom-actions-container (safe-area/get-bottom))
+     :actions          :two-vertical-actions
+     :description      :bottom
+     :description-text [quo/text
+                        {:style  style/text-container
+                         :size   :paragraph-2
+                         :weight :regular}
+                        [quo/text {:style style/plain-text}
+                         (i18n/label :t/by-continuing-you-accept)]
+                        [quo/text
+                         {:on-press #(rf/dispatch [:show-bottom-sheet
+                                                   {:content (fn [] [terms/terms-of-use])
+                                                    :shell?  true}])
+                          :style    style/highlighted-text}
+                         (i18n/label :t/terms-of-service)]]
+     :button-one-label (i18n/label :t/sync-or-recover-profile)
+     :button-one-props {:type                :dark-grey
+                        :accessibility-label :already-use-status-button
+                        :on-press            (fn []
+                                               (when-let [blur-show-fn @overlay/blur-show-fn-atom]
+                                                 (blur-show-fn))
+                                               (rf/dispatch
+                                                [:open-modal
+                                                 :screen/onboarding.sync-or-recover-profile]))}
+     :button-two-label (i18n/label :t/create-profile)
+     :button-two-props {:accessibility-label :new-to-status-button
+                        :on-press
+                        (fn []
+                          (when-let [blur-show-fn @overlay/blur-show-fn-atom]
+                            (blur-show-fn))
+                          (rf/dispatch
+                           [:open-modal :screen/onboarding.new-to-status]))}}]
+   [overlay/view]])

src/status_im/contexts/onboarding/privacy/view.cljs

@@ -1,11 +0,0 @@
-(ns status-im.contexts.onboarding.privacy.view
-  (:require-macros [legacy.status-im.utils.slurp :refer [slurp]])
-  (:require [quo.core :as quo]
-            [react-native.gesture :as gesture]))
-
-(def privacy-statement-text (slurp "resources/privacy.mdwn"))
-
-(defn privacy-statement
-  []
-  [gesture/scroll-view {:margin 20}
-   [quo/text privacy-statement-text]])

src/status_im/contexts/profile/config.cljs

@@ -11,11 +11,10 @@
   {;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved
    :wakuV2Nameserver              "8.8.8.8"
    :statusProxyEnabled            config/status-proxy-enabled?
-   :statusProxyStageName          config/status-proxy-stage-name
-   :statusProxyMarketUser         "test"
-   :statusProxyMarketPassword     "test"
-   :statusProxyBlockchainUser     "test"
-   :statusProxyBlockchainPassword "test"
+   :statusProxyMarketUser         config/STATUS_BUILD_PROXY_USER
+   :statusProxyMarketPassword     config/STATUS_BUILD_PROXY_PASSWORD
+   :statusProxyBlockchainUser     config/STATUS_BUILD_PROXY_USER
+   :statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD
    :openseaAPIKey                 config/opensea-api-key
    :poktToken                     config/POKT_TOKEN
    :infuraToken                   config/INFURA_TOKEN

src/status_im/contexts/syncing/events.cljs

@@ -34,7 +34,7 @@
             :WakuV2Config {;; Temporary fix until https://github.com/status-im/status-go/issues/3024
                            ;; is resolved
                            :Nameserver  "8.8.8.8"
-                           :LightClient true}
+                           :LightClient false}
             :ShhextConfig {:VerifyTransactionURL     config/verify-transaction-url
                            :VerifyENSURL             config/verify-ens-url
                            :VerifyENSContractAddress config/verify-ens-contract-address

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

@@ -7,7 +7,6 @@
             [utils.number :as number]
             [utils.string]))
 
-(def missing-price-decimals 6) ; if we don't have the monetary value of the token, we default to 6 decimals
 (defn get-first-name
   [full-name]
   (first (string/split full-name #" ")))
@@ -67,20 +66,16 @@
 (defn get-standard-crypto-format
   "For full details: https://github.com/status-im/status-mobile/issues/18225"
   [{:keys [market-values-per-currency]} token-units]
-  (cond (or (nil? token-units)
-            (money/equal-to token-units 0))
-        "0"
-
-        (nil? (-> market-values-per-currency :usd :price))
-        (number/remove-trailing-zeroes (.toFixed token-units missing-price-decimals))
-
-        :else
-        (let [price          (-> market-values-per-currency :usd :price)
-              one-cent-value (if (pos? price) (/ 0.01 price) 0)
-              decimals-count (calc-max-crypto-decimals one-cent-value)]
-          (if (< token-units one-cent-value)
-            (str "<" (number/remove-trailing-zeroes (.toFixed one-cent-value decimals-count)))
-            (number/remove-trailing-zeroes (.toFixed token-units decimals-count))))))
+  (if (or (nil? token-units)
+          (nil? market-values-per-currency)
+          (money/equal-to token-units 0))
+    "0"
+    (let [price          (-> market-values-per-currency :usd :price)
+          one-cent-value (if (pos? price) (/ 0.01 price) 0)
+          decimals-count (calc-max-crypto-decimals one-cent-value)]
+      (if (< token-units one-cent-value)
+        (str "<" (number/remove-trailing-zeroes (.toFixed one-cent-value decimals-count)))
+        (number/remove-trailing-zeroes (.toFixed token-units decimals-count))))))
 
 (defn get-market-value
   [currency {:keys [market-values-per-currency]}]

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

@@ -64,11 +64,6 @@
       (is (= (utils/get-standard-crypto-format {:market-values-per-currency market-values-per-currency}
                                                token-units)
              "0.005")))
-    (let [market-values-per-currency {:usd {:price nil}}
-          token-units                (money/bignumber 0.0123456)]
-      (is (= (utils/get-standard-crypto-format {:market-values-per-currency market-values-per-currency}
-                                               token-units)
-             "0.012346")))
     (let [market-values-per-currency {:usd {:price 0.005}}
           token-units                (money/bignumber 0.01)]
       (is (= (utils/get-standard-crypto-format {:market-values-per-currency market-values-per-currency}

src/status_im/contexts/wallet/events.cljs

@@ -296,6 +296,7 @@
            {:start-flow? true
             :flow-id     :wallet-bridge-flow}]]]}))
 
+
 (rf/reg-event-fx :wallet/select-bridge-network
  (fn [{:keys [db]} [{:keys [network-chain-id stack-id]}]]
    {:db (assoc-in db [:wallet :ui :send :bridge-to-chain-id] network-chain-id)
@@ -496,15 +497,16 @@
                                         (string/join ", ")))]
      (when (seq down-chain-ids)
        (log/info "[wallet] Chain(s) down: " down-chain-ids)
-       (log/info "[wallet] Chain name(s) down: " chain-names)
        (log/info "[wallet] Test network enabled: " (boolean test-networks-enabled?))
        (log/info "[wallet] Goerli network enabled: " (boolean is-goerli-enabled?)))
-
-     ;; NOTE <shivekkhurana>: We used to show an error toast, but disabled it because the down
-     ;; signal is sent randomly. Needs to be investigated and enabled again !
-     ;; Context: https://github.com/status-im/status-mobile/issues/21054
-
-     {:db (assoc-in db [:wallet :statuses :blockchains] chains)})))
+     {:db (assoc-in db [:wallet :statuses :blockchains] chains)
+      :fx [(when chains-down?
+             [:dispatch
+              [:toasts/upsert
+               {:id       :chains-down
+                :type     :negative
+                :text     (i18n/label :t/provider-is-down {:chains chain-names})
+                :duration constants/toast-chain-down-duration}]])]})))
 
 (rf/reg-event-fx :wallet/reset-selected-networks
  (fn [{:keys [db]}]

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "test/set-api-proxy-test-debug",
-    "commit-sha1": "022b6fd45b99819ec14baabd6d482ae85ed468bf",
-    "src-sha256": "03p7x3s9005ghi02x334077nxwdhwlkxmvhcnc07lsygfsnzkkzk"
+    "version": "e08ed738afe03dc2243f4c0ced869b9edcca677e",
+    "commit-sha1": "e08ed738afe03dc2243f4c0ced869b9edcca677e",
+    "src-sha256": "0dmcmy0b4aqbkkz1hviydn920qi6g5d8fgiccryvzql07s00nr60"
 }

test/appium/support/api/network_api.py

@@ -1,11 +1,13 @@
 import logging
 import time
+from datetime import datetime
 from decimal import Decimal
 from json import JSONDecodeError
 from os import environ
 from typing import List
 
 import pytest
+import pytz
 import requests
 from selenium.common import TimeoutException
 
@@ -38,7 +40,7 @@ class NetworkApi:
         return self.send_etherscan_request(params)
 
     def get_transactions(self, address: str) -> List[dict]:
-        params = {'module': 'account', 'action': 'txlist', 'address': address, 'sort': 'desc'}
+        params = {'module': 'account', 'action': 'txlist', 'address': address, 'page': 1, 'offset': 10, 'sort': 'desc'}
         return self.send_etherscan_request(params)
 
     def is_transaction_successful(self, transaction_hash: str) -> int:
@@ -106,22 +108,28 @@ class NetworkApi:
                     self.log("Failed iterate transactions(Etherscan unexpected error): " + str(e))
                     continue
 
-    def wait_for_confirmation_of_transaction(self, address, amount, confirmations=6, token=False):
+    def wait_for_confirmation_of_transaction(self, address, tx_time, confirmations=7, token=False):
+        expected_tx_timestamp = datetime.strptime(tx_time, "%Y-%m-%dT%H:%M:%S%z").replace(tzinfo=pytz.UTC)
         start_time = time.time()
         if token:
             token_info = "token transaction"
         else:
             token_info = "ETH transaction"
-        self.log('Waiting %s %s for %s to have %s confirmations' % (amount, token_info, address, confirmations))
+        self.log('Waiting for %s of %s to have %s confirmations' % (token_info, address, confirmations))
         while round(time.time() - start_time, ndigits=2) < 600:  # should be < idleTimeout capability
-            transaction = self.find_transaction_by_unique_amount(address, amount, token)
+            if token:
+                transaction = self.get_token_transactions(address)[0]
+            else:
+                transaction = self.get_transactions(address)[0]
+            tx_timestamp = datetime.fromtimestamp(int(transaction['timeStamp'])).replace(tzinfo=pytz.UTC)
+            if tx_timestamp > expected_tx_timestamp:
+                if int(transaction['confirmations']) >= confirmations:
+                    return
+            time.sleep(20)
             self.log(
                 'Expected amount of confirmations is %s, in fact %s' % (confirmations, transaction['confirmations']))
-            if int(transaction['confirmations']) >= confirmations:
-                return
-            time.sleep(20)
-        pytest.fail('Transaction with amount %s was not confirmed, address is %s, still has %s confirmations' % (
-            amount, address, int(transaction['confirmations'])))
+        pytest.fail('The last transaction was not confirmed, address is %s, still has %s confirmations' % (
+            address, int(transaction['confirmations'])))
 
     def verify_balance_is_updated(self, initial_balance, recipient_address, wait_time=360):
         counter = 0
@@ -142,7 +150,7 @@ class NetworkApi:
             balance = round(self.get_balance(address), 4)
             if balance == expected_balance:
                 return
-            time.sleep(10)
+            time.sleep(20)
         raise TimeoutException(
             'balance is not updated on Etherscan, it is %s but expected to be %s' % (balance, expected_balance))
 

test/appium/tests/critical/test_deep_and_universal_links.py

@@ -17,13 +17,14 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
 
         self.home = self.sign_in.create_user(username=self.username)
         self.home.communities_tab.click_until_presence_of_element(self.home.plus_community_button)
-        self.community_name = "open community"
+        self.open_community_name = "open community"
         self.channel_name = "general"
         self.community = self.home.create_community(community_type="open")
         self.profile_view = self.home.get_profile_view()
         self.browser_view = self.home.get_dapp_view()
-        self.home.get_chat(self.community_name, community=True).click()
+        self.home.get_chat(self.open_community_name, community=True).click()
         self.community_view = self.home.get_community_view()
+        self.open_community_url = self.community_view.copy_community_link()
         self.channel = self.community_view.get_channel(self.channel_name).click()
 
     @marks.testrail_id(704613)
@@ -39,7 +40,6 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
             self.channel.send_message(url)
             self.channel.chat_element_by_text(url).click_on_link_inside_message_body()
             if self.channel.profile_send_contact_request_button.is_element_displayed(10):
-                # username_text = self.profile_view.default_username_text.text
                 username_text = self.profile_view.contact_name_text.text
                 if not (username_text.endswith(url[-6:]) or username_text == text):
                     self.errors.append("Incorrect username is shown for profile url %s" % url)
@@ -47,34 +47,10 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
                 self.errors.append("Profile was not opened by the profile url %s" % url)
             self.profile_view.close_button.click()
 
-        community_urls = {
-            "https://status.app/c/ixyACjgKDVNOVCBjb21tdW5pdHkSHHJlcXVpcmUgMTAgU05UIEdvZXJsaSB0byB1c2UYASIHI2VhYjcwMAM=#zQ3shUeGnhM33QW4g9JfYfeLFAH9ZwbDboNYn5exCR7S3ii1y":
-                "SNT community",
-            "https://status.app/c/G0UAAMTyNsn2QZDEG0EXftOl8pOEfwEBOOSA_YTfIk85xmADDgINGmxpUHAXzK36bN0fK42Xf4YD2yjPk1z2pbFwFw==#zQ3sheoNX5kiuM393TJ6xDnL57aQoiwFWEuJnazJ6W2eNuh9u":
-                "open community",
-            "https://status.app/c/G00AAGS9TbI9mSR-ZNmFrhRjNuEeXAAbcAIUaLLJyjMOG3ACJQ12oIHD78QhzO9s_T5bUeU7rnATWJg3mGgTUemrAg==#zQ3shp9f5M3uyMpwTi3rFpFrP6WCWmNsW9pgK9cjXVTaf2vgj":
-                "closed community"
-        }
-        for url, text in community_urls.items():
-            self.channel.just_fyi("Opening community '%s' by the url %s" % (text, url))
-            self.channel.chat_message_input.clear()
-            self.channel.send_message(url)
-            self.channel.chat_element_by_text(url).click_on_link_inside_message_body()
-            if text == 'SNT community':
-                if self.community_view.community_title.text != text:
-                    self.errors.append("Community '%s' was not requested to join by the url %s" % (text, url))
-            else:
-                if not self.community_view.join_button.is_element_displayed(
-                        10) or self.community_view.community_title.text != text:
-                    self.errors.append("Community '%s' was not requested to join by the url %s" % (text, url))
-            if text != "closed community":  # the last one
-                self.home.navigate_back_to_home_view()
-                self.home.get_to_community_channel_from_home(self.community_name)
-
         self.errors.verify_no_errors()
 
     @marks.testrail_id(702775)
-    def test_links_deep_links(self):
+    def test_links_deep_links_profile(self):
         self.home.navigate_back_to_home_view()
         self.home.browser_tab.click()
 
@@ -87,7 +63,6 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
         for link, text in profile_links.items():
             self.channel.just_fyi("Opening profile link %s" % link)
             self.browser_view.open_url(link)
-            # shown_name_text = self.profile_view.default_username_text.text
             shown_name_text = self.profile_view.contact_name_text.text
             if text:
                 name_is_shown = shown_name_text == text or shown_name_text.endswith(link[-6:])
@@ -97,25 +72,43 @@ class TestDeepLinksOneDevice(MultipleSharedDeviceTestCase):
                 self.errors.append("Profile was not opened by the profile deep link %s" % link)
             self.browser_view.click_system_back_button()
 
+        self.errors.verify_no_errors()
+
+    @marks.testrail_id(739307)
+    def test_deep_links_communities(self):
+        closed_community_name, snt_community_name = "closed community", "SNT community"
+        self.home.navigate_back_to_home_view()
+        self.home.communities_tab.click()
+        self.home.create_community(community_type="closed")
+        if not self.community_view.community_options_button.is_element_displayed():
+            self.home.get_chat(closed_community_name, community=True).click()
+        closed_community_url = self.community_view.copy_community_link()
+        self.home.navigate_back_to_home_view()
+        self.home.create_community(community_type="token-gated")
+        if not self.community_view.community_options_button.is_element_displayed():
+            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.home.browser_tab.click()
+
+        old, new = "https://status.app/", "status-app://"
         community_links = {
-            "status.app://c/ixyACjgKDVNOVCBjb21tdW5pdHkSHHJlcXVpcmUgMTAgU05UIEdvZXJsaSB0byB1c2UYASIHI2VhYjcwMAM=#zQ3shUeGnhM33QW4g9JfYfeLFAH9ZwbDboNYn5exCR7S3ii1y":
-                "SNT community",
-            "status.app://c/G0UAAMTyNsn2QZDEG0EXftOl8pOEfwEBOOSA_YTfIk85xmADDgINGmxpUHAXzK36bN0fK42Xf4YD2yjPk1z2pbFwFw==#zQ3sheoNX5kiuM393TJ6xDnL57aQoiwFWEuJnazJ6W2eNuh9u":
-                "open community",
-            "status.app://c/G00AAGS9TbI9mSR-ZNmFrhRjNuEeXAAbcAIUaLLJyjMOG3ACJQ12oIHD78QhzO9s_T5bUeU7rnATWJg3mGgTUemrAg==#zQ3shp9f5M3uyMpwTi3rFpFrP6WCWmNsW9pgK9cjXVTaf2vgj":
-                "closed community"
+            snt_community_name: snt_community_url.replace(old, new),
+            self.open_community_name: self.open_community_url.replace(old, new),
+            closed_community_name: closed_community_url.replace(old, new)
         }
-        for link, text in community_links.items():
+        for text, link in community_links.items():
             self.channel.just_fyi("Opening community '%s' by the link %s" % (text, link))
             self.browser_view.open_url(link)
-            if text == 'SNT community':
+            if text == snt_community_name:
                 if self.community_view.community_title.text != text:
                     self.errors.append("Community '%s' was not requested to join by the deep link %s" % (text, link))
             else:
                 if not self.community_view.join_button.is_element_displayed(
                         10) or self.community_view.community_title.text != text:
                     self.errors.append("Community '%s' was not requested to join by the deep link %s" % (text, link))
-            if text != "closed community":  # the last one
+            if text != closed_community_name:  # the last one
                 self.home.navigate_back_to_home_view()
                 self.home.browser_tab.click()
 

test/appium/tests/critical/test_wallet.py

@@ -135,11 +135,14 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
 
         self.wallet_1.just_fyi("Sending funds from wallet")
         amount_to_send = 0.0001
+        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)
+        self.network_api.wait_for_confirmation_of_transaction(address=self.sender['wallet_address'],
+                                                              tx_time=device_time_before_sending)
 
-        device_time = self.wallet_1.driver.device_time
+        device_time_after_sending = self.wallet_1.driver.device_time
 
         self._check_balances_after_tx(amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
                                       eth_amount_receiver)
@@ -164,10 +167,13 @@ class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
 
         self.wallet_1.just_fyi("Sending asset from drawer")
         amount_to_send = 0.0001
+        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)
-        device_time = self.wallet_1.driver.device_time
+        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
 
         self._check_balances_after_tx(amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
                                       eth_amount_receiver)

test/appium/views/chat_view.py

@@ -372,7 +372,7 @@ class CommunityView(HomeView):
         self.community_create_a_channel_button = Button(self.driver, accessibility_id="community-create-channel")
         self.channel_name_edit_box = EditBox(self.driver, translation_id="name-your-channel-placeholder")
         self.channel_descripton = ChatView(self.driver).community_description_edit_box
-        self.community_options_button = Button(self.driver, accessibility_id="community-menu-button")
+        self.community_options_button = Button(self.driver, accessibility_id="community-options-for-community")
         self.view_members_button = Button(self.driver, accessibility_id="view-members")
         self.community_info_button = Button(self.driver, translation_id="community-info")
         self.invite_button = Button(self.driver, accessibility_id="community-invite-people")
@@ -455,11 +455,10 @@ class CommunityView(HomeView):
     def copy_community_link(self):
         self.driver.info("Copy community link")
         self.community_options_button.click()
-        self.community_info_button.click()
-        self.element_starts_with_text('join.status.im/c/').click()
-        community_link_text = self.element_starts_with_text('join.status.im/c/').text
-        self.home_button.double_click()
-        return 'https://%s' % community_link_text
+        self.share_community_button.click()
+        text = self.sharing_text_native.text
+        self.click_system_back_button(times=2)
+        return text
 
     def handle_membership_request(self, username: str, approve=True):
         self.driver.info("Handling membership request of user '%s', approve='%s'" % (username, str(approve)))

test/appium/views/profile_view.py

@@ -290,8 +290,11 @@ class ProfileView(BaseView):
         self.advertise_device_button = Button(self.driver, accessibility_id="advertise-device")
         self.sync_all_button = Button(self.driver, translation_id="sync-all-devices")
         self.syncing_button = Button(self.driver, accessibility_id="icon, Syncing, label-component, icon")
-        self.sync_plus_button = Button(self.driver,
-                                       xpath="//*[@text='Syncing']/following-sibling::android.view.ViewGroup[1]")
+        self.paired_devices_button = Button(self.driver,
+                                            accessibility_id="icon, Paired devices, 0 devices, label-component, icon")
+        self.sync_plus_button = Button(
+            self.driver,
+            xpath="//*[@text='Paired devices']/following-sibling::android.view.ViewGroup[@content-desc='icon']")
 
         # Keycard
         self.keycard_button = Button(self.driver, accessibility_id="keycard-button")
@@ -539,6 +542,7 @@ class ProfileView(BaseView):
 
     def get_sync_code(self):
         self.syncing_button.scroll_and_click()
+        self.paired_devices_button.click()
         self.sync_plus_button.click()
         for checkbox in Button(
                 self.driver,

test/appium/views/sign_in_view.py

@@ -149,8 +149,6 @@ class SignInView(BaseView):
         # intro screen
         self.i_m_new_in_status_button = Button(self.driver, accessibility_id="new-to-status-button")
 
-        self.terms_and_privacy_checkbox = Button(
-            self.driver, xpath="//*[@content-desc='terms-privacy-checkbox-container']/*[@content-desc='checkbox-off']")
         self.create_profile_button = Button(self.driver, accessibility_id='new-to-status-button')
         self.not_now_button = Button(self.driver, xpath="//*[@text='Not now']")
         self.sync_or_recover_profile_button = Button(self.driver, accessibility_id='already-use-status-button')
@@ -238,7 +236,6 @@ class SignInView(BaseView):
         self.driver.info("## Creating new multiaccount (password:'%s', keycard:'%s', enable_notification: '%s')" %
                          (password, str(keycard), str(enable_notifications)), device=False)
         if first_user:
-            self.terms_and_privacy_checkbox.click()
             self.create_profile_button.click_until_presence_of_element(self.generate_keys_button)
             self.not_now_button.wait_and_click()
         else:
@@ -263,11 +260,15 @@ class SignInView(BaseView):
         #     self.next_button.click()
         # self.identifiers_button.wait_and_click(30)
         if enable_notifications:
-            self.enable_notifications_button.click_until_presence_of_element(self.start_button)
-            if self.allow_button.is_element_displayed():
-                self.allow_button.click()
+            self.enable_notifications_button.wait_and_click()
+            for _ in range(3):
+                self.allow_button.click_if_shown(sec=10)
+                self.enable_notifications_button.click_if_shown()
+                if self.start_button.is_element_displayed():
+                    break
         else:
             self.maybe_later_button.click_until_presence_of_element(self.start_button)
+        self.cancel_button.click_if_shown()  # TODO: remove when issue 20806 is fixed
         self.start_button.click()
         self.chats_tab.wait_for_visibility_of_element(30)
         self.driver.info("## New multiaccount is created successfully!", device=False)
@@ -278,7 +279,6 @@ class SignInView(BaseView):
         self.driver.info("## Recover access(password:%s, keycard:%s)" % (password, str(keycard)), device=False)
 
         if not second_user:
-            self.terms_and_privacy_checkbox.click()
             self.sync_or_recover_profile_button.click_until_presence_of_element(self.generate_keys_button)
             self.not_now_button.wait_and_click()
         else:
@@ -297,6 +297,7 @@ class SignInView(BaseView):
             self.enable_notifications_button.click_until_presence_of_element(self.start_button)
         else:
             self.maybe_later_button.click_until_presence_of_element(self.start_button)
+        self.cancel_button.click_if_shown()  # TODO: remove when issue 20806 is fixed
         self.start_button.click()
         self.chats_tab.wait_for_visibility_of_element(30)
         self.driver.info("## Multiaccount is recovered successfully!", device=False)

test/appium/views/wallet_view.py

@@ -1,3 +1,5 @@
+import time
+
 import pytest
 
 from tests import common_password
@@ -120,7 +122,12 @@ class WalletView(BaseView):
         self.login_button.click()
 
     def confirm_transaction(self):
-        self.confirm_button.click_until_presence_of_element(self.slide_button_track)
+        self.confirm_button.click()
+        for _ in range(3):
+            if self.slide_button_track.is_element_displayed():
+                break
+            time.sleep(1)
+            self.confirm_button.click()
         self.slide_and_confirm_with_password()
 
     def set_amount(self, amount: float):
@@ -160,7 +167,6 @@ class WalletView(BaseView):
         self.add_account_button.click()
         self.add_account_to_watch.click()
         self.address_to_watch_input.send_keys(address)
-        self.account_has_activity_label.wait_for_visibility_of_element()
         self.add_account_continue_button.click()
         SignInView(self.driver).profile_title_input.send_keys(account_name)
         self.add_watched_address_button.click()

translations/en.json

@@ -186,7 +186,6 @@
   "balance": "Balance",
   "begin-set-up": "Begin setup",
   "below-base-fee": "max fee below base fee",
-  "beta": "Beta",
   "bio": "Bio",
   "bio-added": "Bio added",
   "bio-is-too-long": "Bio is too long",
@@ -1175,7 +1174,6 @@
   "intro-message1": "Welcome to Status!\nTap this message to set your password and get started.",
   "intro-privacy-policy-note1": "Status does not collect or profit from your personal data. By continuing, you agree with the ",
   "intro-privacy-policy-note2": "privacy policy",
-  "intro-privacy-statement": "Privacy Statement",
   "intro-text": "Status is your gateway to the decentralized web",
   "intro-text1": "Chat over a peer-to-peer, encrypted network where messages can’t be censored or hacked",
   "intro-text2": "Send and receive digital assets anywhere in the world—no bank account required",