deps: regenerate

This commit upgrades `react-native` to `v0.75.3`
Following changes were also made :
- `NDK` upgraded to `26.1.10909125`
- `@react-native/gradle-plugin` is set up using `includeBuild` gradle mechanism which is a better way.
- `reactjs` is upgraded to `18.3.1`
- `react-native-config` is upgraded to `1.5.3`
- `react-native-navigation` is upgraded to `7.40.1`
- `react-native-reanimated` is upgraded to `3.16.6`
- `react-native-gesture-handler` is upgraded to `2.22.0`
- `react-native-keychain` is upgraded to `9.2.2`
- patches for react-native-navigation are updated. PR in RNN repo -> https://github.com/wix/react-native-navigation/pull/7913
- patched autolinking behaviour in `react-native` to prevent generating `autolinking.json` in a gradle step. We run gradle in a sandbox with `--offline` so this is not feasible for us.
We do the same thing via a nix phase called `autolinkPhase`.
- `AGP` is bumped to `8.5.0` and `aapt2` is bumped to `8.5.0-11315950`
- we no longer need to patch out `-X` from `script_phases-patched.sh`
- `gradle` deps were updated.
- `pods` were updated.
- `gems` were updated.

android/app/build.gradle

@@ -54,6 +54,9 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -301,7 +304,7 @@ dependencies {
     implementation("com.facebook.fresco:fresco:2.5.0")
     implementation("com.facebook.fresco:animated-gif:2.5.0")
     implementation("com.squareup.okhttp3:okhttp-tls:4.11.0")
-    implementation("com.google.prefab:cli:2.0.0")
+    implementation("com.google.prefab:cli:2.1.0")
     implementation("com.android.tools.build:aapt2:8.1.1-10154469")
 }
 
@@ -337,5 +340,3 @@ task hemroidBuild(type: Exec) {
 }
 
 preBuild.dependsOn hemroidBuild
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

android/app/jni/Android.mk

@@ -6,6 +6,8 @@ LOCAL_MODULE    := status-logs
 LOCAL_SRC_FILES := Log.c
 
 LOCAL_CPPFLAGS  := -std=c++11 -fexceptions -I$(LOCAL_PATH)/include
+# Fix for : ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+LOCAL_CFLAGS := '-Wno-error=implicit-function-declaration'
 LOCAL_LDFLAGS := -llog
 
 include $(BUILD_SHARED_LIBRARY)

android/app/src/debug/AndroidManifest.xml

@@ -7,5 +7,10 @@
     <!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
     <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
 
-   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"  android:usesCleartextTraffic="true" />
+    <application
+            tools:targetApi="28"
+            tools:ignore="GoogleAppIndexingWarning"
+            android:usesCleartextTraffic="true"
+            tools:replace="android:appComponentFactory"
+            android:appComponentFactory="androidx.core.app.CoreComponentFactory" />
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -42,7 +42,8 @@
             android:largeHeap="true"
             android:usesCleartextTraffic="true"
             android:extractNativeLibs="true"
-            android:requestLegacyExternalStorage="true">
+            android:requestLegacyExternalStorage="true"
+            android:supportsRtl="true">
 <!--        After upgrading Android Gradle Plugin to 4.2.0 and above we must get rid of `extractNativeLibs="true"`
             and use`useLegacyPackaging` flag in our app's `build.gradle`-->
         <meta-data android:name="commitHash" android:value="${commitHash}"/>

android/app/src/main/java/im/status/ethereum/MainApplication.kt

@@ -6,7 +6,6 @@ import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JSIModulePackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
 import com.facebook.react.modules.network.OkHttpClientProvider
 import com.reactnativenavigation.NavigationApplication

android/build.gradle

@@ -17,7 +17,8 @@ ext {
     kotlinVersion       = project.kotlinPluginVersion
     kotlinPluginVersion = project.kotlinPluginVersion
     kotlinToolsVersion  = project.kotlinPluginVersion
-    ndkVersion = "25.2.9519653"
+    // This version must match ndkVersion version inside nix/pkgs/android-sdk/compose.nix
+    ndkVersion = "26.1.10909125"
 }
 
 buildscript {

android/gradle.properties

@@ -27,8 +27,8 @@ targetSdkVersion=34
 buildToolsVersion=34.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/pkgs/aapt2/default.nix
-gradlePluginVersion=7.4.2
-kotlinPluginVersion=1.9.0
+gradlePluginVersion=8.5.0
+kotlinPluginVersion=1.9.24
 
 android.useAndroidX=true
 android.enableJetifier=true
@@ -54,7 +54,6 @@ commitHash=unknown
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 newArchEnabled=false
-
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 # Disabled for debug builds to avoid 'maximum call stack exceeded' errors.

android/settings.gradle

@@ -5,10 +5,11 @@ includeBuild('../node_modules/@react-native/gradle-plugin')
       gradlePluginPortal()
   }
 }
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 include ':react-native-share'
 project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
 rootProject.name = 'StatusIm'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':react-native-nfc-manager'
 project(':react-native-nfc-manager').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-nfc-manager/android')
 include ':app'

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.18'
+library 'status-jenkins-lib@v1.9.20'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.combined

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.18'
+library 'status-jenkins-lib@v1.9.20'
 
 import groovy.json.JsonBuilder
 

ci/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.18'
+library 'status-jenkins-lib@v1.9.20'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.18'
+library 'status-jenkins-lib@v1.9.20'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.18'
+library 'status-jenkins-lib@v1.9.20'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.13'
+library 'status-jenkins-lib@v1.9.20'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-prs

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.13'
+library 'status-jenkins-lib@v1.9.20'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.13'
+library 'status-jenkins-lib@v1.9.20'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.13'
+library 'status-jenkins-lib@v1.9.20'
 
 pipeline {
   agent { label 'macos' }

ci/tools/Jenkinsfile.nix-cache

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.13'
+library 'status-jenkins-lib@v1.9.20'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/tools/Jenkinsfile.playstore-meta

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.13'
+library 'status-jenkins-lib@v1.9.20'
 
 pipeline {
   agent { label 'linux' }

ci/tools/Jenkinsfile.xcode-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.13'
+library 'status-jenkins-lib@v1.9.20'
 
 pipeline {
   agent {

fastlane/Gemfile.lock

@@ -1,48 +1,51 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (7.0.8)
+    activesupport (7.0.8.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.15)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.872.0)
-    aws-sdk-core (3.190.1)
+    aws-partitions (1.1032.0)
+    aws-sdk-core (3.214.1)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.75.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.141.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-kms (1.96.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.177.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20231109)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.108.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -61,24 +64,24 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.217.0)
+    fastimage (2.4.0)
+    fastlane (2.226.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -87,9 +90,11 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
@@ -98,10 +103,10 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (~> 3)
@@ -109,12 +114,14 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty (~> 0.4.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.2)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -122,66 +129,66 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.29.0)
+    google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.1)
+    google-cloud-core (1.7.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.0)
-      faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.45.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.29.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.9.1)
-      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.7.1)
-    jwt (2.7.1)
-    mini_magick (4.12.0)
+    json (2.9.1)
+    jwt (2.10.1)
+      base64
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.20.0)
+    minitest (5.25.4)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
-    nanaimo (0.3.0)
+    multipart-post (2.4.1)
+    nanaimo (0.4.0)
     naturally (2.2.1)
-    optparse (0.1.1)
+    nkf (0.2.0)
+    optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.4)
-    rake (13.1.0)
+    plist (3.7.2)
+    public_suffix (6.0.1)
+    rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
-    rouge (2.0.7)
+    rexml (3.4.0)
+    rouge (3.28.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.18.0)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -189,6 +196,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -200,29 +208,27 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  arm64-darwin-22
   arm64-darwin-23
-  x86_64-darwin-22
+  ruby
 
 DEPENDENCIES
   activesupport (>= 6.1.7.3, < 7.1.0)
   fastlane (>= 2.131.0)
 
 BUNDLED WITH
-   2.4.13
+   2.5.16

fastlane/gemset.nix

@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5";
+      sha256 = "1zq4f834my1z6yh05rfr1dzl3i8padh33j092zlal979blvh4iyz";
       type = "gem";
     };
-    version = "7.0.8";
+    version = "7.0.8.7";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -16,20 +16,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
       type = "gem";
     };
-    version = "2.8.6";
+    version = "2.8.7";
   };
   artifactory = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls";
+      sha256 = "0qzj389l2a3zig040h882mf6cxfa71pm2nk51l4p85n3ck4xa8rh";
       type = "gem";
     };
-    version = "3.0.15";
+    version = "3.0.17";
   };
   atomos = {
     groups = ["default"];
@@ -56,10 +56,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm";
+      sha256 = "1b7fjl7cixz099ncdr6il1gb41dxhgz0jbczk195y4cy22yhvqla";
       type = "gem";
     };
-    version = "1.872.0";
+    version = "1.1032.0";
   };
   aws-sdk-core = {
     dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -67,10 +67,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh";
+      sha256 = "1za95pl089xarrqr23vafs1w43b36k0jwhkwifgs2dnp0xs336s1";
       type = "gem";
     };
-    version = "3.190.1";
+    version = "3.214.1";
   };
   aws-sdk-kms = {
     dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -78,10 +78,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1";
+      sha256 = "0xd3ddd9jiapkgv8im4pl9dcdy2ps7qjsssf2nz3q6sd1ca8x0di";
       type = "gem";
     };
-    version = "1.75.0";
+    version = "1.96.0";
   };
   aws-sdk-s3 = {
     dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -89,10 +89,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya";
+      sha256 = "10ziy8zslfjs0ihls7wiq6zvsncq89azh36rshmlylry1hhxjbxz";
       type = "gem";
     };
-    version = "1.141.0";
+    version = "1.177.0";
   };
   aws-sigv4 = {
     dependencies = ["aws-eventstream"];
@@ -100,10 +100,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
+      sha256 = "1fq3lbvkgm1vk5wa8l7vdnq3vjnlmsnyf4bbd0jq3qadyd9hf54a";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.10.1";
   };
   babosa = {
     groups = ["default"];
@@ -115,16 +115,26 @@
     };
     version = "1.0.4";
   };
-  CFPropertyList = {
-    dependencies = ["rexml"];
+  base64 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq";
+      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
       type = "gem";
     };
-    version = "3.0.6";
+    version = "0.2.0";
+  };
+  CFPropertyList = {
+    dependencies = ["base64" "nkf" "rexml"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4";
+      type = "gem";
+    };
+    version = "3.0.7";
   };
   claide = {
     groups = ["default"];
@@ -172,10 +182,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
+      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.3.4";
   };
   declarative = {
     groups = ["default"];
@@ -203,10 +213,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si";
+      sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz";
       type = "gem";
     };
-    version = "0.6.20231109";
+    version = "0.6.20240107";
   };
   dotenv = {
     groups = ["default"];
@@ -233,10 +243,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1q9yz7x36mpzpz04bg6hdyrzzk4bri9jg3h2ygw26bf6v3axq53q";
+      sha256 = "1w7098hnyby5sn2315qy26as6kxlxivxlcrs714amj9g9hxaryfs";
       type = "gem";
     };
-    version = "0.108.0";
+    version = "0.112.0";
   };
   faraday = {
     dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@@ -244,10 +254,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90";
+      sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153";
       type = "gem";
     };
-    version = "1.10.3";
+    version = "1.10.4";
   };
   faraday-cookie_jar = {
     dependencies = ["faraday" "http-cookie"];
@@ -306,20 +316,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
+      sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.1.0";
   };
   faraday-net_http = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+      sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   faraday-net_http_persistent = {
     groups = ["default"];
@@ -367,31 +377,42 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
+      sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.2.1";
   };
   fastimage = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pd7pamzhdz2w0fbcvsfn2nyslznvphnwj16zw35g2b28zd2xyzx";
+      sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz";
       type = "gem";
     };
-    version = "2.2.7";
+    version = "2.4.0";
   };
   fastlane = {
-    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "http-cookie" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "fastlane-sirp" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-env" "google-cloud-storage" "highline" "http-cookie" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0p2b92csayzlj60v15fz3mq4h23kvvr7swhaavi6fpaqzf70iafi";
+      sha256 = "0v3w69j9nc98p4jdr81bx0mdyab0b5v93kq3bixsy14q5v92flp6";
       type = "gem";
     };
-    version = "2.217.0";
+    version = "2.226.0";
+  };
+  fastlane-sirp = {
+    dependencies = ["sysrandom"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hg6ql3g25f96fsmwr9xlxpn8afa7wvjampnrh1fqffhphjqyiv6";
+      type = "gem";
+    };
+    version = "1.0.0";
   };
   gh_inspector = {
     groups = ["default"];
@@ -415,15 +436,15 @@
     version = "0.54.0";
   };
   google-apis-core = {
-    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd";
+      sha256 = "15ycm7al9dizabbqmri5xmiz8mbcci343ygb64ndbmr9n49p08a3";
       type = "gem";
     };
-    version = "0.11.2";
+    version = "0.11.3";
   };
   google-apis-iamcredentials_v1 = {
     dependencies = ["google-apis-core"];
@@ -453,10 +474,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx";
+      sha256 = "13yvc9r8bhs16vq3fjc93qlffmq9p6zx97c9g1c3wh0jbrvwrs03";
       type = "gem";
     };
-    version = "0.29.0";
+    version = "0.31.0";
   };
   google-cloud-core = {
     dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -464,10 +485,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00wfvdvdv9m4l5ydn6xp65n68mgmpqr3n09hzvxs7gp8fly3j17v";
+      sha256 = "0bh1yzv26mqn2qmzkqa0qwzmq4w0dcphjla4w5m2f2qlkj583wjs";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.7.1";
   };
   google-cloud-env = {
     dependencies = ["faraday"];
@@ -475,20 +496,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "056r1p8vhjswnx2cy3mzhwc5gj03whmpz8m4p2ph37gag5bpnxmf";
+      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "1.6.0";
   };
   google-cloud-errors = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0flpj7v196c3xsqx4yjb7rjcj8p0by4rhj6qf5zanw4p1i41ssf0";
+      sha256 = "056yw9cg771c1xqvw15wpdfdw9lz3m13fh5b6a3p1c9xaq7jwkhb";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.4.0";
   };
   google-cloud-storage = {
     dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
@@ -496,21 +517,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j";
+      sha256 = "0xpb3s7zr7g647xg66y2mavdargk5ixsfbfdmi4m2jc3khdd0hxm";
       type = "gem";
     };
-    version = "1.45.0";
+    version = "1.47.0";
   };
   googleauth = {
-    dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"];
+    dependencies = ["faraday" "jwt" "multi_json" "os" "signet"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0spv89di017rg25psiv4w3pn6f67y2w6vv8w910i83b5yii84rl1";
+      sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1";
       type = "gem";
     };
-    version = "1.9.1";
+    version = "1.8.1";
   };
   highline = {
     groups = ["default"];
@@ -528,10 +549,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk";
+      sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.0.8";
   };
   httpclient = {
     groups = ["default"];
@@ -549,10 +570,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
       type = "gem";
     };
-    version = "1.14.1";
+    version = "1.14.6";
   };
   jmespath = {
     groups = ["default"];
@@ -569,30 +590,31 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
+      sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.9.1";
   };
   jwt = {
+    dependencies = ["base64"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87";
+      sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.10.1";
   };
   mini_magick = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
+      sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki";
       type = "gem";
     };
-    version = "4.12.0";
+    version = "4.13.2";
   };
   mini_mime = {
     groups = ["default"];
@@ -609,10 +631,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
+      sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
       type = "gem";
     };
-    version = "5.20.0";
+    version = "5.25.4";
   };
   multi_json = {
     groups = ["default"];
@@ -629,20 +651,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x";
+      sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.1";
   };
   nanaimo = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
+      sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.4.0";
   };
   naturally = {
     groups = ["default"];
@@ -654,15 +676,25 @@
     };
     version = "2.2.1";
   };
+  nkf = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
   optparse = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j9l5a1zszvrlggp1ldx82i4kkqx34g4g3amwp488s499w5l1cvj";
+      sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.6.0";
   };
   os = {
     groups = ["default"];
@@ -679,30 +711,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wzhnbzraz60paxhm48c50fp9xi7cqka4gfhxmiq43mhgh5ajg3h";
+      sha256 = "0hlaf4b3d8grxm9fqbnam5gwd55wvghl0jyzjd1hc5hirhklaynk";
       type = "gem";
     };
-    version = "3.7.0";
+    version = "3.7.2";
   };
   public_suffix = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
+      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
       type = "gem";
     };
-    version = "5.0.4";
+    version = "6.0.1";
   };
   rake = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
+      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
       type = "gem";
     };
-    version = "13.1.0";
+    version = "13.2.1";
   };
   representable = {
     dependencies = ["declarative" "trailblazer-option" "uber"];
@@ -730,20 +762,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      sha256 = "1ch4k2y80r4glr579kxliqnxld2qa91ydq8fiqam38bzpbps3gpg";
       type = "gem";
     };
-    version = "3.2.6";
+    version = "3.4.0";
   };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
+      sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d";
       type = "gem";
     };
-    version = "2.0.7";
+    version = "3.28.0";
   };
   ruby2_keywords = {
     groups = ["default"];
@@ -760,20 +792,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+      sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "2.4.1";
   };
   security = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa";
+      sha256 = "1drkm2wgjazwzj09db1szrllkag036bdvc3dr42fh1kpr877m5rs";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.5";
   };
   signet = {
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
@@ -781,10 +813,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6";
+      sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk";
       type = "gem";
     };
-    version = "0.18.0";
+    version = "0.19.0";
   };
   simctl = {
     dependencies = ["CFPropertyList" "naturally"];
@@ -797,6 +829,16 @@
     };
     version = "1.6.10";
   };
+  sysrandom = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x8yryf6migjnkfwr8dxgx1qyzhvajgha60hr5mgfkn65qyarhas";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
   terminal-notifier = {
     groups = ["default"];
     platforms = [];
@@ -885,20 +927,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+      sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
       type = "gem";
     };
-    version = "2.5.0";
-  };
-  webrick = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
-      type = "gem";
-    };
-    version = "1.8.1";
+    version = "2.6.0";
   };
   word_wrap = {
     groups = ["default"];
@@ -916,10 +948,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn";
+      sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc";
       type = "gem";
     };
-    version = "1.23.0";
+    version = "1.27.0";
   };
   xcpretty = {
     dependencies = ["rouge"];
@@ -927,10 +959,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
+      sha256 = "1lbwk77g28jjhin3qjrh7ldfsgf7aszi9j60mp8yz10i3wyqgvqj";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.4.0";
   };
   xcpretty-travis-formatter = {
     dependencies = ["xcpretty"];

ios/Podfile

@@ -59,6 +59,7 @@ abstract_target 'Status' do
   pod 'SSZipArchive', '2.4.3'
   # to fix [!] CocoaPods could not find compatible versions for pod "CryptoSwift"
   pod 'CryptoSwift', git: "https://github.com/krzyzanowskim/CryptoSwift", tag: '1.8.0'
+  pod 'TOCropViewController', git: "https://github.com/TimOliver/TOCropViewController", tag: '2.7.4'
   pod "react-native-status-keycard", path: "../node_modules/react-native-status-keycard"
   pod "react-native-status", path: "../modules/react-native-status"
   pod "Keycard", git: "https://github.com/status-im/Keycard.swift.git", tag: '3.1.1'
@@ -82,6 +83,7 @@ abstract_target 'Status' do
       installer,
       config[:reactNativePath],
       :mac_catalyst_enabled => false,
+      # :ccache_enabled => true
     )
     # some of libs wouldn't be build for x86_64 otherwise and that is
     # necessary for ios simulators

ios/StatusIm.xcodeproj/project.pbxproj

@@ -11,7 +11,8 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
-		2D32CCEDFF64E1C3F1FB79AF /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6081A369F49E04EC54F77E1B /* libPods-Status-StatusIm-StatusImTests.a */; };
+		33589A5A91A667E83E26A8F1 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AD2A3A4FBF9C660C720333B9 /* libPods-Status-StatusImPR.a */; };
+		33A9649BF03D7722C8AD9A94 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 346DB175AB93E046EABA70F9 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; };
 		3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2626CE245C3F2200D5F94B /* Dummy.swift */; };
@@ -40,11 +41,13 @@
 		65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
+		6DBB6F41C55D0644766866AF /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 67FDD6C432DA668DFEBF5680 /* PrivacyInfo.xcprivacy */; };
 		70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; };
 		715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
+		8FDFD85E9A738F5987881331 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = DE9F1F0F747EAF43F5B4200D /* PrivacyInfo.xcprivacy */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
@@ -56,11 +59,10 @@
 		C1715FFB29C0BCE50088FA8B /* launch-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */; };
 		C1715FFC29C0BCE80088FA8B /* launch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9229C0ADB5005C58A7 /* launch-icon.png */; };
 		CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.xcframework */; };
+		CFCC1602CE7DA2FD62562C83 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E01C76163FA5943BA4FCED5 /* libPods-Status-StatusIm.a */; };
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
-		D791AB0467C983D226FF5713 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E42DDCDBECE60E763EAA5042 /* libPods-Status-StatusIm.a */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
-		F9C9188A9398D58C286A2F4B /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C929A693823978C12D329338 /* libPods-Status-StatusImPR.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -114,46 +116,48 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
-		203C46547A6E99D27529A8AA /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
-		24F63BCFEB33B4C969305A46 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
-		344F43B59CCE090C3271FF08 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
+		346DB175AB93E046EABA70F9 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		3AAD2ADC24A3A60E0075D594 /* Status PR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Status PR.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
-		415E72A662B5ABF086AB7D7B /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		6081A369F49E04EC54F77E1B /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		59C3DE709E21DF59F3163C5B /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
+		67FDD6C432DA668DFEBF5680 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = StatusIm/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
-		70748FF05FFD3CACB6F64CE0 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
+		9E01C76163FA5943BA4FCED5 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
+		AD2A3A4FBF9C660C720333B9 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		AE688642BED459D924D638C9 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = "<group>"; };
 		B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = "<group>"; };
 		B321D25F4493470980039457 /* Inter-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BoldItalic.otf"; path = "../resources/fonts/Inter-BoldItalic.otf"; sourceTree = "<group>"; };
+		B5908EC87D7D3CF5C59076E4 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
-		C929A693823978C12D329338 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		E42DDCDBECE60E763EAA5042 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		F12F9820A9DF3FE08C615B90 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
+		D4B4396706812C0485C86536 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
+		DE9F1F0F747EAF43F5B4200D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = ../StatusIm/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		F73447C82A1342C8A6E3D99B /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
+		FF6D68169B80BA9EF9BB9FF9 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +165,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2D32CCEDFF64E1C3F1FB79AF /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				33A9649BF03D7722C8AD9A94 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +178,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				D791AB0467C983D226FF5713 /* libPods-Status-StatusIm.a in Frameworks */,
+				CFCC1602CE7DA2FD62562C83 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +192,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				F9C9188A9398D58C286A2F4B /* libPods-Status-StatusImPR.a in Frameworks */,
+				33589A5A91A667E83E26A8F1 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -227,6 +231,7 @@
 				13B07FB71A68108700A75B9A /* main.m */,
 				3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */,
 				3A2626CE245C3F2200D5F94B /* Dummy.swift */,
+				67FDD6C432DA668DFEBF5680 /* PrivacyInfo.xcprivacy */,
 			);
 			name = StatusIm;
 			sourceTree = "<group>";
@@ -253,6 +258,7 @@
 			isa = PBXGroup;
 			children = (
 				3A6406FB24A3ADF90046ED37 /* Info.plist */,
+				DE9F1F0F747EAF43F5B4200D /* PrivacyInfo.xcprivacy */,
 			);
 			path = StatusImPR;
 			sourceTree = "<group>";
@@ -314,9 +320,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				E42DDCDBECE60E763EAA5042 /* libPods-Status-StatusIm.a */,
-				6081A369F49E04EC54F77E1B /* libPods-Status-StatusIm-StatusImTests.a */,
-				C929A693823978C12D329338 /* libPods-Status-StatusImPR.a */,
+				9E01C76163FA5943BA4FCED5 /* libPods-Status-StatusIm.a */,
+				346DB175AB93E046EABA70F9 /* libPods-Status-StatusIm-StatusImTests.a */,
+				AD2A3A4FBF9C660C720333B9 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +330,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				24F63BCFEB33B4C969305A46 /* Pods-Status-StatusIm.debug.xcconfig */,
-				344F43B59CCE090C3271FF08 /* Pods-Status-StatusIm.release.xcconfig */,
-				F12F9820A9DF3FE08C615B90 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				203C46547A6E99D27529A8AA /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				70748FF05FFD3CACB6F64CE0 /* Pods-Status-StatusImPR.debug.xcconfig */,
-				415E72A662B5ABF086AB7D7B /* Pods-Status-StatusImPR.release.xcconfig */,
+				FF6D68169B80BA9EF9BB9FF9 /* Pods-Status-StatusIm.debug.xcconfig */,
+				AE688642BED459D924D638C9 /* Pods-Status-StatusIm.release.xcconfig */,
+				59C3DE709E21DF59F3163C5B /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				B5908EC87D7D3CF5C59076E4 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				F73447C82A1342C8A6E3D99B /* Pods-Status-StatusImPR.debug.xcconfig */,
+				D4B4396706812C0485C86536 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,12 +347,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				D357C5313A85261FF3DAB74E /* [CP] Check Pods Manifest.lock */,
+				F676C31E1D44D1BD4576B503 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				36051AE6B742BD851884AB9D /* [CP] Embed Pods Frameworks */,
-				3506F0F77B5DE03815A5414A /* [CP] Copy Pods Resources */,
+				80152ACDD81CE8E1680DDE4F /* [CP] Embed Pods Frameworks */,
+				1BEC29FB652F8E038962FCF8 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -362,15 +368,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				D47DE8479514FAAC6B26ACD2 /* [CP] Check Pods Manifest.lock */,
+				F711D2C4BC11EA6E45C3CE7A /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				82219E0CC0028DA612FCC0E3 /* [CP] Embed Pods Frameworks */,
-				389504FC147AAF0616332C3A /* [CP] Copy Pods Resources */,
+				576C124BF9B0B4545F72B9DB /* [CP] Embed Pods Frameworks */,
+				99E5FF43F591A0EE44848FE0 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -385,15 +391,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				E507D5CEF6BDEB9FBEBFA1C3 /* [CP] Check Pods Manifest.lock */,
+				1A2DE106725880C6A07F695F /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				13D9129EE9E3EFD2436F82FD /* [CP] Embed Pods Frameworks */,
-				E374B6B7AF37774C15097B39 /* [CP] Copy Pods Resources */,
+				FF3E0F53E44C187FBDB0ADE3 /* [CP] Embed Pods Frameworks */,
+				7DC89E6871F5A5F7A2278E03 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -505,6 +511,7 @@
 				3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */,
 				8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */,
 				C14C5F8D29C0A149005C58A7 /* launch-icon@3x.png in Resources */,
