Add caching of token amounts

https://github.com/status-im/status-go/compare/1f7816dd...022b6fd4
Check price is nil
2024-08-16 13:31:50 +01:00 · 2024-08-16 12:56:05 +01:00 · 2024-08-16 12:55:22 +01:00 · 2024-08-15 15:57:06 +01:00 · 2024-08-15 12:52:40 +01:00 · 2024-08-15 08:29:08 +01:00
57 changed files with 928 additions and 766 deletions
@@ -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) && \
@@ -1 +1 @@
-2.29.0
+2.30.0
@@ -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
@@ -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]);
 }

@@ -50,14 +50,14 @@ androidx.core:core:1.9.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
-androidx.databinding:databinding-common:3.5.4
+androidx.databinding:databinding-common:3.5.3
 androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
 androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
 androidx.databinding:databinding-common:8.1.1
 androidx.databinding:databinding-compiler-common:3.2.1
-androidx.databinding:databinding-compiler-common:3.5.4
+androidx.databinding:databinding-compiler-common:3.5.3
 androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
@@ -151,6 +151,7 @@ commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.1.1
 commons-logging:commons-logging:1.2
+com.adarshr:gradle-test-logger-plugin:2.0.0
 com.adobe.xmp:xmpcore:6.1.11
 com.afollestad.material-dialogs:commons:0.9.6.0
 com.afollestad.material-dialogs:core:0.9.6.0
@@ -159,7 +160,7 @@ com.almworks.sqlite4java:sqlite4java:1.0.392
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.1
 com.android.databinding:baseLibrary:3.2.1
-com.android.databinding:baseLibrary:3.5.4
+com.android.databinding:baseLibrary:3.5.3
 com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
@@ -168,7 +169,7 @@ com.android.databinding:baseLibrary:8.1.1
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.1
 com.android.tools.analytics-library:crash:26.2.1
-com.android.tools.analytics-library:crash:26.5.4
+com.android.tools.analytics-library:crash:26.5.3
 com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
@@ -176,7 +177,7 @@ com.android.tools.analytics-library:crash:30.3.1
 com.android.tools.analytics-library:crash:31.1.1
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
-com.android.tools.analytics-library:protos:26.5.4
+com.android.tools.analytics-library:protos:26.5.3
 com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
@@ -184,7 +185,7 @@ com.android.tools.analytics-library:protos:30.3.1
 com.android.tools.analytics-library:protos:31.1.1
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
-com.android.tools.analytics-library:shared:26.5.4
+com.android.tools.analytics-library:shared:26.5.3
 com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
@@ -192,7 +193,7 @@ com.android.tools.analytics-library:shared:30.3.1
 com.android.tools.analytics-library:shared:31.1.1
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
-com.android.tools.analytics-library:tracker:26.5.4
+com.android.tools.analytics-library:tracker:26.5.3
 com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
@@ -221,14 +222,14 @@ com.android.tools.build:aaptcompiler:7.3.1
 com.android.tools.build:aaptcompiler:8.1.1
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
-com.android.tools.build:apksig:3.5.4
+com.android.tools.build:apksig:3.5.3
 com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
 com.android.tools.build:apksig:7.2.1
 com.android.tools.build:apksig:7.3.1
 com.android.tools.build:apksig:8.1.1
 com.android.tools.build:apkzlib:3.2.1
-com.android.tools.build:apkzlib:3.5.4
+com.android.tools.build:apkzlib:3.5.3
 com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
@@ -238,7 +239,7 @@ com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.1
 com.android.tools.build:builder-model:3.2.1
-com.android.tools.build:builder-model:3.5.4
+com.android.tools.build:builder-model:3.5.3
 com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
@@ -248,7 +249,7 @@ com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.1
 com.android.tools.build:builder-test-api:3.2.1
-com.android.tools.build:builder-test-api:3.5.4
+com.android.tools.build:builder-test-api:3.5.3
 com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
@@ -258,7 +259,7 @@ com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.1
 com.android.tools.build:builder:3.2.1
-com.android.tools.build:builder:3.5.4
+com.android.tools.build:builder:3.5.3
 com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
@@ -273,7 +274,7 @@ com.android.tools.build:bundletool:1.9.0
 com.android.tools.build:bundletool:1.14.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
-com.android.tools.build:gradle-api:3.5.4
+com.android.tools.build:gradle-api:3.5.3
 com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
@@ -287,7 +288,7 @@ com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.1
 com.android.tools.build:gradle:3.2.1
-com.android.tools.build:gradle:3.5.4
+com.android.tools.build:gradle:3.5.3
 com.android.tools.build:gradle:4.1.0
 com.android.tools.build:gradle:7.0.4
 com.android.tools.build:gradle:7.2.1
@@ -296,7 +297,7 @@ com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.1
 com.android.tools.build:manifest-merger:26.2.1
-com.android.tools.build:manifest-merger:26.5.4
+com.android.tools.build:manifest-merger:26.5.3
 com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
@@ -308,7 +309,7 @@ com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.1
 com.android.tools.ddms:ddmlib:26.2.1
-com.android.tools.ddms:ddmlib:26.5.4
+com.android.tools.ddms:ddmlib:26.5.3
 com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
@@ -323,7 +324,7 @@ com.android.tools.layoutlib:layoutlib-api:24.3.1
 com.android.tools.layoutlib:layoutlib-api:24.5.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
 com.android.tools.layoutlib:layoutlib-api:26.2.1
-com.android.tools.layoutlib:layoutlib-api:26.5.4
+com.android.tools.layoutlib:layoutlib-api:26.5.3
 com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
@@ -336,7 +337,7 @@ com.android.tools.lint:lint-checks:24.3.1
 com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-gradle-api:26.2.1
-com.android.tools.lint:lint-gradle-api:26.5.4
+com.android.tools.lint:lint-gradle-api:26.5.3
 com.android.tools.lint:lint-gradle-api:27.1.0
 com.android.tools.lint:lint-model:27.1.0
 com.android.tools.lint:lint-model:30.0.4
@@ -377,7 +378,7 @@ com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.1
 com.android.tools:annotations:26.2.1
-com.android.tools:annotations:26.5.4
+com.android.tools:annotations:26.5.3
 com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
@@ -387,7 +388,7 @@ com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.1
 com.android.tools:common:26.2.1
-com.android.tools:common:26.5.4
+com.android.tools:common:26.5.3
 com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
@@ -397,7 +398,7 @@ com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.1
 com.android.tools:dvlib:26.2.1
-com.android.tools:dvlib:26.5.4
+com.android.tools:dvlib:26.5.3
 com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
@@ -405,7 +406,7 @@ com.android.tools:dvlib:30.3.1
 com.android.tools:dvlib:31.1.1
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
-com.android.tools:repository:26.5.4
+com.android.tools:repository:26.5.3
 com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
@@ -415,7 +416,7 @@ com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.1
 com.android.tools:sdklib:26.2.1
-com.android.tools:sdklib:26.5.4
+com.android.tools:sdklib:26.5.3
 com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
@@ -425,7 +426,7 @@ com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.1
 com.android.tools:sdk-common:26.2.1
-com.android.tools:sdk-common:26.5.4
+com.android.tools:sdk-common:26.5.3
 com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
@@ -495,7 +496,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.1
 com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1
 com.fasterxml.woodstox:woodstox-core:6.2.1
-com.github.Dimezis:BlurView:version-2.0.4
+com.github.Dimezis:BlurView:version-2.0.3
 com.github.bumptech.glide:annotations:4.12.0
 com.github.bumptech.glide:compiler:4.12.0
 com.github.bumptech.glide:disklrucache:4.12.0
@@ -733,6 +734,7 @@ org.eclipse.jdt.core.compiler:ecj:4.4.2
 org.eclipse.jdt.core.compiler:ecj:4.6.1
 org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r
 org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r
+org.fusesource.jansi:jansi:1.18
 org.glassfish.jaxb:jaxb-core:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.3.1
@@ -923,5 +925,4 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
 com.android.tools.build:gradle:3.5.4
 androidx.annotation:annotation:1.6.0
 androidx.annotation:annotation-jvm:1.6.0
-com.github.Dimezis:BlurView:version-2.0.4
 com.facebook.react:hermes-android:0.73.5
@@ -68,6 +68,7 @@ https://dl.google.com/dl/android/maven2/androidx/core/core/1.9.0/core-1.9.0.pom
 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.3/databinding-common-3.5.3.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.4/databinding-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/4.1.0/databinding-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom
