fix input

2024-01-16 12:05:20 +04:00
236 changed files with 3096 additions and 4831 deletions
@@ -282,12 +282,11 @@ SIMULATOR=iPhone 13
 # TODO: fix IOS_STATUS_GO_TARGETS to be either amd64 or arm64 when RN is upgraded
 run-ios: export TARGET := ios
 run-ios: export IOS_STATUS_GO_TARGETS := ios/arm64;iossimulator/amd64
-run-ios: export XCBeautify=$(shell which xcbeautify) # for react-native-cli to pick this up and to auto format output
 run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
-	npx react-native run-ios --simulator="$(SIMULATOR)"
+	npx react-native run-ios --simulator="$(SIMULATOR)" | xcbeautify
 else
-	npx react-native run-ios
+	npx react-native run-ios | xcbeautify
 endif

 show-ios-devices: ##@other shows connected ios device and its name
@@ -387,8 +386,9 @@ component-test-watch: export COMPONENT_TEST := true
 component-test-watch: export BABEL_ENV := test
 component-test-watch: export JEST_USE_SILENT_REPORTER := false
 component-test-watch: ##@ Watch tests and re-run no changes to cljs files
-	@scripts/check-metro-shadow-process.sh
+	@@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
+	yarn install
 	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs

 component-test: export TARGET := clojure
@@ -398,6 +398,7 @@ component-test: export JEST_USE_SILENT_REPORTER := false
 component-test: ##@test Run component tests once in NodeJS
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
+	yarn install
 	yarn shadow-cljs compile component-test && \
 	jest --clearCache && jest --config=test/jest/jest.config.js --testEnvironment node

@@ -28,7 +28,7 @@ buildToolsVersion=33.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/pkgs/aapt2/default.nix
 gradlePluginVersion=7.4.2
-kotlinPluginVersion=1.9.0
+kotlinPluginVersion=1.7.22

 android.useAndroidX=true
 android.enableJetifier=true
@@ -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)
          } }
@@ -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"

@@ -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
@@ -2,7 +2,6 @@ androidx.activity:activity:1.0.0
 androidx.activity:activity:1.0.0-rc01
 androidx.activity:activity:1.2.4
 androidx.annotation:annotation-experimental:1.1.0
-androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
@@ -11,7 +10,6 @@ androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
 androidx.appcompat:appcompat-resources:1.4.1
 androidx.appcompat:appcompat-resources:1.4.2
-androidx.appcompat:appcompat:1.0.0
 androidx.appcompat:appcompat:1.1.0-rc01
 androidx.appcompat:appcompat:1.2.0
 androidx.appcompat:appcompat:1.3.1
@@ -40,7 +38,6 @@ androidx.coordinatorlayout:coordinatorlayout:1.0.0
 androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.6.0
 androidx.core:core-splashscreen:1.0.0
-androidx.core:core:1.0.0
 androidx.core:core:1.1.0
 androidx.core:core:1.1.0-rc01
 androidx.core:core:1.2.0
@@ -49,6 +46,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 +54,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
@@ -126,13 +125,10 @@ androidx.tracing:tracing:1.1.0
 androidx.transition:transition:1.1.0
 androidx.transition:transition:1.2.0
 androidx.transition:transition:1.2.0-rc01
-androidx.vectordrawable:vectordrawable-animated:1.0.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0-rc01
-androidx.vectordrawable:vectordrawable:1.0.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0-rc01
-androidx.versionedparcelable:versionedparcelable:1.0.0
 androidx.versionedparcelable:versionedparcelable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.1
@@ -157,6 +153,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 +164,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 +174,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 +184,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 +194,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 +202,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 +226,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 +234,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 +246,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 +258,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 +270,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 +278,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 +288,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 +305,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 +316,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 +330,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 +349,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 +365,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 +406,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 +418,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 +430,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 +440,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 +452,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 +464,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 +584,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
@@ -756,92 +778,91 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
+org.jetbrains.kotlin:kotlin-android-extensions:1.7.22
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.22
 org.jetbrains.kotlin:kotlin-build-common:1.6.20
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.0
-org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.0
+org.jetbrains.kotlin:kotlin-build-common:1.7.22
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.0
+org.jetbrains.kotlin:kotlin-compiler-runner:1.7.22
 org.jetbrains.kotlin:kotlin-daemon-client:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.0
+org.jetbrains.kotlin:kotlin-daemon-client:1.7.22
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.0
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.22
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.7.22
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.0
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.22
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-native-utils:1.6.20
-org.jetbrains.kotlin:kotlin-native-utils:1.9.0
+org.jetbrains.kotlin:kotlin-native-utils:1.7.22
 org.jetbrains.kotlin:kotlin-project-model:1.6.20
-org.jetbrains.kotlin:kotlin-project-model:1.9.0
+org.jetbrains.kotlin:kotlin-project-model:1.7.22
 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
 org.jetbrains.kotlin:kotlin-reflect:1.5.31
-org.jetbrains.kotlin:kotlin-reflect:1.6.10
 org.jetbrains.kotlin:kotlin-reflect:1.7.10
+org.jetbrains.kotlin:kotlin-reflect:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-common:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.22
 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-scripting-jvm:1.7.22
+org.jetbrains.kotlin:kotlin-script-runtime:1.7.22
 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
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.7.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
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
 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
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
 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
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib:1.7.22
-org.jetbrains.kotlin:kotlin-stdlib:1.9.0
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.0
+org.jetbrains.kotlin:kotlin-tooling-core:1.7.22
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
 org.jetbrains.kotlin:kotlin-util-io:1.6.20
-org.jetbrains.kotlin:kotlin-util-io:1.9.0
+org.jetbrains.kotlin:kotlin-util-io:1.7.22
 org.jetbrains.kotlin:kotlin-util-klib:1.6.20
-org.jetbrains.kotlin:kotlin-util-klib:1.9.0
+org.jetbrains.kotlin:kotlin-util-klib:1.7.22
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
 org.jetbrains:markdown-jvm:0.2.1
@@ -909,5 +930,4 @@ org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
 com.android.tools.lint:lint-gradle:30.4.2
 com.android.tools.build:gradle:7.4.2
 com.android.tools.build:aapt2:7.4.2-8841542
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
@@ -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
@@ -670,7 +697,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.24.1/error_prone_annotations-2.24.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.24.0/error_prone_annotations-2.24.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -679,7 +706,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.4.0/error_prone_parent-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.7.1/error_prone_parent-2.7.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.24.1/error_prone_parent-2.24.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.24.0/error_prone_parent-2.24.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -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
@@ -1087,83 +1116,60 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-co
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.5.2/kotlinx-coroutines-core-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.1.0/kotlinx-metadata-jvm-0.1.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.7.22/org.jetbrains.kotlin.jvm.gradle.plugin-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.9.0/org.jetbrains.kotlin.jvm.gradle.plugin-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.6.20/kotlin-android-extensions-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.7.22/kotlin-android-extensions-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.9.0/kotlin-android-extensions-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotations-jvm/1.3.72/kotlin-annotations-jvm-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.6.20/kotlin-annotation-processing-gradle-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.7.22/kotlin-annotation-processing-gradle-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.6.20/kotlin-build-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.7.22/kotlin-build-common-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.9.0/kotlin-build-common-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools-api/1.9.0/kotlin-build-tools-api-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools-impl/1.9.0/kotlin-build-tools-impl-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.6.20/kotlin-compiler-embeddable-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.22/kotlin-compiler-embeddable-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.9.0/kotlin-compiler-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.6.20/kotlin-compiler-runner-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.7.22/kotlin-compiler-runner-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.9.0/kotlin-compiler-runner-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.6.20/kotlin-daemon-client-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.7.22/kotlin-daemon-client-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.9.0/kotlin-daemon-client-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.6.20/kotlin-daemon-embeddable-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.22/kotlin-daemon-embeddable-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.9.0/kotlin-daemon-embeddable-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugins-bom/1.9.0/kotlin-gradle-plugins-bom-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-annotations/1.9.0/kotlin-gradle-plugin-annotations-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.20/kotlin-gradle-plugin-api-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.7.22/kotlin-gradle-plugin-api-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.9.0/kotlin-gradle-plugin-api-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.7.22/kotlin-gradle-plugin-idea-proto-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.9.0/kotlin-gradle-plugin-idea-proto-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.7.22/kotlin-gradle-plugin-idea-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.9.0/kotlin-gradle-plugin-idea-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.6.20/kotlin-gradle-plugin-model-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.7.22/kotlin-gradle-plugin-model-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.9.0/kotlin-gradle-plugin-model-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.20/kotlin-gradle-plugin-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.7.22/kotlin-gradle-plugin-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.9.0/kotlin-gradle-plugin-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.6.20/kotlin-klib-commonizer-api-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.7.22/kotlin-klib-commonizer-api-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.9.0/kotlin-klib-commonizer-api-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.9.0/kotlin-klib-commonizer-embeddable-1.9.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.7.22/kotlin-klib-commonizer-embeddable-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.6.20/kotlin-native-utils-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.7.22/kotlin-native-utils-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.9.0/kotlin-native-utils-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.6.20/kotlin-project-model-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.7.22/kotlin-project-model-1.7.22.pom
-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
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.5.31/kotlin-reflect-1.5.31.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta2/kotlin-reflect-2.0.0-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.9.0/kotlin-scripting-common-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.20/kotlin-scripting-compiler-embeddable-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.22/kotlin-scripting-compiler-embeddable-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.9.0/kotlin-scripting-compiler-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.6.20/kotlin-scripting-compiler-impl-embeddable-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.22/kotlin-scripting-compiler-impl-embeddable-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.9.0/kotlin-scripting-compiler-impl-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.20/kotlin-scripting-jvm-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.22/kotlin-scripting-jvm-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.0/kotlin-scripting-jvm-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.6.20/kotlin-script-runtime-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.7.22/kotlin-script-runtime-1.7.22.pom
-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
@@ -1181,8 +1187,8 @@ 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.6.21/kotlin-stdlib-common-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.pom
 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
@@ -1193,8 +1199,8 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.pom
 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
@@ -1204,12 +1210,12 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.22/kotlin-stdlib-jdk8-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0/kotlin-stdlib-jdk8-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/kotlin-stdlib-1.2.0.pom
 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
@@ -1227,18 +1233,14 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.22/kotlin-stdlib-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta2/kotlin-stdlib-2.0.0-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.6.20/kotlin-util-io-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.7.22/kotlin-util-io-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.9.0/kotlin-util-io-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.6.20/kotlin-util-klib-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.7.22/kotlin-util-klib-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.9.0/kotlin-util-klib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown-jvm/0.2.1/markdown-jvm-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown/0.2.1/markdown-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
@@ -1254,7 +1256,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
@@ -1321,11 +1323,11 @@ https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.7.3/utils
 https://repo.maven.apache.org/maven2/org/robolectric/utils/4.7.3/utils-4.7.3.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.1.0-alpha1/slf4j-api-2.1.0-alpha1.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-bom/2.1.0-alpha1/slf4j-bom-2.1.0-alpha1.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-bom/2.0.9/slf4j-bom-2.0.9.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.21/slf4j-parent-1.7.21.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-parent-1.7.30.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.1.0-alpha1/slf4j-parent-2.1.0-alpha1.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.0.9/slf4j-parent-2.0.9.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
@@ -50,8 +50,7 @@ org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
 com.android.tools.lint:lint-gradle:30.4.2
 com.android.tools.build:gradle:7.4.2
 com.android.tools.build:aapt2:7.4.2-8841542
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0' \
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' \
        >> "${DEPS_LIST}"
 }