+				6DBB6F41C55D0644766866AF /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -527,6 +534,7 @@
 				3AAD2AD324A3A60E0075D594 /* Inter-SemiBold.otf in Resources */,
 				3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */,
 				C1715FFB29C0BCE50088FA8B /* launch-icon@3x.png in Resources */,
+				8FDFD85E9A738F5987881331 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -547,94 +555,62 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\n\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n";
 		};
-		13D9129EE9E3EFD2436F82FD /* [CP] Embed Pods Frameworks */ = {
+		1A2DE106725880C6A07F695F /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3506F0F77B5DE03815A5414A /* [CP] Copy Pods Resources */ = {
+		1BEC29FB652F8E038962FCF8 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		36051AE6B742BD851884AB9D /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		389504FC147AAF0616332C3A /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -663,7 +639,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
 		};
-		82219E0CC0028DA612FCC0E3 /* [CP] Embed Pods Frameworks */ = {
+		576C124BF9B0B4545F72B9DB /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -681,7 +657,107 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D357C5313A85261FF3DAB74E /* [CP] Check Pods Manifest.lock */ = {
+		7DC89E6871F5A5F7A2278E03 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		80152ACDD81CE8E1680DDE4F /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		99E5FF43F591A0EE44848FE0 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		E3914A731DF919ED00EBB515 /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = "/usr/bin/env sh";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
+		};
+		F676C31E1D44D1BD4576B503 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -703,7 +779,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D47DE8479514FAAC6B26ACD2 /* [CP] Check Pods Manifest.lock */ = {
+		F711D2C4BC11EA6E45C3CE7A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -725,66 +801,22 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E374B6B7AF37774C15097B39 /* [CP] Copy Pods Resources */ = {
+		FF3E0F53E44C187FBDB0ADE3 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		E3914A731DF919ED00EBB515 /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
-		};
-		E507D5CEF6BDEB9FBEBFA1C3 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -834,7 +866,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = F12F9820A9DF3FE08C615B90 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 59C3DE709E21DF59F3163C5B /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -871,7 +903,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 203C46547A6E99D27529A8AA /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = B5908EC87D7D3CF5C59076E4 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -904,7 +936,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 24F63BCFEB33B4C969305A46 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = FF6D68169B80BA9EF9BB9FF9 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -986,7 +1018,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 344F43B59CCE090C3271FF08 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = AE688642BED459D924D638C9 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1061,7 +1093,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 70748FF05FFD3CACB6F64CE0 /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = F73447C82A1342C8A6E3D99B /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1141,7 +1173,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 415E72A662B5ABF086AB7D7B /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = D4B4396706812C0485C86536 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1217,6 +1249,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1245,6 +1278,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				CXX = "";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				ENABLE_BITCODE = NO;
@@ -1284,6 +1318,8 @@
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				LD = "";
+				LDPLUSPLUS = "";
 				LIBRARY_SEARCH_PATHS = (
 					"$(SDKROOT)/usr/lib/swift",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
@@ -1306,6 +1342,7 @@
 				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
 				USE_HERMES = true;
 				VALID_ARCHS = arm64;
 				"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
@@ -1317,6 +1354,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1345,6 +1383,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
+				CXX = "";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				ENABLE_BITCODE = NO;
@@ -1375,6 +1414,8 @@
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				LD = "";
+				LDPLUSPLUS = "";
 				LIBRARY_SEARCH_PATHS = (
 					"$(SDKROOT)/usr/lib/swift",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",

ios/StatusIm/AppDelegate.mm

@@ -107,10 +107,10 @@ extern "C" NSString* StatusgoImageServerTLSCert();
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
-  return [self getBundleURL];
+  return [self bundleURL];
 }
 
-- (NSURL *)getBundleURL
+- (NSURL *)bundleURL
 {
 #if DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];

ios/StatusIm/Info.plist

@@ -117,7 +117,7 @@
 	<string>launch-image-universal</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>armv7</string>
+		<string>arm64</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>

ios/StatusIm/PrivacyInfo.xcprivacy

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>3B52.1</string>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>35F9.1</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>

metro.config.js

@@ -1,7 +1,7 @@
 const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
 /**
  * Metro configuration
- * https://facebook.github.io/metro/docs/configuration
+ * https://reactnative.dev/docs/metro
  *
  * @type {import('metro-config').MetroConfig}
  */

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

@@ -35,6 +35,11 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         return File(pubDirectory, gethLogFileName)
     }
 
+    private fun getPreLoginLogFile(): File {
+        val pubDirectory = utils.getPublicStorageDirectory()
+        return File(pubDirectory, preLoginLogFileName)
+    }
+
     fun prepareLogsFile(context: Context): File? {
         val logFile = getGethLogFile()
 
@@ -156,6 +161,7 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         val statusLogFile = File(logsTempDir, statusLogFileName)
         val gethLogFile = getGethLogFile()
         val requestLogFile = getRequestLogFile()
+        val preLoginLogFile = getPreLoginLogFile()
 
         try {
             if (zipFile.exists() || zipFile.createNewFile()) {
@@ -175,6 +181,9 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
             if (requestLogFile.exists()) {
                 filesToZip.add(requestLogFile)
             }
+            if (preLoginLogFile.exists()) {
+                filesToZip.add(preLoginLogFile)
+            }
             val zipped = zip(filesToZip.toTypedArray(), zipFile, errorList)
             if (zipped && zipFile.exists()) {
                 zipFile.setReadable(true, false)
@@ -205,6 +214,7 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         private const val gethLogFileName = "geth.log"
         private const val statusLogFileName = "Status.log"
         private const val requestsLogFileName = "api.log"
+        private const val preLoginLogFileName = "pre_login.log"
         private const val logsZipFileName = "Status-debug-logs.zip"
     }
 }

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

@@ -35,6 +35,7 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
 
     NSURL *mainGethLogsFile = [rootUrl URLByAppendingPathComponent:@"geth.log"];
     NSURL *mainLogsFile = [logsFolderName URLByAppendingPathComponent:@"geth.log"];
+    NSURL *preLoginLogFile = [rootUrl URLByAppendingPathComponent:@"pre_login.log"];
 
     NSURL *requestsLogFile = [rootUrl URLByAppendingPathComponent:@"api.log"];
 
@@ -46,6 +47,10 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
     if ([fileManager fileExistsAtPath:requestsLogFile.path]) {
         [fileManager copyItemAtPath:requestsLogFile.path toPath:[logsFolderName URLByAppendingPathComponent:@"api.log"].path error:nil];
     }
+    
+    if ([fileManager fileExistsAtPath:preLoginLogFile.path]) {
+        [fileManager copyItemAtPath:preLoginLogFile.path toPath:[logsFolderName URLByAppendingPathComponent:@"pre_login.log"].path error:nil];
+    }
 
     [SSZipArchive createZipFileAtPath:zipFile.path withContentsOfDirectory:logsFolderName.path];
     [fileManager removeItemAtPath:logsFolderName.path error:nil];

nix/deps/gradle/deps.list

@@ -5,11 +5,13 @@ androidx.activity:activity:1.6.0
 androidx.annotation:annotation-experimental:1.1.0
 androidx.annotation:annotation-experimental:1.3.0
 androidx.annotation:annotation-jvm:1.6.0
+androidx.annotation:annotation-jvm:1.7.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
 androidx.annotation:annotation:1.6.0
+androidx.annotation:annotation:1.7.0
 androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
@@ -35,7 +37,6 @@ androidx.cardview:cardview:1.0.0
 androidx.collection:collection:1.0.0
 androidx.collection:collection:1.1.0
 androidx.concurrent:concurrent-futures:1.0.0
-androidx.concurrent:concurrent-futures:1.1.0
 androidx.constraintlayout:constraintlayout-solver:2.0.4
 androidx.constraintlayout:constraintlayout:2.0.4
 androidx.coordinatorlayout:coordinatorlayout:1.0.0
@@ -60,7 +61,8 @@ 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:7.4.2
-androidx.databinding:databinding-common:8.1.1
+androidx.databinding:databinding-common:8.3.1
+androidx.databinding:databinding-common:8.5.0
 androidx.databinding:databinding-compiler-common:3.2.1
 androidx.databinding:databinding-compiler-common:3.5.3
 androidx.databinding:databinding-compiler-common:4.1.0
@@ -68,7 +70,18 @@ androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
 androidx.databinding:databinding-compiler-common:7.3.1
 androidx.databinding:databinding-compiler-common:7.4.2
-androidx.databinding:databinding-compiler-common:8.1.1
+androidx.databinding:databinding-compiler-common:8.3.1
+androidx.databinding:databinding-compiler-common:8.5.0
+androidx.datastore:datastore-android:1.1.1
+androidx.datastore:datastore-core-android:1.1.1
+androidx.datastore:datastore-core-okio-jvm:1.1.1
+androidx.datastore:datastore-core-okio:1.1.1
+androidx.datastore:datastore-core:1.1.1
+androidx.datastore:datastore-preferences-android:1.1.1
+androidx.datastore:datastore-preferences-core-jvm:1.1.1
+androidx.datastore:datastore-preferences-core:1.1.1
+androidx.datastore:datastore-preferences:1.1.1
+androidx.datastore:datastore:1.1.1
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
 androidx.emoji2:emoji2-views-helper:1.2.0
@@ -126,12 +139,6 @@ androidx.startup:startup-runtime:1.1.1
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02
-androidx.test.ext:junit:1.1.4-alpha05
-androidx.test.services:storage:1.4.2-alpha02
-androidx.test:annotation:1.0.0
-androidx.test:core:1.4.1-alpha05
-androidx.test:monitor:1.6.0-alpha02
-androidx.test:runner:1.5.0-alpha02
 androidx.tracing:tracing:1.1.0
 androidx.transition:transition:1.1.0
 androidx.transition:transition:1.2.0
@@ -155,14 +162,13 @@ commons-codec:commons-codec:1.9
 commons-codec:commons-codec:1.10
 commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
+commons-io:commons-io:2.13.0
 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
 com.airbnb.android:lottie:3.4.4
-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
@@ -172,7 +178,8 @@ com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
 com.android.databinding:baseLibrary:7.3.1
 com.android.databinding:baseLibrary:7.4.2
-com.android.databinding:baseLibrary:8.1.1
+com.android.databinding:baseLibrary:8.3.1
+com.android.databinding:baseLibrary:8.5.0
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.1
 com.android.tools.analytics-library:crash:26.2.1
@@ -182,7 +189,8 @@ com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
 com.android.tools.analytics-library:crash:30.3.1
 com.android.tools.analytics-library:crash:30.4.2
-com.android.tools.analytics-library:crash:31.1.1
+com.android.tools.analytics-library:crash:31.3.1
+com.android.tools.analytics-library:crash:31.5.0
 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.3
@@ -191,7 +199,8 @@ com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
 com.android.tools.analytics-library:protos:30.3.1
 com.android.tools.analytics-library:protos:30.4.2
-com.android.tools.analytics-library:protos:31.1.1
+com.android.tools.analytics-library:protos:31.3.1
+com.android.tools.analytics-library:protos:31.5.0
 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.3
@@ -200,7 +209,8 @@ com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
 com.android.tools.analytics-library:shared:30.3.1
 com.android.tools.analytics-library:shared:30.4.2
-com.android.tools.analytics-library:shared:31.1.1
+com.android.tools.analytics-library:shared:31.3.1
+com.android.tools.analytics-library:shared:31.5.0
 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.3
@@ -209,7 +219,8 @@ com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
 com.android.tools.analytics-library:tracker:30.3.1
 com.android.tools.analytics-library:tracker:30.4.2
-com.android.tools.analytics-library:tracker:31.1.1
+com.android.tools.analytics-library:tracker:31.3.1
+com.android.tools.analytics-library:tracker:31.5.0
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09
@@ -225,14 +236,16 @@ com.android.tools.build:aapt2-proto:7.0.4-7396180
 com.android.tools.build:aapt2-proto:7.2.1-7984345
 com.android.tools.build:aapt2-proto:7.3.1-8691043
 com.android.tools.build:aapt2-proto:7.4.2-8841542
-com.android.tools.build:aapt2-proto:8.1.1-10154469
+com.android.tools.build:aapt2-proto:8.3.1-10880808
+com.android.tools.build:aapt2-proto:8.5.0-11315950
 com.android.tools.build:aapt2:8.1.1-10154469
 com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:aaptcompiler:7.0.4
 com.android.tools.build:aaptcompiler:7.2.1
 com.android.tools.build:aaptcompiler:7.3.1
 com.android.tools.build:aaptcompiler:7.4.2
-com.android.tools.build:aaptcompiler:8.1.1
+com.android.tools.build:aaptcompiler:8.3.1
+com.android.tools.build:aaptcompiler:8.5.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
 com.android.tools.build:apksig:3.5.3
@@ -241,7 +254,8 @@ 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:7.4.2
-com.android.tools.build:apksig:8.1.1
+com.android.tools.build:apksig:8.3.1
+com.android.tools.build:apksig:8.5.0
 com.android.tools.build:apkzlib:3.2.1
 com.android.tools.build:apkzlib:3.5.3
 com.android.tools.build:apkzlib:4.1.0
@@ -249,7 +263,8 @@ com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
 com.android.tools.build:apkzlib:7.3.1
 com.android.tools.build:apkzlib:7.4.2
-com.android.tools.build:apkzlib:8.1.1
+com.android.tools.build:apkzlib:8.3.1
+com.android.tools.build:apkzlib:8.5.0
 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
@@ -260,7 +275,8 @@ com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
 com.android.tools.build:builder-model:7.3.1
 com.android.tools.build:builder-model:7.4.2
-com.android.tools.build:builder-model:8.1.1
+com.android.tools.build:builder-model:8.3.1
+com.android.tools.build:builder-model:8.5.0
 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
@@ -271,7 +287,8 @@ com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
 com.android.tools.build:builder-test-api:7.3.1
 com.android.tools.build:builder-test-api:7.4.2
-com.android.tools.build:builder-test-api:8.1.1
+com.android.tools.build:builder-test-api:8.3.1
+com.android.tools.build:builder-test-api:8.5.0
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.1
@@ -282,7 +299,8 @@ com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
 com.android.tools.build:builder:7.3.1
 com.android.tools.build:builder:7.4.2
-com.android.tools.build:builder:8.1.1
+com.android.tools.build:builder:8.3.1
+com.android.tools.build:builder:8.5.0
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
@@ -290,7 +308,8 @@ com.android.tools.build:bundletool:1.6.0
 com.android.tools.build:bundletool:1.8.2
 com.android.tools.build:bundletool:1.9.0
 com.android.tools.build:bundletool:1.11.4
-com.android.tools.build:bundletool:1.14.0
+com.android.tools.build:bundletool:1.15.6
+com.android.tools.build:bundletool:1.16.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.3
@@ -299,12 +318,14 @@ com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
 com.android.tools.build:gradle-api:7.3.1
 com.android.tools.build:gradle-api:7.4.2
-com.android.tools.build:gradle-api:8.1.1
+com.android.tools.build:gradle-api:8.3.1
+com.android.tools.build:gradle-api:8.5.0
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
 com.android.tools.build:gradle-core:3.0.1
 com.android.tools.build:gradle-settings-api:7.4.2
-com.android.tools.build:gradle-settings-api:8.1.1
+com.android.tools.build:gradle-settings-api:8.3.1
+com.android.tools.build:gradle-settings-api:8.5.0
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.1
@@ -315,7 +336,8 @@ com.android.tools.build:gradle:7.0.4
 com.android.tools.build:gradle:7.2.1
 com.android.tools.build:gradle:7.3.1
 com.android.tools.build:gradle:7.4.2
-com.android.tools.build:gradle:8.1.1
+com.android.tools.build:gradle:8.3.1
+com.android.tools.build:gradle:8.5.0
 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
@@ -326,7 +348,8 @@ com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
 com.android.tools.build:manifest-merger:30.3.1
 com.android.tools.build:manifest-merger:30.4.2
-com.android.tools.build:manifest-merger:31.1.1
+com.android.tools.build:manifest-merger:31.3.1
+com.android.tools.build:manifest-merger:31.5.0
 com.android.tools.build:transform-api:1.5.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
 com.android.tools.ddms:ddmlib:24.3.1
@@ -339,8 +362,9 @@ com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
 com.android.tools.ddms:ddmlib:30.3.1
 com.android.tools.ddms:ddmlib:30.4.2
-com.android.tools.ddms:ddmlib:31.1.1
-com.android.tools.emulator:proto:31.1.1
+com.android.tools.ddms:ddmlib:31.3.1
+com.android.tools.ddms:ddmlib:31.5.0
+com.android.tools.emulator:proto:31.5.0
 com.android.tools.external.com-intellij:intellij-core:26.0.1
 com.android.tools.external.lombok:lombok-ast:0.2.3
 com.android.tools.external.org-jetbrains:uast:26.0.1
@@ -356,7 +380,8 @@ com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
 com.android.tools.layoutlib:layoutlib-api:30.3.1
 com.android.tools.layoutlib:layoutlib-api:30.4.2
-com.android.tools.layoutlib:layoutlib-api:31.1.1
+com.android.tools.layoutlib:layoutlib-api:31.3.1
+com.android.tools.layoutlib:layoutlib-api:31.5.0
 com.android.tools.lint:lint-api:24.3.1
 com.android.tools.lint:lint-api:24.5.0
 com.android.tools.lint:lint-api:26.0.1
@@ -371,55 +396,67 @@ com.android.tools.lint:lint-model:30.0.4
 com.android.tools.lint:lint-model:30.2.1
 com.android.tools.lint:lint-model:30.3.1
 com.android.tools.lint:lint-model:30.4.2
-com.android.tools.lint:lint-model:31.1.1
+com.android.tools.lint:lint-model:31.3.1
+com.android.tools.lint:lint-model:31.5.0
 com.android.tools.lint:lint-typedef-remover:30.2.1
 com.android.tools.lint:lint-typedef-remover:30.3.1
 com.android.tools.lint:lint-typedef-remover:30.4.2
-com.android.tools.lint:lint-typedef-remover:31.1.1
+com.android.tools.lint:lint-typedef-remover:31.3.1
+com.android.tools.lint:lint-typedef-remover:31.5.0
 com.android.tools.lint:lint:24.3.1
 com.android.tools.lint:lint:24.5.0
 com.android.tools.lint:lint:26.0.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2
-com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.1
-com.android.tools.utp:android-device-provider-ddmlib:31.1.1
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.3.1
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.5.0
+com.android.tools.utp:android-device-provider-ddmlib:31.5.0
 com.android.tools.utp:android-device-provider-gradle-proto:30.0.4
 com.android.tools.utp:android-device-provider-gradle-proto:30.2.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.3.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.4.2
-com.android.tools.utp:android-device-provider-gradle-proto:31.1.1
-com.android.tools.utp:android-device-provider-gradle:31.1.1
+com.android.tools.utp:android-device-provider-gradle-proto:31.3.1
+com.android.tools.utp:android-device-provider-gradle-proto:31.5.0
+com.android.tools.utp:android-device-provider-gradle:31.5.0
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.1
-com.android.tools.utp:android-test-plugin-host-additional-test-output:31.1.1
-com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.1
-com.android.tools.utp:android-test-plugin-host-apk-installer:31.1.1
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.3.1
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.5.0
+com.android.tools.utp:android-test-plugin-host-additional-test-output:31.5.0
+com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.3.1
+com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.5.0
+com.android.tools.utp:android-test-plugin-host-apk-installer:31.5.0
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2
-com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.1
-com.android.tools.utp:android-test-plugin-host-coverage:31.1.1
-com.android.tools.utp:android-test-plugin-host-device-info-proto:31.1.1
-com.android.tools.utp:android-test-plugin-host-device-info:31.1.1
-com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.1
-com.android.tools.utp:android-test-plugin-host-emulator-control:31.1.1
-com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.1
-com.android.tools.utp:android-test-plugin-host-logcat:31.1.1
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.3.1
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.5.0
+com.android.tools.utp:android-test-plugin-host-coverage:31.5.0
+com.android.tools.utp:android-test-plugin-host-device-info-proto:31.5.0
+com.android.tools.utp:android-test-plugin-host-device-info:31.5.0
+com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.3.1
+com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.5.0
+com.android.tools.utp:android-test-plugin-host-emulator-control:31.5.0
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.3.1
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.5.0
+com.android.tools.utp:android-test-plugin-host-logcat:31.5.0
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.4
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2
-com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.1
-com.android.tools.utp:android-test-plugin-host-retention:31.1.1
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.3.1
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.5.0
+com.android.tools.utp:android-test-plugin-host-retention:31.5.0
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.4
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.1
-com.android.tools.utp:android-test-plugin-result-listener-gradle:31.1.1
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.3.1
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.5.0
+com.android.tools.utp:android-test-plugin-result-listener-gradle:31.5.0
+com.android.tools.utp:utp-common:31.5.0
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.1
@@ -430,7 +467,8 @@ com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
 com.android.tools:annotations:30.3.1
 com.android.tools:annotations:30.4.2
-com.android.tools:annotations:31.1.1
+com.android.tools:annotations:31.3.1
+com.android.tools:annotations:31.5.0
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.1
@@ -441,7 +479,8 @@ com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
 com.android.tools:common:30.3.1
 com.android.tools:common:30.4.2
-com.android.tools:common:31.1.1
+com.android.tools:common:31.3.1
+com.android.tools:common:31.5.0
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.1
@@ -452,7 +491,8 @@ com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
 com.android.tools:dvlib:30.3.1
 com.android.tools:dvlib:30.4.2
-com.android.tools:dvlib:31.1.1
+com.android.tools:dvlib:31.3.1
+com.android.tools:dvlib:31.5.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
 com.android.tools:repository:26.5.3
@@ -461,7 +501,8 @@ com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
 com.android.tools:repository:30.3.1
 com.android.tools:repository:30.4.2
-com.android.tools:repository:31.1.1
+com.android.tools:repository:31.3.1
+com.android.tools:repository:31.5.0
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.1
@@ -472,7 +513,8 @@ com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
 com.android.tools:sdklib:30.3.1
 com.android.tools:sdklib:30.4.2
-com.android.tools:sdklib:31.1.1
+com.android.tools:sdklib:31.3.1
+com.android.tools:sdklib:31.5.0
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.1
@@ -483,19 +525,22 @@ com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
 com.android.tools:sdk-common:30.3.1
 com.android.tools:sdk-common:30.4.2
-com.android.tools:sdk-common:31.1.1
+com.android.tools:sdk-common:31.3.1
+com.android.tools:sdk-common:31.5.0
 com.android:signflinger:4.1.0
 com.android:signflinger:7.0.4
 com.android:signflinger:7.2.1
 com.android:signflinger:7.3.1
 com.android:signflinger:7.4.2
-com.android:signflinger:8.1.1
+com.android:signflinger:8.3.1
+com.android:signflinger:8.5.0
 com.android:zipflinger:4.1.0
 com.android:zipflinger:7.0.4
 com.android:zipflinger:7.2.1
 com.android:zipflinger:7.3.1
 com.android:zipflinger:7.4.2
-com.android:zipflinger:8.1.1
+com.android:zipflinger:8.3.1
+com.android:zipflinger:8.5.0
 com.diffplug.durian:durian-collect:1.2.0
 com.diffplug.durian:durian-core:1.2.0
 com.diffplug.durian:durian-io:1.2.0
@@ -507,41 +552,41 @@ com.diffplug.spotless:spotless-plugin-gradle:6.7.2
 com.diffplug.spotless:spotless-plugin-gradle:6.11.0
 com.drewnoakes:metadata-extractor:2.18.0
 com.facebook.conceal:conceal:1.1.3
-com.facebook.fbjni:fbjni:0.5.1
+com.facebook.fbjni:fbjni:0.6.0
 com.facebook.fresco:animated-base:2.5.0
 com.facebook.fresco:animated-drawable:2.5.0
 com.facebook.fresco:animated-gif:2.5.0
 com.facebook.fresco:drawee:2.5.0
-com.facebook.fresco:drawee:3.1.3
+com.facebook.fresco:drawee:3.2.0
 com.facebook.fresco:fbcore:2.5.0
-com.facebook.fresco:fbcore:3.1.3
+com.facebook.fresco:fbcore:3.2.0
 com.facebook.fresco:fresco:2.5.0
-com.facebook.fresco:fresco:3.1.3
+com.facebook.fresco:fresco:3.2.0
 com.facebook.fresco:imagepipeline-base:2.5.0
-com.facebook.fresco:imagepipeline-base:3.1.3
+com.facebook.fresco:imagepipeline-base:3.2.0
 com.facebook.fresco:imagepipeline-native:2.5.0
-com.facebook.fresco:imagepipeline-native:3.1.3
-com.facebook.fresco:imagepipeline-okhttp3:3.1.3
+com.facebook.fresco:imagepipeline-native:3.2.0
+com.facebook.fresco:imagepipeline-okhttp3:3.2.0
 com.facebook.fresco:imagepipeline:2.5.0
-com.facebook.fresco:imagepipeline:3.1.3
+com.facebook.fresco:imagepipeline:3.2.0
 com.facebook.fresco:memory-type-ashmem:2.5.0
-com.facebook.fresco:memory-type-ashmem:3.1.3
+com.facebook.fresco:memory-type-ashmem:3.2.0
 com.facebook.fresco:memory-type-java:2.5.0
-com.facebook.fresco:memory-type-java:3.1.3
+com.facebook.fresco:memory-type-java:3.2.0
 com.facebook.fresco:memory-type-native:2.5.0
-com.facebook.fresco:memory-type-native:3.1.3
-com.facebook.fresco:middleware:3.1.3
+com.facebook.fresco:memory-type-native:3.2.0
+com.facebook.fresco:middleware:3.2.0
 com.facebook.fresco:nativeimagefilters:2.5.0
-com.facebook.fresco:nativeimagefilters:3.1.3
+com.facebook.fresco:nativeimagefilters:3.2.0
 com.facebook.fresco:nativeimagetranscoder:2.5.0
-com.facebook.fresco:nativeimagetranscoder:3.1.3
-com.facebook.fresco:soloader:3.1.3
-com.facebook.fresco:ui-common:3.1.3
+com.facebook.fresco:nativeimagetranscoder:3.2.0
+com.facebook.fresco:soloader:3.2.0
+com.facebook.fresco:ui-common:3.2.0
 com.facebook.infer.annotation:infer-annotation:0.18.0
-com.facebook.react:react-android:0.73.5
-com.facebook.soloader:annotation:0.10.5
-com.facebook.soloader:nativeloader:0.10.5
-com.facebook.soloader:soloader:0.10.5
+com.facebook.react:react-android:0.75.3
+com.facebook.soloader:annotation:0.11.0
+com.facebook.soloader:nativeloader:0.11.0
+com.facebook.soloader:soloader:0.11.0
 com.facebook.yoga:proguard-annotations:1.19.0
 com.fasterxml.jackson.core:jackson-annotations:2.11.1
 com.fasterxml.jackson.core:jackson-core:2.11.1
@@ -575,9 +620,9 @@ com.google.android.material:material:1.2.0-alpha03
 com.google.android:annotations:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-common-protos:2.0.1
+com.google.api.grpc:proto-google-common-protos:2.17.0
 com.google.auto.value:auto-value-annotations:1.6.2
 com.google.auto.value:auto-value-annotations:1.6.3
-com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.5.2
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
@@ -588,6 +633,7 @@ com.google.code.gson:gson:2.8.5
 com.google.code.gson:gson:2.8.6
 com.google.code.gson:gson:2.8.9
 com.google.code.gson:gson:2.9.1
+com.google.code.gson:gson:2.10.1
 com.google.crypto.tink:tink:1.3.0-rc2
 com.google.crypto.tink:tink:1.7.0
 com.google.dagger:dagger:2.28.3
@@ -598,8 +644,7 @@ com.google.errorprone:error_prone_annotations:2.3.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_annotations:2.4.0
 com.google.errorprone:error_prone_annotations:2.7.1
-com.google.errorprone:error_prone_annotations:2.9.0
-com.google.errorprone:error_prone_annotations:2.11.0
+com.google.errorprone:error_prone_annotations:2.18.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
@@ -610,33 +655,34 @@ com.google.guava:guava:28.1-jre
 com.google.guava:guava:29.0-jre
 com.google.guava:guava:30.1-jre
 com.google.guava:guava:31.0.1-jre
-com.google.guava:guava:31.1-jre
+com.google.guava:guava:32.0.1-jre
 com.google.guava:listenablefuture:1.0
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.j2objc:j2objc-annotations:1.3
+com.google.j2objc:j2objc-annotations:2.8
 com.google.jimfs:jimfs:1.1
-com.google.prefab:cli:2.0.0
+com.google.prefab:cli:2.1.0
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java-util:3.10.0
 com.google.protobuf:protobuf-java-util:3.17.2
-com.google.protobuf:protobuf-java-util:3.19.3
+com.google.protobuf:protobuf-java-util:3.22.3
 com.google.protobuf:protobuf-java:3.0.0
 com.google.protobuf:protobuf-java:3.4.0
 com.google.protobuf:protobuf-java:3.10.0
 com.google.protobuf:protobuf-java:3.17.2
-com.google.protobuf:protobuf-java:3.19.3
-com.google.testing.platform:android-device-provider-local:0.0.8-alpha08
-com.google.testing.platform:android-driver-instrumentation:0.0.8-alpha08
-com.google.testing.platform:android-test-plugin:0.0.8-alpha08
+com.google.protobuf:protobuf-java:3.22.3
+com.google.testing.platform:android-device-provider-local:0.0.9-alpha02
+com.google.testing.platform:android-driver-instrumentation:0.0.9-alpha02
+com.google.testing.platform:android-test-plugin:0.0.9-alpha02
 com.google.testing.platform:core-proto:0.0.8-alpha04
 com.google.testing.platform:core-proto:0.0.8-alpha07
 com.google.testing.platform:core-proto:0.0.8-alpha08
-com.google.testing.platform:core:0.0.8-alpha08
-com.google.testing.platform:launcher:0.0.8-alpha08
+com.google.testing.platform:core-proto:0.0.9-alpha02
+com.google.testing.platform:core:0.0.9-alpha02
+com.google.testing.platform:launcher:0.0.9-alpha02
 com.google.test.platform:core-proto:0.0.2-dev
 com.google.zxing:core:3.4.1
-com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
 com.parse.bolts:bolts-tasks:1.4.0
 com.squareup.okhttp3:okhttp-tls:4.11.0
@@ -644,8 +690,10 @@ com.squareup.okhttp3:okhttp-urlconnection:4.9.2
 com.squareup.okhttp3:okhttp:4.9.2
 com.squareup.okhttp3:okhttp:4.11.0
 com.squareup.okio:okio-jvm:3.2.0
+com.squareup.okio:okio-jvm:3.4.0
 com.squareup.okio:okio:2.9.0
 com.squareup.okio:okio:3.2.0
+com.squareup.okio:okio:3.4.0
 com.squareup:javapoet:1.8.0
 com.squareup:javapoet:1.10.0
 com.squareup:javapoet:1.13.0
@@ -664,60 +712,61 @@ de.undercouch:gradle-download-task:4.1.1
 de.undercouch:gradle-download-task:5.0.1
 io.grpc:grpc-api:1.21.1
 io.grpc:grpc-api:1.39.0
-io.grpc:grpc-api:1.45.1
+io.grpc:grpc-api:1.57.0
 io.grpc:grpc-context:1.21.1
 io.grpc:grpc-context:1.39.0
-io.grpc:grpc-context:1.45.1
+io.grpc:grpc-context:1.57.0
 io.grpc:grpc-core:1.21.1
 io.grpc:grpc-core:1.39.0
-io.grpc:grpc-core:1.45.1
+io.grpc:grpc-core:1.57.0
 io.grpc:grpc-netty:1.21.1
 io.grpc:grpc-netty:1.39.0
-io.grpc:grpc-netty:1.45.1
+io.grpc:grpc-netty:1.57.0
 io.grpc:grpc-protobuf-lite:1.21.1
 io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf-lite:1.45.1
+io.grpc:grpc-protobuf-lite:1.57.0
 io.grpc:grpc-protobuf:1.21.1
 io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-protobuf:1.45.1
+io.grpc:grpc-protobuf:1.57.0
 io.grpc:grpc-stub:1.21.1
 io.grpc:grpc-stub:1.39.0
-io.grpc:grpc-stub:1.45.1
+io.grpc:grpc-stub:1.57.0
 io.legere:pdfiumandroid:1.0.19
 io.netty:netty-buffer:4.1.34.Final
 io.netty:netty-buffer:4.1.52.Final
-io.netty:netty-buffer:4.1.72.Final
+io.netty:netty-buffer:4.1.93.Final
 io.netty:netty-codec-http2:4.1.34.Final
 io.netty:netty-codec-http2:4.1.52.Final
-io.netty:netty-codec-http2:4.1.72.Final
+io.netty:netty-codec-http2:4.1.93.Final
 io.netty:netty-codec-http:4.1.34.Final
 io.netty:netty-codec-http:4.1.52.Final
-io.netty:netty-codec-http:4.1.72.Final
+io.netty:netty-codec-http:4.1.93.Final
 io.netty:netty-codec-socks:4.1.34.Final
 io.netty:netty-codec-socks:4.1.52.Final
-io.netty:netty-codec-socks:4.1.72.Final
+io.netty:netty-codec-socks:4.1.93.Final
 io.netty:netty-codec:4.1.34.Final
 io.netty:netty-codec:4.1.52.Final
-io.netty:netty-codec:4.1.72.Final
+io.netty:netty-codec:4.1.93.Final
 io.netty:netty-common:4.1.34.Final
 io.netty:netty-common:4.1.52.Final
-io.netty:netty-common:4.1.72.Final
+io.netty:netty-common:4.1.93.Final
 io.netty:netty-handler-proxy:4.1.34.Final
 io.netty:netty-handler-proxy:4.1.52.Final
-io.netty:netty-handler-proxy:4.1.72.Final
+io.netty:netty-handler-proxy:4.1.93.Final
 io.netty:netty-handler:4.1.34.Final
 io.netty:netty-handler:4.1.52.Final
-io.netty:netty-handler:4.1.72.Final
+io.netty:netty-handler:4.1.93.Final
 io.netty:netty-resolver:4.1.34.Final
 io.netty:netty-resolver:4.1.52.Final
-io.netty:netty-resolver:4.1.72.Final
-io.netty:netty-tcnative-classes:2.0.46.Final
+io.netty:netty-resolver:4.1.93.Final
+io.netty:netty-transport-native-unix-common:4.1.93.Final
 io.netty:netty-transport:4.1.34.Final
 io.netty:netty-transport:4.1.52.Final
-io.netty:netty-transport:4.1.72.Final
+io.netty:netty-transport:4.1.93.Final
 io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.21.0
 io.perfmark:perfmark-api:0.23.0
+io.perfmark:perfmark-api:0.26.0
 it.unimi.dsi:fastutil:7.2.0
 it.unimi.dsi:fastutil:8.4.0
 jakarta.activation:jakarta.activation-api:1.2.1
@@ -731,9 +780,8 @@ junit:junit:4.12
 junit:junit:4.13.2
 me.zhanghai.android.materialprogressbar:library:1.4.2
 net.bytebuddy:byte-buddy-agent:1.11.13
-net.bytebuddy:byte-buddy-agent:1.11.19
 net.bytebuddy:byte-buddy:1.11.13
-net.bytebuddy:byte-buddy:1.11.19
+net.bytebuddy:byte-buddy:1.14.11
 net.java.dev.jna:jna-platform:5.6.0
 net.java.dev.jna:jna:5.6.0
 net.sf.jopt-simple:jopt-simple:4.9
@@ -761,30 +809,36 @@ org.apache.httpcomponents:httpclient:4.5.2
 org.apache.httpcomponents:httpclient:4.5.6
 org.apache.httpcomponents:httpclient:4.5.9
 org.apache.httpcomponents:httpclient:4.5.13
+org.apache.httpcomponents:httpclient:4.5.14
 org.apache.httpcomponents:httpcore:4.1
 org.apache.httpcomponents:httpcore:4.2.5
 org.apache.httpcomponents:httpcore:4.4.5
 org.apache.httpcomponents:httpcore:4.4.10
 org.apache.httpcomponents:httpcore:4.4.11
 org.apache.httpcomponents:httpcore:4.4.13
-org.apache.httpcomponents:httpcore:4.4.15
+org.apache.httpcomponents:httpcore:4.4.16
 org.apache.httpcomponents:httpmime:4.1
 org.apache.httpcomponents:httpmime:4.5.2
 org.apache.httpcomponents:httpmime:4.5.6
+org.assertj:assertj-core:3.25.1
 org.bitbucket.b_c:jose4j:0.7.0
+org.bitbucket.b_c:jose4j:0.9.5
 org.bouncycastle:bcpkix-jdk15on:1.48
 org.bouncycastle:bcpkix-jdk15on:1.56
 org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk18on:1.77
 org.bouncycastle:bcprov-jdk15on:1.48
 org.bouncycastle:bcprov-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.60
 org.bouncycastle:bcprov-jdk15on:1.67
-org.bouncycastle:bcprov-jdk15on:1.68
+org.bouncycastle:bcprov-jdk18on:1.77
+org.bouncycastle:bcutil-jdk18on:1.77
 org.checkerframework:checker-qual:2.5.2
 org.checkerframework:checker-qual:2.8.1
 org.checkerframework:checker-qual:2.11.1
 org.checkerframework:checker-qual:3.5.0
 org.checkerframework:checker-qual:3.12.0
+org.checkerframework:checker-qual:3.33.0
 org.codehaus.groovy:groovy-xml:3.0.9
 org.codehaus.groovy:groovy-xml:3.0.10
 org.codehaus.groovy:groovy:3.0.9
@@ -793,12 +847,12 @@ org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.codehaus.mojo:animal-sniffer-annotations:1.19
+org.codehaus.mojo:animal-sniffer-annotations:1.23
 org.codehaus.woodstox:stax2-api:4.2.1
 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
@@ -809,7 +863,6 @@ org.glassfish.jaxb:txw2:2.3.2
 org.gradle.toolchains:foojay-resolver:0.5.0
 org.gradle:github-dependency-graph-gradle-plugin:1.3.2
 org.hamcrest:hamcrest-core:1.3
-org.hamcrest:hamcrest:2.2
 org.jacoco:org.jacoco.core:0.7.4.201502262128
 org.jacoco:org.jacoco.report:0.7.4.201502262128
 org.jdom:jdom2:2.0.6
@@ -817,69 +870,59 @@ org.jetbrains.dokka:dokka-core:1.4.32
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
 org.jetbrains.kotlinx:atomicfu:0.16.3
+org.jetbrains.kotlinx:atomicfu:0.21.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.6.3
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
-org.jetbrains.kotlin:kotlin-android-extensions:1.8.0
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
+org.jetbrains.kotlin:kotlin-android-extensions:1.9.24
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.0
 org.jetbrains.kotlin:kotlin-build-common:1.6.20
-org.jetbrains.kotlin:kotlin-build-common:1.8.0
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.0
-org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.0
+org.jetbrains.kotlin:kotlin-build-common:1.9.24
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.24
+org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.24
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.0
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
 org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-runner:1.8.0
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.0
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.24
 org.jetbrains.kotlin:kotlin-daemon-client:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-client:1.8.0
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.0
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.24
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.0
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.0
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.24
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.24
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.24
 org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.0
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.0
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.0
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.24
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.24
 org.jetbrains.kotlin:kotlin-native-utils:1.6.20
-org.jetbrains.kotlin:kotlin-native-utils:1.8.0
-org.jetbrains.kotlin:kotlin-native-utils:1.9.0
+org.jetbrains.kotlin:kotlin-native-utils:1.9.24
+org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
 org.jetbrains.kotlin:kotlin-project-model:1.6.20
-org.jetbrains.kotlin:kotlin-project-model:1.8.0
-org.jetbrains.kotlin:kotlin-project-model:1.9.0
+org.jetbrains.kotlin:kotlin-project-model:1.9.24
 org.jetbrains.kotlin:kotlin-reflect:1.1.3-2
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
 org.jetbrains.kotlin:kotlin-reflect:1.3.50
@@ -888,21 +931,16 @@ org.jetbrains.kotlin:kotlin-reflect:1.4.32
 org.jetbrains.kotlin:kotlin-reflect:1.5.31
 org.jetbrains.kotlin:kotlin-reflect:1.6.10
 org.jetbrains.kotlin:kotlin-reflect:1.7.10
-org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-reflect:1.9.20
 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-common:1.8.0
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.24
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.0
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.0
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.0
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0
-org.jetbrains.kotlin:kotlin-script-runtime:1.8.0
-org.jetbrains.kotlin:kotlin-script-runtime:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24
+org.jetbrains.kotlin:kotlin-script-runtime:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
@@ -910,32 +948,31 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10
-org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2
-org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20
+org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
@@ -944,20 +981,14 @@ org.jetbrains.kotlin:kotlin-stdlib:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib:1.7.10
-org.jetbrains.kotlin:kotlin-stdlib:1.8.0
-org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2
-org.jetbrains.kotlin:kotlin-stdlib:1.8.21
-org.jetbrains.kotlin:kotlin-stdlib:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
-org.jetbrains.kotlin:kotlin-tooling-core:1.8.0
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.0
+org.jetbrains.kotlin:kotlin-stdlib:1.9.20
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.24
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
 org.jetbrains.kotlin:kotlin-util-io:1.6.20
-org.jetbrains.kotlin:kotlin-util-io:1.8.0
-org.jetbrains.kotlin:kotlin-util-io:1.9.0
+org.jetbrains.kotlin:kotlin-util-io:1.9.24
 org.jetbrains.kotlin:kotlin-util-klib:1.6.20
-org.jetbrains.kotlin:kotlin-util-klib:1.8.0
-org.jetbrains.kotlin:kotlin-util-klib:1.9.0
+org.jetbrains.kotlin:kotlin-util-klib:1.9.24
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
 org.jetbrains:annotations:23.0.0
@@ -969,8 +1000,6 @@ org.jvnet.staxex:stax-ex:1.7.7
 org.jvnet.staxex:stax-ex:1.8
 org.jvnet.staxex:stax-ex:1.8.1
 org.mockito:mockito-core:3.12.4
-org.mockito:mockito-core:4.0.0
-org.mockito:mockito-inline:4.0.0
 org.objenesis:objenesis:3.2
 org.ow2.asm:asm-analysis:5.0.3
 org.ow2.asm:asm-analysis:5.1
@@ -978,11 +1007,13 @@ org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-analysis:9.1
 org.ow2.asm:asm-analysis:9.2
+org.ow2.asm:asm-analysis:9.6
 org.ow2.asm:asm-commons:5.1
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-commons:9.1
 org.ow2.asm:asm-commons:9.2
+org.ow2.asm:asm-commons:9.6
 org.ow2.asm:asm-debug-all:5.0.1
 org.ow2.asm:asm-tree:5.0.3
 org.ow2.asm:asm-tree:5.1
@@ -990,36 +1021,29 @@ org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-tree:9.1
 org.ow2.asm:asm-tree:9.2
+org.ow2.asm:asm-tree:9.6
 org.ow2.asm:asm-util:5.1
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm-util:7.0
 org.ow2.asm:asm-util:9.1
 org.ow2.asm:asm-util:9.2
+org.ow2.asm:asm-util:9.6
 org.ow2.asm:asm:5.0.3
 org.ow2.asm:asm:5.1
 org.ow2.asm:asm:6.0
 org.ow2.asm:asm:7.0
 org.ow2.asm:asm:9.1
 org.ow2.asm:asm:9.2
-org.robolectric:annotations:4.7.3
-org.robolectric:junit:4.7.3
-org.robolectric:nativeruntime:4.7.3
-org.robolectric:pluginapi:4.7.3
-org.robolectric:plugins-maven-dependency-resolver:4.7.3
-org.robolectric:resources:4.7.3
-org.robolectric:robolectric:4.7.3
-org.robolectric:sandbox:4.7.3
-org.robolectric:shadowapi:4.7.3
-org.robolectric:shadows-framework:4.7.3
-org.robolectric:utils-reflector:4.7.3
-org.robolectric:utils:4.7.3
+org.ow2.asm:asm:9.6
 org.slf4j:slf4j-api:1.7.30
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
 xerces:xercesImpl:2.12.0
 xml-apis:xml-apis:1.4.01
 org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.24
 com.android.tools.build:gradle:3.5.4
-com.facebook.react:hermes-android:0.73.5
-com.android.tools.lint:lint-gradle:31.1.1
+com.facebook.react:hermes-android:0.75.3
+com.android.tools.lint:lint-gradle:31.5.0
+org.junit:junit-bom:5.9.3
+org.junit:junit-bom:5.9.2

nix/deps/gradle/deps_hack.sh

@@ -6,6 +6,7 @@ readonly FOOJAY_FALLBACK="0.5.0"
 readonly KOTLIN_FALLBACK="1.8.0"
 readonly TOOLS_FALLBACK="3.5.4"
 readonly HERMES_FALLBACK="0.73.5"
+readonly GRADLE_LINT_FALLBACK="31.1.1"
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 cd "${GIT_ROOT}"
@@ -25,16 +26,30 @@ get_version() {
     echo "$version"
 }
 
+# https://github.com/googlesamples/android-custom-lint-rules/blob/be672cd747ecf13844918e1afccadb935f856a72/docs/api-guide/example.md.html#L112-L129
+get_gradle_lint_version() {
+  gradlePluginVersion=$(get_version "./nix/pkgs/aapt2/default.nix" "version =" $GRADLE_LINT_FALLBACK)
+  major=$(echo "$gradlePluginVersion" | grep -o "^[0-9]*")
+  #  lintVersion = gradlePluginVersion + 23.0.0
+  major=$((major + 23))
+  minor=$(echo "$gradlePluginVersion" | grep -o "\.[0-9]*\." | grep -o "[0-9]*")
+  patch=$(echo "$gradlePluginVersion" | grep -o "[0-9]*$")
+
+  echo "$major.$minor.$patch"
+}
+
 foojay_version=$(get_version "./node_modules/@react-native/gradle-plugin/settings.gradle.kts" "foojay.*version" "$FOOJAY_FALLBACK")
 kotlin_version=$(get_version "./node_modules/@react-native/gradle-plugin/gradle/libs.versions.toml" "kotlin =" "$KOTLIN_FALLBACK")
 tools_version=$(get_version "./patches/BlurView-build.gradle.patch" "gradle:" "$TOOLS_FALLBACK")
 hermes_version=$(get_version "./node_modules/react-native/ReactAndroid/gradle.properties" "VERSION_NAME" "$HERMES_FALLBACK")
-
+lint_version=$(get_gradle_lint_version)
 
 cat << EOF
 org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:$foojay_version
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$kotlin_version
 com.android.tools.build:gradle:$tools_version
 com.facebook.react:hermes-android:$hermes_version
-com.android.tools.lint:lint-gradle:31.1.1
+com.android.tools.lint:lint-gradle:$lint_version
+org.junit:junit-bom:5.9.3
+org.junit:junit-bom:5.9.2
 EOF

nix/mobile/android/build.nix

@@ -49,6 +49,7 @@ let
     else "Release";
 
   apksPath = "./android/app/build/outputs/apk/${toLower gradleBuildType}";
+  autolinkingPath = "android/build/generated/autolinking";
 
   baseName = "${buildType}-android";
 in stdenv.mkDerivation rec {
@@ -72,7 +73,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = with pkgs; [ nodejs openjdk ];
-  nativeBuildInputs = with pkgs; [ bash gradle unzip ]
+  nativeBuildInputs = with pkgs; [ bash gradle unzip jq gnused ]
     ++ lib.optionals stdenv.isDarwin [ file gnumake ];
 
   # Disable metro watching for file changes. (#13783)
@@ -96,7 +97,7 @@ in stdenv.mkDerivation rec {
   NODE_OPTIONS = "--openssl-legacy-provider";
 
   phases = [
-    "shellHook" "unpackPhase" "secretsPhase" "buildPhase" "checkPhase" "installPhase"
+    "shellHook" "unpackPhase" "secretsPhase" "autolinkPhase" "buildPhase" "checkPhase" "installPhase"
   ];
 
   # We use shellHook as a single place to setup env vars for both build derivation and shell
@@ -116,6 +117,7 @@ in stdenv.mkDerivation rec {
     chmod u+w -R ./
     runHook postUnpack
   '';
+
   postUnpack = ''
     # Ensure we have the right .env file
     cp -bf ./${envFileName} ./.env
@@ -148,6 +150,21 @@ in stdenv.mkDerivation rec {
     echo 'WARNING: No secrets provided!' >&2
   '';
 
+  # Since react-native 0.75.x the autolinking.json file is required to build android.
+  autolinkPhase = ''
+    mkdir -p ${autolinkingPath}
+
+    # Generate initial autolinking.json using react-native config
+    echo "Generating autolinking.json..."
+    ${deps.nodejs-patched}/node_modules/react-native/cli.js config > ${autolinkingPath}/autolinking.json
+
+    # The json contains absolute paths, which can not be accessed from nix derivation
+    ROOT_VALUE=$(${pkgs.jq}/bin/jq -r '.root' ${autolinkingPath}/autolinking.json)
+
+    # This step makes the paths in autolinking.json relative to root directory
+    sed -i "s|$ROOT_VALUE|..|g" ${autolinkingPath}/autolinking.json
+  '';
+
   buildPhase = let
     adhocEnvVars = optionalString stdenv.isLinux
       "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${makeLibraryPath [ pkgs.zlib ]}";

nix/pkgs/aapt2/default.nix

@@ -10,7 +10,8 @@ let
 
   pname = "aapt2";
   # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  version = "8.1.1-10154469";
+  # also referenced in nix/deps/gradle/deps_hack.sh
+  version = "8.5.0-11315950";
 
   pkgPath = "com/android/tools/build/aapt2";
   repoUrl = "https://dl.google.com/dl/android/maven2";
@@ -29,20 +30,20 @@ let
     jar = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}";
       sha256 = getAttr platform {
-        linux = "sha256-p54GGvEfAo0yk8euVO7QTu/c3zuityZhyGdhFSV6w+E=";
-        osx = "sha256-bO4ljdUEfbuns7EyT1FKGLqNGz+0bms5XsplXvzD2T0=";
+        linux = "sha256-DjB8BoQz77xkWhhk1DgLx5kRz13jEal2+SBAyyGHOdw=";
+        osx = "sha256-WNIP05Kek224CbMpmYtMN/8XyGijKgsDjD2ySfAf/lU=";
       };
     };
     sha = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}.sha1";
       sha256 = getAttr platform {
-        linux = "sha256-oUJOQ9j/sJ7Yt0V9WOrRmuqYI+2UWZxeefJ/WyNoWgw=";
-        osx = "sha256-w+q2j4MKtIOihPMaJxuIP9IwXvRIyBxgRIJLox4E7ac=";
+        linux = "sha256-FFMO+i6fvKUbr2wXjw7a/FdrLCLZwvi+B8s4FuzB8Wg=";
+        osx = "sha256-go0UDA+ISNaQXE+4i374sDXUGH+P2lLhlGZ9oWsSnQs=";
       };
     };
     pom = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.pom}";
-      sha256 = "sha256-UdUGCoMmEfJxBS2demYKGdG4lzd2DqQbDUCHt/h7Ohg=";
+      sha256 = "sha256-fQRRqAVn6VY+eTfrt3UZU3PPiHk9IJ6pCjj948ROnvA=";
     };
   };
 

nix/pkgs/android-sdk/compose.nix

@@ -18,7 +18,7 @@ androidenv.composeAndroidPackages {
   platformVersions = [ "34" ];
   # This version must match cmake version inside android/app/build.gradle
   cmakeVersions = [ "3.22.1" ];
-  ndkVersion = "25.2.9519653";
+  ndkVersion = "26.1.10909125";
   includeNDK = true;
   includeExtras = [
     "extras;android;m2repository"

package.json

@@ -15,6 +15,7 @@
     "@react-native-clipboard/clipboard": "1.13.2",
     "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
     "@react-native-community/blur": "4.4.1",
+    "@react-native-community/cli": "14.1.1",
     "@react-native-community/hooks": "^3.0.0",
     "@react-native-community/masked-view": "^0.1.6",
     "@react-native-community/netinfo": "^4.4.0",
@@ -35,32 +36,32 @@
     "i18n-js": "^3.3.0",
     "jsc-android": "^250231.0.0",
     "node-libs-react-native": "^1.2.1",
-    "react": "18.2.0",
-    "react-dom": "18.0.0",
-    "react-native": "0.73.5",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-native": "0.75.3",
     "react-native-background-timer": "^2.1.1",
     "react-native-biometrics": "^3.0.1",
     "react-native-blob-util": "^0.13.18",
     "react-native-camera-kit": "git+https://github.com/status-im/react-native-camera-kit.git#refs/tags/v14.0.0-beta15-status-v1",
-    "react-native-config": "^1.5.0",
+    "react-native-config": "1.5.3",
     "react-native-dialogs": "1.1.2",
     "react-native-draggable-flatlist": "4.0.1",
     "react-native-fast-image": "^8.5.11",
     "react-native-fs": "^2.14.1",
-    "react-native-gesture-handler": "2.14.1",
+    "react-native-gesture-handler": "2.22.0",
     "react-native-get-random-values": "^1.11.0",
     "react-native-gifted-charts": "^1.3.2",
     "react-native-hole-view": "^3.0.0-alpha4",
     "react-native-image-crop-picker": "0.41.2",
     "react-native-image-resizer": "^1.2.3",
-    "react-native-keychain": "8.1.2",
+    "react-native-keychain": "9.2.2",
     "react-native-linear-gradient": "3.0.0-alpha.1",
     "react-native-lottie-splash-screen": "^1.0.1",
-    "react-native-navigation": "7.39.0",
+    "react-native-navigation": "7.40.1",
     "react-native-orientation-locker": "^1.5.0",
     "react-native-pdf": "^6.7.5",
     "react-native-permissions": "4.1.5",
-    "react-native-reanimated": "3.6.1",
+    "react-native-reanimated": "3.16.6",
     "react-native-redash": "18.1.0",
     "react-native-shadow-2": "^7.0.8",
     "react-native-shake": "^3.3.1",
@@ -79,18 +80,23 @@
     "@babel/preset-env": "^7.20.0",
     "@babel/preset-react": "^7.18.6",
     "@babel/register": "7.0.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0-0",
+    "@babel/plugin-proposal-optional-chaining": "^7.0.0-0",
+    "@babel/plugin-transform-arrow-functions": "^7.0.0-0",
+    "@babel/plugin-transform-shorthand-properties": "^7.0.0-0",
+    "@babel/plugin-transform-template-literals": "^7.0.0-0",
     "@jest/globals": "^25.1.0",
     "@mapbox/node-pre-gyp": "^1.0.9",
-    "@react-native/babel-preset": "0.73.21",
+    "@react-native/babel-preset": "0.75.3",
     "@react-native/codegen": "0.73.2",
-    "@react-native/gradle-plugin": "0.73.4",
-    "@react-native/metro-config": "0.73.5",
+    "@react-native/gradle-plugin": "0.75.3",
+    "@react-native/metro-config": "0.75.3",
     "@testing-library/jest-native": "^5.4.3",
     "@testing-library/react-native": "^12.4.2",
     "@tsconfig/react-native": "^3.0.0",
     "@types/jest": "^28.1.6",
     "@types/react": "^18.2.6",
-    "@types/react-test-renderer": "^18.0.0",
+    "@types/react-test-renderer": "18.3.0",
     "babel-jest": "^29.6.3",
     "concurrently": "^7.6.0",
     "jest": "^29.7.0",

patches/BlurView-build.gradle.patch

@@ -1,11 +0,0 @@
---- /tmp/tmp-status-mobile-851dbcb56/tmp.gcyqIAUEIA/build.gradle	2024-04-16 18:11:12.481819000 +0200
-+++ ./node_modules/@react-native-community/blur/android/build.gradle	2024-04-16 18:11:18.889991702 +0200
-@@ -5,7 +5,7 @@
-   }
- 
-   dependencies {
--    classpath 'com.android.tools.build:gradle:3.5.3'
-+    classpath 'com.android.tools.build:gradle:3.5.4'
-   }
- }
- 

patches/ReactNative.SettingsExtension.kt.patch

@@ -0,0 +1,29 @@
+--- /tmp/tmp-status-mobile-65370082b/tmp.MuPLwTpeqQ/ReactSettingsExtension.kt	2024-09-16 15:50:03.224554000 +0530
++++ ./node_modules/@react-native/gradle-plugin/settings-plugin/src/main/kotlin/com/facebook/react/ReactSettingsExtension.kt	2024-09-16 15:57:02.999862248 +0530
+@@ -55,6 +55,9 @@
+   ) {
+     outputFile.parentFile.mkdirs()
+ 
++    val logger = Logging.getLogger("ReactSettingsExtension")
++
++   /*
+     val updateConfig =
+         object : GenerateConfig {
+           private val pb =
+@@ -69,6 +72,16 @@
+         }
+ 
+     checkAndUpdateCache(updateConfig, outputFile, outputFolder, lockFiles)
++    */
++
++    /*
++     * We update autolinking.json manually with nix/scripts/node_modules.sh
++     * We ensure we always have latest build/generated/autolinking/autolinking.json available
++     */
++
++    logger.info("Working Directory is -> $workingDirectory")
++    logger.info("Lock Files are -> ${lockFiles.files.joinToString(", ") { it.name }}")
++    logger.info("Command -> $command won't be executed. Its okay.")
+ 
+     linkLibraries(getLibrariesToAutolink(outputFile))
+   }

patches/ReactNative.ios-configure-glog.sh.patch

@@ -0,0 +1,17 @@
+--- /tmp/tmp-status-mobile-17180a000/tmp.oDuVBOUX8y/ios-configure-glog.sh	2024-09-15 16:02:00.955892000 +0530
++++ ./node_modules/react-native/scripts/ios-configure-glog.sh	2024-09-15 16:03:11.116500837 +0530
+@@ -43,14 +43,6 @@
+ fi
+ 
+ XCRUN="$(which xcrun)"
+-if [ -n "$XCRUN" ]; then
+-  export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
+-  export CXX="$CC"
+-else
+-  export CC="$CC:-$(which gcc)"
+-  export CXX="$CXX:-$(which g++ || true)"
+-fi
+-export CXX="$CXX:-$CC"
+ 
+ # Remove automake symlink if it exists
+ if [ -h "test-driver" ]; then

patches/ReactNativeKeychain.build.gradle.patch

@@ -0,0 +1,10 @@
+--- /private/tmp/tmp-status-mobile-f10ff5a24/nix-shell-3901-0/tmp.O5nBLMLshD/build.gradle	2025-01-08 14:21:51.701538000 +0530
++++ ./node_modules/react-native-keychain/android/build.gradle	2025-01-08 14:22:09.153914879 +0530
+@@ -65,7 +65,6 @@
+     implementation 'com.facebook.react:react-native:+'
+   }
+   implementation 'androidx.appcompat:appcompat:1.6.1'
+-  implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+ 
+   // https://mvnrepository.com/artifact/androidx.biometric/biometric

patches/ReactNativeNavigation.LayoutDirectionApplier.kt.patch

@@ -0,0 +1,21 @@
+--- /tmp/tmp-status-mobile-65370082b/tmp.XzSnIl2ZkE/LayoutDirectionApplier.kt	2024-09-16 22:59:38.120152000 +0530
++++ ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/viewcontroller/LayoutDirectionApplier.kt	2024-09-16 22:59:43.857140365 +0530
+@@ -6,10 +6,12 @@
+ 
+ class LayoutDirectionApplier {
+     fun apply(root: ViewController<*>, options: Options, instanceManager: ReactInstanceManager) {
+-        if (options.layout.direction.hasValue() && instanceManager.currentReactContext != null) {
+-            root.activity.window.decorView.layoutDirection = options.layout.direction.get()
+-            I18nUtil.getInstance().allowRTL(instanceManager.currentReactContext, options.layout.direction.isRtl)
+-            I18nUtil.getInstance().forceRTL(instanceManager.currentReactContext, options.layout.direction.isRtl)
++        if (options.layout.direction.hasValue()) {
++            instanceManager.currentReactContext?.let { context ->
++                root.activity.window.decorView.layoutDirection = options.layout.direction.get()
++                I18nUtil.getInstance().allowRTL(context, options.layout.direction.isRtl)
++                I18nUtil.getInstance().forceRTL(context, options.layout.direction.isRtl)
++            }
+         }
+     }
+-}
+\ No newline at end of file
++}

patches/ReactNativeNavigation.ModalContentLayout.kt.patch

@@ -0,0 +1,44 @@
+--- /tmp/tmp-status-mobile-65370082b/tmp.ZT96tMu4Rb/ModalContentLayout.kt	2024-09-16 22:51:02.779796000 +0530
++++ ./node_modules/react-native-navigation/lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt	2024-09-16 22:52:23.327090657 +0530
+@@ -49,17 +49,17 @@
+             updateFirstChildView()
+         }
+     }
+-    override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent?) {
++    override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent) {
+         mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+     }
+-    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
++    override fun onChildStartedNativeGesture(androidEvent: MotionEvent) {
+         mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+     }
+-    override fun onChildEndedNativeGesture(child: View, androidEvent: MotionEvent?) {
++    override fun onChildEndedNativeGesture(child: View, androidEvent: MotionEvent) {
+         mJSTouchDispatcher.onChildEndedNativeGesture(androidEvent, this.getEventDispatcher())
+     }
+     override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+-    private fun getEventDispatcher(): EventDispatcher? {
++    private fun getEventDispatcher(): EventDispatcher {
+         val reactContext: ReactContext = this.getReactContext()
+         return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+     }
+@@ -73,15 +73,15 @@
+         return this.context as ReactContext
+     }
+ 
+-    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
++    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
+         mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+         return super.onInterceptTouchEvent(event)
+     }
+ 
+-    override fun onTouchEvent(event: MotionEvent?): Boolean {
++    override fun onTouchEvent(event: MotionEvent): Boolean {
+         mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+         super.onTouchEvent(event)
+         return true
+     }
+ 
+-}
+\ No newline at end of file
++}

