Add caching of token amounts

https://github.com/status-im/status-go/compare/1f7816dd...022b6fd4

Makefile

@@ -436,11 +436,10 @@ 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:$(RCT_METRO_PORT) tcp:$(RCT_METRO_PORT) && \
+	adb reverse tcp:8081 tcp:8081 && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
 	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \

VERSION

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

modules/react-native-status/android/src/main/java/im/status/ethereum/module/NetworkManager.kt

@@ -36,6 +36,11 @@ class NetworkManager(private val reactContext: ReactApplicationContext) : ReactC
     @ReactMethod
     fun inputConnectionStringForBootstrapping(connectionString: String, configJSON: String, callback: Callback) {
         val jsonConfig = JSONObject(configJSON)
+        val receiverConfig = jsonConfig.getJSONObject("receiverConfig")
+        val keyStorePath = utils.pathCombine(utils.getNoBackupDirectory(), "/keystore")
+        receiverConfig.put("keystorePath", keyStorePath)
+        receiverConfig.getJSONObject("nodeConfig").put("rootDataDir", utils.getNoBackupDirectory())
+
         utils.executeRunnableStatusGoMethod(
             { Statusgo.inputConnectionStringForBootstrapping(connectionString, jsonConfig.toString()) },
             callback

modules/react-native-status/ios/RCTStatus/NetworkManager.m

@@ -35,7 +35,21 @@ RCT_EXPORT_METHOD(inputConnectionStringForBootstrapping:(NSString *)cs
         configJSON:(NSString *)configJSON
         callback:(RCTResponseSenderBlock)callback) {
 
-    NSString *result = StatusgoInputConnectionStringForBootstrapping(cs, configJSON);
+    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *error;
+    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
+    NSMutableDictionary *receiverConfig = configDict[@"receiverConfig"];
+    NSMutableDictionary *nodeConfig = receiverConfig[@"nodeConfig"];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
+    NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
+    NSString *keystoreDir = multiaccountKeystoreDir.path;
+    NSString *rootDataDir = rootUrl.path;
+
+    [receiverConfig setValue:keystoreDir forKey:@"keystorePath"];
+    [nodeConfig setValue:rootDataDir forKey:@"rootDataDir"];
+    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];
+    NSString *result = StatusgoInputConnectionStringForBootstrapping(cs, modifiedConfigJSON);
     callback(@[result]);
 }
 

nix/mobile/android/build.nix

@@ -17,7 +17,6 @@
   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
@@ -159,7 +158,6 @@ in stdenv.mkDerivation rec {
       --no-build-cache \
       --parallel \
       -Dmaven.repo.local='${deps.gradle}' \
-      -PreactNativeDevServerPort=${toString reactMetroPort} \
       assemble${gradleBuildType}
     '';
   in

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 --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
+if pgrep -f 'react-native start' > /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 --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
+if pgrep -f 'react-native start' > /dev/null; then
     echo "Info: metro is already running in another terminal"
 else
     echo "Info: starting a new metro terminal"
-    react-native start --port=${RCT_METRO_PORT:-8081} --reset-cache
+    react-native start --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:"${RCT_METRO_PORT:-8081}" &> /dev/null; then
+  if ! lsof -i:8081 &> /dev/null; then
     echo "."
     sleep 1
     ((TIMEOUT--))

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

@@ -21,7 +21,7 @@
                 :padding-bottom 2}}
        [quo/tag
         {:accessibility-label :communities-chat-beta-tag
-         :size                24
+         :size                32
          :type                :label
          :label               (i18n/label :t/beta)
          :labelled?           true

src/status_im/config.cljs

@@ -123,6 +123,8 @@
    :waku.test
    ["enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im"]})
 
+(def default-kdf-iterations 3200)
+
 (def community-accounts-selection-enabled? true)
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
 (def test-networks-enabled? (enabled? (get-config :TEST_NETWORKS_ENABLED "0")))

src/status_im/contexts/chat/messenger/messages/content/sticker_message/view.cljs