@@ -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;"
@@ -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
@@ -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
@@ -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
@@ -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",
@@ -0,0 +1,92 @@
+import { useDerivedValue, withTiming, interpolate, useAnimatedScrollHandler, runOnJS } from 'react-native-reanimated';
+
+export function navigationHeaderOpacity(distanceFromListTop, isAllLoaded, isCalculationsComplete, startPosition) {
+  return useDerivedValue(function () {
+    'worklet';
+    const isCalculationsCompleteValue = isCalculationsComplete.value;
+    if (distanceFromListTop.value < startPosition && isAllLoaded.value) {
+      return isCalculationsCompleteValue ? withTiming(0) : 0;
+    } else {
+      return isCalculationsCompleteValue ? withTiming(1) : 1;
+    }
+  });
+}
+
+export function navigationHeaderPosition(distanceFromListTop, isAllLoaded, topBarHeight, startPosition) {
+  return useDerivedValue(function () {
+    'worklet';
+    return distanceFromListTop.value < startPosition && isAllLoaded.value ? withTiming(topBarHeight) : withTiming(0);
+  });
+}
+
+export function interpolateNavigationViewOpacity(props) {
+  return useDerivedValue(function () {
+    'worklet';
+    const {
+      'all-loaded?': isAllLoaded,
+      'end-position': endPosition,
+      'start-position': startPosition,
+      'distance-from-list-top': distanceFromListTop,
+    } = props;
+    if (isAllLoaded.value) {
+      return interpolate(distanceFromListTop.value, [startPosition, endPosition], [0, 1], {
+        extrapolateLeft: 'clamp',
+        extrapolateRight: 'clamp',
+      });
+    } else {
+      return 1;
+    }
+  });
+}
+
+export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callback) {
+  return function (event) {
+    'worklet';
+    const currentY = event.contentOffset.y;
+    const layoutHeight = event.layoutMeasurement.height;
+    const contentSizeY = event.contentSize.height - layoutHeight;
+    const newDistance = contentSizeY - currentY;
+    distanceFromListTop.value = newDistance;
+    chatListScrollY.value = currentY;
+    runOnJS(callback)(layoutHeight, newDistance);
+  };
+}
+
+export function placeholderOpacity(isCalculationsComplete) {
+  return useDerivedValue(function () {
+    'worklet';
+    return isCalculationsComplete.value ? 0 : 1;
+  });
+}
+
+export function placeholderZIndex(isCalculationsComplete) {
+  return useDerivedValue(function () {
+    'worklet';
+    return isCalculationsComplete.value ? 0 : 2;
+  });
+}
+
+export function scrollDownButtonOpacity(chatListScrollY, isComposerFocused, windowHeight) {
+  return useDerivedValue(function () {
+    'worklet';
+    if (isComposerFocused.value) {
+      return 0;
+    } else {
+      return chatListScrollY.value > windowHeight * 0.75 ? 1 : 0;
+    }
+  });
+}
+
+export function jumpToButtonOpacity(scrollDownButtonOpacity, isComposerFocused) {
+  return useDerivedValue(function () {
+    'worklet';
+    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 0 : 1);
+  });
+}
+
+export function jumpToButtonPosition(scrollDownButtonOpacity, isComposerFocused) {
+  return useDerivedValue(function () {
+    'worklet';
+    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 35 : 0);
+  });
+}
@@ -1,26 +0,0 @@
-import { useDerivedValue, withTiming } from 'react-native-reanimated';
-
-export function scrollDownButtonOpacity(chatListScrollY, isComposerFocused, windowHeight) {
-  return useDerivedValue(function () {
-    'worklet';
-    if (isComposerFocused.value) {
-      return 0;
-    } else {
-      return chatListScrollY.value > windowHeight * 0.75 ? 1 : 0;
-    }
-  });
-}
-
-export function jumpToButtonOpacity(scrollDownButtonOpacity, isComposerFocused) {
-  return useDerivedValue(function () {
-    'worklet';
-    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 0 : 1);
-  });
-}
-
-export function jumpToButtonPosition(scrollDownButtonOpacity, isComposerFocused) {
-  return useDerivedValue(function () {
-    'worklet';
-    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 35 : 0);
-  });
-}
@@ -1,14 +0,0 @@
-import { withTiming, runOnJS } from 'react-native-reanimated';
-
-export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callback) {
-  return function (event) {
-    'worklet';
-    const currentY = event.contentOffset.y;
-    const layoutHeight = event.layoutMeasurement.height;
-    const contentSizeY = event.contentSize.height - layoutHeight;
-    const newDistance = contentSizeY - currentY;
-    distanceFromListTop.value = newDistance;
-    chatListScrollY.value = currentY;
-    runOnJS(callback)(layoutHeight, newDistance);
-  };
-}
@@ -1,40 +0,0 @@
-import { useDerivedValue, withTiming, interpolate } from 'react-native-reanimated';
-
-export function navigationHeaderOpacity(distanceFromListTop, isAllLoaded, isCalculationsComplete, startPosition) {
-  return useDerivedValue(function () {
-    'worklet';
-    const isCalculationsCompleteValue = isCalculationsComplete.value;
-    if (distanceFromListTop.value < startPosition && isAllLoaded.value) {
-      return isCalculationsCompleteValue ? withTiming(0) : 0;
-    } else {
-      return isCalculationsCompleteValue ? withTiming(1) : 1;
-    }
-  });
-}
-
-export function navigationHeaderPosition(distanceFromListTop, isAllLoaded, topBarHeight, startPosition) {
-  return useDerivedValue(function () {
-    'worklet';
-    return distanceFromListTop.value < startPosition && isAllLoaded.value ? withTiming(topBarHeight) : withTiming(0);
-  });
-}
-
-export function interpolateNavigationViewOpacity(props) {
-  return useDerivedValue(function () {
-    'worklet';
-    const {
-      'all-loaded?': isAllLoaded,
-      'end-position': endPosition,
-      'start-position': startPosition,
-      'distance-from-list-top': distanceFromListTop,
-    } = props;
-    if (isAllLoaded.value) {
-      return interpolate(distanceFromListTop.value, [startPosition, endPosition], [0, 1], {
-        extrapolateLeft: 'clamp',
-        extrapolateRight: 'clamp',
-      });
-    } else {
-      return 1;
-    }
-  });
-}
@@ -1,15 +0,0 @@
-import { useDerivedValue } from 'react-native-reanimated';
-
-export function placeholderOpacity(isCalculationsComplete) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isCalculationsComplete.value ? 0 : 1;
-  });
-}
-
-export function placeholderZIndex(isCalculationsComplete) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isCalculationsComplete.value ? 0 : 2;
-  });
-}
@@ -1,8 +1,5 @@
 (ns legacy.status-im.data-store.communities
-  (:require
-    [clojure.set :as set]
-    [clojure.walk :as walk]
-    [status-im.constants :as constants]))
+  (:require [clojure.set :as set]))

 (defn rpc->channel-permissions
  [rpc-channels-permissions]
@@ -10,68 +7,3 @@
               (fn [{:keys [viewAndPostPermissions viewOnlyPermissions]}]
                 {:view-only     (set/rename-keys viewOnlyPermissions {:satisfied :satisfied?})
                  :view-and-post (set/rename-keys viewAndPostPermissions {:satisfied :satisfied?})})))