patches/ReactNativeNavigation.ReactTypefaceUtils.java.patch

@@ -0,0 +1,25 @@
+--- /tmp/tmp-status-mobile-65370082b/tmp.RFxwFry0k1/ReactTypefaceUtils.java	2024-09-17 09:52:39.699257000 +0530
++++ ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/utils/ReactTypefaceUtils.java	2024-09-17 09:53:01.232883405 +0530
+@@ -20,6 +20,7 @@
+ import com.facebook.react.bridge.ReadableArray;
+ import com.facebook.react.views.text.ReactFontManager;
+ import com.facebook.react.views.text.ReactTextShadowNode;
++import com.facebook.react.common.ReactConstants;
+ import java.util.ArrayList;
+ import java.util.List;
+
+@@ -96,12 +97,12 @@
+
+     int want = 0;
+     if ((weight == Typeface.BOLD)
+-        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactTextShadowNode.UNSET)) {
++        || ((oldStyle & Typeface.BOLD) != 0 && weight == ReactConstants.UNSET)) {
+       want |= Typeface.BOLD;
+     }
+
+     if ((style == Typeface.ITALIC)
+-        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactTextShadowNode.UNSET)) {
++        || ((oldStyle & Typeface.ITALIC) != 0 && style == ReactConstants.UNSET)) {
+       want |= Typeface.ITALIC;
+     }
+