@@ -1,15 +1,10 @@
 (ns status-im.contexts.chat.messenger.messages.content.sticker-message.view
   (:require [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]
-            [oops.core :as  oops]))
+            [react-native.fast-image :as fast-image]))
 
 (defn view
   [{:keys [url]}]
   [rn/view {:style {:margin-top 6 :margin-bottom 4}}
-   (print "------------ parvesh" url)
-   [rn/image
+   [fast-image/fast-image
     {:style  {:width 120 :height 120}
-     :on-error (fn [e]
-                 (print "------ parvesh error"
-                        (oops/oget e "nativeEvent.error")))
      :source {:uri (str url "&download=true")}}]])

src/status_im/contexts/profile/config.cljs

@@ -12,10 +12,10 @@
    :wakuV2Nameserver              "8.8.8.8"
    :statusProxyEnabled            config/status-proxy-enabled?
    :statusProxyStageName          config/status-proxy-stage-name
-   :statusProxyMarketUser         config/STATUS_BUILD_PROXY_USER
-   :statusProxyMarketPassword     config/STATUS_BUILD_PROXY_PASSWORD
-   :statusProxyBlockchainUser     config/STATUS_BUILD_PROXY_USER
-   :statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD
+   :statusProxyMarketUser         "test"
+   :statusProxyMarketPassword     "test"
+   :statusProxyBlockchainUser     "test"
+   :statusProxyBlockchainPassword "test"
    :openseaAPIKey                 config/opensea-api-key
    :poktToken                     config/POKT_TOKEN
    :infuraToken                   config/INFURA_TOKEN

src/status_im/contexts/syncing/events.cljs

@@ -3,8 +3,8 @@
     [clojure.string :as string]
     [native-module.core :as native-module]
     [react-native.platform :as platform]
+    [status-im.config :as config]
     [status-im.constants :as constants]
-    [status-im.contexts.profile.config :as profile.config]
     [status-im.contexts.syncing.utils :as sync-utils]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
@@ -21,6 +21,26 @@
   {:events [:syncing/clear-states]}
   [{:keys [db]} role]
   {:db (dissoc db :syncing)})
+
+(defn- get-default-node-config
+  []
+  (let [log-level  config/log-level
+        log-config (if (empty? log-level)
+                     {:LogLevel "ERROR" :LogEnabled false}
+                     {:LogLevel log-level :LogEnabled true})]
+    (merge {:WalletConfig (cond-> {:Enabled true}
+                            (not= config/opensea-api-key "")
+                            (assoc :OpenseaAPIKey config/opensea-api-key))
+            :WakuV2Config {;; Temporary fix until https://github.com/status-im/status-go/issues/3024
+                           ;; is resolved
+                           :Nameserver  "8.8.8.8"
+                           :LightClient true}
+            :ShhextConfig {:VerifyTransactionURL     config/verify-transaction-url
+                           :VerifyENSURL             config/verify-ens-url
+                           :VerifyENSContractAddress config/verify-ens-contract-address
+                           :VerifyTransactionChainID config/verify-transaction-chain-id}}
+           log-config)))
+
 (defn- input-connection-string-callback
   [res]
   (log/info "[local-pairing] input-connection-string-for-bootstrapping callback"
@@ -49,15 +69,24 @@
 (rf/defn initiate-local-pairing-with-connection-string
   {:events [:syncing/input-connection-string-for-bootstrapping]}
   [{:keys [db]} connection-string]
-  (let [config-map (.stringify js/JSON
-                               (clj->js
-                                {:receiverConfig
-                                 {:createAccount (profile.config/create)}}))]
-    (rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
-    (native-module/input-connection-string-for-bootstrapping
-     connection-string
-     config-map
-     input-connection-string-callback)))
+  (let [default-node-config-string (.stringify js/JSON (clj->js (get-default-node-config)))
+        callback
+        (fn [final-node-config]
+          (let [config-map (.stringify js/JSON
+                                       (clj->js
+                                        {:receiverConfig
+                                         {:kdfIterations config/default-kdf-iterations
+                                          :nodeConfig final-node-config
+                                          :settingCurrentNetwork config/default-network
+                                          :deviceType platform/os
+                                          :deviceName
+                                          (native-module/get-installation-name)}}))]
+            (rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
+            (native-module/input-connection-string-for-bootstrapping
+             connection-string
+             config-map
+             input-connection-string-callback)))]
+    (native-module/prepare-dir-and-update-config "" default-node-config-string callback)))
 
 (rf/defn preparations-for-connection-string
   {:events [:syncing/get-connection-string]}

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

@@ -7,6 +7,7 @@
             [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 #" ")))
@@ -66,16 +67,20 @@
 (defn get-standard-crypto-format
   "For full details: https://github.com/status-im/status-mobile/issues/18225"
   [{:keys [market-values-per-currency]} token-units]
-  (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))))))
+  (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))))))
 
 (defn get-market-value
   [currency {:keys [market-values-per-currency]}]

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

@@ -64,6 +64,11 @@
       (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}

status-go-version.json

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

test/appium/support/api/network_api.py

@@ -1,13 +1,11 @@
 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
 
@@ -40,7 +38,7 @@ class NetworkApi:
         return self.send_etherscan_request(params)
 
     def get_transactions(self, address: str) -> List[dict]:
-        params = {'module': 'account', 'action': 'txlist', 'address': address, 'page': 1, 'offset': 10, 'sort': 'desc'}
+        params = {'module': 'account', 'action': 'txlist', 'address': address, 'sort': 'desc'}
         return self.send_etherscan_request(params)
 
     def is_transaction_successful(self, transaction_hash: str) -> int:
@@ -108,28 +106,22 @@ class NetworkApi:
                     self.log("Failed iterate transactions(Etherscan unexpected error): " + str(e))
                     continue
 
-    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)
+    def wait_for_confirmation_of_transaction(self, address, amount, confirmations=6, token=False):
         start_time = time.time()
         if token:
             token_info = "token transaction"
         else:
             token_info = "ETH transaction"