-
-(defn <-revealed-accounts-rpc
-  [accounts]
-  (mapv
-   #(set/rename-keys % {:isAirdropAddress :airdrop-address?})
-   (js->clj accounts :keywordize-keys true)))
-
-(defn <-request-to-join-community-rpc
-  [r]
-  (set/rename-keys r
-                   {:communityId :community-id
-                    :publicKey   :public-key
-                    :chatId      :chat-id}))
-
-(defn <-requests-to-join-community-rpc
-  [requests key-fn]
-  (reduce #(assoc %1 (key-fn %2) (<-request-to-join-community-rpc %2)) {} requests))
-
-(defn <-chats-rpc
-  [chats]
-  (reduce-kv (fn [acc k v]
-               (assoc acc
-                      (name k)
-                      (-> v
-                          (assoc :can-post? (:canPost v))
-                          (dissoc :canPost)
-                          (update :members walk/stringify-keys))))
-             {}
-             chats))
-
-(defn <-categories-rpc
-  [categ]
-  (reduce-kv #(assoc %1 (name %2) %3) {} categ))
-
-(defn <-rpc
-  [c]
-  (-> c
-      (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
-                        :lastOpenedAt                :last-opened-at
-                        :joinedAt                    :joined-at})
-      (update :admin-settings
-              set/rename-keys
-              {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
-      (update :members walk/stringify-keys)
-      (update :chats <-chats-rpc)
-      (update :token-permissions seq)
-      (update :categories <-categories-rpc)
-      (assoc :membership-permissions?
-             (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))
-                     {}
-                     (:communityTokensMetadata c)))))
@@ -51,9 +51,3 @@
      (visibility-status-updates/<-rpc-settings)
      (set/rename-keys {:compressedKey :compressed-key
                        :emojiHash     :emoji-hash})))
-
-(defn rpc->setting-value
-  [{:keys [name] :as setting}]
-  (condp = name
-    :currency (update setting :value keyword)
-    setting))
@@ -231,7 +231,7 @@
  [db]
  (into #{}
        (remove #(= (:type %) :watch)
-                (map #(eip55/address->checksum (:address %)) (vals (get-in db [:wallet :accounts]))))))
+                (map #(eip55/address->checksum (:address %)) (get db :profile/wallet-accounts)))))

 ;;NOTE we want to handle only last resolve
 (def resolve-last-id (atom nil))
@@ -79,15 +79,10 @@
    "recent-history-ready"                     (recent-history-fetching-ended cofx event)
    "fetching-history-error"                   (fetching-error cofx event)
    "non-archival-node-detected"               (non-archival-node-detected cofx event)
-    "pending-transaction-status-changed"       {:fx
-                                                [[:dispatch
-                                                  [:wallet/pending-transaction-status-changed-received
-                                                   event]]]}
    "wallet-owned-collectibles-filtering-done" {:fx [[:dispatch
                                                      [:wallet/owned-collectibles-filtering-done
                                                       event]]]}
    "wallet-get-collectibles-details-done"     {:fx [[:dispatch
                                                      [:wallet/get-collectible-details-done
                                                       event]]]}
-    "wallet-tick-reload"                       {:fx [[:dispatch [:wallet/reload]]]}
    (log/debug ::unknown-wallet-event :type type :event event)))
@@ -43,7 +43,6 @@
    [react-native.permissions :as permissions]
    [react-native.platform :as platform]
    [status-im.common.biometric.events :as biometric]
-    status-im.common.serialization
    status-im.common.standard-authentication.events
    [status-im.common.theme.core :as theme]
    [status-im.common.universal-links :as universal-links]
@@ -246,7 +246,7 @@
        [rn/touchable-opacity
         {:on-press #(do
                       (rf/dispatch [:pop-to-root :shell-stack])
-                       (rf/dispatch [:communities/navigate-to-community-overview (:id community)])
+                       (rf/dispatch [:navigate-to :community-overview (:id community)])
                       (rf/dispatch [:chat/close]))}
         [rn/text
          {:style {:text-align :center
@@ -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 {}})

@@ -377,88 +377,81 @@
 (defn mock
  [module]
  (case module
-    "react-native-languages"                           react-native-languages
-    "react-native-background-timer"                    background-timer
-    "react-native-image-crop-picker"                   image-crop-picker
-    "react-native-gesture-handler"                     react-native-gesture-handler
-    "react-native-static-safe-area-insets"             react-native-static-safe-area-insets
-    "react-native-config"                              config
-    "react-native-iphone-x-helper"                     (clj->js {:getStatusBarHeight (fn [])
-                                                                 :getBottomSpace     (fn [])})
-    "react-native-screens"                             (clj->js {})
-    "react-native-reanimated"                          react-native-reanimated
-    "react-native-redash"                              react-native-redash
-    "react-native-fetch-polyfill"                      fetch
-    "react-native-status-keycard"                      status-keycard
-    "react-native-keychain"                            keychain
-    "react-native-biometrics"                          react-native-biometrics
-    "@react-native-community/netinfo"                  net-info
-    "react-native-dialogs"                             dialogs
-    "react-native"                                     react-native
-    "react-native-fs"                                  fs
-    "react-native-mail"                                react-native-mail
-    "react-native-image-resizer"                       image-resizer
-    "react-native-haptic-feedback"                     react-native-haptic-feedback
-    "react-native-device-info"                         react-native-device-info
-    "react-native-push-notification"                   react-native-push-notification
-    "react-native-linear-gradient"                     react-native-gradien
-    "@react-native-community/masked-view"              masked-view
-    "react-native-blob-util"                           react-native-blob-util
-    "react-native-navigation"                          react-native-navigation
-    "@react-native-community/push-notification-ios"    push-notification-ios
-    "@react-native-community/blur"                     react-native-blur
-    "@react-native-camera-roll/camera-roll"            react-native-camera-roll
-    "react-native-camera-kit"                          react-native-camera-kit
-    "react-native-permissions"                         react-native-permissions
-    "rn-emoji-keyboard"                                rn-emoji-keyboard
-    "react-native-hole-view"                           react-native-hole-view
-    "react-native-draggable-flatlist"                  react-native-draggable-flatlist
-    "react-native-webview"                             react-native-webview
-    "@react-native-community/audio-toolkit"            react-native-audio-toolkit
-    "react-native-image-viewing"                       react-native-image-viewing
-    "react-native-share"                               react-native-share
-    "@react-native-async-storage/async-storage"        async-storage
-    "react-native-svg"                                 react-native-svg
-    "react-native-transparent-video"                   react-native-transparent-video
-    "react-native-orientation-locker"                  react-native-orientation-locker
-    "react-native-gifted-charts"                       react-native-gifted-charts
-    "../resources/data/emojis/en.json"                 (js/JSON.parse
-                                                        (slurp
-                                                         "./resources/data/emojis/en.json"))
-    "../src/js/worklets/core.js"                       worklet-factory
-    "../src/js/worklets/shell/bottom_tabs.js"          #js {}
-    "../src/js/worklets/shell/home_stack.js"           #js {}
-    "../src/js/worklets/shell/floating_screen.js"      #js {}
-    "../src/js/worklets/bottom_sheet.js"               #js {}
-    "../src/js/worklets/record_audio.js"               #js {}
-    "../src/js/worklets/scroll_view.js"                #js {}
-    "../src/js/worklets/onboarding_carousel.js"        #js {}
-    "../src/js/worklets/chat/messenger/lightbox.js"    #js {}
-    "../src/js/worklets/chat/messenger/messages.js"    #js {}
-    "../src/js/worklets/chat/messenger/navigation.js"  #js {}
-    "../src/js/worklets/chat/messenger/composer.js"    #js {}
-    "../src/js/worklets/chat/messenger/placeholder.js" #js {}
-    "../src/js/worklets/parallax.js"                   #js {}
-    "../src/js/worklets/identifiers_highlighting.js"   #js {}
-    "./fleets.js"                                      default-fleets
-    "../translations/ar.json"                          (js/JSON.parse (slurp "./translations/ar.json"))
-    "../translations/de.json"                          (js/JSON.parse (slurp "./translations/de.json"))
-    "../translations/en.json"                          (js/JSON.parse (slurp "./translations/en.json"))
-    "../translations/es.json"                          (js/JSON.parse (slurp "./translations/es.json"))
-    "../translations/es_419.json"                      (js/JSON.parse (slurp
-                                                                       "./translations/es_419.json"))
-    "../translations/fil.json"                         (js/JSON.parse (slurp "./translations/fil.json"))
-    "../translations/fr.json"                          (js/JSON.parse (slurp "./translations/fr.json"))
-    "../translations/id.json"                          (js/JSON.parse (slurp "./translations/id.json"))
-    "../translations/it.json"                          (js/JSON.parse (slurp "./translations/it.json"))
-    "../translations/ko.json"                          (js/JSON.parse (slurp "./translations/ko.json"))
-    "../translations/pt_BR.json"                       (js/JSON.parse (slurp
-                                                                       "./translations/pt_BR.json"))
-    "../translations/ru.json"                          (js/JSON.parse (slurp "./translations/ru.json"))
-    "../translations/tr.json"                          (js/JSON.parse (slurp "./translations/tr.json"))
-    "../translations/zh.json"                          (js/JSON.parse (slurp "./translations/zh.json"))
-    "../translations/zh_hant.json"                     (js/JSON.parse (slurp
-                                                                       "./translations/zh_hant.json"))
-    "../translations/zh_TW.json"                       (js/JSON.parse (slurp
-                                                                       "./translations/zh_TW.json"))
+    "react-native-languages"                         react-native-languages
+    "react-native-background-timer"                  background-timer
+    "react-native-image-crop-picker"                 image-crop-picker
+    "react-native-gesture-handler"                   react-native-gesture-handler
+    "react-native-static-safe-area-insets"           react-native-static-safe-area-insets
+    "react-native-config"                            config
+    "react-native-iphone-x-helper"                   (clj->js {:getStatusBarHeight (fn [])
+                                                               :getBottomSpace     (fn [])})
+    "react-native-screens"                           (clj->js {})
+    "react-native-reanimated"                        react-native-reanimated
+    "react-native-redash"                            react-native-redash
+    "react-native-fetch-polyfill"                    fetch
+    "react-native-status-keycard"                    status-keycard
+    "react-native-keychain"                          keychain
+    "react-native-touch-id"                          touchid
+    "@react-native-community/netinfo"                net-info
+    "react-native-dialogs"                           dialogs
+    "react-native"                                   react-native
+    "react-native-fs"                                fs
+    "react-native-mail"                              react-native-mail
+    "react-native-image-resizer"                     image-resizer
+    "react-native-haptic-feedback"                   react-native-haptic-feedback
+    "react-native-device-info"                       react-native-device-info
+    "react-native-push-notification"                 react-native-push-notification
+    "react-native-linear-gradient"                   react-native-gradien
+    "@react-native-community/masked-view"            masked-view
+    "react-native-blob-util"                         react-native-blob-util
+    "react-native-navigation"                        react-native-navigation
+    "@react-native-community/push-notification-ios"  push-notification-ios
+    "@react-native-community/blur"                   react-native-blur
+    "@react-native-camera-roll/camera-roll"          react-native-camera-roll
+    "react-native-camera-kit"                        react-native-camera-kit
+    "react-native-permissions"                       react-native-permissions
+    "rn-emoji-keyboard"                              rn-emoji-keyboard
+    "react-native-hole-view"                         react-native-hole-view
+    "react-native-draggable-flatlist"                react-native-draggable-flatlist
+    "react-native-webview"                           react-native-webview
+    "@react-native-community/audio-toolkit"          react-native-audio-toolkit
+    "react-native-image-viewing"                     react-native-image-viewing
+    "react-native-share"                             react-native-share
+    "@react-native-async-storage/async-storage"      async-storage
+    "react-native-svg"                               react-native-svg
+    "react-native-transparent-video"                 react-native-transparent-video
+    "react-native-orientation-locker"                react-native-orientation-locker
+    "react-native-gifted-charts"                     react-native-gifted-charts
+    "../resources/data/emojis/en.json"               (js/JSON.parse (slurp
+                                                                     "./resources/data/emojis/en.json"))
+    "../src/js/worklets/core.js"                     worklet-factory
+    "../src/js/worklets/shell/bottom_tabs.js"        #js {}
+    "../src/js/worklets/shell/home_stack.js"         #js {}
+    "../src/js/worklets/shell/floating_screen.js"    #js {}
+    "../src/js/worklets/bottom_sheet.js"             #js {}
+    "../src/js/worklets/record_audio.js"             #js {}
+    "../src/js/worklets/scroll_view.js"              #js {}
+    "../src/js/worklets/onboarding_carousel.js"      #js {}
+    "../src/js/worklets/chat/lightbox.js"            #js {}
+    "../src/js/worklets/chat/messages.js"            #js {}
+    "../src/js/worklets/parallax.js"                 #js {}
+    "../src/js/worklets/identifiers_highlighting.js" #js {}
+    "./fleets.js"                                    default-fleets
+    "../translations/ar.json"                        (js/JSON.parse (slurp "./translations/ar.json"))
+    "../translations/de.json"                        (js/JSON.parse (slurp "./translations/de.json"))
+    "../translations/en.json"                        (js/JSON.parse (slurp "./translations/en.json"))
+    "../translations/es.json"                        (js/JSON.parse (slurp "./translations/es.json"))
+    "../translations/es_419.json"                    (js/JSON.parse (slurp "./translations/es_419.json"))
+    "../translations/fil.json"                       (js/JSON.parse (slurp "./translations/fil.json"))
+    "../translations/fr.json"                        (js/JSON.parse (slurp "./translations/fr.json"))
+    "../translations/id.json"                        (js/JSON.parse (slurp "./translations/id.json"))
+    "../translations/it.json"                        (js/JSON.parse (slurp "./translations/it.json"))
+    "../translations/ko.json"                        (js/JSON.parse (slurp "./translations/ko.json"))
+    "../translations/pt_BR.json"                     (js/JSON.parse (slurp "./translations/pt_BR.json"))
+    "../translations/ru.json"                        (js/JSON.parse (slurp "./translations/ru.json"))
+    "../translations/tr.json"                        (js/JSON.parse (slurp "./translations/tr.json"))
+    "../translations/zh.json"                        (js/JSON.parse (slurp "./translations/zh.json"))
+    "../translations/zh_hant.json"                   (js/JSON.parse (slurp
+                                                                     "./translations/zh_hant.json"))
+    "../translations/zh_TW.json"                     (js/JSON.parse (slurp "./translations/zh_TW.json"))
    nil))
@@ -11,17 +11,17 @@
 (defn token-requirement-list-row
  [tokens padding?]
  [rn/view {:style (style/token-row padding?)}
-   (map-indexed (fn [token-index {:keys [img-src amount sufficient? purchasable?] :as token}]
-                  ^{:key token-index}
-                  [rn/view {:style style/token-tag-spacing}
-                   [token-tag/view
-                    {:token-symbol  (:symbol token)
-                     :token-img-src img-src
-                     :token-value   amount
-                     :size          :size-24
-                     :options       (cond
-                                      sufficient?  :hold
-                                      purchasable? :add)}]])
+   (map-indexed (fn [token-index token]
+                  (let [{:keys [amount sufficient? purchasable?]} token]
+                    ^{:key token-index}
+                    [rn/view {:style style/token-tag-spacing}
+                     [token-tag/view
+                      {:token-symbol (:symbol token)
+                       :token-value  amount
+                       :size         :size-24
+                       :options      (cond
+                                       sufficient?  :hold
+                                       purchasable? :add)}]]))
                tokens)])

 (defn- internal-view
@@ -76,19 +76,15 @@
   (str description " · " (i18n/label :t/on-device))])

 (defn- context-tag-subtitle
-  [{:keys [context-tag-type community-logo community-name account-name emoji customization-color]}]
-  (let [tag-type (or context-tag-type :account)]
-    [rn/view
-     {:accessibility-label :context-tag-wrapper
-      :style               {:flex-wrap :wrap}}
-     [context-tag/view
-      {:type                tag-type
-       :account-name        account-name
-       :emoji               emoji
-       :community-name      community-name
-       :community-logo      community-logo
-       :size                24
-       :customization-color customization-color}]]))
+  [{:keys [community-logo community-name]}]
+  [rn/view
+   {:accessibility-label :context-tag-wrapper
+    :style               {:flex-wrap :wrap}}
+   [context-tag/view
+    {:type           :community
+     :community-name community-name
+     :community-logo community-logo
+     :size           24}]])

 (defn- description-subtitle
  [{:keys [theme blur? description]}]
@@ -99,8 +95,7 @@
   description])

 (defn- subtitle
-  [{:keys [type theme blur? keycard? networks description community-name community-logo
-           context-tag-type account-name emoji customization-color]}]
+  [{:keys [type theme blur? keycard? networks description community-name community-logo]}]
  (cond
    (= :keypair type)
    [keypair-subtitle
@@ -123,12 +118,8 @@

    (= :context-tag type)
    [context-tag-subtitle
-     {:context-tag-type    context-tag-type
-      :community-logo      community-logo
-      :community-name      community-name
-      :account-name        account-name
-      :emoji               emoji
-      :customization-color customization-color}]
+     {:community-logo community-logo
+      :community-name community-name}]

    (and (not= :label type) description)
    [description-subtitle
@@ -182,7 +173,6 @@

 (defn- view-internal
  [{:keys [title title-icon type theme description blur? community-name community-logo button-icon
-           account-name emoji
           on-button-press
           on-button-long-press
           button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar
@@ -206,17 +196,14 @@
      :theme      theme
      :blur?      blur?}]
    [subtitle
-     {:type                type
-      :theme               theme
-      :blur?               blur?
-      :keycard?            keycard?
-      :networks            networks
-      :description         description
-      :community-name      community-name
-      :community-logo      community-logo
-      :customization-color customization-color
-      :account-name        account-name
-      :emoji               emoji}]]
+     {:type           type
+      :theme          theme
+      :blur?          blur?
+      :keycard?       keycard?
+      :networks       networks
+      :description    description
+      :community-name community-name
+      :community-logo community-logo}]]
   [right-icon
    {:theme                theme
     :type                 type
@@ -1,6 +1,6 @@
 (ns quo.components.gradient.gradient-cover.style)

 (defn root-container
-  [opacity height]
-  {:height  (or height 252)
+  [opacity]
+  {:height  252
   :opacity opacity})
@@ -6,7 +6,7 @@
    [react-native.linear-gradient :as linear-gradient]))

 (defn- view-internal
-  [{:keys [customization-color opacity container-style height] :or {customization-color :blue}}]
+  [{:keys [customization-color opacity container-style] :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
@@ -14,6 +14,6 @@
      :colors              [color-top color-bottom]
      :start               {:x 0 :y 0}
      :end                 {:x 0 :y 1}
-      :style               (merge (style/root-container opacity height) container-style)}]))
+      :style               (merge (style/root-container opacity) container-style)}]))

 (def view (quo.theme/with-theme view-internal))