patches/ReactNativeNavigation.ReactViewGroup.kt.patch

@@ -0,0 +1,9 @@
+--- /tmp/tmp-status-mobile-65370082b/tmp.QyEZywPVH8/ReactViewGroup.kt	2024-09-17 08:39:24.686748000 +0530
++++ ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/utils/ReactViewGroup.kt	2024-09-17 08:40:47.117817983 +0530
+@@ -4,4 +4,4 @@
+ import com.facebook.react.views.view.ReactViewGroup
+ 
+ val ReactViewGroup.borderRadius: Float
+-    get() = (background as? ReactViewBackgroundDrawable)?.fullBorderRadius ?: 0f
+\ No newline at end of file
++    get() = (background as? ReactViewBackgroundDrawable)?.fullBorderWidth ?: 0f

patches/react-native-keychain.patch

@@ -1,20 +0,0 @@
-# Remove gradle-test-logger-plugin:
-# https://github.com/oblador/react-native-keychain/issues/595
-# TODO: remove this patch when we this library fixes above issue
-
---- ./node_modules/react-native-keychain/android/build.gradle
-+++ ./node_modules/react-native-keychain/android/build-patched.gradle
-@@ -4,13 +4,9 @@
-       url 'https://plugins.gradle.org/m2/'
-     }
-   }
--  dependencies {
--    classpath 'com.adarshr:gradle-test-logger-plugin:2.0.0'
--  }
- }
-
- apply plugin: 'com.android.library'
--apply plugin: "com.adarshr.test-logger"
-
- def safeExtGet(prop, fallback) {
-   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback

patches/react-native-script.patch

@@ -1,13 +0,0 @@
-# to fix https://github.com/status-im/status-mobile/issues/18548
-
---- ./node_modules/react-native/scripts/react_native_pods_utils/script_phases.sh
-+++ ./node_modules/react-native/scripts/react_native_pods_utils/script_phases-patched.sh
-@@ -104,7 +104,7 @@
-     mkdir -p "$RCT_SCRIPT_OUTPUT_DIR"
-
-     # Copy all output to output_dir
--    cp -R -X "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
-+    cp -R "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
-     echo "$LIBRARY_NAME output has been written to $RCT_SCRIPT_OUTPUT_DIR:" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
-     ls -1 "$RCT_SCRIPT_OUTPUT_DIR" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
- }

patches/react-native.patch

@@ -1,15 +0,0 @@
-# Fix pod issue after upgrading to MacOS Sonoma and Xcode 15
-# https://github.com/status-im/status-mobile/issues/17682
-
---- ./node_modules/react-native/scripts/ios-configure-glog.sh
-+++ ./node_modules/react-native/scripts/ios-configure-glog-patched.sh
-@@ -42,9 +42,6 @@
-     patch -p1 config.sub fix_glog_0.3.5_apple_silicon.patch
- fi
-
--export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
--export CXX="$CC"
--
- # Remove automake symlink if it exists
- if [ -h "test-driver" ]; then
-     rm test-driver

scripts/build-android.sh

@@ -45,7 +45,7 @@ SECRETS_ENV_VARS=(
     'INFURA_TOKEN_SECRET'
     'OPENSEA_API_KEY'
     'MIXPANEL_APP_ID'
-    'MIXPANEL_TOKEN'
+    'MIXPANEL_APP_TOKEN'
     'POKT_TOKEN'
 )
 

shadow-cljs.edn

@@ -78,7 +78,7 @@
      status-im.config/STATUS_BACKEND_SERVER_ROOT_DATA_DIR #shadow/env
                                                            "STATUS_BACKEND_SERVER_ROOT_DATA_DIR"
      status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID"
-     status-im.config/MIXPANEL_TOKEN #shadow/env "MIXPANEL_TOKEN"
+     status-im.config/MIXPANEL_APP_TOKEN #shadow/env "MIXPANEL_APP_TOKEN"
      status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"
      status-im.config/RARIBLE_MAINNET_API_KEY #shadow/env "RARIBLE_MAINNET_API_KEY"
      status-im.config/RARIBLE_TESTNET_API_KEY #shadow/env "RARIBLE_TESTNET_API_KEY"
@@ -121,7 +121,7 @@
      status-im.config/STATUS_BUILD_PROXY_PASSWORD         #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
      status-im.config/OPENSEA_API_KEY                     #shadow/env "OPENSEA_API_KEY"
      status-im.config/MIXPANEL_APP_ID                     #shadow/env "MIXPANEL_APP_ID"
-     status-im.config/MIXPANEL_TOKEN                      #shadow/env "MIXPANEL_TOKEN"
+     status-im.config/MIXPANEL_APP_TOKEN                  #shadow/env "MIXPANEL_APP_TOKEN"
      status-im.config/RARIBLE_MAINNET_API_KEY             #shadow/env "RARIBLE_MAINNET_API_KEY"
      status-im.config/RARIBLE_TESTNET_API_KEY             #shadow/env "RARIBLE_TESTNET_API_KEY"
      status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN      #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
@@ -168,7 +168,7 @@
     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
     status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
     status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
-    status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
+    status-im.config/MIXPANEL_APP_TOKEN             #shadow/env "MIXPANEL_APP_TOKEN"
     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"

src/quo/components/community/community_card_view.cljs

@@ -55,7 +55,7 @@
         [rn/view (style/card-view-chat-icon 48 theme)
          [icon/community-icon {:images images} 48]]
         (when (= status :gated)
-          [rn/view (style/permission-tag-styles)
+          [rn/view style/permission-tag-styles
            [community-view/permission-tag-container
             {:locked? locked?
              :status  status
@@ -63,10 +63,12 @@
         [community-view/community-title
          {:title       name
           :description description}]
-        [rn/view {:style (style/card-stats-position)}
+        [rn/view {:style style/card-stats-position}
          [community-view/community-stats-column
-          {:type :card-view}]]
-        [rn/view {:style (style/community-tags-position)}
+          {:type                 :card-view
+           :members-count        (:members-count community)
+           :active-members-count (:active-members-count community)}]]
+        [rn/view {:style style/community-tags-position}
          [community-view/community-tags {:tags tags}]]]]]]))
 
 (defn view

src/quo/components/community/community_list_view.cljs

@@ -60,7 +60,7 @@
              :style          {:border-radius 12
                               :margin-left   12}}
             props)