-        self.log('Waiting for %s of %s to have %s confirmations' % (token_info, address, confirmations))
+        self.log('Waiting %s %s for %s to have %s confirmations' % (amount, token_info, address, confirmations))
         while round(time.time() - start_time, ndigits=2) < 600:  # should be < idleTimeout capability
-            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)
+            transaction = self.find_transaction_by_unique_amount(address, amount, token)
             self.log(
                 'Expected amount of confirmations is %s, in fact %s' % (confirmations, transaction['confirmations']))
-        pytest.fail('The last transaction was not confirmed, address is %s, still has %s confirmations' % (
-            address, int(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'])))
 
     def verify_balance_is_updated(self, initial_balance, recipient_address, wait_time=360):
         counter = 0
@@ -150,7 +142,7 @@ class NetworkApi:
             balance = round(self.get_balance(address), 4)
             if balance == expected_balance:
                 return
-            time.sleep(20)
+            time.sleep(10)
         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,14 +17,13 @@ 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.open_community_name = "open community"
+        self.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.open_community_name, community=True).click()
+        self.home.get_chat(self.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)
@@ -40,6 +39,7 @@ 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,10 +47,34 @@ 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_profile(self):
+    def test_links_deep_links(self):
         self.home.navigate_back_to_home_view()
         self.home.browser_tab.click()
 
@@ -63,6 +87,7 @@ 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:])
@@ -72,43 +97,25 @@ 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 = {
-            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)
+            "status.app://c/ixyACjgKDVNOVCBjb21tdW5pdHkSHHJlcXVpcmUgMTAgU05UIEdvZXJsaSB0byB1c2UYASIHI2VhYjcwMAM=#zQ3shUeGnhM33QW4g9JfYfeLFAH9ZwbDboNYn5exCR7S3ii1y":
+                "SNT community",
+            "status.app://c/G0UAAMTyNsn2QZDEG0EXftOl8pOEfwEBOOSA_YTfIk85xmADDgINGmxpUHAXzK36bN0fK42Xf4YD2yjPk1z2pbFwFw==#zQ3sheoNX5kiuM393TJ6xDnL57aQoiwFWEuJnazJ6W2eNuh9u":
+                "open community",
+            "status.app://c/G00AAGS9TbI9mSR-ZNmFrhRjNuEeXAAbcAIUaLLJyjMOG3ACJQ12oIHD78QhzO9s_T5bUeU7rnATWJg3mGgTUemrAg==#zQ3shp9f5M3uyMpwTi3rFpFrP6WCWmNsW9pgK9cjXVTaf2vgj":
+                "closed community"
         }
-        for text, link in community_links.items():
+        for link, text 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_name:
+            if text == 'SNT community':
                 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_name:  # the last one
+            if text != "closed community":  # the last one
                 self.home.navigate_back_to_home_view()
                 self.home.browser_tab.click()
 

test/appium/tests/critical/test_wallet.py

@@ -135,14 +135,11 @@ 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_after_sending = self.wallet_1.driver.device_time
+        device_time = self.wallet_1.driver.device_time
 
         self._check_balances_after_tx(amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
                                       eth_amount_receiver)
@@ -167,13 +164,10 @@ 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)
-        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
+        device_time = 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-options-for-community")
+        self.community_options_button = Button(self.driver, accessibility_id="community-menu-button")
         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,10 +455,11 @@ class CommunityView(HomeView):
     def copy_community_link(self):
         self.driver.info("Copy community link")
         self.community_options_button.click()
-        self.share_community_button.click()
-        text = self.sharing_text_native.text
-        self.click_system_back_button(times=2)
-        return text
+        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
 
     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,11 +290,8 @@ 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.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']")
+        self.sync_plus_button = Button(self.driver,
+                                       xpath="//*[@text='Syncing']/following-sibling::android.view.ViewGroup[1]")
 
         # Keycard
         self.keycard_button = Button(self.driver, accessibility_id="keycard-button")
@@ -542,7 +539,6 @@ 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

@@ -263,15 +263,11 @@ class SignInView(BaseView):
         #     self.next_button.click()
         # self.identifiers_button.wait_and_click(30)
         if enable_notifications:
-            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
+            self.enable_notifications_button.click_until_presence_of_element(self.start_button)
+            if self.allow_button.is_element_displayed():
+                self.allow_button.click()
         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)
@@ -301,7 +297,6 @@ 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,5 +1,3 @@
-import time
-
 import pytest
 
 from tests import common_password
@@ -122,12 +120,7 @@ class WalletView(BaseView):
         self.login_button.click()
 
     def confirm_transaction(self):
-        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.confirm_button.click_until_presence_of_element(self.slide_button_track)
         self.slide_and_confirm_with_password()
 
     def set_amount(self, amount: float):
@@ -167,6 +160,7 @@ 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()