@@ -1,40 +0,0 @@
-(ns quo.components.list-items.network-list.component-spec
-  (:require [quo.components.list-items.network-list.view :as network-list]
-            [quo.foundations.colors :as colors]
-            [test-helpers.component :as h]))
-
-(defn- render
-  [component]
-  (h/render-with-theme-provider component :light))
-
-(def props
-  {:theme               :light
-   :state               :default
-   :label               "Mainnet"
-   :network-image       873
-   :customization-color :blue
-   :token-value         "100.00 ETH"
-   :fiat-value          "€100.00"})
-
-
-(h/describe "List items: Network List"
-  (h/test "default state explicit"
-    (render [network-list/view props])
-    (h/is-truthy (h/get-by-text "Mainnet")))
-
-  (h/test "Pressed state"
-    (render [network-list/view props])
-    (h/fire-event :on-press-in (h/get-by-label-text ::network-list))
-    (h/wait-for #(h/has-style (h/query-by-label-text ::network-list)
-                              {:backgroundColor (colors/resolve-color :blue :light 5)})))
-
-  (h/test "Active state"
-    (render [network-list/view (assoc props :state :active)])
-    (h/has-style (h/query-by-label-text ::network-list)
-                 {:backgroundColor (colors/resolve-color :blue :light 10)}))
-
-  (h/test "Call on-press"
-    (let [on-press (h/mock-fn)]
-      (render [network-list/view (assoc props :on-press on-press)])
-      (h/fire-event :on-press (h/get-by-label-text ::network-list))
-      (h/was-called on-press))))
@@ -1,41 +0,0 @@
-(ns quo.components.list-items.network-list.style
-  (:require [quo.foundations.colors :as colors]))
-
-(defn- background-color
-  [state customization-color theme]
-  (case state
-    :pressed (colors/resolve-color customization-color theme 5)
-    :active  (colors/resolve-color customization-color theme 10)
-    :transparent))
-
-(defn container
-  [state customization-color theme]
-  {:flex-direction     :row
-   :justify-content    :space-between
-   :align-items        :center
-   :padding-horizontal 12
-   :padding-vertical   8
-   :border-radius      12
-   :height             56
-   :background-color   (background-color state customization-color theme)})
-
-(def info
-  {:flex-direction :row
-   :align-items    :center
-   :gap            2})
-
-(def network-image
-  {:border-width     1
-   :border-radius    16
-   :border-color     colors/neutral-80-opa-5
-   :margin-right     8
-   :background-color colors/neutral-80-opa-5
-   :height           32
-   :width            32})
-
-(def values-container
-  {:align-items :flex-end})
-
-(defn fiat-value
-  [theme]
-  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})
@@ -1,76 +0,0 @@
-(ns quo.components.list-items.network-list.view
-  (:require
-    [clojure.string :as string]
-    [quo.components.list-items.network-list.style :as style]
-    [quo.components.markdown.text :as text]
-    [quo.theme :as quo.theme]
-    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [schema.core :as schema]))
-
-(defn- info
-  [{:keys [network-image label]}]
-  [rn/view {:style style/info}
-   [rn/image
-    {:source network-image
-     :style  style/network-image}]
-   [rn/view
-    [text/text
-     {:weight          :semi-bold
-      :style           {:text-transform :capitalize}
-      :number-of-lines 1}
-     (if (string/blank? label) "-" label)]]])
-
-(defn- values
-  [{:keys [token-value fiat-value theme]}]
-  [rn/view {:style style/values-container}
-   [text/text
-    {:weight          :medium
-     :size            :paragraph-2
-     :number-of-lines 1}
-    token-value]
-   [text/text
-    {:style           (style/fiat-value theme)
-     :size            :paragraph-2
-     :number-of-lines 1}
-    fiat-value]])
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:network-image :int]
-      [:label :string]
-      [:fiat-value :string]
-      [:token-value :string]
-      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-      [:state {:optional true} [:enum :pressed :active :default]]
-      [:on-press {:optional true} [:maybe fn?]]
-      [:theme :schema.common/theme]]]]
-   :any])
-
-(defn- view-internal
-  []
-  (let [pressed?     (reagent/atom false)
-        on-press-in  #(reset! pressed? true)
-        on-press-out #(reset! pressed? false)]
-    (fn [{:keys [on-press state customization-color theme]
-          :as   props
-          :or   {customization-color :blue}}]
-      (let [internal-state (if @pressed?
-                             :pressed
-                             state)]
-
-        [rn/pressable
-         {:style               (style/container internal-state customization-color theme)
-          :on-press-in         on-press-in
-          :on-press-out        on-press-out
-          :on-press            on-press
-          :accessibility-label :network-list}
-         [info props]
-         [values props]]))))
-
-(def view
-  (quo.theme/with-theme
-   (schema/instrument #'view-internal ?schema)))
@@ -1,4 +1,4 @@
-(ns quo.components.list-items.user
+(ns quo.components.list-items.user-list
  (:require
    [quo.components.avatars.user-avatar.view :as user-avatar]
    [quo.components.icon :as icons]
@@ -18,14 +18,14 @@
   :align-items        :center})

 (defn action-icon
-  [{:keys [type on-press on-check disabled? checked?]} theme]
+  [{:keys [type on-press on-check disabled? checked?]}]
  [rn/touchable-opacity
   {:on-press (when on-press on-press)}
   (case type
     :options
     [icons/icon :i/options
      {:size  20
-       :color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
+       :color (colors/theme-colors colors/neutral-50 colors/neutral-40)}]
     :checkbox
     [selectors/view
      {:type                :checkbox
@@ -37,33 +37,30 @@
     [text/text "not implemented"]
     [rn/view])])

-(defn user
+(defn user-list
  [{:keys [short-chat-key primary-name secondary-name photo-path online? contact? verified?
-           untrustworthy? on-press on-long-press accessory customization-color theme]}]
-  [rn/touchable-highlight
+           untrustworthy? on-press on-long-press accessory]}]
+  [rn/touchable-opacity
   {:style               container-style
-    :underlay-color      (colors/resolve-color customization-color theme 5)
    :accessibility-label :user-list
    :on-press            (when on-press on-press)
    :on-long-press       (when on-long-press on-long-press)}
-   [:<>
-    [user-avatar/user-avatar
-     {:full-name       primary-name
-      :profile-picture photo-path
-      :online?         online?
-      :size            :small}]
-    [rn/view {:style {:margin-horizontal 8 :flex 1}}
-     [author/view
-      {:primary-name   primary-name
-       :secondary-name secondary-name
-       :contact?       contact?
-       :verified?      verified?
-       :untrustworthy? untrustworthy?
-       :size           15}]
-     (when short-chat-key
-       [text/text
-        {:size  :paragraph-2
-         :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}}
-        short-chat-key])]
-    (when accessory
-      [action-icon accessory theme])]])
+   [user-avatar/user-avatar
+    {:full-name       primary-name
+     :profile-picture photo-path
+     :online?         online?
+     :size            :small}]
+   [rn/view {:style {:margin-horizontal 8 :flex 1}}
+    [author/view
+     {:primary-name   primary-name
+      :secondary-name secondary-name
+      :contact?       contact?
+      :verified?      verified?
+      :untrustworthy? untrustworthy?}]
+    (when short-chat-key
+      [text/text
+       {:size  :paragraph-1
+        :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}}
+       short-chat-key])]
+   (when accessory
+     [action-icon accessory])])
@@ -38,7 +38,7 @@
 (defn icon-container
  [is-first?]
  {:margin-left   (if is-first? 4 2)
-   :margin-bottom 4})
+   :margin-bottom 2})

 (defn time-text
  [theme]
@@ -51,7 +51,8 @@
      [icons/icon :main-icons2/untrustworthy
       {:size            12
        :no-color        true
-        :container-style (style/icon-container contact?)}])]
+        :container-style (style/icon-container contact?)}])
+   ]
   (when (and (not verified?) short-chat-key)
     [text/text
      {:weight          :monospace
@@ -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]}]
@@ -34,9 +34,10 @@
                                                    (= :pinned use-case)
                                                    theme)
                                    container-style)}
-       [rn/text
-        {:accessibility-label :emoji}
-        (reaction.resource/system-emojis emoji)]
+       [rn/image
+        {:style               {:width 15 :height 15}
+         :accessibility-label :emoji
+         :source              (reaction.resource/get-reaction emoji)}]
       [text/text
        {:size   :paragraph-2
         :weight :semi-bold
@@ -4,14 +4,6 @@
 (def ^:private reactions
  (resolve-all-reactions))

-(def system-emojis
-  {:reaction/thumbs-up   "👍"
-   :reaction/thumbs-down "👎"
-   :reaction/love        "❤"
-   :reaction/laugh       "😂"
-   :reaction/sad         "😢"
-   :reaction/angry       "😡"})
-
 (defn get-reaction
  [reaction]
  (assert (keyword? reaction) "Reaction should be a keyword")
@@ -19,5 +19,6 @@
                               (swap! pressed? not)
                               (when on-press
                                 (on-press e)))}
-       [rn/text
-        (reactions.resource/system-emojis emoji)]])))
+       [rn/image
+        {:source (reactions.resource/get-reaction emoji)
+         :style  {:width 20 :height 20}}]])))
@@ -8,20 +8,19 @@

 (defn- category-internal
  [{:keys [label data container-style] :as props}]
-  (let [settings-item (filter identity data)]
-    [rn/view {:style (merge (style/container label) container-style)}
-     (when label
-       [text/text
-        {:weight :medium
-         :size   :paragraph-2
-         :style  (style/label props)}
-        label])
-     [rn/view {:style (style/settings-items props)}
-      (for [item settings-item]
-        ^{:key item}
-        [:<>
-         [settings-item/view item]
-         (when-not (= item (last settings-item))
-           [rn/view {:style (style/settings-separator props)}])])]]))
+  [rn/view {:style (merge (style/container label) container-style)}
+   (when label
+     [text/text
+      {:weight :medium
+       :size   :paragraph-2
+       :style  (style/label props)}
+      label])
+   [rn/view {:style (style/settings-items props)}
+    (for [item data]
+      ^{:key item}
+      [:<>
+       [settings-item/view item]
+       (when-not (= item (last data))
+         [rn/view {:style (style/settings-separator props)}])])]])

 (def settings-category (quo.theme/with-theme category-internal))
@@ -20,7 +20,7 @@
           network-image]
    :or   {subtitle-type :default}}]
  [rn/view {:style style/subtitle-container}
-   (when (and subtitle-type (not= :small size))
+   (when (not= :small size)
     [rn/view {:style (style/subtitle-icon-container subtitle-type)}
      (case subtitle-type
        :icon    [icons/icon icon
@@ -16,12 +16,6 @@
   :padding-top        12
   :padding-bottom     8})

-(def gradient-bg
-  {:position :absolute
-   :top      0
-   :left     0
-   :right    0})
-
 ;;; Header
 (def header-container
  {:flex-direction :row
@@ -4,13 +4,14 @@
            [oops.core :as oops]
            [quo.components.avatars.account-avatar.view :as account-avatar]
            [quo.components.buttons.button.view :as button]
-            [quo.components.gradient.gradient-cover.view :as gradient-cover]
            [quo.components.markdown.text :as text]
            [quo.components.share.qr-code.view :as qr-code]
            [quo.components.share.share-qr-code.style :as style]
            [quo.components.tabs.tab.view :as tab]
            [quo.theme]
+            [react-native.blur :as blur]
            [react-native.core :as rn]
+            [react-native.platform :as platform]
            [reagent.core :as reagent]
            [utils.i18n :as i18n]))

@@ -125,44 +126,41 @@
  [{:keys [share-qr-type qr-image-uri component-width customization-color full-name
           profile-picture emoji on-share-press]
    :as   props}]
-  [:<>
-   [rn/view {:style style/gradient-bg}
-    [gradient-cover/view {:customization-color customization-color :height 463}]]
-   [rn/view {:style style/content-container}
+  [rn/view {:style style/content-container}
+   [rn/view
+    {:style style/share-qr-container}
    [rn/view
-     {:style style/share-qr-container}
-     [rn/view
-      {:style style/share-qr-inner-container}
-      [account-avatar/view
-       {:customization-color customization-color
-        :emoji               emoji
-        :size                32}]
-      [text/text
-       {:size   :heading-2
-        :weight :semi-bold
-        :style  {:margin-left 8}} full-name]]
-     [share-button {:on-press on-share-press}]]
-    (when (#{:wallet-legacy :wallet-multichain} share-qr-type)
-      [header props])
-    [quo.theme/provider {:theme :light}
-     [qr-code/view
-      {:qr-image-uri        qr-image-uri
-       :size                (style/qr-code-size component-width)
-       :avatar              (if (= share-qr-type :profile)
-                              :profile
-                              :wallet-account)
-       :customization-color customization-color
-       :full-name           full-name
-       :profile-picture     profile-picture
-       :emoji               emoji}]]
-    [rn/view {:style style/bottom-container}
-     (case share-qr-type
-       :profile           [profile-bottom props]
-       :wallet-legacy     [wallet-legacy-bottom props]
-       :wallet-multichain [wallet-multichain-bottom props]
-       nil)]]])
+     {:style style/share-qr-inner-container}
+     [account-avatar/view
+      {:customization-color customization-color
+       :emoji               emoji
+       :size                32}]
+     [text/text
+      {:size   :heading-2
+       :weight :semi-bold
+       :style  {:margin-left 8}} full-name]]
+    [share-button {:on-press on-share-press}]]
+   (when (#{:wallet-legacy :wallet-multichain} share-qr-type)
+     [header props])
+   [quo.theme/provider {:theme :light}
+    [qr-code/view
+     {:qr-image-uri        qr-image-uri
+      :size                (style/qr-code-size component-width)
+      :avatar              (if (= share-qr-type :profile)
+                             :profile
+                             :wallet-account)
+      :customization-color customization-color
+      :full-name           full-name
+      :profile-picture     profile-picture
+      :emoji               emoji}]]
+   [rn/view {:style style/bottom-container}
+    (case share-qr-type
+      :profile           [profile-bottom props]
+      :wallet-legacy     [wallet-legacy-bottom props]
+      :wallet-multichain [wallet-multichain-bottom props]
+      nil)]])

-(defn- view-internal
+(defn view
  "Receives the following properties:
   - type:                :profile | :wallet-legacy | :wallet-multichain
   - qr-image-uri:        Image source value.
@@ -192,9 +190,16 @@
     Sometimes while using a blur layer on top of another on Android, this component looks
     bad because of the `blur/view`, so we can set `unblur-on-android? true` to fix it.
     "
-  [props]
+  [{:keys [unblur-on-android?] :as props}]
  (reagent/with-let [component-width     (reagent/atom nil)
-                     container-component [rn/view {:background-color style/overlay-color}]]
+                     container-component (if (and platform/android? unblur-on-android?)
+                                           [rn/view {:background-color style/overlay-color}]
+                                           [blur/view
+                                            {:blur-radius      20
+                                             :blur-amount      20
+                                             :blur-type        :transparent
+                                             :overlay-color    style/overlay-color
+                                             :background-color style/overlay-color}])]
    [quo.theme/provider {:theme :dark}
     [rn/view
      {:accessibility-label :share-qr-code
@@ -206,6 +211,3 @@
               (-> props
                   (assoc :component-width @component-width)
                   (clojure.set/rename-keys {:type :share-qr-type}))]))]]))
-
-
-(def view (quo.theme/with-theme view-internal))
@@ -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
@@ -20,7 +20,7 @@
    - :token-symbol - string"
  []
  (let [container-width (reagent/atom 0)]
-    (fn [{:keys [options size blur? theme token-value token-img-src token-symbol]
+    (fn [{:keys [options size blur? theme token-value token-symbol]
          :or   {size :size-24}}]
      [rn/view
       {:on-layout #(reset! container-width
@@ -42,12 +42,11 @@
                  [])}
        [rn/view {:style (style/container size options blur? theme)}
         [token/view
-          {:style        (style/token-img size)
-           :token        token-symbol
-           :size         (case size
-                           :size-24 :size-20
-                           :size-32 :size-28)
-           :image-source token-img-src}]
+          {:style (style/token-img size)
+           :token token-symbol
+           :size  (case size
+                    :size-24 :size-20
+                    :size-32 :size-28)}]
         [text/text
          {:size   :paragraph-2
           :weight :medium
@@ -15,7 +15,9 @@
     [: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]]]]]
+     [:image-source {:optional true} [:or :schema.common/image-source :string]]
+     ;; If true, adds `data:image/png;base64,` as prefix to the string passed as `image-source`
+     [:add-b64-prefix? {:optional true} boolean?]]]
   :any])

 (defn- size->number
@@ -50,32 +52,28 @@
            first
            string/capitalize)]])