-     [rn/view (merge (style/membership-info-container) style)
+     [rn/view (merge style/membership-info-container style)
       [community-icon/community-icon
        {:images images} 32]
       [rn/view

src/quo/components/community/community_view.cljs

@@ -11,11 +11,8 @@
     [react-native.gesture :as gesture]))
 
 (defn community-stats-column
-  [{:keys [type members-count active-count]}]
-  [rn/view
-   (if (= type :card-view)
-     (style/card-stats-container)
-     (style/list-stats-container))
+  [{:keys [type members-count active-members-count]}]
+  [rn/view (if (= type :card-view) style/card-stats-container style/list-stats-container)
    [community-stat/view
     {:accessibility-label :stats-members-count
      :icon                :i/group
@@ -24,7 +21,7 @@
    [community-stat/view
     {:accessibility-label :stats-active-count
      :icon                :i/active-members
-     :value               active-count}]])
+     :value               active-members-count}]])
 
 (defn community-tags
   [{:keys [tags container-style last-item-style]}]

src/quo/components/community/style.cljs

@@ -17,24 +17,20 @@
 (def detail-container
   {:flex 1})
 
-(defn card-stats-container
-  []
+(def card-stats-container
   {:flex-direction :row})
 
-(defn list-stats-container
-  []
+(def list-stats-container
   {:flex-direction :row
    :align-items    :center})
 
-(defn card-stats-position
-  []
+(def card-stats-position
   {:position :absolute
    :top      116
    :right    12
    :left     12})
 
-(defn community-tags-position
-  []
+(def community-tags-position
   {:position :absolute
    :top      154
    :right    12
@@ -68,8 +64,7 @@
                       colors/neutral-90
                       theme)})
 
-(defn membership-info-container
-  []
+(def membership-info-container
   {:flex-direction :row
    :border-radius  16
    :align-items    :center
@@ -87,8 +82,7 @@
    :border-top-left-radius  20
    :background-color        colors/primary-50-opa-20})
 
-(defn permission-tag-styles
-  []
+(def permission-tag-styles
   {:position :absolute
    :top      8
    :right    8})
@@ -146,10 +140,14 @@
    :background-color   (colors/theme-colors colors/white colors/neutral-90 theme)})
 
 (def loading-tags-container
-  {:margin-top 20 :flex-direction :row :align-items :center})
+  {:margin-top     20
+   :flex-direction :row
+   :align-items    :center})
 
 (def loading-stats-container
-  {:margin-top 20 :flex-direction :row :align-items :center})
+  {:margin-top     20
+   :flex-direction :row
+   :align-items    :center})
 
 (defn loading-stat-circle
   [theme margin-left]

src/status_im/config.cljs

@@ -26,11 +26,11 @@
 (goog-define ALCHEMY_BASE_MAINNET_TOKEN "")
 (goog-define ALCHEMY_BASE_SEPOLIA_TOKEN "")
 (goog-define WALLET_CONNECT_PROJECT_ID "87815d72a81d739d2a7ce15c2cfdefb3")
-(goog-define MIXPANEL_APP_ID "3350627")
-(goog-define MIXPANEL_TOKEN "5c73bda2d36a9f688a5ee45641fb6775")
 (goog-define STATUS_BUILD_ETH_RPC_PROXY_USER "")
 (goog-define STATUS_BUILD_ETH_RPC_PROXY_PASSWORD "")
 (goog-define STATUS_BUILD_ETH_RPC_PROXY_URL "")
+(goog-define MIXPANEL_APP_ID "")
+(goog-define MIXPANEL_APP_TOKEN "")
 
 (def mainnet-rpc-url (str "https://eth-archival.rpc.grove.city/v1/" POKT_TOKEN))
 (def sepolia-rpc-url (str "https://sepolia-archival.rpc.grove.city/v1/" POKT_TOKEN))
@@ -53,8 +53,16 @@
 (def opensea-link "https://opensea.io")
 (def opensea-tesnet-link "https://testnets.opensea.io")
 
+;; These MixPanel values should be injected via the CI since they vary depending
+;; on the environment, as we want to keep production and test/development
+;; metrics separate.
+;;
+;; We primarily use two MixPanel projects: the production project is named
+;; `status-im`, and the test project is `test.status-im`.
+;;
+;; During development, do not use the production app ID and token.
 (def mixpanel-app-id MIXPANEL_APP_ID)
-(def mixpanel-token MIXPANEL_TOKEN)
+(def mixpanel-token MIXPANEL_APP_TOKEN)
 
 (def opensea-api-key OPENSEA_API_KEY)
 (def status-proxy-enabled? true)

src/status_im/constants.cljs

@@ -443,7 +443,10 @@
 (def ^:const wallet-account-name-max-length 20)
 
 
+(def ^:const gas-rate-low 0)
 (def ^:const gas-rate-medium 1)
+(def ^:const gas-rate-high 2)
+(def ^:const gas-rate-custom 3)
 (def ^:const send-type-transfer 0)
 (def ^:const send-type-bridge 5)
 (def ^:const send-type-erc-721-transfer 6)

src/status_im/contexts/communities/actions/leave/events.cljs

@@ -18,7 +18,9 @@
       :params      [{:id request-to-join-id}]
       :on-success  #(rf/dispatch [:communities/cancel-request-to-join-success %])
       :js-response true
-      :on-error    #(log/error "failed to cancel request to join community" request-to-join-id %)}]}))
+      :on-error    #(log/error "failed to cancel request to join community"
+                               request-to-join-id
+                               %)}]}))
 
 (rf/reg-event-fx :communities/left
  (fn [_ [response-js]]

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

@@ -34,8 +34,7 @@
 
 (defn screen-title
   []
-  [rn/view
-   {:style (style/screen-title-container (safe-area/get-top))}
+  [rn/view {:style (style/screen-title-container (safe-area/get-top))}
    [quo/text
     {:accessibility-label :communities-screen-title
      :weight              :semi-bold
@@ -95,14 +94,14 @@
 
 (defn featured-list
   [communities view-type]
-  (let [view-size (reagent/atom 0)
-        loaded?   (and communities (pos? (count communities)))]
+  (let [view-size     (reagent/atom 0)
+        set-view-size (fn [e]
+                        (reset! view-size (- (oops/oget e "nativeEvent.layout.width") 40)))
+        loaded?       (and communities (pos? (count communities)))]
     (fn []
       [rn/view
        {:style     style/featured-list-container
-        :on-layout #(swap! view-size
-                      (fn [_]
-                        (- (oops/oget % "nativeEvent.layout.width") 40)))}
+        :on-layout set-view-size}
        (when-not (= @view-size 0)
          [rn/flat-list
           {:key-fn                            :id
@@ -132,32 +131,29 @@
    [discover-communities-segments selected-tab false]])
 
 (defn other-communities-list
-  [{:keys [communities communities-ids view-type]}]
+  [{:keys [communities view-type]}]
   [rn/view {:style style/other-communities-container}
-   (if (and communities (pos? (count communities)))
-     (map-indexed
-      (fn [inner-index item]
-        (let [community-id (when communities-ids item)
-              community    (if communities
-                             item
-                             (rf/sub [:communities/home-item community-id]))
-              cover        {:uri (get-in (:images item) [:banner :uri])}]
-          [rn/view
-           {:key           (str inner-index (:id community))
-            :margin-bottom 16}
-           (if (= view-type :card-view)
-             [quo/community-card-view-item
-              {:community (assoc community :cover cover)
-               :on-press  #(rf/dispatch [:communities/navigate-to-community-overview (:id community)])}]
-
-             [quo/community-list
-              {:on-press      (fn []
-                                (rf/dispatch [:dismiss-keyboard])
-                                (rf/dispatch [:communities/navigate-to-community-overview
-                                              (:id community)]))
-               :on-long-press #(js/alert "TODO: to be implemented")}
-              community])]))
-      (if communities communities communities-ids))
+   (if (seq communities)
+     (map-indexed (fn [inner-index {community-id :id :as community}]
+                    (let [cover {:uri (-> community :images :banner :uri)}]
+                      [rn/view
+                       {:key   (str inner-index community-id)
+                        :style {:margin-bottom 16}}
+                       (if (= view-type :card-view)
+                         [quo/community-card-view-item
+                          {:community (assoc community
+                                             :cover         cover
+                                             :members-count (count (:members community)))
+                           :on-press  #(rf/dispatch [:communities/navigate-to-community-overview
+                                                     community-id])}]
+                         [quo/community-list
+                          {:on-press      (fn []
+                                            (rf/dispatch [:dismiss-keyboard])
+                                            (rf/dispatch [:communities/navigate-to-community-overview
+                                                          community-id]))
+                           :on-long-press #(js/alert "TODO: to be implemented")}
+                          community])]))
+                  communities)
      [:<>
       [rn/view {:margin-bottom 16} [quo/community-card-view-item {:loading? true}]]
       [rn/view {:margin-bottom 16} [quo/community-card-view-item {:loading? true}]]
@@ -168,8 +164,9 @@
   [rn/view {:style {:flex 1}}
    (case @selected-tab
      :all
-     (other-communities-list {:communities (rf/sub [:communities/other-contract-communities])
-                              :view-type   view-type})
+     [other-communities-list
+      {:communities (rf/sub [:communities/other-contract-communities])
+       :view-type   view-type}]
 
      :open
      [:<>]
@@ -183,60 +180,55 @@
       (i18n/label :t/error)])])
 
 (defn render-communities
-  [selected-tab
-   featured-communities-count
-   featured-communities
-   view-type]
-  (fn []
-    [rn/view
-     [discover-communities-header
-      {:selected-tab               selected-tab
-       :view-type                  view-type
-       :featured-communities-count featured-communities-count
-       :featured-communities       featured-communities}]
-     [communities-lists selected-tab view-type]]))
+  [{:keys [selected-tab featured-communities-count featured-communities view-type]}]
+  [rn/view
+   [discover-communities-header
+    {:selected-tab               selected-tab
+     :view-type                  view-type
+     :featured-communities-count featured-communities-count
+     :featured-communities       featured-communities}]
+   [communities-lists selected-tab view-type]])
 
 (defn render-sticky-header
   [{:keys [selected-tab scroll-height]}]
-  (fn []
-    (when (> @scroll-height 360)
-      [rn/view
-       {:style (style/blur-tabs-header (safe-area/get-top))}
-       [discover-communities-segments selected-tab true]])))
+  (when (> @scroll-height 360)
+    [rn/view
+     {:style (style/blur-tabs-header (safe-area/get-top))}
+     [discover-communities-segments selected-tab true]]))
 
 (defn discover-screen-content
-  [featured-communities theme]
-  (let [view-type                  (reagent/atom :card-view)
-        selected-tab               (reagent/atom :all)
-        scroll-height              (reagent/atom 0)
-        featured-communities-count (count featured-communities)]
+  []
+  (let [view-type     (reagent/atom :card-view)
+        selected-tab  (reagent/atom :all)
+        scroll-height (reagent/atom 0)]
     (fn []
-      [scroll-page/scroll-page
-       {:on-scroll        #(reset! scroll-height %)
-        :page-nav-props   {:background :blur}
-        :navigate-back?   :true
-        :height           (if (> @scroll-height 360)
-                            208
-                            148)
-        :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
-        :sticky-header    [render-sticky-header
-                           {:selected-tab  selected-tab
-                            :scroll-height scroll-height}]}
-
-       [render-communities
-        selected-tab
-        featured-communities-count
-        featured-communities
-        @view-type]])))
+      (let [theme                      (quo.theme/use-theme)
+            featured-communities       (rf/sub [:communities/featured-contract-communities])
+            featured-communities-count (count featured-communities)]
+        [scroll-page/scroll-page
+         {:on-scroll        #(reset! scroll-height %)
+          :page-nav-props   {:background :blur}
+          :navigate-back?   :true
+          :height           (if (> @scroll-height 360)
+                              208
+                              148)
+          :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
+          :sticky-header    [render-sticky-header
+                             {:selected-tab  selected-tab
+                              :scroll-height scroll-height}]}
+         [render-communities
+          {:selected-tab               selected-tab
+           :featured-communities-count featured-communities-count
+           :featured-communities       featured-communities
+           :view-type                  @view-type}]]))))
 
 (defn view
   []
-  (let [theme                (quo.theme/use-theme)
-        featured-communities (rf/sub [:communities/featured-contract-communities])]
+  (let [theme (quo.theme/use-theme)]
     (rn/use-mount #(rf/dispatch [:fetch-contract-communities]))
     [rn/view
      {:style (style/discover-screen-container (colors/theme-colors
                                                colors/white
                                                colors/neutral-95
                                                theme))}
-     [discover-screen-content featured-communities theme]]))
+     [discover-screen-content]]))

src/status_im/contexts/keycard/migrate/re_encrypting/events.cljs

@@ -27,5 +27,7 @@
              :callback
              (fn [{:keys [error]}]
                (if (string/blank? error)
-                 (rf/dispatch [:navigate-to :screen/keycard.migrate.success])
+                 (do
+                   (rf/dispatch [:biometric/disable])
+                   (rf/dispatch [:navigate-to :screen/keycard.migrate.success]))
                  (rf/dispatch [:navigate-to :screen/keycard.migrate.fail])))}]]})))

src/status_im/contexts/wallet/data_store.cljs

@@ -5,6 +5,7 @@
     [clojure.string :as string]
     [status-im.constants :as constants]
     [status-im.contexts.wallet.collectible.utils :as collectible-utils]
+    [status-im.contexts.wallet.send.transaction-settings.core :as transaction-settings]
     [status-im.contexts.wallet.send.utils :as send-utils]
     [utils.collection :as utils.collection]
     [utils.money :as money]
@@ -229,7 +230,8 @@
 
 (defn new->old-route-path
   [new-path]
-  (let [to-bignumber (fn [k] (-> new-path k money/bignumber))]
+  (let [to-bignumber                          (fn [k] (-> new-path k money/bignumber))
+        suggested-levels-for-max-fees-per-gas (:suggested-levels-for-max-fees-per-gas new-path)]
     {:approval-fee              (to-bignumber :approval-fee)
      :approval-l-1-fee          (to-bignumber :approval-l-1-fee)
      :bonder-fees               (to-bignumber :tx-bonder-fees)
@@ -238,35 +240,34 @@
      :amount-in-locked          (:amount-in-locked new-path)
      :amount-in                 (:amount-in new-path)
      :max-amount-in             (:max-amount-in new-path)
-     :gas-fees                  {:gas-price                "0"
-                                 :base-fee                 (send-utils/convert-to-gwei (:tx-base-fee
-                                                                                        new-path)
-                                                                                       precision)
+     :gas-fees                  {:gas-price "0"
+                                 :base-fee (send-utils/convert-to-gwei (:tx-base-fee
+                                                                        new-path)
+                                                                       precision)
                                  :max-priority-fee-per-gas (send-utils/convert-to-gwei (:tx-priority-fee
                                                                                         new-path)
                                                                                        precision)
-                                 :max-fee-per-gas-low      (send-utils/convert-to-gwei
-                                                            (get-in
-                                                             new-path
-                                                             [:suggested-levels-for-max-fees-per-gas
-                                                              :low])
-                                                            precision)
-                                 :max-fee-per-gas-medium   (send-utils/convert-to-gwei
-                                                            (get-in
-                                                             new-path
-                                                             [:suggested-levels-for-max-fees-per-gas
-                                                              :medium])
-                                                            precision)
-                                 :max-fee-per-gas-high     (send-utils/convert-to-gwei
-                                                            (get-in
-                                                             new-path
-                                                             [:suggested-levels-for-max-fees-per-gas
-                                                              :high])
-                                                            precision)
-                                 :l-1-gas-fee              (send-utils/convert-to-gwei (:tx-l-1-fee
-                                                                                        new-path)
-                                                                                       precision)
-                                 :eip-1559-enabled         true}
+                                 :l-1-gas-fee (send-utils/convert-to-gwei (:tx-l-1-fee
+                                                                           new-path)
+                                                                          precision)
+                                 :eip-1559-enabled true
+                                 :tx-max-fees-per-gas (send-utils/convert-to-gwei
+                                                       (:tx-max-fees-per-gas
+                                                        new-path)
+                                                       precision)
+                                 :suggested-gas-fees-for-setting
+                                 {:tx-fee-mode/normal (send-utils/convert-to-gwei
+                                                       (:low
+                                                        suggested-levels-for-max-fees-per-gas)
+                                                       precision)
+                                  :tx-fee-mode/fast   (send-utils/convert-to-gwei
+                                                       (:medium
+                                                        suggested-levels-for-max-fees-per-gas)
+                                                       precision)
+                                  :tx-fee-mode/urgent (send-utils/convert-to-gwei
+                                                       (:high
+                                                        suggested-levels-for-max-fees-per-gas)
+                                                       precision)}}
      :bridge-name               (:processor-name new-path)
      :amount-out                (:amount-out new-path)
      :approval-contract-address (:approval-contract-address new-path)
@@ -275,7 +276,10 @@
      :to                        (:to-chain new-path)
      :approval-amount-required  (:approval-amount-required new-path)
      ;;  :cost () ;; tbd not used on desktop
-     :gas-amount                (:tx-gas-amount new-path)}))
+     :gas-amount                (:tx-gas-amount new-path)
+     :router-input-params-uuid  (:router-input-params-uuid new-path)
+     :tx-fee-mode               (transaction-settings/gas-rate->tx-fee-mode (:tx-gas-fee-mode
+                                                                             new-path))}))
 
 (defn tokens-never-loaded?
   [db]

src/status_im/contexts/wallet/events.cljs

@@ -435,14 +435,16 @@
 (rf/reg-event-fx
  :wallet/start-bridge
  (fn [{:keys [db]}]
-   (let [view-id (:view-id db)]
-     (cond-> {:db (assoc-in db [:wallet :ui :send :tx-type] :tx/bridge)}
-       (= view-id :screen/wallet.accounts)
-       (assoc :fx
-              [[:dispatch
-                [:wallet/wizard-navigate-forward
-                 {:start-flow? true
-                  :flow-id     :wallet-bridge-flow}]]])))))
+   {:db (assoc-in db [:wallet :ui :send :tx-type] :tx/bridge)
+    :fx [[:dispatch
+          [:wallet/wizard-navigate-forward
+           {:start-flow? true
+            :flow-id     :wallet-bridge-flow}]]]}))
+
+(rf/reg-event-fx
+ :wallet/set-send-tx-type
+ (fn [{:keys [db]} [type]]
+   {:db (assoc-in db [:wallet :ui :send :tx-type] type)}))
 
 (rf/reg-event-fx :wallet/select-bridge-network
  (fn [{:keys [db]} [{:keys [network-chain-id stack-id]}]]

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

@@ -91,12 +91,16 @@
                                                               {:content buy-token/view}]))
         on-bridge-press       (rn/use-callback
                                (fn []
+                                 ;; For a single account, it starts the bridge flow immediately. For
+                                 ;; multiple accounts, it sets the transaction type and starts the
+                                 ;; bridge flow after account selection.
                                  (rf/dispatch [:wallet/clean-send-data])
                                  (when-not multiple-accounts?
                                    (rf/dispatch [:wallet/switch-current-viewing-account
-                                                 first-account-address]))
-                                 (rf/dispatch [:wallet/start-bridge])
+                                                 first-account-address])
+                                   (rf/dispatch [:wallet/start-bridge]))
                                  (when multiple-accounts?
+                                   (rf/dispatch [:wallet/set-send-tx-type :tx/bridge])
                                    (rf/dispatch [:open-modal :screen/wallet.select-from])))
                                [multiple-accounts? first-account-address])
         on-swap-press         (rn/use-callback

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

@@ -6,10 +6,12 @@
     [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.common.utils.networks :as network-utils]
     [status-im.contexts.wallet.data-store :as data-store]
+    [status-im.contexts.wallet.send.transaction-settings.core :as transaction-settings]
     [status-im.contexts.wallet.send.utils :as send-utils]
     [status-im.contexts.wallet.sheets.network-selection.view :as network-selection]
     [taoensso.timbre :as log]
     [utils.address]
+    [utils.i18n :as i18n]
     [utils.money :as utils.money]
     [utils.number]
     [utils.re-frame :as rf]
@@ -384,16 +386,100 @@
 (rf/reg-event-fx
  :wallet/set-token-amount-to-send
  (fn [{:keys [db]} [{:keys [amount stack-id start-flow?]}]]
+   {:db (assoc-in db [:wallet :ui :send :amount] amount)
+    :fx [[:dispatch
+          [:wallet/wizard-navigate-forward
+           {:current-screen stack-id
+            :start-flow?    start-flow?
+            :flow-id        :wallet-send-flow}]]]}))
+
+(rf/reg-event-fx
+ :wallet.send/auth-slider-completed
+ (fn [{:keys [db]}]
    (let [last-request-uuid (get-in db [:wallet :ui :send :last-request-uuid])]
-     {:db (-> db
-              (assoc-in [:wallet :ui :send :amount] amount)
-              (update-in [:wallet :ui :send] dissoc :transaction-for-signing))
+     {:db (update-in db [:wallet :ui :send] dissoc :transaction-for-signing)
       :fx [[:dispatch [:wallet/build-transactions-from-route {:request-uuid last-request-uuid}]]
            [:dispatch
-            [:wallet/wizard-navigate-forward
-             {:current-screen stack-id
-              :start-flow?    start-flow?
-              :flow-id        :wallet-send-flow}]]]})))
+            [:wallet.send/set-sign-transactions-callback-fx
+             [:dispatch
+              [:wallet/prepare-signatures-for-transactions :send]]]]]})))
+
+(defn log-transaction-signature-error
+  [error]
+  (log/error
+   "failed to prepare signatures for transactions"
+   {:event :wallet/prepare-signatures-for-transactions
+    :error error})
+  (rf/dispatch
+   [:toasts/upsert
+    {:id   :prepare-signatures-for-transactions-error
+     :type :negative
+     :text (:message error)}]))
+
+(defn- send-transactions-with-signatures
+  [tx-type signatures]
+  (rf/dispatch
+   [:wallet/send-router-transactions-with-signatures tx-type
+    signatures]))
+
+(rf/reg-event-fx
+ :wallet/send-router-transactions-with-signatures
+ (fn [{:keys [db]} [tx-type signatures]]
+   (let [transaction-for-signing (get-in db [:wallet :ui tx-type :transaction-for-signing])
+         signatures-map          (reduce (fn [acc {:keys [message signature]}]
+                                           (assoc acc
+                                                  message
+                                                  (send-utils/signature-rsv signature)))
+                                         {}
+                                         signatures)]
+     {:json-rpc/call [{:method     "wallet_sendRouterTransactionsWithSignatures"
+                       :params     [{:uuid       (get-in transaction-for-signing [:sendDetails :uuid])
+                                     :signatures signatures-map}]
+                       :on-success (fn []
+                                     (rf/dispatch [:hide-bottom-sheet]))
+                       :on-error   (fn [error]
+                                     (log/error "failed to send router transactions with signatures"
+                                                {:event :wallet/send-router-transactions-with-signatures
+                                                 :error error})
+                                     (rf/dispatch [:toasts/upsert
+                                                   {:id   :send-router-transactions-with-signatures-error
+                                                    :type :negative
+                                                    :text (:message error)}]))}]})))
+
+(rf/reg-event-fx
+ :wallet/prepare-signatures-for-transactions
+ (fn [{:keys [db]} [tx-type]]
+   (let [transaction-for-signing                (get-in db
+                                                        [:wallet :ui tx-type :transaction-for-signing])
+         signing-details                        (:signingDetails transaction-for-signing)
+         {:keys [hashes address signOnKeycard]} signing-details
+         send-tx-fn                             (partial send-transactions-with-signatures tx-type)]
+     (if signOnKeycard
+       {:fx [[:dispatch
+              [:standard-auth/authorize-with-keycard
+               {:on-complete (fn [pin]
+                               (rf/dispatch [:keycard/connect-and-sign-hashes
+                                             {:keycard-pin pin
+                                              :address     address
+                                              :hashes      hashes
+                                              :on-success  send-tx-fn
+                                              :on-failure  log-transaction-signature-error}]))}]]]}
+       {:fx [[:dispatch
+              [:standard-auth/authorize
+               {:on-auth-success   (fn [sha3-pwd]
+                                     (rf/dispatch [:wallet/standard-auth-autorization-success hashes
+                                                   address sha3-pwd send-tx-fn]))
+                :auth-button-label (i18n/label :t/confirm)}]]]}))))
+
+(rf/reg-event-fx
+ :wallet/standard-auth-autorization-success
+ (fn [_ [hashes address sha3-pwd send-tx-fn]]
+   {:fx [[:effects.wallet/sign-transaction-hashes
+          {:hashes     hashes
+           :address    address
+           :password   (security/safe-unmask-data sha3-pwd)
+           :on-success send-tx-fn
+           :on-error   log-transaction-signature-error}]]}))
 
 (rf/reg-event-fx
  :wallet/build-transaction-for-collectible-route
@@ -409,16 +495,14 @@
 (rf/reg-event-fx
  :wallet/set-token-amount-to-bridge
  (fn [{:keys [db]} [{:keys [amount stack-id start-flow?]}]]
-   (let [last-request-uuid (get-in db [:wallet :ui :send :last-request-uuid])]
-     {:db (-> db
-              (assoc-in [:wallet :ui :send :amount] amount)
-              (update-in [:wallet :ui :send] dissoc :transaction-for-signing))
-      :fx [[:dispatch [:wallet/build-transactions-from-route {:request-uuid last-request-uuid}]]
-           [:dispatch
-            [:wallet/wizard-navigate-forward
-             {:current-screen stack-id
-              :start-flow?    start-flow?
-              :flow-id        :wallet-bridge-flow}]]]})))
+   {:db (-> db
+            (assoc-in [:wallet :ui :send :amount] amount)
+            (update-in [:wallet :ui :send] dissoc :transaction-for-signing))
+    :fx [[:dispatch
+          [:wallet/wizard-navigate-forward
+           {:current-screen stack-id
+            :start-flow?    start-flow?
+            :flow-id        :wallet-bridge-flow}]]]}))
 
 (rf/reg-event-fx
  :wallet/clean-bridge-to-selection
@@ -580,7 +664,10 @@
  :wallet/handle-suggested-routes
  (fn [{:keys [db]} [data]]
    (let [{send :send swap? :swap} (-> db :wallet :ui)
-         skip-processing-routes?  (:skip-processing-suggested-routes? send)]
+         skip-processing-routes?  (:skip-processing-suggested-routes? send)
+         clean-user-tx-settings?  (get-in db
+                                          [:wallet :ui :send :custom-tx-settings
+                                           :delete-on-routes-update?])]
      (when (or swap? (not skip-processing-routes?))
        (let [{error-code :code
               :as        error} (:ErrorResponse data)
@@ -591,13 +678,16 @@
            (log/error "failed to get suggested routes (async)"
                       {:event :wallet/handle-suggested-routes
                        :error error-message}))
-         {:fx [[:dispatch
-                (cond
-                  (and failure? swap?) [:wallet/swap-proposal-error error]
-                  failure?             [:wallet/suggested-routes-error error-message]
-                  swap?                [:wallet/swap-proposal-success (fix-routes data)]
-                  :else                [:wallet/suggested-routes-success (fix-routes data)
-                                        enough-assets?])]]})))))
+         (merge
+          (when clean-user-tx-settings?
+            {:db (update-in db [:wallet :ui :send] dissoc :custom-tx-settings)})
+          {:fx [[:dispatch
+                 (cond
+                   (and failure? swap?) [:wallet/swap-proposal-error error]
+                   failure?             [:wallet/suggested-routes-error error-message]
+                   swap?                [:wallet/swap-proposal-success (fix-routes data)]
+                   :else                [:wallet/suggested-routes-success (fix-routes data)
+                                         enough-assets?])]]}))))))
 
 (rf/reg-event-fx
  :wallet/transaction-success
@@ -669,66 +759,6 @@
                                                 :type :negative
                                                 :text (:message error)}]))}]}))
 
-(rf/reg-event-fx
- :wallet/prepare-signatures-for-transactions
- (fn [{:keys [db]} [type sha3-pwd]]
-   (let [{:keys [hashes address signOnKeycard]} (get-in db
-                                                        [:wallet :ui type :transaction-for-signing
-                                                         :signingDetails])
-         on-success                             (fn [signatures]
-                                                  (rf/dispatch
-                                                   [:wallet/send-router-transactions-with-signatures type
-                                                    signatures]))
-         on-error                               (fn [error]
-                                                  (log/error
-                                                   "failed to prepare signatures for transactions"
-                                                   {:event :wallet/prepare-signatures-for-transactions
-                                                    :error error})
-                                                  (rf/dispatch
-                                                   [:toasts/upsert
-                                                    {:id   :prepare-signatures-for-transactions-error
-                                                     :type :negative
-                                                     :text (:message error)}]))]
-     (if signOnKeycard
-       {:fx [[:dispatch
-              [:standard-auth/authorize-with-keycard
-               {:on-complete #(rf/dispatch [:keycard/connect-and-sign-hashes
-                                            {:keycard-pin %
-                                             :address     address
-                                             :hashes      hashes
-                                             :on-success  on-success
-                                             :on-failure  on-error}])}]]]}
-       {:fx [[:effects.wallet/sign-transaction-hashes
-              {:hashes     hashes
-               :address    address
-               :password   (security/safe-unmask-data sha3-pwd)
-               :on-success on-success
-               :on-error   on-error}]]}))))
-
-(rf/reg-event-fx
- :wallet/send-router-transactions-with-signatures
- (fn [{:keys [db]} [type signatures]]
-   (let [transaction-for-signing (get-in db [:wallet :ui type :transaction-for-signing])
-         signatures-map          (reduce (fn [acc {:keys [message signature]}]
-                                           (assoc acc
-                                                  message
-                                                  (send-utils/signature-rsv signature)))
-                                         {}
-                                         signatures)]
-     {:json-rpc/call [{:method     "wallet_sendRouterTransactionsWithSignatures"
-                       :params     [{:uuid       (get-in transaction-for-signing [:sendDetails :uuid])
-                                     :signatures signatures-map}]
-                       :on-success (fn []
-                                     (rf/dispatch [:hide-bottom-sheet]))
-                       :on-error   (fn [error]
-                                     (log/error "failed to send router transactions with signatures"
-                                                {:event :wallet/send-router-transactions-with-signatures
-                                                 :error error})
-                                     (rf/dispatch [:toasts/upsert
-                                                   {:id   :send-router-transactions-with-signatures-error
-                                                    :type :negative
-                                                    :text (:message error)}]))}]})))
-
 (rf/reg-event-fx
  :wallet/select-from-account
  (fn [{db :db} [{:keys [address stack-id network-details network start-flow?] :as params}]]
@@ -817,35 +847,69 @@
 (rf/reg-event-fx
  :wallet/init-tx-settings
  (fn [{db :db}]
-   {:db (assoc-in db
-         [:wallet :ui :send :tx-settings]
-         {:max-base-fee   {:low     5
-                           :current 8.2
-                           :high    9}
-          :priority-fee   {:low     0.6
-                           :high    5.1
-                           :current 1.1}
-          :max-gas-amount {:low     30000
-                           :current 31000}
-          :nonce          {:last-transaction 21
-                           :current          22}})}))
+   {:db (-> db
+            (assoc-in [:wallet :ui :send :custom-tx-settings]
+                      {:max-base-fee   {:low     5
+                                        :current 8.2
+                                        :high    9}
+                       :priority-fee   {:low     0.6
+                                        :high    5.1
+                                        :current 1.1}
+                       :max-gas-amount {:low     30000
+                                        :current 31000}
+                       :nonce          {:last-transaction 21
+                                        :current          22}}))}))
 
 (rf/reg-event-fx
  :wallet/set-max-base-fee
  (fn [{db :db} [value]]
-   {:db (assoc-in db [:wallet :ui :send :tx-settings :max-base-fee :current] value)}))
+   {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :max-base-fee :current] value)}))
 
 (rf/reg-event-fx
  :wallet/set-priority-fee
  (fn [{db :db} [value]]
-   {:db (assoc-in db [:wallet :ui :send :tx-settings :priority-fee :current] value)}))
+   {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :priority-fee :current] value)}))
 (rf/reg-event-fx
 
  :wallet/set-max-gas-amount
  (fn [{db :db} [value]]
-   {:db (assoc-in db [:wallet :ui :send :tx-settings :max-gas-amount :current] value)}))
+   {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :max-gas-amount :current] value)}))
 
 (rf/reg-event-fx
  :wallet/set-nonce
  (fn [{db :db} [value]]
    {:db (assoc-in db [:wallet :ui :send :tx-settings :nonce :current] value)}))
