Remove deprecated custom-color usage

Remove account

Don't remove default account

Fix account path

Makefile

@@ -273,9 +273,6 @@ run-re-frisk: ##@run Start re-frisk server
 
 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
-# Disabled for debug builds to avoid 'maximum call stack exceeded' errors.
-# https://github.com/status-im/status-mobile/issues/18493
-run-android: export ORG_GRADLE_PROJECT_hermesEnabled := false
 # INFO: If it's empty (no devices attached, parsing issues, script error) - for Nix it's the same as not set.
 run-android: export ANDROID_ABI_INCLUDE ?= $(shell ./scripts/adb_devices_abis.sh)
 run-android: ##@run Build Android APK and start it on the device

android/gradle.properties

@@ -57,6 +57,4 @@ 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.
-# https://github.com/status-im/status-mobile/issues/18493
-hermesEnabled=false
+hermesEnabled=true

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.5'
+library 'status-jenkins-lib@v1.8.4'
 
 /* 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.8.5'
+library 'status-jenkins-lib@v1.8.4'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.e2e-nightly

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

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.5'
+library 'status-jenkins-lib@v1.8.4'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -78,7 +78,9 @@ pipeline {
         }
         stage('Upload') {
           steps { script {
-            env.DIAWI_URL = ios.uploadToDiawi()
+            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+              env.DIAWI_URL = ios.uploadToDiawi()
+            }
             env.PKG_URL = env.DIAWI_URL
             jenkins.setBuildDesc(IPA: env.PKG_URL)
           } }

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.5'
+library 'status-jenkins-lib@v1.8.4'
 
 /* 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.8.5'
+library 'status-jenkins-lib@v1.7.15'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-prs

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

ci/tests/Jenkinsfile.e2e-upgrade

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

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.nix-cache

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

ci/tools/Jenkinsfile.playstore-meta

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

ci/tools/Jenkinsfile.xcode-clean

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

doc/dependencies.md

@@ -144,9 +144,9 @@ used for keycard
 used for svg icons, mostly collectibles are using svg
 TODO: updating requires a pod update on iOS
 
-## "react-native-biometrics": "^3.0.1"
+## "react-native-touch-id": "^4.4.1"
 
-used for biometric authentication on Android and iOS 
+used for touch-id identification
 
 ## "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v8.0.7_3"
 

ios/Podfile.lock

@@ -305,8 +305,6 @@ PODS:
     - glog
   - react-native-background-timer (2.2.0):
     - React
-  - react-native-biometrics (3.0.1):
-    - React-Core
   - react-native-blob-util (0.13.18):
     - React-Core
   - react-native-blur (4.3.3):
@@ -519,6 +517,8 @@ PODS:
   - SocketRocket (0.6.1)
   - SSZipArchive (2.4.3)
   - TOCropViewController (2.6.1)
+  - TouchID (4.4.1):
+    - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -548,7 +548,6 @@ DEPENDENCIES:
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
-  - react-native-biometrics (from `../node_modules/react-native-biometrics`)
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
   - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
@@ -604,6 +603,7 @@ DEPENDENCIES:
   - RNSVG (from `../node_modules/react-native-svg`)
   - secp256k1 (from `https://github.com/status-im/secp256k1.swift.git`)
   - SSZipArchive (= 2.4.3)
+  - TouchID (from `../node_modules/react-native-touch-id`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -669,8 +669,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/logger"
   react-native-background-timer:
     :path: "../node_modules/react-native-background-timer"
-  react-native-biometrics:
-    :path: "../node_modules/react-native-biometrics"
   react-native-blob-util:
     :path: "../node_modules/react-native-blob-util"
   react-native-blur:
@@ -780,6 +778,8 @@ EXTERNAL SOURCES:
   secp256k1:
     :git: https://github.com/status-im/secp256k1.swift.git
     :submodules: true
+  TouchID:
+    :path: "../node_modules/react-native-touch-id"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -793,7 +793,7 @@ CHECKOUT OPTIONS:
     :submodules: true
 
 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: 64032b9e9b938fda23325e68a3771f0fabf414dc
   BVLinearGradient: 612a04ff38e8480291f3379ee5b5a2c571f03fe0
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
@@ -822,7 +822,6 @@ SPEC CHECKSUMS:
   React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
   React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
   react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
-  react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
   react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
   react-native-cameraroll: 4701ae7c3dbcd3f5e9e150ca17f250a276154b35
@@ -882,6 +881,7 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
+  TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
   Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6
 
 PODFILE CHECKSUM: 3f98ce893757dfa17e609ef7cd24fa41635b73a6

nix/deps/gradle/deps.json

@@ -1055,6 +1055,21 @@
     }
   },
 
+  {
+    "path": "androidx/databinding/databinding-common/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "databinding-common-3.3.1.pom": {
+        "sha1": "2e932d3219ea5f6d1078b24a8a3ce24b209c9309",
+        "sha256": "sha256-J5Qv7Gy8ROM19MN5Rx/lo2BsA7Zwt+NG6lXxYtjrF10="
+      },
+      "databinding-common-3.3.1.jar": {
+        "sha1": "45795e2f688474b219d37beb7f9f6756578e6454",
+        "sha256": "sha256-mq9hUr+3QZCgovJ1St/aoqkP7Ef50KwR811ej5iYkyw="
+      }
+    }
+  },
+
   {
     "path": "androidx/databinding/databinding-common/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -1164,6 +1179,21 @@
     }
   },
 
+  {
+    "path": "androidx/databinding/databinding-compiler-common/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "databinding-compiler-common-3.3.1.pom": {
+        "sha1": "123c2b1dd44ec6e2441be9441bdf393462936928",
+        "sha256": "sha256-na2hPeqxkcTcC9T7EvFs12+r1ygfSfnOHIirb3kXyzI="
+      },
+      "databinding-compiler-common-3.3.1.jar": {
+        "sha1": "e96aa159e1ed5c5a3461d15adfc42ef5b1f68b59",
+        "sha256": "sha256-sfLOroi0d73GMp2r8SCNhCHFrT/HzPpEOXEOVBcvxh0="
+      }
+    }
+  },
+
   {
     "path": "androidx/databinding/databinding-compiler-common/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -2725,6 +2755,21 @@
     }
   },
 
+  {
+    "path": "com/android/databinding/baseLibrary/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "baseLibrary-3.3.1.pom": {
+        "sha1": "611fd96b47fdd27dd88afc23829975278d47774c",
+        "sha256": "sha256-dKLQobB7s6ExmWyEIG/CHmDQaT4pa7EI07c9B7hnUj8="
+      },
+      "baseLibrary-3.3.1.jar": {
+        "sha1": "702acc804e85563d3ae7b8ee49122e4f857dde83",
+        "sha256": "sha256-5QRyEqpp1J0FULCvlrQQC4xslwG4PD+24ZzGbzxK6cQ="
+      }
+    }
+  },
+
   {
     "path": "com/android/databinding/baseLibrary/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3243,6 +3288,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/analytics-library/crash/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "crash-26.3.1.pom": {
+        "sha1": "7b667eb48f02b8ba2a981a962e9c1137e251c1e0",
+        "sha256": "sha256-m0FH4hP4dmWwzUXF6w47Q79EWJf5r9rKF/c8wjjF01c="
+      },
+      "crash-26.3.1.jar": {
+        "sha1": "46163f2cf0e16a1ba9be2ad6dddc39f1a1d6b613",
+        "sha256": "sha256-k5OoPOLz+pZ4LCU98yROaZo7PfGG3pJssTiVj6+VYpM="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/analytics-library/crash/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3382,6 +3442,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/analytics-library/protos/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "protos-26.3.1.pom": {
+        "sha1": "d6015a3a017dcb62d9a9a56c28b5c47bb6727a91",
+        "sha256": "sha256-IP1qlda7IElg7qdLFBTEWy78J0+4Tf90MnqRYezfc3k="
+      },
+      "protos-26.3.1.jar": {
+        "sha1": "f35a0accd93cfbb4306268ea748e1ac49920a0a8",
+        "sha256": "sha256-70/09xLY//RrI3jBwQh5l1hXdvpsGhwgBpbXd0eNnUw="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/analytics-library/protos/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3521,6 +3596,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/analytics-library/shared/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "shared-26.3.1.pom": {
+        "sha1": "af1e1e7d120696bfee452247b5224290d91d828f",
+        "sha256": "sha256-3Hxmxmp5mFLNaGRaEXOJSRxiTU1U+OzdX5QENgHtys4="
+      },
+      "shared-26.3.1.jar": {
+        "sha1": "3457faee7a68d84dcbd258889567153acfc731a2",
+        "sha256": "sha256-bSe5quJj4rwth0SR72dh86WuH34wzEq2v7ktd/2tO/A="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/analytics-library/shared/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3660,6 +3750,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/analytics-library/tracker/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "tracker-26.3.1.pom": {
+        "sha1": "6775a4eeafd2ef5270750388ee53503eeafa688b",
+        "sha256": "sha256-+mgVCnuDFGnXWVQ1ZGPkmcJjl1ubk/YmTQ3qjRHlKwg="
+      },
+      "tracker-26.3.1.jar": {
+        "sha1": "26248cad2525e003752322cfc6bd86182df7daac",
+        "sha256": "sha256-JG6AgEtANgzjGNp7nRKUjgrUHQwpzHvbOGF9weaWnYg="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/analytics-library/tracker/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3799,6 +3904,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/annotations/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "annotations-26.3.1.pom": {
+        "sha1": "bce2159e811cceee12498cb34812cbae1e7b8eda",
+        "sha256": "sha256-Y7XWCr1wC4On07xPXk1+cRxZsOB6WsMmd2FOP/1xJLE="
+      },
+      "annotations-26.3.1.jar": {
+        "sha1": "3d46d5da6d5dd17df682a22b914cdc6b84677731",
+        "sha256": "sha256-U0rc5Q64KdT4yXW8NOpVs49oxjAOAA4rR8Q6xnLQxyE="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/annotations/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4226,6 +4346,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/apksig/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apksig-3.3.1.pom": {
+        "sha1": "e916d810d293ce4ab620435b41d2e3bc67972cd3",
+        "sha256": "sha256-cGliMgmhK5sal8XJypuekagqDkDG4h4LlMc5barHh80="
+      },
+      "apksig-3.3.1.jar": {
+        "sha1": "5dc32667e573a18b05119685ac3f2b8c0f17182d",
+        "sha256": "sha256-NXs57dinjUgKlT5rl8CYWf1AyXLBpJtvnTvT1LmYyy0="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/apksig/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4335,6 +4470,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/apkzlib/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apkzlib-3.3.1.pom": {
+        "sha1": "02214cdec00c2553430192a7f36e9a28cf96bf6f",
+        "sha256": "sha256-IVhIC03ar9F8K15CEeAPstojFB93BY+VjRqUlFBZ0IU="
+      },
+      "apkzlib-3.3.1.jar": {
+        "sha1": "0563a5b71668b4fe7da03a0a3054c9fdd973d3cf",
+        "sha256": "sha256-ZAVmwOT1BZATm7z7sP90TB9tzZ8mL48tAVn8QZQTgcw="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/apkzlib/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4474,6 +4624,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/builder-model/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-model-3.3.1.pom": {
+        "sha1": "4011d22709777c4063e84d39dbfe4ed535a31905",
+        "sha256": "sha256-XVNezIVtl4YN/ZElCFrqki4FTrfZ4SRPg3p0n76b++M="
+      },
+      "builder-model-3.3.1.jar": {
+        "sha1": "2c47cf0451da2eaad484ccd2d580a8cfd23fa064",
+        "sha256": "sha256-BXtSlcP+jNze+uaN47+/nHbTnaI+BMw0ZdZgA3oxfwA="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/builder-model/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4625,6 +4790,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/builder-test-api/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-test-api-3.3.1.pom": {
+        "sha1": "e79a310b9c89fcb62f343b727f5747783c778861",
+        "sha256": "sha256-heZof7B9lqEFRE1Rouwnrz9798H5w72QcGZ9QblfZAY="
+      },
+      "builder-test-api-3.3.1.jar": {
+        "sha1": "c1a1ce91c0f34c43a52c54c1a2f6fdbaafadd3da",
+        "sha256": "sha256-KYnV5vE5YwFoEC40dwJCFbnKvew+Gqc4saBze0tfyww="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/builder-test-api/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4776,6 +4956,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/builder/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-3.3.1.pom": {
+        "sha1": "fbca96adc8069b8fcb01c7271c3b4be4f901b517",
+        "sha256": "sha256-pg/e6U4EqMemXDi6m2UFhcOkv0cisGFnuI85cO4UA+Q="
+      },
+      "builder-3.3.1.jar": {
+        "sha1": "e4d2ad1ef694fca700b3ab1f4df4b79313d17c98",
+        "sha256": "sha256-zoj1PYZLXN+oW1cC5yiz1u0NOqkoy2HghCRtSlUBXFI="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/builder/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4897,6 +5092,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/bundletool/0.6.0",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "bundletool-0.6.0.pom": {
+        "sha1": "5a6e5b5af1687285125f43e00a8e5a8efe6f76a4",
+        "sha256": "sha256-YDqi6WyRrkPynACNA16mdo0fJya6qjAqXwzYBFfgRiI="
+      },
+      "bundletool-0.6.0.jar": {
+        "sha1": "fb944be26f692e6ac937924ad5be7faa4093dd80",
+        "sha256": "sha256-QAU1QDlstRlZ0GYLSihk7mqBaXi/AT/UwB3L7IlcS7o="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/bundletool/0.9.0",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5032,6 +5242,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/gradle-api/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-api-3.3.1.pom": {
+        "sha1": "c9a6cecdb5e233c2ffde76507bddc6f26ade5528",
+        "sha256": "sha256-3BUSdrg4w9TdT8QdcwRoOkTGotjb3ngpdN9p+1g8dRQ="
+      },
+      "gradle-api-3.3.1.jar": {
+        "sha1": "93aac19942998e480db4195212150fb30f7a78cd",
+        "sha256": "sha256-SMmx/OFMswX3/3XdL97Ds/qtZK/pFQbviYoEsIbmtBY="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/gradle-api/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5232,6 +5457,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/gradle/3.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-3.3.1.pom": {
+        "sha1": "1769370bffda87132eb79580bf54ccb9eb339020",
+        "sha256": "sha256-9eitp3Q6B3or5f+qF0Q0VmkSQa7ZEoYVgAXzUcRA/3w="
+      },
+      "gradle-3.3.1.jar": {
+        "sha1": "7d642f14aa35443dd7aeecd0600c17da37d3bccc",
+        "sha256": "sha256-9WSZq8Ux35uuhlFo5y8kCHAtSgH0bXuMGgowDWLcEb0="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/gradle/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5353,6 +5593,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "jetifier-core-1.0.0-beta02.pom": {
+        "sha1": "db878af76000b681798b114a5169163b1efe59ea",
+        "sha256": "sha256-kJGGklY7MCjkeLrxyUM3jfSIOTpSeJWMbzaWO2jfw7k="
+      },
+      "jetifier-core-1.0.0-beta02.jar": {
+        "sha1": "fa93fdb83bdfd51e80e09a808fb2515a7134d406",
+        "sha256": "sha256-72H4QwL4tB3OOFjB/H56kOx0omOgITsfZegMVhRaR5M="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/jetifier/jetifier-core/1.0.0-beta04",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5417,6 +5672,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta02",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "jetifier-processor-1.0.0-beta02.pom": {
+        "sha1": "3bf006f5a449806a9ad493a99c9f9417b3040ef0",
+        "sha256": "sha256-+zYwiX233O8PE6VViKrYxkvcGPZ64KHizNR1igcioa8="
+      },
+      "jetifier-processor-1.0.0-beta02.jar": {
+        "sha1": "624d187319c8dfd6bc8281b4afbab87c39bbb005",
+        "sha256": "sha256-J+UFZWvlNLNIYHQy/EEeKVQLCE0NTkhlIyqnYswe9Aw="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta04",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5511,6 +5781,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/manifest-merger/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "manifest-merger-26.3.1.pom": {
+        "sha1": "1aad18d13e7389cf148b1c6c468b2947ca23cbbd",
+        "sha256": "sha256-YNhLNKJlpgVeZhxpOvIFB1mgbYpuXLpk370esi0vpPU="
+      },
+      "manifest-merger-26.3.1.jar": {
+        "sha1": "aa94f738e318fc73059d9207f433f13556072d05",
+        "sha256": "sha256-hNrba75FBJgCeexO/2RdkaGgsPpagAQjmjS5vOZ1crU="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/manifest-merger/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5662,6 +5947,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/common/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "common-26.3.1.pom": {
+        "sha1": "b79360c83ea68ba7f0ac0fadf7c48e1a53511352",
+        "sha256": "sha256-mvrBYjeX9GBEevDT9gMuQfLdXx1N7pSbd3OBSR6NxVM="
+      },
+      "common-26.3.1.jar": {
+        "sha1": "b0e3aa846dd94f9608018f7ef6501d1069f6488c",
+        "sha256": "sha256-QashymLYGxzYciSbVSlD1rzTZmN32f1/cY3rQd7HM9Y="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/common/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5801,6 +6101,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/ddms/ddmlib/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "ddmlib-26.3.1.pom": {
+        "sha1": "14405d92c982c96ace23b7a4c505b0d9de58cd8d",
+        "sha256": "sha256-MhUp9OEUJ8VtX0uLtcJkLAHza1LkO1wwnEk81IM9sNE="
+      },
+      "ddmlib-26.3.1.jar": {
+        "sha1": "61ca2873fcce1012ba9782adf7e9b0e164fb6007",
+        "sha256": "sha256-oTYJ+lhJr4+Os0JzaOG8KMp7DwSvKGwLqVoAfrkkHro="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/ddms/ddmlib/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5940,6 +6255,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/dvlib/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "dvlib-26.3.1.pom": {
+        "sha1": "c438f3c025bd878ac3b54368e012b3792f9c8928",
+        "sha256": "sha256-3lL/6GFK8OCRXxbiIujskxfriVuL9GtfE7hU8B2mDdY="
+      },
+      "dvlib-26.3.1.jar": {
+        "sha1": "971430b6163a834656d07434c46fee64d109ad8e",
+        "sha256": "sha256-cLMOL4Sc+kKqE7+GWenhTAKtfLSkbLKB4CKOuC5XM4s="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/dvlib/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6184,6 +6514,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/layoutlib/layoutlib-api/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "layoutlib-api-26.3.1.pom": {
+        "sha1": "0355e0146c59a91fbb303d7faaa6d2d0413f5dde",
+        "sha256": "sha256-az/hSE+y4dWr/4VYc0KxX5tM3W6E/Vkjm9r7ShTtLXg="
+      },
+      "layoutlib-api-26.3.1.jar": {
+        "sha1": "969ef3a7c0c3b245a3efe8aff7a2f6f15ff4e824",
+        "sha256": "sha256-Tk6yS7wTU2sl1t063kHZJWr1rnuBpBe5a1WEMLUKQV4="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/layoutlib/layoutlib-api/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6383,6 +6728,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/lint/lint-gradle-api/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "lint-gradle-api-26.3.1.pom": {
+        "sha1": "dbdbed4b5fa948b991335771c7005fc8aa8be73b",
+        "sha256": "sha256-6xds70C7k1Yy8gaACv2XSeMP+suuYIgzflDCP2vG5CA="
+      },
+      "lint-gradle-api-26.3.1.jar": {
+        "sha1": "d55e1bcbe4e7c0bb97f5c385a003c4339e38d07f",
+        "sha256": "sha256-RcBjcp/izzXWOh/9Ih17gtPkpxWay2AvqWuc/5BN5sk="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/lint/lint-gradle-api/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6657,6 +7017,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/repository/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "repository-26.3.1.pom": {
+        "sha1": "ab5a2f6cbedccf4ff9efbd5301fe26c9d1aaea2a",
+        "sha256": "sha256-VRlYrn5H3gUTtUim8TrCf8Bv8/Ww/x6aQ8SAjzRz6zc="
+      },
+      "repository-26.3.1.jar": {
+        "sha1": "0fe4c713437ebfb8c68e95c717c063843bd63758",
+        "sha256": "sha256-UZR25PiBJMbbndC98J8MSqXMi/Hvq4Dd3uL3Wmug784="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/repository/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6796,6 +7171,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/sdklib/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdklib-26.3.1.pom": {
+        "sha1": "d6cfc0d8a0f49620138cfaea6c51201c7c678633",
+        "sha256": "sha256-gnUcqRaojEMoL7ZX1kJerqAstwsEAJlroYEZr6GRRCE="
+      },
+      "sdklib-26.3.1.jar": {
+        "sha1": "85c3c1de8824ca1f5ff491690931256c23a7297b",
+        "sha256": "sha256-aEN9Fbfmle8G6Yu88HEQQJlVtjsBijR7pofwGuxQfQo="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/sdklib/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6935,6 +7325,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/sdk-common/26.3.1",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdk-common-26.3.1.pom": {
+        "sha1": "9b7b4248e21db9c342dba7c3e891f740246b97c3",
+        "sha256": "sha256-jFp1bExxaochJmmIvOMohkjrj3uDF3DFct1Pcp85iqg="
+      },
+      "sdk-common-26.3.1.jar": {
+        "sha1": "c9bed0f05024f919fe6168ef381afbe72074a272",
+        "sha256": "sha256-s2dcStd5EUHIfzaADxkUIz8q9Rx2b+F67BsVIsgOL8g="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/sdk-common/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -10937,6 +11342,17 @@
     }
   },
 
+  {
+    "path": "com/google/guava/guava-parent/26.0-jre",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "guava-parent-26.0-jre.pom": {
+        "sha1": "3a638a46e3277ff6a3d43d2a50bcccfac2966815",
+        "sha256": "sha256-u31c1BfA19714+Jwkv3SNSLT/CUa2KB5VsE84Fc66qM="
+      }
+    }
+  },
+
   {
     "path": "com/google/guava/guava-parent/27.0.1-jre",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -11089,6 +11505,21 @@
     }
   },
 
+  {
+    "path": "com/google/guava/guava/26.0-jre",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "guava-26.0-jre.pom": {
+        "sha1": "7883e19f8b0cca8c4498d476743e31b107674155",
+        "sha256": "sha256-HDN63JpKtLhE2oHahZNlgbiUbHy3EoTF3L2vHqp+4Qk="
+      },
+      "guava-26.0-jre.jar": {
+        "sha1": "6a806eff209f36f635f943e16d97491f00f6bfab",
+        "sha256": "sha256-oOnKutZlvCC80rAfEI5fwD91bhOuqAq6rbn0BwM76iw="
+      }
+    }
+  },
+
   {
     "path": "com/google/guava/guava/27.0.1-jre",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -13690,16 +14121,16 @@
   },
 
   {
-    "path": "net/bytebuddy/byte-buddy-agent/1.14.11",
+    "path": "net/bytebuddy/byte-buddy-agent/1.14.10",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "byte-buddy-agent-1.14.11.pom": {
-        "sha1": "00a2165ce3253489dd9fd0836a169dfce74e2042",
-        "sha256": "sha256-VBMQ/3WsTurkYFUJn8Ec3b5TqcBe6vry9wMgZQ2zzOk="
+      "byte-buddy-agent-1.14.10.pom": {
+        "sha1": "ab24aa41b81d9496ec9ccd188a0449327d93bfdf",
+        "sha256": "sha256-U7yX6ca/fC0OX5y6x9Xeaykk2RbPS4F+ajo1kpx5a0o="
       },
-      "byte-buddy-agent-1.14.11.jar": {
-        "sha1": "f9cb566608fbac6bc7bf54901a7aa11543a989ee",
-        "sha256": "sha256-L1N6Yhpk+nAT1oxpWnajTujXna105jXKyhbdViV664A="
+      "byte-buddy-agent-1.14.10.jar": {
+        "sha1": "90ed94ac044ea8953b224304c762316e91fd6b31",
+        "sha256": "sha256-Z5k6idR8pY/4aIAqREjd0VDl/k5aVkXe2ZDXtNVXprk="
       }
     }
   },
@@ -13727,12 +14158,12 @@
   },
 
   {
-    "path": "net/bytebuddy/byte-buddy-parent/1.14.11",
+    "path": "net/bytebuddy/byte-buddy-parent/1.14.10",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "byte-buddy-parent-1.14.11.pom": {
-        "sha1": "696bf3e007e88bd1c0c2d877d74e0f3c56f2b96f",
-        "sha256": "sha256-RsDxP8l3jcLrtpdIgjqixMvwfqt9GMaqGRxSnRZQiSs="
+      "byte-buddy-parent-1.14.10.pom": {
+        "sha1": "4c560a925c30d5911dc875af5af4737e21b397be",
+        "sha256": "sha256-xpghkGD7DlZaDyyWCU6Ssg7+FG/WFjayyeTAO9m6Sns="
       }
     }
   },
@@ -13768,16 +14199,16 @@
   },
 
   {
-    "path": "net/bytebuddy/byte-buddy/1.14.11",
+    "path": "net/bytebuddy/byte-buddy/1.14.10",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "byte-buddy-1.14.11.pom": {
-        "sha1": "5ecfcd2f75aa8c7b6347d864a4d0a5212c360301",
-        "sha256": "sha256-NYRJ1sc1OFhFCN2K5s/eVrr0o0t2e3HZzEZE8PH0IRo="
+      "byte-buddy-1.14.10.pom": {
+        "sha1": "8806052a8770a6b3e14362ed0ce6ef263e6a20ab",
+        "sha256": "sha256-zVh4KEX/ju3y7YOgw+30Xu65nhTAWvii6QGGDqCAzq8="
       },
-      "byte-buddy-1.14.11.jar": {
-        "sha1": "725602eb7c8c56b51b9c21f273f9df5c909d9e7d",
-        "sha256": "sha256-Yq4oGH7SsGKBPaap1We/7nM8NBWCaZti3ZgCMHKaAxM="
+      "byte-buddy-1.14.10.jar": {
+        "sha1": "8117daf4a612122eb4f517f66adff778cb8b4737",
+        "sha256": "sha256-MObgRGQ3pn2zfit/fTP1B4fd/ZcDWTGd/QVGnaoty84="
       }
     }
   },
@@ -17391,6 +17822,21 @@
     }
   },
 
+  {
+    "path": "org/jetbrains/kotlin/kotlin-reflect/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-reflect-1.3.20.pom": {
+        "sha1": "7cc0e8dc8e9bf863127aee4501449e25e85a6f78",
+        "sha256": "sha256-ajZdjTUpX69X8t86ssuQQgnaqsiQb8Y3R9Pjv6sJPeI="
+      },
+      "kotlin-reflect-1.3.20.jar": {
+        "sha1": "cd49eec32cf964333faf59e04b4085eac7008477",
+        "sha256": "sha256-7hqSbtZY594ObfAkLNV0s7TgjmT+emgngibG8tM3Mjg="
+      }
+    }
+  },
+
   {
     "path": "org/jetbrains/kotlin/kotlin-reflect/1.3.50",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -17781,6 +18227,21 @@
     }
   },
 
+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-common-1.3.20.pom": {
+        "sha1": "507fa9faf5120c5c5247bc1b23476ad91760c09c",
+        "sha256": "sha256-BIjdHCYv5hfXc2K8Sa+BjYztQJQ6pbA8GITb8kdRCjA="
+      },
+      "kotlin-stdlib-common-1.3.20.jar": {
+        "sha1": "7d7934e26ce34da1a0a8d00e38038d7cf3375e89",
+        "sha256": "sha256-Br3Yrto0fvbvPk6diKASVMzbcHhLaXSV9qQh/WY6tkk="
+      }
+    }
+  },
+
   {
     "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -18066,6 +18527,21 @@
     }
   },
 
+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-jdk7-1.3.20.pom": {
+        "sha1": "665178dfa4d04de64edecf5f0dbda61b55f8f4e3",
+        "sha256": "sha256-SdtmBiZNOmpI+QgzXASEYirVyPTfjEjdSgAmdA4eFsU="
+      },
+      "kotlin-stdlib-jdk7-1.3.20.jar": {
+        "sha1": "aa17d6fd473ce53061a7b2b9d2ae96f547cae93d",
+        "sha256": "sha256-/Sr3C90rwCT7A8vtYzyhQ4cso2pqFuIYzGfIkLefsx0="
+      }
+    }
+  },
+
   {
     "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -18246,6 +18722,21 @@
     }
   },
 
+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-jdk8-1.3.20.pom": {
+        "sha1": "5c65523f57e3918ef722a15faae5173fc9a31331",
+        "sha256": "sha256-DF+73Rh7hSpRoKP7YskCSdpOdN//jf/5RphOL3AlCkI="
+      },
+      "kotlin-stdlib-jdk8-1.3.20.jar": {
+        "sha1": "b1f3cb184c4ce4139741454df2f8fca5320f822d",
+        "sha256": "sha256-bAgx5+OsqjkL8i952B8y8hLcj94ZgHo1Sk7k9migxHg="
+      }
+    }
+  },
+
   {
     "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -18471,6 +18962,21 @@
     }
   },
 
+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.3.20",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-1.3.20.pom": {
+        "sha1": "9d1e01f424795aa471a8def0b5dc8aeeb537aafd",
+        "sha256": "sha256-Mu+dGkDXXOr0F5KW7VTdylp+ekpl4aAZ5kmOusg14Rw="
+      },
+      "kotlin-stdlib-1.3.20.jar": {
+        "sha1": "eb2a232734e09fcd1b958a5c7520a93c6de38b32",
+        "sha256": "sha256-YB+RDalo+z2o6te2Tta/XJcQ2DzqN+SmMYR+fWiOM2E="
+      }
+    }
+  },
+
   {
     "path": "org/jetbrains/kotlin/kotlin-stdlib/1.3.31",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -19160,16 +19666,16 @@
   },
 
   {
-    "path": "org/mockito/mockito-core/5.9.0",
+    "path": "org/mockito/mockito-core/5.8.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "mockito-core-5.9.0.pom": {
-        "sha1": "2054dcc15b9ede899cb9ec6e8e960e36c68b4574",
-        "sha256": "sha256-BJDEL+Yu7WRzQdpAojcHGW2BO0TbKj3KMB2IFz56yPc="
+      "mockito-core-5.8.0.pom": {
+        "sha1": "a2b7b33c5d649a2f48b1e7aab95d81671f66875f",
+        "sha256": "sha256-dJWKzd4UjzC/ox/8CFi2L3H2PMws602KjGfX9CjUOi0="
       },
-      "mockito-core-5.9.0.jar": {
-        "sha1": "faa88b96db3aeb96a93e83dec7491345bfbfc414",
-        "sha256": "sha256-u62Rhe1zSWX6x+Nn8OUVlvaVMeUdiyy87BBI3W+0Hyw="
+      "mockito-core-5.8.0.jar": {
+        "sha1": "df310627f77f859114ad31e1376fff0dce263cca",
+        "sha256": "sha256-wyD2YqA8KVHtzFGkS2TXmo6ZQ3P/VIRTtf2vad6+RoI="
       }
     }
   },

nix/deps/gradle/deps.list

@@ -49,6 +49,7 @@ androidx.core:core:1.7.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
+androidx.databinding:databinding-common:3.3.1
 androidx.databinding:databinding-common:3.5.4
 androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
@@ -56,6 +57,7 @@ androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
 androidx.databinding:databinding-common:7.4.2
 androidx.databinding:databinding-compiler-common:3.2.1
+androidx.databinding:databinding-compiler-common:3.3.1
 androidx.databinding:databinding-compiler-common:3.5.4
 androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
@@ -157,6 +159,7 @@ com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
 com.android.databinding:baseLibrary:3.2.1
+com.android.databinding:baseLibrary:3.3.1
 com.android.databinding:baseLibrary:3.5.4
 com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
@@ -167,6 +170,7 @@ com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
 com.android.tools.analytics-library:crash:26.2.1
+com.android.tools.analytics-library:crash:26.3.1
 com.android.tools.analytics-library:crash:26.5.4
 com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
@@ -176,6 +180,7 @@ com.android.tools.analytics-library:crash:30.4.2
 com.android.tools.analytics-library:protos:26.0.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.3.1
 com.android.tools.analytics-library:protos:26.5.4
 com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
@@ -185,6 +190,7 @@ com.android.tools.analytics-library:protos:30.4.2
 com.android.tools.analytics-library:shared:26.0.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.3.1
 com.android.tools.analytics-library:shared:26.5.4
 com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
@@ -194,6 +200,7 @@ com.android.tools.analytics-library:shared:30.4.2
 com.android.tools.analytics-library:tracker:26.0.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.3.1
 com.android.tools.analytics-library:tracker:26.5.4
 com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
@@ -201,10 +208,12 @@ 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.build.jetifier:jetifier-core:1.0.0-alpha10
+com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
@@ -223,6 +232,7 @@ com.android.tools.build:aaptcompiler:7.4.2
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
+com.android.tools.build:apksig:3.3.1
 com.android.tools.build:apksig:3.5.4
 com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
@@ -230,6 +240,7 @@ 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:apkzlib:3.2.1
+com.android.tools.build:apkzlib:3.3.1
 com.android.tools.build:apkzlib:3.5.4
 com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
@@ -241,6 +252,7 @@ com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.0
 com.android.tools.build:builder-model:3.0.1
 com.android.tools.build:builder-model:3.2.1
+com.android.tools.build:builder-model:3.3.1
 com.android.tools.build:builder-model:3.5.4
 com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
@@ -252,6 +264,7 @@ com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.0
 com.android.tools.build:builder-test-api:3.0.1
 com.android.tools.build:builder-test-api:3.2.1
+com.android.tools.build:builder-test-api:3.3.1
 com.android.tools.build:builder-test-api:3.5.4
 com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
@@ -263,6 +276,7 @@ com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.0
 com.android.tools.build:builder:3.0.1
 com.android.tools.build:builder:3.2.1
+com.android.tools.build:builder:3.3.1
 com.android.tools.build:builder:3.5.4
 com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
@@ -270,6 +284,7 @@ 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:bundletool:0.5.0
+com.android.tools.build:bundletool:0.6.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
 com.android.tools.build:bundletool:1.6.0
@@ -279,6 +294,7 @@ com.android.tools.build:bundletool:1.11.4
 com.android.tools.build:gradle-api:3.0.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.3.1
 com.android.tools.build:gradle-api:3.5.4
 com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
@@ -295,6 +311,7 @@ com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.0
 com.android.tools.build:gradle:3.0.1
 com.android.tools.build:gradle:3.2.1
+com.android.tools.build:gradle:3.3.1
 com.android.tools.build:gradle:3.5.4
 com.android.tools.build:gradle:4.1.0
 com.android.tools.build:gradle:7.0.4
@@ -305,6 +322,7 @@ com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.0
 com.android.tools.build:manifest-merger:26.0.1
 com.android.tools.build:manifest-merger:26.2.1
+com.android.tools.build:manifest-merger:26.3.1
 com.android.tools.build:manifest-merger:26.5.4
 com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
@@ -318,6 +336,7 @@ com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.0
 com.android.tools.ddms:ddmlib:26.0.1
 com.android.tools.ddms:ddmlib:26.2.1
+com.android.tools.ddms:ddmlib:26.3.1
 com.android.tools.ddms:ddmlib:26.5.4
 com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
@@ -336,6 +355,7 @@ com.android.tools.layoutlib:layoutlib-api:24.5.0
 com.android.tools.layoutlib:layoutlib-api:26.0.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
 com.android.tools.layoutlib:layoutlib-api:26.2.1
+com.android.tools.layoutlib:layoutlib-api:26.3.1
 com.android.tools.layoutlib:layoutlib-api:26.5.4
 com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
@@ -351,6 +371,7 @@ com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-gradle-api:26.2.1
+com.android.tools.lint:lint-gradle-api:26.3.1
 com.android.tools.lint:lint-gradle-api:26.5.4
 com.android.tools.lint:lint-gradle-api:27.1.0
 com.android.tools.lint:lint-model:27.1.0
@@ -391,6 +412,7 @@ com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.0
 com.android.tools:annotations:26.0.1
 com.android.tools:annotations:26.2.1
+com.android.tools:annotations:26.3.1
 com.android.tools:annotations:26.5.4
 com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
@@ -402,6 +424,7 @@ com.android.tools:common:24.5.0
 com.android.tools:common:26.0.0
 com.android.tools:common:26.0.1
 com.android.tools:common:26.2.1
+com.android.tools:common:26.3.1
 com.android.tools:common:26.5.4
 com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
@@ -413,6 +436,7 @@ com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.0
 com.android.tools:dvlib:26.0.1
 com.android.tools:dvlib:26.2.1
+com.android.tools:dvlib:26.3.1
 com.android.tools:dvlib:26.5.4
 com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
@@ -422,6 +446,7 @@ com.android.tools:dvlib:30.4.2
 com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
+com.android.tools:repository:26.3.1
 com.android.tools:repository:26.5.4
 com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
@@ -433,6 +458,7 @@ com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.0
 com.android.tools:sdklib:26.0.1
 com.android.tools:sdklib:26.2.1
+com.android.tools:sdklib:26.3.1
 com.android.tools:sdklib:26.5.4
 com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
@@ -444,6 +470,7 @@ com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.0
 com.android.tools:sdk-common:26.0.1
 com.android.tools:sdk-common:26.2.1
+com.android.tools:sdk-common:26.3.1
 com.android.tools:sdk-common:26.5.4
 com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
@@ -563,6 +590,7 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
 com.google.guava:guava:22.0
 com.google.guava:guava:23.0
+com.google.guava:guava:26.0-jre
 com.google.guava:guava:27.0.1-jre
 com.google.guava:guava:28.1-jre
 com.google.guava:guava:29.0-jre
@@ -789,6 +817,7 @@ org.jetbrains.kotlin:kotlin-project-model:1.6.20
 org.jetbrains.kotlin:kotlin-project-model:1.9.0
 org.jetbrains.kotlin:kotlin-reflect:1.1.3-2
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
+org.jetbrains.kotlin:kotlin-reflect:1.3.20
 org.jetbrains.kotlin:kotlin-reflect:1.3.50
 org.jetbrains.kotlin:kotlin-reflect:1.3.72
 org.jetbrains.kotlin:kotlin-reflect:1.4.32
@@ -805,6 +834,7 @@ org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0
 org.jetbrains.kotlin:kotlin-script-runtime:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
@@ -813,6 +843,7 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20
 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
@@ -821,6 +852,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20
 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
@@ -829,6 +861,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
+org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32

nix/deps/gradle/deps.urls

@@ -62,6 +62,7 @@ https://dl.google.com/dl/android/maven2/androidx/core/core/1.7.0/core-1.7.0.pom
 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.3.1/databinding-common-3.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.4/databinding-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/4.1.0/databinding-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom
@@ -69,6 +70,7 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.1/databinding-common-7.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.4.2/databinding-common-7.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.3.1/databinding-compiler-common-3.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.4/databinding-compiler-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/4.1.0/databinding-compiler-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom
@@ -168,6 +170,7 @@ https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/run
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.3.1/baseLibrary-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom
@@ -202,6 +205,7 @@ https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.0.2/su
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/26.0.2/support-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/27.0.1/support-vector-drawable-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.2.1/crash-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.3.1/crash-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.4/crash-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom
@@ -211,6 +215,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.3.1/protos-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom
@@ -220,6 +225,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.3.1/shared-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom
@@ -229,6 +235,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.3.1/tracker-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom
@@ -238,6 +245,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.3.1/annotations-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom
@@ -263,6 +271,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.4
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.3.1/apksig-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apksig-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom
@@ -270,6 +279,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.1/apksig-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.4.2/apksig-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.3.1/apkzlib-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/apkzlib-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom
@@ -279,6 +289,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.4.2/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.3.1/builder-model-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom
@@ -288,6 +299,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.3.1/builder-test-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom
@@ -297,6 +309,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.3.1/builder-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom
@@ -304,6 +317,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.2.1/bu
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.3.1/builder-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.4.2/builder-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.6.0/bundletool-0.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.9.0/bundletool-0.9.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.0/bundletool-0.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.6.0/bundletool-1.6.0.pom
@@ -313,6 +327,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.11.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.3.1/gradle-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom
@@ -325,6 +340,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.0/gradle-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.3.1/gradle-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gradle-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom
@@ -332,16 +348,19 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.2.1/gra
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.3.1/gradle-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.4.2/gradle-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-alpha10/jetifier-core-1.0.0-alpha10.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02/jetifier-core-1.0.0-beta02.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta04/jetifier-core-1.0.0-beta04.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta09/jetifier-core-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta10/jetifier-core-1.0.0-beta10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-alpha10/jetifier-processor-1.0.0-alpha10.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta02/jetifier-processor-1.0.0-beta02.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta04/jetifier-processor-1.0.0-beta04.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta09/jetifier-processor-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta10/jetifier-processor-1.0.0-beta10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.3.1/manifest-merger-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom
@@ -351,6 +370,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/common/26.3.1/common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom
@@ -360,6 +380,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/30.4.2/common-3
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.3.1/ddmlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom
@@ -369,6 +390,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.4.2/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.3.1/dvlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom
@@ -385,6 +407,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.3.1/layoutlib-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/27.1.0/layoutlib-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom
@@ -398,6 +421,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/30.4.2/lint-checks-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/30.4.2/lint-gradle-30.4.2.pom
@@ -416,6 +440,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/play-sdk-proto/30.4.2/
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.3.1/repository-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom
@@ -425,6 +450,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.4.2/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.3.1/sdklib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom
@@ -434,6 +460,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.4.2/sdklib-3
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.3.1/sdk-common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom
@@ -688,6 +715,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/17.0/guava-pa
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/22.0/guava-parent-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/23.0/guava-parent-23.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/26.0-android/guava-parent-26.0-android.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/26.0-jre/guava-parent-26.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/27.0.1-jre/guava-parent-27.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/28.1-jre/guava-parent-28.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/29.0-jre/guava-parent-29.0-jre.pom
@@ -700,6 +728,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/26.0-android/guava-26.0-android.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/26.0-jre/guava-26.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/27.0.1-jre/guava-27.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/28.1-jre/guava-28.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/29.0-jre/guava-29.0-jre.pom
@@ -884,13 +913,13 @@ https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.19/byte-buddy-agent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.11/byte-buddy-agent-1.14.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.11/byte-buddy-parent-1.14.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.10/byte-buddy-parent-1.14.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.11/byte-buddy-1.14.11.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -1138,6 +1167,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.9.0/kotlin-project-model-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.2.0/kotlin-reflect-1.2.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.20/kotlin-reflect-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.50/kotlin-reflect-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.pom
@@ -1164,6 +1194,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.9.0/kotlin-script-runtime-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.2.71/kotlin-stdlib-common-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.0/kotlin-stdlib-common-1.3.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.20/kotlin-stdlib-common-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.50/kotlin-stdlib-common-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.60/kotlin-stdlib-common-1.3.60.pom
@@ -1183,6 +1214,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.22/kotlin-stdlib-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/kotlin-stdlib-jdk7-1.4.10.pom
@@ -1195,6 +1227,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.22/kotlin-stdlib-jdk7-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/kotlin-stdlib-jdk8-1.4.10.pom
@@ -1210,6 +1243,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/ko
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.20/kotlin-stdlib-1.2.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.71/kotlin-stdlib-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.0/kotlin-stdlib-1.3.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.20/kotlin-stdlib-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.50/kotlin-stdlib-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.60/kotlin-stdlib-1.3.60.pom
@@ -1254,7 +1288,7 @@ https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.po
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.9.0/mockito-core-5.9.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.8.0/mockito-core-5.8.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-inline/4.0.0/mockito-inline-4.0.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom

nix/deps/gradle/get_projects.sh

@@ -19,4 +19,4 @@ trap show_gradle_log ERR
 ./gradlew projects --no-daemon --console plain 2>&1 \
     | tee "${GRADLE_LOG_FILE}" \
     | grep "Project ':" \
-    | sed -E "s;^.--- Project '\:([@_a-zA-Z0-9\-]+)'.*;\1;"
+    | sed -E "s;^.--- Project '\:([@_a-zA-Z0-9\-]+)';\1;"

nix/deps/gradle/proj.list

@@ -1,7 +1,6 @@
 app
 react-native-async-storage_async-storage
 react-native-background-timer
-react-native-biometrics
 react-native-blob-util
 react-native-blur
 react-native-camera-kit
@@ -37,5 +36,6 @@ react-native-static-safe-area-insets
 react-native-status
 react-native-status-keycard
 react-native-svg
+react-native-touch-id
 react-native-transparent-video
 react-native-webview

nix/mobile/android/release.nix

@@ -79,9 +79,6 @@ in stdenv.mkDerivation rec {
   STATUS_GO_SRC_OVERRIDE = statusGoSrcOverride;
   ANDROID_ABI_SPLIT = androidAbiSplit;
   ANDROID_ABI_INCLUDE = androidAbiInclude;
-  # Disabled for debug builds to avoid 'maximum call stack exceeded' errors.
-  # https://github.com/status-im/status-mobile/issues/18493
-  ORG_GRADLE_PROJECT_hermesEnabled = true;
 
   # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
   NODE_OPTIONS = "--openssl-legacy-provider";

nix/scripts/kill_proc_prompt.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-# script to prompt user for terminating a process
-
-pid="${1}"
-
-read -p "Do you want to terminate this process? (y/n): " choice
-if [[ "${choice}" == "y" ]]; then
-    sudo kill "${pid}"
-    echo "Process ${pid} terminated."
-else
-    echo "Process not terminated. Please close it manually and retry."
-    exit 1
-fi

nix/scripts/purge.sh

@@ -22,10 +22,12 @@ nix_purge_linux_multi_user_users() {
 }
 
 nix_purge_darwin_multi_user_service() {
-    sudo launchctl unload /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-    sudo rm /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-    sudo launchctl unload /Library/LaunchDaemons/org.nixos.darwin-store.plist
-    sudo rm /Library/LaunchDaemons/org.nixos.darwin-store.plist
+    cd /Library/LaunchDaemons
+    NIX_SERVICES=(org.nixos.darwin-store.plist org.nixos.nix-daemon.plist)
+    for NIX_SERVICE in "${NIX_SERVICES[@]}"; do
+        sudo launchctl unload "${NIX_SERVICE}" || true
+        sudo launchctl remove "${NIX_SERVICE}" || true
+    done
 }
 
 nix_purge_darwin_multi_user_users() {
@@ -46,10 +48,18 @@ nix_purge_darwin_multi_user_volumes() {
 
         # Identify the process using the volume
         local pid=$(lsof +D /nix | awk 'NR==2{print $2}')
-        if [[ -n "$pid" ]]; then
+        if [ -n "$pid" ]; then
             echo "The volume /nix is in use by process ID $pid."
-            "${GIT_ROOT}/nix/scripts/kill_proc_prompt.sh" "${pid}" || return 1
 
+            # Ask the user whether to terminate the process
+            read -p "Do you want to terminate this process? (y/n): " choice
+            if [[ $choice == "y" ]]; then
+                sudo kill $pid
+                echo "Process $pid terminated."
+            else
+                echo "Process not terminated. Please close it manually and retry."
+                return 1
+            fi
         else
             echo "No process found using /nix. Manual intervention required."
             return 1
@@ -61,9 +71,9 @@ nix_purge_darwin_multi_user_volumes() {
 
 nix_purge_multi_user() {
     if [[ $(uname -s) == "Darwin" ]]; then
-        nix_purge_darwin_multi_user_service
-        nix_purge_darwin_multi_user_users
-        nix_purge_darwin_multi_user_volumes
+        nix_purge_darwin_multi_user_service || true
+        nix_purge_darwin_multi_user_users || true
+        nix_purge_darwin_multi_user_volumes || true
     else
         nix_purge_linux_multi_user_service
         nix_purge_linux_multi_user_users
@@ -107,7 +117,7 @@ if (return 0 2>/dev/null); then
     return
 fi
 
-# Confirm user decision, unless --force is used.
+# Confirm user decission, unless --force is used.
 if [[ "${1}" != "--force" ]]; then
     echo -e "${YLW}Are you sure you want to purge Nix?${RST}" >&2
     read -p "[y/n]: " -n 1 -r
@@ -119,7 +129,7 @@ if [[ "${1}" != "--force" ]]; then
 fi
 
 NIX_INSTALL_TYPE=$(nix_install_type)
-# Purging /nix on NixOS would be disastrous.
+# Purging /nix on NixOS would be disasterous.
 if [[ "${NIX_INSTALL_TYPE}" == "nixos" ]]; then
     echo -e "${RED}You should not purge Nix files on NixOS!${RST}" >&2
     exit

package.json

@@ -35,7 +35,6 @@
     "react-dom": "18.0.0",
     "react-native": "0.72.5",
     "react-native-background-timer": "^2.1.1",
-    "react-native-biometrics": "^3.0.1",
     "react-native-blob-util": "^0.13.18",
     "react-native-camera-kit": "14.0.0-beta13",
     "react-native-config": "^1.5.0",
@@ -66,6 +65,7 @@
     "react-native-static-safe-area-insets": "^2.2.0",
     "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39",
     "react-native-svg": "13.10.0",
+    "react-native-touch-id": "^4.4.1",
     "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
     "react-native-webview": "13.6.3",
     "react-syntax-highlighter": "^15.5.0",

scripts/build-android.sh

@@ -33,17 +33,10 @@ trap "rm -vf ${SECRETS_FILE_PATH}" EXIT ERR INT QUIT
 
 # Names of variables containing secrets to save in env file.
 SECRETS_ENV_VARS=(
-    'ALCHEMY_ETHEREUM_MAINNET_TOKEN'
-    'ALCHEMY_ETHEREUM_GOERLI_TOKEN'
-    'ALCHEMY_ETHEREUM_SEPOLIA_TOKEN'
     'ALCHEMY_ARBITRUM_GOERLI_TOKEN'
     'ALCHEMY_ARBITRUM_MAINNET_TOKEN'
-    'ALCHEMY_ARBITRUM_SEPOLIA_TOKEN'
     'ALCHEMY_OPTIMISM_GOERLI_TOKEN'
     'ALCHEMY_OPTIMISM_MAINNET_TOKEN'
-    'ALCHEMY_OPTIMISM_SEPOLIA_TOKEN'
-    'RARIBLE_MAINNET_API_KEY'
-    'RARIBLE_TESTNET_API_KEY'
     'INFURA_TOKEN'
     'INFURA_TOKEN_SECRET'
     'OPENSEA_API_KEY'

shadow-cljs.edn

@@ -63,17 +63,10 @@
          {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
           status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_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"
-          status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-          status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
-          status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
-          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
           status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
-          status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-          status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
           status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
-          status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+          status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
+          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
          :compiler-options {:output-feature-set :es5
                             ;; We disable `:fn-deprecated` warnings because we
                             ;; are managing deprecation via clj-kondo and we
@@ -97,17 +90,10 @@
     {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
      status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_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"
-     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
      status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
      status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
+     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
     :compiler-options {:output-feature-set :es6
                        ;;disable for android build as there
                        ;;is an intermittent warning with deftype
@@ -137,17 +123,10 @@
     status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_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"
-    status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_ETHEREUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ETHEREUM_GOERLI_TOKEN"
-    status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
-    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
     status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
-    status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
-    status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
+    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
    :compiler-options
    {;; needed because we override require and it
     ;; messes with source-map which reports callstack

src/legacy/status_im/data_store/communities.cljs

@@ -44,37 +44,20 @@
   [categ]
   (reduce-kv #(assoc %1 (name %2) %3) {} categ))
 
-(defn role-permission?
-  [token-permission]
-  (contains? constants/community-role-permissions (:type token-permission)))
-
-(defn membership-permission?
-  [token-permission]
-  (= (:type token-permission) constants/community-token-permission-become-member))
-
 (defn <-rpc
   [c]
   (-> c
-      (set/rename-keys
-       {:canRequestAccess            :can-request-access?
-        :canManageUsers              :can-manage-users?
-        :canDeleteMessageForEveryone :can-delete-message-for-everyone?
-        ;; This flag is misleading based on its name alone
-        ;; because it should not be used to decide if the user
-        ;; is *allowed* to join. Allowance is based on token
-        ;; permissions. Still, the flag can be used to know
-        ;; whether or not the user will have to wait until an
-        ;; admin approves a join request.
-        :canJoin                     :can-join?
-        :requestedToJoinAt           :requested-to-join-at
-        :isMember                    :is-member?
-        :adminSettings               :admin-settings
-        :tokenPermissions            :token-permissions
-        :communityTokensMetadata     :tokens-metadata
-        :introMessage                :intro-message
-        :muteTill                    :muted-till
-        :lastOpenedAt                :last-opened-at
-        :joinedAt                    :joined-at})
+      (set/rename-keys {:canRequestAccess            :can-request-access?
+                        :canManageUsers              :can-manage-users?
+                        :canDeleteMessageForEveryone :can-delete-message-for-everyone?
+                        :canJoin                     :can-join?
+                        :requestedToJoinAt           :requested-to-join-at
+                        :isMember                    :is-member?
+                        :adminSettings               :admin-settings
+                        :tokenPermissions            :token-permissions
+                        :communityTokensMetadata     :tokens-metadata
+                        :introMessage                :intro-message
+                        :muteTill                    :muted-till})
       (update :admin-settings
               set/rename-keys
               {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
@@ -82,16 +65,9 @@
       (update :chats <-chats-rpc)
       (update :token-permissions seq)
       (update :categories <-categories-rpc)
-      (assoc :role-permissions?
-             (->> c
-                  :tokenPermissions
-                  vals
-                  (some role-permission?)))
       (assoc :membership-permissions?
-             (->> c
-                  :tokenPermissions
-                  vals
-                  (some membership-permission?)))
+             (some #(= (:type %) constants/community-token-permission-become-member)
+                   (vals (:tokenPermissions c))))
       (assoc :token-images
              (reduce (fn [acc {sym :symbol image :image}]
                        (assoc acc sym image))

src/legacy/status_im/ui/screens/advanced_settings/views.cljs

@@ -19,8 +19,7 @@
            transactions-management-enabled?
            current-fleet
            webview-debug
-           test-networks-enabled?
-           is-sepolia-enabled?]}]
+           test-networks-enabled?]}]
   (keep
    identity
    [{:size :small
@@ -111,14 +110,6 @@
      #(re-frame/dispatch [:profile.settings/toggle-test-networks])
      :accessory :switch
      :active test-networks-enabled?}
-    {:size :small
-     :title "Enable Sepolia as test network"
-     :accessibility-label :enable-sepolia-as-test-network
-     :container-margin-bottom 8
-     :on-press
-     #(re-frame/dispatch [:profile.settings/toggle-sepolia-test-network])
-     :accessory :switch
-     :active is-sepolia-enabled?}
     {:size                :small
      :title               (i18n/label :t/set-currency)
      :accessibility-label :wallet-change-currency
@@ -139,7 +130,6 @@
 (views/defview advanced-settings
   []
   (views/letsubs [test-networks-enabled?           [:profile/test-networks-enabled?]
-                  is-sepolia-enabled?              [:profile/is-sepolia-enabled?]
                   light-client-enabled?            [:profile/light-client-enabled?]
                   webview-debug                    [:profile/webview-debug]
                   network-name                     [:network-name]
@@ -155,7 +145,6 @@
                    :current-fleet                    current-fleet
                    :dev-mode?                        false
                    :webview-debug                    webview-debug
-                   :test-networks-enabled?           test-networks-enabled?
-                   :is-sepolia-enabled?              is-sepolia-enabled?})
+                   :test-networks-enabled?           test-networks-enabled?})
       :key-fn    (fn [_ i] (str i))
       :render-fn render-item}]))

src/mocks/js_dependencies.cljs

@@ -164,7 +164,7 @@
    {:MediaStates        {}
     :PlaybackCategories {}})
 (def net-info #js {})
-(def react-native-biometrics #js {:default {}})
+(def touchid #js {})
 (def react-native-image-viewing #js {:default {}})
 (def react-native-static-safe-area-insets #js {:default {}})
 
@@ -391,7 +391,7 @@
     "react-native-fetch-polyfill"                      fetch
     "react-native-status-keycard"                      status-keycard
     "react-native-keychain"                            keychain
-    "react-native-biometrics"                          react-native-biometrics
+    "react-native-touch-id"                            touchid
     "@react-native-community/netinfo"                  net-info
     "react-native-dialogs"                             dialogs
     "react-native"                                     react-native

src/quo/components/drawers/action_drawers/style.cljs

@@ -3,11 +3,9 @@
     [quo.foundations.colors :as colors]))
 
 (defn divider
-  [theme blur?]
+  [theme]
   {:border-top-width 1
-   :border-top-color (if blur?
-                       colors/white-opa-5
-                       (colors/theme-colors colors/neutral-10 colors/neutral-90 theme))
+   :border-top-color (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)
    :margin-top       8
    :margin-bottom    7
    :align-items      :center

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

@@ -14,9 +14,9 @@
     (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
 
 (defn- divider
-  [theme blur?]
+  [theme]
   [rn/view
-   {:style               (style/divider theme blur?)
+   {:style               (style/divider theme)
     :accessible          true
     :accessibility-label :divider}])
 
@@ -45,7 +45,7 @@
            blur?]}]
   [:<>
    (when add-divider?
-     [divider theme blur?])
+     [divider theme])
    [maybe-pressable disabled?
     {:accessibility-label accessibility-label
      :style               (style/container {:sub-label           sub-label

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

@@ -182,7 +182,7 @@
 
 (defn- view-internal
   [{:keys [title title-icon type theme description blur? community-name community-logo button-icon
-           account-name emoji context-tag-type
+           account-name emoji
            on-button-press
            on-button-long-press
            button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar
@@ -214,7 +214,6 @@
       :description         description
       :community-name      community-name
       :community-logo      community-logo
-      :context-tag-type    context-tag-type
       :customization-color customization-color
       :account-name        account-name
       :emoji               emoji}]]

src/quo/components/gradient/gradient_cover/view.cljs

@@ -6,14 +6,21 @@
     [react-native.linear-gradient :as linear-gradient]))
 
 (defn- view-internal
-  [{:keys [customization-color opacity container-style height] :or {customization-color :blue}}]
-  (let [color-top    (colors/custom-color customization-color 50 20)
-        color-bottom (colors/custom-color customization-color 50 0)]
-    [linear-gradient/linear-gradient
-     {:accessibility-label :gradient-cover
-      :colors              [color-top color-bottom]
-      :start               {:x 0 :y 0}
-      :end                 {:x 0 :y 1}
-      :style               (merge (style/root-container opacity height) container-style)}]))
+  [{:keys [customization-color opacity container-style height]
+    :or   {customization-color :blue}}]
+  ;; `when` added for safety, `linear-gradient` will break if `nil` is passed,
+  ;; the `:or` destructuring won't work because it's only applied when the
+  ;; `:customization-color` key is non-existent. While deleting an account the key exists
+  ;; and has a `nil` value.
+  (when customization-color
+    (let [color-top    (colors/resolve-color customization-color 50 20)
+          color-bottom (colors/resolve-color customization-color 50 0)]
+      [linear-gradient/linear-gradient
+       {:accessibility-label :gradient-cover
+        :colors              [color-top color-bottom]
+        :start               {:x 0 :y 0}
+        :end                 {:x 0 :y 1}
+        :style               (merge (style/root-container opacity height)
+                                    container-style)}])))
 
 (def view (quo.theme/with-theme view-internal))

src/quo/components/list_items/network_list/view.cljs

@@ -45,7 +45,7 @@
       [:fiat-value :string]
       [:token-value :string]
       [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-      [:state {:optional true} [:enum :pressed :active :default]]
+      [:state [:enum :pressed :active :default]]
       [:on-press {:optional true} [:maybe fn?]]
       [:theme :schema.common/theme]]]]
    :any])

src/quo/components/profile/collectible/view.cljs

@@ -2,9 +2,7 @@
   (:require
     [quo.components.markdown.text :as text]
     [quo.components.profile.collectible.style :as style]
-    [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]
-    [react-native.svg :as svg]))
+    [react-native.core :as rn]))
 
 (defn remaining-tiles
   [amount]
@@ -16,21 +14,12 @@
     (str "+" amount)]])
 
 (defn tile
-  [{:keys [style size resource]}]
-  (let [svg?        (and (map? resource) (:svg? resource))
-        image-style (style/tile-style-by-size size)]
+  [{:keys [style resource size]}]
+  (let [source (if (string? resource) {:uri resource} resource)]
     [rn/view {:style style}
-     (if svg?
-       [rn/view
-        {:style {:border-radius (:border-radius image-style)
-                 :overflow      :hidden}}
-        [svg/svg-uri (assoc image-style :uri (:uri resource))]]
-       [fast-image/fast-image
-        {:style  image-style
-         :source (if (string? resource)
-                   {:uri      resource
-                    :priority :low}
-                   resource)}])]))
+     [rn/image
+      {:style  (style/tile-style-by-size size)
+       :source source}]]))
 
 (defn two-tiles
   [{:keys [images size]}]

src/quo/components/tabs/tab/view.cljs

@@ -27,7 +27,7 @@
      9.213 11.877 8.436 C 11.787 7.866 11.649 7.313 11.468 6.781 Z"
      :clip-path "url(#clip0_5514_84289)"}]
    [svg/defs
-    [svg/clip-path {:id "clip0_5514_84289"}
+    [svg/clippath {:id "clip0_5514_84289"}
      [svg/rect {:width width :height height :fill :none}]]]])
 
 (defn- content

src/quo/components/utilities/token/view.cljs

@@ -12,7 +12,7 @@
    [:cat
     [:map {:closed true}
      [:size {:optional true :default 32} [:or keyword? pos-int?]]
-     [:token {:optional true} [:maybe [:or keyword? string?]]]
+     [:token {:optional true} [:or keyword? string?]]
      [:style {:optional true} map?]
      ;; Ignores `token` and uses this as parameter to `rn/image`'s source.
      [:image-source {:optional true} [:maybe [:or :schema.common/image-source :string]]]]]

src/quo/components/wallet/token_input/view.cljs

@@ -1,7 +1,6 @@
 (ns quo.components.wallet.token-input.view
   (:require
     [clojure.string :as string]
-    [oops.core :as oops]
     [quo.components.buttons.button.view :as button]
     [quo.components.dividers.divider-line.view :as divider-line]
     [quo.components.markdown.text :as text]
@@ -73,25 +72,18 @@
    [token-name-text theme text]])
 
 (defn input-section
-  [{:keys [on-change-text value value-atom on-selection-change]}]
-  (let [input-ref               (atom nil)
-        set-ref                 #(reset! input-ref %)
-        focus-input             #(when-let [ref ^js @input-ref]
-                                   (.focus ref))
-        controlled-input?       (some? value)
-        handle-on-change-text   (fn [v]
-                                  (when-not controlled-input?
-                                    (reset! value-atom v))
-                                  (when on-change-text
-                                    (on-change-text v)))
-        handle-selection-change (fn [^js e]
-                                  (when on-selection-change
-                                    (-> e
-                                        (oops/oget "nativeEvent.selection")
-                                        (js->clj :keywordize-keys true)
-                                        (on-selection-change))))]
-    (fn [{:keys [theme token customization-color show-keyboard? crypto? currency value error?
-                 selection]
+  [{:keys [on-change-text value value-atom]}]
+  (let [input-ref             (atom nil)
+        set-ref               #(reset! input-ref %)
+        focus-input           #(when-let [ref ^js @input-ref]
+                                 (.focus ref))
+        controlled-input?     (some? value)
+        handle-on-change-text (fn [v]
+                                (when-not controlled-input?
+                                  (reset! value-atom v))
+                                (when on-change-text
+                                  (on-change-text v)))]
+    (fn [{:keys [theme token customization-color show-keyboard? crypto? currency value error?]
           :or   {show-keyboard? true}}]
       [rn/pressable
        {:on-press focus-input
@@ -110,9 +102,7 @@
                   :max-length               12
                   :on-change-text           handle-on-change-text
                   :selection-color          customization-color
-                  :show-soft-input-on-focus show-keyboard?
-                  :on-selection-change      handle-selection-change
-                  :selection                (clj->js selection)}
+                  :show-soft-input-on-focus show-keyboard?}
            controlled-input?       (assoc :value value)
            (not controlled-input?) (assoc :default-value @value-atom))]]
        [token-label
@@ -121,32 +111,33 @@
          :value (if controlled-input? value @value-atom)}]])))
 
 (defn- view-internal
-  []
-  (let [width      (:width (rn/get-window))
-        value-atom (reagent/atom nil)
-        crypto?    (reagent/atom true)]
-    (fn [{:keys [theme container-style value on-swap] :as props}]
-      (let [handle-on-swap (fn []
-                             (swap! crypto? not)
-                             (when on-swap (on-swap @crypto?)))]
-        [rn/view {:style (merge (style/main-container width) container-style)}
-         [rn/view {:style style/amount-container}
-          [input-section
-           (assoc props
-                  :value-atom value-atom
-                  :crypto?    @crypto?)]
-          [button/button
-           {:icon                true
-            :icon-only?          true
-            :size                32
-            :on-press            handle-on-swap
-            :type                :outline
-            :accessibility-label :reorder}
-           :i/reorder]]
-         [divider-line/view {:container-style (style/divider theme)}]
-         [data-info
-          (assoc props
-                 :crypto? @crypto?
-                 :amount  (or value @value-atom))]]))))
+  [{:keys [on-swap]}]
+  (let [width          (:width (rn/get-window))
+        value-atom     (reagent/atom nil)
+        crypto?        (reagent/atom true)
+        handle-on-swap (fn []
+                         (swap! crypto? not)
+                         (when on-swap
+                           (on-swap @crypto?)))]
+    (fn [{:keys [theme container-style value] :as props}]
+      [rn/view {:style (merge (style/main-container width) container-style)}
+       [rn/view {:style style/amount-container}
+        [input-section
+         (assoc props
+                :value-atom value-atom
+                :crypto?    @crypto?)]
+        [button/button
+         {:icon                true
+          :icon-only?          true
+          :size                32
+          :on-press            handle-on-swap
+          :type                :outline
+          :accessibility-label :reorder}
+         :i/reorder]]
+       [divider-line/view {:container-style (style/divider theme)}]
+       [data-info
+        (assoc props
+               :crypto? @crypto?
+               :amount  (or value @value-atom))]])))
 
 (def view (quo.theme/with-theme view-internal))

src/quo/foundations/shadows.cljs

@@ -3,69 +3,62 @@
   (:require
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
-    [react-native.platform :as platform]
-    [utils.number]))
-
-;; Set radius coefficient based on Android Version.
-;; A good way to know is to check if shadow color is supported i.e API level 28 (Android 9) above
-(def ^:private shadow-radius-coefficient (if platform/is-shadow-color-supported? 0.8 0.1))
-
-(defn- get-shadow-color
-  "Calculates the shadow color based on a given color and opacity, with an optional coefficient.
-  - Arity [color opacity]: Uses a default coefficient value of 5 (empirically determined) to compute the shadow color.
-  - Arity [color opacity coefficient]: Uses the specified coefficient to compute the shadow color.
-  On Android platforms, the shadow color's alpha is adjusted based on the product of opacity and
-  coefficient, constrained between 0 and 1. Returns a map with :shadow-color and :shadow-opacity keys."
-  ([color opacity]
-   (get-shadow-color color opacity 5))
-  ([color opacity coefficient]
-   {:shadow-color   (if platform/android?
-                      (colors/alpha color (utils.number/value-in-range (* opacity coefficient) 0 1))
-                      color)
-    :shadow-opacity opacity}))
-
-(defn- get-shadow-radius
-  "Computes shadow radius and elevation properties based on a given radius, with an optional coefficient.
-  - Arity [radius]: Uses a default coefficient of 0.8 for API level 28 and above and 0.1 otherwise (empirically determined) to compute the elevation.
-  - Arity [radius coefficient]: Uses the specified coefficient to compute the elevation.
-  Returns a map with :elevation, computed as the product of radius and coefficient, and :shadow-radius keys."
-  ([radius]
-   (get-shadow-radius radius shadow-radius-coefficient))
-  ([radius coefficient]
-   {:elevation     (* radius coefficient)
-    :shadow-radius radius}))
+    [react-native.platform :as platform]))
 
 (def ^:private shadows
-  (let [dark-normal           {1 (merge {:shadow-offset {:width 0 :height 4}}
-                                        (get-shadow-color colors/neutral-100 0.5)
-                                        (get-shadow-radius 20))
-                               2 (merge {:shadow-offset {:width 0 :height 4}}
-                                        (get-shadow-color colors/neutral-100 0.64)
-                                        (get-shadow-radius 20))
-                               3 (merge {:shadow-offset {:width 0 :height 12}}
-                                        (get-shadow-color colors/neutral-100 0.64)
-                                        (get-shadow-radius 20))
-                               4 (merge {:shadow-offset {:width 0 :height 16}}
-                                        (get-shadow-color colors/neutral-100 0.72)
-                                        (get-shadow-radius 20))}
+  (let [dark-normal           {1 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.5))
+                                  :shadow-offset  {:width 0 :height 4}
+                                  :elevation      3
+                                  :shadow-opacity 1
+                                  :shadow-radius  20}
+                               2 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.64))
+                                  :shadow-offset  {:width 0 :height 4}
+                                  :elevation      4
+                                  :shadow-opacity 1
+                                  :shadow-radius  20}
+                               3 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.64))
+                                  :shadow-offset  {:width 0 :height 12}
+                                  :elevation      8
+                                  :shadow-opacity 1
+                                  :shadow-radius  20}
+                               4 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.72))
+                                  :shadow-offset  {:width 0 :height 16}
+                                  :shadow-opacity 1
+                                  :shadow-radius  20
+                                  :elevation      15}}
         dark-normal-inverted  (-> dark-normal
                                   (update-in [:soft :shadow-offset :height] -)
                                   (update-in [:medium :shadow-offset :height] -)
                                   (update-in [:intense :shadow-offset :height] -)
                                   (update-in [:strong :shadow-offset :height] -))
-        light-normal          {1 (merge {:shadow-offset {:width 0 :height 4}}
-                                        (get-shadow-color colors/neutral-100 0.04)
-                                        (get-shadow-radius 16))
-
-                               2 (merge {:shadow-offset {:width 0 :height 4}}
-                                        (get-shadow-color colors/neutral-100 0.08)
-                                        (get-shadow-radius 16))
-                               3 (merge {:shadow-offset {:width 0 :height 12}}
-                                        (get-shadow-color colors/neutral-100 0.12)
-                                        (get-shadow-radius 16))
-                               4 (merge {:shadow-offset {:width 0 :height 16}}
-                                        (get-shadow-color colors/neutral-100 0.16)
-                                        (get-shadow-radius 16))}
+        light-normal          {1 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.04))
+                                  :shadow-offset  {:width 0 :height 4}
+                                  :elevation      1
+                                  :shadow-opacity 1
+                                  :shadow-radius  16}
+                               2 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.08))
+                                  :shadow-offset  {:width 0 :height 4}
+                                  :elevation      6
+                                  :shadow-opacity 1
+                                  :shadow-radius  16}
+                               3 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.12))
+                                  :shadow-offset  {:width 0 :height 12}
+                                  :elevation      8
+                                  :shadow-opacity 1
+                                  :shadow-radius  16}
+                               4 {:shadow-color   (when platform/ios?
+                                                    (colors/alpha colors/neutral-100 0.16))
+                                  :shadow-offset  {:width 0 :height 16}
+                                  :shadow-opacity 1
+                                  :shadow-radius  16
+                                  :elevation      13}}
         light-normal-inverted (-> light-normal
                                   (update-in [:soft :shadow-offset :height] -)
                                   (update-in [:medium :shadow-offset :height] -)

src/react_native/biometrics.cljs

@@ -1,76 +0,0 @@
-(ns react-native.biometrics
-  (:require
-    ["react-native-biometrics" :default Biometrics]
-    [clojure.string :as string]
-    [oops.core :as oops]
-    [react-native.platform :as platform]
-    [schema.core :as schema]))
-
-(def ^:private ^:const android-not-available-error-message "Biometric hardware unavailable")
-(def ^:private ^:const android-not-enrolled-error-message "No fingerprints enrolled.")
-(def ^:private ^:const ios-not-enrolled-error-message "No identities are enrolled")
-
-(defn get-supported-type
-  "Returns a JS promise that resolves with the biometrics types supported by the
-  device, regardless of whether it's enabled or disabled.
-
-  Resolved values: `:Biometrics` `:FaceID` `:TouchID`"
-  []
-  (-> (Biometrics.)
-      (.isSensorAvailable)
-      (.then (fn [result]
-               (-> result
-                   (oops/oget :biometryType)
-                   keyword)))
-      (.catch (constantly nil))))
-
-(defn get-available
-  "Returns a JS promise that resolves to a boolean, which signifies whether
-  biometrics is enabled/disabled on the device."
-  []
-  (-> (Biometrics.)
-      (.isSensorAvailable)
-      (.then (fn [result]
-               (oops/oget result :available)))))
-
-;; NOTE: the react-native-biometrics package error codes/messages differ across platforms.
-;; On android we get error messages while on iOS it's a stringified Obj-C error object.
-(defn- convert-auth-error-message
-  [message]
-  (let [cause (if platform/android?
-                (condp = message
-                  android-not-enrolled-error-message  ::not-enrolled
-                  android-not-available-error-message ::not-available
-                  ::unknown)
-
-                (condp #(string/includes? %2 %1) message
-                  ios-not-enrolled-error-message ::not-enrolled
-                  ::unknown))]
-    (ex-info "Failed to authenticate with biometrics"
-             {:orig-error-message message}
-             cause)))
-
-(defn authenticate
-  "Returns a JS promise that resolves with a boolean auth success state: `true` for
-  success and `false` when canceled by user."
-  [{:keys [prompt-message fallback-prompt-message cancel-button-text]}]
-  (-> (Biometrics.)
-      (.simplePrompt #js
-                      {"promptMessage"         prompt-message
-                       "fallbackPromptMessage" fallback-prompt-message
-                       "cancelButtonText"      cancel-button-text})
-      (.then (fn [result]
-               (oops/oget result :success)))
-      (.catch (fn [error]
-                (-> (.-message error)
-                    convert-auth-error-message
-                    throw)))))
-
-(schema/=> authenticate
-  [:=>
-   [:cat
-    [:map {:closed true}
-     [:prompt-message string?]
-     [:fallback-prompt-message {:optional true} string?]
-     [:cancel-button-text {:optional true} string?]]]
-   :any])

src/react_native/fast_image.cljs

@@ -20,8 +20,7 @@
        (merge
         props
         {:source   (if (string? source)
-                     {:uri      source
-                      :priority :high}
+                     {:uri source}
                      source)
          :on-error (fn [e]
                      (when-let [on-error (:on-error props)]

src/react_native/keychain.cljs

@@ -72,11 +72,9 @@
 
 (defn get-credentials
   "Gets the credentials for a specified server from the Keychain"
-  ([server]
-   (get-credentials server identity))
-  ([server callback]
-   (-> (.getInternetCredentials ^js react-native-keychain (string/lower-case server))
-       (.then callback))))
+  [server callback]
+  (-> (.getInternetCredentials ^js react-native-keychain (string/lower-case server))
+      (.then callback)))
 
 (defn reset-credentials
   [server]

src/react_native/platform.cljs

@@ -14,5 +14,3 @@
 (def low-device? (and android? (< version 29)))
 
 (def is-below-android-13? (and android? (< version 33)))
-
-(def is-shadow-color-supported? (and android? (> version 27)))

src/react_native/svg.cljs

@@ -6,11 +6,10 @@
 (def svg (reagent/adapt-react-class Svg/default))
 (def path (reagent/adapt-react-class Svg/Path))
 (def rect (reagent/adapt-react-class Svg/Rect))
-(def clip-path (reagent/adapt-react-class Svg/ClipPath))
+(def clippath (reagent/adapt-react-class Svg/ClipPath))
 (def defs (reagent/adapt-react-class Svg/Defs))
 (def circle (reagent/adapt-react-class Svg/Circle))
-(def svg-xml (reagent/adapt-react-class Svg/SvgXml))
-(def svg-uri (reagent/adapt-react-class Svg/SvgUri))
+(def svgxml (reagent/adapt-react-class Svg/SvgXml))
 (def g (reagent/adapt-react-class Svg/G))
 (def linear-gradient (reagent/adapt-react-class Svg/LinearGradient))
 (def stop (reagent/adapt-react-class Svg/Stop))

src/react_native/touch_id.cljs

@@ -0,0 +1,20 @@
+(ns react-native.touch-id
+  (:require
+    ["react-native-touch-id" :default touchid]))
+
+;; currently, for android, react-native-touch-id
+;; is not returning supported biometric type
+;; defaulting to :fingerprint
+(def android-default-support :fingerprint)
+
+(defn get-supported-type
+  [callback]
+  (-> (.isSupported ^js touchid)
+      (.then #(callback (or (keyword %) android-default-support)))
+      (.catch #(callback nil))))
+
+(defn authenticate
+  [{:keys [on-success on-fail reason options]}]
+  (-> (.authenticate ^js touchid reason (clj->js options))
+      (.then #(when on-success (on-success %)))
+      (.catch #(when on-fail (on-fail (aget % "code"))))))

src/status_im/common/biometric/events.cljs

@@ -2,8 +2,9 @@
   (:require
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
-    [react-native.biometrics :as biometrics]
+    [react-native.async-storage :as async-storage]
     [react-native.platform :as platform]
+    [react-native.touch-id :as touch-id]
     [status-im.common.keychain.events :as keychain]
     [status-im.constants :as constants]
     [taoensso.timbre :as log]
@@ -11,19 +12,27 @@
     [utils.re-frame :as rf]))
 
 (def android-device-blacklisted?
-  (and platform/android? (= (:brand (native-module/get-device-model-info)) "bannedbrand")))
+  (= (:brand (native-module/get-device-model-info)) "bannedbrand"))
+
+(defn get-supported-type
+  [callback]
+  (cond platform/ios?     (touch-id/get-supported-type callback)
+        platform/android? (if android-device-blacklisted?
+                            (callback nil)
+                            (touch-id/get-supported-type callback))
+        :else             (callback nil)))
 
 (defn get-label-by-type
   [biometric-type]
   (condp = biometric-type
-    constants/biometrics-type-android (i18n/label :t/biometric-fingerprint)
-    constants/biometrics-type-face-id (i18n/label :t/biometric-faceid)
+    :fingerprint (i18n/label :t/biometric-fingerprint)
+    :FaceID      (i18n/label :t/biometric-faceid)
     (i18n/label :t/biometric-touchid)))
 
 (defn get-icon-by-type
   [biometric-type]
   (condp = biometric-type
-    constants/biometrics-type-face-id :i/face-id
+    :FaceID :i/face-id
     :i/touch-id))
 
 (re-frame/reg-fx
@@ -32,10 +41,8 @@
    ;;NOTE: if we can't save user password, we can't use biometric
    (keychain/can-save-user-password?
     (fn [can-save?]
-      (when (and can-save? (not android-device-blacklisted?))
-        (-> (biometrics/get-supported-type)
-            (.then (fn [type]
-                     (rf/dispatch [:biometric/get-supported-biometric-type-success type])))))))))
+      (when can-save?
+        (get-supported-type #(rf/dispatch [:biometric/get-supported-biometric-type-success %])))))))
 
 (rf/defn get-supported-biometric-auth-success
   {:events [:biometric/get-supported-biometric-type-success]}
@@ -44,32 +51,82 @@
 
 (rf/defn show-message
   {:events [:biometric/show-message]}
-  [_ error]
-  (let [code    (ex-cause error)
-        content (if (#{::biometrics/not-enrolled
-                       ::biometrics/not-available}
-                     code)
-                  (i18n/label :t/grant-face-id-permissions)
-                  (i18n/label :t/biometric-auth-error {:code code}))]
-    {:effects.utils/show-popup
-     {:title   (i18n/label :t/biometric-auth-login-error-title)
-      :content content}}))
+  [_ code]
+  (let [handle-error? (and code
+                           (not (contains? #{constants/biometric-error-user-canceled
+                                             constants/biometric-error-user-fallback}
+                                           code)))
+        content       (if (#{constants/biometric-error-not-available
+                             constants/biometric-error-not-enrolled}
+                           code)
+                        (i18n/label :t/grant-face-id-permissions)
+                        (i18n/label :t/biometric-auth-error {:code code}))]
+    (when handle-error?
+      {:effects.utils/show-popup
+       {:title   (i18n/label :t/biometric-auth-login-error-title)
+        :content content}})))
 
+(defn- supress-biometry-error-key
+  [key-uid]
+  (keyword (str "biometric/supress-not-enrolled-error-" key-uid)))
+
+;; NOTE: if the account had biometrics registered, but it's not enrolled at the moment,
+;; we should show the error message only once and supress further "NOT_ENROLLED" errors
+;; until biometry is enrolled again. Note that we can only know that when :biometric/authenticate
+;; is dispatched and fails with "NOT_ENROLLED", since :biometric/get-supported-biometric-type
+;; only tells us what kind of biometric is available on the device, but it doesn't know of its
+;; enrollment status.
+(re-frame/reg-fx
+ :biometric/supress-not-enrolled-error
+ (fn [[key-uid dispatch-event]]
+   (let [storage-key (supress-biometry-error-key key-uid)]
+     (-> (async-storage/get-item storage-key identity)
+         (.then (fn [item]
+                  (when (not item)
+                    (rf/dispatch dispatch-event)
+                    (async-storage/set-item! storage-key true))))
+         (.catch (fn [err]
+                   (log/error "Couldn't supress biometry NOT_ENROLLED error"
+                              {:key-uid key-uid
+                               :event   :biometric/supress-not-enrolled-error
+                               :error   err})))))))
+
+;; NOTE: when biometrics is re-enrolled, we erase the flag in async-storage to assure
+;; the "NOT_ENROLLED" error message will be shown again if biometrics is un-enrolled
+;; in the future.
+(re-frame/reg-fx
+ :biometric/reset-not-enrolled-error
+ (fn [key-uid]
+   (let [storage-key (supress-biometry-error-key key-uid)]
+     (-> (async-storage/get-item storage-key identity)
+         (.then (fn [supress?]
+                  (when supress?
+                    (async-storage/set-item! storage-key nil))))
+         (.catch (fn [err]
+                   (log/error "Couldn't reset supressing biometry NOT_ENROLLED error"
+                              {:key-uid key-uid
+                               :event   :biometric/reset-not-enrolled-error
+                               :error   err})))))))
 
 (re-frame/reg-fx
  :biometric/authenticate
- (fn [{:keys [on-success on-fail prompt-message]}]
-   (-> (biometrics/authenticate
-        {:prompt-message          (or prompt-message (i18n/label :t/biometric-auth-reason-login))
-         :fallback-prompt-message (i18n/label
-                                   :t/biometric-auth-login-ios-fallback-label)
-         :cancel-button-text      (i18n/label :t/cancel)})
-       (.then (fn [not-canceled?]
-                (when (and on-success not-canceled?)
-                  (on-success))))
-       (.catch (fn [err]
-                 (when on-fail
-                   (on-fail err)))))))
+ (fn [options]
+   (touch-id/authenticate
+    (merge
+     {:reason  (i18n/label :t/biometric-auth-reason-login)
+      :options (merge
+                {:unifiedErrors true}
+                (when platform/ios?
+                  {:passcodeFallback false
+                   :fallbackLabel    (i18n/label :t/biometric-auth-login-ios-fallback-label)})
+                (when platform/android?
+                  {:title                  (i18n/label :t/biometric-auth-android-title)
+                   :imageColor             :blue
+                   :imageErrorColor        :red
+                   :sensorDescription      (i18n/label :t/biometric-auth-android-sensor-desc)
+                   :sensorErrorDescription (i18n/label :t/biometric-auth-android-sensor-error-desc)
+                   :cancelText             (i18n/label :t/cancel)}))}
+     options))))
 
 (rf/defn authenticate
   {:events [:biometric/authenticate]}
@@ -98,23 +155,3 @@
    (let [key-uid (get-in db [:profile/profile :key-uid])]
      {:db                           (assoc db :auth-method constants/auth-method-none)
       :keychain/clear-user-password key-uid})))
-
-(rf/reg-fx
- :biometric/check-if-available
- (fn [[key-uid callback]]
-   (keychain/can-save-user-password?
-    (fn [can-save?]
-      (when can-save?
-        (-> (biometrics/get-available)
-            (.then (fn [available?]
-                     (when-not available?
-                       (throw (js/Error. "biometric-not-available")))))
-            (.then #(keychain/get-auth-method! key-uid))
-            (.then (fn [auth-method]
-                     (when auth-method (callback auth-method))))
-            (.catch (fn [err]
-                      (when-not (= (.-message err) "biometric-not-available")
-                        (log/error "Failed to check if biometrics is available"
-                                   {:error   err
-                                    :key-uid key-uid
-                                    :event   :profile.login/check-biometric}))))))))))

src/status_im/common/keychain/events.cljs

@@ -70,13 +70,17 @@
   {:db                        (assoc db :auth-method method)
    :keychain/save-auth-method [key-uid method]})
 
-(defn get-auth-method!
-  [key-uid]
-  (-> (str key-uid "-auth")
-      (keychain/get-credentials)
-      (.then (fn [value]
-               (if value (oops/oget value "password") auth-method-none)))
-      (.catch (constantly auth-method-none))))
+(re-frame/reg-fx
+ :keychain/get-auth-method
+ (fn [[key-uid callback]]
+   (can-save-user-password?
+    (fn [can-save?]
+      (if can-save?
+        (keychain/get-credentials
+         (str key-uid "-auth")
+         (fn [value]
+           (callback (if value (oops/oget value "password") auth-method-none))))
+        (callback nil))))))
 
 (defn save-user-password!
   [key-uid password]
@@ -97,7 +101,7 @@
    (get-user-password! key-uid callback)))
 
 (rf/defn get-user-password
-  [_ [key-uid callback]]
+  [_ key-uid callback]
   {:keychain/get-user-password [key-uid callback]})
 
 (defn- password-migration-key-name

src/status_im/common/lightbox/top_view.cljs

@@ -9,6 +9,7 @@
     [status-im.common.lightbox.animations :as anim]
     [status-im.common.lightbox.constants :as constants]
     [status-im.common.lightbox.style :as style]
+    [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [utils.url :as url]))
 
@@ -39,6 +40,25 @@
         (anim/animate top-view-width screen-width)
         (anim/animate top-view-bg colors/neutral-100-opa-0)))))
 
+(defn drawer
+  [images index]
+  (let [{:keys [image]} (nth images index)
+        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
+    [quo/action-drawer
+     [[{:icon                :i/save
+        :accessibility-label :save-image
+        :label               (i18n/label :t/save-image-library)
+        :on-press            (fn []
+                               (rf/dispatch [:hide-bottom-sheet])
+                               (rf/dispatch
+                                [:lightbox/save-image-to-gallery
+                                 uri
+                                 #(rf/dispatch [:toasts/upsert
+                                                {:id              :random-id
+                                                 :type            :positive
+                                                 :container-style {:bottom (when platform/android? 20)}
+                                                 :text            (i18n/label :t/photo-saved)}])]))}]]]))
+
 (defn share-image
   [images index]
   (let [{:keys [image]} (nth images index)
@@ -46,7 +66,7 @@
     (rf/dispatch [:lightbox/share-image uri])))
 
 (defn top-view
-  [images insets index animations derived landscape? screen-width on-options-press]
+  [images insets index animations derived landscape? screen-width]
   (let [{:keys [description header]} (nth images @index)
         bg-color                     (if landscape?
                                        colors/neutral-100-opa-70
@@ -93,6 +113,7 @@
       [rn/touchable-opacity
        {:active-opacity      1
         :accessibility-label :image-options
-        :on-press            #(on-options-press images @index)
+        :on-press            #(rf/dispatch [:show-bottom-sheet
+                                            {:content (fn [] [drawer images @index])}])
         :style               style/close-container}
        [quo/icon :options {:size 20 :color colors/white}]]]]))

src/status_im/common/lightbox/view.cljs

@@ -44,8 +44,7 @@
    [rn/view {:style {:width constants/separator-width}}]])
 
 (defn lightbox-content
-  [{:keys [props state animations derived images index handle-items-changed bottom-text-component
-           on-options-press]}]
+  [{:keys [props state animations derived images index handle-items-changed bottom-text-component]}]
   (let [{:keys [data transparent? scroll-index
                 set-full-height?]} state
         insets                     (safe-area/get-insets)
@@ -70,7 +69,7 @@
                                                    {:height screen-height})}
      (when-not @transparent?
        [:f> top-view/top-view images insets scroll-index animations derived landscape?
-        screen-width on-options-press])
+        screen-width])
      [gesture/gesture-detector
       {:gesture (utils/drag-gesture animations (and landscape? platform/ios?) set-full-height?)}
       [reanimated/view
@@ -137,8 +136,7 @@
 
 (defn- f-lightbox
   []
-  (let [{:keys [images index bottom-text-component on-options-press]}
-        (rf/sub [:get-screen-params])
+  (let [{:keys [images index bottom-text-component]} (rf/sub [:get-screen-params])
         props
         (utils/init-props)
         state
@@ -162,8 +160,7 @@
           :images                images
           :index                 index
           :handle-items-changed  handle-items-changed
-          :bottom-text-component bottom-text-component
-          :on-options-press      on-options-press}]))))
+          :bottom-text-component bottom-text-component}]))))
 
 (defn lightbox
   []

src/status_im/common/resources.cljs

@@ -26,8 +26,7 @@
    :discover                      (js/require "../resources/images/ui2/discover.png")
    :invite-friends                (js/require "../resources/images/ui2/invite-friends.png")
    :transaction-progress          (js/require "../resources/images/ui2/transaction-progress.png")
-   :welcome-illustration          (js/require "../resources/images/ui2/welcome_illustration.png")
-   :notifications                 (js/require "../resources/images/ui2/notifications.png")})
+   :welcome-illustration          (js/require "../resources/images/ui2/welcome_illustration.png")})
 
 (def ui-themed
   {:angry-man

src/status_im/common/scroll_page/view.cljs

@@ -4,7 +4,6 @@
     [quo.core :as quo]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
-    [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
     [status-im.common.scroll-page.style :as style]
     [utils.re-frame :as rf]))
@@ -60,7 +59,7 @@
         [rn/view {:style {:margin-top 0}}
          top-nav]
         [quo/page-nav
-         (cond-> {:margin-top     (safe-area/get-top)
+         (cond-> {:margin-top     44
                   :type           :no-title
                   :background     (if (= 1 (reanimated/get-shared-value opacity-animation))
                                     :blur

src/status_im/common/standard_authentication/standard_auth/authorize.cljs

@@ -1,6 +1,6 @@
 (ns status-im.common.standard-authentication.standard-auth.authorize
   (:require
-    [react-native.biometrics :as biometrics]
+    [react-native.touch-id :as biometric]
     [status-im.common.standard-authentication.enter-password.view :as enter-password]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
@@ -39,29 +39,25 @@
         ; to retrigger biometric auth, so they can endlessly repeat this cycle.
         biometrics-login    (fn [on-press-biometrics]
                               (rf/dispatch [:dismiss-keyboard])
-                              (rf/dispatch
-                               [:biometric/authenticate
-                                {:prompt-message (i18n/label :t/biometric-auth-confirm-message)
-                                 :on-success     (fn []
-                                                   (on-close)
-                                                   (rf/dispatch [:standard-auth/on-biometric-success
-                                                                 (handle-auth-success true)]))
-                                 :on-fail        (fn [error]
-                                                   (on-close)
-                                                   (log/error
-                                                    (ex-message error)
-                                                    (-> error ex-data (assoc :code (ex-cause error))))
-                                                   (when on-auth-fail (on-auth-fail error))
-                                                   (password-login {:on-press-biometrics
-                                                                    #(on-press-biometrics
-                                                                      on-press-biometrics)}))}]))]
+                              (biometric/authenticate
+                               {:reason     (i18n/label :t/biometric-auth-confirm-message)
+                                :on-success (fn [_response]
+                                              (on-close)
+                                              (rf/dispatch [:standard-auth/on-biometric-success
+                                                            (handle-auth-success true)]))
+                                :on-fail    (fn [error]
+                                              (on-close)
+                                              (log/error "Authentication Failed. Error:" error)
+                                              (when on-auth-fail (on-auth-fail error))
+                                              (password-login {:on-press-biometrics
+                                                               #(on-press-biometrics
+                                                                 on-press-biometrics)}))}))]
     (if biometric-auth?
-      (-> (biometrics/get-supported-type)
-          (.then (fn [biometric-type]
-                   (if biometric-type
-                     (biometrics-login biometrics-login)
-                     (do
-                       (reset-password)
-                       (password-login {})))))
-          (.catch #(password-login {})))
+      (biometric/get-supported-type
+       (fn [biometric-type]
+         (if biometric-type
+           (biometrics-login biometrics-login)
+           (do
+             (reset-password)
+             (password-login {})))))
       (password-login {}))))

src/status_im/config.cljs

@@ -11,18 +11,11 @@
 
 (goog-define INFURA_TOKEN "")
 (goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9")
-(goog-define OPENSEA_API_KEY "")
-(goog-define RARIBLE_MAINNET_API_KEY "")
-(goog-define RARIBLE_TESTNET_API_KEY "")
-(goog-define ALCHEMY_ETHEREUM_MAINNET_TOKEN "")
-(goog-define ALCHEMY_ETHEREUM_GOERLI_TOKEN "")
-(goog-define ALCHEMY_ETHEREUM_SEPOLIA_TOKEN "")
-(goog-define ALCHEMY_ARBITRUM_MAINNET_TOKEN "")
 (goog-define ALCHEMY_ARBITRUM_GOERLI_TOKEN "")
-(goog-define ALCHEMY_ARBITRUM_SEPOLIA_TOKEN "")
-(goog-define ALCHEMY_OPTIMISM_MAINNET_TOKEN "")
 (goog-define ALCHEMY_OPTIMISM_GOERLI_TOKEN "")
-(goog-define ALCHEMY_OPTIMISM_SEPOLIA_TOKEN "")
+(goog-define ALCHEMY_OPTIMISM_MAINNET_TOKEN "")
+(goog-define ALCHEMY_ARBITRUM_MAINNET_TOKEN "")
+(goog-define OPENSEA_API_KEY "")
 
 (def mainnet-rpc-url (str "https://eth-archival.gateway.pokt.network/v1/lb/" POKT_TOKEN))
 (def goerli-rpc-url (str "https://goerli-archival.gateway.pokt.network/v1/lb/" POKT_TOKEN))
@@ -167,7 +160,7 @@
 
 (def default-kdf-iterations 3200)
 
-(def community-accounts-selection-enabled? (enabled? (get-config :ACCOUNT_SELECTION_ENABLED "0")))
+(def community-accounts-selection-enabled? false)
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
 
 (def wallet-feature-flags

src/status_im/constants.cljs

@@ -153,11 +153,6 @@
 (def ^:const community-token-permission-can-view-and-post-channel 4)
 (def ^:const community-token-permission-become-token-master 5)
 (def ^:const community-token-permission-become-token-owner 6)
-(def ^:const community-role-permissions
-  #{community-token-permission-become-admin
-    community-token-permission-become-member
-    community-token-permission-become-token-master
-    community-token-permission-become-token-owner})
 
 ;; Community rules for joining
 (def ^:const community-rule-ens-only "ens-only")
@@ -383,10 +378,10 @@
 (def ^:const auth-method-biometric-prepare "biometric-prepare")
 (def ^:const auth-method-none "none")
 
-;; NOTE all android biometrics falls under :Biometrics
-(def ^:const biometrics-type-android :Biometrics)
-(def ^:const biometrics-type-touch-id :TouchID)
-(def ^:const biometrics-type-face-id :FaceID)
+(def ^:const biometric-error-user-canceled "USER_CANCELED")
+(def ^:const biometric-error-user-fallback "USER_USER_FALLBACK")
+(def ^:const biometric-error-not-available "NOT_AVAILABLE")
+(def ^:const biometric-error-not-enrolled "NOT_ENROLLED")
 
 (def ^:const onboarding-generating-keys-animation-duration-ms 7000)
 (def ^:const onboarding-generating-keys-navigation-retry-ms 3000)
@@ -410,15 +405,12 @@
 (def ^:const ens-action-type-set-pub-key 2)
 
 ;; wallet
-(def ^:const ethereum-mainnet-chain-id 1)
-(def ^:const ethereum-goerli-chain-id 5)
-(def ^:const ethereum-sepolia-chain-id 11155111)
-(def ^:const arbitrum-mainnet-chain-id 42161)
-(def ^:const arbitrum-goerli-chain-id 421613)
-(def ^:const arbitrum-sepolia-chain-id 421614)
-(def ^:const optimism-mainnet-chain-id 10)
-(def ^:const optimism-goerli-chain-id 420)
-(def ^:const optimism-sepolia-chain-id 11155420)
+(def ^:const mainnet-chain-id 1)
+(def ^:const optimism-chain-id 10)
+(def ^:const optimism-test-chain-id 420)
+(def ^:const arbitrum-chain-id 42161)
+(def ^:const arbitrum-test-chain-id 421613)
+(def ^:const goerli-chain-id 5)
 
 (def ^:const mainnet-short-name "eth")
 (def ^:const optimism-short-name "opt")

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

@@ -66,12 +66,7 @@
                                                   album-messages))
                                    :bottom-text-component
                                    [lightbox/bottom-text-for-lightbox
-                                    first-image]
-                                   :on-options-press (fn [images index]
-                                                       (rf/dispatch [:show-bottom-sheet
-                                                                     {:content (fn [] [lightbox/drawer
-                                                                                       images
-                                                                                       index])}]))}])}
+                                    first-image]}])}
               [fast-image/fast-image
                {:style     (style/image dimensions index portrait? images-count)
                 :source    {:uri (url/replace-port (:image (:content item)) media-server-port)}

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

@@ -57,13 +57,7 @@
                                        :index 0
                                        :insets insets
                                        :bottom-text-component
-                                       [lightbox/bottom-text-for-lightbox message]
-                                       :on-options-press (fn [images index]
-                                                           (rf/dispatch [:show-bottom-sheet
-                                                                         {:content (fn []
-                                                                                     [lightbox/drawer
-                                                                                      images
-                                                                                      index])}]))}])}
+                                       [lightbox/bottom-text-for-lightbox message]}])}
       [fast-image/fast-image
        {:source              {:uri image-local-url}
         :style               (merge dimensions {:border-radius 12})

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

@@ -1,15 +1,10 @@
 (ns status-im.contexts.chat.messenger.messages.content.lightbox.view
   (:require
     [oops.core :as oops]
-    [quo.core :as quo]
-    [react-native.platform :as platform]
     [reagent.core :as reagent]
     [status-im.common.lightbox.constants :as constants]
     [status-im.contexts.chat.messenger.messages.content.lightbox.style :as style]
-    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.url :as url]))
+    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]))
 
 (defn bottom-text-for-lightbox
   [_]
@@ -21,22 +16,3 @@
           :chat-id        chat-id
           :style-override (style/bottom-text expandable-text?)
           :on-layout      #(reset! text-height (oops/oget % "nativeEvent.layout.height"))}]))))
-
-(defn drawer
-  [images index]
-  (let [{:keys [image]} (nth images index)
-        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
-    [quo/action-drawer
-     [[{:icon                :i/save
-        :accessibility-label :save-image
-        :label               (i18n/label :t/save-image-library)
-        :on-press            (fn []
-                               (rf/dispatch [:hide-bottom-sheet])
-                               (rf/dispatch
-                                [:lightbox/save-image-to-gallery
-                                 uri
-                                 #(rf/dispatch [:toasts/upsert
-                                                {:id              :random-id
-                                                 :type            :positive
-                                                 :container-style {:bottom (when platform/android? 20)}
-                                                 :text            (i18n/label :t/photo-saved)}])]))}]]]))

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

@@ -35,7 +35,6 @@
      [quo/drawer-top
       {:type                :context-tag
        :title               (i18n/label :t/addresses-for-permissions)
-       :context-tag-type    :community
        :community-name      name
        :button-icon         :i/info
        :on-button-press     not-implemented/alert

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

@@ -26,7 +26,6 @@
     [:<>
      [quo/drawer-top
       {:type                :context-tag
-       :context-tag-type    :community
        :title               (i18n/label :t/airdrop-addresses)
        :community-name      name
        :button-icon         :i/info

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

@@ -23,8 +23,10 @@
 (defn- view-internal
   [{:keys [theme]}]
   (fn []
-    (let [{:keys [id]}                (rf/sub [:get-screen-params])
-          {:keys [color name images]} (rf/sub [:communities/community id])]
+    (let [{:keys [name
+                  id
+                  images]} (rf/sub [:get-screen-params])
+          {:keys [color]}  (rf/sub [:communities/community id])]
       [rn/safe-area-view {:flex 1}
        [gesture/scroll-view {:style style/container}
         [rn/view style/page-container

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

@@ -1,16 +1,13 @@
 (ns status-im.contexts.communities.discover.style
   (:require
+    [react-native.platform :as platform]
     [status-im.contexts.shell.jump-to.constants :as jump-to.constants]))
 
-(def header-height 56)
-
-(defn screen-title-container
-  [safe-area-top]
-  {:height            header-height
+(def screen-title-container
+  {:height            56
    :padding-vertical  12
    :justify-content   :center
-   :margin-horizontal 20
-   :margin-top        (+ header-height safe-area-top)})
+   :margin-horizontal 20})
 
 (def featured-communities-header
   {:flex-direction  :row
@@ -43,7 +40,7 @@
   [fixed?]
   (merge
    {:padding-vertical 12
-    :height           header-height
+    :height           56
     :background-color :transparent}
    (when-not fixed?
      {:margin-top        12
@@ -63,12 +60,15 @@
   {:align-items     :center
    :justify-content :center})
 
+(def render-communities-container
+  {:margin-top (if platform/ios? 57 104)})
+
 (defn blur-tabs-header
-  [safe-area-top]
+  []
   {:padding-horizontal 20
    :position           :absolute
-   :top                (+ header-height safe-area-top)
-   :height             header-height
+   :top                (if platform/ios? 100 104)
+   :height             56
    :right              0
    :left               0
    :justify-content    :center

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

@@ -5,7 +5,6 @@
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
     [status-im.common.scroll-page.view :as scroll-page]
     [status-im.contexts.communities.actions.community-options.view :as options]
@@ -34,7 +33,7 @@
 (defn screen-title
   []
   [rn/view
-   {:style (style/screen-title-container (safe-area/get-top))}
+   {:style style/screen-title-container}
    [quo/text
     {:accessibility-label :communities-screen-title
      :weight              :semi-bold
@@ -184,6 +183,7 @@
    view-type]
   (fn []
     [rn/view
+     {:style style/render-communities-container}
      [discover-communities-header
       {:selected-tab               selected-tab
        :view-type                  view-type
@@ -196,7 +196,7 @@
   (fn []
     (when (> @scroll-height 360)
       [rn/view
-       {:style (style/blur-tabs-header (safe-area/get-top))}
+       {:style (style/blur-tabs-header)}
        [discover-communities-segments selected-tab true]])))
 
 (defn discover-screen-content
@@ -209,7 +209,6 @@
       [scroll-page/scroll-page
        {:theme            theme
         :on-scroll        #(reset! scroll-height %)
-        :page-nav-props   {:background :blur}
         :navigate-back?   :true
         :height           (if (> @scroll-height 360)
                             208

src/status_im/contexts/communities/events.cljs

@@ -362,16 +362,14 @@
      (rf/merge
       cofx
       {:fx [[:dispatch [:communities/fetch-community deserialized-key]]
-            [:dispatch [:navigate-to :community-overview deserialized-key]]
-            [:dispatch [:communities/update-last-opened-at deserialized-key]]]}
+            [:dispatch [:navigate-to :community-overview deserialized-key]]]}
       (navigation/pop-to-root :shell-stack)))))
 
 (rf/reg-event-fx :communities/navigate-to-community-chat
  (fn [{:keys [db]} [chat-id pop-to-root?]]
    (let [{:keys [community-id]} (get-in db [:chats chat-id])]
      {:fx [(when community-id
-             [:dispatch [:communities/fetch-community community-id]]
-             [:dispatch [:communities/update-last-opened-at community-id]])
+             [:dispatch [:communities/fetch-community community-id]])
            (if pop-to-root?
              [:dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]]
              [:dispatch [:chat/navigate-to-chat chat-id]])]})))
@@ -426,16 +424,3 @@
  (fn [{:keys [db]} [community-id]]
    (when (get-in db [:communities community-id])
      {:db (update-in db [:communities community-id] dissoc :fetching-revealed-accounts)})))
-
-(rf/reg-event-fx :communities/update-last-opened-at
- (fn [_ [community-id]]
-   {:json-rpc/call [{:method     "wakuext_communityUpdateLastOpenedAt"
-                     :params     [community-id]
-                     :on-success #(rf/dispatch [:communities/update-last-opened-at-success community-id
-                                                %])
-                     :on-error   #(log/error (str "failed to update last opened at for community "
-                                                  %))}]}))
-
-(rf/reg-event-fx :communities/update-last-opened-at-success
- (fn [{:keys [db]} [community-id last-opened-at]]
-   {:db (assoc-in db [:communities community-id :last-opened-at] last-opened-at)}))

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

@@ -7,6 +7,7 @@
     [react-native.core :as rn]
     [reagent.core :as reagent]
     [status-im.common.home.actions.view :as actions]
+    [status-im.common.password-authentication.view :as password-authentication]
     [status-im.common.scroll-page.style :as scroll-page.style]
     [status-im.common.scroll-page.view :as scroll-page]
     [status-im.config :as config]
@@ -14,20 +15,38 @@
     [status-im.contexts.communities.actions.chat.view :as chat-actions]
     [status-im.contexts.communities.actions.community-options.view :as options]
     [status-im.contexts.communities.overview.style :as style]
+    [status-im.contexts.communities.overview.utils :as utils]
     [status-im.contexts.communities.utils :as communities.utils]
     [utils.debounce :as debounce]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
-(defn- add-category-height
-  [categories-heights category height]
-  (swap! categories-heights assoc category height))
+(defn preview-user-list
+  [user-list]
+  (when (seq user-list)
+    [rn/view style/preview-user
+     [quo/preview-list
+      {:type   :user
+       :number (count user-list)
+       :size   :size-24}
+      user-list]
+     [quo/text
+      {:accessibility-label :communities-screen-title
+       :style               {:margin-left 8}
+       :size                :label}
+      (utils/join-existing-users-string user-list)]]))
 
-(defn- collapse-category
+(defn add-category-height
+  [categories-heights category height]
+  (swap! categories-heights
+    (fn [heights]
+      (assoc heights category height))))
+
+(defn collapse-category
   [community-id category-id collapsed?]
   (rf/dispatch [:communities/toggle-collapsed-category community-id category-id (not collapsed?)]))
 
-(defn- layout-y
+(defn layout-y
   [event]
   (oops/oget event "nativeEvent.layout.y"))
 
@@ -58,7 +77,7 @@
              {:on-press      on-press
               :on-long-press #(rf/dispatch [:show-bottom-sheet channel-sheet-data])})]]))
 
-(defn- channel-list-component
+(defn channel-list-component
   [{:keys [on-category-layout community-id community-color on-first-channel-height-changed]}
    channels-list]
   [rn/view
@@ -85,7 +104,7 @@
            ^{:key (:id chat)}
            [channel-chat-item community-id community-color chat])])])])
 
-(defn- get-access-type
+(defn get-access-type
   [access]
   (condp = access
     constants/community-no-membership-access   :open
@@ -93,9 +112,17 @@
     constants/community-on-request-access      :request-access
     :unknown-access))
 
-(defn- info-button
+(defn join-gated-community
+  [id]
+  (rf/dispatch [:password-authentication/show
+                {:content (fn [] [password-authentication/view])}
+                {:label    (i18n/label :t/join-open-community)
+                 :on-press #(rf/dispatch [:communities/request-to-join
+                                          {:community-id id :password %}])}]))
+
+(defn info-button
   []
-  [rn/pressable
+  [rn/touchable-without-feedback
    {:on-press
     #(rf/dispatch
       [:show-bottom-sheet
@@ -110,116 +137,119 @@
    [rn/view
     [quo/icon :i/info {:no-color true}]]])
 
-(defn- token-requirements
-  [{:keys [id color]}]
-  (let [{:keys [can-request-access?
-                number-of-hold-tokens tokens
-                highest-permission-role]} (rf/sub [:community/token-gated-overview id])
-        highest-role-text
-        (i18n/label
-         (communities.utils/role->translation-key highest-permission-role :t/member))]
-    [rn/view {:style (style/token-gated-container)}
-     [rn/view
-      {:style {:padding-horizontal 12
-               :flex-direction     :row
-               :align-items        :center
-               :justify-content    :space-between
-               :flex               1}}
-      [quo/text {:weight :medium}
-       (if can-request-access?
-         (i18n/label :t/you-eligible-to-join-as {:role highest-role-text})
-         (i18n/label :t/you-not-eligible-to-join))]
-      [info-button]]
-     (when (pos? number-of-hold-tokens)
-       [quo/text {:style {:padding-horizontal 12 :padding-bottom 18} :size :paragraph-2}
-        (if can-request-access?
-          (i18n/label :t/you-hold-number-of-hold-tokens-of-these
-                      {:number-of-hold-tokens number-of-hold-tokens})
-          (i18n/label :t/you-must-hold))])
-     [quo/token-requirement-list
-      {:tokens   tokens
-       :padding? true}]
-     [quo/button
-      {:on-press            (if config/community-accounts-selection-enabled?
-                              #(rf/dispatch [:open-modal :community-account-selection
-                                             {:community-id id}])
-                              #(rf/dispatch [:open-modal :community-requests-to-join {:id id}]))
-       :accessibility-label :join-community-button
-       :customization-color color
-       :container-style     {:margin-horizontal 12 :margin-top 12 :margin-bottom 12}
-       :disabled?           (not can-request-access?)
-       :icon-left           (if can-request-access? :i/unlocked :i/locked)}
-      (i18n/label :t/join-open-community)]]))
+(defn token-gates
+  []
+  (fn [{:keys [id color]}]
+    (let [{:keys [can-request-access?
+                  number-of-hold-tokens tokens
+                  highest-permission-role]} (rf/sub [:community/token-gated-overview id])
+          highest-role-text
+          (i18n/label
+           (communities.utils/role->translation-key highest-permission-role :t/member))]
+      [rn/view {:style (style/token-gated-container)}
+       [rn/view
+        {:style {:padding-horizontal 12
+                 :flex-direction     :row
+                 :align-items        :center
+                 :justify-content    :space-between
+                 :flex               1}}
+        [quo/text {:weight :medium}
+         (if can-request-access?
+           (i18n/label :t/you-eligible-to-join-as {:role highest-role-text})
+           (i18n/label :t/you-not-eligible-to-join))]
+        [info-button]]
+       (when (pos? number-of-hold-tokens)
+         [quo/text {:style {:padding-horizontal 12 :padding-bottom 18} :size :paragraph-2}
+          (if can-request-access?
+            (i18n/label :t/you-hold-number-of-hold-tokens-of-these
+                        {:number-of-hold-tokens number-of-hold-tokens})
+            (i18n/label :t/you-must-hold))])
+       [quo/token-requirement-list
+        {:tokens   tokens
+         :padding? true}]
+       [quo/button
+        {:on-press
+         (if config/community-accounts-selection-enabled?
+           #(rf/dispatch [:open-modal :community-account-selection {:community-id id}])
+           #(join-gated-community id))
+         :accessibility-label :join-community-button
+         :customization-color color
+         :container-style {:margin-horizontal 12 :margin-top 12 :margin-bottom 12}
+         :disabled? (not can-request-access?)
+         :icon-left (if can-request-access? :i/unlocked :i/locked)}
+        (i18n/label :t/join-open-community)]])))
 
-(defn- join-community
-  [{:keys [id color joined permissions role-permissions? can-join?] :as community}]
-  (let [pending?        (rf/sub [:communities/my-pending-request-to-join id])
-        access-type     (get-access-type (:access permissions))
+(defn join-community
+  [{:keys [joined color permissions token-permissions membership-permissions? id] :as community}
+   pending?]
+  (let [access-type     (get-access-type (:access permissions))
         unknown-access? (= access-type :unknown-access)
         invite-only?    (= access-type :invite-only)]
     [:<>
      (when-not (or joined pending? invite-only? unknown-access?)
-       (if role-permissions?
-         [token-requirements community]
+       (if membership-permissions?
+         [token-gates community]
          [quo/button
-          {:on-press            (if config/community-accounts-selection-enabled?
-                                  #(rf/dispatch [:open-modal :community-account-selection
-                                                 {:community-id id}])
-                                  #(rf/dispatch [:open-modal :community-requests-to-join {:id id}]))
+          {:on-press
+           (if config/community-accounts-selection-enabled?
+             #(rf/dispatch [:open-modal :community-account-selection {:community-id id}])
+             #(rf/dispatch [:open-modal :community-requests-to-join community]))
+
            :accessibility-label :show-request-to-join-screen-button
            :customization-color color
-           :icon-left           :i/communities}
+           :icon-left :i/communities}
           (i18n/label :t/request-to-join)]))
-     (when (not (or pending? role-permissions? can-join?))
+
+     (when (not (or joined pending? token-permissions))
        [quo/text
         {:size   :paragraph-2
          :weight :regular
          :style  style/review-notice}
         (i18n/label :t/community-admins-will-review-your-request)])]))
 
-(defn- status-tag
-  [community-id joined]
-  (let [pending? (rf/sub [:communities/my-pending-request-to-join community-id])]
-    (when (or pending? joined)
-      [rn/view {:style {:position :absolute :top 12 :right 12}}
-       [quo/status-tag
-        {:status {:type (if joined :positive :pending)}
-         :label  (if joined
-                   (i18n/label :t/joined)
-                   (i18n/label :t/pending))}]])))
+(defn status-tag
+  [pending? joined]
+  (when (or pending? joined)
+    [rn/view {:style {:position :absolute :top 12 :right 12}}
+     [quo/status-tag
+      {:status {:type (if joined :positive :pending)}
+       :label  (if joined
+                 (i18n/label :t/joined)
+                 (i18n/label :t/pending))}]]))
 
-(defn- add-handlers
+(defn add-handlers
   [community-id
    joined-or-spectated
    {:keys [id locked?]
     :or   {locked? false}
     :as   chat}]
-  (cond-> chat
-    (and (not locked?) id)
-    (assoc :on-press      (when joined-or-spectated
-                            (fn []
-                              (rf/dispatch [:dismiss-keyboard])
-                              (debounce/dispatch-and-chill
-                               [:communities/navigate-to-community-chat (str community-id id)]
-                               1000)))
-           :on-long-press #(rf/dispatch
-                            [:show-bottom-sheet
-                             {:content (fn []
-                                         [chat-actions/actions chat false])}])
-           :community-id  community-id)))
+  (merge
+   chat
+   (when (and (not locked?) id)
+     {:on-press      (when joined-or-spectated
+                       (fn []
+                         (rf/dispatch [:dismiss-keyboard])
+                         (debounce/dispatch-and-chill
+                          [:communities/navigate-to-community-chat (str community-id id)]
+                          1000)))
+      :on-long-press #(rf/dispatch
+                       [:show-bottom-sheet
+                        {:content (fn []
+                                    [chat-actions/actions chat false])}])
+      :community-id  community-id})))
 
-(defn- add-handlers-to-chats
+(defn add-handlers-to-chats
   [community-id joined-or-spectated chats]
   (mapv (partial add-handlers community-id joined-or-spectated) chats))
 
-(defn- add-handlers-to-categorized-chats
+(defn add-handlers-to-categorized-chats
   [community-id categorized-chats joined-or-spectated]
   (let [add-on-press (partial add-handlers-to-chats community-id joined-or-spectated)]
     (map (fn [[category v]]
            [category (update v :chats add-on-press)])
          categorized-chats)))
 
-(defn- community-header
+(defn community-header
   [title logo description]
   [quo/text-combinations
    {:container-style
@@ -236,11 +266,11 @@
     :title-accessibility-label :community-title
     :description-accessibility-label :community-description}])
 
-(defn- community-content
-  [{:keys [id]}]
-  (rf/dispatch [:communities/check-all-community-channels-permissions id])
-  (fn [{:keys [name description joined spectated images tags color id membership-permissions?]
-        :as   community}
+(defn community-content
+  [community]
+  (rf/dispatch [:communities/check-all-community-channels-permissions (:id community)])
+  (fn [{:keys [name description joined spectated images tags color id token-permissions] :as community}
+       pending?
        {:keys [on-category-layout
                collapsed?
                on-first-channel-height-changed]}]
@@ -249,7 +279,7 @@
       [:<>
        [rn/view {:style style/community-content-container}
         (when-not collapsed?
-          [status-tag id joined])
+          [status-tag pending? joined])
         [community-header name (when collapsed? (get-in images [:thumbnail :uri]))
          (when-not collapsed? description)]
         (when (and (seq tags) (not collapsed?))
@@ -257,8 +287,9 @@
            {:tags            tags
             :last-item-style style/last-community-tag
             :container-style style/community-tag-container}])
-        [join-community community]]
-       (when (or joined (not membership-permissions?))
+        [join-community community pending?]]
+       (when (or (and (seq token-permissions) joined)
+                 (empty? token-permissions))
          [channel-list-component
           {:on-category-layout              on-category-layout
            :community-id                    id
@@ -266,7 +297,7 @@
            :on-first-channel-height-changed on-first-channel-height-changed}
           (add-handlers-to-categorized-chats id chats-by-category joined-or-spectated)])])))
 
-(defn- sticky-category-header
+(defn sticky-category-header
   [_]
   (fn [{:keys [enabled label]}]
     (when enabled
@@ -279,7 +310,7 @@
         {:chevron :left}
         label]])))
 
-(defn- page-nav-right-section-buttons
+(defn page-nav-right-section-buttons
   [id]
   [{:icon-name           :i/options
     :accessibility-label :community-options-for-community
@@ -287,7 +318,7 @@
                            [:show-bottom-sheet
                             {:content (fn [] [options/community-options-bottom-sheet id])}])}])
 
-(defn- pick-first-category-by-height
+(defn pick-first-category-by-height
   [scroll-height first-channel-height categories-heights]
   (->> categories-heights
        (sort-by (comp - second))
@@ -295,7 +326,7 @@
                (and (>= scroll-height (+ height first-channel-height))
                     category)))))
 
-(defn- community-scroll-page
+(defn community-scroll-page
   [{:keys [joined]}]
   (let [scroll-height        (reagent/atom 0)
         categories-heights   (reagent/atom {})
@@ -305,7 +336,7 @@
         ;; from not collapsed to collapsed if the
         ;; user is on this page
         initial-joined?      joined]
-    (fn [{:keys [id name images] :as community}]
+    (fn [{:keys [id name images] :as community} pending?]
       (let [cover          {:uri (get-in images [:banner :uri])}
             logo           {:uri (get-in images [:thumbnail :uri])}
             collapsed?     (and initial-joined? (:joined community))
@@ -332,6 +363,7 @@
                                         @categories-heights)}]}
          [community-content
           community
+          pending?
           {:on-category-layout              (partial add-category-height categories-heights)
            :collapsed?                      collapsed?
            :on-first-channel-height-changed
@@ -341,16 +373,17 @@
              (swap! categories-heights select-keys categories)
              (reset! first-channel-height height))}]]))))
 
-(defn- community-card-page-view
+(defn community-card-page-view
   [id]
   (let [{:keys [id joined]
-         :as   community} (rf/sub [:communities/community id])]
+         :as   community} (rf/sub [:communities/community id])
+        pending?          (rf/sub [:communities/my-pending-request-to-join id])]
     (when community
       (when joined
         (rf/dispatch [:activity-center.notifications/dismiss-community-overview id]))
-      [community-scroll-page community])))
+      [community-scroll-page community pending?])))
 
-(defn view
+(defn overview
   [id]
   (let [id                  (or id (rf/sub [:get-screen-params :community-overview]))
         customization-color (rf/sub [:profile/customization-color])]

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

@@ -10,10 +10,10 @@
     [react-native.platform :as platform]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
-    [status-im.common.profile-picture-picker.view :as profile-picture-picker]
     [status-im.common.validation.profile :as profile-validator]
     [status-im.constants :as c]
     [status-im.contexts.onboarding.create-profile.style :as style]
+    [status-im.contexts.onboarding.select-photo.method-menu.view :as method-menu]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [utils.responsiveness :as responsiveness]))
@@ -144,9 +144,7 @@
                                      (rf/dispatch
                                       [:show-bottom-sheet
                                        {:content (fn []
-                                                   [profile-picture-picker/view
-                                                    {:update-profile-pic-callback on-change-profile-pic
-                                                     :has-picture?                false}])
+                                                   [method-menu/view on-change-profile-pic])
                                         :shell?  true}]))
               :image-picker-props  {:profile-picture     @profile-pic
                                     :full-name           (if (seq @full-name)

src/status_im/contexts/onboarding/select_photo/method_menu/view.cljs

@@ -1,4 +1,4 @@
-(ns status-im.common.profile-picture-picker.view
+(ns status-im.contexts.onboarding.select-photo.method-menu.view
   (:require
     ["react-native-image-crop-picker" :default image-picker]
     [quo.core :as quo]
@@ -59,7 +59,7 @@
    crop-opts))
 
 (defn view
-  [{:keys [update-profile-pic-callback has-picture?]}]
+  [update-profile-pic-callback]
   [quo/action-drawer
    [[{:icon                :i/camera
       :accessibility-label :take-photo-button
@@ -86,15 +86,5 @@
                                :on-allowed  (fn [] (pick-pic update-profile-pic-callback))
                                :on-denied   (fn []
                                               (log/info
-                                               "user has denied permissions to select picture"))}))}
-     (when has-picture?
-       {:accessibility-label :remove-profile-picture
-        :add-divider?        true
-        :danger?             true
-        :blur?               true
-        :icon                :i/delete
-        :label               (i18n/label :t/profile-pic-remove)
-        :on-press            (fn []
-                               (rf/dispatch [:hide-bottom-sheet])
-                               (update-profile-pic-callback nil))})]]])
+                                               "user has denied permissions to select picture"))}))}]]])
 

src/status_im/contexts/profile/config.cljs

@@ -13,17 +13,10 @@
    :openseaAPIKey               config/opensea-api-key
    :poktToken                   config/POKT_TOKEN
    :infuraToken                 config/INFURA_TOKEN
-   :raribleMainnetAPIKey        config/RARIBLE_MAINNET_API_KEY
-   :raribleTestnetAPIKey        config/RARIBLE_TESTNET_API_KEY
-   :alchemyEthereumMainnetToken config/ALCHEMY_ETHEREUM_MAINNET_TOKEN
-   :alchemyEthereumGoerliToken  config/ALCHEMY_ETHEREUM_GOERLI_TOKEN
-   :alchemyEthereumSepoliaToken config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN
    :alchemyOptimismMainnetToken config/ALCHEMY_OPTIMISM_MAINNET_TOKEN
    :alchemyOptimismGoerliToken  config/ALCHEMY_OPTIMISM_GOERLI_TOKEN
-   :alchemyOptimismSepoliaToken config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN
    :alchemyArbitrumMainnetToken config/ALCHEMY_ARBITRUM_MAINNET_TOKEN
-   :alchemyArbitrumGoerliToken  config/ALCHEMY_ARBITRUM_GOERLI_TOKEN
-   :alchemyArbitrumSepoliaToken config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN})
+   :alchemyArbitrumGoerliToken  config/ALCHEMY_ARBITRUM_GOERLI_TOKEN})
 
 (defn create
   []

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

@@ -1,52 +0,0 @@
-(ns status-im.contexts.profile.edit.header.events
-  (:require [clojure.string :as string]
-            [status-im.common.profile-picture-picker.view :as profile-picture-picker]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]))
-
-(rf/reg-event-fx :profile/update-local-picture
- (fn [{:keys [db]} [images]]
-   {:db (if images
-          (assoc-in db [:profile/profile :images] images)
-          (update db :profile/profile dissoc :images))}))
-
-(rf/reg-event-fx :profile/edit-profile-picture-success
- (fn [_ [images]]
-   {:fx [[:dispatch [:profile/update-local-picture (reverse images)]]
-         [:dispatch
-          [:toasts/upsert
-           {:type  :positive
-            :theme :dark
-            :text  (i18n/label :t/profile-picture-added)}]]]}))
-
-(defn edit-profile-picture
-  [{:keys [db]} [picture crop-width crop-height]]
-  (let [key-uid     (get-in db [:profile/profile :key-uid])
-        crop-width  (or crop-width profile-picture-picker/crop-size)
-        crop-height (or crop-height profile-picture-picker/crop-size)
-        path        (string/replace-first picture #"file://" "")]
-    {:fx [[:json-rpc/call
-           [{:method     "multiaccounts_storeIdentityImage"
-             :params     [key-uid path 0 0 crop-width crop-height]
-             :on-success [:profile/edit-profile-picture-success]}]]]}))
-
-(rf/reg-event-fx :profile/edit-picture edit-profile-picture)
-
-(rf/reg-event-fx :profile/delete-profile-picture-success
- (fn [_]
-   {:fx [[:dispatch [:profile/update-local-picture nil]]
-         [:dispatch
-          [:toasts/upsert
-           {:type  :positive
-            :theme :dark
-            :text  (i18n/label :t/profile-picture-removed)}]]]}))
-
-(defn delete-profile-picture
-  [{:keys [db]}]
-  (let [key-uid (get-in db [:profile/profile :key-uid])]
-    {:fx [[:json-rpc/call
-           [{:method     "multiaccounts_deleteIdentityImage"
-             :params     [key-uid]
-             :on-success [:profile/delete-profile-picture-success]}]]]}))
-
-(rf/reg-event-fx :profile/delete-picture delete-profile-picture)

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

@@ -1,27 +0,0 @@
-(ns status-im.contexts.profile.edit.header.events-test
-  (:require [cljs.test :refer [deftest is]]
-            matcher-combinators.test
-            [status-im.common.profile-picture-picker.view :as profile-picture-picker]
-            [status-im.contexts.profile.edit.header.events :as sut]))
-
-(deftest edit-picture-test
-  (let [picture  "new-picture"
-        key-uid  "key-uid"
-        cofx     {:db {:profile/profile {:key-uid key-uid}}}
-        expected {:fx [[:json-rpc/call
-                        [{:method     "multiaccounts_storeIdentityImage"
-                          :params     [key-uid picture 0 0 profile-picture-picker/crop-size
-                                       profile-picture-picker/crop-size]
-                          :on-success [:profile/edit-profile-picture-success]}]]]}]
-    (is (match? expected
-                (sut/edit-profile-picture cofx [picture])))))
-
-(deftest delete-picture-test
-  (let [key-uid  "key-uid"
-        cofx     {:db {:profile/profile {:key-uid key-uid}}}
-        expected {:fx [[:json-rpc/call
-                        [{:method     "multiaccounts_deleteIdentityImage"
-                          :params     [key-uid]
-                          :on-success [:profile/delete-profile-picture-success]}]]]}]
-    (is (match? expected
-                (sut/delete-profile-picture cofx)))))

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

@@ -1,7 +1,7 @@
 (ns status-im.contexts.profile.edit.header.view
   (:require [quo.core :as quo]
             [react-native.core :as rn]
-            [status-im.common.profile-picture-picker.view :as profile-picture-picker]
+            [status-im.common.not-implemented :as not-implemented]
             [status-im.contexts.profile.edit.style :as style]
             [status-im.contexts.profile.utils :as profile.utils]
             [utils.i18n :as i18n]
@@ -9,37 +9,22 @@
 
 (defn view
   []
-  (let [profile               (rf/sub [:profile/profile-with-image])
-        customization-color   (rf/sub [:profile/customization-color])
-        full-name             (profile.utils/displayed-name profile)
-        profile-picture       (profile.utils/photo profile)
-        has-picture?          (rf/sub [:profile/has-picture])
-        on-change-profile-pic (fn [picture]
-                                (if picture
-                                  (rf/dispatch [:profile/edit-picture picture])
-                                  (rf/dispatch [:profile/delete-picture])))]
+  (let [profile         (rf/sub [:profile/profile-with-image])
+        full-name       (profile.utils/displayed-name profile)
+        profile-picture (profile.utils/photo profile)]
     [rn/view
      {:key   :edit-profile
       :style style/screen-container}
      [quo/text-combinations {:title (i18n/label :t/edit-profile)}]
      [rn/view style/avatar-wrapper
       [quo/user-avatar
-       {:full-name           full-name
-        :profile-picture     profile-picture
-        :customization-color customization-color
-        :status-indicator?   false
-        :ring?               true
-        :size                :big}]
+       {:full-name         full-name
+        :profile-picture   profile-picture
+        :status-indicator? false
+        :ring?             true
+        :size              :big}]
       [quo/button
-       {:on-press        (fn []
-                           (rf/dispatch
-                            [:show-bottom-sheet
-                             {:content (fn []
-                                         [profile-picture-picker/view
-                                          {:update-profile-pic-callback on-change-profile-pic
-                                           :has-picture?                has-picture?}])
-                              :theme   :dark
-                              :shell?  true}]))
+       {:on-press        not-implemented/alert
         :container-style style/camera-button
         :icon-only?      true
         :type            :grey

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

@@ -2,21 +2,17 @@
   (:require [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
-(rf/reg-event-fx :profile/edit-profile-name-success
- (fn [_]
-   {:fx [[:dispatch [:navigate-back]]
-         [:dispatch
-          [:toasts/upsert
-           {:type  :positive
-            :theme :dark
-            :text  (i18n/label :t/name-updated)}]]]}))
-
 (defn edit-profile-name
   [{:keys [db]} [name]]
   {:db (assoc-in db [:profile/profile :display-name] name)
    :fx [[:json-rpc/call
          [{:method     "wakuext_setDisplayName"
            :params     [name]
-           :on-success [:profile/edit-profile-name-success]}]]]})
+           :on-success (fn []
+                         (rf/dispatch [:navigate-back])
+                         (rf/dispatch [:toasts/upsert
+                                       {:type  :positive
+                                        :theme :dark
+                                        :text  (i18n/label :t/name-updated)}]))}]]]})
 
 (rf/reg-event-fx :profile/edit-name edit-profile-name)

src/status_im/contexts/profile/edit/name/events_test.cljs

@@ -10,6 +10,6 @@
                   :fx [[:json-rpc/call
                         [{:method     "wakuext_setDisplayName"
                           :params     [name]
-                          :on-success [:profile/edit-profile-name-success]}]]]}]
+                          :on-success fn?}]]]}]
     (is (match? expected
                 (sut/edit-profile-name cofx [new-name])))))

src/status_im/contexts/profile/events.cljs

@@ -3,7 +3,6 @@
     [legacy.status-im.data-store.settings :as data-store.settings]
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
-    [status-im.contexts.profile.edit.header.events]
     [status-im.contexts.profile.edit.name.events]
     [status-im.contexts.profile.login.events :as profile.login]
     [status-im.contexts.profile.rpc :as profile.rpc]

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

@@ -16,6 +16,7 @@
     [status-im.common.log :as logging]
     [status-im.common.universal-links :as universal-links]
     [status-im.config :as config]
+    [status-im.constants :as constants]
     [status-im.contexts.chat.contacts.events :as contacts]
     [status-im.contexts.chat.messenger.messages.link-preview.events :as link-preview]
     [status-im.contexts.profile.config :as profile.config]
@@ -177,11 +178,11 @@
 (rf/defn login-with-biometric-if-available
   {:events [:profile.login/login-with-biometric-if-available]}
   [_ key-uid]
-  {:biometric/check-if-available [key-uid
-                                  #(rf/dispatch [:profile.login/check-biometric-success % key-uid])]})
+  {:keychain/get-auth-method [key-uid
+                              #(rf/dispatch [:profile.login/get-auth-method-success % key-uid])]})
 
-(rf/defn check-biometric-success
-  {:events [:profile.login/check-biometric-success]}
+(rf/defn get-auth-method-success
+  {:events [:profile.login/get-auth-method-success]}
   [{:keys [db]} auth-method key-uid]
   (merge {:db (assoc db :auth-method auth-method)}
          (when (= auth-method keychain/auth-method-biometric)
@@ -193,6 +194,7 @@
                                         :on-fail    #(rf/dispatch
                                                       [:profile.login/biometric-auth-fail %])}]))}})))
 
+;; result of :keychain/get-auth-method above
 (rf/defn get-user-password-success
   {:events [:profile.login/get-user-password-success]}
   [{:keys [db] :as cofx} password]
@@ -207,18 +209,22 @@
  :profile.login/biometric-success
  (fn [{:keys [db]}]
    (let [key-uid (get-in db [:profile/login :key-uid])]
-     {:keychain/get-user-password [key-uid
-                                   #(rf/dispatch [:profile.login/get-user-password-success %])]})))
+     {:db db
+      :fx [[:biometric/reset-not-enrolled-error key-uid]
+           [:keychain/get-user-password
+            [key-uid #(rf/dispatch [:profile.login/get-user-password-success %])]]]})))
 
 (rf/reg-event-fx
  :profile.login/biometric-auth-fail
- (fn [_ [error]]
-   (log/error (ex-message error)
-              (-> error
-                  ex-data
-                  (assoc :code  (ex-cause error)
-                         :event :profile.login/biometric-auth-fail)))
-   {:dispatch [:biometric/show-message error]}))
+ (fn [{:keys [db]} [code]]
+   (let [key-uid (get-in db [:profile/login :key-uid])]
+     {:db db
+      :fx [(if (= code constants/biometric-error-not-enrolled)
+             [:biometric/supress-not-enrolled-error
+              [key-uid
+               [:biometric/show-message code]]]
+             [:dispatch [:biometric/show-message code]])]})))
+
 
 (rf/defn verify-database-password
   {:events [:profile.login/verify-database-password]}

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

@@ -70,15 +70,6 @@
                                        {:on-success on-success}])
              :on-cancel nil}]]})))
 
-(rf/reg-event-fx :profile.settings/toggle-sepolia-test-network
- (fn [{:keys [db]}]
-   (let [value      (get-in db [:profile/profile :is-sepolia-enabled?])
-         on-success #(rf/dispatch [:wallet/initialize])]
-     {:fx [[:dispatch
-            [:profile.settings/profile-update :is-sepolia-enabled?
-             (not value)
-             {:on-success on-success}]]]})))
-
 (rf/defn change-preview-privacy-flag
   {:events [:profile.settings/change-preview-privacy]}
   [{:keys [db] :as cofx} private?]
@@ -89,6 +80,7 @@
              (boolean private?)
              {})))
 
+
 (rf/defn change-profile-pictures-show-to
   {:events [:profile.settings/change-profile-pictures-show-to]}
   [cofx id]

src/status_im/contexts/shell/jump_to/components/floating_screens/view.cljs

@@ -15,7 +15,7 @@
 
 (def screens-map
   {shell.constants/chat-screen                 chat/chat
-   shell.constants/community-screen            communities.overview/view
+   shell.constants/community-screen            communities.overview/overview
    shell.constants/discover-communities-screen communities.discover/view})
 
 (defn f-screen

src/status_im/contexts/shell/share/profile/view.cljs

@@ -15,12 +15,12 @@
 (defn profile-tab
   []
   (let [{:keys [emoji-hash
+                customization-color
                 universal-profile-url]
-         :as   profile}     (rf/sub [:profile/profile-with-image])
-        customization-color (rf/sub [:profile/customization-color])
-        abbreviated-url     (address/get-abbreviated-profile-url
-                             universal-profile-url)
-        emoji-hash-string   (string/join emoji-hash)]
+         :as   profile}   (rf/sub [:profile/profile])
+        abbreviated-url   (address/get-abbreviated-profile-url
+                           universal-profile-url)
+        emoji-hash-string (string/join emoji-hash)]
     [rn/scroll-view
      {:content-container-style {:padding-bottom 16}}
      [rn/view {:style style/qr-code-container}

src/status_im/contexts/wallet/account/bridge/view.cljs

@@ -13,14 +13,6 @@
   [item]
   {:source (quo.resources/get-network (:network-name item))})
 
-(defn- bridge-token-component
-  []
-  (fn [token]
-    (let [on-press #(rf/dispatch [:wallet/select-bridge-to
-                                  {:token    token
-                                   :stack-id :wallet-bridge}])]
-      [quo/token-network (assoc token :on-press on-press)])))
-
 (defn view
   []
   (let [networks       (rf/sub [:wallet/network-details])
@@ -38,5 +30,5 @@
        :placeholder     (i18n/label :t/search-assets)}]
      [rn/flat-list
       {:data                    (temp/bridge-token-list networks-logos)
-       :render-fn               bridge-token-component
+       :render-fn               quo/token-network
        :content-container-style style/list-content-container}]]))

src/status_im/contexts/wallet/account/bridge_to/style.cljs

@@ -1,9 +0,0 @@
-(ns status-im.contexts.wallet.account.bridge-to.style)
-
-(def header-container
-  {:padding-horizontal 20
-   :padding-vertical   12})
-
-(def content-container
-  {:padding-horizontal 8})
-

src/status_im/contexts/wallet/account/bridge_to/view.cljs

@@ -1,64 +0,0 @@
-(ns status-im.contexts.wallet.account.bridge-to.view
-  (:require
-    [clojure.string :as string]
-    [quo.core :as quo]
-    [quo.foundations.resources :as quo.resources]
-    [quo.theme :as quo.theme]
-    [react-native.core :as rn]
-    [status-im.contexts.wallet.account.bridge-to.style :as style]
-    [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
-    [status-im.contexts.wallet.common.utils :as utils]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
-
-(defn- bridge-token-component
-  []
-  (fn [{:keys [chain-id network-name]} token]
-    (let [network           (rf/sub [:wallet/network-details-by-chain-id chain-id])
-          currency          (rf/sub [:profile/currency])
-          currency-symbol   (rf/sub [:profile/currency-symbol])
-          all-balances      (:balances-per-chain token)
-          balance-for-chain (utils/get-balance-for-chain all-balances chain-id)
-          crypto-formatted  (or (:balance balance-for-chain) "0.00")
-          fiat-value        (utils/token-fiat-value currency
-                                                    (or (:balance balance-for-chain) 0)
-                                                    token)
-          fiat-formatted    (utils/get-standard-fiat-format crypto-formatted currency-symbol fiat-value)]
-      [quo/network-list
-       {:label         (name network-name)
-        :network-image (quo.resources/get-network (:network-name network))
-        :token-value   (str crypto-formatted " " (:symbol token))
-        :fiat-value    fiat-formatted}])))
-
-(defn- view-internal
-  []
-  (let [send-bridge-data (rf/sub [:wallet/wallet-send])
-        network-details  (rf/sub [:wallet/network-details])
-        account          (rf/sub [:wallet/current-viewing-account])
-        token            (:token send-bridge-data)
-        token-symbol     (:symbol token)
-        tokens           (:tokens account)
-        mainnet          (first network-details)
-        layer-2-networks (rest network-details)
-        account-token    (some #(when (= token-symbol (:symbol %)) %) tokens)]
-
-
-    [rn/view
-     [account-switcher/view
-      {:on-press            #(rf/dispatch [:navigate-back-within-stack :wallet-bridge-to])
-       :icon-name           :i/arrow-left
-       :accessibility-label :top-bar}]
-     [quo/text-combinations
-      {:container-style style/header-container
-       :title           (i18n/label :t/bridge-to {:name (string/upper-case (str (:label token)))})}]
-     [rn/view style/content-container
-      [bridge-token-component (assoc mainnet :network-name :t/mainnet) account-token]]
-
-     [quo/divider-label (i18n/label :t/layer-2)]
-     [rn/flat-list
-      {:data                    layer-2-networks
-       :render-fn               (fn [network]
-                                  [bridge-token-component network account-token])
-       :content-container-style style/content-container}]]))
-
-(def view (quo.theme/with-theme view-internal))

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

@@ -3,15 +3,12 @@
     [quo.core :as quo]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [react-native.platform :as platform]
-    [react-native.svg :as svg]
     [reagent.core :as reagent]
     [status-im.common.scroll-page.view :as scroll-page]
     [status-im.contexts.wallet.collectible.style :as style]
     [status-im.contexts.wallet.collectible.tabs.view :as tabs]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.url :as url]))
+    [utils.re-frame :as rf]))
 
 (defn header
   [collectible-name collection-name collection-image-url]
@@ -73,49 +70,19 @@
       :accessibility-label :share-details
       :label               (i18n/label :t/share-details)}]]])
 
-(defn options-drawer
-  [images index]
-  (let [{:keys [image]} (nth images index)
-        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
-    [quo/action-drawer
-     [[{:icon                :i/link
-        :accessibility-label :view-on-etherscan
-        :label               (i18n/label :t/view-on-eth)}]
-      [{:icon                :i/save
-        :accessibility-label :save-image
-        :label               (i18n/label :t/save-image-to-photos)
-        :on-press            (fn []
-                               (rf/dispatch [:hide-bottom-sheet])
-                               (rf/dispatch
-                                [:lightbox/save-image-to-gallery
-                                 uri
-                                 #(rf/dispatch [:toasts/upsert
-                                                {:id              :random-id
-                                                 :type            :positive
-                                                 :container-style {:bottom (when platform/android? 20)}
-                                                 :text            (i18n/label :t/photo-saved)}])]))}]
-      [{:icon                :i/share
-        :accessibility-label :share-collectible
-        :label               (i18n/label :t/share-collectible)
-        :right-icon          :i/external}]]]))
-
 (defn view-internal
   [{:keys [theme] :as _props}]
   (let [selected-tab  (reagent/atom :overview)
         on-tab-change #(reset! selected-tab %)]
     (fn []
-      (let [collectible                 (rf/sub [:wallet/last-collectible-details])
-            animation-shared-element-id (rf/sub [:animation-shared-element-id])
-            {:keys [id
-                    preview-url
-                    collection-data
-                    collectible-data]}  collectible
-            {svg?        :svg?
-             preview-uri :uri}          preview-url
-            token-id                    (:token-id id)
+      (let [collectible                  (rf/sub [:wallet/last-collectible-details])
+            animation-shared-element-id  (rf/sub [:animation-shared-element-id])
+            {:keys [collectible-data preview-url
+                    collection-data id]} collectible
+            token-id                     (:token-id id)
             {collection-image :image-url
-             collection-name  :name}    collection-data
-            {collectible-name :name}    collectible-data]
+             collection-name  :name}     collection-data
+            {collectible-name :name}     collectible-data]
         [scroll-page/scroll-page
          {:navigate-back? true
           :height         148
@@ -127,45 +94,29 @@
                                                        [:show-bottom-sheet
                                                         {:content collectible-actions-sheet
                                                          :theme   theme}])}]
-                           :picture     preview-uri}}
+                           :picture     preview-url}}
          [rn/view {:style style/container}
           [rn/view {:style style/preview-container}
            [rn/touchable-opacity
             {:active-opacity 1
-             :on-press       (fn []
-                               (if svg?
-                                 (js/alert "Can't visualize SVG images in lightbox")
-                                 (rf/dispatch
-                                  [:lightbox/navigate-to-lightbox
-                                   token-id
-                                   {:images           [{:image        preview-uri
-                                                        :image-width  300 ; collectibles don't have
-                                                                          ; width/height but we need
-                                                                          ; to pass something
-                                                        :image-height 300 ; without it animation
-                                                                          ; doesn't work smoothly
-                                                                          ; and :border-radius not
-                                                                          ; applied
-                                                        :id           token-id
-                                                        :header       collectible-name
-                                                        :description  collection-name}]
-                                    :index            0
-                                    :on-options-press (fn [images index]
-                                                        (rf/dispatch [:show-bottom-sheet
-                                                                      {:content (fn []
-                                                                                  [options-drawer
-                                                                                   images
-                                                                                   index])}]))}])))}
-            (if svg?
-              [rn/view
-               {:style     (assoc style/preview :overflow :hidden)
-                :native-ID (when (= animation-shared-element-id token-id)
-                             :shared-element)}
-               [svg/svg-uri (assoc style/preview :uri preview-uri)]]
-              [rn/image
-               {:source    preview-uri
-                :style     style/preview
-                :native-ID (when (= animation-shared-element-id token-id) :shared-element)}])]]
+             :on-press       #(rf/dispatch [:lightbox/navigate-to-lightbox
+                                            token-id
+                                            {:images [{:image        preview-url
+                                                       :image-width  300 ; collectibles don't have
+                                                                         ; width/height but we need
+                                                                         ; to pass something
+                                                       :image-height 300 ; without it animation
+                                                                         ; doesn't work smoothly and
+                                                                         ; :border-radius not
+                                                                         ; applied
+                                                       :id           token-id
+                                                       :header       collectible-name
+                                                       :description  collection-name}]
+                                             :index  0}])}
+            [rn/image
+             {:source    preview-url
+              :style     style/preview
+              :native-ID (when (= animation-shared-element-id token-id) :shared-element)}]]]
           [header collectible-name collection-name collection-image]
           [cta-buttons]
           [quo/tabs

src/status_im/contexts/wallet/common/sheets/account_options/view.cljs

@@ -32,12 +32,13 @@
 
 (defn- options
   [{:keys [theme show-account-selector? options-height]}]
-  (let [{:keys [name color emoji address watch-only?]} (rf/sub [:wallet/current-viewing-account])
-        network-preference-details                     (rf/sub [:wallet/network-preference-details])
-        multichain-address                             (utils/get-multichain-address
-                                                        network-preference-details
-                                                        address)
-        share-title                                    (str name " " (i18n/label :t/address))]
+  (let [{:keys [name color emoji address watch-only?
+                default-account?]} (rf/sub [:wallet/current-viewing-account])
+        network-preference-details (rf/sub [:wallet/network-preference-details])
+        multichain-address         (utils/get-multichain-address
+                                    network-preference-details
+                                    address)
+        share-title                (i18n/label :t/share-address-title {:address name})]
     [rn/view
      {:on-layout #(reset! options-height (oops/oget % "nativeEvent.layout.height"))
       :style     (when show-account-selector? style/options-container)}
@@ -92,15 +93,16 @@
                                  #(rf/dispatch [:wallet/share-account
                                                 {:title share-title :content multichain-address}])
                                  600))}
-        {:add-divider?        (not show-account-selector?)
-         :icon                :i/delete
-         :accessibility-label :remove-account
-         :label               (i18n/label :t/remove-account)
-         :danger?             true
-         :on-press            #(rf/dispatch [:show-bottom-sheet
-                                             {:content
-                                              (fn []
-                                                [remove-account/view])}])}]]]
+        (when-not default-account?
+          {:add-divider?        (not show-account-selector?)
+           :icon                :i/delete
+           :accessibility-label :remove-account
+           :label               (i18n/label :t/remove-account)
+           :danger?             true
+           :on-press            #(rf/dispatch [:show-bottom-sheet
+                                               {:content
+                                                (fn []
+                                                  [remove-account/view])}])})]]]
      (when show-account-selector?
        [:<>
         [quo/divider-line {:container-style style/divider-label}]

src/status_im/contexts/wallet/common/sheets/remove_account/view.cljs

@@ -11,13 +11,17 @@
     [utils.re-frame :as rf]))
 
 (defn- footer
-  [{:keys [submit-disabled?]}]
+  [{:keys [address submit-disabled? toast-message]}]
   [quo/bottom-actions
    {:actions             :2-actions
     :customization-color :danger
     :button-one-label    (i18n/label :t/remove)
-    :button-one-props    {:on-press  #(js/alert "Will be implemented")
-                          :type      :danger
+    :button-one-props    {:on-press
+                          (fn []
+                            (rf/dispatch [:wallet/remove-account
+                                          {:address       address
+                                           :toast-message toast-message}]))
+                          :type :danger
                           :disabled? submit-disabled?}
     :button-two-label    (i18n/label :t/cancel)
     :button-two-props    {:on-press #(rf/dispatch [:hide-bottom-sheet])
@@ -26,7 +30,7 @@
 (defn- recovery-phase-flow
   []
   (let [confirmed? (reagent/atom false)]
-    (fn [{:keys [name emoji path color] :as _account}]
+    (fn [{:keys [address name emoji path color] :as _account}]
       (let [formatted-path (utils/format-derivation-path path)]
         [:<>
          [quo/drawer-top
@@ -64,10 +68,13 @@
             :checked?            @confirmed?
             :on-change           #(swap! confirmed? not)}]
           [quo/text (i18n/label :t/remove-account-confirmation)]]
-         [footer {:submit-disabled? (not @confirmed?)}]]))))
+         [footer
+          {:submit-disabled? (not @confirmed?)
+           :address          address
+           :toast-message    (i18n/label :t/account-removed)}]]))))
 
 (defn- watched-address-flow
-  [{:keys [name emoji color] :as _account}]
+  [{:keys [address name emoji color] :as _account}]
   [:<>
    [quo/drawer-top
     {:title               (i18n/label :t/remove-watched-address-title)
@@ -79,13 +86,17 @@
    [rn/view {:style style/desc-container}
     [quo/text {:weight :medium}
      (i18n/label :t/remove-watched-address-desc)]]
-   [footer {:submit-disabled? false}]])
+   [footer
+    {:submit-disabled? false
+     :address          address
+     :toast-message    (i18n/label :t/watched-account-removed)}]])
 
 (defn- view-internal
   []
   (let [{:keys [type] :as account} (rf/sub [:wallet/current-viewing-account])]
     (case type
       :generated [recovery-phase-flow account]
-      :watch     [watched-address-flow account])))
+      :watch     [watched-address-flow account]
+      nil)))
 
 (def view (quo.theme/with-theme view-internal))

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

@@ -52,7 +52,6 @@
     :fiat-value          "€0.00"
     :networks            networks-list
     :state               :default
-    :symbol              "STT"
     :customization-color :blue}
    {:token               :eth
     :label               "Ethereum"
@@ -60,7 +59,6 @@
     :fiat-value          "€0.00"
     :networks            networks-list
     :state               :default
-    :symbol              "ETH"
     :customization-color :blue}
    {:token               :dai
     :label               "Dai"
@@ -68,7 +66,6 @@
     :fiat-value          "€0.00"
     :networks            networks-list
     :state               :default
-    :symbol              "DAI"
     :customization-color :blue}])
 
 (def secret-phrase

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

@@ -41,12 +41,10 @@
 
 (defn view
   [item]
-  (let [{:keys [watch-only?]} (rf/sub [:wallet/current-viewing-account])]
-    [quo/token-value
-     (cond-> item
-       (not watch-only?)
-       (assoc :on-long-press
-              #(rf/dispatch
-                [:show-bottom-sheet
-                 {:content       (fn [] [token-value-drawer item])
-                  :selected-item (fn [] [quo/token-value item])}])))]))
+  [quo/token-value
+   (merge item
+          {:on-long-press
+           #(rf/dispatch
+             [:show-bottom-sheet
+              {:content       (fn [] [token-value-drawer item])
+               :selected-item (fn [] [quo/token-value item])}])})])

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

@@ -74,13 +74,11 @@
 (defn get-standard-crypto-format
   "For full details: https://github.com/status-im/status-mobile/issues/18225"
   [{:keys [market-values-per-currency]} token-units]
-  (if (or (nil? token-units)
-          (nil? market-values-per-currency)
-          (money/equal-to token-units 0))
-    "0"
-    (let [price          (-> market-values-per-currency :usd :price)
-          one-cent-value (if (pos? price) (/ 0.01 price) 0)
-          decimals-count (calc-max-crypto-decimals one-cent-value)]
+  (let [price          (get-in market-values-per-currency [:usd :price])
+        one-cent-value (if (pos? price) (/ 0.01 price) 0)
+        decimals-count (calc-max-crypto-decimals one-cent-value)]
+    (if (money/equal-to token-units 0)
+      "0"
       (if (< token-units one-cent-value)
         (str "<" (remove-trailing-zeroes (.toFixed one-cent-value decimals-count)))
         (remove-trailing-zeroes (.toFixed token-units decimals-count))))))
@@ -108,16 +106,6 @@
         total-units-in-all-chains (total-token-units-in-all-chains token)]
     (money/crypto->fiat total-units-in-all-chains price)))
 
-(defn token-fiat-value
-  "Returns the fiat value for a single token on a given network."
-  [currency raw-balance {:keys [market-values-per-currency]}]
-  (let [price (or (get-in market-values-per-currency
-                          [currency :price])
-                  (get-in market-values-per-currency
-                          [constants/profile-default-currency :price])
-                  0)]
-    (money/crypto->fiat raw-balance price)))
-
 (defn calculate-balance-for-account
   [currency {:keys [tokens] :as _account}]
   (->> tokens
@@ -190,20 +178,17 @@
     address))
 
 (def id->network
-  {constants/ethereum-mainnet-chain-id :ethereum
-   constants/ethereum-goerli-chain-id  :ethereum
-   constants/ethereum-sepolia-chain-id :ethereum
-   constants/optimism-mainnet-chain-id :optimism
-   constants/optimism-goerli-chain-id  :optimism
-   constants/optimism-sepolia-chain-id :optimism
-   constants/arbitrum-mainnet-chain-id :arbitrum
-   constants/arbitrum-goerli-chain-id  :arbitrum
-   constants/arbitrum-sepolia-chain-id :arbitrum})
+  {constants/mainnet-chain-id       :ethereum
+   constants/goerli-chain-id        :ethereum
+   constants/optimism-chain-id      :optimism
+   constants/optimism-test-chain-id :optimism
+   constants/arbitrum-chain-id      :arbitrum
+   constants/arbitrum-test-chain-id :arbitrum})
 
 (def short-name->id
-  {:eth  constants/ethereum-mainnet-chain-id
-   :opt  constants/optimism-mainnet-chain-id
-   :arb1 constants/arbitrum-mainnet-chain-id})
+  {:eth  constants/mainnet-chain-id
+   :opt  constants/optimism-chain-id
+   :arb1 constants/arbitrum-chain-id})
 
 (defn get-standard-fiat-format
   [crypto-value currency-symbol fiat-value]
@@ -246,7 +231,3 @@
   [input-string]
   (let [split-result (string/split input-string #"0x")]
     [(first split-result) (str "0x" (second split-result))]))
-
-(defn get-balance-for-chain
-  [data chain-id]
-  (some #(when (= chain-id (:chain-id %)) %) (vals data)))

src/status_im/contexts/wallet/data_store.cljs

@@ -33,6 +33,7 @@
       (update :test-preferred-chain-ids chain-ids-string->set)
       (update :type keyword)
       (update :color #(if (seq %) (keyword %) constants/account-default-customization-color))
+      (assoc :default-account? (:wallet account))
       add-keys-to-account))
 
 (defn rpc->accounts
@@ -49,7 +50,8 @@
                         :color                    :colorId})
       (update :prodPreferredChainIds chain-ids-set->string)
       (update :testPreferredChainIds chain-ids-set->string)
-      (dissoc :watch-only?)))
+      (dissoc :watch-only?)
+      (dissoc :default-account?)))
 
 (defn- rpc->balances-per-chain
   [token]

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

@@ -51,7 +51,7 @@
                                               :updated-key :name
                                               :new-value   @edited-account-name}))]
     (fn []
-      (let [{:keys [name emoji address color watch-only?]
+      (let [{:keys [name emoji address color watch-only? default-account?]
              :as   account}         (rf/sub [:wallet/current-viewing-account])
             network-details         (rf/sub [:wallet/network-preference-details])
             test-networks-enabled?  (rf/sub [:profile/test-networks-enabled?])
@@ -62,13 +62,14 @@
             button-disabled?        (or (nil? @edited-account-name)
                                         (= name @edited-account-name))]
         [create-or-edit-account/view
-         {:page-nav-right-side [{:icon-name :i/delete
-                                 :on-press
-                                 (fn []
-                                   (rf/dispatch [:show-bottom-sheet
-                                                 {:content
-                                                  (fn []
-                                                    [remove-account/view])}]))}]
+         {:page-nav-right-side [(when-not default-account?
+                                  {:icon-name :i/delete
+                                   :on-press
+                                   (fn []
+                                     (rf/dispatch [:show-bottom-sheet
+                                                   {:content
+                                                    (fn []
+                                                      [remove-account/view])}]))})]
           :account-name        account-name
           :account-emoji       emoji
           :account-color       color

src/status_im/contexts/wallet/events.cljs

@@ -7,6 +7,7 @@
     [status-im.contexts.wallet.events.collectibles]
     [status-im.contexts.wallet.item-types :as item-types]
     [taoensso.timbre :as log]
+    [utils.collection]
     [utils.ethereum.chain :as chain]
     [utils.ethereum.eip.eip55 :as eip55]
     [utils.i18n :as i18n]
@@ -51,10 +52,9 @@
          wallet-db           (get db :wallet)
          new-account?        (:new-account? wallet-db)
          navigate-to-account (:navigate-to-account wallet-db)]
-     {:db (reduce (fn [db {:keys [address] :as account}]
-                    (assoc-in db [:wallet :accounts address] account))
-                  db
-                  (data-store/rpc->accounts wallet-accounts))
+     {:db (assoc-in db
+           [:wallet :accounts]
+           (utils.collection/index-by :address (data-store/rpc->accounts wallet-accounts)))
       :fx [[:dispatch [:wallet/get-wallet-token]]
            [:dispatch [:wallet/request-collectibles {:start-at-index 0 :new-request? true}]]
            (when new-account?
@@ -84,6 +84,30 @@
                                    {:error %
                                     :event :wallet/save-account})}]]]}))
 
+(rf/reg-event-fx
+ :wallet/show-account-deleted-toast
+ (fn [_ [toast-message]]
+   {:fx [[:dispatch [:toasts/upsert {:type :positive :text toast-message}]]]}))
+
+(rf/reg-event-fx
+ :wallet/remove-account-success
+ (fn [_ [toast-message _]]
+   {:fx [[:dispatch [:hide-bottom-sheet]]
+         [:dispatch [:pop-to-root :shell-stack]]
+         [:dispatch [:wallet/get-accounts]]
+         [:dispatch [:wallet/show-account-deleted-toast toast-message]]]}))
+
+(rf/reg-event-fx
+ :wallet/remove-account
+ (fn [_ [{:keys [address toast-message]}]]
+   {:fx [[:json-rpc/call
+          [{:method     "accounts_deleteAccount"
+            :params     [address]
+            :on-success [:wallet/remove-account-success toast-message]
+            :on-error   #(log/info "failed to remove account "
+                                   {:error %
+                                    :event :wallet/remove-account})}]]]}))
+
 (rf/reg-event-fx
  :wallet/get-wallet-token
  (fn [{:keys [db]}]
@@ -133,10 +157,10 @@
 
 (rf/reg-event-fx :wallet/create-derived-addresses
  (fn [{:keys [db]} [{:keys [sha3-pwd path]} on-success]]
-   (let [{:keys [wallet-root-address]} (:profile/profile db)]
+   (let [{:keys [address]} (:profile/profile db)]
      {:fx [[:json-rpc/call
             [{:method     "wallet_getDerivedAddresses"
-              :params     [sha3-pwd wallet-root-address [path]]
+              :params     [sha3-pwd address [path]]
               :on-success on-success
               :on-error   #(log/info "failed to derive address " %)}]]]})))
 
@@ -178,11 +202,6 @@
                                     (first derived-address-details)]))]
      {:fx [[:dispatch [:wallet/create-derived-addresses account-details on-success]]]})))
 
-(rf/reg-event-fx :wallet/select-bridge-to
- (fn [{:keys [db]} [{:keys [token stack-id]}]]
-   {:db (assoc-in db [:wallet :ui :send :token] token)
-    :fx [[:navigate-to-within-stack [:wallet-bridge-to stack-id]]]}))
-
 (rf/reg-event-fx
  :wallet/get-ethereum-chains
  (fn [_]

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

@@ -24,11 +24,9 @@
 
 (defn displayable-collectible?
   [collectible]
-  (let [{{:keys [image-url animation-url]} :collectible-data
-         {collection-image-url :image-url} :collection-data} collectible]
+  (let [{:keys [image-url animation-url]} (:collectible-data collectible)]
     (or (not (string/blank? animation-url))
-        (not (string/blank? image-url))
-        (not (string/blank? collection-image-url)))))
+        (not (string/blank? image-url)))))
 
 (defn- add-collectibles-to-accounts
   [accounts collectibles]

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

@@ -3,12 +3,10 @@
     [camel-snake-kebab.core :as csk]
     [camel-snake-kebab.extras :as cske]
     [clojure.string :as string]
-    [native-module.core :as native-module]
     [status-im.constants :as constants]
     [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.send.utils :as send-utils]
     [taoensso.timbre :as log]
-    [utils.address :as address]
     [utils.money :as money]
     [utils.number]
     [utils.re-frame :as rf]))
@@ -58,14 +56,11 @@
  (fn [{:keys [db]}]
    {:db (update-in db [:wallet :ui :send] dissoc :recipient :to-address)}))
 
-(rf/reg-event-fx
- :wallet/select-send-address
+(rf/reg-event-fx :wallet/select-send-address
  (fn [{:keys [db]} [{:keys [address token recipient stack-id]}]]
    (let [[prefix to-address] (utils/split-prefix-and-address address)
          prefix-seq          (string/split prefix #":")
-         selected-networks   (->> prefix-seq
-                                  (remove string/blank?)
-                                  (mapv #(utils/short-name->id (keyword %))))]
+         selected-networks   (mapv #(utils/short-name->id (keyword %)) prefix-seq)]
      {:db (-> db
               (assoc-in [:wallet :ui :send :recipient] (or recipient address))
               (assoc-in [:wallet :ui :send :to-address] to-address)
@@ -76,20 +71,18 @@
               [:wallet-send-input-amount stack-id]
               [:wallet-select-asset stack-id])]]})))
 
-(rf/reg-event-fx
- :wallet/update-receiver-networks
+(rf/reg-event-fx :wallet/update-receiver-networks
  (fn [{:keys [db]} [selected-networks]]
    {:db (assoc-in db [:wallet :ui :send :selected-networks] selected-networks)}))
 
 (rf/reg-event-fx :wallet/send-select-token
  (fn [{:keys [db]} [{:keys [token stack-id]}]]
-   {:db (-> db
-            (update-in [:wallet :ui :send] dissoc :collectible)
-            (assoc-in [:wallet :ui :send :token] token))
-    :fx [[:navigate-to-within-stack [:wallet-send-input-amount stack-id]]]}))
+   {:db (assoc-in db [:wallet :ui :send :token] token)
+    :fx [[:dispatch-later
+          {:ms       1
+           :dispatch [:navigate-to-within-stack [:wallet-send-input-amount stack-id]]}]]}))
 
-(rf/reg-event-fx
- :wallet/send-select-token-drawer
+(rf/reg-event-fx :wallet/send-select-token-drawer
  (fn [{:keys [db]} [{:keys [token]}]]
    {:db (assoc-in db [:wallet :ui :send :token] token)}))
 
@@ -97,15 +90,6 @@
  (fn [{:keys [db]}]
    {:db (assoc-in db [:wallet :ui :send :token] nil)}))
 
-(rf/reg-event-fx :wallet/send-select-collectible
- (fn [{:keys [db]} [{:keys [collectible stack-id]}]]
-   {:db (-> db
-            (update-in [:wallet :ui :send] dissoc :token)
-            (assoc-in [:wallet :ui :send :collectible] collectible)
-            (assoc-in [:wallet :ui :send :amount] 1))
-    :fx [[:dispatch [:wallet/get-suggested-routes 1]]
-         [:navigate-to-within-stack [:wallet-transaction-confirmation stack-id]]]}))
-
 (rf/reg-event-fx :wallet/send-select-amount
  (fn [{:keys [db]} [{:keys [amount stack-id]}]]
    {:db (assoc-in db [:wallet :ui :send :amount] amount)
@@ -115,25 +99,19 @@
  (fn [{:keys [db now]} [amount]]
    (let [wallet-address          (get-in db [:wallet :current-viewing-account-address])
          token                   (get-in db [:wallet :ui :send :token])
-         collectible             (get-in db [:wallet :ui :send :collectible])
-         to-address              (get-in db [:wallet :ui :send :to-address])
-         token-decimal           (when token (:decimals token))
-         token-id                (if token
-                                   (:symbol token)
-                                   (str (get-in collectible [:id :contract-id :address])
-                                        ":"
-                                        (get-in collectible [:id :token-id])))
-         network-preferences     (if token [] [(get-in collectible [:id :contract-id :chain-id])])
+         account-address         (get-in db [:wallet :ui :send :send-account-address])
+         selected-networks       (get-in db [:wallet :ui :send :selected-networks])
+         to-address              (or account-address (get-in db [:wallet :ui :send :to-address]))
+         token-decimal           (:decimals token)
+         token-id                (:symbol token)
+         network-preferences     selected-networks
          gas-rates               constants/gas-rate-medium
-         amount-in               (send-utils/amount-in-hex amount (if token token-decimal 0))
+         amount-in               (send-utils/amount-in-hex amount token-decimal)
          from-address            wallet-address
          disabled-from-chain-ids []
          disabled-to-chain-ids   []
          from-locked-amount      {}
-         transaction-type        (if token
-                                   constants/send-type-transfer
-                                   constants/send-type-erc-721-transfer)
-         request-params          [transaction-type
+         request-params          [constants/send-type-transfer
                                   from-address
                                   to-address
                                   amount-in
@@ -177,46 +155,21 @@
    {:fx [[:dispatch [:dismiss-modal :wallet-transaction-progress]]]}))
 
 (defn- transaction-bridge
-  [{:keys [from-address from-chain-id to-address token-id token-address route data eth-transfer?]}]
-  (let [{:keys [bridge-name amount-out gas-amount
-                gas-fees]}                 route
-        eip-1559-enabled?                  (:eip-1559-enabled gas-fees)
-        {:keys [gas-price max-fee-per-gas-medium
-                max-priority-fee-per-gas]} gas-fees
-        transfer-tx                        (cond-> {:From  from-address
-                                                    :To    (or token-address to-address)
-                                                    :Gas   (money/to-hex gas-amount)
-                                                    :Value (when eth-transfer? amount-out)
-                                                    :Nonce nil
-                                                    :Input ""
-                                                    :Data  (or data "0x")}
-                                             eip-1559-enabled?       (assoc :TxType "0x02"
-                                                                            :MaxFeePerGas
-                                                                            (money/to-hex
-                                                                             (money/->wei
-                                                                              :gwei
-                                                                              max-fee-per-gas-medium))
-                                                                            :MaxPriorityFeePerGas
-                                                                            (money/to-hex
-                                                                             (money/->wei
-                                                                              :gwei
-                                                                              max-priority-fee-per-gas)))
-                                             (not eip-1559-enabled?) (assoc :TxType   "0x00"
-                                                                            :GasPrice (money/to-hex
-                                                                                       (money/->wei
-                                                                                        :gwei
-                                                                                        gas-price))))]
-    [(cond-> {:BridgeName bridge-name
-              :ChainID    from-chain-id}
-
-       (= bridge-name constants/bridge-name-erc-721-transfer)
-       (assoc :ERC721TransferTx
-              (assoc transfer-tx
-                     :Recipient to-address
-                     :TokenID   token-id))
-
-       (= bridge-name constants/bridge-name-transfer)
-       (assoc :TransferTx transfer-tx))]))
+  [{:keys [from-address to-address route]}]
+  (let [{:keys [from bridge-name amount-out gas-amount gas-fees]}           route
+        {:keys [gas-price max-fee-per-gas-medium max-priority-fee-per-gas]} gas-fees]
+    [{:BridgeName bridge-name
+      :ChainID    (:chain-id from)
+      :TransferTx {:From                 from-address
+                   :To                   to-address
+                   :Gas                  (money/to-hex gas-amount)
+                   :GasPrice             (money/to-hex (money/->wei :gwei gas-price))
+                   :Value                amount-out
+                   :Nonce                nil
+                   :MaxFeePerGas         (money/to-hex (money/->wei :gwei max-fee-per-gas-medium))
+                   :MaxPriorityFeePerGas (money/to-hex (money/->wei :gwei max-priority-fee-per-gas))
+                   :Input                ""
+                   :Data                 "0x"}}]))
 
 (defn- multi-transaction-command
   [{:keys [from-address to-address from-asset to-asset amount-out transfer-type]
@@ -230,50 +183,25 @@
 
 (rf/reg-event-fx :wallet/send-transaction
  (fn [{:keys [db]} [sha3-pwd]]
-   (let [route           (get-in db [:wallet :ui :send :route])
-         from-address    (get-in db [:wallet :current-viewing-account-address])
-         token           (get-in db [:wallet :ui :send :token])
-         collectible     (get-in db [:wallet :ui :send :collectible])
-         from-chain-id   (get-in route [:from :chain-id])
-         token-id        (if token
-                           (:symbol token)
-                           (get-in collectible [:id :token-id]))
-         erc20-transfer? (and token (not= token-id "ETH"))
-         eth-transfer?   (and token (not erc20-transfer?))
-         token-address   (cond collectible
-                               (get-in collectible
-                                       [:id :contract-id :address])
-                               erc20-transfer?
-                               (get-in token [:balances-per-chain from-chain-id :address]))
-         to-address      (get-in db [:wallet :ui :send :to-address])
-         data            (when erc20-transfer?
-                           (native-module/encode-transfer (address/normalized-hex to-address)
-                                                          (:amount-out route)))
-         request-params  [(multi-transaction-command
-                           {:from-address from-address
-                            :to-address   to-address
-                            :from-asset   token-id
-                            :to-asset     token-id
-                            :amount-out   (if eth-transfer? (:amount-out route) "0x0")})
-                          (transaction-bridge {:to-address    to-address
-                                               :from-address  from-address
-                                               :route         route
-                                               :from-chain-id from-chain-id
-                                               :token-address token-address
-                                               :token-id      (when collectible
-                                                                (money/to-hex (js/parseInt token-id)))
-                                               :data          data
-                                               :eth-transfer? eth-transfer?})
-                          sha3-pwd]]
+   (let [route          (get-in db [:wallet :ui :send :route])
+         from-address   (get-in db [:wallet :current-viewing-account-address])
+         to-address     (get-in db [:wallet :ui :send :to-address])
+         token          (get-in db [:wallet :ui :send :token])
+         token-id       (:symbol token)
+         request-params [(multi-transaction-command {:from-address from-address
+                                                     :to-address   to-address
+                                                     :from-asset   token-id
+                                                     :to-asset     token-id
+                                                     :amount-out   (:amount-out route)})
+                         (transaction-bridge {:to-address   to-address
+                                              :from-address from-address
+                                              :route        route})
+                         sha3-pwd]]
      {:json-rpc/call [{:method     "wallet_createMultiTransaction"
                        :params     request-params
                        :on-success (fn [result]
                                      (rf/dispatch [:hide-bottom-sheet])
-                                     (rf/dispatch [:wallet/add-authorized-transaction result])
-                                     (rf/dispatch [:wallet/clean-scanned-address])
-                                     (rf/dispatch [:wallet/clean-local-suggestions])
-                                     (rf/dispatch [:wallet/clean-send-address])
-                                     (rf/dispatch [:wallet/select-address-tab nil]))
+                                     (rf/dispatch [:wallet/add-authorized-transaction result]))
                        :on-error   (fn [error]
                                      (log/error "failed to send transaction"
                                                 {:event  :wallet/send-transaction

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

@@ -53,9 +53,8 @@
   (h/test "Default render"
     (h/setup-subs sub-mocks)
     (h/render [input-amount/view
-               {:crypto-decimals          2
-                :limit-crypto             250
-                :initial-crypto-currency? false}])
+               {:crypto-decimals 2
+                :limit-crypto    250}])
     (h/is-truthy (h/get-by-text "0"))
     (h/is-truthy (h/get-by-text "ETH"))
     (h/is-truthy (h/get-by-text "$0.00"))
@@ -66,10 +65,9 @@
     (h/setup-subs sub-mocks)
     (let [on-confirm (h/mock-fn)]
       (h/render [input-amount/view
-                 {:on-confirm               on-confirm
-                  :crypto-decimals          10
-                  :limit-crypto             1000
-                  :initial-crypto-currency? false}])
+                 {:on-confirm      on-confirm
+                  :crypto-decimals 10
+                  :limit-crypto    1000}])
 
       (h/fire-event :press (h/query-by-label-text :keyboard-key-1))
       (h/fire-event :press (h/query-by-label-text :keyboard-key-2))
@@ -90,10 +88,9 @@
 
     (let [on-confirm (h/mock-fn)]
       (h/render [input-amount/view
-                 {:crypto-decimals          10
-                  :limit-crypto             1000
-                  :on-confirm               on-confirm
-                  :initial-crypto-currency? false}])
+                 {:crypto-decimals 10
+                  :limit-crypto    1000
+                  :on-confirm      on-confirm}])
 
       (h/fire-event :press (h/query-by-label-text :keyboard-key-1))
       (h/fire-event :press (h/query-by-label-text :keyboard-key-2))

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

@@ -30,54 +30,28 @@
 (defn valid-input?
   [current v]
   (let [max-length          12
-        length-overflow?    (>= (count current) max-length)
+        length-owerflow?    (>= (count current) max-length)
         extra-dot?          (and (= v dot) (string/includes? current dot))
         extra-leading-zero? (and (= current "0") (= "0" (str v)))
         non-numeric?        (re-find not-digits-or-dot-pattern (str v))]
-    (not (or non-numeric? extra-dot? extra-leading-zero? length-overflow?))))
-
-(defn- add-char-to-string
-  [s c idx]
-  (let [size (count s)]
-    (if (= size idx)
-      (str s c)
-      (str (subs s 0 idx)
-           c
-           (subs s idx size)))))
-
-(defn- move-input-cursor
-  ([input-selection-atom new-idx]
-   (move-input-cursor input-selection-atom new-idx new-idx))
-  ([input-selection-atom new-start-idx new-end-idx]
-   (let [start-idx (if (< new-start-idx 0) 0 new-start-idx)
-         end-idx   (if (< new-end-idx 0) 0 new-start-idx)]
-     (swap! input-selection-atom assoc :start start-idx :end end-idx))))
+    (not (or non-numeric? extra-dot? extra-leading-zero? length-owerflow?))))
 
 (defn- normalize-input
-  [current v input-selection-atom]
-  (let [{:keys [start end]} @input-selection-atom]
-    (if (= start end)
-      (cond
-        (and (string/blank? current) (= v dot))
-        (do
-          (move-input-cursor input-selection-atom 2)
-          (str "0" v))
+  [current v]
+  (cond
+    (and (string/blank? current) (= v dot))
+    (str "0" v)
 
-        (and (= current "0") (not= v dot))
-        (do
-          (move-input-cursor input-selection-atom 1)
-          (str v))
+    (and (= current "0") (not= v dot))
+    (str v)
 
-        :else
-        (do
-          (move-input-cursor input-selection-atom (inc start))
-          (add-char-to-string current v start)))
-      current)))
+    :else
+    (str current v)))
 
 (defn- make-new-input
-  [current v input-selection-atom]
+  [current v]
   (if (valid-input? current v)
-    (normalize-input current v input-selection-atom)
+    (normalize-input current v)
     current))
 
 (defn- reset-input-error
@@ -85,154 +59,124 @@
   (reset! input-error
     (> new-value prev-value)))
 
-(defn delete-from-string
-  [s idx]
-  (let [size (count s)]
-    (str (subs s 0 (dec idx)) (subs s idx size))))
-
 (defn- f-view-internal
-  ;; crypto-decimals, limit-crypto and initial-crypto-currency? args are needed
-  ;; for component tests only
-  [{default-on-confirm       :on-confirm
-    default-limit-crypto     :limit-crypto
-    default-crypto-decimals  :crypto-decimals
-    initial-crypto-currency? :initial-crypto-currency?
-    :or                      {initial-crypto-currency? true}}]
-  (let [_ (rn/dismiss-keyboard!)
-        bottom                (safe-area/get-bottom)
-        input-value           (reagent/atom "")
-        input-error           (reagent/atom false)
-        crypto-currency?      (reagent/atom initial-crypto-currency?)
-        input-selection       (reagent/atom {:start 0 :end 0})
-        handle-swap           (fn [{:keys [crypto? limit-fiat limit-crypto]}]
-                                (let [num-value     (parse-double @input-value)
-                                      current-limit (if crypto? limit-crypto limit-fiat)]
-                                  (reset! crypto-currency? crypto?)
-                                  (reset-input-error num-value current-limit input-error)))
-        handle-keyboard-press (fn [v loading-routes? current-limit-amount]
-                                (when-not loading-routes?
-                                  (let [current-value @input-value
-                                        new-value     (make-new-input current-value v input-selection)
-                                        num-value     (or (parse-double new-value) 0)]
-                                    (reset! input-value new-value)
-                                    (reset-input-error num-value current-limit-amount input-error)
-                                    (reagent/flush))))
-        handle-delete         (fn [loading-routes? current-limit-amount]
-                                (when-not loading-routes?
-                                  (let [{:keys [start end]} @input-selection]
-                                    (reset-input-error @input-value current-limit-amount input-error)
-                                    (when (= start end)
-                                      (swap! input-value delete-from-string start)
-                                      (move-input-cursor input-selection (dec start)))
-                                    (reagent/flush))))
-        handle-on-change      (fn [v current-limit-amount]
-                                (when (valid-input? @input-value v)
-                                  (let [num-value (or (parse-double v) 0)]
-                                    (reset! input-value v)
-                                    (reset-input-error num-value current-limit-amount input-error)
-                                    (reagent/flush))))
-        on-navigate-back      (fn []
-                                (rf/dispatch [:wallet/clean-selected-token])
-                                (rf/dispatch [:navigate-back-within-stack :wallet-send-input-amount]))
-        fetch-routes          (fn [input-num-value current-limit-amount]
+  ;; crypto-decimals and limit-crypto args are needed for component tests only
+  [{:keys [crypto-decimals limit-crypto]}]
+  (let [bottom                    (safe-area/get-bottom)
+        {:keys [currency]}        (rf/sub [:profile/profile])
+        token                     (rf/sub [:wallet/wallet-send-token])
+        loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
+        token-symbol              (:symbol token)
+        limit-crypto              (or limit-crypto
+                                      (utils/get-standard-crypto-format token (:total-balance token)))
+        conversion-rate           (get-in token [:market-values-per-currency :usd :price])
+        limit-fiat                (.toFixed (* (:total-balance token) conversion-rate) 2)
+        crypto-decimals           (or crypto-decimals (utils/get-crypto-decimals-count token))
+        input-value               (reagent/atom "")
+        input-error               (reagent/atom false)
+        current-limit             (reagent/atom {:amount   limit-crypto
+                                                 :currency token-symbol})
+        handle-swap               (fn [crypto?]
+                                    (let [num-value (parse-double @input-value)]
+                                      (reset! current-limit (if crypto?
+                                                              {:amount   limit-crypto
+                                                               :currency token-symbol}
+                                                              {:amount   limit-fiat
+                                                               :currency currency}))
+                                      (reset-input-error num-value
+                                                         (:amount @current-limit)
+                                                         input-error)))
+        handle-keyboard-press     (fn [v]
+                                    (let [current-value        @input-value
+                                          new-value            (make-new-input current-value v)
+                                          num-value            (or (parse-double new-value) 0)
+                                          current-limit-amount (:amount @current-limit)]
+                                      (when (not loading-suggested-routes?)
+                                        (reset! input-value new-value)
+                                        (reset-input-error num-value current-limit-amount input-error)
+                                        (reagent/flush))))
+        handle-delete             (fn [_]
+                                    (when-not loading-suggested-routes?
+                                      (let [current-limit-amount (:amount @current-limit)]
+                                        (swap! input-value #(subs % 0 (dec (count %))))
+                                        (reset-input-error @input-value current-limit-amount input-error)
+                                        (reagent/flush))))
+        handle-on-change          (fn [v]
+                                    (when (valid-input? @input-value v)
+                                      (let [num-value            (or (parse-double v) 0)
+                                            current-limit-amount (:amount @current-limit)]
+                                        (reset! input-value v)
+                                        (reset-input-error num-value current-limit-amount input-error)
+                                        (reagent/flush))))]
+    (fn [{:keys [on-confirm]
+          :or   {on-confirm #(rf/dispatch [:wallet/send-select-amount
+                                           {:amount   @input-value
+                                            :stack-id :wallet-send-input-amount}])}}]
+      (let [limit-label       (make-limit-label @current-limit)
+            input-num-value   (parse-double @input-value)
+            suggested-routes  (rf/sub [:wallet/wallet-send-suggested-routes])
+            route             (rf/sub [:wallet/wallet-send-route])
+            confirm-disabled? (or
+                               (nil? route)
+                               (empty? @input-value)
+                               (<= input-num-value 0)
+                               (> input-num-value (:amount @current-limit)))
+            amount            (str @input-value " " token-symbol)
+            {:keys [color]}   (rf/sub [:wallet/current-viewing-account])
+            fetch-routes      (fn []
                                 (rf/dispatch [:wallet/clean-suggested-routes])
-                                (when-not (or (empty? @input-value)
-                                              (<= input-num-value 0)
-                                              (> input-num-value current-limit-amount))
-                                  (debounce/debounce-and-dispatch
-                                   [:wallet/get-suggested-routes @input-value]
-                                   100)))
-        handle-on-confirm     (fn []
-                                (rf/dispatch [:wallet/send-select-amount
-                                              {:amount   @input-value
-                                               :stack-id :wallet-send-input-amount}]))
-        selection-change      (fn [selection]
-                                ;; `reagent/flush` is needed to properly propagate the
-                                ;; input cursor state. Since this is a controlled
-                                ;; component the cursor will become static if
-                                ;; `reagent/flush` is removed.
-                                (reset! input-selection selection)
-                                (reagent/flush))]
-    (fn []
-      (let [{fiat-currency :currency} (rf/sub [:profile/profile])
-            {:keys [color]}           (rf/sub [:wallet/current-viewing-account])
-            {token-balance  :total-balance
-             token-symbol   :symbol
-             token-networks :networks
-             :as            token}    (rf/sub [:wallet/wallet-send-token])
-            conversion-rate           (-> token :market-values-per-currency :usd :price)
-            loading-routes?           (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
-            suggested-routes          (rf/sub [:wallet/wallet-send-suggested-routes])
-            route                     (rf/sub [:wallet/wallet-send-route])
-            on-confirm                (or default-on-confirm handle-on-confirm)
-            crypto-decimals           (or default-crypto-decimals
-                                          (utils/get-crypto-decimals-count token))
-            crypto-limit              (or default-limit-crypto
-                                          (utils/get-standard-crypto-format token token-balance))
-            fiat-limit                (.toFixed (* token-balance conversion-rate) 2)
-            current-limit             (if @crypto-currency? crypto-limit fiat-limit)
-            current-currency          (if @crypto-currency? token-symbol fiat-currency)
-            limit-label               (make-limit-label {:amount   current-limit
-                                                         :currency current-currency})
-            input-num-value           (parse-double @input-value)
-            confirm-disabled?         (or (nil? route)
-                                          (empty? @input-value)
-                                          (<= input-num-value 0)
-                                          (> input-num-value current-limit))
-            amount-text               (str @input-value " " token-symbol)]
+                                (when-not (or
+                                           (empty? @input-value)
+                                           (<= input-num-value 0)
+                                           (> input-num-value (:amount @current-limit)))
+                                  (debounce/debounce-and-dispatch [:wallet/get-suggested-routes
+                                                                   @input-value]
+                                                                  100)))]
         (rn/use-effect
          (fn []
            (let [dismiss-keyboard-fn   #(when (= % "active") (rn/dismiss-keyboard!))
                  app-keyboard-listener (.addEventListener rn/app-state "change" dismiss-keyboard-fn)]
              #(.remove app-keyboard-listener))))
-        (rn/use-effect
-         #(fetch-routes input-num-value current-limit)
-         [@input-value])
+        (rn/use-effect #(fetch-routes) [@input-value])
         [rn/view
          {:style               style/screen
           :accessibility-label (str "container" (when @input-error "-error"))}
          [account-switcher/view
           {:icon-name     :i/arrow-left
-           :on-press      on-navigate-back
+           :on-press      #(rf/dispatch [:navigate-back-within-stack :wallet-send-input-amount])
            :switcher-type :select-account}]
          [quo/token-input
-          {:container-style     style/input-container
-           :token               token-symbol
-           :currency            current-currency
-           :crypto-decimals     crypto-decimals
-           :error?              @input-error
-           :networks            token-networks
-           :title               (i18n/label :t/send-limit {:limit limit-label})
-           :conversion          conversion-rate
-           :show-keyboard?      false
-           :value               @input-value
-           :selection           @input-selection
-           :on-change-text      #(handle-on-change % current-limit)
-           :on-selection-change selection-change
-           :on-swap             #(handle-swap
-                                  {:crypto?      %
-                                   :currency     current-currency
-                                   :token-symbol token-symbol
-                                   :limit-fiat   fiat-limit
-                                   :limit-crypto crypto-limit})}]
+          {:container-style style/input-container
+           :token           token-symbol
+           :currency        currency
+           :crypto-decimals crypto-decimals
+           :error?          @input-error
+           :networks        (:networks token)
+           :title           (i18n/label :t/send-limit {:limit limit-label})
+           :conversion      conversion-rate
+           :show-keyboard?  false
+           :value           @input-value
+           :on-swap         handle-swap
+           :on-change-text  (fn [text]
+                              (handle-on-change text))}]
          [routes/view
-          {:amount       amount-text
+          {:amount       amount
            :routes       suggested-routes
            :token        token
            :input-value  @input-value
-           :fetch-routes #(fetch-routes % current-limit)}]
+           :fetch-routes fetch-routes}]
          [quo/bottom-actions
           {:actions             :1-action
-           :customization-color color
            :button-one-label    (i18n/label :t/confirm)
            :button-one-props    {:disabled? confirm-disabled?
-                                 :on-press  on-confirm}}]
+                                 :on-press  on-confirm}
+           :customization-color color}]
          [quo/numbered-keyboard
           {:container-style (style/keyboard-container bottom)
            :left-action     :dot
            :delete-key?     true
-           :on-press        #(handle-keyboard-press % loading-routes? current-limit)
-           :on-delete       #(handle-delete loading-routes? current-limit)}]]))))
+           :on-press        handle-keyboard-press
+           :on-delete       handle-delete}]]))))
 
 (defn- view-internal
   [props]

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

@@ -168,13 +168,14 @@
              [local-suggestions-list]]]
            [:<>
             [quo/tabs
-             {:style           style/tabs
-              :container-style style/tabs-content
-              :size            32
-              :default-active  selected-tab
-              :data            tabs-data
-              :scrollable?     true
-              :on-change       on-change-tab}]
+             {:style            style/tabs
+              :container-style  style/tabs-content
+              :size             32
+              :default-active   selected-tab
+              :data             tabs-data
+              :scrollable?      true
+              :scroll-on-press? true
+              :on-change        on-change-tab}]
             [tabs/view {:selected-tab selected-tab}]])]))))
 
 (defn view

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

@@ -17,21 +17,22 @@
    {:id :tab/collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}])
 
 (defn- asset-component
-  [token _ _ {:keys [currency currency-symbol]}]
-  (let [on-press         #(rf/dispatch [:wallet/send-select-token
-                                        {:token    token
-                                         :stack-id :wallet-select-asset}])
-        token-units      (utils/total-token-units-in-all-chains token)
-        crypto-formatted (utils/get-standard-crypto-format token token-units)
-        fiat-value       (utils/total-token-fiat-value currency token)
-        fiat-formatted   (utils/get-standard-fiat-format crypto-formatted currency-symbol fiat-value)]
-    [quo/token-network
-     {:token       (:symbol token)
-      :label       (:name token)
-      :token-value (str crypto-formatted " " (:symbol token))
-      :fiat-value  fiat-formatted
-      :networks    (:networks token)
-      :on-press    on-press}]))
+  []
+  (fn [token _ _ {:keys [currency currency-symbol]}]
+    (let [on-press         #(rf/dispatch [:wallet/send-select-token
+                                          {:token    token
+                                           :stack-id :wallet-select-asset}])
+          token-units      (utils/total-token-units-in-all-chains token)
+          crypto-formatted (utils/get-standard-crypto-format token token-units)
+          fiat-value       (utils/total-token-fiat-value currency token)
+          fiat-formatted   (utils/get-standard-fiat-format crypto-formatted currency-symbol fiat-value)]
+      [quo/token-network
+       {:token       (:symbol token)
+        :label       (:name token)
+        :token-value (str crypto-formatted " " (:symbol token))
+        :fiat-value  fiat-formatted
+        :networks    (:networks token)
+        :on-press    on-press}])))
 
 (defn- asset-list
   [search-text]

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

@@ -14,18 +14,16 @@
   {:margin-right 4})
 
 (defn details-container
-  [{:keys [loading-suggested-routes? route-loaded? theme]}]
+  [route? theme]
   {:flex-direction     :row
-   :justify-content    (if route-loaded? :space-between :center)
-   :height             (when (or loading-suggested-routes? route-loaded?) 52)
+   :justify-content    (if route? :space-between :center)
+   :height             52
    :padding-horizontal 12
    :padding-top        7
    :padding-bottom     8
    :border-radius      16
    :border-width       1
-   :border-color       (if (or loading-suggested-routes? route-loaded?)
-                         (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)
-                         :transparent)})
+   :border-color       (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)})
 
 (def details-title-container
   {:padding-horizontal 20

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

@@ -74,10 +74,9 @@
      :account-props account-props}]])
 
 (defn- transaction-details
-  [{:keys [estimated-time-min max-fees token-symbol amount to-address route theme]}]
-  (let [currency-symbol           (rf/sub [:profile/currency-symbol])
-        route-loaded?             (some? route)
-        loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])]
+  [{:keys [estimated-time-min max-fees token amount to-address route theme]}]
+  (let [currency-symbol (rf/sub [:profile/currency-symbol])
+        route-loaded?   (some? route)]
     [rn/view
      {:style style/details-title-container}
      [quo/text
@@ -87,14 +86,8 @@
        :accessibility-label :summary-from-label}
       (i18n/label :t/details)]
      [rn/view
-      {:style (style/details-container
-               {:loading-suggested-routes? loading-suggested-routes?
-                :route-loaded?             route-loaded?
-                :theme                     theme})}
-      (cond
-        loading-suggested-routes?
-        [rn/activity-indicator {:style {:align-self :center}}]
-        route-loaded?
+      {:style (style/details-container route-loaded? theme)}
+      (if route-loaded?
         [:<>
          [quo/data-item
           {:container-style style/detail-item
@@ -130,10 +123,8 @@
            :status          :default
            :size            :small
            :title           (i18n/label :t/user-gets {:name (utils/get-shortened-address to-address)})
-           :subtitle        (str amount " " token-symbol)}]]
-        :else
-        [quo/text {:style {:align-self :center}}
-         (i18n/label :t/no-routes-found-confirmation)])]]))
+           :subtitle        (str amount " " (:symbol token))}]]
+        [rn/activity-indicator {:style {:align-self :center}}])]]))
 
 (defn- view-internal
   [_]
@@ -149,10 +140,9 @@
             collectible-data      (:collectible-data collectible)
             collectible-id        (get-in collectible [:id :token-id])
             token-symbol          (if collectible
-                                    (first (remove
-                                            string/blank?
-                                            [(:name collectible-data)
-                                             (str (:name collection-data) " #" collectible-id)]))
+                                    (first (remove string/blank?
+                                                   [(:name collectible-data)
+                                                    (str (:name collection-data) " #" collectible-id)]))
                                     (:symbol token))
             image-url             (when collectible (:image-url collectible-data))
             amount                (:amount send-transaction-data)
@@ -167,8 +157,7 @@
                                    :emoji               (:emoji account)
                                    :type                :default
                                    :name                (:name account)
-                                   :address             (utils/get-shortened-address (:address
-                                                                                      account))}
+                                   :address             (utils/get-shortened-address (:address account))}
             user-props            {:full-name to-address
                                    :address   (utils/get-shortened-address to-address)}]
         [rn/view {:style {:flex 1}}
@@ -184,17 +173,17 @@
                                                               :on-press            #(js/alert
                                                                                      "to be implemented")
                                                               :accessibility-label :advanced-options}]}]
-           :footer                   (when route
+           :footer                   (if route
                                        [standard-auth/slide-button
                                         {:size                :size-48
                                          :track-text          (i18n/label :t/slide-to-send)
                                          :container-style     {:z-index 2}
                                          :customization-color account-color
-                                         :on-auth-success     #(rf/dispatch
-                                                                [:wallet/send-transaction
-                                                                 (security/safe-unmask-data
-                                                                  %)])
-                                         :auth-button-label   (i18n/label :t/confirm)}])
+                                         :on-auth-success     #(rf/dispatch [:wallet/send-transaction
+                                                                             (security/safe-unmask-data
+                                                                              %)])
+                                         :auth-button-label   (i18n/label :t/confirm)}]
+                                       [rn/activity-indicator])
            :gradient-cover?          true
            :customization-color      (:color account)}
           [rn/view
@@ -224,7 +213,7 @@
            [transaction-details
             {:estimated-time-min estimated-time-min
              :max-fees           max-fees
-             :token-symbol       token-symbol
+             :token              token
              :amount             amount
              :to-address         to-address
              :theme              theme

src/status_im/core.cljs

@@ -13,8 +13,7 @@
     [react-native.platform :as platform]
     [react-native.shake :as react-native-shake]
     [reagent.impl.batching :as batching]
-    [status-im.common.log :as logging]
-    [taoensso.timbre :as log]
+    [status-im.common.log :as log]
     [status-im.common.universal-links :as universal-links]
     [status-im.config :as config]
     [status-im.contexts.profile.push-notifications.events :as notifications]
@@ -35,17 +34,12 @@
 
 (def adjust-resize 16)
 
-(defn is-hermes
-  []
-  (boolean (.-HermesInternal js/global)))
-
 (defn init
   []
-
   (native-module/init #(re-frame/dispatch [:signals/signal-received %]))
   (when platform/android?
     (native-module/set-soft-input-mode adjust-resize))
-  (logging/setup config/log-level)
+  (log/setup config/log-level)
   (global-error/register-handler)
   (notifications/listen-notifications)
   (.addEventListener rn/app-state "change" #(re-frame/dispatch [:app-state-change %]))
@@ -60,6 +54,5 @@
   (async-storage/get-item :screen-height #(reset! shell.state/screen-height %))
 
   (dev/setup)
-  (log/info "hermesEnabled ->" (is-hermes))
 
   (re-frame/dispatch-sync [:app-started]))

src/status_im/integration_test/profile_test.cljs

@@ -2,8 +2,6 @@
   (:require
     [cljs.test :refer [deftest is]]
     [day8.re-frame.test :as rf-test]
-    [legacy.status-im.multiaccounts.logout.core :as logout]
-    [legacy.status-im.utils.test :as utils.test]
     [status-im.contexts.profile.utils :as profile.utils]
     [test-helpers.integration :as h]
     [utils.re-frame :as rf]))
@@ -21,38 +19,4 @@
            [:toasts/upsert]
            (let [profile      (rf/sub [:profile/profile])
                  display-name (profile.utils/displayed-name profile)]
-             (is (= new-name display-name)))
-           (h/logout)
-           (rf-test/wait-for [::logout/logout-method]))))))))
-
-(deftest edit-profile-picture-test
-  (h/log-headline :edit-profile-picture-test)
-  (let [mock-image    "resources/images/mock2/monkey.png"
-        absolute-path (.resolve utils.test/path mock-image)]
-    (rf-test/run-test-async
-     (h/with-app-initialized
-      (h/with-account
-       (rf/dispatch [:profile/edit-picture absolute-path 80 80])
-       (rf-test/wait-for
-         [:profile/update-local-picture]
-         (rf-test/wait-for
-           [:toasts/upsert]
-           (let [profile (rf/sub [:profile/profile])]
-             (is (not (nil? (:images profile)))))
-           (h/logout)
-           (rf-test/wait-for [::logout/logout-method]))))))))
-
-(deftest delete-profile-picture-test
-  (h/log-headline :delete-profile-picture-test)
-  (rf-test/run-test-async
-   (h/with-app-initialized
-    (h/with-account
-     (rf/dispatch [:profile/delete-picture])
-     (rf-test/wait-for
-       [:profile/update-local-picture]
-       (rf-test/wait-for
-         [:toasts/upsert]
-         (let [profile (rf/sub [:profile/profile])]
-           (is (nil? (:image profile))))
-         (h/logout)
-         (rf-test/wait-for [::logout/logout-method])))))))
+             (is (= new-name display-name))))))))))