@@ -75,6 +76,7 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.1/databinding-common-7.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/8.1.1/databinding-common-8.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.3/databinding-compiler-common-3.5.3.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.4/databinding-compiler-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/4.1.0/databinding-compiler-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom
@@ -180,6 +182,7 @@ https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0/comm
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/runtime-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.3/baseLibrary-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom
@@ -213,6 +216,7 @@ https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.0.2/su
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/26.0.2/support-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/27.0.1/support-vector-drawable-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.2.1/crash-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.3/crash-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.4/crash-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom
@@ -221,6 +225,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/31.1.1/crash-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.3/protos-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom
@@ -229,6 +234,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/31.1.1/protos-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.3/shared-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom
@@ -237,6 +243,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/31.1.1/shared-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.3/tracker-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom
@@ -245,6 +252,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/31.1.1/tracker-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.3/annotations-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom
@@ -269,6 +277,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/8.1.1/aaptcompiler-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.3/apksig-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apksig-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom
@@ -276,6 +285,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.1/apksig-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/8.1.1/apksig-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.3/apkzlib-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/apkzlib-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom
@@ -284,6 +294,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.1/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/8.1.1/apkzlib-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.3/builder-model-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom
@@ -292,6 +303,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/8.1.1/builder-model-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.3/builder-test-api-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom
@@ -300,6 +312,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/8.1.1/builder-test-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.3/builder-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom
@@ -315,6 +328,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.9.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.14.0/bundletool-1.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.3/gradle-api-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom
@@ -325,6 +339,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-api/8.1.1/gradle-settings-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.3/gradle-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gradle-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom
@@ -341,6 +356,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifie
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta10/jetifier-processor-1.0.0-beta10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.3/manifest-merger-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom
@@ -349,6 +365,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/31.1.1/manifest-merger-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.3/common-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom
@@ -357,6 +374,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.1/common-3
 https://dl.google.com/dl/android/maven2/com/android/tools/common/31.1.1/common-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.3/ddmlib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom
@@ -365,6 +383,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.1/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/31.1.1/ddmlib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.3/dvlib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom
@@ -378,6 +397,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/31.1.1/uast-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.3/layoutlib-api-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/27.1.0/layoutlib-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom
@@ -389,6 +409,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/31.1.1/l
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/31.1.1/lint-checks-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.3/lint-gradle-api-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/31.1.1/lint-gradle-31.1.1.pom
@@ -405,6 +426,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/31.1.1/lint-
 https://dl.google.com/dl/android/maven2/com/android/tools/play-sdk-proto/31.1.1/play-sdk-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.3/repository-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom
@@ -413,6 +435,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.1/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/31.1.1/repository-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.3/sdklib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom
@@ -421,6 +444,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.1/sdklib-3
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/31.1.1/sdklib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.3/sdk-common-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom
@@ -463,13 +487,14 @@ https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha07/core-proto-0.0.8-alpha07.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha08/core-proto-0.0.8-alpha08.pom
 https://dl.google.com/dl/android/maven2/com/google/test/platform/core-proto/0.0.2-dev/core-proto-0.0.2-dev.pom
-https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.4/BlurView-version-2.0.4.pom
+https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.3/BlurView-version-2.0.3.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/android/3.1.1/android-3.1.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1.pom
 https://jitpack.io/com/github/wix-playground/ahbottomnavigation/3.3.0/ahbottomnavigation-3.3.0.pom
 https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animator-1.0.6.pom
 https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom
+https://plugins.gradle.org/m2/com/adarshr/gradle-test-logger-plugin/2.0.0/gradle-test-logger-plugin-2.0.0.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver-convention/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.5.0/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-0.5.0.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver/0.5.0/foojay-resolver-0.5.0.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.1/antlr-2.7.1.pom
@@ -484,7 +509,7 @@ https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.po
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
-https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.4/commons-logging-1.3.4.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.3/commons-logging-1.3.3.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
@@ -668,7 +693,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.0/error_prone_annotations-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.30.0/error_prone_annotations-2.30.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.29.2/error_prone_annotations-2.29.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -681,7 +706,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.0/error_prone_parent-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.30.0/error_prone_parent-2.30.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.29.2/error_prone_parent-2.29.2.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -698,8 +723,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.0-jre/guava-parent-33.3.0-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.3.0-jre/guava-testlib-33.3.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.2.1-jre/guava-parent-33.2.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.2.1-jre/guava-testlib-33.2.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -712,7 +737,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.0-jre/guava-33.3.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.2.1-jre/guava-33.2.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -726,7 +751,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.17.2/protobuf-bom-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.2/protobuf-bom-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.3/protobuf-bom-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.28.0-RC2/protobuf-bom-4.28.0-RC2.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.28.0-RC1/protobuf-bom-4.28.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -743,7 +768,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/pr
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.17.2/protobuf-java-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.28.0-RC2/protobuf-java-4.28.0-RC2.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.28.0-RC1/protobuf-java-4.28.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -754,7 +779,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.2/protobuf-parent-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.3/protobuf-parent-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.28.0-RC2/protobuf-parent-4.28.0-RC2.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.28.0-RC1/protobuf-parent-4.28.0-RC1.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.4/truth-parent-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/core/3.4.1/core-3.4.1.pom
@@ -929,11 +954,11 @@ https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.15/byte
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.15/byte-buddy-parent-1.14.15.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.18/byte-buddy-parent-1.14.18.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.17/byte-buddy-parent-1.14.17.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.15/byte-buddy-1.14.15.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.18/byte-buddy-1.14.18.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.17/byte-buddy-1.14.17.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -957,8 +982,8 @@ https://repo.maven.apache.org/maven2/org/abego/treelayout/org.abego.treelayout.c
 https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.pom
 https://repo.maven.apache.org/maven2/org/antlr/ST4/4.3.4/ST4-4.3.4.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5.3.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.13.2/antlr4-master-4.13.2.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.13.2/antlr4-runtime-4.13.2.pom
+https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.13.1/antlr4-master-4.13.1.pom
+https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.3/antlr-master-3.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.5.2/antlr-master-3.5.2.pom
@@ -979,7 +1004,6 @@ https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
-https://repo.maven.apache.org/maven2/org/apache/apache/33/apache-33.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.pom
@@ -1000,7 +1024,6 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/71/commons-parent-71.pom
-https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/72/commons-parent-72.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1055,7 +1078,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.46.0/checker-qual-3.46.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.45.0/checker-qual-3.45.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
@@ -1078,8 +1101,8 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/84/mojo-paren
 https://repo.maven.apache.org/maven2/org/codehaus/woodstox/stax2-api/4.2.1/stax2-api-4.2.1.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
-https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.4.0/easymock-parent-5.4.0.pom
-https://repo.maven.apache.org/maven2/org/easymock/easymock/5.4.0/easymock-5.4.0.pom
+https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.3.0/easymock-parent-5.3.0.pom
+https://repo.maven.apache.org/maven2/org/easymock/easymock/5.3.0/easymock-5.3.0.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.2/angus-activation-project-2.0.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.2/angus-activation-2.0.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.2/project-1.0.2.pom
@@ -1093,6 +1116,9 @@ https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/5.
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/5.13.1.202206130422-r/org.eclipse.jgit-parent-5.13.1.202206130422-r.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.0.202109080827-r/org.eclipse.jgit-5.13.0.202109080827-r.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.1.202206130422-r/org.eclipse.jgit-5.13.1.202206130422-r.pom
+https://repo.maven.apache.org/maven2/org/fusesource/fusesource-pom/1.11/fusesource-pom-1.11.pom
+https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-project/1.18/jansi-project-1.18.pom
+https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb-bom-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.1/jaxb-bom-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.2/jaxb-bom-2.3.2.pom
@@ -1107,10 +1133,10 @@ https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.po
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.5/txw2-4.0.5.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
-https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/3.0/hamcrest-core-3.0.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/3.0-rc1/hamcrest-core-3.0-rc1.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
-https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/3.0/hamcrest-3.0.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/3.0-rc1/hamcrest-3.0-rc1.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.12/org.jacoco.build-0.8.12.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
@@ -1210,7 +1236,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.20-RC2/kotlin-reflect-2.0.20-RC2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.20-Beta2/kotlin-reflect-2.0.20-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
@@ -1315,7 +1341,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-R
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.20-RC2/kotlin-stdlib-2.0.20-RC2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.20-Beta2/kotlin-stdlib-2.0.20-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
@@ -1335,7 +1361,7 @@ https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20240303/json-20240303.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
 https://repo.maven.apache.org/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0/junit-bom-5.11.0.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0-M2/junit-bom-5.11.0-M2.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