+
+(rf/reg-event-fx :wallet/quick-fee-mode-confirmed
+ (fn [{db :db} [fee-mode]]
+   (let [gas-rate         (transaction-settings/tx-fee-mode->gas-rate fee-mode)
+         route            (first (get-in db [:wallet :ui :send :route]))
+         path-tx-identity (send-utils/path-identity route)
+         params           [path-tx-identity gas-rate]]
+     {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :tx-fee-mode] fee-mode)
+      :fx [[:json-rpc/call
+            [{:method   "wallet_setFeeMode"
+              :params   params
+              :on-error (fn [error]
+                          (log/error "failed to set quick transaction settings"
+                                     {:event  :wallet/quick-fee-mode-confirmed
+                                      :error  (:message error)
+                                      :params params}))}]]
+           [:dispatch [:wallet/mark-user-tx-settings-for-deletion]]]})))
+
+
+;; There is a delay between the moment when user selected
+;; custom settings and the moment when new route arrived
+;; with those settings applied. During this delay
+;; we should keep user settings for ui. After new route
+;; arrived we should clean the settings.
+(rf/reg-event-fx :wallet/mark-user-tx-settings-for-deletion
+ (fn [{db :db}]
+   {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :delete-on-routes-update?] true)}))
+
+
+(rf/reg-event-fx :wallet.send/set-sign-transactions-callback-fx
+ (fn [{:keys [db]} [callback-fx]]
+   {:db (assoc-in db
+         [:wallet :ui :send :sign-transactions-callback-fx]
+         callback-fx)}))

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

@@ -72,11 +72,6 @@
 
     :else (rf/dispatch [:wallet/stop-and-clean-suggested-routes])))
 
-(defn- get-fee-formatted
-  [route]
-  (when-let [native-currency-symbol (-> route first :from :native-currency-symbol)]
-    (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol])))
-
 (defn- insufficient-asset-amount?
   [{:keys [token-symbol owned-eth-token input-state limit-exceeded? enough-assets?]}]
   (let [eth-selected?              (= token-symbol (string/upper-case constants/mainnet-short-name))
@@ -172,7 +167,7 @@
                                           (empty? route)
                                           (not valid-input?))
         fee-formatted                 (when (or (not confirm-disabled?) not-enough-asset?)
-                                        (get-fee-formatted route))
+                                        (rf/sub [:wallet/wallet-send-fee-fiat-formatted]))
         handle-on-confirm             (fn [amount]
                                         (rf/dispatch [:wallet/set-token-amount-to-send
                                                       {:amount   amount

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

@@ -5,9 +5,10 @@
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
+    [status-im.common.biometric.utils :as biometric]
     [status-im.common.events-helper :as events-helper]
     [status-im.common.floating-button-page.view :as floating-button-page]
-    [status-im.common.standard-authentication.core :as standard-auth]
+    [status-im.constants :as constants]
     [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.send.transaction-confirmation.style :as style]
     [status-im.contexts.wallet.send.transaction-settings.view :as transaction-settings]
@@ -168,10 +169,9 @@
     :subtitle        subtitle}])
 
 (defn- transaction-details
-  [{:keys [estimated-time-min max-fees to-network route
-           transaction-type]}]
-  (let [route-loaded?             (and route (seq route))
-        loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
+  [{:keys [estimated-time-min max-fees to-network
+           transaction-type route-loaded?]}]
+  (let [loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
         amount                    (rf/sub [:wallet/send-total-amount-formatted])]
     [rn/view
      {:style (style/details-container
@@ -182,18 +182,17 @@
        [rn/activity-indicator {:style {:flex 1}}]
        route-loaded?
        [:<>
-        (when (ff/enabled? ::ff/wallet.transaction-params)
-          [quo/button
-           {:icon-only?          true
-            :type                :outline
-            :size                32
-            :inner-style         {:opacity 1}
-            :accessibility-label :advanced-button
-            :container-style     {:margin-right 8}
-            :on-press            #(rf/dispatch
-                                   [:show-bottom-sheet
-                                    {:content transaction-settings/settings-sheet}])}
-           :i/advanced])
+        [quo/button
+         {:icon-only?          true
+          :type                :outline
+          :size                32
+          :inner-style         {:opacity 1}
+          :accessibility-label :advanced-button
+          :container-style     {:margin-right 8}
+          :on-press            #(rf/dispatch
+                                 [:show-bottom-sheet
+                                  {:content transaction-settings/settings-sheet}])}
+         :i/advanced]
         [data-item
          {:title    (i18n/label :t/est-time)
           :subtitle (i18n/label :t/time-in-mins {:minutes (str estimated-time-min)})}]
@@ -225,11 +224,7 @@
         estimated-time-min        (reduce + (map :estimated-time route))
         token-symbol              (or token-display-name
                                       (-> send-transaction-data :token :symbol))
-        first-route               (first route)
-        native-currency-symbol    (get-in first-route
-                                          [:from :native-currency-symbol])
-        fee-formatted             (rf/sub [:wallet/wallet-send-fee-fiat-formatted
-                                           native-currency-symbol])
+        fee-formatted             (rf/sub [:wallet/wallet-send-fee-fiat-formatted])
         account                   (rf/sub [:wallet/current-viewing-account])
         account-color             (:color account)
         bridge-to-network         (when bridge-to-chain-id
@@ -237,7 +232,6 @@
                                              bridge-to-chain-id]))
         loading-suggested-routes? (rf/sub
                                    [:wallet/wallet-send-loading-suggested-routes?])
-        transaction-for-signing   (rf/sub [:wallet/wallet-send-transaction-for-signing])
         from-account-props        {:customization-color account-color
                                    :size                32
                                    :emoji               (:emoji account)
@@ -249,20 +243,9 @@
         user-props                {:full-name to-address
                                    :address   (utils/get-shortened-address
                                                to-address)}
-        sign-on-keycard?          (get-in transaction-for-signing
-                                          [:signingDetails :signOnKeycard])]
+        biometric-auth?           (= (rf/sub [:auth-method]) constants/auth-method-biometric)
+        biometric-type            (rf/sub [:biometrics/supported-type])]
     (hot-reload/use-safe-unmount #(rf/dispatch [:wallet/clean-route-data-for-collectible-tx]))
-    ;; In token send flow we already have transaction built when
-    ;; we reach confirmation screen. But in send collectible flow
-    ;; routes request happens at the same time with navigation to
-    ;; confirmation screen. So we need to build the transaction as soon
-    ;; as route is available.
-    (rn/use-effect
-     (fn []
-       (when (and (send-utils/tx-type-collectible? transaction-type)
-                  first-route)
-         (rf/dispatch [:wallet/build-transaction-for-collectible-route])))
-     [first-route])
     (rn/use-mount
      (fn []
        (when (ff/enabled? ::ff/wallet.transaction-params)
@@ -283,27 +266,21 @@
                                     :to-network         bridge-to-network
                                     :theme              theme
                                     :route              route
-                                    :transaction-type   transaction-type}]
+                                    :transaction-type   transaction-type
+                                    :route-loaded?      (and route (seq route))}]
                                   (when (and (not loading-suggested-routes?) route (seq route))
-                                    [standard-auth/slide-button
-                                     {:size :size-48
-                                      :track-text (if (= transaction-type :tx/bridge)
-                                                    (i18n/label :t/slide-to-bridge)
-                                                    (i18n/label :t/slide-to-send))
-                                      :container-style {:z-index 2}
-                                      :disabled? (not transaction-for-signing)
+                                    [quo/slide-button
+                                     {:size                :size-48
+                                      :track-text          (if (= transaction-type :tx/bridge)
+                                                             (i18n/label :t/slide-to-bridge)
+                                                             (i18n/label :t/slide-to-send))
+                                      :container-style     {:z-index 2}
                                       :customization-color account-color
-                                      :auth-button-label (i18n/label :t/confirm)
-                                      :on-complete (when sign-on-keycard?
-                                                     #(rf/dispatch
-                                                       [:wallet/prepare-signatures-for-transactions
-                                                        :send
-                                                        ""]))
-                                      :on-auth-success
-                                      (fn [psw]
-                                        (rf/dispatch
-                                         [:wallet/prepare-signatures-for-transactions :send
-                                          psw]))}])]
+                                      :track-icon          (if biometric-auth?
+                                                             (biometric/get-icon-by-type biometric-type)
+                                                             :password)
+                                      :on-complete         #(rf/dispatch
+                                                             [:wallet.send/auth-slider-completed])}])]
        :gradient-cover?          true
        :customization-color      (:color account)}
       [rn/view

src/status_im/contexts/wallet/send/transaction_settings/core.cljs

@@ -0,0 +1,23 @@
+(ns status-im.contexts.wallet.send.transaction-settings.core
+  (:require
+    [status-im.constants :as constants]))
+
+(def default-transaction-setting :tx-fee-mode/fast)
+
+(defn tx-fee-mode->gas-rate
+  [tx-fee-mode]
+  (case tx-fee-mode
+    :tx-fee-mode/normal constants/gas-rate-low
+    :tx-fee-mode/fast   constants/gas-rate-medium
+    :tx-fee-mode/urgent constants/gas-rate-high
+    :tx-fee-mode/custom constants/gas-rate-custom
+    constants/gas-rate-medium))
+
+(defn gas-rate->tx-fee-mode
+  [gas-rate]
+  (condp = gas-rate
+    constants/gas-rate-low    :tx-fee-mode/normal
+    constants/gas-rate-medium :tx-fee-mode/fast
+    constants/gas-rate-high   :tx-fee-mode/urgent
+    constants/gas-rate-custom :tx-fee-mode/custom
+    :tx-fee-mode/fast))

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

@@ -5,6 +5,7 @@
     [react-native.platform :as platform]
     [react-native.safe-area :as safe-area]
     [status-im.common.controlled-input.utils :as controlled-input]
+    [status-im.feature-flags :as ff]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -14,7 +15,8 @@
   (let [max-base-fee   (:current (rf/sub [:wallet/tx-settings-max-base-fee]))
         priority-fee   (:current (rf/sub [:wallet/tx-settings-priority-fee]))
         max-gas-amount (:current (rf/sub [:wallet/tx-settings-max-gas-amount]))
-        nonce          (:current (rf/sub [:wallet/tx-settings-nonce]))]
+        nonce          (:current (rf/sub [:wallet/tx-settings-nonce]))
+        account-color  (rf/sub [:wallet/current-viewing-account-color])]
     [rn/view
      [quo/drawer-top
       {:title (i18n/label :t/custom)}]
@@ -62,64 +64,90 @@
                     :preview-size      :size-32}]}]
      [quo/bottom-actions
       {:actions          :one-action
-       :button-one-props {:on-press #(rf/dispatch [:hide-bottom-sheet])}
+       :button-one-props {:on-press            #(rf/dispatch [:hide-bottom-sheet])
+                          :customization-color account-color}
        :button-one-label (i18n/label :t/confirm)}]]))
 
 (defn settings-sheet
-  [_]
-  (let [[selected-id set-selected-id] (rn/use-state :normal)]
+  []
+  (let [current-transaction-setting                   (rf/sub [:wallet/tx-fee-mode])
+        account-color                                 (rf/sub [:wallet/current-viewing-account-color])
+        [transaction-setting set-transaction-setting] (rn/use-state current-transaction-setting)
+        set-normal                                    #(set-transaction-setting :tx-fee-mode/normal)
+        set-fast                                      #(set-transaction-setting :tx-fee-mode/fast)
+        set-urgent                                    #(set-transaction-setting :tx-fee-mode/urgent)]
     [rn/view
      [quo/drawer-top
       {:title (i18n/label :t/transaction-settings)}]
      [quo/category
       {:list-type :settings
-       :data      [{:title             (str (i18n/label :t/normal) "~60s")
-                    :image-props       "🍿"
-                    :description-props {:text "€1.45"}
-                    :image             :emoji
-                    :description       :text
-                    :action            :selector
-                    :action-props      {:type     :radio
-                                        :checked? (= :normal selected-id)}
-                    :on-press          #(set-selected-id :normal)
-                    :label             :text
-                    :preview-size      :size-32}
-                   {:title             (str (i18n/label :t/fast) "~40s")
-                    :image-props       "🚗"
-                    :description-props {:text "€1.65"}
-                    :image             :emoji
-                    :description       :text
-                    :action            :selector
-                    :action-props      {:type     :radio
-                                        :checked? (= :fast selected-id)}
-                    :on-press          #(set-selected-id :fast)
-                    :label             :text
-                    :preview-size      :size-32}
-                   {:title             (str (i18n/label :t/urgent) "~15s")
-                    :image-props       "🚀"
-                    :description-props {:text "€1.85"}
-                    :image             :emoji
-                    :description       :text
-                    :action            :selector
-                    :action-props      {:type     :radio
-                                        :checked? (= :urgent selected-id)}
-                    :on-press          #(set-selected-id :urgent)
-                    :label             :text
-                    :preview-size      :size-32}
-                   {:title             (i18n/label :t/custom)
-                    :image-props       :i/edit
-                    :description-props {:text "Set your own fees and nonce"}
-                    :image             :icon
-                    :description       :text
-                    :action            :arrow
-                    :on-press          #(rf/dispatch
-                                         [:show-bottom-sheet
-                                          {:content custom-settings-sheet}])
-                    :label             :text
-                    :preview-size      :size-32}]}]
+       :data [{:title             (str (i18n/label :t/normal) "~60s")
+               :image-props       "🍿"
+               :description-props {:text (rf/sub [:wallet/wallet-send-transaction-setting-fiat-formatted
+                                                  :tx-fee-mode/normal])}
+               :image             :emoji
+               :description       :text
+               :action            :selector
+               :action-props      {:type                :radio
+                                   :checked?            (= :tx-fee-mode/normal transaction-setting)
+                                   :customization-color account-color
+                                   ;; there is an UI isssue in quo/category, it has :on-press event
+                                   ;; and child radio button has own :on-change. If they are not set
+                                   ;; to the same action then we are getting inconsistent behaviour
+                                   ;; when user can click on settings item but cant on radio itself.
+                                   ;; So duplication is to prevent that until general fix is applied
+                                   ;; to quo/category
+                                   :on-change           set-normal}
+               :on-press          set-normal
+               :label             :text
+               :preview-size      :size-32}
+              {:title             (str (i18n/label :t/fast) "~40s")
+               :image-props       "🚗"
+               :description-props {:text (rf/sub [:wallet/wallet-send-transaction-setting-fiat-formatted
+                                                  :tx-fee-mode/fast])}
+               :image             :emoji
+               :description       :text
+               :action            :selector
+               :action-props      {:type                :radio
+                                   :checked?            (= :tx-fee-mode/fast transaction-setting)
+                                   :on-change           set-fast
+                                   :customization-color account-color}
+               :on-press          set-fast
+               :label             :text
+               :preview-size      :size-32}
+              {:title             (str (i18n/label :t/urgent) "~15s")
+               :image-props       "🚀"
+               :description-props {:text (rf/sub [:wallet/wallet-send-transaction-setting-fiat-formatted
+                                                  :tx-fee-mode/urgent])}
+               :image             :emoji
+               :description       :text
+               :action            :selector
+               :action-props      {:type                :radio
+                                   :checked?            (= :tx-fee-mode/urgent transaction-setting)
+                                   :customization-color account-color
+                                   :on-change           set-urgent}
+               :on-press          set-urgent
+               :label             :text
+               :preview-size      :size-32}
+              (when (ff/enabled? ::ff/wallet.transaction-params)
+                {:title             (i18n/label :t/custom)
+                 :image-props       :i/edit
+                 :description-props {:text "Set your own fees and nonce"}
+                 :image             :icon
+                 :description       :text
+                 :action            :arrow
+                 :on-press          #(rf/dispatch
+                                      [:show-bottom-sheet
+                                       {:content custom-settings-sheet}])
+                 :label             :text
+                 :preview-size      :size-32})]}]
      [quo/bottom-actions
       {:actions          :one-action
-       :button-one-props {:on-press #(rf/dispatch [:hide-bottom-sheet])}
+       :button-one-props {:on-press            (fn []
+                                                 (rf/dispatch [:wallet/quick-fee-mode-confirmed
+                                                               transaction-setting])
+                                                 (rf/dispatch [:hide-bottom-sheet]))
+                          :customization-color account-color}
        :button-one-label (i18n/label :t/confirm)}]]))
 
 (defn- hint

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

@@ -25,21 +25,42 @@
              transaction-hashes))
 
 (defn calculate-gas-fee
-  [data]
-  (let [gas-amount         (money/bignumber (get data :gas-amount))
-        gas-fees           (get data :gas-fees)
-        eip1559-enabled?   (get gas-fees :eip-1559-enabled)
-        optimal-price-gwei (money/bignumber (if eip1559-enabled?
-                                              (get gas-fees :max-fee-per-gas-medium)
-                                              (get gas-fees :gas-price)))
-        total-gas-fee-wei  (money/mul (money/->wei :gwei optimal-price-gwei) gas-amount)
-        l1-fee-wei         (money/->wei :gwei (get gas-fees :l-1-gas-fee))]
+  [{:keys [gas-amount gas-price l1-gas-fee]}]
+  (let [total-gas-fee-wei (money/mul (money/->wei :gwei gas-price) gas-amount)
+        l1-fee-wei        (money/->wei :gwei l1-gas-fee)]
     (money/add total-gas-fee-wei l1-fee-wei)))
 
-(defn calculate-full-route-gas-fee
+(defn path-gas-fee
+  [path]
+  (let [gas-amount       (money/bignumber (get path :gas-amount))
+        gas-fees         (get path :gas-fees)
+        eip1559-enabled? (get gas-fees :eip-1559-enabled)
+        gas-price        (money/bignumber (if eip1559-enabled?
+                                            (get gas-fees :tx-max-fees-per-gas)
+                                            (get gas-fees :gas-price)))
+        l1-gas-fee       (get gas-fees :l-1-gas-fee)]
+    (calculate-gas-fee {:gas-amount gas-amount
+                        :gas-price  gas-price
+                        :l1-gas-fee l1-gas-fee})))
+
+(defn path-gas-fee-for-custom-gas-price
+  [route gas-price]
+  (let [gas-amount (money/bignumber (get route :gas-amount))
+        gas-fees   (get route :gas-fees)
+        l1-gas-fee (get gas-fees :l-1-gas-fee)]
+    (calculate-gas-fee {:gas-amount gas-amount
+                        :gas-price  (money/bignumber gas-price)
+                        :l1-gas-fee l1-gas-fee})))
+
+(defn full-route-gas-fee
   "Sums all the routes fees in wei and then convert the total value to ether"
   [route]
-  (money/wei->ether (reduce money/add (map calculate-gas-fee route))))
+  (money/wei->ether (reduce money/add (map path-gas-fee route))))
+
+(defn full-route-gas-fee-for-custom-gas-price
+  "Sums all the routes fees in wei and then convert the total value to ether"
+  [route gas-price]
+  (money/wei->ether (reduce money/add (map #(path-gas-fee-for-custom-gas-price % gas-price) route))))
 
 (defn- path-amount-in
   [path]
@@ -224,3 +245,11 @@
   {:r (subs signature 0 64)
    :s (subs signature 64 128)
    :v (subs signature 128 130)})
+
+(defn path-identity
+  [path]
+  {:routerInputParamsUuid (:router-input-params-uuid path)
+   :pathName              (:bridge-name path)
+   :chainID               (get-in path [:from :chain-id])
+   :isApprovalTx          (:approval-required path)
+   :communityID           nil})

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

@@ -178,21 +178,21 @@
 (deftest calculate-gas-fee-test
   (testing "EIP-1559 transaction without L1 fee"
     (let [data            {:gas-amount "23487"
-                           :gas-fees   {:max-fee-per-gas-medium "2.259274911"
-                                        :eip-1559-enabled       true
-                                        :l-1-gas-fee            "0"}}
+                           :gas-fees   {:tx-max-fees-per-gas "2.259274911"
+                                        :eip-1559-enabled    true
+                                        :l-1-gas-fee         "0"}}
           expected-result (money/bignumber "53063589834657")] ; This is in Wei
-      (is (money/equal-to (utils/calculate-gas-fee data)
+      (is (money/equal-to (utils/path-gas-fee data)
                           expected-result))))
 
   (testing "EIP-1559 transaction with L1 fee of 60,000 Gwei"
     (let [data            {:gas-amount "23487"
-                           :gas-fees   {:max-fee-per-gas-medium "2.259274911"
-                                        :eip-1559-enabled       true
-                                        :l-1-gas-fee            "60000"}}
+                           :gas-fees   {:tx-max-fees-per-gas "2.259274911"
+                                        :eip-1559-enabled    true
+                                        :l-1-gas-fee         "60000"}}
           expected-result (money/bignumber "113063589834657")] ; Added 60,000 Gwei in Wei to the
                                                                ; previous result
-      (is (money/equal-to (utils/calculate-gas-fee data)
+      (is (money/equal-to (utils/path-gas-fee data)
                           expected-result))))
 
   (testing "Non-EIP-1559 transaction with specified gas price"
@@ -202,48 +202,48 @@
                                         :l-1-gas-fee      "0"}}
           expected-result (money/bignumber "67471600217343")] ; This is in Wei, for the specified
                                                               ; gas amount and price
-      (is (money/equal-to (utils/calculate-gas-fee data)
+      (is (money/equal-to (utils/path-gas-fee data)
                           expected-result)))))
 
 (deftest calculate-full-route-gas-fee-test
   (testing "Route with a single EIP-1559 transaction, no L1 fees"
     (let [route           [{:gas-amount "23487"
-                            :gas-fees   {:max-fee-per-gas-medium "2.259274911"
-                                         :eip-1559-enabled       true
-                                         :l-1-gas-fee            "0"}}]
+                            :gas-fees   {:tx-max-fees-per-gas "2.259274911"
+                                         :eip-1559-enabled    true
+                                         :l-1-gas-fee         "0"}}]
           expected-result (money/bignumber "0.000053063589834657")] ; The Wei amount for the
                                                                     ; transaction, converted to
                                                                     ; Ether
-      (is (money/equal-to (utils/calculate-full-route-gas-fee route)
+      (is (money/equal-to (utils/full-route-gas-fee route)
                           expected-result))))
 
   (testing "Route with two EIP-1559 transactions, no L1 fees"
     (let [route           [{:gas-amount "23487"
-                            :gas-fees   {:max-fee-per-gas-medium "2.259274911"
-                                         :eip-1559-enabled       true
-                                         :l-1-gas-fee            "0"}}
+                            :gas-fees   {:tx-max-fees-per-gas "2.259274911"
+                                         :eip-1559-enabled    true
+                                         :l-1-gas-fee         "0"}}
                            {:gas-amount "23487"
-                            :gas-fees   {:max-fee-per-gas-medium "2.259274911"
-                                         :eip-1559-enabled       true
-                                         :l-1-gas-fee            "0"}}]
+                            :gas-fees   {:tx-max-fees-per-gas "2.259274911"
+                                         :eip-1559-enabled    true
+                                         :l-1-gas-fee         "0"}}]
           expected-result (money/bignumber "0.000106127179669314")] ; Sum of both transactions' Wei
                                                                     ; amounts, converted to Ether
-      (is (money/equal-to (utils/calculate-full-route-gas-fee route)
+      (is (money/equal-to (utils/full-route-gas-fee route)
                           expected-result))))
 
   (testing "Route with two EIP-1559 transactions, one with L1 fee of 60,000 Gwei"
     (let [route           [{:gas-amount "23487"
-                            :gas-fees   {:max-fee-per-gas-medium "2.259274911"
-                                         :eip-1559-enabled       true
-                                         :l-1-gas-fee            "0"}}
+                            :gas-fees   {:tx-max-fees-per-gas "2.259274911"
+                                         :eip-1559-enabled    true
+                                         :l-1-gas-fee         "0"}}
                            {:gas-amount "23487"
-                            :gas-fees   {:max-fee-per-gas-medium "2.259274911"
-                                         :eip-1559-enabled       true
-                                         :l-1-gas-fee            "60000"}}]
+                            :gas-fees   {:tx-max-fees-per-gas "2.259274911"
+                                         :eip-1559-enabled    true
+                                         :l-1-gas-fee         "60000"}}]
           expected-result (money/bignumber "0.000166127179669314")] ; Added 60,000 Gwei in Wei to
                                                                     ; the previous total and
                                                                     ; converted to Ether
-      (is (money/equal-to (utils/calculate-full-route-gas-fee route)
+      (is (money/equal-to (utils/full-route-gas-fee route)
                           expected-result)))))
 
 (deftest token-available-networks-for-suggested-routes-test

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

@@ -410,7 +410,17 @@
    {:db (assoc-in db [:wallet :ui :swap :sign-transactions-callback-fx] callback-fx)}))
 
 (rf/reg-event-fx
- :wallet.swap/approve
+ :wallet.swap/review-swap
+ (fn [{:keys [db]}]
+   {:db (-> db
+            (update-in [:wallet :ui :swap] dissoc :transaction-for-signing))
+    :fx [[:dispatch
+          [:navigate-to-within-stack
+           [:screen/wallet.swap-confirmation
+            :screen/wallet.setup-swap]]]]}))
+
+(rf/reg-event-fx
+ :wallet/prepare-signatures-for-swap-transactions
  (fn [{:keys [db]}]
    (let [last-request-uuid (get-in db [:wallet :ui :swap :last-request-uuid])
          max-slippage      (get-in db [:wallet :ui :swap :max-slippage])]
@@ -420,23 +430,7 @@
               :slippage     max-slippage}]]
            [:dispatch
             [:wallet.swap/set-sign-transactions-callback-fx
-             [:dispatch [:open-modal :screen/wallet.swap-set-spending-cap]]]]]})))
-
-(rf/reg-event-fx
- :wallet.swap/review-swap
- (fn [{:keys [db]}]
-   (let [last-request-uuid (get-in db [:wallet :ui :swap :last-request-uuid])
-         max-slippage      (get-in db [:wallet :ui :swap :max-slippage])]
-     {:db (-> db
-              (update-in [:wallet :ui :swap] dissoc :transaction-for-signing))
-      :fx [[:dispatch
-            [:wallet/build-transactions-from-route
-             {:request-uuid last-request-uuid
-              :slippage     max-slippage}]]
-           [:dispatch
-            [:navigate-to-within-stack
-             [:screen/wallet.swap-confirmation
-              :screen/wallet.setup-swap]]]]})))
+             [:dispatch [:wallet/prepare-signatures-for-transactions :swap]]]]]})))
 
 (defn transaction-approval-required?
   [transactions {:keys [swap-proposal approval-transaction-id]}]

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

@@ -4,9 +4,10 @@
     [quo.foundations.resources :as resources]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
+    [status-im.common.biometric.utils :as biometric]
     [status-im.common.events-helper :as events-helper]
     [status-im.common.floating-button-page.view :as floating-button-page]
-    [status-im.common.standard-authentication.core :as standard-auth]
+    [status-im.constants :as constants]
     [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.common.utils.external-links :as external-links]
     [status-im.contexts.wallet.swap.set-spending-cap.style :as style]
@@ -216,25 +217,21 @@
 
 (defn- slide-button
   []
-  (let [loading-swap-proposal?  (rf/sub [:wallet/swap-loading-swap-proposal?])
-        swap-proposal           (rf/sub [:wallet/swap-proposal-without-fees])
-        account                 (rf/sub [:wallet/current-viewing-account])
-        transaction-for-signing (rf/sub [:wallet/swap-transaction-for-signing])
-        sign-on-keycard?        (get-in transaction-for-signing
-                                        [:signingDetails :signOnKeycard])
-        on-auth-success         (rn/use-callback
-                                 #(rf/dispatch [:wallet/prepare-signatures-for-transactions :swap %]))
-        on-complete             (rn/use-callback
-                                 #(rf/dispatch [:wallet/prepare-signatures-for-transactions :swap ""]))]
-    [standard-auth/slide-button
+  (let [loading-swap-proposal? (rf/sub [:wallet/swap-loading-swap-proposal?])
+        swap-proposal          (rf/sub [:wallet/swap-proposal-without-fees])
+        account                (rf/sub [:wallet/current-viewing-account])
+        biometric-auth?        (= (rf/sub [:auth-method]) constants/auth-method-biometric)
+        biometric-type         (rf/sub [:biometrics/supported-type])]
+    [quo/slide-button
      {:size                :size-48
       :track-text          (i18n/label :t/slide-to-sign)
       :container-style     {:z-index 2}
       :customization-color (:color account)
+      :track-icon          (if biometric-auth?
+                             (biometric/get-icon-by-type biometric-type)
+                             :password)
       :disabled?           (or loading-swap-proposal? (not swap-proposal))
-      :on-complete         (when sign-on-keycard? on-complete)
-      :on-auth-success     on-auth-success
-      :auth-button-label   (i18n/label :t/confirm)}]))
+      :on-complete         #(rf/dispatch [:wallet/prepare-signatures-for-swap-transactions])}]))
 
 (defn- footer
   []

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

@@ -169,6 +169,12 @@
      (fn []
        (request-fetch-swap-proposal))
      [pay-input-amount])
+    (rn/use-effect
+     (fn []
+       ;; Restart swap proposal fetch after approval confirmation, as route building was paused.
+       (when (and approval-required (= approval-transaction-status :confirmed))
+         (request-fetch-swap-proposal)))
+     [approval-required approval-transaction-status])
     (rn/use-effect
      (fn []
        (when-not overlay-shown?
@@ -374,8 +380,6 @@
   []
   (let [[pay-input-state set-pay-input-state]       (rn/use-state controlled-input/init-state)
         [pay-input-focused? set-pay-input-focused?] (rn/use-state true)
-        refetch-interval                            (rn/use-ref-atom nil)
-        error-response                              (rf/sub [:wallet/swap-error-response])
         loading-swap-proposal?                      (rf/sub [:wallet/swap-loading-swap-proposal?])
         swap-proposal                               (rf/sub [:wallet/swap-proposal-without-fees])
         asset-to-pay                                (rf/sub [:wallet/swap-asset-to-pay])
@@ -433,71 +437,26 @@
                                                           (controlled-input/set-input-value
                                                            input-state
                                                            max-value)))))
-        on-refresh-swap-proposal                    (rn/use-callback
-                                                     (fn []
-                                                       (let
-                                                         [bottom-sheets (rf/sub
-                                                                         [:bottom-sheet-sheets])
-                                                          approval-transaction-status
-                                                          (rf/sub
-                                                           [:wallet/swap-approval-transaction-status])]
-                                                         (when-not valid-pay-input?
-                                                           (when @refetch-interval
-                                                             (js/clearTimeout @refetch-interval))
-                                                           (reset! refetch-interval nil))
-                                                         (when @refetch-interval
-                                                           (js/clearTimeout @refetch-interval))
-                                                         (reset! refetch-interval nil)
-                                                         (when (and valid-pay-input?
-                                                                    (not loading-swap-proposal?)
-                                                                    (not bottom-sheets)
-                                                                    (not= approval-transaction-status
-                                                                          :pending))
-                                                           (fetch-swap-proposal
-                                                            {:amount pay-input-amount
-                                                             :valid-input? valid-pay-input?
-                                                             :clean-approval-transaction? false}))))
-                                                     [valid-pay-input? loading-swap-proposal?
-                                                      pay-input-amount])
         refetch-swap-proposal                       (fn []
                                                       (when valid-pay-input?
                                                         (fetch-swap-proposal
                                                          {:amount                      pay-input-amount
                                                           :valid-input?                valid-pay-input?
                                                           :clean-approval-transaction? true})))]
-    (rn/use-effect (fn []
-                     (when @refetch-interval
-                       (js/clearInterval @refetch-interval)
-                       (reset! refetch-interval nil))
-                     (when (or swap-proposal error-response)
-                       (reset! refetch-interval
-                         (js/setInterval
-                          on-refresh-swap-proposal
-                          constants/swap-proposal-refresh-interval-ms))))
-                   [swap-proposal error-response])
     (rn/use-effect (fn []
                      (rf/dispatch [:wallet/clean-swap-proposal
                                    {:clean-amounts?              false
                                     :clean-approval-transaction? true}])
-                     (when @refetch-interval
-                       (js/clearInterval @refetch-interval)
-                       (reset! refetch-interval nil))
                      (refetch-swap-proposal))
                    [current-account-address])
     (rn/use-unmount (fn []
                       (rf/dispatch [:wallet/clean-swap-proposal
                                     {:clean-amounts?              true
-                                     :clean-approval-transaction? true}])
-                      (when @refetch-interval
-                        (js/clearInterval @refetch-interval)
-                        (reset! refetch-interval nil))))
+                                     :clean-approval-transaction? true}])))
     (rn/use-effect
      (fn []
        (when asset-to-pay
          (let [swap-amount (rf/sub [:wallet/swap-amount])]
-           (when (and swap-amount refetch-interval)
-             (js/clearTimeout @refetch-interval)
-             (reset! refetch-interval nil))
            (cond (and swap-amount (not= swap-amount pay-input-amount))
                  (set-pay-input-state
                   (fn [input-state]
@@ -528,15 +487,12 @@
         :on-max-press     on-max-press
         :input-focused?   pay-input-focused?
         :on-token-press   #(rf/dispatch [:show-bottom-sheet {:content pay-token-bottom-sheet}])
-        :on-approve-press #(rf/dispatch [:wallet.swap/approve])
+        :on-approve-press #(rf/dispatch [:open-modal :screen/wallet.swap-set-spending-cap])
         :on-input-focus   (fn []
                             (when platform/android? (rf/dispatch [:dismiss-keyboard]))
                             (set-pay-input-focused? true))}]
       [swap-order-button
        {:on-press (fn []
-                    (when @refetch-interval
-                      (js/clearTimeout @refetch-interval)
-                      (reset! refetch-interval nil))
                     (rf/dispatch [:wallet.swap/flip-assets]))}]
       [receive-token-input
        {:input-focused? (not pay-input-focused?)

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

@@ -4,8 +4,8 @@
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
+    [status-im.common.biometric.utils :as biometric]
     [status-im.common.floating-button-page.view :as floating-button-page]
-    [status-im.common.standard-authentication.core :as standard-auth]
     [status-im.constants :as constants]
     [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.send.utils :as send-utils]
@@ -163,30 +163,23 @@
 
 (defn- slide-button
   []
-  (let [loading-swap-proposal?  (rf/sub [:wallet/swap-loading-swap-proposal?])
-        transaction-for-signing (rf/sub [:wallet/swap-transaction-for-signing])
-        swap-proposal           (rf/sub [:wallet/swap-proposal-without-fees])
-        account                 (rf/sub [:wallet/current-viewing-account])
-        account-color           (:color account)
-        sign-on-keycard?        (get-in transaction-for-signing
-                                        [:signingDetails :signOnKeycard])]
-    [standard-auth/slide-button
+  (let [loading-swap-proposal? (rf/sub [:wallet/swap-loading-swap-proposal?])
+        swap-proposal          (rf/sub [:wallet/swap-proposal-without-fees])
+        account                (rf/sub [:wallet/current-viewing-account])
+        biometric-auth?        (= (rf/sub [:auth-method]) constants/auth-method-biometric)
+        biometric-type         (rf/sub [:biometrics/supported-type])
+        account-color          (:color account)]
+    [quo/slide-button
      {:size                :size-48
       :track-text          (i18n/label :t/slide-to-swap)
       :container-style     {:z-index 2}
       :customization-color account-color
+      :track-icon          (if biometric-auth?
+                             (biometric/get-icon-by-type biometric-type)
+                             :password)
       :disabled?           (or loading-swap-proposal?
-                               (not swap-proposal)
-                               (not transaction-for-signing))
-      :auth-button-label   (i18n/label :t/confirm)
-      :on-complete         (when sign-on-keycard?
-                             #(rf/dispatch
-                               [:wallet/prepare-signatures-for-transactions
-                                :swap
-                                ""]))
-      :on-auth-success     (fn [data]
-                             (rf/dispatch [:wallet/stop-get-swap-proposal])
-                             (rf/dispatch [:wallet/prepare-signatures-for-transactions :swap data]))}]))
+                               (not swap-proposal))
+      :on-complete         #(rf/dispatch [:wallet/prepare-signatures-for-swap-transactions])}]))
 
 (defn footer
   []

src/status_im/subs/wallet/send.cljs

@@ -205,27 +205,40 @@
      {:crypto (str crypto-formatted " " (:symbol token))
       :fiat   fiat-formatted})))
 
+
 (rf/reg-sub
- :wallet/tx-settings
+ :wallet/custom-tx-settings
  :<- [:wallet/wallet-send]
- :-> :tx-settings)
+ :-> :custom-tx-settings)
+
+(rf/reg-sub
+ :wallet/tx-settings-fee-mode-user
+ :<- [:wallet/custom-tx-settings]
+ :-> :tx-fee-mode)
 
 (rf/reg-sub
  :wallet/tx-settings-max-base-fee
- :<- [:wallet/tx-settings]
+ :<- [:wallet/custom-tx-settings]
  :-> :max-base-fee)
 
 (rf/reg-sub
  :wallet/tx-settings-priority-fee
- :<- [:wallet/tx-settings]
+ :<- [:wallet/custom-tx-settings]
  :-> :priority-fee)
 
 (rf/reg-sub
  :wallet/tx-settings-max-gas-amount
- :<- [:wallet/tx-settings]
+ :<- [:wallet/custom-tx-settings]
  :-> :max-gas-amount)
 
 (rf/reg-sub
  :wallet/tx-settings-nonce
- :<- [:wallet/tx-settings]
+ :<- [:wallet/custom-tx-settings]
  :-> :nonce)
+
+(rf/reg-sub
+ :wallet/tx-fee-mode
+ :<- [:wallet/send-route]
+ :<- [:wallet/tx-settings-fee-mode-user]
+ (fn [[route value-set-by-user]]
+   (or value-set-by-user (:tx-fee-mode (first route)))))

src/status_im/subs/wallet/swap.cljs

@@ -260,7 +260,7 @@
            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 [swap-proposal])
+           fee-in-native-token (send-utils/full-route-gas-fee [swap-proposal])
            fee-in-fiat         (utils/calculate-token-fiat-value
                                 {:currency         currency
                                  :balance          fee-in-native-token

src/status_im/subs/wallet/swap_test.cljs

@@ -120,9 +120,9 @@
                    :approval-required        true
                    :approval-amount-required "0x10000"
                    :gas-amount               "25000"
-                   :gas-fees                 {:max-fee-per-gas-medium "4"
-                                              :eip-1559-enabled       true
-                                              :l-1-gas-fee            "0"}}
+                   :gas-fees                 {:tx-max-fees-per-gas "4"
+                                              :eip-1559-enabled    true
+                                              :l-1-gas-fee         "0"}}
    :error-response "Error"
    :loading-swap-proposal? false
    :max-slippage 0.5})

src/status_im/subs/wallet/wallet.cljs

@@ -162,6 +162,17 @@
  :<- [:wallet/wallet-send]
  :-> :route)
 
+(rf/reg-sub
+ :wallet/gas-fees
+ :<- [:wallet/wallet-send-route]
+ (fn [route]
+   (:gas-fees (first route))))
+
+(rf/reg-sub
+ :wallet/suggested-gas-fees-for-setting
+ :<- [:wallet/gas-fees]
+ :-> :suggested-gas-fees-for-setting)
+
 (rf/reg-sub
  :wallet/wallet-send-enough-assets?
  :<- [:wallet/wallet-send]
@@ -844,22 +855,51 @@
  :<- [:profile/currency]
  :<- [:profile/currency-symbol]
  :<- [:wallet/prices-per-token]
- (fn [[account route currency currency-symbol prices-per-token] [_ 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-fiat         (utils/calculate-token-fiat-value
-                                {:currency         currency
-                                 :balance          fee-in-native-token
-                                 :token            token-for-fees
-                                 :prices-per-token prices-per-token})
-           fee-formatted       (utils/fiat-formatted-for-ui
-                                currency-symbol
-                                fee-in-fiat)]
-       fee-formatted))))
+ (fn [[account route currency currency-symbol prices-per-token]]
+   (let [token-symbol-for-fees (get-in (first route) [:from :native-currency-symbol])]
+     (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/full-route-gas-fee route)
+             fee-in-fiat         (utils/calculate-token-fiat-value
+                                  {:currency         currency
+                                   :balance          fee-in-native-token
+                                   :token            token-for-fees
+                                   :prices-per-token prices-per-token})
+             fee-formatted       (utils/fiat-formatted-for-ui
+                                  currency-symbol
+                                  fee-in-fiat)]
+         fee-formatted)))))
+
+(rf/reg-sub
+ :wallet/wallet-send-transaction-setting-fiat-formatted
+ :<- [:wallet/current-viewing-account]
+ :<- [:wallet/wallet-send-route]
+ :<- [:profile/currency]
+ :<- [:profile/currency-symbol]
+ :<- [:wallet/prices-per-token]
+ :<- [:wallet/suggested-gas-fees-for-setting]
+ (fn [[account route currency currency-symbol prices-per-token fees-for-settings]
+      [_ transaction-setting]]
+   (let [token-symbol-for-fees (get-in (first route) [:from :native-currency-symbol])]
+     (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))
+             gas-price           (transaction-setting fees-for-settings)
+             fee-in-native-token (send-utils/full-route-gas-fee-for-custom-gas-price route gas-price)
+             fee-in-fiat         (utils/calculate-token-fiat-value
+                                  {:currency         currency
+                                   :balance          fee-in-native-token
+                                   :token            token-for-fees
+                                   :prices-per-token prices-per-token})
+             fee-formatted       (utils/fiat-formatted-for-ui
+                                  currency-symbol
+                                  fee-in-fiat)]
+         fee-formatted)))))
 
 (rf/reg-sub
  :wallet/accounts-names

src/status_im/subs/wallet/wallet_test.cljs

@@ -205,9 +205,10 @@
 
 (def route-data
   [{:gas-amount "25000"
-    :gas-fees   {:max-fee-per-gas-medium "4"
-                 :eip-1559-enabled       true
-                 :l-1-gas-fee            "0"}}])
+    :gas-fees   {:tx-max-fees-per-gas "4"
+                 :eip-1559-enabled    true
+                 :l-1-gas-fee         "0"}
+    :from       {:native-currency-symbol "ETH"}}])
 
 (h/deftest-sub :wallet/balances-in-selected-networks
   [sub-name]
@@ -938,9 +939,7 @@
            (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])]