-(defn- normalize-b64-string
-  [b64-image]
-  (if (string/starts-with? b64-image "data:image/")
-    b64-image
-    (str b64-png-image-prefix b64-image)))
-
 (defn view-internal
  "Render a token image.
   Props:
-   - style:        extra styles to apply to the `rn/image` component.
-   - size:         `:size-nn` or just `nn`, being `nn` any number. Defaults to 32.
-   - token:        string or keyword, it can contain upper case letters or not.
-                   E.g. all of these are valid and resolve to the same:
-                   :token/snt | :snt | :SNT | \"SNT\" | \"snt\".
-   - image-source: Ignores `token` and uses this as parameter to `rn/image`'s source, it
-                   can be a b64 string representing an image.
+   - style:           extra styles to apply to the `rn/image` component.
+   - size:            `:size-nn` or just `nn`, being `nn` any number. Defaults to 32.
+   - token:           string or keyword, it can contain upper case letters or not.
+                      E.g. all of these are valid and resolve to the same:
+                      :token/snt | :snt | :SNT | \"SNT\" | \"snt\".
+   - image-source:    Ignores `token` and uses this as parameter to `rn/image`'s source.
+   - add-b64-prefix?: If true, adds `data:image/png;base64,` as prefix to the string
+                      passed as `image-source`.
  "
-  [{:keys [token size style image-source]
+  [{:keys [token size style image-source add-b64-prefix?]
    :or   {size 32}}]
-  (let [img-src (if (string? image-source)
-                  (normalize-b64-string image-source)
-                  image-source)]
-    (if-let [existing-source (or img-src (token-loader/get-token-image token))]
+  (let [b64-string (if (and image-source add-b64-prefix?)
+                     (str b64-png-image-prefix image-source)
+                     image-source)
+        source     (or b64-string (token-loader/get-token-image token))]
+    (if source
      [rn/image
       {:style  (token-style style size)
-        :source existing-source}]
+        :source source}]
      [temp-empty-symbol token size style])))

 (def view (schema/instrument #'view-internal ?schema))
@@ -4,7 +4,7 @@

 (defn container
  [network state theme]
-  {:width              136
+  {:flex               1
   :height             44
   :border-width       1
   :border-radius      12
@@ -10,12 +10,8 @@
    [react-native.core :as rn]))

 (defn network-bridge-add
-  [{:keys [network state theme container-style on-press]}]
-  [rn/pressable
-   {:style    (merge (style/container network state theme)
-                     (style/add-container theme)
-                     container-style)
-    :on-press on-press}
+  [{:keys [network state theme]}]
+  [rn/view {:style (merge (style/container network state theme) (style/add-container theme))}
   [icon/icon :i/add-circle {:size 12 :no-color true}]])

 (defn- network->text
@@ -25,14 +21,13 @@
        :else                 (string/capitalize (name network))))

 (defn view-internal
-  [{:keys [theme network status amount container-style on-press] :as args}]
+  [{:keys [theme network status amount container-style] :as args}]
  (if (= status :add)
    [network-bridge-add args]
-    [rn/pressable
+    [rn/view
     {:style               (merge (style/container network status theme) container-style)
      :accessible          true
-      :accessibility-label :container
-      :on-press            on-press}
+      :accessibility-label :container}
     (if (= status :loading)
       [rn/view
        {:style               (style/loading-skeleton theme)
@@ -33,22 +33,22 @@
    [rn/view
     {:style               style/networks-container
      :accessibility-label :networks}
-     (when (and ethereum (pos? (:amount ethereum)))
+     (when (pos? ethereum)
       [network-amount
        {:network  :ethereum
-         :amount   (str (:amount ethereum) " " (or (:token-symbol ethereum) "ETH"))
+         :amount   (str ethereum " ETH")
         :divider? (or show-arbitrum? show-optimism?)
         :theme    theme}])
     (when show-optimism?
       [network-amount
        {:network  :optimism
-         :amount   (str (:amount optimism) " " (or (:token-symbol optimism) "OPT"))
+         :amount   (str optimism " OPT")
         :divider? show-arbitrum?
         :theme    theme}])
     (when show-arbitrum?
       [network-amount
        {:network :arbitrum
-         :amount  (str (:amount arbitrum) " " (or (:token-symbol arbitrum) "ARB"))
+         :amount  (str arbitrum " ARB")
         :theme   theme}])]))

 (defn- view-internal
@@ -1,7 +1,8 @@
 (ns quo.components.wallet.token-input.style
  (:require
    [quo.foundations.colors :as colors]
-    [quo.foundations.typography :as typography]))
+    [quo.foundations.typography :as typography]
+    [react-native.platform :as platform]))

 (defn main-container
  [width]
@@ -15,55 +16,23 @@
   :flex-direction     :row
   :justify-content    :space-between})

-(defn token-name
-  [theme]
-  {:color          (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
-   :margin-right   8
-   :padding-bottom 2})
-
-(def token-label-container
-  {:position       :absolute
-   :left           40 ; token image size + margin
-   :right          0
-   :bottom         0
-   :top            0
-   :flex-direction :row
-   :align-items    :flex-end})
-
-(def text-input-container
-  {:position :absolute
-   :top      0
-   :bottom   0
-   :left     40 ; token image size + margin
-   :right    0})
-
-(def text-input-dimensions
-  (-> typography/heading-1
-      (dissoc :letter-spacing)
-      (assoc :font-weight    "600"
-             :margin-right   5
-             :padding-left   0
-             :padding-right  0
-             :padding-top    0
-             :padding-bottom 0
-             :height         "100%")))
-
 (defn text-input
-  [theme error?]
-  (assoc text-input-dimensions
-         :color
-         (if error?
-           (colors/resolve-color :danger theme)
-           (colors/theme-colors colors/neutral-100 colors/white theme))))
-
-(defn placeholder-text
  [theme]
-  (colors/theme-colors colors/neutral-40 colors/neutral-50 theme))
+  (merge typography/heading-1
+         {:font-weight  "600"
+          :margin-left  8
+          :margin-right (if platform/ios? 6 4)
+          :color        (colors/theme-colors colors/neutral-100 colors/white theme)
+          :padding      0
+          :flex         1
+          :height       "100%"}))

 (defn divider
-  [theme]
-  {:margin-vertical  8
-   :background-color (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)})
+  [width theme]
+  {:height           1
+   :width            width
+   :background-color (colors/theme-colors colors/neutral-10 colors/neutral-90 theme)
+   :margin-vertical  8})

 (def data-container
  {:padding-top        4
@@ -71,7 +40,3 @@
   :flex-direction     :row
   :justify-content    :space-between
   :align-items        :center})
-
-(defn fiat-amount
-  [theme]
-  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})
@@ -7,137 +7,85 @@
    [quo.components.tags.network-tags.view :as network-tag]
    [quo.components.utilities.token.view :as token]
    [quo.components.wallet.token-input.style :as style]
+    [quo.foundations.colors :as colors]
    [quo.foundations.common :as common]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [reagent.core :as reagent]))

-(defn fiat-format
-  [currency num-value conversion]
-  (str (get common/currency-label currency) (.toFixed (* num-value conversion) 2)))
-
-(defn crypto-format
-  [num-value conversion crypto-decimals token]
-  (str (.toFixed (/ num-value conversion) (or crypto-decimals 2))
-       " "
-       (string/upper-case (or (clj->js token) ""))))
-
 (defn calc-value
-  [{:keys [crypto? currency token value conversion crypto-decimals]}]
-  (let [num-value (if (string? value)
-                    (or (parse-double value) 0)
-                    value)]
+  [crypto? currency token value conversion]
+  (let [num-value (if (string? value) (parse-double (or value "0")) value)]
    (if crypto?
-      (fiat-format currency num-value conversion)
-      (crypto-format num-value conversion crypto-decimals token))))
-
-(defn- data-info
-  [{:keys [theme token crypto-decimals conversion networks title crypto? currency amount error?]}]
-  [rn/view {:style style/data-container}
-   [network-tag/view
-    {:networks networks
-     :title    title
-     :status   (when error? :error)}]
-   [text/text
-    {:size   :paragraph-2
-     :weight :medium
-     :style  (style/fiat-amount theme)}
-    (calc-value {:crypto?         crypto?
-                 :currency        currency
-                 :token           token
-                 :value           amount
-                 :conversion      conversion
-                 :crypto-decimals crypto-decimals})]])
-
-(defn- token-name-text
-  [theme text]
-  [text/text
-   {:style  (style/token-name theme)
-    :size   :paragraph-2
-    :weight :semi-bold}
-   (string/upper-case (or (clj->js text) ""))])
-
-(defn- token-label
-  [{:keys [theme value text]}]
-  [rn/view
-   {:style          style/token-label-container
-    :pointer-events :none}
-   [rn/text-input
-    {:max-length  12
-     :style       style/text-input-dimensions
-     :editable    false
-     :placeholder "0"
-     :opacity     0
-     :value       value}]
-   [token-name-text theme text]])
-
-(defn input-section
-  [{: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
-        :style    {:flex 1}}
-       [token/view
-        {:token token
-         :size  :size-32}]
-       [rn/view {:style style/text-input-container}
-        [rn/text-input
-         (cond-> {:style                    (style/text-input theme error?)
-                  :placeholder-text-color   (style/placeholder-text theme)
-                  :auto-focus               true
-                  :ref                      set-ref
-                  :placeholder              "0"
-                  :keyboard-type            :numeric
-                  :max-length               12
-                  :on-change-text           handle-on-change-text
-                  :selection-color          customization-color
-                  :show-soft-input-on-focus show-keyboard?}
-           controlled-input?       (assoc :value value)
-           (not controlled-input?) (assoc :default-value @value-atom))]]
-       [token-label
-        {:theme theme
-         :text  (if crypto? token currency)
-         :value (if controlled-input? value @value-atom)}]])))
+      (str (get common/currency-label currency) (.toFixed (* num-value conversion) 2))
+      (str (.toFixed (/ num-value conversion) 2) " " (string/upper-case (or (clj->js token) ""))))))

 (defn- view-internal
-  [{: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)}
+  [{external-value :value}]
+  (let [width             (:width (rn/get-window))
+        value             (reagent/atom nil)
+        crypto?           (reagent/atom true)
+        input-ref         (atom nil)
+        controlled-input? (some? external-value)]
+    (fn [{:keys          [theme token currency conversion networks title customization-color
+                          on-change-text on-swap container-style show-keyboard?]
+          :or            {show-keyboard? true}
+          external-value :value}]
+      [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?)]
+        [rn/pressable
+         {:on-press #(when @input-ref (.focus ^js @input-ref))
+          :style    {:flex-direction :row
+                     :flex-grow      1
+                     :align-items    :flex-end}}
+         [token/view {:token token :size :size-32}]
+         [rn/text-input
+          (cond-> {:auto-focus               true
+                   :ref                      #(reset! input-ref %)
+                   :placeholder              "0"
+                   :placeholder-text-color   (colors/theme-colors colors/neutral-40
+                                                                  colors/neutral-50
+                                                                  theme)
+                   :keyboard-type            :numeric
+                   :max-length               12
+                   :on-change-text           (fn [v]
+                                               (when-not controlled-input?
+                                                 (reset! value v))
+                                               (when on-change-text
+                                                 (on-change-text v)))
+                   :style                    (style/text-input theme)
+                   :selection-color          customization-color
+                   :show-soft-input-on-focus show-keyboard?}
+            controlled-input?       (assoc :value external-value)
+            (not controlled-input?) (assoc :default-value @value))]
+         [text/text
+          {:size   :paragraph-2
+           :weight :semi-bold
+           :style  {:color          (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+                    :margin-right   8
+                    :padding-bottom 2}}
+          (string/upper-case (or (clj->js (if @crypto? token currency)) ""))]]
        [button/button
         {:icon                true
          :icon-only?          true
          :size                32
-          :on-press            handle-on-swap
+          :on-press            (fn []
+                                 (swap! crypto? not)
+                                 (when on-swap
+                                   (on-swap @crypto?)))
          :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))]])))
+       [divider-line/view {:container-style {:margin-vertical 8}}]
+       [rn/view {:style style/data-container}
+        [network-tag/view {:networks networks :title title}]
+        [text/text
+         {:size   :paragraph-2
+          :weight :medium
+          :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
+         (calc-value @crypto? currency token (or external-value @value) conversion)]]])))

 (def view (quo.theme/with-theme view-internal))
@@ -80,14 +80,13 @@
    quo.components.list-items.community.view
    quo.components.list-items.dapp.view
    quo.components.list-items.menu-item