@@ -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
@@ -49,6 +49,13 @@ let
        export ANDROID_SDK_ROOT="${pkgs.androidPkgs.sdk}"
        export ANDROID_NDK_ROOT="${pkgs.androidPkgs.ndk}"

+        export STATUS_MOBILE_HOME=$(git rev-parse --show-toplevel)
+        # WARNING: Unpatched Node.js deps allow Gradle to use remote repos.
+        "$STATUS_MOBILE_HOME/nix/scripts/node_modules.sh" ${pkgs.deps.nodejs}
+        function restore_patched_modules() {
+          "$STATUS_MOBILE_HOME/nix/scripts/node_modules.sh" ${pkgs.deps.nodejs-patched}
+        }
+        trap restore_patched_modules EXIT
      '';
    };

@@ -1,9 +0,0 @@
--- /tmp/tmp-status-mobile-215e516b2/tmp.iCGv95VzNg/build.gradle	2024-08-20 19:39:24.147334000 +0530
-+++ ./node_modules/@react-native-community/blur/android/build.gradle	2024-08-20 19:39:27.720555147 +0530
-@@ -138,5 +138,5 @@
-   implementation "com.facebook.react:react-native:+"
-   // From node_modules
- 
-  implementation 'com.github.Dimezis:BlurView:version-2.0.3'
-+  implementation 'com.github.Dimezis:BlurView:version-2.0.4'
- }
@@ -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
@@ -13,7 +13,7 @@ export BUILD_TYPE=debug

 # Install the APK on running emulator or android device.
 installAndLaunchApp() {
-  adb install -r "./result/app-${ANDROID_ABI_INCLUDE}-debug.apk" > "${ADB_INSTALL_LOG_FILE}" 2>&1
+  adb install -r ./result/app-arm64-v8a-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
  "${GIT_ROOT}/scripts/wait-for-metro-port.sh" 2>&1
  # connected android devices need this port to be exposed for metro
  adb reverse "tcp:${RCT_METRO_PORT}" "tcp:${RCT_METRO_PORT}"
@@ -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
@@ -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--))
@@ -107,12 +107,11 @@
              (assoc network-tag-props
                     :status
                     (if error? :error :default))]])
-          (when fiat-value
-            [text/text
-             {:size   :paragraph-2
-              :style  style/fiat-amount
-              :weight :medium}
-             (str currency-symbol fiat-value)])])
+          [text/text
+           {:size   :paragraph-2
+            :style  style/fiat-amount
+            :weight :medium}
+           (str currency-symbol fiat-value)]])
       (when loading?
         [rn/view {:style (style/row-2-loader theme)}])]]
     (when (and (not= status :loading) (= type :pay) show-approval-label?)
@@ -19,10 +19,8 @@
    :text-color       (colors/resolve-color :danger theme)}})

 (defn- banner
-  [{:keys [text type second-banner? colors-map on-press]}]
-  [rn/pressable
-   {:on-press #(when on-press (on-press))
-    :style    (when second-banner? style/second-banner-wrapper)}
+  [{:keys [text type second-banner? colors-map]}]
+  [rn/view (when second-banner? {:style style/second-banner-wrapper})
   [hole-view/hole-view
    {:style (style/hole-view (get-in colors-map [type :background-color]))
     :holes (if second-banner?
@@ -126,8 +126,7 @@
      [reanimated/view
       {:style (reanimated/apply-animations-to-style
                {:opacity bg-opacity}
-                {:flex             1
-                 :background-color (if shell? colors/neutral-100-opa-60 colors/neutral-100-opa-70)})}]]
+                {:flex 1 :background-color colors/neutral-100-opa-70})}]]
     ;; sheet
     [gesture/gesture-detector {:gesture sheet-gesture}
      [reanimated/view
@@ -139,7 +138,7 @@
          [quo/blur
           {:style         style/shell-bg
            :blur-radius   (or blur-radius 20)
-            :blur-amount   15
+            :blur-amount   32
            :blur-type     :transparent
            :overlay-color :transparent}]])
       (when selected-item
@@ -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
@@ -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")))
@@ -1,5 +0,0 @@
-(ns status-im.contexts.network.data-store)
-
-(defn online?
-  [{:network/keys [status]}]
-  (= :online status))
@@ -2,10 +2,12 @@
  (:require
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
+    [re-frame.core :as re-frame]
    [react-native.core :as rn]
    [react-native.linear-gradient :as linear-gradient]
    [react-native.safe-area :as safe-area]
    [status-im.common.resources :as resources]
+    [status-im.constants :as constants]
    [status-im.contexts.onboarding.welcome.style :as style]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -22,12 +24,20 @@
      :description                     (i18n/label :t/welcome-to-web3-sub-title)
      :description-accessibility-label :welcome-sub-title}]))

+(defn dispatch-visibility-status-update
+  [status-type]
+  (re-frame/dispatch
+   [:visibility-status-updates/delayed-visibility-status-update status-type]))
+
 (defn view
  []
-  (let [profile-color (rf/sub [:onboarding/customization-color])
-        window        (rf/sub [:dimensions/window])
-        insets        (safe-area/get-insets)]
+  (let [profile-color         (rf/sub [:onboarding/customization-color])
+        {:keys [status-type]} (rf/sub [:multiaccount/current-user-visibility-status])
+        window                (rf/sub [:dimensions/window])
+        insets                (safe-area/get-insets)]
    [rn/view {:style (style/page-container insets)}
+     (when (nil? status-type)
+       (dispatch-visibility-status-update constants/visibility-status-automatic))
     [quo/page-nav
      {:type       :no-title
       :background :blur
@@ -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
@@ -251,6 +251,5 @@
              config/enable-alert-banner?)
     {:fx [[:dispatch
            [:alert-banners/add
-             {:type     :alert
-              :text     (i18n/label :t/testnet-mode-enabled)
-              :on-press #(rf/dispatch [:wallet/show-disable-testnet-mode-confirmation])}]]]})))
+             {:type :alert
+              :text (i18n/label :t/testnet-mode-enabled)}]]]})))
@@ -2,9 +2,7 @@
  (:require
    [clojure.string :as string]
    [native-module.core :as native-module]
-    [react-native.platform :as platform]
    [status-im.contexts.settings.wallet.data-store :as data-store]
-    [status-im.contexts.settings.wallet.network-settings.testnet-mode.view :as testnet]
    [taoensso.timbre :as log]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]
@@ -294,15 +292,3 @@

 (rf/reg-event-fx :wallet/make-partially-operable-accounts-fully-operable
 make-partially-operable-accounts-fully-operable)
-
-(rf/reg-event-fx :wallet/show-disable-testnet-mode-confirmation
- (fn [{:keys [db]} _]
-   (let [theme (:theme db)
-         blur? (and (not platform/android?) (= theme :dark))]
-     {:fx [[:dispatch
-            [:show-bottom-sheet
-             {:content (fn [] [testnet/view
-                               {:enable? false
-                                :blur?   blur?}])
-              :shell?  blur?
-              :theme   (when-not platform/android? theme)}]]]})))
@@ -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]}
@@ -2,7 +2,6 @@
  (:require [camel-snake-kebab.extras :as cske]
            [clojure.string :as string]
            [react-native.platform :as platform]
-            [status-im.contexts.network.data-store :as network.data-store]
            [status-im.contexts.wallet.collectible.utils :as collectible-utils]
            [taoensso.timbre :as log]
            [utils.ethereum.chain :as chain]
@@ -123,15 +122,14 @@
 (rf/reg-event-fx
 :wallet/request-collectibles-for-current-viewing-account
 (fn [{:keys [db]} _]
-   (when (network.data-store/online? db)
-     (let [current-viewing-account (-> db :wallet :current-viewing-account-address)
-           [request-id]            (get-unique-collectible-request-id 1)]
-       {:db (assoc-in db [:wallet :ui :collectibles :pending-requests] 1)
-        :fx [[:dispatch
-              [:wallet/request-new-collectibles-for-account
-               {:request-id request-id
-                :account    current-viewing-account
-                :amount     collectibles-request-batch-size}]]]}))))
+   (let [current-viewing-account (-> db :wallet :current-viewing-account-address)
+         [request-id]            (get-unique-collectible-request-id 1)]
+     {:db (assoc-in db [:wallet :ui :collectibles :pending-requests] 1)
+      :fx [[:dispatch
+            [:wallet/request-new-collectibles-for-account
+             {:request-id request-id
+              :account    current-viewing-account
+              :amount     collectibles-request-batch-size}]]]})))

 (defn- update-fetched-collectibles-progress
  [db owner-address collectibles offset has-more?]
@@ -262,7 +262,3 @@
     ;;  :cost () ;; tbd not used on desktop
     :token-fees                token-fees
     :gas-amount                (:tx-gas-amount new-path)}))