-      (is (match? result "$0.20")))))
+    (is (match? (rf/sub [sub-name]) "$0.20"))))
 
 (h/deftest-sub :wallet/zero-balance-in-all-non-watched-accounts?
   [sub-name]

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v10.4.0",
-    "commit-sha1": "1bfb0cef022afc1484a410cb3e0097e7523bb705",
-    "src-sha256": "13cg07ld319g1fyaqpkjnpdw6iap389dwzwnh9g870ci8scpdy5m"
+    "version": "v10.6.0",
+    "commit-sha1": "c5e4eb1a56ea7641efcc7cc677be7fd5d3f92225",
+    "src-sha256": "0n8x03c4dqxwcl27y8x6hmn6wbfpq3llkj15hhjxc4baaqwrhy8i"
 }

test/appium/tests/critical/wallet/test_collectibles.py

@@ -0,0 +1,185 @@
+import re
+import time
+
+import pytest
+from selenium.common import TimeoutException
+
+from base_test_case import MultipleSharedDeviceTestCase, create_shared_drivers
+from tests import marks
+from users import transaction_senders
+from views.sign_in_view import SignInView
+
+
+@pytest.mark.xdist_group(name="new_one_2")
+@marks.nightly
+@marks.secured
+@marks.smoke
+class TestWalletCollectibles(MultipleSharedDeviceTestCase):
+
+    def prepare_devices(self):
+        self.drivers, self.loop = create_shared_drivers(1)
+        self.sign_in_view = SignInView(self.drivers[0])
+        self.sender, self.receiver = transaction_senders['ETH_1'], transaction_senders['ETH_2']
+        self.sender['wallet_address'] = '0x' + self.sender['address']
+        self.receiver['wallet_address'] = '0x' + self.receiver['address']
+        self.sign_in_view.recover_access(passphrase=self.sender['passphrase'])
+
+        self.home_view = self.sign_in_view.get_home_view()
+        self.sender_username = self.home_view.get_username()
+        self.profile_view = self.home_view.profile_button.click()
+        self.profile_view.switch_network()
+        self.sign_in_view.sign_in(user_name=self.sender_username)
+        self.home_view.wallet_tab.click()
+        self.wallet_view = self.home_view.get_wallet_view()
+        self.account_name = 'Account 1'
+        self.sender_short_address = self.sender['wallet_address'].replace(self.sender['wallet_address'][6:-3],
+                                                                          '…').lower()
+        self.receiver_short_address = self.receiver['wallet_address'].replace(self.receiver['wallet_address'][6:-3],
+                                                                              '…').lower()
+
+    @marks.testrail_id(741839)
+    def test_wallet_collectibles_balance(self):
+        self.wallet_view.collectibles_tab.click()
+        self.wallet_view.set_network_in_wallet('Base')
+        collectibles = {
+            "BVL": {"quantity": 2,
+                    "info": {"Account": "Account 1",
+                             "Network": "Base",
+                             "category": "Football Player",
+                             "rank": "Star",
+                             "type": "Modric"}},
+            "Glitch Punks": {"quantity": 1,
+                             "info": {"Account": "Account 1",
+                                      "Network": "Base",
+                                      "Race": "Skull Blue",
+                                      "Mouth": "Lipstick Green",
+                                      "Eyes": "Femme Shade Eyes Variant 3",
+                                      "Face": "Pipe",
+                                      "Ear Accessory": "Silver Stud Cross Combo",
+                                      "Nose": "Bot Nose 3",
+                                      "Eye Accessory": "Nouns",
+                                      "Head": "Double Spike"}}
+        }
+        for collectible_name, data in collectibles.items():
+            self.wallet_view.just_fyi("Check %s collectible info and image" % collectible_name)
+            try:
+                element = self.wallet_view.get_collectible_element(collectible_name)
+                element.wait_for_element()
+            except TimeoutException:
+                self.errors.append(self.wallet_view, "Collectible '%s' is not displayed" % collectible_name)
+                continue
+            if element.image_element.is_element_differs_from_template(
+                    '%s_collectible_image_template.png' % collectible_name):
+                self.errors.append(self.wallet_view, "%s image doesn't match expected template" % collectible_name)
+            if element.quantity != data['quantity']:
+                self.errors.append(self.wallet_view, "%s quantity %s doesn't match expected %s" % (
+                    collectible_name, element.quantity, data['quantity']))
+            self.wallet_view.just_fyi("Check %s collectible expanded info" % collectible_name)
+            element.click()
+            if self.wallet_view.expanded_collectible_image.is_element_differs_from_template(
+                    '%s_expanded_collectible_image_template.png' % collectible_name):
+                self.errors.append(self.wallet_view,
+                                   "%s expanded image doesn't match expected template" % collectible_name)
+            self.wallet_view.driver.swipe(500, 2000, 500, 300)
+            for item, expected_text in data['info'].items():
+                try:
+                    text = self.wallet_view.get_data_item_element_text(item)
+                    if text != expected_text:
+                        self.errors.append(self.wallet_view, "%s: shown %s text '%s' doesn't match expected '%s'" % (
+                            collectible_name, item, text, expected_text))
+                except TimeoutException:
+                    self.errors.append(self.wallet_view, "%s: %s data item is not shown" % (collectible_name, item))
+            self.wallet_view.click_system_back_button()
+        self.errors.verify_no_errors()
+
+    @marks.testrail_id(741840)
+    def test_wallet_send_collectible(self):
+        self.wallet_view.reopen_app(user_name=self.sender_username)
+        self.wallet_view.send_button.click()
+        self.wallet_view.address_text_input.send_keys(self.receiver['wallet_address'])
+        self.wallet_view.continue_button.click()
+        self.wallet_view.collectibles_tab_on_select_token_view.click()
+        time.sleep(5)
+        self.wallet_view.get_collectible_element('BVL').click()
+        self.wallet_view.amount_input_increase_button.click()
+        self.wallet_view.confirm_button.click()
+        expected_text = '2 BVL #47'
+        for text in [self.account_name, self.sender_short_address, expected_text]:
+            if not self.wallet_view.from_data_container.get_child_element_by_text(text).is_element_displayed():
+                self.errors.append(self.wallet_view,
+                                   "Text %s is not shown in 'From' container on the Review Send page" % text)
+        for text in [self.receiver_short_address, expected_text]:
+            if not self.wallet_view.to_data_container.get_child_element_by_text(text).is_element_displayed():
+                self.errors.append(self.wallet_view,
+                                   "Text %s is not shown in 'To' container on the Review Send page" % text)
+        data_to_check = {
+            'Est. time': ' min',
+            'Max fees': r"[$]\d+.\d+",
+            'Recipient gets': '2 '
+        }
+        for key, expected_value in data_to_check.items():
+            try:
+                text = self.wallet_view.get_data_item_element_text(data_item_name=key)
+                if key == 'Max fees':
+                    if not re.findall(expected_value, text):
+                        self.errors.append(self.wallet_view,
+                                           "Max fee is not a number - %s on the Review Send page" % text)
+                else:
+                    if text != expected_value:
+                        self.errors.append(
+                            self.wallet_view,
+                            "%s text %s doesn't match expected %s on the Review Send page" % (
+                                key, text, expected_value))
+            except TimeoutException:
+                self.errors.append(self.wallet_view, "%s is not shown on the Review Send page" % key)
+
+        self.wallet_view.slide_button_track.slide()
+        if not self.wallet_view.password_input.is_element_displayed():
+            self.errors.append(self.wallet_view, "Can't confirm transaction")
+
+        self.wallet_view.click_system_back_button(times=6)
+        self.errors.verify_no_errors()
+
+    @marks.testrail_id(741841)
+    def test_wallet_collectible_send_from_expanded_info_view(self):
+        # self.wallet_view.reopen_app(user_name=self.sender_username)
+        self.wallet_view.collectibles_tab.click()
+        self.wallet_view.get_collectible_element('Glitch Punks').wait_for_element().click()
+        self.wallet_view.send_from_collectible_info_button.click()
+        self.wallet_view.address_text_input.send_keys(self.receiver['wallet_address'])
+        self.wallet_view.continue_button.click()
+        expected_text = '1 Glitch Punks #3422'
+        for text in [self.account_name, self.sender_short_address, expected_text]:
+            if not self.wallet_view.from_data_container.get_child_element_by_text(text).is_element_displayed():
+                self.errors.append(self.wallet_view,
+                                   "Text %s is not shown in 'From' container on the Review Send page" % text)
+        for text in [self.receiver_short_address, expected_text]:
+            if not self.wallet_view.to_data_container.get_child_element_by_text(text).is_element_displayed():
+                self.errors.append(self.wallet_view,
+                                   "Text %s is not shown in 'To' container on the Review Send page" % text)
+        data_to_check = {
+            'Est. time': ' min',
+            'Max fees': r"[$]\d+.\d+",
+            'Recipient gets': '1 '
+        }
+        for key, expected_value in data_to_check.items():
+            try:
+                text = self.wallet_view.get_data_item_element_text(data_item_name=key)
+                if key == 'Max fees':
+                    if not re.findall(expected_value, text):
+                        self.errors.append(self.wallet_view,
+                                           "Max fee is not a number - %s on the Review Send page" % text)
+                else:
+                    if text != expected_value:
+                        self.errors.append(
+                            self.wallet_view,
+                            "'%s' text '%s' doesn't match expected '%s' on the Review Send page" % (
+                                key, text, expected_value))
+            except TimeoutException:
+                self.errors.append(self.wallet_view, "%s is not shown on the Review Send page" % key)
+
+        self.wallet_view.slide_button_track.slide()
+        if not self.wallet_view.password_input.is_element_displayed():
+            self.errors.append(self.wallet_view, "Can't confirm transaction")
+
+        self.errors.verify_no_errors()