-    quo.components.list-items.network-list.view
    quo.components.list-items.preview-list.view
    quo.components.list-items.quiz-item.view
    quo.components.list-items.saved-address.view
    quo.components.list-items.saved-contact-address.view
    quo.components.list-items.token-network.view
    quo.components.list-items.token-value.view
-    quo.components.list-items.user
+    quo.components.list-items.user-list
    quo.components.loaders.skeleton-list.view
    quo.components.markdown.list.view
    quo.components.markdown.text
@@ -300,17 +299,16 @@
 (def account-list-card quo.components.list-items.account-list-card.view/view)
 (def address quo.components.list-items.address.view/view)
 (def channel quo.components.list-items.channel.view/view)
-(def community-list quo.components.list-items.community.view/view)
+(def community-list-item quo.components.list-items.community.view/view)
 (def dapp quo.components.list-items.dapp.view/view)
 (def menu-item quo.components.list-items.menu-item/menu-item)
-(def network-list quo.components.list-items.network-list.view/view)
 (def preview-list quo.components.list-items.preview-list.view/view)
 (def quiz-item quo.components.list-items.quiz-item.view/view)
 (def saved-address quo.components.list-items.saved-address.view/view)
 (def saved-contact-address quo.components.list-items.saved-contact-address.view/view)
 (def token-network quo.components.list-items.token-network.view/view)
 (def token-value quo.components.list-items.token-value.view/view)
-(def user quo.components.list-items.user/user)
+(def user-list quo.components.list-items.user-list/user-list)

 ;;;; Loaders
 (def skeleton-list quo.components.loaders.skeleton-list.view/view)
@@ -48,7 +48,6 @@
    quo.components.list-items.channel.component-spec
    quo.components.list-items.community.component-spec
    quo.components.list-items.dapp.component-spec
-    quo.components.list-items.network-list.component-spec
    quo.components.list-items.quiz-item.component-spec
    quo.components.list-items.saved-address.component-spec
    quo.components.list-items.saved-contact-address.component-spec
@@ -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])
@@ -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)]
@@ -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]
@@ -17,19 +17,19 @@
  (fn [^js data]
    (let [^js section (.-section data)]
      (reagent/as-element [f
-                           {:index (.-index section)
-                            :title (.-title section)
+                           {:title (.-title section)
                            :data  (.-data section)}]))))

 (defn- wrap-per-section-render-fn
-  [index props]
-  (-> (if-let [f (:render-fn props)]
-        (assoc (dissoc props :render-fn :render-data)
-               :renderItem
-               (memo-wrap-render-fn f (:render-data props)))
-        props)
-      (update :data to-array)
-      (assoc :index index)))
+  [props]
+  (update
+   (if-let [f (:render-fn props)]
+     (assoc (dissoc props :render-fn :render-data)
+            :renderItem
+            (memo-wrap-render-fn f (:render-data props)))
+     props)
+   :data
+   to-array))

 (defn section-list
  "A wrapper for SectionList.
@@ -42,8 +42,6 @@
          props
          (when render-section-footer-fn
            {:renderSectionFooter (wrap-render-section-header-fn render-section-footer-fn)})
-          {:sections            (->> sections
-                                     (map-indexed wrap-per-section-render-fn)
-                                     (clj->js))
+          {:sections            (clj->js (map wrap-per-section-render-fn sections))
           :renderSectionHeader (wrap-render-section-header-fn render-section-header-fn)
           :style               style})])
