e2e: added gathering Status.log for failed tests

2024-09-28 16:09:06 +03:00
225 changed files with 3442 additions and 7021 deletions
@@ -97,8 +97,6 @@ nix-purge: ##@nix Completely remove Nix setup, including /nix directory
 	nix/scripts/purge.sh

 nix-update-gradle: export TARGET := gradle
-nix-update-gradle: export ORG_GRADLE_PROJECT_hermesEnabled := false
-nix-update-gradle: export ORG_GRADLE_PROJECT_universalApk := false
 nix-update-gradle: ##@nix Update maven nix expressions based on current gradle setup
 	nix/deps/gradle/generate.sh

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

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

 import groovy.json.JsonBuilder

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

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

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

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

 pipeline {

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

 pipeline {

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

 pipeline {

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

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

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

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

 pipeline {
  agent {
@@ -19,5 +19,5 @@
 Make sure to compress images before using into project.
 ```
 make shell
-./scripts/compress_image.sh image_path
+./scrips/compress_image.sh image_path
 ```
@@ -935,8 +935,6 @@ PODS:
    - React
  - react-native-orientation-locker (1.5.0):
    - React-Core
-  - react-native-pdf (6.7.5):
-    - React-Core
  - react-native-shake (3.4.0):
    - React
  - react-native-slider (3.0.0):
@@ -1235,7 +1233,6 @@ DEPENDENCIES:
  - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`)
  - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
  - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
-  - react-native-pdf (from `../node_modules/react-native-pdf`)
  - react-native-shake (from `../node_modules/react-native-shake`)
  - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
  - react-native-status (from `../modules/react-native-status`)
@@ -1380,8 +1377,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/@react-native-community/netinfo"
  react-native-orientation-locker:
    :path: "../node_modules/react-native-orientation-locker"
-  react-native-pdf:
-    :path: "../node_modules/react-native-pdf"
  react-native-shake:
    :path: "../node_modules/react-native-shake"
  react-native-slider:
@@ -1490,7 +1485,7 @@ SPEC CHECKSUMS:
  FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
  FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: c0eca6ffed0a6fde1965ef26dcc7bf528f052af4
+  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
  hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
@@ -1530,7 +1525,6 @@ SPEC CHECKSUMS:
  react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
  react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
-  react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c
  react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
  react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
  react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
@@ -253,11 +253,6 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
        utils.executeRunnableStatusGoMethod({ Statusgo.initializeApplication(request) }, callback)
    }

-    @ReactMethod
-    private fun acceptTerms(callback: Callback) {
-        Log.d(TAG, "acceptTerms")
-        utils.executeRunnableStatusGoMethod({ Statusgo.acceptTerms() }, callback)
-    }

    @ReactMethod
    fun logout() {
@@ -204,14 +204,6 @@ RCT_EXPORT_METHOD(initializeApplication:(NSString *)request
    callback(@[result]);
 }

-RCT_EXPORT_METHOD(acceptTerms:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"acceptTerms() method called");
-#endif
-    NSString *result = StatusgoAcceptTerms();
-    callback(@[result]);
-}
-
 RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"OpenAccounts() method called");
@@ -761,26 +761,6 @@ void _Logout(const FunctionCallbackInfo<Value>& args) {

 }

-void _AcceptTerms(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-
-	if (args.Length() != 0) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for AcceptTerms")));
-		return;
-	}
-
-	// Check the argument types
-
-	// Call exported Go function, which returns a C string
-	char *c = AcceptTerms();
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-}
-
 void _HashMessage(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -2018,7 +1998,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
 	NODE_SET_METHOD(exports, "initializeApplication", _InitializeApplication);
-	NODE_SET_METHOD(exports, "acceptTerms", _AcceptTerms);
 	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
@@ -4,12 +4,10 @@ androidx.activity:activity:1.2.4
 androidx.activity:activity:1.6.0
 androidx.annotation:annotation-experimental:1.1.0
 androidx.annotation:annotation-experimental:1.3.0
-androidx.annotation:annotation-jvm:1.6.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
-androidx.annotation:annotation:1.6.0
 androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
@@ -43,14 +41,12 @@ androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.2.0
 androidx.core:core-ktx:1.6.0
 androidx.core:core-ktx:1.9.0
-androidx.core:core-ktx:1.12.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.6.0
 androidx.core:core:1.9.0
-androidx.core:core:1.12.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
@@ -59,7 +55,6 @@ androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
 androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
-androidx.databinding:databinding-common:7.4.2
 androidx.databinding:databinding-common:8.1.1
 androidx.databinding:databinding-compiler-common:3.2.1
 androidx.databinding:databinding-compiler-common:3.5.3
@@ -67,7 +62,6 @@ androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
 androidx.databinding:databinding-compiler-common:7.3.1
-androidx.databinding:databinding-compiler-common:7.4.2
 androidx.databinding:databinding-compiler-common:8.1.1
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
@@ -171,7 +165,6 @@ com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
 com.android.databinding:baseLibrary:7.3.1
-com.android.databinding:baseLibrary:7.4.2
 com.android.databinding:baseLibrary:8.1.1
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.1
@@ -181,7 +174,6 @@ com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
 com.android.tools.analytics-library:crash:30.3.1
-com.android.tools.analytics-library:crash:30.4.2
 com.android.tools.analytics-library:crash:31.1.1
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
@@ -190,7 +182,6 @@ com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
 com.android.tools.analytics-library:protos:30.3.1
-com.android.tools.analytics-library:protos:30.4.2
 com.android.tools.analytics-library:protos:31.1.1
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
@@ -199,7 +190,6 @@ com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
 com.android.tools.analytics-library:shared:30.3.1
-com.android.tools.analytics-library:shared:30.4.2
 com.android.tools.analytics-library:shared:31.1.1
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
@@ -208,7 +198,6 @@ com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
 com.android.tools.analytics-library:tracker:30.3.1
-com.android.tools.analytics-library:tracker:30.4.2
 com.android.tools.analytics-library:tracker:31.1.1
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
@@ -224,14 +213,12 @@ com.android.tools.build:aapt2-proto:4.1.0-6503028
 com.android.tools.build:aapt2-proto:7.0.4-7396180
 com.android.tools.build:aapt2-proto:7.2.1-7984345
 com.android.tools.build:aapt2-proto:7.3.1-8691043
-com.android.tools.build:aapt2-proto:7.4.2-8841542
 com.android.tools.build:aapt2-proto:8.1.1-10154469
 com.android.tools.build:aapt2:8.1.1-10154469
 com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:aaptcompiler:7.0.4
 com.android.tools.build:aaptcompiler:7.2.1
 com.android.tools.build:aaptcompiler:7.3.1
-com.android.tools.build:aaptcompiler:7.4.2
 com.android.tools.build:aaptcompiler:8.1.1
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
@@ -240,7 +227,6 @@ com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
 com.android.tools.build:apksig:7.2.1
 com.android.tools.build:apksig:7.3.1
-com.android.tools.build:apksig:7.4.2
 com.android.tools.build:apksig:8.1.1
 com.android.tools.build:apkzlib:3.2.1
 com.android.tools.build:apkzlib:3.5.3
@@ -248,7 +234,6 @@ com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
 com.android.tools.build:apkzlib:7.3.1
-com.android.tools.build:apkzlib:7.4.2
 com.android.tools.build:apkzlib:8.1.1
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
@@ -259,7 +244,6 @@ com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
 com.android.tools.build:builder-model:7.3.1
-com.android.tools.build:builder-model:7.4.2
 com.android.tools.build:builder-model:8.1.1
 com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
@@ -270,7 +254,6 @@ com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
 com.android.tools.build:builder-test-api:7.3.1
-com.android.tools.build:builder-test-api:7.4.2
 com.android.tools.build:builder-test-api:8.1.1
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
@@ -281,7 +264,6 @@ com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
 com.android.tools.build:builder:7.3.1
-com.android.tools.build:builder:7.4.2
 com.android.tools.build:builder:8.1.1
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.9.0
@@ -289,7 +271,6 @@ com.android.tools.build:bundletool:0.14.0
 com.android.tools.build:bundletool:1.6.0
 com.android.tools.build:bundletool:1.8.2
 com.android.tools.build:bundletool:1.9.0
-com.android.tools.build:bundletool:1.11.4
 com.android.tools.build:bundletool:1.14.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
@@ -298,12 +279,10 @@ com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
 com.android.tools.build:gradle-api:7.3.1
-com.android.tools.build:gradle-api:7.4.2
 com.android.tools.build:gradle-api:8.1.1
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
 com.android.tools.build:gradle-core:3.0.1
-com.android.tools.build:gradle-settings-api:7.4.2
 com.android.tools.build:gradle-settings-api:8.1.1
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
@@ -314,7 +293,6 @@ com.android.tools.build:gradle:4.1.0
 com.android.tools.build:gradle:7.0.4
 com.android.tools.build:gradle:7.2.1
 com.android.tools.build:gradle:7.3.1
-com.android.tools.build:gradle:7.4.2
 com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.1
@@ -324,7 +302,6 @@ com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
 com.android.tools.build:manifest-merger:30.3.1
-com.android.tools.build:manifest-merger:30.4.2
 com.android.tools.build:manifest-merger:31.1.1
 com.android.tools.build:transform-api:1.5.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
@@ -337,7 +314,6 @@ com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
 com.android.tools.ddms:ddmlib:30.3.1
-com.android.tools.ddms:ddmlib:30.4.2
 com.android.tools.ddms:ddmlib:31.1.1
 com.android.tools.external.com-intellij:intellij-core:26.0.1
 com.android.tools.external.lombok:lombok-ast:0.2.3
@@ -353,7 +329,6 @@ com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
 com.android.tools.layoutlib:layoutlib-api:30.3.1
-com.android.tools.layoutlib:layoutlib-api:30.4.2
 com.android.tools.layoutlib:layoutlib-api:31.1.1
 com.android.tools.lint:lint-api:24.3.1
 com.android.tools.lint:lint-api:24.5.0
@@ -368,44 +343,36 @@ com.android.tools.lint:lint-model:27.1.0
 com.android.tools.lint:lint-model:30.0.4
 com.android.tools.lint:lint-model:30.2.1
 com.android.tools.lint:lint-model:30.3.1
-com.android.tools.lint:lint-model:30.4.2
 com.android.tools.lint:lint-model:31.1.1
 com.android.tools.lint:lint-typedef-remover:30.2.1
 com.android.tools.lint:lint-typedef-remover:30.3.1
-com.android.tools.lint:lint-typedef-remover:30.4.2
 com.android.tools.lint:lint-typedef-remover:31.1.1
 com.android.tools.lint:lint:24.3.1
 com.android.tools.lint:lint:24.5.0
 com.android.tools.lint:lint:26.0.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.1
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2
 com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.0.4
 com.android.tools.utp:android-device-provider-gradle-proto:30.2.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.3.1
-com.android.tools.utp:android-device-provider-gradle-proto:30.4.2
 com.android.tools.utp:android-device-provider-gradle-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2
 com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.4
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2
 com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.4
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.1
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.1
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
@@ -416,7 +383,6 @@ com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
 com.android.tools:annotations:30.3.1
-com.android.tools:annotations:30.4.2
 com.android.tools:annotations:31.1.1
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
@@ -427,7 +393,6 @@ com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
 com.android.tools:common:30.3.1
-com.android.tools:common:30.4.2
 com.android.tools:common:31.1.1
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
@@ -438,7 +403,6 @@ com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
 com.android.tools:dvlib:30.3.1
-com.android.tools:dvlib:30.4.2
 com.android.tools:dvlib:31.1.1
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
@@ -447,7 +411,6 @@ com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
 com.android.tools:repository:30.3.1
-com.android.tools:repository:30.4.2
 com.android.tools:repository:31.1.1
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
@@ -458,7 +421,6 @@ com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
 com.android.tools:sdklib:30.3.1
-com.android.tools:sdklib:30.4.2
 com.android.tools:sdklib:31.1.1
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
@@ -469,19 +431,16 @@ com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
 com.android.tools:sdk-common:30.3.1
-com.android.tools:sdk-common:30.4.2
 com.android.tools:sdk-common:31.1.1
 com.android:signflinger:4.1.0
 com.android:signflinger:7.0.4
 com.android:signflinger:7.2.1
 com.android:signflinger:7.3.1
-com.android:signflinger:7.4.2
 com.android:signflinger:8.1.1
 com.android:zipflinger:4.1.0
 com.android:zipflinger:7.0.4
 com.android:zipflinger:7.2.1
 com.android:zipflinger:7.3.1
-com.android:zipflinger:7.4.2
 com.android:zipflinger:8.1.1
 com.diffplug.durian:durian-collect:1.2.0
 com.diffplug.durian:durian-core:1.2.0
@@ -552,7 +511,6 @@ com.github.status-im:function:0.0.1
 com.github.wix-playground:ahbottomnavigation:3.3.0
 com.github.wix-playground:reflow-animator:1.0.6
 com.github.yalantis:ucrop:2.2.6-native
-com.github.zacharee:AndroidPdfViewer:4.0.1
 com.googlecode.concurrent-trees:concurrent-trees:2.6.1
 com.googlecode.javaewah:JavaEWAH:1.1.12
 com.googlecode.javaewah:JavaEWAH:1.1.13
@@ -662,7 +620,6 @@ io.grpc:grpc-protobuf:1.45.1
 io.grpc:grpc-stub:1.21.1
 io.grpc:grpc-stub:1.39.0
 io.grpc:grpc-stub:1.45.1
-io.legere:pdfiumandroid:1.0.19
 io.netty:netty-buffer:4.1.34.Final
 io.netty:netty-buffer:4.1.52.Final
 io.netty:netty-buffer:4.1.72.Final
@@ -796,16 +753,12 @@ org.jetbrains.intellij.deps:trove4j:1.0.20200330
 org.jetbrains.kotlinx:atomicfu:0.16.3
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
 org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
@@ -845,7 +798,6 @@ 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.8.20-RC2
 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
 org.jetbrains.kotlin:kotlin-scripting-common:1.9.0
@@ -862,18 +814,15 @@ 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.10
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
@@ -882,7 +831,6 @@ 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.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
@@ -893,11 +841,9 @@ 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.10
 org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-stdlib:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib:1.9.0
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
 org.jetbrains.kotlin:kotlin-tooling-core:1.9.0
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
 org.jetbrains.kotlin:kotlin-util-io:1.6.20
@@ -906,7 +852,6 @@ org.jetbrains.kotlin:kotlin-util-klib:1.6.20
 org.jetbrains.kotlin:kotlin-util-klib:1.9.0
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
-org.jetbrains:annotations:23.0.0
 org.jetbrains:markdown-jvm:0.2.1
 org.jetbrains:markdown:0.2.1
 org.json:json:20180813
@@ -52,7 +52,6 @@ https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.2.0/core-ktx-1.
 https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.6.0/core-ktx-1.6.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.8.0/core-ktx-1.8.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.9.0/core-ktx-1.9.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.12.0/core-ktx-1.12.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core-splashscreen/1.0.0/core-splashscreen-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.1/core-1.0.1.pom
@@ -66,7 +65,6 @@ https://dl.google.com/dl/android/maven2/androidx/core/core/1.5.0/core-1.5.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.6.0/core-1.6.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.8.0/core-1.8.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.9.0/core-1.9.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core/1.12.0/core-1.12.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
@@ -76,7 +74,6 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.2.1/databinding-common-7.2.1.pom
 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-common/8.1.1/databinding-common-8.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.3/databinding-compiler-common-3.5.3.pom
@@ -85,7 +82,6 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compile
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.2.1/databinding-compiler-common-7.2.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.3.1/databinding-compiler-common-7.3.1.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.4.2/databinding-compiler-common-7.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/8.1.1/databinding-compiler-common-8.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0/documentfile-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom
@@ -192,14 +188,12 @@ https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.2.1/baseLibrary-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.3.1/baseLibrary-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.4.2/baseLibrary-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/8.1.1/baseLibrary-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/4.1.0/signflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.0.4/signflinger-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.2.1/signflinger-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.3.1/signflinger-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/signflinger/7.4.2/signflinger-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/8.1.1/signflinger-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/26.0.2/animated-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/27.0.1/animated-vector-drawable-27.0.1.pom
@@ -228,7 +222,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.2.1/crash-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.3.1/crash-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.4.2/crash-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/31.1.1/crash-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
@@ -238,7 +231,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.2.1/protos-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.3.1/protos-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.4.2/protos-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/31.1.1/protos-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
@@ -248,7 +240,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.2.1/shared-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.3.1/shared-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.4.2/shared-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/31.1.1/shared-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
@@ -258,7 +249,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.2.1/tracker-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.3.1/tracker-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.4.2/tracker-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/31.1.1/tracker-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
@@ -268,7 +258,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/ann
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.2.1/annotations-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.3.1/annotations-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.4.2/annotations-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/31.1.1/annotations-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.4.0/aapt2-proto-0.4.0.pom
@@ -279,14 +268,12 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.0.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.2.1-7984345/aapt2-proto-7.2.1-7984345.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.3.0-alpha07-8248216/aapt2-proto-7.3.0-alpha07-8248216.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.3.1-8691043/aapt2-proto-7.3.1-8691043.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.4.2-8841542/aapt2-proto-7.4.2-8841542.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/8.1.1-10154469/aapt2-proto-8.1.1-10154469.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/8.1.1-10154469/aapt2-8.1.1-10154469.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/4.1.0/aaptcompiler-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.0.4/aaptcompiler-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.2.1/aaptcompiler-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3.1/aaptcompiler-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.4.2/aaptcompiler-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/8.1.1/aaptcompiler-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
@@ -296,7 +283,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apksig-7.2.1.pom
 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/apksig/8.1.1/apksig-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.3/apkzlib-3.5.3.pom
@@ -305,7 +291,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.2.1/apkzlib-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.1/apkzlib-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.4.2/apkzlib-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/8.1.1/apkzlib-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
@@ -315,7 +300,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.2.1/builder-model-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.3.1/builder-model-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.4.2/builder-model-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/8.1.1/builder-model-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
@@ -325,7 +309,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.2.1/builder-test-api-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.3.1/builder-test-api-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.4.2/builder-test-api-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/8.1.1/builder-test-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
@@ -335,7 +318,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/bu
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.2.1/builder-7.2.1.pom
 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/builder/8.1.1/builder-8.1.1.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.9.0/bundletool-0.9.0.pom
@@ -343,7 +325,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.6.0/bundletool-1.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.8.2/bundletool-1.8.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.9.0/bundletool-1.9.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.11.4/bundletool-1.11.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.14.0/bundletool-1.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
@@ -353,10 +334,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.2.1/gradle-api-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.3.1/gradle-api-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.4.2/gradle-api-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/8.1.1/gradle-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-api/7.4.2/gradle-settings-api-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-api/8.1.1/gradle-settings-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
@@ -366,7 +345,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gra
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.2.1/gradle-7.2.1.pom
 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/gradle/8.1.1/gradle-8.1.1.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-beta04/jetifier-core-1.0.0-beta04.pom
@@ -384,7 +362,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.2.1/manifest-merger-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.3.1/manifest-merger-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.4.2/manifest-merger-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/31.1.1/manifest-merger-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
@@ -394,7 +371,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-2
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.2.1/common-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.1/common-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/common/30.4.2/common-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/31.1.1/common-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
@@ -404,7 +380,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.2.1/ddmlib-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.1/ddmlib-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.4.2/ddmlib-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/31.1.1/ddmlib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
@@ -414,7 +389,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.1/dvlib-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.3.1/dvlib-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.4.2/dvlib-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/31.1.1/dvlib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/31.1.1/intellij-core-31.1.1.pom
@@ -429,7 +403,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-ap
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.2.1/layoutlib-api-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.3.1/layoutlib-api-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.4.2/layoutlib-api-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/31.1.1/layoutlib-api-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/31.1.1/lint-api-31.1.1.pom
@@ -444,11 +417,9 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/27.1.0
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.0.4/lint-model-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.2.1/lint-model-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.3.1/lint-model-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.4.2/lint-model-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/31.1.1/lint-model-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.2.1/lint-typedef-remover-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.3.1/lint-typedef-remover-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.4.2/lint-typedef-remover-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/31.1.1/lint-typedef-remover-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/31.1.1/lint-31.1.1.pom
@@ -461,7 +432,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.2.1/repository-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.1/repository-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.4.2/repository-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/31.1.1/repository-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
@@ -471,7 +441,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-2
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.2.1/sdklib-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.1/sdklib-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.4.2/sdklib-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/31.1.1/sdklib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
@@ -481,43 +450,35 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.2.1/sdk-common-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.3.1/sdk-common-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.4.2/sdk-common-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/31.1.1/sdk-common-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.2.1/android-device-provider-ddmlib-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.3.1/android-device-provider-ddmlib-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.4.2/android-device-provider-ddmlib-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/31.1.1/android-device-provider-ddmlib-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.0.4/android-device-provider-gradle-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.2.1/android-device-provider-gradle-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.3.1/android-device-provider-gradle-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.4.2/android-device-provider-gradle-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/31.1.1/android-device-provider-gradle-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.2.1/android-test-plugin-host-additional-test-output-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.3.1/android-test-plugin-host-additional-test-output-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.4.2/android-test-plugin-host-additional-test-output-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/31.1.1/android-test-plugin-host-additional-test-output-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-apk-installer-proto/31.1.1/android-test-plugin-host-apk-installer-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.2.1/android-test-plugin-host-coverage-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.3.1/android-test-plugin-host-coverage-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.4.2/android-test-plugin-host-coverage-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/31.1.1/android-test-plugin-host-coverage-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-emulator-control-proto/31.1.1/android-test-plugin-host-emulator-control-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-logcat-proto/31.1.1/android-test-plugin-host-logcat-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.0.4/android-test-plugin-host-retention-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.2.1/android-test-plugin-host-retention-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.3.1/android-test-plugin-host-retention-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.4.2/android-test-plugin-host-retention-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/31.1.1/android-test-plugin-host-retention-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.0.4/android-test-plugin-result-listener-gradle-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.2.1/android-test-plugin-result-listener-gradle-proto-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.3.1/android-test-plugin-result-listener-gradle-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.4.2/android-test-plugin-result-listener-gradle-proto-30.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/31.1.1/android-test-plugin-result-listener-gradle-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.1.0/zipflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.0.4/zipflinger-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.1/zipflinger-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.3.1/zipflinger-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.4.2/zipflinger-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/8.1.1/zipflinger-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom
@@ -533,7 +494,6 @@ https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1.
 https://jitpack.io/com/github/wix-playground/ahbottomnavigation/3.3.0/ahbottomnavigation-3.3.0.pom
 https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animator-1.0.6.pom
 https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom
-https://jitpack.io/com/github/zacharee/AndroidPdfViewer/4.0.1/AndroidPdfViewer-4.0.1.pom
 https://plugins.gradle.org/m2/com/adarshr/gradle-test-logger-plugin/2.0.0/gradle-test-logger-plugin-2.0.0.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver-convention/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.5.0/org.gradle.toolchains.foojay-resolver-convention.gradle.plugin-0.5.0.pom
 https://plugins.gradle.org/m2/org/gradle/toolchains/foojay-resolver/0.5.0/foojay-resolver-0.5.0.pom
@@ -546,7 +506,7 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-co
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.1/commons-codec-1.17.1.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
-https://repo.maven.apache.org/maven2/commons-io/commons-io/2.17.0/commons-io-2.17.0.pom
+https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.4/commons-logging-1.3.4.pom
@@ -649,25 +609,25 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloa
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.5/soloader-0.10.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.18.0/jackson-annotations-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.2/jackson-annotations-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.18.0/jackson-core-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.2/jackson-core-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.18.0/jackson-databind-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.2/jackson-databind-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.18.0/jackson-base-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.2/jackson-base-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.18.0/jackson-bom-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.2/jackson-bom-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.18/jackson-parent-2.18.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.17/jackson-parent-2.17.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.18.0/jackson-modules-base-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.2/jackson-modules-base-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.18.0/jackson-module-jaxb-annotations-2.18.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.2/jackson-module-jaxb-annotations-2.17.2.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/61/oss-parent-61.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/58/oss-parent-58.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/woodstox/woodstox-core/6.2.1/woodstox-core-6.2.1.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
@@ -733,7 +693,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.0/error_prone_annotations-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.33.0/error_prone_annotations-2.33.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.31.0/error_prone_annotations-2.31.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
@@ -746,7 +706,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.0/error_prone_parent-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.33.0/error_prone_parent-2.33.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.31.0/error_prone_parent-2.31.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
@@ -763,8 +723,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.1-jre/guava-parent-33.3.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.3.1-jre/guava-testlib-33.3.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.3.0-jre/guava-parent-33.3.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.3.0-jre/guava-testlib-33.3.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/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
@@ -777,7 +737,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.1-jre/guava-33.3.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.3.0-jre/guava-33.3.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -791,7 +751,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.17.2/protobuf-bom-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.2/protobuf-bom-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.3/protobuf-bom-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.29.0-RC1/protobuf-bom-4.29.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.28.0/protobuf-bom-4.28.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -808,7 +768,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/pr
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.17.2/protobuf-java-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.29.0-RC1/protobuf-java-4.29.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.28.0/protobuf-java-4.28.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -819,7 +779,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.2/protobuf-parent-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.3/protobuf-parent-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.29.0-RC1/protobuf-parent-4.29.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.28.0/protobuf-parent-4.28.0.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.4/truth-parent-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/core/3.4.1/core-3.4.1.pom
@@ -840,7 +800,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.11.0/okhttp-4
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.9.1/okio-jvm-3.9.1.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.9.0/okio-jvm-3.9.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.13.0/okio-parent-1.13.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.4/okio-parent-1.17.4.pom
@@ -850,7 +810,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.p
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.9.1/okio-3.9.1.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.9.0/okio-3.9.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.1/all-1.2.1.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.2/all-1.2.2.pom
@@ -917,7 +877,6 @@ https://repo.maven.apache.org/maven2/io/grpc/grpc-protobuf/1.45.1/grpc-protobuf-
 https://repo.maven.apache.org/maven2/io/grpc/grpc-stub/1.21.1/grpc-stub-1.21.1.pom
 https://repo.maven.apache.org/maven2/io/grpc/grpc-stub/1.39.0/grpc-stub-1.39.0.pom
 https://repo.maven.apache.org/maven2/io/grpc/grpc-stub/1.45.1/grpc-stub-1.45.1.pom
-https://repo.maven.apache.org/maven2/io/legere/pdfiumandroid/1.0.19/pdfiumandroid-1.0.19.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-buffer/4.1.34.Final/netty-buffer-4.1.34.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-buffer/4.1.52.Final/netty-buffer-4.1.52.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.pom
@@ -983,7 +942,6 @@ https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.3.1/jaxb-api-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.4.0-b180830.0359/jaxb-api-parent-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jaxb-api-2.2.12-b140109.1041.pom
-https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12/jaxb-api-2.2.12.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180830.0359/jaxb-api-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.pom
@@ -992,15 +950,15 @@ 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.15.4/byte-buddy-agent-1.15.4.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.15.0/byte-buddy-agent-1.15.0.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.18/byte-buddy-parent-1.14.18.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.4/byte-buddy-parent-1.15.4.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.15.0/byte-buddy-parent-1.15.0.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.18/byte-buddy-1.14.18.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.4/byte-buddy-1.15.4.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.15.0/byte-buddy-1.15.0.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
@@ -1044,6 +1002,7 @@ https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/33/apache-33.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
@@ -1064,9 +1023,9 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/71/commons-parent-71.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/72/commons-parent-72.pom
-https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/74/commons-parent-74.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1121,7 +1080,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.48.1/checker-qual-3.48.1.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.46.0/checker-qual-3.46.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
@@ -1187,7 +1146,6 @@ https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.12/org.jacoc
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annotations-23.0.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/dokka/dokka-core/1.4.32/dokka-core-1.4.32.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.pom
@@ -1195,18 +1153,14 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu-jvm/0.16.3/a
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/atomicfu/0.16.3/atomicfu-0.16.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.5.2/kotlinx-coroutines-android-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.1/kotlinx-coroutines-android-1.6.1.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.7.3/kotlinx-coroutines-android-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.6.1/kotlinx-coroutines-bom-1.6.1.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-bom/1.7.3/kotlinx-coroutines-bom-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.4.1/kotlinx-coroutines-core-jvm-1.4.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.0/kotlinx-coroutines-core-jvm-1.5.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.2/kotlinx-coroutines-core-jvm-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.1/kotlinx-coroutines-core-jvm-1.6.1.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.7.3/kotlinx-coroutines-core-jvm-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.4.1/kotlinx-coroutines-core-1.4.1.pom
 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-coroutines-core/1.6.1/kotlinx-coroutines-core-1.6.1.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.7.3/kotlinx-coroutines-core-1.7.3.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.8.0/org.jetbrains.kotlin.jvm.gradle.plugin-1.8.0.pom
@@ -1282,10 +1236,9 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/
 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/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.1.0-Beta2/kotlin-reflect-2.1.0-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.20/kotlin-reflect-2.0.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
@@ -1329,11 +1282,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.7.22/kotlin-stdlib-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.20-RC2/kotlin-stdlib-common-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.20/kotlin-stdlib-common-1.8.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.22/kotlin-stdlib-common-1.8.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-common/1.9.22/kotlin-stdlib-common-1.9.22.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.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
@@ -1345,10 +1295,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.0/kotlin-stdlib-jdk7-1.6.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.pom
 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.8.0/kotlin-stdlib-jdk7-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.20-RC2/kotlin-stdlib-jdk7-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.20/kotlin-stdlib-jdk7-1.8.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.21/kotlin-stdlib-jdk7-1.8.21.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
@@ -1362,10 +1310,8 @@ 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.6.0/kotlin-stdlib-jdk8-1.6.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20.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.8.0/kotlin-stdlib-jdk8-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.20-RC2/kotlin-stdlib-jdk8-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.20/kotlin-stdlib-jdk8-1.8.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.21/kotlin-stdlib-jdk8-1.8.21.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
@@ -1394,13 +1340,10 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/k
 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.8.0/kotlin-stdlib-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-RC2/kotlin-stdlib-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20/kotlin-stdlib-1.8.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.22/kotlin-stdlib-1.8.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.22/kotlin-stdlib-1.9.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.25/kotlin-stdlib-1.9.25.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.1.0-Beta2/kotlin-stdlib-2.1.0-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.20/kotlin-stdlib-2.0.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
@@ -1420,14 +1363,14 @@ https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20240303/json-20240303.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
 https://repo.maven.apache.org/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.2/junit-bom-5.11.2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0/junit-bom-5.11.0.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 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.14.2/mockito-core-5.14.2.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.13.0/mockito-core-5.13.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
@@ -1442,14 +1385,14 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.0/asm-analysis-7
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.7.1/asm-bom-9.7.1.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.7/asm-bom-9.7.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.7.1/asm-commons-9.7.1.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.7/asm-commons-9.7.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/6.0_BETA/asm-debug-all-6.0_BETA.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1.pom
@@ -1464,7 +1407,7 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.7.1/asm-tree-9.7.1.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.7/asm-tree-9.7.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0/asm-util-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/7.0/asm-util-7.0.pom
@@ -1478,7 +1421,6 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/8.0.1/asm-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7.1/asm-9.7.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
@@ -26,7 +26,6 @@ react-native-lottie-splash-screen
 react-native-navigation
 react-native-nfc-manager
 react-native-orientation-locker
-react-native-pdf
 react-native-permissions
 react-native-reanimated
 react-native-shake
@@ -51,6 +51,7 @@ in {
  };

  # Package version adjustments
+  gradle = super.gradle_8.override { java = super.openjdk17_headless; };
  nodejs = super.nodejs_20;
  ruby = super.ruby_3_1;
  yarn = super.yarn.override { nodejs = super.nodejs_20; };
@@ -6,16 +6,8 @@ let
  # For testing local version of nixpkgs
  #nixpkgsSrc = (import <nixpkgs> { }).lib.cleanSource "/home/jakubgs/work/nixpkgs";

-  # We follow release 24-05 of nixpkgs
-  # https://github.com/NixOS/nixpkgs/releases/tag/24.05
-  nixpkgsSrc = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/df27247e6f3e636c119e2610bf12d38b5e98cc79.tar.gz";
-    sha256 = "sha256:0bbvimk7xb7akrx106mmsiwf9nzxnssisqmqffla03zz51d0kz2n";
-  };
-
-  # FIXME: remove this additional source when nixpkgs includes gradle 8.8 in stable channel
  # We use a commit from the unstable channel of nixpkgs for gradle 8.8
-  gradleNixpkgsSrc = builtins.fetchTarball {
+  nixpkgsSrc = builtins.fetchTarball {
    url = "https://github.com/NixOS/nixpkgs/archive/48d567fc7b299de90f70a48e4263e31f690ba03e.tar.gz";
    sha256 = "sha256:0zynbk52khdfhg4qfv26h3r5156xff5p0cga2cin7b07i7lqminh";
  };
@@ -29,14 +21,6 @@ let
  # Override some packages and utilities
  pkgsOverlay = import ./overlay.nix;

-  # FIXME: remove this additional source when nixpkgs includes gradle 8.8 in stable channel
-  gradleOverlay = final: prev: {
-    gradle = (import gradleNixpkgsSrc {
-      inherit (prev) system;
-      config = defaultConfig // config;
-    }).gradle_8.override { java = prev.openjdk17_headless; };
-  };
-
  # Fix for lack of Android SDK for M1 Macs.
  systemOverride = let
    inherit (builtins) currentSystem getEnv;
@@ -51,5 +35,5 @@ in
  (import nixpkgsSrc) {
    config = defaultConfig // config;
    system = systemOverride;
-    overlays = [ pkgsOverlay gradleOverlay ];
+    overlays = [ pkgsOverlay ];
  }
@@ -1,5 +1,4 @@
-{ lib, stdenv, meta, source, buildGoPackage,
-  go-bindata, mockgen, protoc-gen-go, protobuf3_20 }:
+{ lib, stdenv, meta, source, buildGoPackage }:

 buildGoPackage {
  pname = source.repo;
@@ -8,10 +7,6 @@ buildGoPackage {
  inherit meta;
  inherit (source) src goPackagePath;

-  nativeBuildInputs = [
-    go-bindata mockgen protoc-gen-go protobuf3_20
-  ];
-
  phases = ["unpackPhase" "configurePhase" "buildPhase"];

  # https://pkg.go.dev/net#hdr-Name_Resolution
@@ -27,7 +22,6 @@ buildGoPackage {
  preBuild = ''
    pushd go/src/$goPackagePath
    go run cmd/library/*.go > $NIX_BUILD_TOP/main.go
-    make generate SHELL=$SHELL GO111MODULE=on GO_GENERATE_CMD='go generate'
    popd
  '';

@@ -1,6 +1,5 @@
 { callPackage, lib, buildGoPackage
 , androidPkgs, openjdk, gomobile, xcodeWrapper, removeReferencesTo
-, go-bindata, mockgen, protobuf3_20, protoc-gen-go
 , meta
 , source
 , platform ? "android"
@@ -16,7 +15,7 @@ let
  isAndroid = platform == "android";
  enforceXCodeAvailable = callPackage ./enforceXCodeAvailable.nix { };

-in buildGoPackage rec {
+in buildGoPackage {
  pname = source.repo;
  version = "${source.cleanVersion}-${source.shortRev}-${platform}";

@@ -28,9 +27,8 @@ in buildGoPackage rec {
  __noChroot = isIOS;

  extraSrcPaths = [ gomobile ];
-  nativeBuildInputs = [
-    gomobile removeReferencesTo go-bindata mockgen protoc-gen-go protobuf3_20
-  ] ++ optional isAndroid openjdk
+  nativeBuildInputs = [ gomobile removeReferencesTo ]
+    ++ optional isAndroid openjdk
    ++ optional isIOS xcodeWrapper;

  ldflags = goBuildLdFlags;
@@ -46,13 +44,6 @@ in buildGoPackage rec {
  # TODO: try removing when go is upgraded to 1.22
  GODEBUG = "netdns=cgo+2";

-  preBuild = ''
-    echo 'Generate static files'
-    pushd go/src/$goPackagePath
-    make generate SHELL=$SHELL GO111MODULE=on GO_GENERATE_CMD='go generate'
-    popd
-  '';
-
  buildPhase = ''
    runHook preBuild
    echo -e "\nBuilding $pname for: ${concatStringsSep "," targets}"
@@ -58,7 +58,6 @@
    "react-native-lottie-splash-screen": "^1.0.1",
    "react-native-navigation": "7.39.0",
    "react-native-orientation-locker": "^1.5.0",
-    "react-native-pdf": "^6.7.5",
    "react-native-permissions": "4.1.5",
    "react-native-reanimated": "3.6.1",
    "react-native-redash": "18.1.0",
@@ -180,17 +180,17 @@
        },
        "shards.staging": {
            "tcp/p2p/waku/boot": {
-                "boot-01.do-ams3.shards.staging": "/dns4/boot-01.do-ams3.shards.staging.status.im/tcp/30303/p2p/16Uiu2HAmQE7FXQc6iZHdBzYfw3qCSDa9dLc1wsBJKoP4aZvztq2d",
+                "boot-01.do-ams3.shards.staging": "/dns4/boot-01.do-ams3.shards.staging.status.im/tcp/30303/p2p/16Uiu2HAmEqqio4UR1SWqAc7KY19t6qyDvtmyjreZpzUBJvb4u65R",
                "boot-01.gc-us-central1-a.shards.staging": "/dns4/boot-01.gc-us-central1-a.shards.staging.status.im/tcp/30303/p2p/16Uiu2HAmGAA54bBTE78MYidSy3P7Q9yAWFNTAEReJYD69VRvtL5r",
                "boot-01.ac-cn-hongkong-c.shards.staging": "/dns4/boot-01.ac-cn-hongkong-c.shards.staging.status.im/tcp/30303/p2p/16Uiu2HAmNTpGnyZ8W1BK2sXEmgSCNWiyDKgRU3NBR2DXST2HzxRU"
            },
            "enr/p2p/waku/boot": {
-                "boot-01.do-ams3.shards.staging": "enr:-QEQuEBuiQgFlJNcv255042zwyl4pOBOivakX8N30Dr9vaaEU2q8-7N4GVY4Hk87iEKELjlIXTpE9Wj6EQq1lrBuc7ayAYJpZIJ2NIJpcISPxvrpim11bHRpYWRkcnO4YAAtNihib290LTAxLmRvLWFtczMuc3RhdHVzLnN0YWdpbmcuc3RhdHVzLmltBnZfAC82KGJvb3QtMDEuZG8tYW1zMy5zdGF0dXMuc3RhZ2luZy5zdGF0dXMuaW0GAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDq-yGgpuoUG6NKkbIDRmrMiT-bEVzFlpWLEK_rF3yKUaDdGNwgnZfg3VkcIIjKIV3YWt1Mg0",
+                "boot-01.do-ams3.shards.staging": "enr:-QEQuEDsh6FgAb_36cReaX7W4gWx_7_GNpsUki7bXMoMrrrWij5pDEyV3guR-urDW_6GJTAzpQiJV61F-CfNn_NxPbY-AYJpZIJ2NIJpcISPxvrpim11bHRpYWRkcnO4YAAtNihib290LTAxLmRvLWFtczMuc2hhcmRzLnN0YWdpbmcuc3RhdHVzLmltBnZfAC82KGJvb3QtMDEuZG8tYW1zMy5zaGFyZHMuc3RhZ2luZy5zdGF0dXMuaW0GAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDIH8BcuEzgnmwPQTu7BPYyg4u4om7K9qekKA2gT_H2wSDdGNwgnZfg3VkcIIjKIV3YWt1Mg0",
                "boot-01.gc-us-central1-a.shards.staging": "enr:-QEiuECWCuk1CoefbPYUV_cff27t-471k_QhJ_MvgOUQmRE4vgI6h9fD4LgXy7TZNSFXeBBP9haWJB7lx8Wujx-LPmhrAYJpZIJ2NIJpcIRoxQVgim11bHRpYWRkcnO4cgA2NjFib290LTAxLmdjLXVzLWNlbnRyYWwxLWEuc2hhcmRzLnN0YWdpbmcuc3RhdHVzLmltBnZfADg2MWJvb3QtMDEuZ2MtdXMtY2VudHJhbDEtYS5zaGFyZHMuc3RhZ2luZy5zdGF0dXMuaW0GAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDNAvlGjekD1YV4WpmjwArGAH2g9kHFJnMRfgUhcIkoA2DdGNwgnZfg3VkcIIjKIV3YWt1Mg0",
                "boot-01.ac-cn-hongkong-c.shards.staging": "enr:-QEiuEAcHWW7aNBtJhigTCAnKu9-H1b98SWpBJkGm3PAxth5QjJA0kdiabOfou4HgCD6RuyZEnFE5L8ymahouw3kWRiWAYJpZIJ2NIJpcIQvTKi6im11bHRpYWRkcnO4cgA2NjFib290LTAxLmFjLWNuLWhvbmdrb25nLWMuc2hhcmRzLnN0YWdpbmcuc3RhdHVzLmltBnZfADg2MWJvb3QtMDEuYWMtY24taG9uZ2tvbmctYy5zaGFyZHMuc3RhZ2luZy5zdGF0dXMuaW0GAbveA4Jyc40AEAUAAQAgAEAAgAEAiXNlY3AyNTZrMaEDkbgV7oqPNmFtX5FzSPi9WH8kkmrPB1R3n9xRXge91M-DdGNwgnZfg3VkcIIjKIV3YWt1Mg0"
            },
            "wss/p2p/waku/boot": {
-                "boot-01.do-ams3.shards.staging": "/dns4/boot-01.do-ams3.shards.staging.status.im/tcp/443/wss/p2p/16Uiu2HAmQE7FXQc6iZHdBzYfw3qCSDa9dLc1wsBJKoP4aZvztq2d",
+                "boot-01.do-ams3.shards.staging": "/dns4/boot-01.do-ams3.shards.staging.status.im/tcp/443/wss/p2p/16Uiu2HAmEqqio4UR1SWqAc7KY19t6qyDvtmyjreZpzUBJvb4u65R",
                "boot-01.gc-us-central1-a.shards.staging": "/dns4/boot-01.gc-us-central1-a.shards.staging.status.im/tcp/443/wss/p2p/16Uiu2HAmGAA54bBTE78MYidSy3P7Q9yAWFNTAEReJYD69VRvtL5r",
                "boot-01.ac-cn-hongkong-c.shards.staging": "/dns4/boot-01.ac-cn-hongkong-c.shards.staging.status.im/tcp/443/wss/p2p/16Uiu2HAmNTpGnyZ8W1BK2sXEmgSCNWiyDKgRU3NBR2DXST2HzxRU"
            },
@@ -95,8 +95,7 @@
                            ;; otherwise sometimes you'll get weird errors when
                            ;; instrumenting functions.
                            :static-fns         false
-                            :infer-externs      true
-                            :reader-features    #{:mobile}}
+                            :infer-externs      true}
         ;; if you want to use a real device, set your local ip
         ;; in the SHADOW_HOST env variable to make sure that
         ;; it will use the right interface
@@ -130,8 +129,7 @@
                       :static-fns         true
                       :fn-invoke-direct   true
                       :optimizations      :advanced
-                       :js-options         {:js-provider :closure}
-                       :reader-features    #{:mobile}}}}
+                       :js-options         {:js-provider :closure}}}}
  ;; the tests are ran with node, react-native dependencies are mocked
  ;; by using node --require override.js, which uses the node-library
  ;; produced by the target :mocks below and redefines node require
@@ -171,13 +169,12 @@
   {;; needed because we override require and it
    ;; messes with source-map which reports callstack
    ;; exceeded exceptions instead of real issues
-    :source-map      false
+    :source-map    false
    ;; needed because we use deref in tests
-    :static-fns      false
-    :optimizations   :simple
-    :warnings        {:fn-deprecated false}
-    :infer-externs   true
-    :reader-features #{:mobile}}}
+    :static-fns    false
+    :optimizations :simple
+    :warnings      {:fn-deprecated false}
+    :infer-externs true}}

  ;; mock.js-dependencies is mocking the react-native libraries
  ;; we build it as a node library so that it can be required by
@@ -0,0 +1,47 @@
+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 navigationButtonsCompleteOpacity(isCalculationComplete) {
+  return useDerivedValue(function () {
+    'worklet';
+    return isCalculationComplete.value ? withTiming(1) : 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;
+    }
+  });
+}
@@ -0,0 +1,15 @@
+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;
+  });
+}
@@ -256,10 +256,9 @@
  {:events [:pairing/pair-and-sync]}
  [cofx installation-id]
  {:fx [[:json-rpc/call
-         [{:method      "wakuext_enableInstallationAndSync"
-           :params      [{:installationId installation-id}]
-           :js-response true
-           :on-success  [:sanitize-messages-and-process-response]}]]]})
+         [{:method     "wakuext_enableInstallationAndSync"
+           :params     [{:installationId installation-id}]
+           :on-success #(log/debug "successfully synced devices")}]]]})

 (rf/defn enable-installation-success
  {:events [:pairing.callback/enable-installation-success]}
@@ -371,8 +371,6 @@
    :LineChart        #js {}
    :LineChartBicolor #js {}})

-(def react-native-pdf #js {:default {}})
-
 (def worklet-factory
  #js {:applyAnimationsToStyle (fn [])})

@@ -423,7 +421,6 @@
    "react-native-transparent-video"                   react-native-transparent-video
    "react-native-orientation-locker"                  react-native-orientation-locker
    "react-native-gifted-charts"                       react-native-gifted-charts
-    "react-native-pdf"                                 react-native-pdf
    "@walletconnect/react-native-compat"               #js {}
    "../resources/data/emojis/en.json"                 (js/JSON.parse
                                                        (slurp
@@ -79,12 +79,6 @@
                          (types/clj->json request)
                          #(callback (types/json->clj %))))

-(defn accept-terms
-  ([]
-   (native-utils/promisify-native-module-call accept-terms))
-  ([callback]
-   (.acceptTerms ^js (account-manager) callback)))
-
 (defn prepare-dir-and-update-config
  [key-uid config callback]
  (log/debug "[native-module] prepare-dir-and-update-config")
@@ -1,5 +1,4 @@
-(ns quo.components.buttons.wallet-ctas.style
-  (:require [quo.foundations.colors :as colors]))
+(ns quo.components.buttons.wallet-ctas.style)

 (def inner-container
  {:flex-direction  :row
@@ -11,9 +10,3 @@
   :width            77.75
   :justify-content  :center
   :align-items      :center})
-
-(defn action-button-text
-  [theme disabled?]
-  (cond-> {:margin-top 4
-           :color      (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}
-    disabled? (assoc :opacity 0.5)))
@@ -3,28 +3,28 @@
    [quo.components.buttons.wallet-button.view :as wallet-button]
    [quo.components.buttons.wallet-ctas.style :as style]
    [quo.components.markdown.text :as text]
+    [quo.foundations.colors :as colors]
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [utils.i18n :as i18n]))


 (defn action-button
-  [{:keys [icon text on-press theme accessibility-label disabled?]}]
+  [{:keys [icon text on-press theme accessibility-label]}]
  [rn/view
   {:style               style/button-container
    :accessibility-label accessibility-label}
   [wallet-button/view
-    {:icon      icon
-     :disabled? disabled?
-     :on-press  on-press}]
+    {:icon     icon
+     :on-press on-press}]
   [text/text
    {:weight :medium
     :size   :paragraph-2
-     :style  (style/action-button-text theme disabled?)} text]])
+     :style  {:margin-top 4
+              :color      (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}} text]])

 (defn view
-  [{:keys [buy-action send-action receive-action bridge-action swap-action bridge-disabled?
-           swap-disabled? container-style]}]
+  [{:keys [buy-action send-action receive-action bridge-action swap-action container-style]}]
  (let [theme (quo.theme/use-theme)]
    [rn/view {:style container-style}
     [rn/view {:style style/inner-container}
@@ -48,16 +48,14 @@
        :accessibility-label :receive}]
      (when swap-action
        [action-button
-         {:icon                :i/transaction
+         {:icon                :i/swap
          :text                (i18n/label :t/swap)
          :on-press            swap-action
          :theme               theme
-          :disabled?           swap-disabled?
          :accessibility-label :swap}])
      [action-button
       {:icon                :i/bridge
        :text                (i18n/label :t/bridge)
        :on-press            bridge-action
        :theme               theme
-        :disabled?           bridge-disabled?
        :accessibility-label :bridge}]]]))
@@ -65,7 +65,7 @@
                                                      :type            type
                                                      :include-button? include-button?})
                                    style)}
-       [icons/icon (or icon :i/info)
+       [icons/icon icon
        {:color           (style/get-color-by-type theme type :icon)
         :no-color        no-icon-color?
         :size            (or icon-size 16)
@@ -28,6 +28,7 @@
                  :seed :i/seed
                  :key  :i/password
                  nil)
+       :color   :neutral
       :blur?   true
       :border? true}]
     [rn/view
@@ -1,7 +1,6 @@
 (ns quo.components.list-items.network-list.view
  (:require
    [clojure.string :as string]
-    [quo.components.icon :as icon]
    [quo.components.list-items.network-list.style :as style]
    [quo.components.markdown.text :as text]
    [quo.theme :as quo.theme]
@@ -43,8 +42,8 @@
     [:map {:closed true}
      [:network-image :int]
      [:label :string]
-      [:fiat-value {:optional true} [:maybe :string]]
-      [:token-value {:optional true} [:maybe :string]]
+      [:fiat-value :string]
+      [:token-value :string]
      [:container-style {:optional true} [:maybe :map]]
      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
      [:state {:optional true} [:enum :pressed :active :disabled :default]]
@@ -52,7 +51,7 @@
   :any])

 (defn- view-internal
-  [{:keys [fiat-value token-value on-press container-style state customization-color]
+  [{:keys [on-press container-style state customization-color]
    :as   props
    :or   {customization-color :blue}}]
  (let [theme                  (quo.theme/use-theme)
@@ -68,8 +67,6 @@
      :on-press            (when-not (= state :disabled) on-press)
      :accessibility-label :network-list}
     [info props]
-     (if (or token-value fiat-value)
-       [values props]
-       [icon/icon :i/chevron-right])]))
+     [values props]]))

 (def view (schema/instrument #'view-internal ?schema))
@@ -4,10 +4,12 @@
  [container-style]
  (merge container-style
         {:flex-direction :row
+          :flex           1
          :align-items    :flex-start}))

 (def index
  {:margin-left 5})

 (def text-container
-  {:margin-left 8})
+  {:margin-left 8
+   :flex        1})
@@ -32,8 +32,7 @@
    [rn/pressable
     (when-not disabled?
       {:on-press                on-press
-        :allow-multiple-presses? true
-        :hit-slop                12})
+        :allow-multiple-presses? true})
     [rn/view
      {:style                             outer-styles
       :needs-offscreen-alpha-compositing true
@@ -10,8 +10,7 @@
       :customization-color :blue
       :token-value         "100"
       :token-symbol        "SNT"}])
-    (h/is-truthy (h/get-by-translation-text :t/approve-amount-symbol
-                                            {:token-amount "100" :token-symbol "SNT"})))
+    (h/is-truthy (h/get-by-translation-text :t/approve-amount-symbol {:amount "100" :symbol "SNT"})))

  (h/test "with :approving status"
    (h/render-with-theme-provider
@@ -20,8 +19,7 @@
       :customization-color :blue
       :token-value         "50"
       :token-symbol        "DAI"}])
-    (h/is-truthy (h/get-by-translation-text :t/approving-amount-symbol
-                                            {:token-amount "50" :token-symbol "DAI"})))
+    (h/is-truthy (h/get-by-translation-text :t/approving-amount-symbol {:amount "50" :symbol "DAI"})))

  (h/test "with :approved status"
    (h/render-with-theme-provider
@@ -30,8 +28,7 @@
       :customization-color :blue
       :token-value         "5"
       :token-symbol        "ETH"}])
-    (h/is-truthy (h/get-by-translation-text :t/approved-amount-symbol
-                                            {:token-amount "5" :token-symbol "ETH"})))
+    (h/is-truthy (h/get-by-translation-text :t/approved-amount-symbol {:amount "5" :symbol "ETH"})))

  (h/test "on-press event is called when button is pressed"
    (let [mock-fn (h/mock-fn)]
@@ -54,8 +54,8 @@
        {:size  :paragraph-2
         :style (style/message theme)}
        (i18n/label (status-message status)
-                    {:token-amount token-value
-                     :token-symbol token-symbol})]]
+                    {:amount token-value
+                     :symbol token-symbol})]]
      (when (and button-props
                 (or (= status :approve)
                     (and (not= status :approve) show-view-button?)))
@@ -60,8 +60,7 @@

 (defn- view-internal
  [{:keys [type account-props token-props networks? values]}]
-  (let [theme   (quo.theme/use-theme)
-        address (or (:address account-props) (:address token-props))]
+  (let [theme (quo.theme/use-theme)]
    [rn/view
     {:style (style/container networks? theme)}
     [rn/view
@@ -90,13 +89,12 @@
            (get-in account-props [:status-account :name])]
           [rn/view
            {:style (style/dot-divider theme)}]])
-        (when address
-          [text/text
-           {:size   (when (not= type :account) :paragraph-2)
-            :weight (when (= type :account) :semi-bold)
-            :style  {:color (when (not= type :account)
-                              (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}}
-           address])]]]
+        [text/text
+         {:size   (when (not= type :account) :paragraph-2)
+          :weight (when (= type :account) :semi-bold)
+          :style  {:color (when (not= type :account)
+                            (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}}
+         (or (:address account-props) (:address token-props))]]]]
     (when networks?
       [:<>
        [rn/view
@@ -75,16 +75,3 @@

 (def fiat-amount
  {:color colors/neutral-50})
-
-(def gradient-common
-  {:width    64
-   :position :absolute
-   :top      0
-   :bottom   0
-   :z-index  1})
-
-(def gradient-start
-  (assoc gradient-common :left 0))
-
-(def gradient-end
-  (assoc gradient-common :right 0))
@@ -11,7 +11,6 @@
            [quo.foundations.colors :as colors]
            quo.theme
            [react-native.core :as rn]
-            [react-native.linear-gradient :as linear-gradient]
            [schema.core :as schema]))

 (def ?schema
@@ -19,7 +18,6 @@
   [:catn
    [:props
     [:map {:closed true}
-      [:get-ref {:optional true} [:maybe fn?]]
      [:type {:optional true} [:maybe [:enum :pay :receive]]]
      [:status {:optional true} [:maybe [:enum :default :typing :disabled :loading]]]
      [:token {:optional true} [:maybe :string]]
@@ -44,65 +42,26 @@
      [:container-style {:optional true} [:maybe :map]]]]]
   :any])

-(def icon-size 32)
-(def container-padding (* 2 (:padding (style/row-1 false))))
-(def max-cursor-position 5)
-
 (defn view-internal
  [{:keys [type status token value fiat-value show-approval-label? error? network-tag-props
           approval-label-props default-value auto-focus? input-disabled? enable-swap?
-           currency-symbol on-change-text show-keyboard? get-ref
+           currency-symbol on-change-text show-keyboard?
           container-style on-swap-press on-token-press on-max-press on-input-focus]}]
-  (let [theme                        (quo.theme/use-theme)
-        pay?                         (= type :pay)
-        disabled?                    (= status :disabled)
-        loading?                     (= status :loading)
-        typing?                      (= status :typing)
-        controlled-input?            (some? value)
-        [container-width
-         set-container-width]        (rn/use-state)
-        [overflow?
-         set-overflow?]              (rn/use-state false)
-        [cursor-close-to-start?
-         set-cursor-close-to-start?] (rn/use-state false)
-        [label-width
-         set-label-width]            (rn/use-state 0)
-        input-ref                    (rn/use-ref-atom nil)
-        set-input-ref                (rn/use-callback (fn [ref]
-                                                        (reset! input-ref ref)
-                                                        (when get-ref (get-ref ref)))
-                                                      [])
-        focus-input                  (rn/use-callback (fn []
-                                                        (some-> @input-ref
-                                                                (oops/ocall "focus")))
-                                                      [input-ref])
-        on-layout-container          (rn/use-callback
-                                      (fn [e]
-                                        (let [width (oops/oget e "nativeEvent.layout.width")]
-                                          (set-container-width width))))
-        on-layout-text-input         (rn/use-callback
-                                      (fn [e]
-                                        (let [width     (oops/oget e "nativeEvent.layout.width")
-                                              max-width (- container-width
-                                                           icon-size
-                                                           container-padding
-                                                           (* label-width 2))]
-                                          (set-overflow? (> width max-width))))
-                                      [container-width label-width])
-        on-layout-label              (rn/use-callback
-                                      (fn [e]
-                                        (let [width (oops/oget e "nativeEvent.layout.width")]
-                                          (set-label-width width))))
-        on-selection-change          (rn/use-callback
-                                      (fn [e]
-                                        (let [selection-start (oops/oget e
-                                                                         "nativeEvent.selection.start")]
-                                          (set-cursor-close-to-start?
-                                           (< selection-start max-cursor-position)))))]
+  (let [theme             (quo.theme/use-theme)
+        pay?              (= type :pay)
+        disabled?         (= status :disabled)
+        loading?          (= status :loading)
+        typing?           (= status :typing)
+        controlled-input? (some? value)
+        input-ref         (rn/use-ref-atom nil)
+        set-input-ref     (rn/use-callback (fn [ref] (reset! input-ref ref)) [])
+        focus-input       (rn/use-callback (fn []
+                                             (some-> @input-ref
+                                                     (oops/ocall "focus")))
+                                           [input-ref])]
    [rn/view
     {:style               container-style
-      :accessibility-label :swap-input
-      :on-layout           on-layout-container}
+      :accessibility-label :swap-input}
     [rn/view {:style (style/content typing? theme)}
      [rn/view
       {:style (style/row-1 loading?)}
@@ -116,43 +75,25 @@
          [rn/pressable
           {:style    style/input-container
            :on-press focus-input}
-           [rn/view {:style {:flex-shrink 1}}
-            (when (and overflow? typing? (not cursor-close-to-start?))
-              [linear-gradient/linear-gradient
-               {:start  {:x 0 :y 0}
-                :end    {:x 1 :y 0}
-                :colors [(colors/theme-colors colors/white colors/neutral-100 theme)
-                         (colors/theme-colors colors/white-opa-10 colors/neutral-100-opa-10 theme)]
-                :style  style/gradient-start}])
-            (when (and overflow? disabled?)
-              [linear-gradient/linear-gradient
-               {:start  {:x 0 :y 0}
-                :end    {:x 1 :y 0}
-                :colors [(colors/theme-colors colors/white-opa-10 colors/neutral-100-opa-10 theme)
-                         (colors/theme-colors colors/white colors/neutral-100 theme)]
-                :style  style/gradient-end}])
-            [rn/text-input
-             (cond-> {:ref                      set-input-ref
-                      :style                    (style/input disabled? error? theme)
-                      :placeholder-text-color   (colors/theme-colors colors/neutral-40
-                                                                     colors/neutral-50
-                                                                     theme)
-                      :keyboard-type            :numeric
-                      :editable                 (not input-disabled?)
-                      :auto-focus               auto-focus?
-                      :on-focus                 on-input-focus
-                      :on-change-text           on-change-text
-                      :on-layout                on-layout-text-input
-                      :on-selection-change      on-selection-change
-                      :show-soft-input-on-focus show-keyboard?
-                      :default-value            default-value
-                      :placeholder              "0"}
-               controlled-input? (assoc :value value))]]
+           [rn/text-input
+            (cond-> {:ref                      set-input-ref
+                     :style                    (style/input disabled? error? theme)
+                     :placeholder-text-color   (colors/theme-colors colors/neutral-40
+                                                                    colors/neutral-50
+                                                                    theme)
+                     :keyboard-type            :numeric
+                     :editable                 (not input-disabled?)
+                     :auto-focus               auto-focus?
+                     :on-focus                 on-input-focus
+                     :on-change-text           on-change-text
+                     :show-soft-input-on-focus show-keyboard?
+                     :default-value            default-value
+                     :placeholder              "0"}
+              controlled-input? (assoc :value value))]
           [text/text
-            {:size      :paragraph-2
-             :weight    :semi-bold
-             :style     (style/token-symbol theme)
-             :on-layout on-layout-label}
+            {:size   :paragraph-2
+             :weight :semi-bold
+             :style  (style/token-symbol theme)}
            token]]
          (when (and pay? enable-swap?)
            [buttons/button
@@ -17,7 +17,7 @@

 (def transaction-icon
  {:send   :i/send
-   :swap   :i/transaction
+   :swap   :i/swap
   :bridge :i/bridge})

 (defn transaction-header
@@ -23,7 +23,7 @@
 (def transaction-icon
  {:receive :i/receive
   :send    :i/send
-   :swap    :i/transaction
+   :swap    :i/swap
   :bridge  :i/bridge
   :buy     :i/buy
   :destroy :i/destroy
@@ -1,6 +0,0 @@
-(ns react-native.pdf-viewer
-  (:require
-    ["react-native-pdf" :default rn-pdf]
-    [reagent.core :as reagent]))
-
-(def view (reagent/adapt-react-class rn-pdf))
@@ -5,7 +5,6 @@
    [react-native.core :as rn]
    [reagent.core :as reagent]
    [status-im.common.confirmation-drawer.style :as style]
-    [status-im.constants :as constants]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

@@ -36,12 +35,11 @@
           close-button-text]}]
  (let [extra-action-selected? (reagent/atom false)]
    (fn []
-      (let [{:keys [group-chat chat-id public-key color chat-type
+      (let [{:keys [group-chat chat-id public-key color
                    profile-picture name]} context
            id                             (or chat-id public-key)
            theme                          (quo.theme/use-theme)
-            [primary-name _]               (when-not (or group-chat
-                                                         (= chat-type constants/public-chat-type))
+            [primary-name _]               (when-not group-chat
                                             (rf/sub [:contacts/contact-two-names-by-identity id]))
            display-name                   (cond
                                             (= primary-name "Unknown")
@@ -96,7 +96,7 @@
       (take 7)))

 (defn recovery-phrase-screen
-  [{:keys [banner-offset initial-insets keypair title on-success render-controls]}]
+  [{:keys [banner-offset initial-insets keypair title recovering-keypair? render-controls]}]
  (reagent/with-let [keyboard-shown?           (reagent/atom false)
                     keyboard-show-listener    (.addListener rn/keyboard
                                                             "keyboardDidShow"
@@ -120,20 +120,14 @@
                                                 (reset! seed-phrase new-phrase))
                     on-submit                 (fn []
                                                 (swap! seed-phrase clean-seed-phrase)
-                                                 (rf/dispatch
-                                                  [:profile.recover/validate-recovery-phrase
-                                                   (security/mask-data @seed-phrase)
-                                                   {:on-success (fn [mnemonic key-uid]
-                                                                  (if on-success
-                                                                    (on-success
-                                                                     {:key-uid key-uid
-                                                                      :phrase mnemonic
-                                                                      :on-error
-                                                                      set-invalid-seed-phrase})
-                                                                    (rf/dispatch
-                                                                     [:onboarding/seed-phrase-validated
-                                                                      mnemonic key-uid])))
-                                                    :on-error   set-invalid-seed-phrase}]))]
+                                                 (if recovering-keypair?
+                                                   (rf/dispatch [:wallet/seed-phrase-entered
+                                                                 (security/mask-data
+                                                                  @seed-phrase)
+                                                                 set-invalid-seed-phrase])
+                                                   (rf/dispatch [:onboarding/seed-phrase-entered
+                                                                 (security/mask-data @seed-phrase)
+                                                                 set-invalid-seed-phrase])))]
    (let [words-coll               (mnemonic/passphrase->words @seed-phrase)
          last-word                (peek words-coll)
          pick-suggested-word      (fn [pressed-word]
@@ -197,7 +191,7 @@
         [rn/view {:style style/keyboard-container}
          [quo/predictive-keyboard
           {:type     suggestions-state
-            :blur?    (not on-success)
+            :blur?    (not recovering-keypair?)
            :text     suggestions-text
            :words    (keyboard-suggestions last-word)
            :on-press pick-suggested-word}]])])
@@ -206,7 +200,7 @@
     (.remove keyboard-hide-listener))))

 (defn screen
-  [{:keys [title keypair navigation-icon on-success render-controls]}]
+  [{:keys [title keypair navigation-icon recovering-keypair? render-controls]}]
  (let [[insets _]    (rn/use-state (safe-area/get-insets))
        banner-offset (rf/sub [:alert-banners/top-margin])]
    [rn/view {:style style/full-layout}
@@ -215,22 +209,21 @@
       {:margin-top (:top insets)
        :background :blur
        :icon-name  (or navigation-icon
-                        (if on-success :i/close :i/arrow-left))
+                        (if recovering-keypair? :i/close :i/arrow-left))
        :on-press   #(rf/dispatch [:navigate-back])}]
      [recovery-phrase-screen
-       {:title           title
-        :keypair         keypair
-        :render-controls render-controls
-        :banner-offset   banner-offset
-        :initial-insets  insets
-        :on-success      on-success}]]]))
+       {:title               title
+        :keypair             keypair
+        :render-controls     render-controls
+        :banner-offset       banner-offset
+        :initial-insets      insets
+        :recovering-keypair? recovering-keypair?}]]]))

 (defn view
  []
-  (let [{:keys [on-success]} (rf/sub [:get-screen-params])]
+  (let [{:keys [recovering-keypair?]} (rf/sub [:get-screen-params])]
    (rn/use-unmount
-     (when-not on-success
-       #(rf/dispatch [:onboarding/clear-navigated-to-enter-seed-phrase-from-screen])))
+     #(rf/dispatch [:onboarding/clear-navigated-to-enter-seed-phrase-from-screen]))
    [screen
-     {:title      (i18n/label :t/use-recovery-phrase)
-      :on-success on-success}]))
+     {:title               (i18n/label :t/use-recovery-phrase)
+      :recovering-keypair? recovering-keypair?}]))
@@ -232,11 +232,12 @@
      :sub-label           nil
      :chevron?            false})))

+;; TODO(OmarBasem): Requires design input.
 (defn edit-name-image-entry
-  [chat-id]
+  []
  (entry {:icon                :i/edit
          :label               (i18n/label :t/edit-name-and-image)
-          :on-press            #(rf/dispatch [:open-modal :screen/group-update chat-id])
+          :on-press            #(js/alert "TODO: to be implemented, requires design input")
          :danger?             false
          :accessibility-label :edit-name-and-image
          :sub-label           nil
@@ -358,7 +359,7 @@
                                 (rf/dispatch [:chats-list/load-chat chat-id])
                                 (rf/dispatch [:pin-message/load-pin-messages chat-id])
                                 (rf/dispatch [:hide-bottom-sheet])
-                                 (rf/dispatch [:navigate-to :screen/group-details chat-id]))
+                                 (rf/dispatch [:navigate-to :group-details chat-id]))
          :danger?             false
          :accessibility-label :group-details
          :sub-label           nil
@@ -368,17 +369,18 @@
  [chat-id admin?]
  (entry {:icon                :i/add-user
          :label               (i18n/label (if admin? :t/manage-members :t/add-members))
-          :on-press            #(rf/dispatch [:open-modal :screen/group-add-manage-members chat-id])
+          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members chat-id])
          :danger?             false
          :accessibility-label :manage-members
          :sub-label           nil
          :chevron?            false}))

+;; TODO(OmarBasem): to be implemented.
 (defn edit-group-entry
-  [chat-id]
+  []
  (entry {:icon                :i/edit
          :label               (i18n/label :t/edit-name-and-image)
-          :on-press            #(rf/dispatch [:open-modal :screen/group-update chat-id])
+          :on-press            #(js/alert "TODO: to be implemented")
          :danger?             false
          :accessibility-label :edit-group
          :sub-label           nil
@@ -396,11 +398,10 @@
          :chevron?            false}))

 (defn destructive-actions
-  [{:keys [group-chat chat-type] :as item} inside-chat?]
+  [{:keys [group-chat] :as item} inside-chat?]
  [(when (not group-chat)
-     (close-chat-entry item inside-chat? (not= chat-type constants/public-chat-type)))
-   (when-not (= chat-type constants/public-chat-type)
-     (clear-history-entry item group-chat))
+     (close-chat-entry item inside-chat? (not group-chat)))
+   (clear-history-entry item group-chat)
   (when group-chat
     (leave-group-entry item nil))])

@@ -424,7 +425,8 @@
     (when inside-chat?
       (add-manage-members-entry chat-id admin?))
     (when (and admin? inside-chat?)
-       (edit-group-entry chat-id))
+       (when config/show-not-implemented-features?
+         (edit-group-entry)))
     (when (and admin? inside-chat?)
       (when config/show-not-implemented-features?
         (group-privacy-entry)))]))
@@ -436,11 +438,6 @@
    (notification-actions item inside-chat? true)
    (destructive-actions item inside-chat?)]])

-(defn public-chat-actions
-  [item inside-chat?]
-  [quo/action-drawer
-   [(destructive-actions item inside-chat?)]])
-
 (defn private-group-chat-actions
  [item inside-chat?]
  [quo/action-drawer
@@ -476,8 +473,6 @@
     [one-to-one-actions chat inside-chat?]
     constants/private-group-chat-type
     [private-group-chat-actions chat inside-chat?]
-     constants/public-chat-type
-     [public-chat-actions chat inside-chat?]
     constants/community-chat-type
     [communities-chat-actions/actions chat inside-chat? hide-show-members?]
     nil))
@@ -485,12 +480,13 @@
   (chat-actions chat inside-chat? nil)))

 (defn group-details-actions
-  [{:keys [chat-id admins] :as group}]
+  [{:keys [admins] :as group}]
  (let [current-pub-key (rf/sub [:multiaccount/public-key])
        admin?          (get admins current-pub-key)]
    [quo/action-drawer
     [(when admin?
-        [(edit-name-image-entry chat-id)])
+        [(when config/show-not-implemented-features?
+           (edit-name-image-entry))])
      [(when config/show-not-implemented-features?
         (notifications-entry admin?))]
      (destructive-actions group false)]]))
@@ -1,20 +0,0 @@
-(ns status-im.common.pdf-viewer.view
-  (:require
-    [quo.core :as quo]
-    [react-native.core :as rn]
-    [react-native.pdf-viewer :as pdf-viewer]
-    [status-im.common.events-helper :as events-helper]
-    [utils.re-frame :as rf]))
-
-(defn view
-  []
-  (let [{:keys [uri pdf-viewer-props]} (rf/sub [:get-screen-params])]
-    [rn/view {:style {:flex 1}}
-     [quo/page-nav
-      {:icon-name           :i/close
-       :on-press            events-helper/navigate-back
-       :accessibility-label :pdf-viewer-nav}]
-     [pdf-viewer/view
-      (merge {:source {:uri uri}
-              :style  {:flex 1}}
-             pdf-viewer-props)]]))
@@ -17,7 +17,6 @@
   :generate-keys1                (js/require "../resources/images/ui2/generating-keys-1.png")
   :ethereum-address              (js/require "../resources/images/ui2/ethereum-address.png")
   :use-keycard                   (js/require "../resources/images/ui2/keycard.png")
-   :check-your-keycard            (js/require "../resources/images/ui2/check-your-keycard.png")
   :onboarding-illustration       (js/require "../resources/images/ui2/onboarding_illustration.png")
   :qr-code                       (js/require "../resources/images/ui2/qr-code.png")
   :keycard-logo                  (js/require "../resources/images/ui2/keycard-logo.png")
@@ -10,7 +10,7 @@

 (defn enabled? [v] (= "1" v))

-(goog-define INFURA_TOKEN "")
+(goog-define INFURA_TOKEN "62f3cee52dbb484198e7339837e263f3")
 (goog-define POKT_TOKEN "3ef2018191814b7e1009b8d9")
 (goog-define STATUS_BUILD_PROXY_USER "")
 (goog-define STATUS_BUILD_PROXY_PASSWORD "")
@@ -566,7 +566,6 @@
 (def ^:const bridge-name-erc-1155-transfer "ERC1155Transfer")
 (def ^:const bridge-name-hop "Hop")
 (def ^:const bridge-name-paraswap "Paraswap")
-(def ^:const bridge-name-celer "CBridge")

 (def ^:const bridge-assets #{"ETH" "USDT" "USDC" "DAI"})

@@ -620,12 +619,3 @@
 (def router-error-code-not-enough-liquidity "WPP-038")
 (def router-error-code-price-impact-too-high "WPP-039")
 (def router-error-code-not-enough-native-balance "WR-002")
-
-(def ^:const wallet-transaction-estimation
-  {:unknown                 0
-   :less-than-one-minute    1
-   :less-than-three-minutes 2
-   :less-than-five-minutes  3
-   :more-than-five-minutes  4})
-
-(def ^:const wallet-connect-transaction-refresh-interval-ms 10000)
@@ -14,13 +14,10 @@

 (defn centralized-metrics-interceptor
  [context]
-  (when (push-event? (interceptor/get-coeffect context :db))
-    (when-let [event (tracking/metrics-event (interceptor/get-coeffect context :event))]
-      (log/debug "tracking event" event)
-      (if (or (seq? event) (vector? event))
-        (doseq [e event]
-          (native-module/add-centralized-metric e))
-        (native-module/add-centralized-metric event))))
+  (when-let [event (tracking/tracked-event (interceptor/get-coeffect context :event))]
+    (log/debug "tracking event" event)
+    (when (push-event? (interceptor/get-coeffect context :db))
+      (native-module/add-centralized-metric event)))
  context)

 (def interceptor
@@ -48,15 +45,3 @@
                          #(rf/dispatch [:profile.login/login-with-biometric-if-available
                                         (get-in db [:profile/login :key-uid])]))
              :shell?   true}]]]})))
-
-(rf/reg-fx :effects.centralized-metrics/track
- (fn [event]
-   (native-module/add-centralized-metric event)))
-
-(rf/reg-event-fx
- :centralized-metrics/track
- (fn [{:keys [db]} [event-name data]]
-   (let [event-id (name event-name)]
-     (when (push-event? db)
-       {:fx [[:effects.centralized-metrics/track
-              (tracking/key-value-event event-id data)]]}))))
@@ -15,7 +15,7 @@

 (deftest centralized-metrics-interceptor-test
  (testing "processes context correctly"
-    (with-redefs [tracking/metrics-event (fn [_] {:metric "mocked-event"})
+    (with-redefs [tracking/tracked-event (fn [_] {:metric "mocked-event"})
                  events/push-event?     (fn [_] true)]
      (let [context {:coeffects {:event [:some-event]
                                 :db    {:centralized-metrics/enabled? true}}}]
@@ -1,35 +1,23 @@
 (ns status-im.contexts.centralized-metrics.tracking
  (:require
-    [clojure.string]
    [legacy.status-im.utils.build :as build]
-    [react-native.platform :as platform]
-    [status-im.navigation.screens :as screens]))
+    [react-native.platform :as platform]))

 (defn key-value-event
-  [event-name event-value]
+  [event-name val-key value]
  {:metric
   {:eventName  event-name
    :platform   platform/os
    :appVersion build/app-short-version
-    :eventValue event-value}})
+    :eventValue {val-key value}}})

 (defn user-journey-event
  [action]
-  (key-value-event "user-journey" {:action action}))
+  (key-value-event "user-journey" :action action))

 (defn navigation-event
  [view-id]
-  (key-value-event "navigation" {:viewId view-id}))
-
-(defn screen-event
-  [screen event-data]
-  (let [screen-id (:name screen)
-        view-id   (get-in screen [:metrics :alias-id] screen-id)]
-    {:metric
-     {:eventName  "navigation"
-      :platform   platform/os
-      :appVersion build/app-short-version
-      :eventValue (assoc event-data :viewId (name view-id))}}))
+  (key-value-event "navigation" :viewId view-id))

 (def ^:const app-started-event "app-started")

@@ -37,38 +25,41 @@
  #{;; Tabs
    :communities-stack
    :chats-stack
-    :wallet-stack})
+    :wallet-stack
+
+    ;; Onboarding
+    :screen/onboarding.intro
+    :screen/onboarding.new-to-status
+    :screen/onboarding.sync-or-recover-profile
+    :screen/onboarding.enter-seed-phrase
+    :screen/onboarding.create-profile
+    :screen/onboarding.create-profile-password
+    :screen/onboarding.enable-biometrics
+    :screen/onboarding.generating-keys
+    :screen/onboarding.enable-notifications
+    :screen/onboarding.preparing-status
+    :screen/onboarding.sign-in-intro
+    :screen/onboarding.sign-in
+    :screen/onboarding.syncing-progress
+    :screen/onboarding.syncing-progress-intro
+    :screen/onboarding.syncing-results
+    :screen/onboarding.welcome})

 (defn track-view-id-event
  [view-id]
-  (if-let [screen (get screens/screens-by-name view-id)]
-    (when (get-in screen [:metrics :track?])
-      (screen-event screen {}))
-    (when (contains? view-ids-to-track view-id)
-      (navigation-event (name view-id)))))
+  (when (contains? view-ids-to-track view-id)
+    (navigation-event (name view-id))))

-(defn navigated-to-collectibles-tab-event
-  [location]
-  (key-value-event "navigated-to-collectibles-tab" {:location location}))
-
-(defn metrics-event
-  [[rf-event-name rf-event-parameter]]
-  (case rf-event-name
+(defn tracked-event
+  [[event-name second-parameter]]
+  (case event-name
    :profile/get-profiles-overview-success
    (user-journey-event app-started-event)

    :centralized-metrics/toggle-centralized-metrics
-    (key-value-event "events.metrics-enabled" {:enabled rf-event-parameter})
+    (key-value-event "events.metrics-enabled" :enabled second-parameter)

    :set-view-id
-    (track-view-id-event rf-event-parameter)
-
-    :wallet/select-account-tab
-    (when (= rf-event-parameter :collectibles)
-      (navigated-to-collectibles-tab-event :account))
-
-    :wallet/select-home-tab
-    (when (= rf-event-parameter :collectibles)
-      (navigated-to-collectibles-tab-event :home))
+    (track-view-id-event second-parameter)

    nil))
@@ -18,7 +18,7 @@
                       :platform   platform-os
                       :appVersion app-version
                       :eventValue {val-key value}}}]
-      (is (= expected (tracking/key-value-event event-name {val-key value}))))))
+      (is (= expected (tracking/key-value-event event-name val-key value))))))

 (deftest user-journey-event-test
  (testing "creates correct user journey event"
@@ -52,7 +52,7 @@
            {:eventName  "navigation"
             :platform   platform-os
             :appVersion app-version
-             :eventValue {:viewId "onboarding.create-profile-info"}}}
+             :eventValue {:viewId "onboarding.create-profile"}}}
           (tracking/track-view-id-event :screen/onboarding.create-profile)))
    (is (nil? (tracking/track-view-id-event :unknown-stack)))))

@@ -63,23 +63,17 @@
             :platform   platform-os
             :appVersion app-version
             :eventValue {:action tracking/app-started-event}}}
-           (tracking/metrics-event [:profile/get-profiles-overview-success])))
+           (tracking/tracked-event [:profile/get-profiles-overview-success])))
    (is (= {:metric
            {:eventName  "events.metrics-enabled"
             :platform   platform-os
             :appVersion app-version
             :eventValue {:enabled true}}}
-           (tracking/metrics-event [:centralized-metrics/toggle-centralized-metrics true])))
+           (tracking/tracked-event [:centralized-metrics/toggle-centralized-metrics true])))
    (is (= {:metric
            {:eventName  "navigation"
             :platform   platform-os
             :appVersion app-version
             :eventValue {:viewId "wallet-stack"}}}
-           (tracking/metrics-event [:set-view-id :wallet-stack])))
-    (is (nil? (tracking/metrics-event [:unknown-event])))
-    (is (= {:metric
-            {:eventName  "navigation"
-             :platform   platform-os
-             :appVersion app-version
-             :eventValue {:viewId "onboarding.intro"}}}
-           (tracking/metrics-event [:set-view-id :screen/onboarding.intro])))))
+           (tracking/tracked-event [:set-view-id :wallet-stack])))
+    (is (nil? (tracking/tracked-event [:unknown-event])))))
@@ -9,7 +9,7 @@
    [status-im.constants :as constants]
    [status-im.contexts.chat.contacts.events :as contacts-store]
    status-im.contexts.chat.effects
-    status-im.contexts.chat.group.events
+    status-im.contexts.chat.group-create.events
    [status-im.contexts.chat.messenger.composer.link-preview.events :as link-preview]
    status-im.contexts.chat.messenger.messages.content.reactions.events
    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events :as delete-for-me]
@@ -33,8 +33,8 @@
   (multi-user-chat? (get-chat cofx chat-id))))

 (defn public-chat?
-  ([{:keys [chat-type]}]
-   (= chat-type constants/public-chat-type))
+  ([chat]
+   (:public? chat))
  ([cofx chat-id]
   (public-chat? (get-chat cofx chat-id))))

@@ -52,7 +52,7 @@
 (defn group-chat?
  ([chat]
   (and (multi-user-chat? chat)
-        (not (:public? chat))))
+        (not (public-chat? chat))))
  ([cofx chat-id]
   (group-chat? (get-chat cofx chat-id))))

@@ -1,27 +0,0 @@
-(ns status-im.contexts.chat.group.create.view
-  (:require
-    [clojure.string :as string]
-    [quo.foundations.colors :as colors]
-    [status-im.constants :as constants]
-    [status-im.contexts.chat.group.common.group-edit :as group-edit]
-    [status-im.contexts.profile.utils :as profile.utils]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
-
-(defn view
-  [{:keys [close]}]
-  (let [contacts           (rf/sub [:selected-group-contacts])
-        contact-string     (string/join ", " (map profile.utils/displayed-name contacts))
-        default-group-name (subs contact-string
-                                 0
-                                 (min (count contact-string) constants/max-group-chat-name-length))
-        profile            (rf/sub [:profile/profile-with-image])
-        contacts           (conj contacts profile)]
-    [group-edit/view
-     {:default-group-name  default-group-name
-      :default-group-color (rand-nth colors/account-colors)
-      :contacts            contacts
-      :submit-button-label (i18n/label :t/create-group-chat)
-      :submit-event        :group-chat/create
-      :back-button-icon    :i/arrow-left
-      :close               close}]))
@@ -1,23 +0,0 @@
-(ns status-im.contexts.chat.group.update.view
-  (:require
-    [status-im.contexts.chat.group.common.group-edit :as group-edit]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
-
-(defn view
-  [{:keys [close]}]
-  (let [chat-id                         (rf/sub [:get-screen-params :screen/group-update])
-        {:keys [chat-name color image]} (rf/sub [:chats/chat-by-id chat-id])
-        contacts                        (rf/sub [:contacts/contacts-by-chat chat-id])]
-    [group-edit/view
-     {:default-group-name  chat-name
-      :default-group-color color
-      :default-group-image image
-      :contacts            contacts
-      :submit-button-label (i18n/label :t/update-group-chat)
-      :submit-event        :group-chat/edit
-      :back-button-icon    :i/close
-      :chat-id             chat-id
-      :close               close
-      :on-success          close
-      :editing-group?      true}]))
@@ -1,12 +1,12 @@
-(ns status-im.contexts.chat.group.events
+(ns status-im.contexts.chat.group-create.events
  (:require [clojure.string :as string]
+            [legacy.status-im.data-store.chats :as data-store.chats]
            [oops.core :as oops]
            [re-frame.core :as rf]
-            [status-im.common.avatar-picture-picker.view :as avatar-picture-picker]
-            [taoensso.timbre :as log]))
+            [status-im.common.avatar-picture-picker.view :as avatar-picture-picker]))

 (rf/reg-event-fx :group-chat/create
- (fn [{:keys [db]} [{:keys [group-name group-color group-image]}]]
+ (fn [{:keys [db]} [group-name color image]]
   (let [selected-contacts (:group/selected-contacts db)]
     {:json-rpc/call [{:method      "wakuext_createGroupChatWithMembers"
                       :params      [nil group-name (into [] selected-contacts)]
@@ -17,23 +17,25 @@
                                                        (oops/oget :id))]
                                        (rf/dispatch [:chat-updated response])
                                        (rf/dispatch [:group-chat/edit
-                                                      {:chat-id     chat-id
-                                                       :group-name  group-name
-                                                       :group-color group-color
-                                                       :group-image group-image}])))}]})))
+                                                      {:chat-id    chat-id
+                                                       :group-name group-name
+                                                       :color      color
+                                                       :image      image}])))}]})))
+
+(rf/reg-event-fx :group-chat/edit-success
+ (fn [{:keys [db]} [{:keys [chat-id name color image]}]]
+   (let [new-chat {:name name :color color :image image}]
+     {:db (update-in db [:chats chat-id] #(merge % new-chat))})))

 (rf/reg-event-fx :group-chat/edit
- (fn [_ [{:keys [chat-id group-name group-color group-image on-success]}]]
+ (fn [_ [{:keys [chat-id group-name color image]}]]
   {:json-rpc/call [{:method      "chat_editChat"
-                     :params      ["" chat-id group-name (name group-color)
-                                   {:imagePath (when group-image
-                                                 (string/replace-first group-image #"file://" ""))
+                     :params      ["" chat-id group-name (name color)
+                                   {:imagePath (when image (string/replace-first image #"file://" ""))
                                    :x         0
                                    :y         0
                                    :width     avatar-picture-picker/crop-size
                                    :height    avatar-picture-picker/crop-size}]
                     :js-response true
-                     :on-error    #(log/error "failed to edit group" {:error %})
-                     :on-success  (fn [response]
-                                    (rf/dispatch [:chat-updated response true])
-                                    (when on-success (on-success)))}]}))
+                     :on-success  #(rf/dispatch [:group-chat/edit-success
+                                                 (data-store.chats/<-rpc-js %)])}]}))
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.group.common.style
+(ns status-im.contexts.chat.group-create.style
  (:require [quo.foundations.colors :as colors]))

 (def avatar {:width 88 :margin-top 12 :margin-left 20})
@@ -1,11 +1,13 @@
-(ns status-im.contexts.chat.group.common.group-edit
-  (:require [quo.core :as quo]
+(ns status-im.contexts.chat.group-create.view
+  (:require [clojure.string :as string]
+            [quo.core :as quo]
+            [quo.foundations.colors :as colors]
            [quo.theme]
            [react-native.core :as rn]
            [status-im.common.avatar-picture-picker.view :as avatar-picture-picker]
            [status-im.common.floating-button-page.view :as floating-button-page]
            [status-im.constants :as constants]
-            [status-im.contexts.chat.group.common.style :as style]
+            [status-im.contexts.chat.group-create.style :as style]
            [status-im.contexts.profile.utils :as profile.utils]
            [utils.debounce :as debounce]
            utils.emojilib
@@ -39,28 +41,35 @@
      :i/camera]]))

 (defn view
-  [{:keys [default-group-name default-group-color default-group-image contacts
-           submit-button-label submit-event back-button-icon chat-id close on-success editing-group?]}]
+  []
  (let [theme                         (quo.theme/use-theme)
        {window-width :width}         (rn/get-window)
+        profile                       (rf/sub [:profile/profile-with-image])
+        contacts                      (rf/sub [:selected-group-contacts])
        contacts-count                (count contacts)
-        [group-name set-group-name]   (rn/use-state default-group-name)
+        default-value                 (rn/use-memo
+                                       (fn []
+                                         (let [contact-string (string/join ", "
+                                                                           (map
+                                                                            profile.utils/displayed-name
+                                                                            contacts))]
+                                           (subs contact-string
+                                                 0
+                                                 (min (count contact-string)
+                                                      constants/max-group-chat-name-length))))
+                                       [])
+        [group-name set-group-name]   (rn/use-state default-value)
        [error-message
         set-error-message]           (rn/use-state nil)
        group-name-empty?             (not (and (string? group-name) (not-empty group-name)))
-        [group-color set-group-color] (rn/use-state default-group-color)
-        [group-image set-group-image] (rn/use-state default-group-image)
-        on-submit                     (rn/use-callback #(debounce/throttle-and-dispatch
-                                                         [submit-event
-                                                          {:group-name  group-name
-                                                           :group-color group-color
-                                                           :group-image (when (not= group-image
-                                                                                    default-group-image)
-                                                                          group-image)
-                                                           :chat-id     chat-id
-                                                           :on-success  on-success}]
+        [group-color set-group-color] (rn/use-state (rand-nth colors/account-colors))
+        [group-image set-group-image] (rn/use-state nil)
+        create-group-on-press         (rn/use-callback #(debounce/throttle-and-dispatch
+                                                         [:group-chat/create group-name group-color
+                                                          group-image]
                                                         300)
                                                       [group-name group-color group-image])
+        back-on-press                 (rn/use-callback #(rf/dispatch [:navigate-back]))
        on-change-text                (rn/use-callback
                                       (fn [text]
                                         (if (boolean (re-find utils.emojilib/emoji-regex text))
@@ -68,13 +77,7 @@
                                                                          {:check (i18n/label
                                                                                   :t/emojis)}))
                                           (set-error-message nil))
-                                         (set-group-name text)))
-        disabled?                     (or group-name-empty?
-                                          error-message
-                                          (and editing-group?
-                                               (= group-name default-group-name)
-                                               (= group-color default-group-color)
-                                               (= group-image default-group-image)))]
+                                         (set-group-name text)))]
    [floating-button-page/view
     {:customization-color    group-color
      :gradient-cover?        true
@@ -82,13 +85,13 @@
      :header                 [quo/page-nav
                               {:background :photo
                                :type       :no-title
-                                :icon-name  back-button-icon
-                                :on-press   close}]
+                                :icon-name  :i/arrow-left
+                                :on-press   back-on-press}]
      :footer                 [quo/button
                               {:customization-color group-color
-                                :disabled?           disabled?
-                                :on-press            on-submit}
-                               submit-button-label]}
+                                :disabled?           (boolean (or group-name-empty? error-message))
+                                :on-press            create-group-on-press}
+                               (i18n/label :t/create-group-chat)]}
     [:<>
      [avatar
       {:customization-color group-color
@@ -96,7 +99,7 @@
        :set-group-image     set-group-image}]
      [quo/title-input
       {:on-change-text  on-change-text
-        :default-value   default-group-name
+        :default-value   default-value
        :container-style {:padding-horizontal 20 :padding-top 12 :padding-bottom (if error-message 0 16)}
        :placeholder     (i18n/label :t/name-your-group)
        :max-length      constants/max-group-chat-name-length}]
@@ -123,9 +126,9 @@
                            :padding-left   (responsiveness/iphone-11-Pro-20-pixel-from-width
                                             window-width)}}]]
      [quo/divider-label
-       (i18n/label :t/n-m-people {:n contacts-count :m constants/max-group-chat-participants})]
+       (i18n/label :t/n-m-people {:n (inc contacts-count) :m constants/max-group-chat-participants})]
      [rn/view {:style style/tags}
-       (for [contact contacts]
+       (for [contact (conj contacts profile)]
         ^{:key contact}
         [quo/context-tag
          {:container-style style/tag
@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.group.details.style
+(ns status-im.contexts.chat.group-details.style
  (:require
    [quo.foundations.colors :as colors]))

@@ -1,4 +1,4 @@
-(ns status-im.contexts.chat.group.details.view
+(ns status-im.contexts.chat.group-details.view
  (:require
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
@@ -11,7 +11,7 @@
    [status-im.common.contact-list.view :as contact-list]
    [status-im.common.home.actions.view :as actions]
    [status-im.constants :as constants]
-    [status-im.contexts.chat.group.details.style :as style]
+    [status-im.contexts.chat.group-details.style :as style]
    [status-im.feature-flags :as ff]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -54,7 +54,7 @@
  (let [theme                      (quo.theme/use-theme)
        selected-participants      (rf/sub [:group-chat/selected-participants])
        deselected-members         (rf/sub [:group-chat/deselected-members])
-        chat-id                    (rf/sub [:get-screen-params :screen/group-add-manage-members])
+        chat-id                    (rf/sub [:get-screen-params :group-add-manage-members])
        {:keys [admins] :as group} (rf/sub [:chats/chat-by-id chat-id])
        current-pk                 (rf/sub [:multiaccount/public-key])
        admin?                     (get admins current-pk)]
@@ -123,9 +123,9 @@
  [_]
  [rn/view {:style {:height 8}}])

-(defn view
+(defn group-details
  []
-  (let [chat-id         (rf/sub [:get-screen-params :screen/group-details])
+  (let [chat-id         (rf/sub [:get-screen-params :group-details])
        {:keys [admins chat-id chat-name color muted contacts image]
         :as   group}   (rf/sub [:chats/chat-by-id chat-id])
        members         (rf/sub [:contacts/group-members-sections chat-id])
@@ -176,8 +176,7 @@
                          :icon                :i/add-user
                          :label               (i18n/label (if admin? :t/manage-members :t/add-members))
                          :counter-value       (count contacts)
-                          :on-press            #(rf/dispatch [:open-modal
-                                                              :screen/group-add-manage-members
+                          :on-press            #(rf/dispatch [:open-modal :group-add-manage-members
                                                              chat-id])}]}]
     [rn/section-list
      {:key-fn                         :title
@@ -237,17 +237,11 @@

 (defn chat-item
  [{:keys [chat-id group-chat color name last-message timestamp muted image
-           chat-type unviewed-messages-count]
+           unviewed-messages-count]
    :as   item}]
  (let [[primary-name secondary-name]
-        (cond
-          group-chat
+        (if group-chat
          [name ""]
-
-          (= chat-type constants/public-chat-type)
-          [(str "#" name) ""]
-
-          :else
          (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
        {:keys [ens-verified added?] :as contact} (when-not group-chat
                                                    (rf/sub [:contacts/contact-by-address chat-id]))
@@ -149,7 +149,7 @@
          :on-press            (fn []
                                 (if one-contact-selected?
                                   (rf/dispatch [:chat.ui/start-chat public-key])
-                                   (rf/dispatch [:open-modal :screen/group-create])))}
+                                   (rf/dispatch [:open-modal :group-create])))}
         (if one-contact-selected?
           (i18n/label :t/chat-with {:selected-user primary-name})
           (i18n/label :t/setup-group-chat))]])]))
@@ -17,7 +17,7 @@
   user])

 (defn view
-  [layout-height]
+  [{:keys [layout-height]}]
  (let [suggestions                               (rf/sub [:chat/mention-suggestions])
        suggestions?                              (seq suggestions)
        theme                                     (quo.theme/use-theme)
@@ -35,7 +35,7 @@
        :default-value            default-value}])))

 (defn view
-  [layout-height]
+  [props]
  (let [theme     (quo.theme/use-theme)
        bottom    (safe-area/get-bottom)
        input-ref (rn/use-ref-atom nil)
@@ -43,7 +43,7 @@
                                     (rf/dispatch [:chat/set-input-ref value])
                                     (reset! input-ref value)))]
    [rn/view {:style {:margin-bottom bottom}}
-     [mentions/view layout-height]
+     [mentions/view props]
     [quo/separator]
     [rn/view {:style {:padding-horizontal 20 :padding-top 20}}
      [:<>
@@ -3,4 +3,15 @@
 ;;;; Navigation
 (def ^:const top-bar-height 56)
 (def ^:const pinned-banner-height 40)
+(def ^:const header-container-top-margin 48)
 (def ^:const header-container-radius 20)
+(def ^:const header-animation-distance 20)
+(def ^:const content-animation-start-position-android 130)
+(def ^:const content-animation-start-position-ios 124)
+;; Note - We should also consider height of bio for banner animation starting position
+;; Todo - Should be updated once New-profile implemation is complete
+(def ^:const pinned-banner-animation-start-position 148)
+
+(def ^:const default-extrapolation-option
+  {:extrapolateLeft  "clamp"
+   :extrapolateRight "clamp"})
@@ -11,26 +11,25 @@

 (defn view
  [{:keys [contact-id]}]
-  (let [customization-color       (rf/sub [:profile/customization-color])
-        {:keys [contact-request-state
-                community-id
-                chat-name]}       (rf/sub [:chats/current-chat-chat-view])
-        chat-type                 (rf/sub [:chats/chat-type])
-        [primary-name _]          (if (= chat-type :public-chat)
-                                    [(str "#" chat-name) ""]
-                                    (rf/sub [:contacts/contact-two-names-by-identity contact-id]))
-        community-chat?           (= chat-type :community-chat)
-        joined                    (when community-chat?
-                                    (rf/sub [:communities/community-joined community-id]))
-        pending?                  (when community-chat?
-                                    (rf/sub [:communities/my-pending-request-to-join community-id]))
-        contact-request-send?     (or (not contact-request-state)
-                                      (= contact-request-state
-                                         constants/contact-request-state-none))
-        contact-request-received? (= contact-request-state
-                                     constants/contact-request-state-received)
-        contact-request-pending?  (= contact-request-state
-                                     constants/contact-request-state-sent)]
+  (let [customization-color                          (rf/sub [:profile/customization-color])
+        [primary-name _]                             (rf/sub [:contacts/contact-two-names-by-identity
+                                                              contact-id])
+        {:keys [contact-request-state community-id]} (rf/sub [:chats/current-chat-chat-view])
+        chat-type                                    (rf/sub [:chats/chat-type])
+        community-chat?                              (= chat-type :community-chat)
+        joined                                       (when community-chat?
+                                                       (rf/sub [:communities/community-joined
+                                                                community-id]))
+        pending?                                     (when community-chat?
+                                                       (rf/sub [:communities/my-pending-request-to-join
+                                                                community-id]))
+        contact-request-send?                        (or (not contact-request-state)
+                                                         (= contact-request-state
+                                                            constants/contact-request-state-none))
+        contact-request-received?                    (= contact-request-state
+                                                        constants/contact-request-state-received)
+        contact-request-pending?                     (= contact-request-state
+                                                        constants/contact-request-state-sent)]
    [rn/view {:style style/container}
     [quo/permission-context
      {:blur?        true
@@ -1,11 +1,11 @@
 (ns status-im.contexts.chat.messenger.messages.list.style
  (:require
    [quo.foundations.colors :as colors]
-    [react-native.safe-area :as safe-area]
+    [quo.foundations.shadows :as shadows]
+    [react-native.reanimated :as reanimated]
    [status-im.contexts.chat.messenger.messages.constants :as messages.constants]))

 (def permission-context-height 46)
-(def distance-from-last-message 4)

 (defn keyboard-avoiding-container
  [theme]
@@ -13,13 +13,70 @@
   :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
   :z-index          2})

-(def permission-context-sheet {:flex 3}) ; Pushes composer to bottom
+(defn background-container
+  [background-color background-opacity top-margin]
+  (reanimated/apply-animations-to-style
+   {:opacity background-opacity}
+   {:background-color background-color
+    :position         :absolute
+    :top              0
+    :left             0
+    :right            0
+    :height           (+ top-margin messages.constants/header-container-radius)}))

-(defn list-paddings
-  [add-padding-bottom?]
-  (let [{:keys [top bottom]} (safe-area/get-insets)]
-    ;; WARNING: the flat-list is reversed, so the paddings are applied inverted
-    {:padding-top    (if add-padding-bottom?
-                       (+ distance-from-last-message permission-context-height bottom)
-                       distance-from-last-message)
-     :padding-bottom (+ top messages.constants/top-bar-height)}))
+(defn header-bottom-container
+  [bottom top-margin]
+  (reanimated/apply-animations-to-style
+   {:bottom bottom}
+   {:margin-top top-margin}))
+
+(defn header-bottom-part
+  [theme]
+  {:background-color   (colors/theme-colors colors/white colors/neutral-95 theme)
+   :padding-horizontal 20
+   :border-radius      20})
+
+(defn header-bottom-shadow
+  [theme]
+  (assoc
+   (shadows/get 2 theme :inverted)
+   :left          0
+   :right         0
+   :height        40
+   :position      :absolute
+   :border-radius 20))
+
+(defn header-image
+  [scale top left theme]
+  (reanimated/apply-animations-to-style
+   {:transform [{:scale scale}]
+    :top       top
+    :left      left}
+   {:position         :absolute
+    :border-width     4
+    :border-radius    50
+    :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
+    :border-color     (colors/theme-colors colors/white colors/neutral-95 theme)}))
+
+(defn user-name-container
+  [top left]
+  (reanimated/apply-animations-to-style
+   {:top  top
+    :left left}
+   {:z-index -1}))
+
+(def user-name
+  {:align-items    :center
+   :flex-direction :row
+   :margin-top     52})
+
+(defn bio-and-actions
+  [top]
+  (reanimated/apply-animations-to-style
+   {:top top}
+   {:row-gap 16}))
+
+(defn permission-context-sheet
+  [margin-bottom?]
+  {:flex          3 ;; Pushes composer to bottom
+   :margin-bottom (when margin-bottom? permission-context-height)})
@@ -1,5 +1,6 @@
 (ns status-im.contexts.chat.messenger.messages.list.view
  (:require
+    [clojure.string :as string]
    [legacy.status-im.ui.screens.chat.group :as chat.group]
    [oops.core :as oops]
    [quo.core :as quo]
@@ -10,9 +11,11 @@
    [react-native.hooks :as hooks]
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
+    [react-native.safe-area :as safe-area]
    [status-im.common.home.actions.view :as home.actions]
    [status-im.constants :as constants]
    [status-im.contexts.chat.messenger.composer.constants :as composer.constants]
+    [status-im.contexts.chat.messenger.messages.constants :as messages.constants]
    [status-im.contexts.chat.messenger.messages.content.view :as message]
    [status-im.contexts.chat.messenger.messages.list.state :as state]
    [status-im.contexts.chat.messenger.messages.list.style :as style]
@@ -22,7 +25,8 @@
    [utils.re-frame :as rf]
    [utils.worklets.chat.messenger.messages :as worklets]))

-(def ^:const loading-indicator-page-loading-height 100)
+(defonce ^:const distance-from-last-message 4)
+(defonce ^:const loading-indicator-page-loading-height 100)

 (defn list-key-fn [{:keys [message-id value]}] (or message-id value))
 (defn list-ref [ref] (reset! state/messages-list-ref ref))
@@ -56,17 +60,44 @@
                                                   on-loaded])
                                    (if platform/low-device? 700 100)))))

+(defn- contact-icon
+  [{:keys [ens-verified added?]} theme]
+  (when (or ens-verified added?)
+    [rn/view
+     {:style {:margin-left 4}}
+     (if ens-verified
+       [quo/icon :i/verified
+        {:no-color true
+         :size     20
+         :color    (colors/theme-colors
+                    (colors/custom-color :success 50)
+                    (colors/custom-color :success 60)
+                    theme)}]
+       (when added?
+         [quo/icon :i/contact
+          {:no-color true
+           :size     20
+           :color    (colors/theme-colors colors/primary-50 colors/primary-60 theme)}]))]))
+
+(defn- skeleton-list-props
+  [content parent-height animated?]
+  {:content       content
+   :parent-height parent-height
+   :animated?     animated?})
+
 (defn loading-view
-  [{:keys [chat-id window-height]}]
+  [chat-id {:keys [window-height]}]
  (let [messages            (rf/sub [:chats/raw-chat-messages-stream chat-id])
        loading-first-page? (= (count messages) 0)
+        top-spacing         (if loading-first-page?
+                              0
+                              (+ messages.constants/top-bar-height (safe-area/get-top)))
        parent-height       (if loading-first-page?
                              window-height
                              loading-indicator-page-loading-height)]
-    [quo/skeleton-list
-     {:content       :messages
-      :parent-height parent-height
-      :animated?     false}]))
+    [rn/view {:padding-top top-spacing}
+     ;; Don't use animated loading skeleton https://github.com/status-im/status-mobile/issues/17426
+     [quo/skeleton-list (skeleton-list-props :messages parent-height false)]]))

 (defn header-height
  [{:keys [insets able-to-send-message? images reply edit link-previews? input-content-height]}]
@@ -94,6 +125,84 @@
      (+ (:bottom insets)))
    (- 70 (:bottom insets))))

+(defn list-header
+  [insets able-to-send-message?]
+  (let [header-data {:insets                insets
+                     :able-to-send-message? able-to-send-message?
+                     :input-content-height  (:input-content-height (rf/sub [:chats/current-chat-input]))
+                     :images                (rf/sub [:chats/sending-image])
+                     :reply                 (rf/sub [:chats/reply-message])
+                     :edit                  (rf/sub [:chats/edit-message])
+                     :link-previews?        (or (rf/sub [:chats/link-previews?])
+                                                (rf/sub [:chats/status-link-previews?]))}]
+    [rn/view {:style {:height (header-height header-data)}}]))
+
+(defn list-footer-avatar
+  [{:keys [distance-from-list-top display-name online? profile-picture theme group-chat color
+           emoji chat-type chat-name empty-chat?]}]
+  (let [scale              (reanimated/interpolate
+                            distance-from-list-top
+                            [0 (if empty-chat? 0 messages.constants/header-container-top-margin)]
+                            [1 0.4]
+                            messages.constants/default-extrapolation-option)
+        top                (reanimated/interpolate
+                            distance-from-list-top
+                            [0 (if empty-chat? 0 messages.constants/header-container-top-margin)]
+                            [-44 -12]
+                            messages.constants/default-extrapolation-option)
+        left               (reanimated/interpolate
+                            distance-from-list-top
+                            [0 (if empty-chat? 0 messages.constants/header-container-top-margin)]
+                            [16 -8]
+                            messages.constants/default-extrapolation-option)
+        community-channel? (= chat-type constants/community-chat-type)]
+    [reanimated/view
+     {:style (style/header-image scale top left theme)}
+     (cond
+       community-channel?
+       [quo/channel-avatar
+        {:size                :size-80
+         :full-name           chat-name
+         :customization-color color
+         :emoji               (when-not (string/blank? emoji)
+                                (string/trim emoji))}]
+       group-chat
+       [quo/group-avatar
+        {:customization-color color
+         :size                :size-80
+         :picture             profile-picture
+         :chat-name           chat-name}]
+       :else
+       [quo/user-avatar
+        {:full-name       display-name
+         :online?         online?
+         :profile-picture profile-picture
+         :size            :big}])]))
+
+(defn chat-display-name
+  [{:keys [distance-from-list-top display-name contact theme empty-chat?]}]
+  (let [top  (reanimated/interpolate
+              distance-from-list-top
+              [0 (if empty-chat? 0 messages.constants/header-container-top-margin)]
+              [0 -35]
+              messages.constants/default-extrapolation-option)
+        left (reanimated/interpolate
+              distance-from-list-top
+              [0 (if empty-chat? 0 messages.constants/header-container-top-margin)]
+              [0 40]
+              messages.constants/default-extrapolation-option)]
+    [reanimated/view
+     {:style (style/user-name-container top left)}
+     [rn/view
+      {:style style/user-name}
+      [quo/text
+       {:weight          :semi-bold
+        :size            :heading-1
+        :style           {:flex-shrink 1}
+        :number-of-lines 1}
+       display-name]
+      [contact-icon contact theme]]]))
+
 (defn actions
  [chat-id cover-bg-color]
  (let [latest-pin-text                      (rf/sub [:chats/last-pinned-message-text chat-id])
@@ -127,12 +236,101 @@
                                                                chat-type
                                                                muted?)))}]}]))

-(defn more-messages-loader
-  [{:keys [chat-id] :as props}]
-  (let [loading-messages? (rf/sub [:chats/loading-messages? chat-id])
+(defn bio-and-actions
+  [{:keys [distance-from-list-top bio chat-id customization-color empty-chat? description]}]
+  (let [has-bio (seq (or bio description))
+        top     (reanimated/interpolate
+                 distance-from-list-top
+                 [0 (if empty-chat? 0 messages.constants/header-container-top-margin)]
+                 [(if has-bio 8 16) (if has-bio -28 -20)]
+                 messages.constants/default-extrapolation-option)]
+    [reanimated/view
+     {:style (style/bio-and-actions top)}
+     (when has-bio
+       [quo/text (or bio description)])
+     [actions chat-id customization-color]]))
+
+(defn footer-component
+  [{:keys [chat distance-from-list-top customization-color]}]
+  (let [theme                 (quo.theme/use-theme)
+        {:keys [chat-id chat-name emoji chat-type
+                group-chat color description
+                empty-chat?]} chat
+        display-name          (cond
+                                (= chat-type constants/one-to-one-chat-type)
+                                (first (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
+                                (= chat-type constants/community-chat-type)
+                                (str "# " chat-name)
+                                :else (str emoji chat-name))
+        {:keys [bio]}         (rf/sub [:contacts/contact-by-identity chat-id])
+        online?               (rf/sub [:visibility-status-updates/online? chat-id])
+        contact               (when-not group-chat
+                                (rf/sub [:contacts/contact-by-address chat-id]))
+        photo-path            (if group-chat
+                                (rf/sub [:chats/group-chat-image chat-id])
+                                (rf/sub [:chats/photo-path chat-id]))
+        top-margin            (+ (safe-area/get-top)
+                                 messages.constants/top-bar-height
+                                 messages.constants/header-container-top-margin
+                                 32)
+        background-color      (colors/theme-colors
+                               (colors/resolve-color customization-color theme 20)
+                               (colors/resolve-color customization-color theme 40)
+                               theme)
+        bottom                (reanimated/interpolate
+                               distance-from-list-top
+                               [0 messages.constants/header-container-top-margin]
+                               [32 -4]
+                               messages.constants/default-extrapolation-option)
+        background-opacity    (reanimated/interpolate
+                               distance-from-list-top
+                               [messages.constants/header-container-top-margin
+                                (+ messages.constants/header-animation-distance
+                                   messages.constants/header-container-top-margin)]
+                               [1 0]
+                               messages.constants/default-extrapolation-option)]
+    [:<>
+     [reanimated/view
+      {:style (style/background-container background-color background-opacity top-margin)}]
+     [reanimated/view {:style (style/header-bottom-container bottom top-margin)}
+      [rn/view {:style (style/header-bottom-shadow theme)}]
+      [rn/view {:style (style/header-bottom-part theme)}
+       [list-footer-avatar
+        {:distance-from-list-top distance-from-list-top
+         :display-name           display-name
+         :online?                online?
+         :theme                  theme
+         :profile-picture        photo-path
+         :group-chat             group-chat
+         :color                  color
+         :emoji                  emoji
+         :chat-type              chat-type
+         :chat-name              chat-name
+         :empty-chat?            empty-chat?}]
+       [chat-display-name
+        {:distance-from-list-top distance-from-list-top
+         :display-name           display-name
+         :theme                  theme
+         :contact                contact
+         :group-chat             group-chat
+         :empty-chat?            empty-chat?}]
+       [bio-and-actions
+        {:distance-from-list-top distance-from-list-top
+         :bio                    bio
+         :chat-id                chat-id
+         :customization-color    customization-color
+         :description            description
+         :empty-chat?            empty-chat?}]]]]))
+
+(defn list-footer
+  [props]
+  (let [chat-id           (get-in props [:chat :chat-id])
+        loading-messages? (rf/sub [:chats/loading-messages? chat-id])
        all-loaded?       (rf/sub [:chats/all-loaded? chat-id])]
-    (when (or loading-messages? (not all-loaded?))
-      [loading-view props])))
+    [:<>
+     (if (or loading-messages? (not all-loaded?))
+       [loading-view chat-id props]
+       [footer-component props])]))

 (defn list-group-chat-header
  [{:keys [chat-id invitation-admin]}]
@@ -161,7 +359,8 @@
        (reset! content-height content-height-new)))))

 (defn on-layout
-  [{:keys [event layout-height distance-atom distance-from-list-top on-layout-done?]}]
+  [{:keys [event layout-height distance-atom distance-from-list-top
+           chat-screen-layout-calculations-complete?]}]
  (let [layout-height-new (oops/oget event "nativeEvent.layout.height")
        change            (- layout-height-new @layout-height)
        new-distance      (- @distance-atom change)]
@@ -169,7 +368,8 @@
      (reanimated/set-shared-value distance-from-list-top new-distance)
      (reset! distance-atom new-distance)
      (reset! layout-height layout-height-new))
-    (reset! on-layout-done? true)))
+    (when-not (reanimated/get-shared-value chat-screen-layout-calculations-complete?)
+      (reanimated/set-shared-value chat-screen-layout-calculations-complete? true))))

 (defn on-scroll-fn
  [distance-atom layout-height-atom]
@@ -179,21 +379,29 @@
    (reset! distance-atom new-distance)))

 (defn messages-list-content
-  [{:keys [insets distance-from-list-top layout-height chat-list-scroll-y on-layout-done?]}]
-  (let [content-height           (rn/use-ref-atom 0)
-        distance-atom            (rn/use-ref-atom 0)
-        theme                    (quo.theme/use-theme)
-        {:keys [keyboard-shown]} (hooks/use-keyboard)
-        {:keys [chat-type chat-id]
-         :as   chat}             (rf/sub [:chats/current-chat-chat-view])
-        community-channel?       (= constants/community-chat-type chat-type)
-        {window-height :height}  (rn/get-window)
-        context                  (rf/sub [:chats/current-chat-message-list-view-context])
-        able-to-send-message?    (:able-to-send-message? context)
-        messages                 (rf/sub [:chats/raw-chat-messages-stream chat-id])
-        add-padding-bottom?      (and community-channel? (not able-to-send-message?))
-        recording?               (rf/sub [:chats/recording?])]
-    [rn/view {:style style/permission-context-sheet}
+  [{:keys [insets distance-from-list-top content-height layout-height distance-atom
+           chat-screen-layout-calculations-complete? chat-list-scroll-y]}]
+  (let [theme                                (quo.theme/use-theme)
+        {:keys [chat-type chat-id] :as chat} (rf/sub [:chats/current-chat-chat-view])
+        one-to-one-chat?                     (= chat-type constants/one-to-one-chat-type)
+        community-channel?                   (= constants/community-chat-type chat-type)
+        {contact-customization-color
+         :customization-color}               (when one-to-one-chat?
+                                               (rf/sub [:contacts/contact-by-identity chat-id]))
+        customization-color                  (cond community-channel?
+                                                   (or (:color chat)
+                                                       (rf/sub [:communities/community-color
+                                                                (:community-id chat)]))
+                                                   one-to-one-chat? contact-customization-color
+                                                   :else (or (:color chat) :turquoise))
+        {:keys [keyboard-shown]}             (hooks/use-keyboard)
+        {window-height :height}              (rn/get-window)
+        context                              (rf/sub [:chats/current-chat-message-list-view-context])
+        able-to-send-message?                (:able-to-send-message? context)
+        messages                             (rf/sub [:chats/raw-chat-messages-stream chat-id])
+        margin-bottom?                       (and community-channel? (not able-to-send-message?))
+        recording?                           (rf/sub [:chats/recording?])]
+    [rn/view {:style (style/permission-context-sheet margin-bottom?)}
     [rn/view {:style {:flex-shrink 1}} ;; Keeps flat list on top
      [reanimated/flat-list
       {:key-fn                            list-key-fn
@@ -201,9 +409,12 @@
        :bounces                           false
        :header                            (when (= (:chat-type chat) constants/private-group-chat-type)
                                             [list-group-chat-header chat])
-        :footer                            [more-messages-loader
-                                            {:chat-id       chat-id
-                                             :window-height window-height}]
+        :footer                            [list-footer
+                                            {:theme                  theme
+                                             :chat                   chat
+                                             :window-height          window-height
+                                             :distance-from-list-top distance-from-list-top
+                                             :customization-color    customization-color}]
        :data                              messages
        :render-data                       {:theme           theme
                                            :context         context
@@ -233,14 +444,15 @@
        :style                             {:background-color (colors/theme-colors colors/white
                                                                                   colors/neutral-95
                                                                                   theme)}
-        :content-container-style           (style/list-paddings add-padding-bottom?)
+        :content-container-style           {:padding-top distance-from-last-message}
        :inverted                          true
        :on-layout                         #(on-layout
-                                             {:event                  %
-                                              :layout-height          layout-height
-                                              :distance-atom          distance-atom
+                                             {:event %
+                                              :layout-height layout-height
+                                              :distance-atom distance-atom
                                              :distance-from-list-top distance-from-list-top
-                                              :on-layout-done?        on-layout-done?})
+                                              :chat-screen-layout-calculations-complete?
+                                              chat-screen-layout-calculations-complete?})
        :scroll-enabled                    (not recording?)
        :content-inset-adjustment-behavior :never
        :scroll-indicator-insets           {:right 1}}]]]))
@@ -1,43 +1,56 @@
 (ns status-im.contexts.chat.messenger.messages.navigation.style
-  (:require [quo.foundations.colors :as colors]
-            [status-im.contexts.chat.messenger.messages.constants :as messages.constants]))
+  (:require
+    [quo.foundations.colors :as colors]
+    [react-native.reanimated :as reanimated]))

 (defn navigation-view
-  [navigation-view-height]
+  [navigation-view-height pinned-banner-height]
  {:top            0
   :left           0
   :right          0
   :position       :absolute
   :pointer-events :box-none
-   :height         (+ navigation-view-height messages.constants/pinned-banner-height)
+   :height         (+ navigation-view-height pinned-banner-height)
   :z-index        1})

-(defn background
-  [navigation-view-height]
-  {:height   navigation-view-height
-   :top      0
-   :left     0
-   :right    0
-   :overflow :hidden
-   :position :absolute})
+(defn animated-background-view
+  [background-opacity navigation-view-height]
+  (reanimated/apply-animations-to-style
+   {:opacity background-opacity}
+   {:height   navigation-view-height
+    :top      0
+    :left     0
+    :right    0
+    :overflow :hidden
+    :position :absolute}))

 (defn header-container
-  [top-insets]
+  [top-insets top-bar-height]
  {:margin-top         top-insets
   :flex-direction     :row
   :padding-horizontal 20
   :overflow           :hidden
-   :height             messages.constants/top-bar-height
+   :height             top-bar-height
   :align-items        :center})

+(defn button-animation-container
+  [opacity-value]
+  (reanimated/apply-animations-to-style
+   {:opacity opacity-value}
+   {}))
+
 ;;;; Content

-(def header-content-container
-  {:flex-direction    :row
-   :align-items       :center
-   :flex              1
-   :margin-horizontal 12
-   :height            40})
+(defn header-content-container
+  [header-opacity header-position]
+  (reanimated/apply-animations-to-style
+   {:transform [{:translate-y header-position}]
+    :opacity   header-opacity}
+   {:flex-direction    :row
+    :align-items       :center
+    :flex              1
+    :margin-horizontal 12
+    :height            40}))

 (def header-text-container
  {:margin-left 8})
@@ -7,6 +7,7 @@
    [re-frame.db]
    [react-native.core :as rn]
    [react-native.platform :as platform]
+    [react-native.reanimated :as reanimated]
    [react-native.safe-area :as safe-area]
    [status-im.common.home.actions.view :as actions]
    [status-im.constants :as constants]
@@ -14,26 +15,44 @@
    [status-im.contexts.chat.messenger.messages.navigation.style :as style]
    [status-im.contexts.chat.messenger.messages.pin.banner.view :as pin.banner]
    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
+    [utils.re-frame :as rf]
+    [utils.worklets.chat.messenger.messages :as messages.worklets]
+    [utils.worklets.chat.messenger.navigation :as worklets]))

 (defn header-content-container
-  [{:keys [chat-id group-chat chat-type chat-name emoji color] :as _chat}]
-  (let [theme              (quo.theme/use-theme)
-        display-name       (cond
-                             (= chat-type constants/one-to-one-chat-type)
-                             (first (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
-
-                             (= chat-type constants/community-chat-type)
-                             (str "# " chat-name)
-
-                             :else
-                             (str emoji chat-name))
-        online?            (when-not group-chat (rf/sub [:visibility-status-updates/online? chat-id]))
-        photo-path         (if group-chat
-                             (rf/sub [:chats/group-chat-image chat-id])
-                             (rf/sub [:chats/photo-path chat-id]))
-        community-channel? (= chat-type constants/community-chat-type)]
-    [rn/view {:style style/header-content-container}
+  [{:keys [chat distance-from-list-top all-loaded? chat-screen-layout-calculations-complete?]}]
+  (let [theme                 (quo.theme/use-theme)
+        {:keys [chat-id group-chat chat-type chat-name
+                emoji color]} chat
+        display-name          (cond
+                                (= chat-type constants/one-to-one-chat-type)
+                                (first (rf/sub
+                                        [:contacts/contact-two-names-by-identity
+                                         chat-id]))
+                                (= chat-type constants/community-chat-type)
+                                (str "# " chat-name)
+                                :else (str emoji chat-name))
+        online?               (when-not group-chat (rf/sub [:visibility-status-updates/online? chat-id]))
+        photo-path            (if group-chat
+                                (rf/sub [:chats/group-chat-image chat-id])
+                                (rf/sub [:chats/photo-path chat-id]))
+        header-opacity        (worklets/navigation-header-opacity
+                               distance-from-list-top
+                               all-loaded?
+                               chat-screen-layout-calculations-complete?
+                               (if platform/ios?
+                                 messages.constants/content-animation-start-position-ios
+                                 messages.constants/content-animation-start-position-android))
+        header-position       (worklets/navigation-header-position
+                               distance-from-list-top
+                               all-loaded?
+                               messages.constants/top-bar-height
+                               (if platform/ios?
+                                 messages.constants/content-animation-start-position-ios
+                                 messages.constants/content-animation-start-position-android))
+        community-channel?    (= chat-type constants/community-chat-type)]
+    [reanimated/view
+     {:style (style/header-content-container header-opacity header-position)}
     (cond
       community-channel?
       [quo/channel-avatar
@@ -71,11 +90,30 @@
         (i18n/label
          (if online? :t/online :t/offline))])]]))

-(defn header-background
-  [{:keys [chat-id navigation-view-height]}]
-  (let [theme (quo.theme/use-theme)]
+(defn animated-background-and-pinned-banner
+  [{:keys [chat-id navigation-view-height distance-from-list-top all-loaded?]}]
+  (let [theme              (quo.theme/use-theme)
+        animation-distance messages.constants/header-animation-distance
+        props              {:distance-from-list-top distance-from-list-top
+                            :all-loaded?            all-loaded?}
+        background-opacity (worklets/interpolate-navigation-view-opacity
+                            (assoc props
+                                   :start-position
+                                   messages.constants/header-container-top-margin
+                                   :end-position
+                                   (+ animation-distance
+                                      messages.constants/header-container-top-margin)))
+        banner-opacity     (worklets/interpolate-navigation-view-opacity
+                            (assoc props
+                                   :start-position
+                                   (+ navigation-view-height
+                                      messages.constants/pinned-banner-animation-start-position)
+                                   :end-position
+                                   (+ animation-distance
+                                      navigation-view-height
+                                      messages.constants/pinned-banner-animation-start-position)))]
    [:<>
-     [rn/view {:style (style/background navigation-view-height)}
+     [reanimated/view {:style (style/animated-background-view background-opacity navigation-view-height)}
      [quo/blur
       {:style         {:flex 1}
        :blur-amount   20
@@ -83,37 +121,58 @@
        :overlay-color (colors/theme-colors colors/white-70-blur colors/neutral-95-opa-70-blur theme)
        :blur-radius   (if platform/ios? 20 10)}]]
     [pin.banner/banner
-      {:chat-id    chat-id
-       :top-offset navigation-view-height}]]))
+      {:chat-id        chat-id
+       :banner-opacity banner-opacity
+       :top-offset     navigation-view-height}]]))

 (defn view
-  []
+  [{:keys [distance-from-list-top chat-screen-layout-calculations-complete?]}]
  (let [{:keys [chat-id chat-type]
-         :as   chat}           (rf/sub [:chats/current-chat-chat-view])
-        top-insets             (safe-area/get-top)
-        navigation-view-height (+ top-insets messages.constants/top-bar-height)]
-    [rn/view {:style (style/navigation-view navigation-view-height)}
-     [header-background
+         :as   chat}               (rf/sub [:chats/current-chat-chat-view])
+        all-loaded?                (reanimated/use-shared-value false)
+        all-loaded-sub             (rf/sub [:chats/all-loaded? chat-id])
+        top-insets                 (safe-area/get-top)
+        top-bar-height             messages.constants/top-bar-height
+        navigation-view-height     (+ top-bar-height top-insets)
+        navigation-buttons-opacity (worklets/navigation-buttons-complete-opacity
+                                    chat-screen-layout-calculations-complete?)
+        reached-threshold?         (messages.worklets/use-messages-scrolled-to-threshold
+                                    distance-from-list-top
+                                    top-bar-height)
+        button-background          (if reached-threshold? :photo :blur)]
+    (rn/use-effect (fn [] (reanimated/set-shared-value all-loaded? all-loaded-sub))
+                   [all-loaded-sub])
+    [rn/view
+     {:style (style/navigation-view navigation-view-height messages.constants/pinned-banner-height)}
+     [animated-background-and-pinned-banner
      {:chat-id                chat-id
-       :navigation-view-height navigation-view-height}]
-     [rn/view {:style (style/header-container top-insets)}
-      [quo/button
-       {:icon-only?          true
-        :type                :grey
-        :background          :blur
-        :size                32
-        :accessibility-label :back-button
-        :on-press            #(rf/dispatch [:navigate-back])}
-       (if (= chat-type constants/community-chat-type) :i/arrow-left :i/close)]
-      [header-content-container chat]
-      [quo/button
-       {:icon-only?          true
-        :type                :grey
-        :background          :blur
-        :size                32
-        :accessibility-label :options-button
-        :on-press            (fn []
-                               (rf/dispatch [:dismiss-keyboard])
-                               (rf/dispatch [:show-bottom-sheet
-                                             {:content (fn [] [actions/chat-actions chat true])}]))}
-       :i/options]]]))
+       :navigation-view-height navigation-view-height
+       :distance-from-list-top distance-from-list-top
+       :all-loaded?            all-loaded?}]
+     [rn/view {:style (style/header-container top-insets top-bar-height)}
+      [reanimated/view {:style (style/button-animation-container navigation-buttons-opacity)}
+       [quo/button
+        {:icon-only?          true
+         :type                :grey
+         :background          button-background
+         :size                32
+         :accessibility-label :back-button
+         :on-press            #(rf/dispatch [:navigate-back])}
+        (if (= chat-type constants/community-chat-type) :i/arrow-left :i/close)]]
+      [header-content-container
+       {:chat                                      chat
+        :distance-from-list-top                    distance-from-list-top
+        :all-loaded?                               all-loaded?
+        :chat-screen-layout-calculations-complete? chat-screen-layout-calculations-complete?}]
+      [reanimated/view {:style (style/button-animation-container navigation-buttons-opacity)}
+       [quo/button
+        {:icon-only?          true
+         :type                :grey
+         :background          button-background
+         :size                32
+         :accessibility-label :options-button
+         :on-press            (fn []
+                                (rf/dispatch [:dismiss-keyboard])
+                                (rf/dispatch [:show-bottom-sheet
+                                              {:content (fn [] [actions/chat-actions chat true])}]))}
+        :i/options]]]]))
@@ -1,5 +1,6 @@
 (ns status-im.contexts.chat.messenger.messages.pin.banner.style
  (:require
+    [react-native.reanimated :as reanimated]
    [status-im.contexts.chat.messenger.messages.constants :as messages.constants]))

 (def container
@@ -9,6 +10,8 @@
   :right    0
   :height   messages.constants/pinned-banner-height})

-(defn container-with-top-offset
-  [top-offset]
-  (assoc container :top top-offset))
+(defn container-animated-style
+  [top-offset banner-opacity]
+  (reanimated/apply-animations-to-style
+   {:opacity banner-opacity}
+   (assoc container :top top-offset)))
@@ -2,26 +2,30 @@
  (:require
    [quo.core :as quo]
    [quo.theme]
-    [react-native.core :as rn]
    [react-native.platform :as platform]
+    [react-native.reanimated :as reanimated]
    [status-im.contexts.chat.messenger.messages.pin.banner.style :as style]
    [utils.re-frame :as rf]))

+(defn f-banner
+  [{:keys [chat-id banner-opacity top-offset]} latest-pin-text pins-count]
+  (let [theme (quo.theme/use-theme)]
+    [reanimated/view {:style (style/container-animated-style top-offset banner-opacity)}
+     [quo/blur
+      {:style       style/container
+       :blur-radius (if platform/ios? 20 10)
+       :blur-type   theme
+       :blur-amount 20}]
+     [quo/banner
+      {:latest-pin-text latest-pin-text
+       :pins-count      pins-count
+       :on-press        (fn []
+                          (rf/dispatch [:dismiss-keyboard])
+                          (rf/dispatch [:pin-message/show-pins-bottom-sheet chat-id]))}]]))
+
 (defn banner
-  [{:keys [chat-id top-offset]}]
-  (let [theme           (quo.theme/use-theme)
-        latest-pin-text (rf/sub [:chats/last-pinned-message-text chat-id])
+  [{:keys [chat-id] :as props}]
+  (let [latest-pin-text (rf/sub [:chats/last-pinned-message-text chat-id])
        pins-count      (rf/sub [:chats/pin-messages-count chat-id])]
    (when (> pins-count 0)
-      [rn/view {:style (style/container-with-top-offset top-offset)}
-       [quo/blur
-        {:style       style/container
-         :blur-radius (if platform/ios? 20 10)
-         :blur-type   theme
-         :blur-amount 20}]
-       [quo/banner
-        {:latest-pin-text latest-pin-text
-         :pins-count      pins-count
-         :on-press        (fn []
-                            (rf/dispatch [:dismiss-keyboard])
-                            (rf/dispatch [:pin-message/show-pins-bottom-sheet chat-id]))}]])))
+      [:f> f-banner props latest-pin-text pins-count])))
@@ -7,7 +7,7 @@
    [utils.worklets.chat.messenger.composer :as worklets]))

 (defn button
-  [chat-list-scroll-y]
+  [{:keys [chat-list-scroll-y]}]
  (let [{window-height :height}    (rn/get-window)
        scroll-down-button-opacity (worklets/scroll-down-button-opacity
                                    chat-list-scroll-y
@@ -19,50 +19,57 @@
    [utils.re-frame :as rf]))

 (defn- footer
-  [layout-height]
+  [props]
  (let [current-chat-id       (rf/sub [:chats/current-chat-id])
        able-to-send-message? (rf/sub [:chats/able-to-send-message?])]
    (when-not (string/blank? current-chat-id)
      (if able-to-send-message?
-        [composer/view layout-height]
+        [composer/view props]
        [contact-requests.bottom-drawer/view {:contact-id current-chat-id}]))))

 (defn- chat-screen
-  [on-layout-done?]
+  [{:keys [insets] :as props}]
  (let [theme                    (quo.theme/use-theme)
-        layout-height            (rn/use-ref-atom 0)
-        distance-from-list-top   (reanimated/use-shared-value 0)
-        chat-list-scroll-y       (reanimated/use-shared-value 0)
        alert-banners-top-margin (rf/sub [:alert-banners/top-margin])
-        insets                   (safe-area/get-insets)]
-    [rn/keyboard-avoiding-view
-     {:style                    (style/keyboard-avoiding-container theme)
-      :keyboard-vertical-offset (- (if platform/ios? alert-banners-top-margin 0)
-                                   (:bottom insets))}
-     [:<>
-      [list.view/messages-list-content
-       {:insets                 insets
-        :distance-from-list-top distance-from-list-top
-        :chat-list-scroll-y     chat-list-scroll-y
-        :layout-height          layout-height
-        :on-layout-done?        on-layout-done?}]
-      [scroll-to-bottom/button chat-list-scroll-y]]
-     [messages.navigation/view]
-     [footer layout-height]]))
+        chat-exist?              (rf/sub [:chats/current-chat-exist?])]
+    (when chat-exist?
+      [rn/keyboard-avoiding-view
+       {:style                    (style/keyboard-avoiding-container theme)
+        :keyboard-vertical-offset (- (if platform/ios? alert-banners-top-margin 0) (:bottom insets))}
+       [:<>
+        [list.view/messages-list-content props]
+        [scroll-to-bottom/button props]]
+       [messages.navigation/view props]
+       [footer props]])))
+
+(defn lazy-chat-screen
+  [chat-screen-layout-calculations-complete? *screen-loaded?*]
+  (let [screen-loaded?         (rf/sub [:shell/chat-screen-loaded?])
+        distance-from-list-top (reanimated/use-shared-value 0)
+        chat-list-scroll-y     (reanimated/use-shared-value 0)
+        props                  {:insets (safe-area/get-insets)
+                                :content-height (atom 0)
+                                :layout-height (atom 0)
+                                :distance-atom (atom 0)
+                                :distance-from-list-top distance-from-list-top
+                                :chat-list-scroll-y chat-list-scroll-y
+                                :chat-screen-layout-calculations-complete?
+                                chat-screen-layout-calculations-complete?}]
+    (when *screen-loaded?*
+      (rn/use-mount #(reset! *screen-loaded?* true)))
+    (when-not (if *screen-loaded?* @*screen-loaded?* screen-loaded?)
+      (reanimated/set-shared-value chat-screen-layout-calculations-complete? false)
+      (reanimated/set-shared-value distance-from-list-top 0)
+      (reanimated/set-shared-value chat-list-scroll-y 0))
+    (when (if *screen-loaded?* @*screen-loaded?* screen-loaded?)
+      [chat-screen props])))

 (defn chat
  []
-  (let [on-layout-done?    (reagent/atom false)
-        first-render-done? (reagent/atom false)]
-    (fn []
-      (let [chat-exists?               (rf/sub [:chats/current-chat-exist?])
-            jump-to-enabled?           (ff/enabled? ::ff/shell.jump-to)
-            screen-loaded-for-jump-to? (rf/sub [:shell/chat-screen-loaded?])
-            screen-loaded?             (if jump-to-enabled?
-                                         screen-loaded-for-jump-to?
-                                         @first-render-done?)]
-        (rn/use-mount #(reset! first-render-done? true))
-        [:<>
-         (when (and chat-exists? screen-loaded?)
-           [chat-screen on-layout-done?])
-         [placeholder.view/view on-layout-done?]]))))
+  (let [chat-screen-layout-calculations-complete? (reanimated/use-shared-value false)
+        jump-to-enabled?                          (ff/enabled? ::ff/shell.jump-to)
+        *screen-loaded?*                          (when-not jump-to-enabled?
+                                                    (reagent/atom false))]
+    [:<>
+     [lazy-chat-screen chat-screen-layout-calculations-complete? *screen-loaded?*]
+     [placeholder.view/view chat-screen-layout-calculations-complete?]]))
@@ -1,15 +1,16 @@
 (ns status-im.contexts.chat.messenger.placeholder.style
  (:require [quo.foundations.colors :as colors]
-            [react-native.safe-area :as safe-area]))
+            [react-native.reanimated :as reanimated]))

 (defn container
-  [theme on-layout-done?]
-  {:position         :absolute
-   :padding-top      (safe-area/get-top)
-   :top              0
-   :left             0
-   :right            0
-   :bottom           0
-   :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
-   :opacity          (if on-layout-done? 0 1)
-   :z-index          (if on-layout-done? 0 2)})
+  [top opacity z-index theme]
+  (reanimated/apply-animations-to-style
+   {:opacity opacity
+    :z-index z-index}
+   {:position         :absolute
+    :padding-top      top
+    :top              0
+    :left             0
+    :right            0
+    :bottom           0
+    :background-color (colors/theme-colors colors/white colors/neutral-95 theme)}))
@@ -3,8 +3,11 @@
    [quo.core :as quo]
    [quo.theme]
    [react-native.core :as rn]
+    [react-native.reanimated :as reanimated]
+    [react-native.safe-area :as safe-area]
    [status-im.contexts.chat.messenger.placeholder.style :as style]
-    [utils.re-frame :as rf]))
+    [utils.re-frame :as rf]
+    [utils.worklets.chat.messenger.placeholder :as worklets]))

 (defn- loading-skeleton
  []
@@ -14,10 +17,13 @@
    :animated?     false}])

 (defn view
-  [on-layout-done?]
+  [chat-screen-layout-calculations-complete?]
  (let [theme       (quo.theme/use-theme)
-        chat-exist? (rf/sub [:chats/current-chat-exist?])]
-    [rn/view {:style (style/container theme @on-layout-done?)}
+        top         (safe-area/get-top)
+        chat-exist? (rf/sub [:chats/current-chat-exist?])
+        opacity     (worklets/placeholder-opacity chat-screen-layout-calculations-complete?)
+        z-index     (worklets/placeholder-z-index chat-screen-layout-calculations-complete?)]
+    [reanimated/view {:style (style/container top opacity z-index theme)}
     (when-not chat-exist?
       [quo/page-nav
        {:icon-name :i/arrow-left
@@ -119,29 +119,38 @@
    :icon-left           :i/communities}
   (i18n/label :t/request-to-join)])

-(defn token-gated-communities-info
+(defn- info-button-handler
  []
-  [quo/documentation-drawers {:title (i18n/label :t/token-gated-communities)}
-   [quo/text {:size :paragraph-2}
-    (i18n/label :t/token-gated-communities-info)]])
+  (rf/dispatch
+   [:show-bottom-sheet
+    {:content
+     (fn []
+       [quo/documentation-drawers
+        {:title        (i18n/label :t/token-gated-communities)
+         :show-button? true
+         :button-label (i18n/label :t/read-more)
+         :button-icon  :info}
+        [quo/text {:size :paragraph-2}
+         (i18n/label :t/token-gated-communities-info)]])}]))

 (defn- token-requirements
  [{:keys [id color role-permissions?]}]
-  (let [{:keys [can-request-access? no-member-permission? networks-not-supported?
-                highest-permission-role
-                tokens]}  (rf/sub [:community/token-gated-overview id])
-        highest-role-text (i18n/label
-                           (communities.utils/role->translation-key highest-permission-role :t/member))
-        on-press          (rn/use-callback
-                           (fn []
-                             (if config/community-accounts-selection-enabled?
-                               (rf/dispatch [:open-modal :community-account-selection-sheet
-                                             {:community-id id}])
-                               (rf/dispatch [:open-modal :community-requests-to-join
-                                             {:id id}])))
-                           [id])
-        on-press-info     #(rf/dispatch
-                            [:show-bottom-sheet {:content token-gated-communities-info}])]
+  (let [{:keys [can-request-access?
+                no-member-permission?
+                tokens
+                networks-not-supported?
+                highest-permission-role]} (rf/sub [:community/token-gated-overview id])
+        highest-role-text
+        (i18n/label
+         (communities.utils/role->translation-key highest-permission-role :t/member))
+        on-press (rn/use-callback (fn []
+                                    (if config/community-accounts-selection-enabled?
+                                      (rf/dispatch [:open-modal :community-account-selection-sheet
+                                                    {:community-id id}])
+                                      (rf/dispatch [:open-modal :community-requests-to-join
+                                                    {:id
+                                                     id}])))
+                                  [id])]
    (cond
      networks-not-supported?
      [network-not-supported]
@@ -151,12 +160,13 @@

      :else
      [quo/community-token-gating
-       {:role            highest-role-text
-        :tokens          tokens
+       {:role highest-role-text
+        :tokens tokens
        :community-color color
-        :satisfied?      can-request-access?
-        :on-press        on-press
-        :on-press-info   on-press-info}])))
+        :satisfied? can-request-access?
+        :on-press on-press
+        :on-press-info
+        info-button-handler}])))

 (defn- join-community
  [{:keys [id joined permissions] :as community}]
@@ -1,35 +0,0 @@
-(ns status-im.contexts.keycard.authorise.view
-  (:require [quo.core :as quo]
-            [react-native.core :as rn]
-            [status-im.common.events-helper :as events-helper]
-            [status-im.common.standard-authentication.core :as standard-auth]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]
-            [utils.security.core :as security]))
-
-(defn view
-  []
-  (let [profile-name        (rf/sub [:profile/name])
-        profile-picture     (rf/sub [:profile/image])
-        customization-color (rf/sub [:profile/customization-color])]
-    [:<>
-     [quo/page-nav
-      {:key        :header
-       :background :blur
-       :icon-name  :i/close
-       :on-press   events-helper/navigate-back}]
-     [quo/page-top
-      {:title       (i18n/label :t/authorise-with-password)
-       :description :context-tag
-       :context-tag {:full-name           profile-name
-                     :profile-picture     profile-picture
-                     :customization-color customization-color}}]
-     [rn/view {:style {:flex 1 :padding-horizontal 20 :justify-content :space-between}}
-      [quo/text (i18n/label :t/migrate-key-pair-authorise)]
-      [standard-auth/slide-button
-       {:size                :size-48
-        :container-style     {}
-        :customization-color customization-color
-        :track-text          (i18n/label :t/slide-to-authorise)
-        :on-auth-success     #(println "TBD" (security/safe-unmask-data %))
-        :auth-button-label   (i18n/label :t/confirm)}]]]))
@@ -1,36 +0,0 @@
-(ns status-im.contexts.keycard.check.view
-  (:require [quo.core :as quo]
-            [react-native.core :as rn]
-            [status-im.common.events-helper :as events-helper]
-            [status-im.common.resources :as resources]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]))
-
-(defn view
-  []
-  [:<>
-   [quo/page-nav
-    {:key        :header
-     :background :blur
-     :icon-name  :i/arrow-left
-     :on-press   events-helper/navigate-back}]
-   [quo/page-top
-    {:title            (i18n/label :t/check-keycard)
-     :description      :text
-     :description-text (i18n/label :t/see-keycard-ready)}]
-   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    [rn/image
-     {:resize-mode :contain
-      :source      (resources/get-image :check-your-keycard)}]]
-   [quo/divider-label (i18n/label :t/tips-scan-keycard)]
-   [rn/view {:style {:padding-horizontal 10}}
-    [quo/markdown-list
-     {:container-style {:padding-vertical 10}
-      :description     (i18n/label :t/remove-phone-case)}]
-    [quo/markdown-list
-     {:container-style {:padding-bottom 25}
-      :description     (i18n/label :t/keep-card-steady)}]]
-   [quo/button
-    {:on-press        #(rf/dispatch [:keycard/connect])
-     :container-style {:margin-horizontal 20}}
-    (i18n/label :t/ready-to-scan)]])
@@ -10,15 +10,10 @@

 (defonce ^:private active-listeners (atom []))

-(defn unregister-card-events
+(defn register-card-events
  []
  (doseq [listener @active-listeners]
    (keycard/remove-event-listener listener))
-  (reset! active-listeners nil))
-
-(defn register-card-events
-  []
-  (unregister-card-events)
  (reset! active-listeners
    [(keycard/on-card-connected #(rf/dispatch [:keycard/on-card-connected]))
     (keycard/on-card-disconnected #(rf/dispatch [:keycard/on-card-disconnected]))
@@ -28,9 +23,7 @@
       (keycard/on-nfc-timeout #(rf/dispatch [:keycard.ios/on-nfc-timeout])))
     (keycard/on-nfc-enabled #(rf/dispatch [:keycard/on-check-nfc-enabled-success true]))
     (keycard/on-nfc-disabled #(rf/dispatch [:keycard/on-check-nfc-enabled-success false]))]))
-
 (rf/reg-fx :effects.keycard/register-card-events register-card-events)
-(rf/reg-fx :effects.keycard/unregister-card-events unregister-card-events)

 (defn check-nfc-enabled
  []
@@ -1,36 +0,0 @@
-(ns status-im.contexts.keycard.empty.view
-  (:require [quo.core :as quo]
-            [react-native.core :as rn]
-            [status-im.common.events-helper :as events-helper]
-            [status-im.common.resources :as resources]
-            [status-im.contexts.keycard.sheets.migrate.view :as sheets.migrate]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]))
-
-(defn view
-  []
-  [:<>
-   [quo/page-nav
-    {:key        :header
-     :background :blur
-     :icon-name  :i/arrow-left
-     :on-press   events-helper/navigate-back}]
-   [quo/page-top
-    {:title            (i18n/label :t/keycard-empty)
-     :description      :text
-     :description-text (i18n/label :t/what-to-do)}]
-   [rn/view {:style {:padding-horizontal 28 :padding-top 20}}
-    [quo/small-option-card
-     {:variant             :main
-      :title               (i18n/label :t/import-key-pair-keycard)
-      :subtitle            (i18n/label :t/use-keycard-login-sign)
-      :button-label        (i18n/label :t/import-profile-key-pair)
-      :accessibility-label :get-keycard
-      :image               (resources/get-image :generate-keys)
-      :on-press            #(rf/dispatch [:show-bottom-sheet
-                                          {:theme   :dark
-                                           :content (fn [] [sheets.migrate/view])}])}]]
-   [quo/information-box
-    {:type  :default
-     :style {:margin-top 32 :margin-horizontal 28}}
-    (i18n/label :t/empty-card-info)]])
@@ -1,42 +0,0 @@
-(ns status-im.contexts.keycard.error.view
-  (:require [quo.core :as quo]
-            [react-native.core :as rn]
-            [react-native.safe-area :as safe-area]
-            [status-im.common.events-helper :as events-helper]
-            [utils.re-frame :as rf]))
-
-(def titles
-  {:keycard/error.keycard-wrong    {:title       "Keycard is not empty"
-                                    :description "You can’t use it to store new keys right now"}
-   :keycard/error.keycard-unpaired {:title       "Keycard is full"
-                                    :description "All pairing slots are occupied"}
-   :keycard/error.keycard-frozen   {:title       "Keycard is locked"
-                                    :description "You can’t use it right now"}
-   :keycard/error.keycard-locked   {:title       "Keycard is locked"
-                                    :description "You can’t use it right now"}})
-
-(defn view
-  []
-  (let [{:keys [top bottom]}        (safe-area/get-insets)
-        error                       (rf/sub [:keycard/application-info-error])
-        {:keys [title description]} (get titles error)]
-    [quo/overlay
-     {:type            :shell
-      :container-style {:padding-top    top
-                        :padding-bottom bottom}}
-     [quo/page-nav
-      {:key        :header
-       :background :blur
-       :icon-name  :i/arrow-left
-       :on-press   events-helper/navigate-back}]
-     [quo/page-top
-      {:title            title
-       :description      :text
-       :description-text description}]
-     [rn/view {:height 226}]
-     [rn/view {:padding-horizontal 20}
-      [quo/info-message
-       {:container-style {:padding-top 15}
-        :icon            :i/info
-        :size            :default}
-       "To unlock or factory reset the Keycard, please use the Status desktop app. If you'd like this features on mobile, feel free to upvote them and discuss in the Status community."]]]))
@@ -1,8 +1,8 @@
 (ns status-im.contexts.keycard.events
  (:require [re-frame.core :as rf]
            status-im.contexts.keycard.login.events
-            status-im.contexts.keycard.nfc-sheet.events
            status-im.contexts.keycard.pin.events
+            status-im.contexts.keycard.sheet.events
            status-im.contexts.keycard.sign.events
            [status-im.contexts.keycard.utils :as keycard.utils]
            [taoensso.timbre :as log]))
@@ -14,9 +14,7 @@
 (rf/reg-event-fx :keycard.ios/on-nfc-user-cancelled
 (fn [{:keys [db]}]
   (log/debug "[keycard] nfc user cancelled")
-   {:db (-> db
-            (assoc-in [:keycard :pin :status] nil)
-            (assoc-in [:keycard :on-nfc-cancelled-event-vector] nil))
+   {:db (assoc-in db [:keycard :pin :status] nil)
    :fx [(when-let [on-nfc-cancelled-event-vector (get-in db [:keycard :on-nfc-cancelled-event-vector])]
           [:dispatch on-nfc-cancelled-event-vector])]}))

@@ -44,6 +42,12 @@
   {:db (assoc-in db [:keycard :card-connected?] false)
    :fx [[:dispatch-later [{:ms 500 :dispatch [:keycard.ios/start-nfc]}]]]}))

+(rf/reg-event-fx :keycard/get-application-info
+ (fn [_ [{:keys [on-success on-failure]}]]
+   (log/debug "[keycard] get-application-info")
+   {:effects.keycard/get-application-info {:on-success on-success
+                                           :on-failure on-failure}}))
+
 (rf/reg-event-fx :keycard/on-retrieve-pairings-success
 (fn [{:keys [db]} [pairings]]
   {:db (assoc-in db [:keycard :pairings] pairings)
@@ -56,7 +60,7 @@

 (rf/reg-event-fx :keycard/on-action-with-pin-error
 (fn [{:keys [db]} [error]]
-   (log/debug "[keycard] on-action-with-pin-error: " error)
+   (log/debug "[keycard] get keys error: " error)
   (let [tag-was-lost?     (keycard.utils/tag-lost? (:error error))
         pin-retries-count (keycard.utils/pin-retries (:error error))]
     (if tag-was-lost?
@@ -65,52 +69,7 @@
         {:effects.utils/show-popup {:title "wrong-keycard"}}
         {:db (-> db
                  (assoc-in [:keycard :application-info :pin-retry-counter] pin-retries-count)
-                  (assoc-in [:keycard :pin :status] :error))
-          :fx [[:dispatch [:keycard/disconnect]]
+                  (update-in [:keycard :pin] assoc :status :error))
+          :fx [[:dispatch [:keycard/hide-connection-sheet]]
               (when (zero? pin-retries-count)
                 [:effects.utils/show-popup {:title "frozen-keycard"}])]})))))
-
-(rf/reg-event-fx :keycard/on-get-application-info-success
- (fn [{:keys [db]} [application-info {:keys [key-uid on-success-fx]}]]
-   (if-let [error (keycard.utils/validate-application-info key-uid application-info)]
-     (case error
-       :keycard/error.not-keycard
-       {:fx [[:dispatch [:keycard/disconnect]]
-             [:dispatch [:open-modal :screen/keycard.not-keycard]]]}
-       :keycard/error.keycard-blank
-       {:fx [[:dispatch [:keycard/disconnect]]
-             [:dispatch [:open-modal :screen/keycard.empty]]]}
-       {:db (assoc-in db [:keycard :application-info-error] error)
-        :fx [[:dispatch [:keycard/disconnect]]
-             [:dispatch [:open-modal :screen/keycard.error]]]})
-     {:db (-> db
-              (assoc-in [:keycard :application-info] application-info)
-              (assoc-in [:keycard :pin :status] :verifying))
-      :fx on-success-fx})))
-
-(rf/reg-event-fx :keycard/get-application-info
- (fn [_ [{:keys [on-success on-failure]}]]
-   {:effects.keycard/get-application-info {:on-success on-success :on-failure on-failure}}))
-
-(rf/reg-event-fx :keycard/cancel-connection
- (fn [{:keys [db]}]
-   {:db (-> db
-            (assoc-in [:keycard :on-card-connected-event-vector] nil)
-            (assoc-in [:keycard :on-nfc-cancelled-event-vector] nil))}))
-
-(rf/reg-event-fx :keycard/disconnect
- (fn [_ _]
-   {:fx [[:dispatch [:keycard/cancel-connection]]
-         [:dispatch [:keycard/hide-connection-sheet]]]}))
-
-(rf/reg-event-fx :keycard/connect
- (fn [{:keys [db]} [args]]
-   (let [connected?   (get-in db [:keycard :card-connected?])
-         event-vector [:keycard/get-application-info
-                       {:on-success #(rf/dispatch [:keycard/on-get-application-info-success % args])}]]
-     {:db (assoc-in db [:keycard :on-card-connected-event-vector] event-vector)
-      :fx [[:dispatch
-            [:keycard/show-connection-sheet
-             {:on-cancel-event-vector [:keycard/cancel-connection]}]]
-           (when connected?
-             [:dispatch event-vector])]})))
@@ -1,5 +1,7 @@
 (ns status-im.contexts.keycard.login.events
-  (:require [utils.re-frame :as rf]))
+  (:require [status-im.contexts.keycard.utils :as keycard.utils]
+            [taoensso.timbre :as log]
+            [utils.re-frame :as rf]))

 (rf/reg-event-fx :keycard.login/on-get-keys-success
 (fn [{:keys [db]} [data]]
@@ -14,7 +16,7 @@
                  :password      encryption-public-key
                  :key-uid       key-uid
                  :name          (:name profile)))
-      :fx [[:dispatch [:keycard/disconnect]]
+      :fx [[:dispatch [:keycard/hide-connection-sheet]]
           [:effects.keycard/login-with-keycard
            {:password            encryption-public-key
             :whisper-private-key whisper-private-key
@@ -31,8 +33,36 @@
                    :password      encryption-public-key
                    :key-uid       key-uid
                    :name          (:name profile)))
-        :fx [[:dispatch [:keycard/disconnect]]
+        :fx [[:dispatch [:keycard/hide-connection-sheet]]
             [:effects.keycard/login-with-keycard
              {:password            encryption-public-key
               :whisper-private-key whisper-private-key
               :key-uid             key-uid}]]}))))
+
+(rf/reg-event-fx :keycard.login/on-get-application-info-success
+ (fn [{:keys [db]} [application-info {:keys [key-uid on-read-fx]}]]
+   (let [error (keycard.utils/validate-application-info key-uid application-info)]
+     (if error
+       {:effects.utils/show-popup {:title (str error)}}
+       {:db (-> db
+                (assoc-in [:keycard :application-info] application-info)
+                (assoc-in [:keycard :pin :status] :verifying))
+        :fx on-read-fx}))))
+
+(rf/reg-event-fx :keycard.login/cancel-reading-card
+ (fn [{:keys [db]}]
+   {:db (assoc-in db [:keycard :on-card-connected-event-vector] nil)}))
+
+(rf/reg-event-fx :keycard/read-card
+ (fn [{:keys [db]} [args]]
+   (let [connected?   (get-in db [:keycard :card-connected?])
+         event-vector [:keycard/get-application-info
+                       {:on-success #(rf/dispatch [:keycard.login/on-get-application-info-success %
+                                                   args])}]]
+     (log/debug "[keycard] proceed-to-login")
+     {:db (assoc-in db [:keycard :on-card-connected-event-vector] event-vector)
+      :fx [[:dispatch
+            [:keycard/show-connection-sheet
+             {:on-cancel-event-vector [:keycard.login/cancel-reading-card]}]]
+           (when connected?
+             [:dispatch event-vector])]})))
@@ -1,28 +0,0 @@
-(ns status-im.contexts.keycard.not-keycard.view
-  (:require [quo.core :as quo]
-            [react-native.core :as rn]
-            [react-native.safe-area :as safe-area]
-            [status-im.common.events-helper :as events-helper]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]))
-
-(defn view
-  []
-  (let [{:keys [top bottom]} (safe-area/get-insets)]
-    [quo/overlay
-     {:type            :shell
-      :container-style {:padding-top    top
-                        :padding-bottom bottom}}
-     [quo/page-nav
-      {:key        :header
-       :background :blur
-       :icon-name  :i/arrow-left
-       :on-press   events-helper/navigate-back}]
-     [quo/page-top
-      {:title            (i18n/label :t/oops-not-keycard)
-       :description      :text
-       :description-text (i18n/label :t/make-sure-keycard)}]
-     [rn/view {:flex 1}]
-     [rn/view {:padding-horizontal 20}
-      [quo/button {:on-press #(rf/dispatch [:keycard/connect])}
-       (i18n/label :t/try-again)]]]))
@@ -1,55 +0,0 @@
-(ns status-im.contexts.keycard.pin.create.view
-  (:require [clojure.string :as string]
-            [quo.core :as quo]
-            [react-native.core :as rn]
-            [status-im.constants :as constants]
-            [utils.i18n :as i18n]))
-
-(defn view
-  [{:keys [on-complete]}]
-  (let [[pin set-pin]             (rn/use-state "")
-        [first-pin set-first-pin] (rn/use-state "")
-        [error? set-error]        (rn/use-state false)
-        [stage set-stage]         (rn/use-state :create)
-        pin-empty?                (string/blank? pin)
-        on-delete                 (rn/use-callback
-                                   (fn []
-                                     (set-error false)
-                                     (if (= (count pin) 1)
-                                       (do
-                                         (set-pin "")
-                                         (set-stage :create))
-                                       (when (and pin (pos? (count pin)))
-                                         (set-pin (.slice pin 0 -1)))))
-                                   [pin])
-        on-press                  (rn/use-callback
-                                   (fn [new-symbol]
-                                     (let [new-pin (str pin new-symbol)]
-                                       (when (<= (count new-pin) constants/pincode-length)
-                                         (set-pin new-pin)
-                                         (when (= constants/pincode-length (count new-pin))
-                                           (if (= :repeat stage)
-                                             (if (= first-pin new-pin)
-                                               (on-complete new-pin)
-                                               (set-error true))
-                                             (do
-                                               (set-pin "")
-                                               (set-first-pin new-pin)
-                                               (set-stage :repeat)))))))
-                                   [pin stage first-pin])]
-    [rn/view {:style {:padding-bottom 12 :flex 1}}
-     [quo/drawer-top
-      {:title (if (= :create stage)
-                (i18n/label :t/create-keycard-pin)
-                (i18n/label :t/repeat-keycard-pin))}]
-     [rn/view {:style {:flex 1 :justify-content :center :align-items :center :padding-vertical 34}}
-      [quo/pin-input
-       {:blur?                 false
-        :number-of-pins        constants/pincode-length
-        :number-of-filled-pins (count pin)
-        :error?                error?
-        :info                  (when error? (i18n/label :t/pin-not-match))}]]
-     [quo/numbered-keyboard
-      {:delete-key? (not pin-empty?)
-       :on-delete   on-delete
-       :on-press    on-press}]]))
@@ -1,16 +1,18 @@
-(ns status-im.contexts.keycard.nfc-sheet.events
+(ns status-im.contexts.keycard.sheet.events
  (:require [re-frame.core :as rf]
            [react-native.platform :as platform]
            [taoensso.timbre :as log]))

+(rf/reg-event-fx :keycard/show-connection-sheet-component
+ (fn [{:keys [db]} [{:keys [on-cancel-event-vector]}]]
+   {:db (assoc-in db [:keycard :connection-sheet-opts] {:on-close #(rf/dispatch on-cancel-event-vector)})
+    :fx [[:dismiss-keyboard true]
+         [:show-nfc-sheet nil]]}))
+
 (rf/reg-event-fx :keycard/show-connection-sheet
- (fn [{:keys [db]} [{:keys [on-cancel-event-vector]} :as args]]
+ (fn [_ [args]]
   (if platform/android?
-     {:db (assoc-in db
-           [:keycard :connection-sheet-opts]
-           {:on-close #(rf/dispatch on-cancel-event-vector)})
-      :fx [[:dismiss-keyboard true]
-           [:show-nfc-sheet nil]]}
+     {:dispatch [:keycard/show-connection-sheet-component args]}
     {:effects.keycard.ios/start-nfc
      {:on-success
       (fn []
@@ -1,9 +1,8 @@
-(ns status-im.contexts.keycard.nfc-sheet.view
+(ns status-im.contexts.keycard.sheet.view
  (:require [quo.foundations.colors :as colors]
            quo.theme
            [react-native.core :as rn]
            [status-im.common.resources :as resources]
-            [utils.i18n :as i18n]
            [utils.re-frame :as rf]))

 (defn connect-keycard
@@ -19,13 +18,13 @@
               :padding-vertical   30
               :background-color   (colors/theme-colors colors/white colors/neutral-95 theme)}}
      [rn/text {:style {:font-size 26 :color "#9F9FA5" :margin-bottom 36}}
-       (i18n/label :t/ready-to-scan)]
+       "Ready to Scan"]
      [rn/image
       {:source (resources/get-image :nfc-prompt)}]
      [rn/text {:style {:font-size 16 :color :white :margin-vertical 36}}
       (if connected?
-         (i18n/label :t/connected-dont-move)
-         (i18n/label :t/hold-phone-near-keycard))]
+         "Connected. Don’t move your card."
+         "Hold your phone near a Status Keycard")]
      [rn/pressable
       {:on-press (fn []
                    (when on-close (on-close))
@@ -34,4 +33,4 @@
       [rn/view
        {:style {:background-color "#8E8E93" :flex 1 :align-items :center :padding 18 :border-radius 10}}
        [rn/text {:style {:color :white :font-size 16}}
-         (i18n/label :t/cancel)]]]]]))
+         "Cancel"]]]]]))
@@ -1,38 +0,0 @@
-(ns status-im.contexts.keycard.sheets.migrate.view
-  (:require [quo.core :as quo]
-            [react-native.core :as rn]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]))
-
-(defn view
-  []
-  (let [profile-name               (rf/sub [:profile/name])
-        profile-picture            (rf/sub [:profile/image])
-        customization-color        (rf/sub [:profile/customization-color])
-        recovery-phrase-backed-up? (rf/sub [:profile/recovery-phrase-backed-up?])]
-    [:<>
-     [quo/drawer-top
-      {:type                :context-tag
-       :context-tag-type    :default
-       :title               (i18n/label :t/migrate-key-pair-keycard)
-       :full-name           profile-name
-       :profile-picture     profile-picture
-       :customization-color customization-color}]
-     [rn/view {:style {:padding-horizontal 20}}
-      [quo/text {}
-       (i18n/label :t/migrate-key-pair-keycard-default-key {:name profile-name})]
-      [quo/information-box
-       {:type  :default
-        :style {:margin-top 20 :margin-bottom 12}}
-       (i18n/label :t/migrate-key-pair-keycard-info)]]
-     [quo/bottom-actions
-      {:actions          :two-actions
-       :button-one-label (i18n/label :t/continue)
-       :button-one-props {:on-press #(if recovery-phrase-backed-up?
-                                       (rf/dispatch [:open-modal :screen/use-recovery-phrase
-                                                     {:on-success (fn [])}])
-                                       (rf/dispatch [:open-modal :screen/backup-recovery-phrase
-                                                     {:on-success (fn [])}]))}
-       :button-two-label (i18n/label :t/cancel)
-       :button-two-props {:type     :grey
-                          :on-press #(rf/dispatch [:hide-bottom-sheet])}}]]))
--- a/Show More
+++ b/Show More