test/appium/tests/critical/wallet/test_wallet_mainnet.py

@@ -1,209 +1,15 @@
-import datetime
 import re
-import time
 
 import pytest
 from _pytest.outcomes import Failed
 from selenium.common import NoSuchElementException, TimeoutException
 
 from base_test_case import MultipleSharedDeviceTestCase, create_shared_drivers
-from support.api.network_api import NetworkApi
-from tests import marks, run_in_parallel
+from tests import marks
 from users import transaction_senders
 from views.sign_in_view import SignInView
 
 
-@pytest.mark.xdist_group(name="new_four_2")
-@marks.nightly
-@marks.secured
-@marks.smoke
-class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
-
-    def prepare_devices(self):
-        self.network_api = NetworkApi()
-        self.drivers, self.loop = create_shared_drivers(2)
-        self.sign_in_1, self.sign_in_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
-        self.sender, self.receiver = transaction_senders['ETH_1'], transaction_senders['ETH_2']
-        self.sender['wallet_address'] = '0x' + self.sender['address']
-        self.receiver['wallet_address'] = '0x' + self.receiver['address']
-        self.loop.run_until_complete(
-            run_in_parallel(((self.sign_in_1.recover_access, {'passphrase': self.sender['passphrase']}),
-                             (self.sign_in_2.recover_access, {'passphrase': self.receiver['passphrase']}))))
-        self.home_1, self.home_2 = self.sign_in_1.get_home_view(), self.sign_in_2.get_home_view()
-        self.sender_username, self.receiver_username = self.home_1.get_username(), self.home_2.get_username()
-        self.wallet_1, self.wallet_2 = self.sign_in_1.get_wallet_view(), self.sign_in_2.get_wallet_view()
-        self.wallet_1.wallet_tab.click()
-        self.wallet_2.wallet_tab.click()
-        self.network = "Arbitrum"
-
-    def _get_balances_before_tx(self):
-        # ToDo: Arbiscan API is down, looking for analogue
-        # sender_balance = self.network_api.get_balance(self.sender['wallet_address'])
-        # receiver_balance = self.network_api.get_balance(self.receiver['wallet_address'])
-        self.wallet_1.just_fyi("Getting ETH amount in the wallet of the sender before transaction")
-        self.wallet_1.get_account_element().click()
-        eth_amount_sender = self.wallet_1.get_asset(asset_name='Ether').get_amount()
-        self.wallet_2.just_fyi("Getting ETH amount in the wallet of the receiver before transaction")
-        self.wallet_2.get_account_element().click()
-        eth_amount_receiver = self.wallet_2.get_asset(asset_name='Ether').get_amount()
-        # return sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver
-        return eth_amount_sender, eth_amount_receiver
-
-    def _check_balances_after_tx(self, amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
-                                 eth_amount_receiver):
-        # ToDo: Arbiscan API is down, looking for analogue
-        # try:
-        #     self.network_api.wait_for_balance_to_be(address=self.sender['wallet_address'],
-        #                                             expected_balance=sender_balance - amount_to_send)
-        # except TimeoutException as e:
-        #     self.errors.append("Sender " + e.msg)
-        # try:
-        #     self.network_api.wait_for_balance_to_be(address=self.receiver['wallet_address'],
-        #                                             expected_balance=receiver_balance + amount_to_send)
-        # except TimeoutException as e:
-        #     self.errors.append("Receiver " + e.msg)
-
-        def wait_for_wallet_balance_to_update(wallet_view, user_name, initial_eth_amount):
-            wallet_view.just_fyi("Getting ETH amount in the wallet of the %s after transaction" % user_name)
-            if user_name == self.sender_username:
-                exp_amount = round(initial_eth_amount - amount_to_send, 4)
-            else:
-                exp_amount = round(initial_eth_amount + amount_to_send, 4)
-
-            # for _ in range(12):  # ToDo: 120 sec wait time, enable when autoupdate feature is ready
-            new_eth_amount = round(wallet_view.get_asset(asset_name='Ether').get_amount(), 4)
-            if user_name == self.sender_username and new_eth_amount <= exp_amount:
-                return
-            if user_name == self.receiver_username and new_eth_amount >= exp_amount:
-                return
-            self.errors.append(wallet_view,
-                               "Eth amount in the %s's wallet is %s but should be %s" % (
-                                   user_name, new_eth_amount, exp_amount))
-
-        # ToDo: disable relogin when autoupdate feature is ready
-        self.home_1.just_fyi("Relogin for getting an updated balance")
-        self.home_2.just_fyi("Relogin for getting an updated balance")
-        for _ in range(6):  # just waiting 1 minute here to be sure that balances are updated
-            self.wallet_1.wallet_tab.is_element_displayed()
-            self.wallet_2.wallet_tab.is_element_displayed()
-            time.sleep(10)
-        self.loop.run_until_complete(
-            run_in_parallel(((self.home_1.reopen_app, {'user_name': self.sender_username}),
-                             (self.home_2.reopen_app, {'user_name': self.receiver_username}))))
-        self.wallet_1.wallet_tab.wait_and_click()
-        self.wallet_2.wallet_tab.wait_and_click()
-        self.wallet_1.set_network_in_wallet(network_name=self.network)
-        self.wallet_2.set_network_in_wallet(network_name=self.network)
-        self.loop.run_until_complete(
-            run_in_parallel(((wait_for_wallet_balance_to_update, {'wallet_view': self.wallet_1,
-                                                                  'user_name': self.sender_username,
-                                                                  'initial_eth_amount': eth_amount_sender}),
-                             (wait_for_wallet_balance_to_update, {'wallet_view': self.wallet_2,
-                                                                  'user_name': self.receiver_username,
-                                                                  'initial_eth_amount': eth_amount_receiver}))))
-
-    def _check_last_transaction_in_activity(self, wallet_view, device_time, amount_to_send, sender=True):
-        wallet_view.get_account_element().click()
-        wallet_view.activity_tab.click()
-        wallet_view.just_fyi("Checking the transaction in the activity tab")
-        current_time = datetime.datetime.strptime(device_time, "%Y-%m-%dT%H:%M:%S%z")
-        expected_time = "Today %s" % current_time.strftime('%-I:%M %p')
-        possible_times = [expected_time,
-                          "Today %s" % (current_time + datetime.timedelta(minutes=1)).strftime('%-I:%M %p')]
-        sender_address_short = self.sender['wallet_address'].replace(self.sender['wallet_address'][5:-3], '...').lower()
-        receiver_address_short = self.receiver['wallet_address'].replace(self.receiver['wallet_address'][5:-3],
-                                                                         '...').lower()
-        activity_element = wallet_view.get_activity_element()
-        try:
-            if not all((activity_element.header == 'Send' if sender else 'Receive',
-                        activity_element.timestamp in possible_times,
-                        activity_element.amount == '%s ETH' % amount_to_send,
-                        activity_element.from_text == sender_address_short,
-                        activity_element.to_text == receiver_address_short)):
-                self.errors.append(
-                    wallet_view,
-                    "The last transaction is not listed in activity for the %s, expected timestamp is %s" %
-                    ('sender' if sender else 'receiver', expected_time))
-        except NoSuchElementException:
-            self.errors.append(wallet_view,
-                               "Can't find the last transaction for the %s" % ('sender' if sender else 'receiver'))
-        finally:
-            wallet_view.close_account_button.click_until_presence_of_element(wallet_view.show_qr_code_button)
-
-    @marks.testrail_id(727229)
-    def test_wallet_send_eth(self):
-        self.wallet_1.set_network_in_wallet(network_name=self.network)
-        self.wallet_2.set_network_in_wallet(network_name=self.network)
-        # sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
-        eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
-
-        self.wallet_2.close_account_button.click()
-        self.wallet_2.chats_tab.click()
-
-        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=f"{amount_to_send:.4f}",
-                                 network_name=self.network)
-        # ToDo: Arbiscan API is down, looking for analogue
-        # self.network_api.wait_for_confirmation_of_transaction(address=self.sender['wallet_address'],
-        #                                                       tx_time=device_time_before_sending)
-
-        device_time_after_sending = self.wallet_1.driver.device_time
-
-        # self._check_balances_after_tx(amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
-        #                               eth_amount_receiver)
-        self._check_balances_after_tx(amount_to_send, None, None, eth_amount_sender, eth_amount_receiver)
-
-        # ToDo: enable when issues 20807 and 20808 are fixed
-        # self.loop.run_until_complete(
-        #     run_in_parallel(((self._check_last_transaction_in_activity, {'wallet_view': self.wallet_1,
-        #                                                                  'device_time': device_time,
-        #                                                                  'amount_to_send': amount_to_send}),
-        #                      (self._check_last_transaction_in_activity, {'wallet_view': self.wallet_2,
-        #                                                                  'device_time': device_time,
-        #                                                                  'amount_to_send': amount_to_send,
-        #                                                                  'sender': False}))))
-        self.errors.verify_no_errors()
-
-    @marks.testrail_id(727230)
-    def test_wallet_send_asset_from_drawer(self):
-        self.wallet_1.navigate_back_to_wallet_view()
-        # sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
-        eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
-        self.wallet_2.close_account_button.click_if_shown()
-        self.wallet_2.chats_tab.click()
-
-        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=f"{amount_to_send:.4f}",
-                                             network_name=self.network)
-        # ToDo: Arbiscan API is down, looking for analogue
-        # self.network_api.wait_for_confirmation_of_transaction(address=self.sender['wallet_address'],
-        #                                                       tx_time=device_time_before_sending)
-        device_time_after_sending = self.wallet_1.driver.device_time
-
-        # self._check_balances_after_tx(amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
-        #                               eth_amount_receiver)
-        self._check_balances_after_tx(amount_to_send, None, None, eth_amount_sender, eth_amount_receiver)
-
-        # ToDo: enable when issues 20807 and 20808 are fixed
-        # self.loop.run_until_complete(
-        #     run_in_parallel(((self._check_last_transaction_in_activity, {'wallet_view': self.wallet_1,
-        #                                                                  'device_time': device_time,
-        #                                                                  'amount_to_send': amount_to_send}),
-        #                      (self._check_last_transaction_in_activity, {'wallet_view': self.wallet_2,
-        #                                                                  'device_time': device_time,
-        #                                                                  'amount_to_send': amount_to_send,
-        #                                                                  'sender': False}))))
-        self.errors.verify_no_errors()
-
-
 @pytest.mark.xdist_group(name="new_one_2")
 @marks.nightly
 @marks.secured
@@ -336,7 +142,7 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
 
                 self.wallet_view.slide_button_track.slide()
                 if not self.wallet_view.password_input.is_element_displayed():
-                    self.errors.append("%s on %s: can't confirm transaction" % (asset, network))
+                    self.errors.append(self.wallet_view, "%s on %s: can't confirm transaction" % (asset, network))
                 self.wallet_view.click_system_back_button_until_presence_of_element(
                     element=self.wallet_view.element_by_text('Select token'), attempts=4)
         self.wallet_view.click_system_back_button_until_presence_of_element(
@@ -537,7 +343,7 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
                                            network_from, network_to, key))
             self.wallet_view.slide_button_track.slide()
             if not self.wallet_view.password_input.is_element_displayed():
-                self.errors.append("%s to %s: can't confirm bridge" % (network_from, network_to))
+                self.errors.append(self.wallet_view, "%s to %s: can't confirm bridge" % (network_from, network_to))
             self.wallet_view.click_system_back_button(times=5)
         self.wallet_view.click_system_back_button_until_presence_of_element(
             element=self.wallet_view.add_account_button, attempts=6)

test/appium/tests/critical/wallet/test_wallet_testnet.py

@@ -0,0 +1,202 @@
+import datetime
+import time
+
+import pytest
+from selenium.common import NoSuchElementException
+
+from base_test_case import MultipleSharedDeviceTestCase, create_shared_drivers
+from support.api.network_api import NetworkApi
+from tests import marks, run_in_parallel
+from users import transaction_senders
+from views.sign_in_view import SignInView
+
+
+@pytest.mark.xdist_group(name="new_four_2")
+@marks.nightly
+@marks.secured
+@marks.smoke
+class TestWalletMultipleDevice(MultipleSharedDeviceTestCase):
+
+    def prepare_devices(self):
+        self.network_api = NetworkApi()
+        self.drivers, self.loop = create_shared_drivers(2)
+        self.sign_in_1, self.sign_in_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
+        self.sender, self.receiver = transaction_senders['ETH_1'], transaction_senders['ETH_2']
+        self.sender['wallet_address'] = '0x' + self.sender['address']
+        self.receiver['wallet_address'] = '0x' + self.receiver['address']
+        self.loop.run_until_complete(
+            run_in_parallel(((self.sign_in_1.recover_access, {'passphrase': self.sender['passphrase']}),
+                             (self.sign_in_2.recover_access, {'passphrase': self.receiver['passphrase']}))))
+        self.home_1, self.home_2 = self.sign_in_1.get_home_view(), self.sign_in_2.get_home_view()
+        self.sender_username, self.receiver_username = self.home_1.get_username(), self.home_2.get_username()
+        self.wallet_1, self.wallet_2 = self.sign_in_1.get_wallet_view(), self.sign_in_2.get_wallet_view()
+        self.wallet_1.wallet_tab.click()
+        self.wallet_2.wallet_tab.click()
+        self.network = "Arbitrum"
+
+    def _get_balances_before_tx(self):
+        # ToDo: Arbiscan API is down, looking for analogue
+        # sender_balance = self.network_api.get_balance(self.sender['wallet_address'])
+        # receiver_balance = self.network_api.get_balance(self.receiver['wallet_address'])
+        self.wallet_1.just_fyi("Getting ETH amount in the wallet of the sender before transaction")
+        self.wallet_1.get_account_element().click()
+        eth_amount_sender = self.wallet_1.get_asset(asset_name='Ether').get_amount()
+        self.wallet_2.just_fyi("Getting ETH amount in the wallet of the receiver before transaction")
+        self.wallet_2.get_account_element().click()
+        eth_amount_receiver = self.wallet_2.get_asset(asset_name='Ether').get_amount()
+        # return sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver
+        return eth_amount_sender, eth_amount_receiver
+
+    def _check_balances_after_tx(self, amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
+                                 eth_amount_receiver):
+        # ToDo: Arbiscan API is down, looking for analogue
+        # try:
+        #     self.network_api.wait_for_balance_to_be(address=self.sender['wallet_address'],
+        #                                             expected_balance=sender_balance - amount_to_send)
+        # except TimeoutException as e:
+        #     self.errors.append("Sender " + e.msg)
+        # try:
+        #     self.network_api.wait_for_balance_to_be(address=self.receiver['wallet_address'],
+        #                                             expected_balance=receiver_balance + amount_to_send)
+        # except TimeoutException as e:
+        #     self.errors.append("Receiver " + e.msg)
+
+        def wait_for_wallet_balance_to_update(wallet_view, user_name, initial_eth_amount):
+            wallet_view.just_fyi("Getting ETH amount in the wallet of the %s after transaction" % user_name)
+            if user_name == self.sender_username:
+                exp_amount = round(initial_eth_amount - amount_to_send, 4)
+            else:
+                exp_amount = round(initial_eth_amount + amount_to_send, 4)
+
+            # for _ in range(12):  # ToDo: 120 sec wait time, enable when autoupdate feature is ready
+            new_eth_amount = round(wallet_view.get_asset(asset_name='Ether').get_amount(), 4)
+            if user_name == self.sender_username and new_eth_amount <= exp_amount:
+                return
+            if user_name == self.receiver_username and new_eth_amount >= exp_amount:
+                return
+            self.errors.append(wallet_view,
+                               "Eth amount in the %s's wallet is %s but should be %s" % (
+                                   user_name, new_eth_amount, exp_amount))
+
+        # ToDo: disable relogin when autoupdate feature is ready
+        self.home_1.just_fyi("Relogin for getting an updated balance")
+        self.home_2.just_fyi("Relogin for getting an updated balance")
+        for _ in range(6):  # just waiting 1 minute here to be sure that balances are updated
+            self.wallet_1.wallet_tab.is_element_displayed()
+            self.wallet_2.wallet_tab.is_element_displayed()
+            time.sleep(10)
+        self.loop.run_until_complete(
+            run_in_parallel(((self.home_1.reopen_app, {'user_name': self.sender_username}),
+                             (self.home_2.reopen_app, {'user_name': self.receiver_username}))))
+        self.wallet_1.wallet_tab.wait_and_click()
+        self.wallet_2.wallet_tab.wait_and_click()
+        self.wallet_1.set_network_in_wallet(network_name=self.network)
+        self.wallet_2.set_network_in_wallet(network_name=self.network)
+        self.loop.run_until_complete(
+            run_in_parallel(((wait_for_wallet_balance_to_update, {'wallet_view': self.wallet_1,
+                                                                  'user_name': self.sender_username,
+                                                                  'initial_eth_amount': eth_amount_sender}),
+                             (wait_for_wallet_balance_to_update, {'wallet_view': self.wallet_2,
+                                                                  'user_name': self.receiver_username,
+                                                                  'initial_eth_amount': eth_amount_receiver}))))
+
+    def _check_last_transaction_in_activity(self, wallet_view, device_time, amount_to_send, sender=True):
+        wallet_view.get_account_element().click()
+        wallet_view.activity_tab.click()
+        wallet_view.just_fyi("Checking the transaction in the activity tab")
+        current_time = datetime.datetime.strptime(device_time, "%Y-%m-%dT%H:%M:%S%z")
+        expected_time = "Today %s" % current_time.strftime('%-I:%M %p')
+        possible_times = [expected_time,
+                          "Today %s" % (current_time + datetime.timedelta(minutes=1)).strftime('%-I:%M %p')]
+        sender_address_short = self.sender['wallet_address'].replace(self.sender['wallet_address'][5:-3], '...').lower()
+        receiver_address_short = self.receiver['wallet_address'].replace(self.receiver['wallet_address'][5:-3],
+                                                                         '...').lower()
+        activity_element = wallet_view.get_activity_element()
+        try:
+            if not all((activity_element.header == 'Send' if sender else 'Receive',
+                        activity_element.timestamp in possible_times,
+                        activity_element.amount == '%s ETH' % amount_to_send,
+                        activity_element.from_text == sender_address_short,
+                        activity_element.to_text == receiver_address_short)):
+                self.errors.append(
+                    wallet_view,
+                    "The last transaction is not listed in activity for the %s, expected timestamp is %s" %
+                    ('sender' if sender else 'receiver', expected_time))
+        except NoSuchElementException:
+            self.errors.append(wallet_view,
+                               "Can't find the last transaction for the %s" % ('sender' if sender else 'receiver'))
+        finally:
+            wallet_view.close_account_button.click_until_presence_of_element(wallet_view.show_qr_code_button)
+
+    @marks.testrail_id(727229)
+    def test_wallet_send_eth(self):
+        self.wallet_1.set_network_in_wallet(network_name=self.network)
+        self.wallet_2.set_network_in_wallet(network_name=self.network)
+        # sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
+        eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
+
+        self.wallet_2.close_account_button.click()
+        self.wallet_2.chats_tab.click()
+
+        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=f"{amount_to_send:.4f}",
+                                 network_name=self.network)
+        # ToDo: Arbiscan API is down, looking for analogue
+        # self.network_api.wait_for_confirmation_of_transaction(address=self.sender['wallet_address'],
+        #                                                       tx_time=device_time_before_sending)
+
+        device_time_after_sending = self.wallet_1.driver.device_time
+
+        # self._check_balances_after_tx(amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
+        #                               eth_amount_receiver)
+        self._check_balances_after_tx(amount_to_send, None, None, eth_amount_sender, eth_amount_receiver)
+
+        # ToDo: enable when issues 20807 and 20808 are fixed
+        # self.loop.run_until_complete(
+        #     run_in_parallel(((self._check_last_transaction_in_activity, {'wallet_view': self.wallet_1,
+        #                                                                  'device_time': device_time,
+        #                                                                  'amount_to_send': amount_to_send}),
+        #                      (self._check_last_transaction_in_activity, {'wallet_view': self.wallet_2,
+        #                                                                  'device_time': device_time,
+        #                                                                  'amount_to_send': amount_to_send,
+        #                                                                  'sender': False}))))
+        self.errors.verify_no_errors()
+
+    @marks.testrail_id(727230)
+    def test_wallet_send_asset_from_drawer(self):
+        self.wallet_1.navigate_back_to_wallet_view()
+        # sender_balance, receiver_balance, eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
+        eth_amount_sender, eth_amount_receiver = self._get_balances_before_tx()
+        self.wallet_2.close_account_button.click_if_shown()
+        self.wallet_2.chats_tab.click()
+
+        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=f"{amount_to_send:.4f}",
+                                             network_name=self.network)
+        # ToDo: Arbiscan API is down, looking for analogue
+        # self.network_api.wait_for_confirmation_of_transaction(address=self.sender['wallet_address'],
+        #                                                       tx_time=device_time_before_sending)
+        device_time_after_sending = self.wallet_1.driver.device_time
+
+        # self._check_balances_after_tx(amount_to_send, sender_balance, receiver_balance, eth_amount_sender,
+        #                               eth_amount_receiver)
+        self._check_balances_after_tx(amount_to_send, None, None, eth_amount_sender, eth_amount_receiver)
+
+        # ToDo: enable when issues 20807 and 20808 are fixed
+        # self.loop.run_until_complete(
+        #     run_in_parallel(((self._check_last_transaction_in_activity, {'wallet_view': self.wallet_1,
+        #                                                                  'device_time': device_time,
+        #                                                                  'amount_to_send': amount_to_send}),
+        #                      (self._check_last_transaction_in_activity, {'wallet_view': self.wallet_2,
+        #                                                                  'device_time': device_time,
+        #                                                                  'amount_to_send': amount_to_send,
+        #                                                                  'sender': False}))))
+        self.errors.verify_no_errors()

test/appium/views/wallet_view.py

@@ -1,6 +1,7 @@
 import time
 
 import pytest
+from selenium.common import NoSuchElementException
 
 from tests import common_password
 from views.base_element import Button, EditBox, Text, BaseElement
@@ -30,6 +31,24 @@ class AssetElement(Button):
             pytest.fail("Cannot get %s amount" % self.asset_name)
 
 
+class CollectibleItemElement(Button):
+
+    def __init__(self, driver, collectible_name):
+        self.collectible_name = collectible_name
+        self.locator = "//*[@content-desc='collectible-list-item']//*[contains(@text,'%s')]/../.." % collectible_name
+        super().__init__(driver=driver, xpath=self.locator)
+        self.image_element = BaseElement(self.driver, xpath=self.locator + "//android.widget.ImageView")
+
+    @property
+    def quantity(self):
+        counter_element = BaseElement(
+            self.driver, xpath=self.locator + "//*[@content-desc='collectible-counter']/android.widget.TextView")
+        try:
+            return int(counter_element.text.strip('x'))
+        except NoSuchElementException:
+            return 1
+
+
 class ActivityElement(BaseElement):
     def __init__(self, driver, index: int):
         self.locator = "(//*[@content-desc='wallet-activity'])[%s]" % index
@@ -111,11 +130,13 @@ class WalletView(BaseView):
 
         # Sending transaction
         self.address_text_input = EditBox(self.driver, accessibility_id='address-text-input')
+        self.collectibles_tab_on_select_token_view = Button(self.driver, accessibility_id='Collectibles')
         self.amount_input = EditBox(self.driver, xpath="//android.widget.EditText")
         self.from_network_text = Text(
             self.driver, xpath="(//*[@content-desc='loading']/following-sibling::android.widget.TextView)[1]")
         self.confirm_button = Button(self.driver, accessibility_id='button-one')
         self.done_button = Button(self.driver, accessibility_id='done')
+        self.amount_input_increase_button = Button(self.driver, accessibility_id='amount-input-inc-button')
 
         # Review Send and Review Bridge screens
         self.from_data_container = ConfirmationViewInfoContainer(self.driver, label_name='from')
@@ -153,6 +174,11 @@ class WalletView(BaseView):
         self.passphrase_word_number_container = Text(
             self.driver, xpath="//*[@content-desc='number-container']/android.widget.TextView")
 
+        # Collectible view
+        self.expanded_collectible_image = BaseElement(
+            self.driver, xpath="//*[@content-desc='expanded-collectible']//android.widget.ImageView")
+        self.send_from_collectible_info_button = Button(self.driver, accessibility_id="icon, Send")
+
     def set_network_in_wallet(self, network_name: str):
         self.network_drop_down.click()
         Button(self.driver, accessibility_id="%s, label-component" % network_name.capitalize()).click()
@@ -166,6 +192,9 @@ class WalletView(BaseView):
         element.scroll_to_element(down_start_y=0.89, down_end_y=0.8)
         return element
 
+    def get_collectible_element(self, collectible_name: str):
+        return CollectibleItemElement(driver=self.driver, collectible_name=collectible_name)
+
     def select_asset(self, asset_name: str):
         Button(driver=self.driver,
                xpath="//*[@content-desc='token-network']/android.widget.TextView[@text='%s']" % asset_name).click()

test/jest/jestSetup.js

@@ -3,7 +3,7 @@ const { NativeModules } = require('react-native');
 
 mockAsyncStorage = require('@react-native-async-storage/async-storage/jest/async-storage-mock');
 require('react-native-gesture-handler/jestSetup');
-require('react-native-reanimated/src/reanimated2/jestUtils').setUpTests();
+require('react-native-reanimated').setUpTests();
 
 jest.mock('@react-native-async-storage/async-storage', () => mockAsyncStorage);