@@ -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))
@@ -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"))))))
@@ -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}))))))))))
@@ -1,5 +0,0 @@
-(ns status-im.common.contact-list.style)
-
-(defn contacts-section-header
-  [first-item?]
-  {:padding-top (if first-item? 0 8)})
@@ -1,10 +1,7 @@
 (ns status-im.common.contact-list.view
  (:require
-    [quo.core :as quo]
-    [react-native.core :as rn]
-    [status-im.common.contact-list.style :as style]))
+    [quo.core :as quo]))

 (defn contacts-section-header
-  [{:keys [title index]}]
-  [rn/view (style/contacts-section-header (= index 0))
-   [quo/divider-label title]])
+  [{:keys [title]}]
+  [quo/divider-label title])
@@ -6,21 +6,17 @@

 (defn contact-list-item
  [{:keys [on-press on-long-press accessory]}
-   {:keys [primary-name secondary-name public-key compressed-key ens-verified added?]}
-   theme]
-  (let [photo-path          (rf/sub [:chats/photo-path public-key])
-        online?             (rf/sub [:visibility-status-updates/online? public-key])
-        customization-color (rf/sub [:profile/customization-color])]
-    [quo/user
-     {:customization-color customization-color
-      :theme               theme
-      :short-chat-key      (address/get-shortened-compressed-key (or compressed-key public-key))
-      :primary-name        primary-name
-      :secondary-name      secondary-name
-      :photo-path          photo-path
-      :online?             online?
-      :verified?           ens-verified
-      :contact?            added?
-      :on-press            on-press
-      :on-long-press       on-long-press
-      :accessory           accessory}]))
+   {:keys [primary-name secondary-name public-key compressed-key ens-verified added?]}]
+  (let [photo-path (rf/sub [:chats/photo-path public-key])
+        online?    (rf/sub [:visibility-status-updates/online? public-key])]
+    [quo/user-list
+     {:short-chat-key (address/get-shortened-compressed-key (or compressed-key public-key))
+      :primary-name   primary-name
+      :secondary-name secondary-name
+      :photo-path     photo-path
+      :online?        online?
+      :verified?      ens-verified
+      :contact?       added?
+      :on-press       on-press
+      :on-long-press  on-long-press
+      :accessory      accessory}]))
@@ -52,8 +52,7 @@
     :remove-listeners    remove-listeners}))

 (defn view
-  [{:keys [header footer customization-color footer-container-padding gradient-cover?]
-    :or   {footer-container-padding (safe-area/get-top)}} &
+  [{:keys [header footer customization-color gradient-cover?]} &
   children]
  (reagent/with-let [window-height                (:height (rn/get-window))
                     footer-container-height      (reagent/atom 0)
@@ -95,7 +94,7 @@
               children)]
        [rn/keyboard-avoiding-view
         {:style                    style/keyboard-avoiding-view
-          :keyboard-vertical-offset (if platform/ios? footer-container-padding 0)
+          :keyboard-vertical-offset (if platform/ios? (safe-area/get-top) 0)
          :pointer-events           :box-none}
         [floating-container/view
          {:on-layout       set-footer-container-height
@@ -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
@@ -1,37 +0,0 @@
-(ns status-im.common.lightbox.events
-  (:require [reagent.core :as reagent]
-            status-im.common.lightbox.effects
-            [utils.re-frame :as rf]))
-
-(rf/reg-event-fx :lightbox/navigate-to-lightbox
- (fn [{:keys [db]} [animation-shared-element-id screen-params]]
-   (reagent/next-tick #(rf/dispatch [:navigate-to :lightbox screen-params]))
-   {:db (assoc db :animation-shared-element-id animation-shared-element-id)}))
-
-(rf/reg-event-fx :lightbox/update-animation-shared-element-id
- (fn [{:keys [db]} [animation-shared-element-id]]
-   {:db (assoc db :animation-shared-element-id animation-shared-element-id)}))
-
-(rf/reg-event-fx :lightbox/exit-lightbox-signal
- (fn [{:keys [db]} [value]]
-   {:db (assoc db :lightbox/exit-signal value)}))
-
-(rf/reg-event-fx :lightbox/zoom-out-signal
- (fn [{:keys [db]} [value]]
-   {:db (assoc db :lightbox/zoom-out-signal value)}))
-
-(rf/reg-event-fx :lightbox/orientation-change
- (fn [{:keys [db]} [value]]
-   {:db (assoc db :lightbox/orientation value)}))
-
-(rf/reg-event-fx :lightbox/lightbox-scale
- (fn [{:keys [db]} [value]]
-   {:db (assoc db :lightbox/scale value)}))
-
-(rf/reg-event-fx :lightbox/share-image
- (fn [_ [uri]]
-   {:effects.lightbox/share-image uri}))
-
-(rf/reg-event-fx :lightbox/save-image-to-gallery
- (fn [_ [uri on-success]]
-   {:effects.lightbox/save-image-to-gallery [uri on-success]}))
@@ -38,9 +38,6 @@
   :no-contacts
   {:light (js/require "../resources/images/ui2/no-contacts-light.png")
    :dark  (js/require "../resources/images/ui2/no-contacts-dark.png")}
-   :no-contacts-to-chat
-   {:light (js/require "../resources/images/ui2/no-contacts-to-chat-light.png")
-    :dark  (js/require "../resources/images/ui2/no-contacts-to-chat-dark.png")}
   :keycard-chip
   {:light (js/require "../resources/images/ui2/keycard-chip-light.png")
    :dark  (js/require "../resources/images/ui2/keycard-chip-dark.png")}
@@ -259,6 +259,12 @@
  {:type    :wallet-account
   :account (when account (string/lower-case account))})

+(defn community-route-type
+  [route-params]
+  (if (string/starts-with? (:community-id route-params) "z")
+    :desktop-community
+    :community))
+
 (defn handle-uri
  [chain chats uri cb]
  (let [{:keys [handler route-params query-params]} (match-uri uri)]
@@ -291,14 +297,14 @@
      (cb {:type handler :community-id (:community-id route-params)})

      (and (= handler :community) (:community-id route-params))
-      (cb {:type         :community
+      (cb {:type         (community-route-type route-params)
           :community-id (:community-id route-params)})

      (and (= handler :community-chat) (:community-channel-id route-params) (:community-id route-params))
      (match-community-channel-async route-params cb)

      (and (= handler :community-chat) (:community-id route-params))
-      (cb {:type         :community
+      (cb {:type         (community-route-type route-params)
           :community-id (:community-id route-params)})

      ;; NOTE: removed in `match-uri`, might need this in the future
@@ -1,27 +0,0 @@
-(ns status-im.common.serialization
-  (:require
-    [native-module.core :as native-module]
-    [status-im.constants :as constants]
-    [utils.re-frame :as rf]
-    [utils.transforms :as transforms]))
-
-(rf/reg-fx :serialization/deserialize-and-compress-key
- (fn [{:keys [serialized-key on-success on-error]}]
-   (native-module/deserialize-and-compress-key
-    serialized-key
-    (fn [resp]
-      (let [{:keys [error]} (transforms/json->clj resp)]
-        (if error
-          (on-error error)
-          (on-success resp)))))))
-
-(rf/reg-fx :serialization/decompress-public-key
- (fn [{:keys [compressed-key on-success on-error]}]
-   (native-module/compressed-key->public-key
-    compressed-key
-    constants/deserialization-key
-    (fn [resp]
-      (let [{:keys [error]} (transforms/json->clj resp)]
-        (if error
-          (on-error error)
-          (on-success (str "0x" (subs resp 5)))))))))
@@ -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 {}))))
@@ -2,12 +2,12 @@
  (:require
    [clojure.string :as string]
    [goog.string :as gstring]
+    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
    [react-native.async-storage :as async-storage]
    [react-native.core :as rn]
    [schema.core :as schema]
    [status-im.constants :as constants]
-    [status-im.contexts.communities.events :as communities.events]
    [status-im.navigation.events :as navigation]
    [taoensso.timbre :as log]
    [utils.ethereum.chain :as chain]
@@ -68,6 +68,32 @@
  (log/info "universal-links: handling community request  " community-id)
  (navigation/navigate-to cofx :community-requests-to-join {:community-id community-id}))

+(rf/defn handle-community
+  [cofx {:keys [community-id]}]
+  (log/info "universal-links: handling community" community-id)
+  (navigation/navigate-to cofx :community {:community-id community-id}))
+
+(rf/defn handle-navigation-to-desktop-community-from-mobile
+  {:events [:handle-navigation-to-desktop-community-from-mobile]}
+  [cofx deserialized-key]
+  (rf/merge
+   cofx
+   {:dispatch [:navigate-to :community-overview deserialized-key]}
+   (navigation/pop-to-root :shell-stack)))
+
+(rf/defn handle-desktop-community
+  [_ {:keys [community-id]}]
+  (native-module/deserialize-and-compress-key
+   community-id
+   (fn [deserialized-key]
+     (rf/dispatch [:chat.ui/fetch-community (str deserialized-key)])
+     (rf/dispatch [:handle-navigation-to-desktop-community-from-mobile (str deserialized-key)]))))
+
+(rf/defn handle-community-chat
+  [cofx {:keys [chat-id]}]
+  (log/info "universal-links: handling community chat" chat-id)
+  {:dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]})
+
 (rf/defn handle-view-profile
  [{:keys [db] :as cofx} {:keys [public-key ens-name]}]
  (log/info "universal-links: handling view profile" public-key)
@@ -117,13 +143,14 @@

 (rf/defn on-handle
  {:events [::match-value]}
-  [cofx url {:keys [type chat-id] :as data}]
+  [cofx url {:keys [type] :as data}]
  (case type
    :group-chat         (handle-group-chat cofx data)
    :private-chat       (handle-private-chat cofx data)
    :community-requests (handle-community-requests cofx data)
-    :community          (communities.events/navigate-to-serialized-community cofx data)
-    :community-chat     {:dispatch [:communities/navigate-to-community-chat chat-id :pop-to-root]}
+    :community          (handle-community cofx data)
+    :desktop-community  (handle-desktop-community cofx data)
+    :community-chat     (handle-community-chat cofx data)
    :contact            (handle-view-profile cofx data)
    :browser            (handle-browse cofx data)
    :eip681             (handle-eip681 cofx data)
@@ -162,7 +162,3 @@

 (def community-accounts-selection-enabled? false)
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
-
-(def wallet-feature-flags
-  {:edit-default-keypair false
-   :bridge-token         false})
@@ -219,8 +219,7 @@
 (def regx-community-universal-link #"((^https?://status.app/)|(^status-app://))c/([\x00-\x7F]+)$")
 (def regx-deep-link #"((^ethereum:.*)|(^status-app://[\x00-\x7F]+$))")
 (def regx-ens #"^(?=.{5,255}$)([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$")
-(def regx-multichain-address #"^(?:(?:eth:|arb1:|opt:)(?=:|))*0x[0-9a-fA-F]{40}$")
-
+(def regx-address #"^0x[a-fA-F0-9]{40}$")
 (def regx-address-contains #"(?i)0x[a-fA-F0-9]{40}")
 (def regx-starts-with-uuid #"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
 (def regx-full-or-partial-address #"^0x[a-fA-F0-9]{1,40}$")
@@ -338,13 +337,6 @@
 (def ^:const local-pairing-action-sync-device 3)
 (def ^:const local-pairing-action-pairing-installation 4)

-(def ^:const serialization-key
-  "We pass this serialization key as a parameter to MultiformatSerializePublicKey
-  function at status-go, This key determines the output base of the serialization.
-  according to https://specs.status.im/spec/2#public-key-serialization we serialize
-  keys with base58btc encoding"
-  "z")
-
 (def ^:const deserialization-key
  "We pass this deserialization key as a parameter to MultiformatDeserializePublicKey
  function at status-go, This key determines the output base of the deserialization.
@@ -378,10 +370,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)
@@ -440,6 +432,3 @@
 (def ^:const send-type-stickers-buy 4)
 (def ^:const send-type-bridge 5)
 (def ^:const send-type-erc-721-transfer 6)
-
-(def ^:const bridge-name-transfer "Transfer")
-(def ^:const bridge-name-erc-721-transfer "ERC721Transfer")
@@ -29,7 +29,7 @@
     {:icon                :i/add-user
      :accessibility-label :add-a-contact
      :label               (i18n/label :t/add-a-contact)
-      :sub-label           (i18n/label :t/enter-chat-key)
+      :sub-label           (i18n/label :t/enter-a-chat-key)
      :add-divider?        true
      :on-press            #(debounce/dispatch-and-chill
                             [:open-modal :new-contact]
@@ -4,12 +4,13 @@
    [legacy.status-im.chat.models.loading :as loading]
    [legacy.status-im.data-store.chats :as chats-store]
    [re-frame.core :as re-frame]
-    status-im.common.lightbox.events
+    [reagent.core :as reagent]
    [status-im.common.muting.helpers :refer [format-mute-till]]
    [status-im.constants :as constants]
    [status-im.contexts.chat.contacts.events :as contacts-store]
    status-im.contexts.chat.effects
    [status-im.contexts.chat.messenger.composer.link-preview.events :as link-preview]
+    status-im.contexts.chat.messenger.lightbox.events
    status-im.contexts.chat.messenger.messages.content.reactions.events
    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events :as delete-for-me]
    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
@@ -393,6 +394,38 @@
  [cofx chat-id]
  (navigation/navigate-to cofx :chat-pinned-messages {:chat-id chat-id}))

+
+(rf/defn update-shared-element-id
+  {:events [:chat.ui/update-shared-element-id]}
+  [{:keys [db]} shared-element-id]
+  {:db (assoc db :shared-element-id shared-element-id)})
+
+(rf/defn navigate-to-lightbox
+  {:events [:chat.ui/navigate-to-lightbox]}
+  [{:keys [db]} shared-element-id screen-params]
+  (reagent/next-tick #(rf/dispatch [:navigate-to :lightbox screen-params]))
+  {:db (assoc db :shared-element-id shared-element-id)})
+
+(rf/defn exit-lightbox-signal
+  {:events [:chat.ui/exit-lightbox-signal]}
+  [{:keys [db]} value]
+  {:db (assoc db :lightbox/exit-signal value)})
+
+(rf/defn zoom-out-signal
+  {:events [:chat.ui/zoom-out-signal]}
+  [{:keys [db]} value]
+  {:db (assoc db :lightbox/zoom-out-signal value)})
+
+(rf/defn orientation-change
+  {:events [:chat.ui/orientation-change]}
+  [{:keys [db]} value]
+  {:db (assoc db :lightbox/orientation value)})
+
+(rf/defn lightbox-scale
+  {:events [:chat.ui/lightbox-scale]}
+  [{:keys [db]} value]
+  {:db (assoc db :lightbox/scale value)})
+
 (rf/defn check-last-chat
  {:events [:chat/check-last-chat]}
  [{:keys [db]}]
@@ -419,15 +452,3 @@
  {:events [:chat.ui/scroll-to-bottom]}
  [_]
  {:effects.chat/scroll-to-bottom nil})
-
-(rf/reg-event-fx :chat.ui/clear-sending-images
- (fn [{:keys [db]}]
-   {:db (update-in db [:chat/inputs (:current-chat-id db) :metadata] assoc :sending-image {})}))
-
-(rf/reg-event-fx :chat.ui/image-unselected
- (fn [{:keys [db]} [original]]
-   (let [current-chat-id (:current-chat-id db)]
-     {:db (update-in db
-                     [:chat/inputs current-chat-id :metadata :sending-image]
-                     dissoc
-                     (:uri original))})))
@@ -1,7 +1,21 @@
 (ns status-im.contexts.chat.home.add-new-contact.effects
  (:require
    [legacy.status-im.ethereum.ens :as ens]
-    [utils.re-frame :as rf]))
+    [native-module.core :as native-module]
+    [status-im.constants :as constants]
+    [utils.re-frame :as rf]
+    [utils.transforms :as transforms]))
+
+(rf/reg-fx :effects.contacts/decompress-public-key
+ (fn [{:keys [compressed-key on-success on-error]}]
+   (native-module/compressed-key->public-key
+    compressed-key
+    constants/deserialization-key
+    (fn [resp]
+      (let [{:keys [error]} (transforms/json->clj resp)]
+        (if error
+          (on-error error)
+          (on-success (str "0x" (subs resp 5)))))))))

 (rf/reg-fx :effects.contacts/resolve-public-key-from-ens
 (fn [{:keys [chain-id ens on-success on-error]}]
@@ -104,7 +104,7 @@
      :empty            {:db (dissoc db :contacts/new-identity)}
      (:valid :invalid) {:db (assoc db :contacts/new-identity contact)}
      :decompress-key   {:db (assoc db :contacts/new-identity contact)
-                         :serialization/decompress-public-key
+                         :effects.contacts/decompress-public-key
                         {:compressed-key id
                          :on-success
                          (dispatcher :contacts/set-new-identity-success input)
@@ -132,7 +132,7 @@
                             :type            :compressed-key
                             :public-key      nil ; not yet...
                             :state           :decompress-key}))
-                :serialization/decompress-public-key
+                :effects.contacts/decompress-public-key
                {:compressed-key user-ckey
                 :on-success     [:contacts/set-new-identity-success user-ckey]
                 :on-error       [:contacts/set-new-identity-error user-ckey]}})))
@@ -21,7 +21,7 @@
  []
  {:size   :heading-1
   :weight :semi-bold
-   :style  {:margin-top    28
+   :style  {:margin-top    32
            :margin-bottom 6
            :color         (colors/theme-colors colors/neutral-100 colors/white)}})

@@ -16,38 +16,33 @@

 (defn- no-contacts-view
  [{:keys [theme]}]
-  (let [customization-color (rf/sub [:profile/customization-color])]
-    [rn/view
-     {:style (style/no-contacts)}
-     [rn/image {:source (resources/get-themed-image :no-contacts-to-chat theme)}]
-     [quo/text
-      {:weight :semi-bold
-       :size   :paragraph-1
-       :style  {:margin-bottom 2
-                :margin-top    12}}
-      (i18n/label :t/you-have-no-contacts)]
-     [quo/text
-      {:weight :regular
-       :size   :paragraph-2}
-      (i18n/label :t/dont-yell-at-me)]
-     [quo/button
-      {:customization-color customization-color
-       :theme               theme
-       :type                :primary
-       :size                32
-       :container-style     {:margin-top    20
-                             :margin-bottom 12}
-       :on-press            #(rf/dispatch [:invite.events/share-link])}
-      (i18n/label :t/invite-friends)]
-     [quo/button
-      {:customization-color customization-color
-       :theme               theme
-       :type                :grey
-       :size                32
-       :on-press            #(do
-                               (rf/dispatch [:navigate-back])
-                               (rf/dispatch [:open-modal :new-contact]))}
-      (i18n/label :t/add-a-contact)]]))
+  [rn/view
+   {:style (style/no-contacts)}
+   [rn/image {:source (resources/get-themed-image :no-contacts theme)}]
+   [quo/text
+    {:weight :semi-bold
+     :size   :paragraph-1
+     :style  {:margin-bottom 2
+              :margin-top    12}}
+    (i18n/label :t/you-have-no-contacts)]
+   [quo/text
+    {:weight :regular
+     :size   :label}
+    (i18n/label :t/dont-yell-at-me)]
+   [quo/button
+    {:type            :primary
+     :size            32
+     :container-style {:margin-top    20
+                       :margin-bottom 12}
+     :on-press        #(rf/dispatch [:invite.events/share-link])}
+    (i18n/label :t/invite-friends)]
+   [quo/button
+    {:type     :grey
+     :size     32
+     :on-press #(do
+                  (rf/dispatch [:navigate-back])
+                  (rf/dispatch [:open-modal :new-contact]))}
+    (i18n/label :t/add-a-contact)]])

 (defn contact-item-render
  [_]
@@ -73,7 +73,7 @@
                                              :shared-value scroll-shared-value})}])))

 (defn contact-item-render
-  [{:keys [public-key] :as item} theme]
+  [{:keys [public-key] :as item}]
  (let [current-pk           (rf/sub [:multiaccount/public-key])
        show-profile-actions #(rf/dispatch [:show-bottom-sheet
                                            {:content (fn [] [actions/contact-actions item])}])]
@@ -83,8 +83,7 @@
        :on-long-press show-profile-actions
        :accessory     {:type     :options
                        :on-press show-profile-actions}})
-     item
-     theme]))
+     item]))

 (defn contacts
  [{:keys [theme pending-contact-requests set-scroll-ref scroll-shared-value]}]
@@ -106,8 +105,7 @@
        :sections                          items
        :sticky-section-headers-enabled    false
        :render-section-header-fn          contact-list/contacts-section-header
-        :render-fn                         (fn [data]
-                                             (contact-item-render data theme))
+        :render-fn                         contact-item-render
        :scroll-event-throttle             8
        :on-scroll                         #(common.banner/set-scroll-shared-value
                                             {:scroll-input (oops/oget % "nativeEvent.contentOffset.y")
@@ -30,7 +30,7 @@
  (js/setTimeout #(reanimated/set-shared-value background-y
                                               (- window-height))
                 300)
-  (rf/dispatch [:chat.ui/send-current-message])
+  (rf/dispatch [:chat.ui/replace-mentions-and-send-current-message])
  (rf/dispatch [:chat.ui/set-input-maximized false])
  (rf/dispatch [:chat.ui/set-input-content-height comp-constants/input-height])
  (rf/dispatch [:chat.ui/set-chat-input-text nil])
@@ -16,19 +16,13 @@
 (defn reenter-screen-effect
  [{:keys [text-value saved-cursor-position maximized?]}
   {:keys [content-height]}
-   {:keys [input-content-height input-text input-maximized?]}
-   {:keys [height]}]
-  (let [lines            (utils/calc-lines input-content-height)
-        minimized-height (if (or (= lines 1) (empty? input-text))
-                           constants/input-height
-                           constants/multiline-minimized-height)]
-    (when (and (empty? @text-value) (not= input-text nil))
-      (reset! text-value input-text)
-      (reset! content-height input-content-height)
-      (reset! saved-cursor-position (count input-text))
-      (reanimated/set-shared-value height minimized-height))
-    (when input-maximized?
-      (reset! maximized? true))))
+   {:keys [input-content-height input-text input-maximized?]}]
+  (when (and (empty? @text-value) (not= input-text nil))
+    (reset! text-value input-text)
+    (reset! content-height input-content-height)
+    (reset! saved-cursor-position (count input-text)))
+  (when input-maximized?
+    (reset! maximized? true)))

 (defn maximized-effect
  [{:keys [maximized?]}
@@ -107,15 +101,16 @@
   [max-height])
  (rn/use-effect
   (fn []
-     (reenter-screen-effect state dimensions subscriptions animations))
+     (reenter-screen-effect state dimensions subscriptions))
   [max-height subscriptions]))

 (defn use-edit
  [{:keys [input-ref]}
   {:keys [text-value saved-cursor-position cursor-position]}
   {:keys [edit input-with-mentions]}
-   chat-screen-layout-calculations-complete?]
-  (let [mention? (some #(= :mention (first %)) (seq input-with-mentions))]
+   messages-list-on-layout-finished?]
+  (let [mention?              (some #(= :mention (first %)) (seq input-with-mentions))
+        composer-just-opened? (not @messages-list-on-layout-finished?)]
    (rn/use-effect
     (fn []
       (let [mention-text     (reduce (fn [acc item]
@@ -127,9 +122,7 @@
                                ;; NOTE: using text-value for cases when the user
                                ;; leaves the app with an unfinished edit and re-opens
                                ;; the chat.
-                                (and (seq @text-value)
-                                     (not (reanimated/get-shared-value
-                                           chat-screen-layout-calculations-complete?)))
+                                (and (seq @text-value) composer-just-opened?)
                                @text-value
                                :else (get-in edit [:content :text]))
             selection-pos    (count edit-text)
@@ -151,9 +144,7 @@
           ;; UI. This way, `on-focus` will trigger first without changing the height, after which
           ;; `on-content-size-change` will animate the height of the input based on the injected
           ;; text.
-           (js/setTimeout #(do (when (reanimated/get-shared-value
-                                      chat-screen-layout-calculations-complete?)
-                                 (.focus ^js @input-ref))
+           (js/setTimeout #(do (when @messages-list-on-layout-finished? (.focus ^js @input-ref))
                               (reagent/next-tick inject-edit-text))
                          600))))
     [(:message-id edit)])))
@@ -162,12 +153,12 @@
  [{:keys [input-ref]}
   {:keys [container-opacity]}
   {:keys [reply]}
-   chat-screen-layout-calculations-complete?]
+   messages-list-on-layout-finished?]
  (rn/use-effect
   (fn []
     (when reply
       (reanimated/animate container-opacity 1))
-     (when (and reply @input-ref (reanimated/get-shared-value chat-screen-layout-calculations-complete?))
+     (when (and reply @input-ref @messages-list-on-layout-finished?)
       (js/setTimeout #(.focus ^js @input-ref) 600)))
   [(:message-id reply)]))

@@ -207,12 +207,24 @@
   (link-preview/reset-unfurled)
   (cancel-message-edit)))

-(rf/defn send-current-message
+(rf/defn replace-mentions-and-send-current-message
  "Sends message from current chat input"
-  {:events [:chat.ui/send-current-message]}
-  [{{:keys [current-chat-id] :as db} :db :as cofx}]
-  (let [{:keys [input-text metadata]} (get-in db [:chat/inputs current-chat-id])
-        editing-message               (:editing-message metadata)]
-    (if editing-message
-      (send-edited-message cofx input-text editing-message)
-      (send-messages cofx input-text current-chat-id))))
+  {:events [:chat.ui/replace-mentions-and-send-current-message]}
+  [{{:keys [current-chat-id] :as db} :db}]
+  (let [{:keys [input-text metadata]} (get-in db [:chat/inputs current-chat-id])]
+    {:json-rpc/call [{:method     "wakuext_chatMentionReplaceWithPublicKey"
+                      :params     [current-chat-id input-text]
+                      :on-error   #(log/error "[wakuext_chatMentionReplaceWithPublicKey] on-error" %)
+                      :on-success #(rf/dispatch [:chat.ui/send-current-message-with-mentions
+                                                 current-chat-id
+                                                 (:editing-message metadata)
+                                                 input-text
+                                                 %])}]}))
+
+(rf/defn send-current-message-with-mentions
+  {:events [:chat.ui/send-current-message-with-mentions]}
+  [{:keys [db] :as cofx} current-chat-id editing-message input-text new-text]
+  (rf/merge cofx
+            (if editing-message
+              (send-edited-message new-text editing-message)
+              (send-messages new-text current-chat-id))))
@@ -31,7 +31,8 @@
   :position :absolute
   :bottom   0
   :left     0