-
-(defn tokens-never-loaded?
-  [db]
-  (nil? (get-in db [:wallet :ui :tokens-loading])))
@@ -7,7 +7,4 @@

 (def defaults
  {:ui {:network-filter network-filter-defaults
-        ;; Note: we set it to nil by default to differentiate when the user logs
-        ;; in and the device is offline, versus re-fetching when offline and
-        ;; tokens already exist in the app-db.
-        :tokens-loading nil}})
+        :tokens-loading {}}})
@@ -5,7 +5,6 @@
    [clojure.string :as string]
    [react-native.platform :as platform]
    [status-im.constants :as constants]
-    [status-im.contexts.network.data-store :as network.data-store]
    [status-im.contexts.settings.wallet.effects]
    [status-im.contexts.settings.wallet.events]
    [status-im.contexts.wallet.common.activity-tab.events]
@@ -108,44 +107,23 @@
         [:dispatch [:wallet/request-new-collectibles-for-account-from-signal address]]
         [:dispatch [:wallet/check-recent-history-for-account address]]]}))

-(defn- reconcile-accounts
-  [db-accounts-by-address new-accounts]
-  (reduce
-   (fn [res {:keys [address] :as account}]
-     ;; Because we add extra fields (tokens and collectibles) into the RPC
-     ;; response from accounts_getAccounts, if we are offline we want to keep
-     ;; the old balances in the accounts, thus we merge the up-to-date account
-     ;; from status-go into the cached accounts. We also merge when online
-     ;; because we will re-fetch balances anyway.
-     ;;
-     ;; Refactor improvement: don't augment entities from status-go, store
-     ;; tokens and collectibles in separate keys in the app-db indexed by
-     ;; account address.
-     (assoc res
-            address
-            (-> (get db-accounts-by-address address)
-                (merge account)
-                ;; These should not be cached, otherwise when going
-                ;; offline->online collectibles won't be fetched.
-                (dissoc :current-collectible-idx :has-more-collectibles?))))
-   {}
-   new-accounts))
-
-(rf/reg-event-fx :wallet/get-accounts-success
+(rf/reg-event-fx
+ :wallet/get-accounts-success
 (fn [{:keys [db]} [accounts]]
   (let [wallet-accounts     (data-store/rpc->accounts accounts)
         wallet-db           (get db :wallet)
         new-account?        (:new-account? wallet-db)
         navigate-to-account (:navigate-to-account wallet-db)]
-     {:db (update-in db [:wallet :accounts] reconcile-accounts wallet-accounts)
-      :fx (concat (when (or (data-store/tokens-never-loaded? db)
-                            (network.data-store/online? db))
-                    refresh-accounts-fx-dispatches)
+     {:db (assoc-in db
+           [:wallet :accounts]
+           (utils.collection/index-by :address wallet-accounts))
+      :fx (concat refresh-accounts-fx-dispatches
                  [(when new-account?
                     [:dispatch [:wallet/navigate-to-new-account navigate-to-account]])])})))

-(rf/reg-event-fx :wallet/get-accounts
- (fn []
+(rf/reg-event-fx
+ :wallet/get-accounts
+ (fn [_]
   {:fx [[:json-rpc/call
          [{:method     "accounts_getAccounts"
            :on-success [:wallet/get-accounts-success]
@@ -508,7 +486,7 @@
                                  {:test-networks-enabled? test-networks-enabled?
                                   :is-goerli-enabled?     is-goerli-enabled?})
         chains-filtered-by-mode (remove #(not (contains? chain-ids-by-mode %)) down-chain-ids)
-         chains-down?            (and (network.data-store/online? db) (seq chains-filtered-by-mode))
+         chains-down?            (seq chains-filtered-by-mode)
         chain-names             (when chains-down?
                                   (->> (map #(-> (network-utils/id->network %)
                                                  name
@@ -518,8 +518,8 @@

 (rf/reg-event-fx
 :wallet/handle-suggested-routes
- (fn [_ [data]]
-   (if-let [{:keys [code details]} (-> data :ErrorResponse)]
+ (fn [_ data]
+   (if-let [{:keys [code details]} (-> data :ErrorResponse first)]
     (let [error-message (if (= code "0") "An error occurred" details)]
       (log/error "failed to get suggested routes (async)"
                  {:event :wallet/handle-suggested-routes
@@ -531,6 +531,7 @@
           candidates-fix  (comp ->old-route-paths
                                 remove-invalid-bonder-fees-routes)
           routes          (-> data
+                               (first)
                               (data-store/rpc->suggested-routes)
                               (update :best best-routes-fix)
                               (update :candidates candidates-fix))]
@@ -231,9 +231,11 @@
        native-currency-symbol                      (when-not confirm-disabled?
                                                      (get-in first-route
                                                              [:from :native-currency-symbol]))
-        fee-formatted                               (when native-currency-symbol
-                                                      (rf/sub [:wallet/wallet-send-fee-fiat-formatted
+        native-token                                (when native-currency-symbol
+                                                      (rf/sub [:wallet/token-by-symbol
                                                               native-currency-symbol]))
+        fee-formatted                               (rf/sub [:wallet/wallet-send-fee-fiat-formatted
+                                                             native-token])
        show-select-asset-sheet                     #(rf/dispatch
                                                      [:show-bottom-sheet
                                                       {:content (fn []
@@ -213,8 +213,11 @@
            first-route               (first route)
            native-currency-symbol    (get-in first-route
                                              [:from :native-currency-symbol])
+            native-token              (when native-currency-symbol
+                                        (rf/sub [:wallet/token-by-symbol
+                                                 native-currency-symbol]))
            fee-formatted             (rf/sub [:wallet/wallet-send-fee-fiat-formatted
-                                               native-currency-symbol])
+                                               native-token])
            account                   (rf/sub [:wallet/current-viewing-account])
            account-color             (:color account)
            bridge-to-network         (when bridge-to-chain-id
@@ -43,15 +43,9 @@
       {:fx [[:dispatch [:wallet/reload]]]}

       "wallet-blockchain-status-changed"
-       {:fx [[:dispatch-later
-              ;; Don't dispatch immediately because the signal may arrive as
-              ;; soon as the device goes offline. We need to give some time for
-              ;; RN to dispatch the network status update, otherwise when going
-              ;; offline the user will immediately see a toast saying "provider
-              ;; X is down".
-              [{:ms       500
-                :dispatch [:wallet/blockchain-status-changed
-                           (transforms/js->clj event-js)]}]]]}
+       {:fx [[:dispatch
+              [:wallet/blockchain-status-changed
+               (transforms/js->clj event-js)]]]}

       "wallet-activity-filtering-done"
       {:fx
@@ -28,23 +28,20 @@
                    :max-priority-fee-per-gas "0.011000001"
                    :eip1559-enabled          true}
   :estimated-time 3
-   :receive-amount "99.98"
-   :pay-token      {:symbol  "SNT"
-                    :address "0x432492384728934239789"}
-   :receive-token  {:symbol  "USDT"
+   :receive-amount 99.98
+   :receive-token  {:symbol  "SNT"
                    :address "0x432492384728934239789"}})

 (defn- assets-view
  [search-text on-change-text]
  (let [on-token-press (fn [token]
-                         (let [token-networks   (:networks token)
-                               asset-to-receive (rf/sub [:wallet/token-by-symbol "SNT"])]
+                         (let [token-networks (:networks token)]
                           (rf/dispatch [:wallet.swap/select-asset-to-pay
                                         {:token    token
                                          :network  (when (= (count token-networks) 1)
                                                      (first token-networks))
                                          :stack-id :screen/wallet.swap-select-asset-to-pay}])
-                           (rf/dispatch [:wallet.swap/select-asset-to-receive {:token asset-to-receive}])
+                           (rf/dispatch [:wallet.swap/select-asset-to-receive {:token token}])
                           (rf/dispatch [:wallet.swap/set-pay-amount 100])
                           (rf/dispatch [:wallet.swap/set-swap-proposal dummy-swap-proposal])
                           (rf/dispatch [:wallet.swap/set-provider])))]
@@ -172,7 +172,11 @@

 (defn footer
  [{:keys [estimated-time-min native-currency-symbol network theme account-color loading-fees?]}]
-  (let [fee-formatted   (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol])
+  (let [native-token    (when native-currency-symbol
+                          (rf/sub [:wallet/token-by-symbol
+                                   native-currency-symbol]))
+        fee-formatted   (rf/sub [:wallet/wallet-send-fee-fiat-formatted
+                                 native-token])
        on-auth-success (rn/use-callback #(js/alert "Not implemented yet"))]
    [rn/view {:style {:margin-bottom -10}}
     [transaction-details
@@ -1,35 +0,0 @@
-(ns status-im.contexts.wallet.swap.setup-swap.style)
-
-(def container
-  {:flex 1})
-
-(def keyboard-container
-  {:align-self :flex-end
-   :width      "100%"})
-
-(def inputs-container
-  {:padding-top        12
-   :padding-horizontal 20})
-
-(def details-container
-  {:flex-direction     :row
-   :justify-content    :space-between
-   :padding-top        7
-   :padding-horizontal 20})
-
-(def detail-item
-  {:flex             1
-   :height           36
-   :background-color :transparent})
-
-(def swap-order-button
-  {:margin-top -9
-   :z-index    2
-   :align-self :center})
-
-(def receive-token-swap-input-container
-  {:margin-top -9})
-
-(def footer-container
-  {:flex            1
-   :justify-content :flex-end})
@@ -1,132 +0,0 @@
-(ns status-im.contexts.wallet.swap.setup-swap.view
-  (:require [quo.core :as quo]
-            [react-native.core :as rn]
-            [react-native.safe-area :as safe-area]
-            [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
-            [status-im.contexts.wallet.common.utils :as utils]
-            [status-im.contexts.wallet.swap.setup-swap.style :as style]
-            [utils.i18n :as i18n]
-            [utils.navigation :as navigation]
-            [utils.re-frame :as rf]))
-
-(defn- data-item
-  [{:keys [title subtitle size subtitle-icon loading?]}]
-  [quo/data-item
-   {:container-style style/detail-item
-    :blur?           false
-    :card?           false
-    :subtitle-type   (if subtitle-icon :editable :default)
-    :status          (if loading? :loading :default)
-    :title           title
-    :subtitle        subtitle
-    :size            size
-    :icon            subtitle-icon}])
-
-(defn- transaction-details
-  [{:keys [max-slippage native-currency-symbol loading-fees?]}]
-  (let [max-fees (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol])]
-    [rn/view {:style style/details-container}
-     [data-item
-      {:title    (i18n/label :t/max-fees)
-       :subtitle max-fees
-       :loading? loading-fees?
-       :size     :small}]
-     [data-item
-      {:title         (i18n/label :t/max-slippage)
-       :subtitle      max-slippage
-       :subtitle-icon :i/edit
-       :loading?      loading-fees?}]]))
-
-(defn view
-  []
-  (let [[pay-value set-pay-value]        (rn/use-state "")
-        {:keys [color]}                  (rf/sub [:wallet/current-viewing-account])
-        {:keys [max-slippage swap-proposal loading-fees?
-                receive-amount network]} (rf/sub [:wallet/swap])
-        currency                         (rf/sub [:profile/currency])
-        currency-symbol                  (rf/sub [:profile/currency-symbol])
-        asset-to-pay                     (rf/sub [:wallet/swap-asset-to-pay])
-        asset-to-receive                 (rf/sub [:wallet/swap-asset-to-receive])
-
-        pay-token-fiat-value             (utils/calculate-token-fiat-value
-                                          {:currency currency
-                                           :balance  (or pay-value 0)
-                                           :token    asset-to-pay})
-        receive-token-fiat-value         (utils/calculate-token-fiat-value
-                                          {:currency currency
-                                           :balance  (or receive-amount 0)
-                                           :token    asset-to-receive})
-        native-currency-symbol           (get-in swap-proposal
-                                                 [:from :native-currency-symbol])
-        pay-token-symbol                 (:symbol asset-to-pay)
-        receive-token-symbol             (:symbol asset-to-receive)
-        on-press                         (fn [v] (set-pay-value (str pay-value v)))
-        delete                           (fn []
-                                           (set-pay-value #(subs % 0 (dec (count %)))))]
-    [rn/view {:style style/container}
-     [account-switcher/view
-      {:on-press      navigation/navigate-back
-       :icon-name     :i/arrow-left
-       :margin-top    (safe-area/get-top)
-       :switcher-type :select-account}]
-     [rn/view {:style style/inputs-container}
-      [quo/swap-input
-       {:type                 :pay
-        :error?               false
-        :token                pay-token-symbol
-        :customization-color  :blue
-        :show-approval-label? false
-        :status               :default
-        :currency-symbol      currency-symbol
-        :on-swap-press        #(js/alert "Swap Pressed")
-        :on-token-press       #(js/alert "Token Pressed")
-        :on-max-press         #(js/alert "Max Pressed")
-        :value                pay-value
-        :fiat-value           pay-token-fiat-value
-        :network-tag-props    {:title    (i18n/label :t/max-token
-                                                     {:number       200
-                                                      :token-symbol pay-token-symbol})
-                               :networks [{:source (:source network)}]}
-        :approval-label-props {:status              :approve
-                               :token-value         pay-value
-                               :button-props        {:on-press
-                                                     #(js/alert "Approve Pressed")}
-                               :customization-color color
-                               :token-symbol        pay-token-symbol}}]
-      [quo/swap-order-button
-       {:container-style style/swap-order-button
-        :on-press        #(js/alert "Pressed")}]
-      [quo/swap-input
-       {:type                 :receive
-        :error?               false
-        :token                receive-token-symbol
-        :customization-color  color
-        :show-approval-label? false
-        :enable-swap?         true
-        :status               :default
-        :currency-symbol      currency-symbol
-        :on-swap-press        #(js/alert "Swap Pressed")
-        :on-token-press       #(js/alert "Token Pressed")
-        :on-max-press         #(js/alert "Max Pressed")
-        :value                receive-amount
-        :fiat-value           receive-token-fiat-value
-        :container-style      style/receive-token-swap-input-container}]]
-     [rn/view {:style style/footer-container}
-      (when swap-proposal
-        [transaction-details
-         {:native-currency-symbol native-currency-symbol
-          :max-slippage           max-slippage
-          :loading-fees?          loading-fees?}])
-      [quo/bottom-actions
-       {:actions          :one-action
-        :button-one-label (i18n/label :t/review-swap)
-        :button-one-props {:disabled?           (or (not swap-proposal)
-                                                    loading-fees?)
-                           :customization-color color
-                           :on-press            #(js/alert "Review swap pressed")}}]]
-     [quo/numbered-keyboard
-      {:container-style style/keyboard-container
-       :left-action     :dot
-       :delete-key?     true
-       :on-press        on-press
-       :on-delete       delete}]]))
@@ -103,7 +103,11 @@
 (defn footer
  [{:keys [estimated-time-min native-currency-symbol max-slippage theme account-color provider
           loading-fees?]}]
-  (let [fee-formatted (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol])]
+  (let [native-token  (when native-currency-symbol
+                        (rf/sub [:wallet/token-by-symbol
+                                 native-currency-symbol]))
+        fee-formatted (rf/sub [:wallet/wallet-send-fee-fiat-formatted
+                               native-token])]
    [:<>
     [transaction-details
      {:estimated-time-min estimated-time-min
@@ -19,8 +19,4 @@
      "Swap confirmation"]
     [quo/button
      {:on-press #(rf/dispatch [:open-modal :screen/wallet.swap-set-spending-cap])}
-      "Set spending cap"]
-     [quo/button
-      {:on-press #(rf/dispatch [:navigate-to-within-stack
-                                [:screen/wallet.setup-swap :screen/wallet.swap-propasal]])}
-      "Setup swap"]]))
+      "Set spending cap"]]))
@@ -120,7 +120,6 @@
    [status-im.contexts.wallet.send.transaction-progress.view :as wallet-transaction-progress]
    [status-im.contexts.wallet.swap.select-asset-to-pay.view :as wallet-swap-select-asset-to-pay]
    [status-im.contexts.wallet.swap.set-spending-cap.view :as wallet-swap-set-spending-cap]
-    [status-im.contexts.wallet.swap.setup-swap.view :as wallet-swap-setup-swap]
    [status-im.contexts.wallet.swap.swap-confirmation.view :as wallet-swap-confirmation]
    [status-im.contexts.wallet.swap.swap-proposal.view :as wallet-swap-propasal]
    [status-im.contexts.wallet.wallet-connect.modals.send-transaction.view :as
@@ -523,10 +522,6 @@
                 :insets                 {:top? true}}
     :component wallet-swap-select-asset-to-pay/view}

-    {:name      :screen/wallet.setup-swap
-     :options   {:insets {:bottom? true}}
-     :component wallet-swap-setup-swap/view}
-
    {:name      :screen/wallet.swap-propasal
     :options   {:insets {:top? true}}
     :component wallet-swap-propasal/view}
@@ -152,12 +152,8 @@
 (fn [toasts [_ toast-id & cursor]]
   (get-in toasts (into [:toasts toast-id] cursor))))

-(re-frame/reg-sub :network/offline?
+(re-frame/reg-sub
+ :network/offline?
 :<- [:network/status]
 (fn [status]
   (= status :offline)))
-
-(re-frame/reg-sub :network/online?
- :<- [:network/status]
- (fn [status]
-   (= status :online)))
@@ -14,11 +14,6 @@
 :<- [:wallet/swap]
 :-> :asset-to-pay)

-(rf/reg-sub
- :wallet/swap-asset-to-receive
- :<- [:wallet/swap]
- :-> :asset-to-receive)
-
 (rf/reg-sub
 :wallet/swap-asset-to-pay-token-symbol
 :<- [:wallet/swap-asset-to-pay]
@@ -64,43 +64,6 @@
    :token-list-id ""
    :built-on "ETH"
    :verified true}
-   :asset-to-receive
-   {:description "Dai Stablecoin"
-    :decimals 18
-    :symbol "DAI"
-    :name "Dai Stablecoin"
-    :total-balance 1
-    :balances-per-chain
-    {1
-     {:raw-balance 1000000000000000000
-      :balance     "1"
-      :chain-id    1}
-     10
-     {:raw-balance 0
-      :balance     "0"
-      :chain-id    10}
-     42161
-     {:raw-balance 0
-      :balance     "0"
-      :chain-id    42161}}
-    :networks (concat [(networks :mainnet-network)] (networks :layer-2-networks))
-    :chain-id 0
-    :market-values-per-currency
-    {:usd
-     {:change-24hour     -0.00109422754667007
-      :change-pct-day    -5.57352274163899
-      :change-pct-24hour -4.177805426737527
-      :high-day          0.0271858672171352
-      :market-cap        170783296.1155821
-      :has-error         false
-      :change-pct-hour   -0.0160462113709363
-      :low-day           0.02473516779550377
-      :price             0.0251}}
-    :asset-website-url "https://status.im/"
-    :available-balance 1
-    :token-list-id ""
-    :built-on "ETH"
-    :verified true}
   :network nil})

 (h/deftest-sub :wallet/swap
@@ -119,14 +82,6 @@
      swap-data)
    (is (match? (swap-data :asset-to-pay) (rf/sub [sub-name])))))

-(h/deftest-sub :wallet/swap-asset-to-receive
-  [sub-name]
-  (testing "Return swap asset-to-receive"
-    (swap! rf-db/app-db assoc-in
-      [:wallet :ui :swap]
-      swap-data)
-    (is (match? (swap-data :asset-to-receive) (rf/sub [sub-name])))))
-
 (h/deftest-sub :wallet/swap-asset-to-pay-token-symbol
  [sub-name]
  (testing "Return asset-to-pay token symbol"
@@ -48,10 +48,11 @@
 :wallet/home-tokens-loading?
 :<- [:wallet/tokens-loading]
 (fn [tokens-loading]
-   (->> tokens-loading
-        vals
-        (some true?)
-        boolean)))
+   (or (empty? tokens-loading)
+       (->> tokens-loading
+            vals
+            (some true?)
+            boolean))))

 (rf/reg-sub
 :wallet/current-viewing-account-tokens-loading?
@@ -350,10 +351,9 @@
 :<- [:wallet/accounts]
 :<- [:wallet/balances-in-selected-networks]
 :<- [:wallet/tokens-loading]
- :<- [:network/online?]
 :<- [:profile/currency-symbol]
 :<- [:wallet/keypairs]
- (fn [[accounts balances tokens-loading online? currency-symbol keypairs]]
+ (fn [[accounts balances tokens-loading currency-symbol keypairs]]
   (mapv (fn [{:keys [color address watch-only? key-uid operable] :as account}]
           (let [account-type (cond
                                (= operable :no) :missing-keypair
@@ -373,9 +373,8 @@
                                                                       account
                                                                       keypair)}]))
                                           #(rf/dispatch [:wallet/navigate-to-account address]))
-                    :loading?            (and online?
-                                              (or (get tokens-loading address)
-                                                  (not (contains? tokens-loading address))))
+                    :loading?            (or (get tokens-loading address)
+                                             (not (contains? tokens-loading address)))
                    :balance             (utils/prettify-balance currency-symbol
                                                                 (get balances address)))))
         accounts)))
@@ -691,29 +690,23 @@

 (rf/reg-sub
 :wallet/wallet-send-fee-fiat-formatted
- :<- [:wallet/current-viewing-account]
 :<- [:wallet/wallet-send-route]
 :<- [:profile/currency]
 :<- [:profile/currency-symbol]
- (fn [[account route currency currency-symbol] [_ token-symbol-for-fees]]
-   (when token-symbol-for-fees
-     (let [tokens                  (:tokens account)
-           token-for-fees          (first (filter #(= (string/lower-case (:symbol %))
-                                                      (string/lower-case token-symbol-for-fees))
-                                                  tokens))
-           fee-in-native-token     (send-utils/calculate-full-route-gas-fee route)
-           fee-in-crypto-formatted (utils/get-standard-crypto-format
-                                    token-for-fees
-                                    fee-in-native-token)
-           fee-in-fiat             (utils/calculate-token-fiat-value
-                                    {:currency currency
-                                     :balance  fee-in-native-token
-                                     :token    token-for-fees})
-           fee-formatted           (utils/get-standard-fiat-format
-                                    fee-in-crypto-formatted
-                                    currency-symbol
-                                    fee-in-fiat)]
-       fee-formatted))))
+ (fn [[route currency currency-symbol] [_ token-for-fees]]
+   (let [fee-in-native-token     (send-utils/calculate-full-route-gas-fee route)
+         fee-in-crypto-formatted (utils/get-standard-crypto-format
+                                  token-for-fees
+                                  fee-in-native-token)
+         fee-in-fiat             (utils/calculate-token-fiat-value
+                                  {:currency currency
+                                   :balance  fee-in-native-token
+                                   :token    token-for-fees})
+         fee-formatted           (utils/get-standard-fiat-format
+                                  fee-in-crypto-formatted
+                                  currency-symbol
+                                  fee-in-fiat)]
+     fee-formatted)))

 (rf/reg-sub
 :wallet/has-partially-operable-accounts?
@@ -133,7 +133,8 @@
           max-fees-fiat           (wallet-utils/calculate-token-fiat-value {:currency currency
                                                                             :balance  max-fees-ether
                                                                             :token    eth-token})
-           max-fees-fiat-formatted (-> (wallet-utils/get-standard-crypto-format eth-token max-fees-ether)
+           max-fees-fiat-formatted (-> max-fees-ether
+                                       (wallet-utils/get-standard-crypto-format eth-token)
                                       (wallet-utils/get-standard-fiat-format currency-symbol
                                                                              max-fees-fiat))
           balance                 (-> eth-token
@@ -13,20 +13,17 @@
              {:before #(reset! rf-db/app-db {})})

 (def ^:private accounts-with-tokens
-  {:0x1 {:tokens                    [{:symbol                     "ETH"
-                                      :balances-per-chain         {1 {:raw-balance "100"}}
-                                      :market-values-per-currency {:usd {:price 10000}}}
-                                     {:symbol                     "SNT"
-                                      :balances-per-chain         {1 {:raw-balance "100"}}
-                                      :market-values-per-currency {:usd {:price 10000}}}]
+  {:0x1 {:tokens                    [{:symbol             "ETH"
+                                      :balances-per-chain {1 {:raw-balance "100"}}}
+                                     {:symbol             "SNT"
+                                      :balances-per-chain {1 {:raw-balance "100"}}}]
         :network-preferences-names #{}
         :customization-color       nil
         :operable?                 true
         :operable                  :fully
         :address                   "0x1"}
-   :0x2 {:tokens                    [{:symbol                     "SNT"
-                                      :balances-per-chain         {1 {:raw-balance "200"}}
-                                      :market-values-per-currency {:usd {:price 10000}}}]
+   :0x2 {:tokens                    [{:symbol             "SNT"
+                                      :balances-per-chain {1 {:raw-balance "200"}}}]
         :network-preferences-names #{}
         :customization-color       nil
         :operable?                 true
@@ -504,12 +501,10 @@
           (assoc-in [:wallet :ui :send :token-symbol] "ETH")))
    (let [result (rf/sub [sub-name])]
      (is (match? result
-                  [{:tokens                    [{:symbol                     "ETH"
-                                                 :balances-per-chain         {1 {:raw-balance "100"}}
-                                                 :market-values-per-currency {:usd {:price 10000}}}
-                                                {:symbol                     "SNT"
-                                                 :balances-per-chain         {1 {:raw-balance "100"}}
-                                                 :market-values-per-currency {:usd {:price 10000}}}]
+                  [{:tokens                    [{:symbol             "ETH"
+                                                 :balances-per-chain {1 {:raw-balance "100"}}}
+                                                {:symbol             "SNT"
+                                                 :balances-per-chain {1 {:raw-balance "100"}}}]
                    :network-preferences-names #{}
                    :customization-color       nil
                    :operable?                 true
@@ -523,12 +518,10 @@
           (assoc-in [:wallet :ui :send :token] {:symbol "ETH"})))
    (let [result (rf/sub [sub-name])]
      (is (match? result
-                  [{:tokens                    [{:symbol                     "ETH"
-                                                 :balances-per-chain         {1 {:raw-balance "100"}}
-                                                 :market-values-per-currency {:usd {:price 10000}}}
-                                                {:symbol                     "SNT"
-                                                 :balances-per-chain         {1 {:raw-balance "100"}}
-                                                 :market-values-per-currency {:usd {:price 10000}}}]
+                  [{:tokens                    [{:symbol             "ETH"
+                                                 :balances-per-chain {1 {:raw-balance "100"}}}
+                                                {:symbol             "SNT"
+                                                 :balances-per-chain {1 {:raw-balance "100"}}}]
                    :network-preferences-names #{}
                    :customization-color       nil
                    :operable?                 true
@@ -966,14 +959,15 @@
  (testing "wallet send fee calculated and formatted in fiat"
    (swap! rf-db/app-db
      #(-> %
-           (assoc-in [:wallet :accounts] accounts-with-tokens)
-           (assoc-in [:wallet :current-viewing-account-address] "0x1")
           (assoc-in [:wallet :ui :send :route] route-data)
           (assoc-in [:profile/profile :currency] :usd)
           (assoc-in [:profile/profile :currency-symbol] "$")))

-    (let [token-symbol-for-fees "ETH"
-          result                (rf/sub [sub-name token-symbol-for-fees])]
+    (let [token-for-fees {:decimals                   18
+                          :symbol                     "ETH"
+                          :name                       "Ether"
+                          :market-values-per-currency {:usd {:price 10000}}}
+          result         (rf/sub [sub-name token-for-fees])]
      (is (match? result "$1.00")))))

 (h/deftest-sub :wallet/has-partially-operable-accounts?
@@ -3,7 +3,7 @@
    "_comment": "Instead use: scripts/update-status-go.sh <rev>",
    "owner": "status-im",
    "repo": "status-go",
-    "version": "v0.184.47",
-    "commit-sha1": "83aa01c7daf69d518e624fc584ea22ca27b34b73",
-    "src-sha256": "07gqijx652ap0lf0kvcpd0lxx5x58air19pxgjawwymq2b8kly16"
+    "version": "test/set-api-proxy-test-debug",
+    "commit-sha1": "022b6fd45b99819ec14baabd6d482ae85ed468bf",
+    "src-sha256": "03p7x3s9005ghi02x334077nxwdhwlkxmvhcnc07lsygfsnzkkzk"
 }
@@ -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))

@@ -264,15 +264,15 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
        expected_communities = {
            # ' 0xUX': ['Design', 'Ethereum', 'Collaboration'],
            'Status': ['Web3', 'Blockchain', 'Ethereum'],
-            # 'Status Inu': ['News', 'Social', 'Web3'],
+            'Status Inu': ['News', 'Social', 'Web3'],
        }
        for community_name, tags in expected_communities.items():
            self.home.just_fyi("Check %s community tags in the Discover communities screen" % community_name)
            card = self.home.get_discover_community_card_by_name(community_name=community_name)
            try:
                card.wait_for_visibility_of_element(30)
-                # if community_name == 'Status':
-                #     card.swipe_to_web_element()
+                if community_name == 'Status':
+                    card.swipe_to_web_element()
                missing_tags = list()
                for text in tags:
                    try:
@@ -281,17 +281,18 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
                        missing_tags.append(text)
                if missing_tags:
                    self.errors.append("Community '%s' is missing tag(s) %s." % (community_name, ','.join(tags)))
-                # if community_name == 'Status':
-                self.home.just_fyi("Check Status community screen")
-                card.click()
-                if self.community_view.join_button.is_element_differs_from_template(
-                        'status_community_join_button.png'):
-                    self.errors.append("Status community Join button is different from expected template.")
-                if self.community_view.community_logo.is_element_differs_from_template('status_community_logo.png'):
-                    self.errors.append("Status community logo is different from expected template.")

-                    # self.community_view.close_community_view_button.click()
-                    # self.home.swipe_up()
+                if community_name == 'Status':
+                    self.home.just_fyi("Check Status community screen")
+                    card.click()
+                    if self.community_view.join_button.is_element_differs_from_template(
+                            'status_community_join_button.png'):
+                        self.errors.append("Status community Join button is different from expected template.")
+                    if self.community_view.community_logo.is_element_differs_from_template('status_community_logo.png'):
+                        self.errors.append("Status community logo is different from expected template.")
+
+                    self.community_view.close_community_view_button.click()
+                    self.home.swipe_up()

            except TimeoutException:
                self.errors.append("Community '%s' is not in the Discover Communities list." % community_name)
@@ -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()

@@ -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)
@@ -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)))
@@ -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,
@@ -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)
@@ -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()
@@ -1478,7 +1478,6 @@
  "max-fees": "Max fees",
  "max-priority-fee": "Max priority fee",
  "max-slippage": "Max slippage",
-  "max-token": "Max: {{number}} {{token-symbol}}",
  "maximum-fee": "Maximum fee",
  "maximum-fee-desc": "Maximum overall price for the transaction. If the current block base fee exceeds this, your transaction will be included in a following block with a lower base fee.",
  "may": "May",
@@ -2071,7 +2070,6 @@
  "reveal-sync-code": "Reveal sync code",
  "review-bridge": "Review bridge",
  "review-send": "Review send",
-  "review-swap": "Review swap",
  "revoke-access": "Revoke access",
  "ropsten-testnet": "Ropsten Testnet",
  "rpc-usage-copy": "Copy",
Author	SHA1	Message	Date
Andrea Maria Piana	bed2057d97	Add caching of token amounts https://github.com/status-im/status-go/compare/1f7816dd...022b6fd4	2024-08-16 13:31:50 +01:00
Andrea Maria Piana	ce87945736	Check price is nil	2024-08-16 12:56:05 +01:00
Andrea Maria Piana	f4e0c69d72	test caching https://github.com/status-im/status-go/compare/1f7816dd...022b6fd4	2024-08-16 12:55:22 +01:00
Jamie Caprani Yevheniia Berdnyk Sean Hagstrom Shivek Khurana	09c4e33834	Jc/cp3 (#21058 ) * chore(status-go) bump to latest https://github.com/status-im/status-go/compare/a93c8572...dd787c98 * feature: require manual acceptance of terms-of-use and privacy-statement (#21010) This change changes the initial onboarding screen to require users to manually accept the terms-of-use and privacy-statement before continuing to onboard into the app. * Hide provider down toast --------- Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com> * 👓 Hide chain down toasts (#21055) --------- Co-authored-by: Sean Hagstrom <sean@seanhagstrom.com> Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com> Co-authored-by: Shivek Khurana <khuranashivek@outlook.com>	2024-08-15 15:57:06 +01:00
Andrea Maria Piana	5b79f40de1	add logs	2024-08-15 12:52:40 +01:00
Andrea Maria Piana	6b29021075	[Remove me] Set credentials to test:test in prod proxy Prod server is misconfigured, it's using test server credentials. This commit hardcodes those credentials to continue testing. It will break once prod is updated.	2024-08-15 08:29:08 +01:00
Andrea Maria Piana	236dc37159	Revert "REMOVE ME, log config" This reverts commit `b43fc6fabf`.	2024-08-15 08:28:33 +01:00
Andrea Maria Piana	b43fc6fabf	REMOVE ME, log config	2024-08-15 08:03:35 +01:00
Andrea Maria Piana	3d205c837c	drive stage from config https://github.com/status-im/status-go/compare/1f7816dd...5bb7c6a8	2024-08-14 20:12:32 +01:00
frank	5c8fc2f700	fix_:enable light client after sync (#21041 ) (#21042 )	2024-08-14 16:46:50 +05:30
Jamie Caprani	1c9d69416b	cherry pick to release (#21038 )	2024-08-13 15:48:17 +01:00
Andrea Maria Piana	26fb0b20e7	update status-go version	2024-08-13 14:00:50 +01:00
Mohsen	b47f53777d	[#20971 ] fix: app crash when collectible max limit is nan (#20992 )	2024-08-12 10:24:45 -03:00
Parvesh Monu	1d298d0a5d	Improve theme switch (#20984 )	2024-08-12 10:24:45 -03:00
Andrea Maria Piana	b6f59bc5c0	update status-go version	2024-08-12 13:54:40 +01:00
Andrea Maria Piana	38dd9c46c2	update status-go version	2024-08-12 13:49:42 +01:00
Ulises Manuel	2b6e782e80	fix(wallet): Remove redirection to send flow when the user scans an address QR code (#20979 )	2024-08-08 17:28:32 +01:00
Andrea Maria Piana	c32f31f8cd	update status-go version	2024-08-08 13:57:27 +01:00
flexsurfer	50e41c8ed5	Token-gated permissions are not displayed on community's homepage #20965 (#20976 )	2024-08-08 13:50:14 +01:00
Siddarth Kumar	93b748a629	update status-go version to latest release	2024-08-07 14:50:33 +05:30
frankandSiddarth Kumar	a324481206	chore:enable status proxy (#20931 ) * feat_: enable status proxy * chore: update jenkins lib * chore: add missing env reference --------- Co-authored-by: Siddarth Kumar <siddarthkay@gmail.com>	2024-08-07 14:46:44 +05:30
Jamie Caprani	254717971e	Cherry pick to release branch (#20963 )	2024-08-06 15:43:10 +01:00
Icaro Motta	05279c111e	Bump status-go version	2024-08-02 11:20:20 -03:00
Lungu Cristian	b4a49bfe55	Fix typed-data chainid check (#20943 ) * fix: typed-data chainid check & toast on sign fail * fix: parsing the chain-id and error-handling	2024-08-02 11:20:20 -03:00
Sean Hagstrom	e5c3357317	fix: remove mobile-data sync setting inside legacy settings (#20942 )	2024-08-02 11:20:20 -03:00
Parvesh Monu	da2e5ff1c0	fix 'Usage data' bottom sheet reappears after reopening the app if you swipe it down on onboarding (#20945 )	2024-08-02 11:20:20 -03:00
Parvesh Monu	f69f075e29	fix Mobile app doesn't allow taking screenshots when the 'Block Screenshots' toggle is turned off (#20941 )	2024-08-02 11:20:20 -03:00
Ulises Manuel	81350b978f	fix(wallet): Error while bridging tokens due to bonderFees (#20929 )	2024-08-02 11:20:20 -03:00
Brian Sztamfater	f59dca0589	chore: bump react-native-camera-link version to Status fork to remove usage of ML Kit (#20891 )	2024-08-02 11:20:20 -03:00
Brian Sztamfater	745e5d75fb	fix(wallet): inverted values of receiver and sender when displaying bridging routes (#20893 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-08-02 11:20:20 -03:00
Mohamed Javid	7c6f2bf878	fix(android): send and bridge ERC-20 tokens (#20924 ) This commit adds the missing "encodeFunctionCall" method in Android Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-08-02 11:20:20 -03:00
Icaro MottaandMohamed Javid	29203e57ec	Update release branch 2.30.x (#20925 ) * fix_: use usd as default currency (#20916) This commit uses "usd" currency as default for the fiat price calculation for the tokens. Every currency has a different format - decimal which we need to rely on a separate RPC to fetch currency format and do the calculation. So, this PR will change to use usd as the default for v2.30. Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com> * Bump status-go version --------- Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com> Co-authored-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-07-30 16:09:44 -03:00
Icaro Motta	0f15c0192d	Update release branch 2.30.x (#20903 ) Revisions from develop: - `59ceddbaa` develop origin/develop fix(wallet): fix bridge transactions (#20902) - `99ccbc338` Cover wallet send events with tests Part 2 #20411 #20533 (#20721) - `8c2d5398b` Enabling WalletConnect feature flag (#20906) - `67c83b13e` fix(wallet): remove edit routes button in bridging (#20874) - `11a84ba14` feat(wallet): disable complex routing (#20901) - `1f5bb579c` chore(wallet): disable bridging on unsupported tokens (#20846) - `4586f8007` Add toggle in advanced settings for mobile data - `55c620e59` fix: create password for small screen (#20645) - `525609f0a` Wallet Activity: transactions are not sorted by time #20808 (#20862) - `90653955a` chore(settings): Disable telemetry option (#20881) - `d27ab756d` fix_:display group message using the new ui (#20787) - `c6a1db633` ci: enable split apks & build only for arm64-v8a (#20683) - `73777e052` Ensure keycard account can send transaction after upgrading from v1 to v2 #20552 (#20845) - `a6d3fc374` [#20524] fix: the missed keypairs are shown in the key pair list screen (#20888) - `a671c7083` fix broken screen and navigation when syncing fails (#20887) - `a45991b6d` 🥅 Filter connected dapps based on testnet mode, reject proposals and requests gracefully (#20799) - `2e9fa22e4` feat: wallet router v2 (#20631) - `737d8c4d5` rename sub to fix error when requesting to join community (#20868) - `3aa7e103f` Sync process is blocked on Enabled notifications screen (#20883) - `c1d2d44da` perf: Fix app freeze after login (#20729) - `0fed8113d` e2e: updated testnet switching and added one test into smoke - `53c35cb55` fix(wallet): Linear gradient exception on invalid colors for watched account cards (#20854) - `be8236554` chore(settings)_: Remove testnet toggle from legacy advanced settings (#20875) - `eae8a6559` feat(wallet)_: Add beta info box in activity tab (#20873) - `fe54a25a3` fix: not clearing network & web3-wallet on logout (#20886) - `15a4219ef` Reject wallet-connect request by dragging the modal down (#20763) (#20836) - `2ffbdac89` WalletConnect show expired toast (#20857) - `402eb8397` fix Issue with scrolling WalletConnect transaction on Android (#20867) - `ff88049a0` Fix WalletConnect header alignment on Android (#20860) - `cee21241d` WalletConnect no internet edge-cases (#20826) - `60ad7c8a2` chore(tests): New match-strict? cljs.test directive (#20825) - `4989c9278` fix_: Adding own address as saved addresses (#20839)	2024-07-30 11:28:07 -03:00
Andrea Maria Piana	a1784c5e1f	Merge branch 'develop' into release/2.30.x https://github.com/status-im/status-go/compare/4a43b2b2...4a43b2b2	2024-07-24 13:48:37 +01:00
Andrea Maria Piana	45cf31d469	Enable lightclient by default	2024-07-05 09:22:33 +01:00
Andrea Maria Piana	f958d95467	Bump status-go version	2024-07-05 09:21:52 +01:00
Andrea Maria Piana	894f8f26ee	Bump release to 2.30.0	2024-07-05 09:20:15 +01:00
@@ -1 +1 @@
 .29.0
 .30.0