-   :right    0})
+   :right    0
+   :z-index  2})

 (defn bottom-gradient
  []
@@ -19,7 +19,6 @@
     (when show-bottom-gradient?
       [rn/pressable
        {:on-press            #(when @input-ref (.focus ^js @input-ref))
-         :style               {:z-index 1}
         :accessibility-label :bottom-gradient}
        [linear-gradient/linear-gradient (style/bottom-gradient)]])]))

@@ -16,20 +16,18 @@
 (defn focus
  "Animate to the `saved-height`, display background-overlay if needed, and set cursor position"
  [{:keys [input-ref] :as props}
-   {:keys [text-value focused? lock-selection? saved-cursor-position composer-focused? maximized?]}
+   {:keys [text-value focused? lock-selection? saved-cursor-position composer-focused?]}
   {:keys [height saved-height last-height opacity background-y container-opacity]
    :as   animations}
   {:keys [max-height] :as dimensions}]
  (reanimated/set-shared-value composer-focused? true)
  (reset! focused? true)
  (rf/dispatch [:chat.ui/set-input-focused true])
-  (let [last-height-value (reanimated/get-shared-value last-height)
-        new-height        (min max-height last-height-value)]
-    (reanimated/animate height new-height)
-    (reanimated/set-shared-value saved-height new-height)
+  (let [last-height-value (reanimated/get-shared-value last-height)]
+    (reanimated/animate height last-height-value)
+    (reanimated/set-shared-value saved-height last-height-value)
    (reanimated/animate container-opacity 1)
    (when (> last-height-value (* constants/background-threshold max-height))
-      (reset! maximized? true)
      (reanimated/animate opacity 1)
      (reanimated/set-shared-value background-y 0)))

@@ -7,7 +7,7 @@
    [status-im.contexts.chat.messenger.composer.style :as style]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]
-    [utils.worklets.chat.messenger.composer :as worklets]))
+    [utils.worklets.chat.messages :as worklets]))

 (defn bar
  [theme]
@@ -31,12 +31,12 @@
 (defn sheet-component
  [{:keys [insets
           chat-list-scroll-y
-           chat-screen-layout-calculations-complete?
           window-height
           blur-height
           opacity
           background-y
-           theme]} props state]
+           theme
+           messages-list-on-layout-finished?]} props state]
  (let [subscriptions            (utils/init-subs)
        content-height           (reagent/atom (or (:input-content-height ; Actual text height
                                                    subscriptions)
@@ -75,8 +75,8 @@
                        animations
                        dimensions
                        subscriptions)
-    (effects/use-edit props state subscriptions chat-screen-layout-calculations-complete?)
-    (effects/use-reply props animations subscriptions chat-screen-layout-calculations-complete?)
+    (effects/use-edit props state subscriptions messages-list-on-layout-finished?)
+    (effects/use-reply props animations subscriptions messages-list-on-layout-finished?)
    (effects/update-input-mention props state subscriptions)
    (effects/link-previews props state animations subscriptions)
    (effects/use-images props state animations subscriptions)
@@ -145,20 +145,22 @@
        [:f> actions/view props state animations window-height insets subscriptions]]]]]))

 (defn f-composer
-  [props]
+  [{:keys [insets chat-list-scroll-y messages-list-on-layout-finished?]}]
  (let [window-height (:height (rn/get-window))
        theme         (quo.theme/use-theme-value)
        opacity       (reanimated/use-shared-value 0)
        background-y  (reanimated/use-shared-value (- window-height)) ; Y position of background
                                                                      ; overlay
        blur-height   (reanimated/use-shared-value (+ constants/composer-default-height
-                                                      (:bottom (:insets props))))
-        extra-params  (assoc props
-                             :window-height window-height
-                             :blur-height   blur-height
-                             :opacity       opacity
-                             :background-y  background-y
-                             :theme         theme)
+                                                      (:bottom insets)))
+        extra-params  {:insets                            insets
+                       :window-height                     window-height
+                       :chat-list-scroll-y                chat-list-scroll-y
+                       :blur-height                       blur-height
+                       :opacity                           opacity
+                       :background-y                      background-y
+                       :theme                             theme
+                       :messages-list-on-layout-finished? messages-list-on-layout-finished?}
        props         (utils/init-non-reactive-state)
        state         (utils/init-reactive-state)]
    [rn/view (when platform/ios? {:style {:z-index 1}})
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.animations
+(ns status-im.contexts.chat.messenger.lightbox.animations
  (:require
    [react-native.reanimated :as reanimated]))

@@ -1,25 +1,25 @@
-(ns status-im.common.lightbox.bottom-view
+(ns status-im.contexts.chat.messenger.lightbox.bottom-view
  (:require
    [quo.foundations.colors :as colors]
    [react-native.core :as rn]
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.style :as style]
-    [status-im.common.lightbox.text-sheet.view :as text-sheet]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.view :as text-sheet]
    [utils.re-frame :as rf]))

 (defn get-small-item-layout
  [_ index]
  #js
-   {:length constants/small-image-size
-    :offset (* (+ constants/small-image-size 8) index)
+   {:length c/small-image-size
+    :offset (* (+ c/small-image-size 8) index)
    :index  index})

 (defn- f-small-image
  [item index _ {:keys [scroll-index props]}]
-  (let [size (if (= @scroll-index index) constants/focused-image-size constants/small-image-size)
+  (let [size (if (= @scroll-index index) c/focused-image-size c/small-image-size)
        size-value (anim/use-val size)
        {:keys [scroll-index-lock? small-list-ref flat-list-ref]}
        props]
@@ -27,7 +27,7 @@
    [rn/touchable-opacity
     {:active-opacity 1
      :on-press       (fn []
-                        (rf/dispatch [:lightbox/zoom-out-signal @scroll-index])
+                        (rf/dispatch [:chat.ui/zoom-out-signal @scroll-index])
                        (reset! scroll-index-lock? true)
                        (js/setTimeout #(reset! scroll-index-lock? false) 500)
                        (js/setTimeout
@@ -38,9 +38,9 @@
                           (.scrollToIndex ^js @flat-list-ref
                                           #js {:animated true :index index}))
                         (if platform/ios? 50 150))
-                        (rf/dispatch [:lightbox/update-animation-shared-element-id (:id item)]))}
+                        (rf/dispatch [:chat.ui/update-shared-element-id (:message-id item)]))}
     [reanimated/fast-image
-      {:source {:uri (:image item)}
+      {:source {:uri (:image (:content item))}
       :style  (reanimated/apply-animations-to-style {:width  size-value
                                                      :height size-value}
                                                     {:border-radius 10})}]]))
@@ -50,26 +50,20 @@
  [:f> f-small-image item index _ render-data])

 (defn bottom-view
-  [{:keys [images index scroll-index insets animations derived item-width props state transparent?
-           bottom-text-component]}]
-  (let [padding-horizontal (- (/ item-width 2) (/ constants/focused-image-size 2))]
+  [messages index scroll-index insets animations derived item-width props state transparent?]
+  (let [padding-horizontal (- (/ item-width 2) (/ c/focused-image-size 2))]
    [reanimated/linear-gradient
     {:colors   [colors/neutral-100-opa-100 colors/neutral-100-opa-80 colors/neutral-100-opa-0]
      :location [0.2 0.9]
      :start    {:x 0 :y 1}
      :end      {:x 0 :y 0}
      :style    (style/gradient-container insets animations derived transparent?)}
-     (when bottom-text-component
-       [text-sheet/view
-        {:overlay-opacity  (:overlay-opacity animations)
-         :overlay-z-index  (:overlay-z-index state)
-         :text-sheet-lock? (:text-sheet-lock? props)
-         :text-component   bottom-text-component}])
+     [text-sheet/view messages animations state props]
     [rn/flat-list
      {:ref                               #(reset! (:small-list-ref props) %)
-       :key-fn                            :id
-       :style                             {:height constants/small-list-height}
-       :data                              images
+       :key-fn                            :message-id
+       :style                             {:height c/small-list-height}
+       :data                              messages
       :render-fn                         small-image
       :render-data                       {:scroll-index scroll-index
                                           :props        props}
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.constants)
+(ns status-im.contexts.chat.messenger.lightbox.constants)

 (def ^:const small-image-size 40)
 (def ^:const focused-extra-size 16)
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.effects
+(ns status-im.contexts.chat.messenger.lightbox.effects
  (:require [react-native.blob :as blob]
            [react-native.cameraroll :as cameraroll]
            [react-native.fs :as fs]
@@ -10,7 +10,7 @@
  {:trusty platform/ios?
   :path   (str (fs/cache-dir) "/StatusIm_Image.jpeg")})

-(rf/reg-fx :effects.lightbox/share-image
+(rf/reg-fx :effects.chat/share-image
 (fn [uri]
   (blob/fetch uri
               config
@@ -20,7 +20,7 @@
                             #(fs/unlink downloaded-url)
                             #(fs/unlink downloaded-url))))))

-(rf/reg-fx :effects.lightbox/save-image-to-gallery
+(rf/reg-fx :effects.chat/save-image-to-gallery
 (fn [[uri on-success]]
   (blob/fetch uri
               config
@@ -0,0 +1,23 @@
+(ns status-im.contexts.chat.messenger.lightbox.events
+  (:require status-im.contexts.chat.messenger.lightbox.effects
+            [utils.re-frame :as rf]))
+
+(rf/reg-event-fx :chat.ui/clear-sending-images
+ (fn [{:keys [db]}]
+   {:db (update-in db [:chat/inputs (:current-chat-id db) :metadata] assoc :sending-image {})}))
+
+(rf/reg-event-fx :chat.ui/image-unselected
+ (fn [{:keys [db]} [original]]
+   (let [current-chat-id (:current-chat-id db)]
+     {:db (update-in db
+                     [:chat/inputs current-chat-id :metadata :sending-image]
+                     dissoc
+                     (:uri original))})))
+
+(rf/reg-event-fx :chat.ui/share-image
+ (fn [_ [uri]]
+   {:effects.chat/share-image uri}))
+
+(rf/reg-event-fx :chat.ui/save-image-to-gallery
+ (fn [_ [uri on-success]]
+   {:effects.chat/save-image-to-gallery [uri on-success]}))
--- a/Show More
+++ b/Show More