fix input

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

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

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

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

 android.useAndroidX=true
 android.enableJetifier=true
@@ -11129,16 +11129,16 @@
  },

  {
-    "path": "com/google/errorprone/error_prone_annotations/2.24.1",
+    "path": "com/google/errorprone/error_prone_annotations/2.24.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "error_prone_annotations-2.24.1.pom": {
-        "sha1": "e36d508134193b5b782a79cd834fef22f96850ea",
-        "sha256": "sha256-dW0LPDkGWZ2XMUDuziZuDej08ZKvFLGQBq8Un+kO+NU="
+      "error_prone_annotations-2.24.0.pom": {
+        "sha1": "a267fc6adc4f7e83c84ecd3bfa3d757f0faa4c4e",
+        "sha256": "sha256-MDJ5+CcjbFXBkhu9hjL941NUxcNcAma8CF+apovLcV0="
      },
-      "error_prone_annotations-2.24.1.jar": {
-        "sha1": "32b299e45105aa9b0df8279c74dc1edfcf313ff0",
-        "sha256": "sha256-Gf4vcVXSDqCTFoUnmZ2pgQgQPuVG0ei3JrxLJ8MaPDA="
+      "error_prone_annotations-2.24.0.jar": {
+        "sha1": "29dca9118b577ad24533e563438feb8fad51427e",
+        "sha256": "sha256-qIvYgSTI1MmFGrgjrcOo8EsKE68VydgLXs9J9aejIdI="
      }
    }
  },
@@ -11232,12 +11232,12 @@
  },

  {
-    "path": "com/google/errorprone/error_prone_parent/2.24.1",
+    "path": "com/google/errorprone/error_prone_parent/2.24.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "error_prone_parent-2.24.1.pom": {
-        "sha1": "20bcb755b5f180723ef1b055f34a1834b7410f54",
-        "sha256": "sha256-y589WAUC7OXhJCnX96x1/kerhdat91zd+G+lokrvpI8="
+      "error_prone_parent-2.24.0.pom": {
+        "sha1": "2aca1bd2b01e085422633daa951905ea36ccd009",
+        "sha256": "sha256-XfQPVmlQqy86ZF0z2LcXGB7v9OplOO+2/ZuRL+obie4="
      }
    }
  },
@@ -16913,17 +16913,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "org.jetbrains.kotlin.jvm.gradle.plugin-1.9.0.pom": {
-        "sha1": "896c88badef90b092f519041d1ee201eb5d1b1a0",
-        "sha256": "sha256-Bb7sz992ArEqfazluEynL3ao8E3ookIUo/WSxzYmtrc="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-android-extensions/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -16954,21 +16943,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-android-extensions/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-android-extensions-1.9.0.pom": {
-        "sha1": "c08cc427bc37faf86bd41de0b64e8ac67899a06b",
-        "sha256": "sha256-WOHIg3JukUaVIDV95u0Xw/mSnI4IsRdKJ6OtbsDrzVI="
-      },
-      "kotlin-android-extensions-1.9.0.jar": {
-        "sha1": "ca23de2a64833d204f9af248e265274f3b8c0333",
-        "sha256": "sha256-IGdbuyp7aYKnFEUYpRi5qJZfkK6JuMmHiJgBIkSh6jM="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-annotations-jvm/1.3.72",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17044,51 +17018,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-build-common/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-build-common-1.9.0.pom": {
-        "sha1": "ab861d4e7cbca289fa3d215daad0cbfb2a2cfb82",
-        "sha256": "sha256-6itlfmsETYgfDT/f/BPOKIwlQYxipbBL/64XeJDs6EU="
-      },
-      "kotlin-build-common-1.9.0.jar": {
-        "sha1": "68e075bff7dca0d2d444c19279afe6882f311a19",
-        "sha256": "sha256-txTWfNj1bTe4Pqj2XdysZAXFdix9n2EV81J0o5GxW2w="
-      }
-    }
-  },
-
-  {
-    "path": "org/jetbrains/kotlin/kotlin-build-tools-api/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-build-tools-api-1.9.0.pom": {
-        "sha1": "ab0f33a948936b4ef2b51a8b82720fe5982184e5",
-        "sha256": "sha256-iIFxmCZbm8BrPzSTWyv2qpj0gA7OvBzOQREN70m3pCE="
-      },
-      "kotlin-build-tools-api-1.9.0.jar": {
-        "sha1": "5d33265af7283ca4d7b1f3115b83b54545f4cfab",
-        "sha256": "sha256-0ZyavegKnPQtJezJLLEUjtOhXu2yZy2qHkZubaWQ7sY="
-      }
-    }
-  },
-
-  {
-    "path": "org/jetbrains/kotlin/kotlin-build-tools-impl/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-build-tools-impl-1.9.0.pom": {
-        "sha1": "3d7403fd4d2f8914b46b250f6746da17c5a1ba47",
-        "sha256": "sha256-3Qrb3SO5XBP8N2JAqCoL/F1k37eBON7GJASX6QVtQIw="
-      },
-      "kotlin-build-tools-impl-1.9.0.jar": {
-        "sha1": "1ce2bdaf6dd80d4e7748058231059766e298a6de",
-        "sha256": "sha256-1yw3nxx1eZrAxm5sMVj2iGW9/tGlw1xepBwnihuAUBo="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-compiler-embeddable/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17119,21 +17048,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-compiler-embeddable/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-compiler-embeddable-1.9.0.pom": {
-        "sha1": "079ce81c461cfa0c3ad6b05b4a40b23bf821dbd2",
-        "sha256": "sha256-7jyHHO39bM9A0ESUQJbihlXeL5NF2ET+7GPMqcXkt8w="
-      },
-      "kotlin-compiler-embeddable-1.9.0.jar": {
-        "sha1": "2c8c3a7402becca891f12739b3e9fd2dc2adbd7a",
-        "sha256": "sha256-lTtQaR103SGf8/ZkRnDD5UnYfN/AphVPFgKmoKXf43M="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-compiler-runner/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17164,21 +17078,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-compiler-runner/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-compiler-runner-1.9.0.pom": {
-        "sha1": "f2f333b81d78150bca741b75646a042f8a69be2c",
-        "sha256": "sha256-GIN9BlVntn5bzy4wTYWm4rbSRDz4En9AdnNKTo3yo2E="
-      },
-      "kotlin-compiler-runner-1.9.0.jar": {
-        "sha1": "4cf7c2cb6bfd82876e592697d3ad9bc835b21010",
-        "sha256": "sha256-BbWlXUlJFhpxT838ZKXwTYejZMm73IZBs7t6VVfkPqo="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-daemon-client/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17209,21 +17108,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-daemon-client/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-daemon-client-1.9.0.pom": {
-        "sha1": "af448a4a8fdd5c0bff3d93fa78a2e495779e18a5",
-        "sha256": "sha256-sv50dBgjzM6JMXCWkg3LnOXBa460Z5jTn9jmdwPFidc="
-      },
-      "kotlin-daemon-client-1.9.0.jar": {
-        "sha1": "a7aff9bf77b5c882789cc495262def8948d93c5d",
-        "sha256": "sha256-WoyXfn3H8N4tka5Yva3CBBXe9M9dST5aGD+WxZeZAyA="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-daemon-embeddable/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17254,51 +17138,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-daemon-embeddable/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-daemon-embeddable-1.9.0.pom": {
-        "sha1": "216bc4d3f72fb679b1f79e73a730cac6e5cd3fa5",
-        "sha256": "sha256-OOMsu5GFenIGy/3cON1O4L5mX0CgEV/21NF348f4kq8="
-      },
-      "kotlin-daemon-embeddable-1.9.0.jar": {
-        "sha1": "186543f5e28cf8d9a0290fecc2cf34301c40a65c",
-        "sha256": "sha256-lDGCoTfs1A5ikFjaUtszbO6bZm+AmWtlWELyCmNz35o="
-      }
-    }
-  },
-
-  {
-    "path": "org/jetbrains/kotlin/kotlin-gradle-plugins-bom/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-gradle-plugins-bom-1.9.0.pom": {
-        "sha1": "511e9094170ffec75cbb76b58cfe7f1a058dc046",
-        "sha256": "sha256-XTmtkDDf0zsLrCn3UAAJzmKHYulP5h8BF3rhNL24D6E="
-      },
-      "kotlin-gradle-plugins-bom-1.9.0.module": {
-        "sha1": "b6bc353c189d28e9e0419f0635df8121ae8c8cbf",
-        "sha256": "sha256-/SufabguQ8tQnwhBsYvzxd99q18eC+oDT8CypZnW4pY="
-      }
-    }
-  },
-
-  {
-    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-annotations/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-gradle-plugin-annotations-1.9.0.pom": {
-        "sha1": "b1b0737be6ae375ea12ea9e7cbc6c6f1a4832ec1",
-        "sha256": "sha256-qjXuWp0dpZMV92nH/tsshwBWD1PFaAupKwsniBpKQnE="
-      },
-      "kotlin-gradle-plugin-annotations-1.9.0.jar": {
-        "sha1": "42d1ea51a701505256d5bd54d9152819937835dc",
-        "sha256": "sha256-KiZbNbx8VYIUJukbajzU9LkWOKC8fIffz+TgX36IRzg="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17341,53 +17180,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-gradle-plugin-api-1.9.0.pom": {
-        "sha1": "7c80dda386f89cf10d0c3ba399176f5ad26cf057",
-        "sha256": "sha256-VPHdp1Zn7esbrIpY9KNsh4wPBJGGA2vJOnAyjNnNfaw="
-      },
-      "kotlin-gradle-plugin-api-1.9.0-gradle70.jar": {
-        "sha1": "82a9928a60c442822fccaf08aa212528a85fbf25",
-        "sha256": "sha256-AhbssMeA+V47EBoOlc/DZ/LvVrBvLeqqqZJaDxF8INk="
-      },
-      "kotlin-gradle-plugin-api-1.9.0-gradle71.jar": {
-        "sha1": "82a9928a60c442822fccaf08aa212528a85fbf25",
-        "sha256": "sha256-AhbssMeA+V47EBoOlc/DZ/LvVrBvLeqqqZJaDxF8INk="
-      },
-      "kotlin-gradle-plugin-api-1.9.0-gradle74.jar": {
-        "sha1": "82a9928a60c442822fccaf08aa212528a85fbf25",
-        "sha256": "sha256-AhbssMeA+V47EBoOlc/DZ/LvVrBvLeqqqZJaDxF8INk="
-      },
-      "kotlin-gradle-plugin-api-1.9.0-gradle75.jar": {
-        "sha1": "82a9928a60c442822fccaf08aa212528a85fbf25",
-        "sha256": "sha256-AhbssMeA+V47EBoOlc/DZ/LvVrBvLeqqqZJaDxF8INk="
-      },
-      "kotlin-gradle-plugin-api-1.9.0-gradle76.jar": {
-        "sha1": "82a9928a60c442822fccaf08aa212528a85fbf25",
-        "sha256": "sha256-AhbssMeA+V47EBoOlc/DZ/LvVrBvLeqqqZJaDxF8INk="
-      },
-      "kotlin-gradle-plugin-api-1.9.0-gradle80.jar": {
-        "sha1": "82a9928a60c442822fccaf08aa212528a85fbf25",
-        "sha256": "sha256-AhbssMeA+V47EBoOlc/DZ/LvVrBvLeqqqZJaDxF8INk="
-      },
-      "kotlin-gradle-plugin-api-1.9.0-gradle81.jar": {
-        "sha1": "82a9928a60c442822fccaf08aa212528a85fbf25",
-        "sha256": "sha256-AhbssMeA+V47EBoOlc/DZ/LvVrBvLeqqqZJaDxF8INk="
-      },
-      "kotlin-gradle-plugin-api-1.9.0.jar": {
-        "sha1": "82a9928a60c442822fccaf08aa212528a85fbf25",
-        "sha256": "sha256-AhbssMeA+V47EBoOlc/DZ/LvVrBvLeqqqZJaDxF8INk="
-      },
-      "kotlin-gradle-plugin-api-1.9.0.module": {
-        "sha1": "cede46e2a2c9f2abeaa726fef80f85e451a6b5b3",
-        "sha256": "sha256-Gu1WWijZE0KsWkuhRsKFal67xjkoXFKVUhefr8dhTds="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.7.22",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17403,21 +17195,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-gradle-plugin-idea-proto-1.9.0.pom": {
-        "sha1": "19b5a92d55669744290e83b5a7d643d1fbd83f65",
-        "sha256": "sha256-QeElaFOKOjQHBMlww6T2D/WAH/3OQlymjKLAtHIhclA="
-      },
-      "kotlin-gradle-plugin-idea-proto-1.9.0.jar": {
-        "sha1": "d7e3ab4f0b7f7966e446f516fddf331475319f53",
-        "sha256": "sha256-54mY6iK81fVtE5gszBJMnHM3vRUHVMvcivKhSNdslwA="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.7.22",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17441,29 +17218,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-gradle-plugin-idea-1.9.0.pom": {
-        "sha1": "e3c307cf7ee2c63e9535edb403466dc49aa5d5d9",
-        "sha256": "sha256-W/gGnkUbY0wdxLRpLpKO9pEanrLtk3TeIPRC3AloBo0="
-      },
-      "kotlin-gradle-plugin-idea-1.9.0-test-fixtures.jar": {
-        "sha1": "af6020bc0aa902bb438e69aa0eca58438111136b",
-        "sha256": "sha256-MAj3geetkPywHc2d6pbg9ky48bMYT5T4p9jNHeGlsfI="
-      },
-      "kotlin-gradle-plugin-idea-1.9.0.jar": {
-        "sha1": "5538265e4961666c769825f4543ab445cbc45bdc",
-        "sha256": "sha256-C7JszuNyr7m1hPKFfofMLz9TK2Kk9/pFdVjzr8Or6ZU="
-      },
-      "kotlin-gradle-plugin-idea-1.9.0.module": {
-        "sha1": "186d2bb5113962059551805961d9c80a5b06a80c",
-        "sha256": "sha256-pVg82bC0AS6VWtlhn7kBe1saosJRsFltr1M0kExcpls="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17506,53 +17260,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-gradle-plugin-model-1.9.0.pom": {
-        "sha1": "b9b395f72a747e294548584cb93b9e48d2d8dad7",
-        "sha256": "sha256-QcXjVzTqEZA+IQr5i3eHB08mQab0C0X5vpwRAAga5Y0="
-      },
-      "kotlin-gradle-plugin-model-1.9.0-gradle70.jar": {
-        "sha1": "d64789139fb89d78f2128d6b5be8a164d8669a72",
-        "sha256": "sha256-/wWqtoizSnmSp+NfncTewlhD8Tqelwrv5W3T4SKghBU="
-      },
-      "kotlin-gradle-plugin-model-1.9.0-gradle71.jar": {
-        "sha1": "d64789139fb89d78f2128d6b5be8a164d8669a72",
-        "sha256": "sha256-/wWqtoizSnmSp+NfncTewlhD8Tqelwrv5W3T4SKghBU="
-      },
-      "kotlin-gradle-plugin-model-1.9.0-gradle74.jar": {
-        "sha1": "d64789139fb89d78f2128d6b5be8a164d8669a72",
-        "sha256": "sha256-/wWqtoizSnmSp+NfncTewlhD8Tqelwrv5W3T4SKghBU="
-      },
-      "kotlin-gradle-plugin-model-1.9.0-gradle75.jar": {
-        "sha1": "d64789139fb89d78f2128d6b5be8a164d8669a72",
-        "sha256": "sha256-/wWqtoizSnmSp+NfncTewlhD8Tqelwrv5W3T4SKghBU="
-      },
-      "kotlin-gradle-plugin-model-1.9.0-gradle76.jar": {
-        "sha1": "d64789139fb89d78f2128d6b5be8a164d8669a72",
-        "sha256": "sha256-/wWqtoizSnmSp+NfncTewlhD8Tqelwrv5W3T4SKghBU="
-      },
-      "kotlin-gradle-plugin-model-1.9.0-gradle80.jar": {
-        "sha1": "d64789139fb89d78f2128d6b5be8a164d8669a72",
-        "sha256": "sha256-/wWqtoizSnmSp+NfncTewlhD8Tqelwrv5W3T4SKghBU="
-      },
-      "kotlin-gradle-plugin-model-1.9.0-gradle81.jar": {
-        "sha1": "d64789139fb89d78f2128d6b5be8a164d8669a72",
-        "sha256": "sha256-/wWqtoizSnmSp+NfncTewlhD8Tqelwrv5W3T4SKghBU="
-      },
-      "kotlin-gradle-plugin-model-1.9.0.jar": {
-        "sha1": "d64789139fb89d78f2128d6b5be8a164d8669a72",
-        "sha256": "sha256-/wWqtoizSnmSp+NfncTewlhD8Tqelwrv5W3T4SKghBU="
-      },
-      "kotlin-gradle-plugin-model-1.9.0.module": {
-        "sha1": "cc984614ad443557e13d3a07c6dbcd8ce214eec4",
-        "sha256": "sha256-ZvS5FEcM80bgXQP4otWenHRvpu3PZMcS8XagiBqsPkk="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17595,53 +17302,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-gradle-plugin/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-gradle-plugin-1.9.0.pom": {
-        "sha1": "75f5520fa218e0833a1d4332bc10cf325925f63f",
-        "sha256": "sha256-RSdrCf+7uANPvQRwj5D34xtw1orgI7LPs8EdiG532DY="
-      },
-      "kotlin-gradle-plugin-1.9.0-gradle70.jar": {
-        "sha1": "70f96081d51820be6e998ae76591ca2485298880",
-        "sha256": "sha256-tpVPc4pbBeMHcvq9tFnIHVjfGz2oBqng7qcQ9Oj1Afw="
-      },
-      "kotlin-gradle-plugin-1.9.0-gradle71.jar": {
-        "sha1": "a237533df09406429a90e4cf6eddbd665fb879ef",
-        "sha256": "sha256-eb2kXiIyG1eXss3mhJ9KwFUgfVcAUxsEI+aMURdlers="
-      },
-      "kotlin-gradle-plugin-1.9.0-gradle74.jar": {
-        "sha1": "8ca3abcf0134fac694a3d78e78cc879ac37efc40",
-        "sha256": "sha256-p0Pj9keSxLrCRuE8GYSIIGskZnHvzXB7NQw+IsEWW50="
-      },
-      "kotlin-gradle-plugin-1.9.0-gradle75.jar": {
-        "sha1": "fa282ffe215f034c063a361d338f58b14479b336",
-        "sha256": "sha256-y9fMKOqRe48m9sVeYWVSYOGtQ3ZNM1edrj91pJMa/vI="
-      },
-      "kotlin-gradle-plugin-1.9.0-gradle76.jar": {
-        "sha1": "5e15ae8365f8750303ad66e169cb8fb25e20f408",
-        "sha256": "sha256-k6DXXAMnUB4h2z8pprUoju8uIjFyan/esXYMwNmi6/I="
-      },
-      "kotlin-gradle-plugin-1.9.0-gradle80.jar": {
-        "sha1": "3e9dd06e2aabd397923535a42118bc861bcff9eb",
-        "sha256": "sha256-JnLbEUAqZqYyLpzT9nV2rbtyq+jkdNkStqrzP5QGuPY="
-      },
-      "kotlin-gradle-plugin-1.9.0-gradle81.jar": {
-        "sha1": "8cfc2ba810d67ffb9a931d3785163acb5ff859fd",
-        "sha256": "sha256-2UOg4ntHRuAfg0BaSfUmoi9HGx2x1GOdb84m1xHv+/4="
-      },
-      "kotlin-gradle-plugin-1.9.0.jar": {
-        "sha1": "a031b8e97a70eb71b3d8a9298a82d153fc40c938",
-        "sha256": "sha256-yxGBud8e8LclfOPYc6mWy79G3K6qnD+OxIBWE3V5BxU="
-      },
-      "kotlin-gradle-plugin-1.9.0.module": {
-        "sha1": "f15d8f1e4dff619035904e448de88cbbde259d28",
-        "sha256": "sha256-/mOWRe2PvcW8Et588lRopNsx52O6ea26ogahTeYP0xQ="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17673,31 +17333,16 @@
  },

  {
-    "path": "org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.9.0",
+    "path": "org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.7.22",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "kotlin-klib-commonizer-api-1.9.0.pom": {
-        "sha1": "dc9b1e38fb03d23112825bc6ab3ab8144ef8d42a",
-        "sha256": "sha256-hE+SCI/0j4v64lYh4yStw1d5CM9lD0/bJWlhC4+vaz4="
+      "kotlin-klib-commonizer-embeddable-1.7.22.pom": {
+        "sha1": "5b3e5c9d161d6de851b75af4b73a3cd2bf438140",
+        "sha256": "sha256-Ft3srgIpxS0bNHWY5je65P8si2Nj1+AIbNa2bfzIltw="
      },
-      "kotlin-klib-commonizer-api-1.9.0.jar": {
-        "sha1": "35782a8198131f9ee6eec26d7bf60b1e0a508bc5",
-        "sha256": "sha256-hd4ulysLtvRSjB90j0PEhmMUX8hTnsqWwT0bwNo/k10="
-      }
-    }
-  },
-
-  {
-    "path": "org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-klib-commonizer-embeddable-1.9.0.pom": {
-        "sha1": "210d03d9e5afa2938c9a6d20ce164c59277dc437",
-        "sha256": "sha256-L9STJpNwf9ujj80diJL7TdPPAIC5LxJSX8cF42G2eTs="
-      },
-      "kotlin-klib-commonizer-embeddable-1.9.0.jar": {
-        "sha1": "bae135d2d5ed2ae9c2c9b7f8300dbcb345ef8bc7",
-        "sha256": "sha256-zdYmTXJPcRKakwi+JEAsqMccKrICywO2hEmdqXrdS4Q="
+      "kotlin-klib-commonizer-embeddable-1.7.22.jar": {
+        "sha1": "f84170d46b52ac44408be1055fb12849bfff4629",
+        "sha256": "sha256-3owxqAkvto74DzSjy9+x3NQCB7Z8/4fUC1xHnsamjs4="
      }
    }
  },
@@ -17732,21 +17377,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-native-utils/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-native-utils-1.9.0.pom": {
-        "sha1": "80b8f19f18a627c23ed18cf2a44ef7eabc84da96",
-        "sha256": "sha256-Kazy3vkmve3Z6yBOx3Tnhq3Ek0EGqSlJAK81FVbn52o="
-      },
-      "kotlin-native-utils-1.9.0.jar": {
-        "sha1": "13264bd5949f9e68c5d53a6d394b800b725dc577",
-        "sha256": "sha256-D0gF93S/tcG20UXf5g09ILGu4ACJbOjs8+7/hM5EAjs="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-project-model/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17777,21 +17407,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-project-model/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-project-model-1.9.0.pom": {
-        "sha1": "fe67d9afc6940fe0019e18fca37a37c58976536b",
-        "sha256": "sha256-6sHGTGAMYAJ7jmjfrTogPEFbn6IkWB1oz6Xnc+hWa3g="
-      },
-      "kotlin-project-model-1.9.0.jar": {
-        "sha1": "7c6006a523220e0a82f4954652c3140f7353e85a",
-        "sha256": "sha256-rgk26bTGkh8D73eTYcrLu3XtKyIQR5+S9l8cushuNAw="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-reflect/1.1.3-2",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -17897,21 +17512,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/1.6.10",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-reflect-1.6.10.pom": {
-        "sha1": "535560dfd5b3dba98f57b12f3e921c7a83d0aafe",
-        "sha256": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
-      },
-      "kotlin-reflect-1.6.10.jar": {
-        "sha1": "1cbe9c92c12a94eea200d23c2bbaedaf3daf5132",
-        "sha256": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-reflect/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18002,21 +17602,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-scripting-common/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-scripting-common-1.9.0.pom": {
-        "sha1": "326fa3ca7bb1705794879cbae1a9467b7d7aa09e",
-        "sha256": "sha256-C/MG5PRe6xrDAk4pnUybcL4J7OmsAOcLL/mLPtQA8wc="
-      },
-      "kotlin-scripting-common-1.9.0.jar": {
-        "sha1": "ea019fa9e3885795a81df270775e5609f7115307",
-        "sha256": "sha256-KFxBwO7tWaDn3LGIuJ+BVBR/vLvVNUcc9piWzNonP4Q="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18047,21 +17632,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-scripting-compiler-embeddable-1.9.0.pom": {
-        "sha1": "cba5705bf5fb615d2b72195faa25159e83e3a264",
-        "sha256": "sha256-UJ5ikUwwvT43GcDgLk5Df8vxkRa4ouZYSPbUbFTsXJ4="
-      },
-      "kotlin-scripting-compiler-embeddable-1.9.0.jar": {
-        "sha1": "1708703c0683b8d2a0a76048544480b94d3eb458",
-        "sha256": "sha256-Rp3RIGiVipevzhGIoBRFVM3tZ95aGqC/XKUwOfKdizY="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18092,21 +17662,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-scripting-compiler-impl-embeddable-1.9.0.pom": {
-        "sha1": "5459191b6fda205abb23fb4a767bb0f86e8cc12e",
-        "sha256": "sha256-zaYp8KgbqcAKM95QJ/D4/7+fC45E5BlwNHdmu4WLTmM="
-      },
-      "kotlin-scripting-compiler-impl-embeddable-1.9.0.jar": {
-        "sha1": "c825693be78dfcbc351a53856d75f4d11bb0e274",
-        "sha256": "sha256-ZcUlbiyPvdpCbAMobmomgmfXEu+V7C05yVKSlXN4sE0="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18137,21 +17692,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-scripting-jvm-1.9.0.pom": {
-        "sha1": "178d3c678207d53a68cab7ce61dd89867bacdc6f",
-        "sha256": "sha256-Ymj4BVjTX9qSRruneTKWkrlNWJWWVQfL6KhIkSxQ5yo="
-      },
-      "kotlin-scripting-jvm-1.9.0.jar": {
-        "sha1": "e2e6a0bd37a72cded2fec7882199e1bdc4e8bcb4",
-        "sha256": "sha256-Zp3SvGBBjgdRU/2K2NllvlaetlwvMIOIyxEDud8TUVk="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-script-runtime/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18182,21 +17722,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-script-runtime/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-script-runtime-1.9.0.pom": {
-        "sha1": "a52322c274112401ded9622eb8d7eb2570fae853",
-        "sha256": "sha256-FNwHhdGUFP7sEgI91z64DIPQeIC3PlS48IqHj0I9seY="
-      },
-      "kotlin-script-runtime-1.9.0.jar": {
-        "sha1": "4b3102cbbb7e1b58d9d1adf89563f00069ffa7d1",
-        "sha256": "sha256-2E0MykEFD6wqlS0RBEc8Mpr/BMULNxMuV1SiCYCa3Z8="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.2.71",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18497,21 +18022,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-common-1.9.0.pom": {
-        "sha1": "0a865a0c5a64618fd1dcca13d05dea4cba44c832",
-        "sha256": "sha256-NmDTanD+s6vknxG5BjPkHTYnNXbwcbDhCdqbOg3wgqU="
-      },
-      "kotlin-stdlib-common-1.9.0.jar": {
-        "sha1": "cd65c21cfd1eec4d44ef09f9f52b6d9f8a720636",
-        "sha256": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18692,21 +18202,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-jdk7-1.9.0.pom": {
-        "sha1": "5ce6c5278ef6e342507a96372ee534ed0b830e54",
-        "sha256": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o="
-      },
-      "kotlin-stdlib-jdk7-1.9.0.jar": {
-        "sha1": "f320478990d05e0cfaadd74f9619fd6027adbf37",
-        "sha256": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -18872,21 +18367,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-jdk8-1.9.0.pom": {
-        "sha1": "4f04e57e4a12d4a59f620c63520681c4ff1d03e6",
-        "sha256": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I="
-      },
-      "kotlin-stdlib-jdk8-1.9.0.jar": {
-        "sha1": "e000bd084353d84c9e888f6fb341dc1f5b79d948",
-        "sha256": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -19232,21 +18712,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-1.9.0.pom": {
-        "sha1": "4aea0493dfd3ee18df73bcd97db791c2ea5bb383",
-        "sha256": "sha256-N3UiY/Ysw+MlCFbiiO5Kc9QQLXJqd2JwNPlIBsjBCso="
-      },
-      "kotlin-stdlib-1.9.0.jar": {
-        "sha1": "8ee15ef0c67dc83d874f412d84378d7f0eb50b63",
-        "sha256": "sha256-Na7/vi21qkRgcs7lD87ki3+p4vxRyjfAzH19C8OdlS4="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.9.21",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -19316,21 +18781,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-tooling-core/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-tooling-core-1.9.0.pom": {
-        "sha1": "0c1335f31eaaf304a866a1ca780bb75c05df79d1",
-        "sha256": "sha256-KSbD/CFJWXAcjxYNjdyGn3s/pFKv3o3RdcjnwrvHBSI="
-      },
-      "kotlin-tooling-core-1.9.0.jar": {
-        "sha1": "7b3e809d24d27d00072fd69eb130f8a6cbd365e1",
-        "sha256": "sha256-5TmiJCi5ysZ/dbLWHytuKnGDUNe7MYI8fcqJB/kJma4="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -19376,21 +18826,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-util-io/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-util-io-1.9.0.pom": {
-        "sha1": "9481aa1ef0a147a6ca09cbf4a5f72915303185e5",
-        "sha256": "sha256-BUBa+xn3tgbFKr6haJqi1ew9qQL+4teoV2lDOeSgQJQ="
-      },
-      "kotlin-util-io-1.9.0.jar": {
-        "sha1": "e9b6d257f0c94bdf8a0f4ab67d6ffc199a0deba7",
-        "sha256": "sha256-gdNtxt4/C+rwTDl6BrVoITujc6vO9Tlyt7gvYX1a9ws="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-util-klib/1.6.20",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -19421,21 +18856,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-util-klib/1.9.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-util-klib-1.9.0.pom": {
-        "sha1": "45a02a0e039fcf3ef011e38917da856894dad326",
-        "sha256": "sha256-acZHGaDgRjb2whMZ/lGKC1gieEu66P7YXmUfv6b4pFs="
-      },
-      "kotlin-util-klib-1.9.0.jar": {
-        "sha1": "41df7b8939660817a283d9255d5f2e4b555eebc6",
-        "sha256": "sha256-wtxr820zabdzdVq4k3uX5Tmk1F04Fb7xm+36FUsS0xM="
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/markdown-jvm/0.2.1",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -20683,27 +20103,27 @@
  },

  {
-    "path": "org/slf4j/slf4j-api/2.1.0-alpha1",
+    "path": "org/slf4j/slf4j-api/2.0.9",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "slf4j-api-2.1.0-alpha1.pom": {
-        "sha1": "c5362a45b3be4d9d110f5450822ea81b27adb1a0",
-        "sha256": "sha256-QirqW+u6gwWzxhT6Zo7SKePJYQkw7PQvhzOO4F4minU="
+      "slf4j-api-2.0.9.pom": {
+        "sha1": "96a47b716e8241bca75562533e3a9fbb7ffbefb9",
+        "sha256": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U="
      },
-      "slf4j-api-2.1.0-alpha1.jar": {
-        "sha1": "4e2525fc4327cc553c52e3937427c7cf2114735f",
-        "sha256": "sha256-mrf/pkYgK0mdBZlaPsgvMbzLelA0XBUU2MtC7IzOo1M="
+      "slf4j-api-2.0.9.jar": {
+        "sha1": "7cf2726fdcfbc8610f9a71fb3ed639871f315340",
+        "sha256": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w="
      }
    }
  },

  {
-    "path": "org/slf4j/slf4j-bom/2.1.0-alpha1",
+    "path": "org/slf4j/slf4j-bom/2.0.9",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "slf4j-bom-2.1.0-alpha1.pom": {
-        "sha1": "f8784ee61914057bec3db57b5efea4e6b0333c6f",
-        "sha256": "sha256-qOgTiZePRAcJJBuYPTHvp4cRO+EbgYwsa82e0wlv1IU="
+      "slf4j-bom-2.0.9.pom": {
+        "sha1": "54c55d4b55c9f82d34434fe6a36e8c6b5671588a",
+        "sha256": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM="
      }
    }
  },
@@ -20731,12 +20151,12 @@
  },

  {
-    "path": "org/slf4j/slf4j-parent/2.1.0-alpha1",
+    "path": "org/slf4j/slf4j-parent/2.0.9",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "slf4j-parent-2.1.0-alpha1.pom": {
-        "sha1": "ef0d60c3407004bb7e71643a13644f4bc2f3ec00",
-        "sha256": "sha256-zkc1sfnIId4Lkrjb5AsHHG6jIHMuWTVZxupt+WX4c48="
+      "slf4j-parent-2.0.9.pom": {
+        "sha1": "fa1b5ef4b7f48daf822d408eebd3319fa6254c0f",
+        "sha256": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U="
      }
    }
  },
@@ -2,7 +2,6 @@ androidx.activity:activity:1.0.0
 androidx.activity:activity:1.0.0-rc01
 androidx.activity:activity:1.2.4
 androidx.annotation:annotation-experimental:1.1.0
-androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
@@ -11,7 +10,6 @@ androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
 androidx.appcompat:appcompat-resources:1.4.1
 androidx.appcompat:appcompat-resources:1.4.2
-androidx.appcompat:appcompat:1.0.0
 androidx.appcompat:appcompat:1.1.0-rc01
 androidx.appcompat:appcompat:1.2.0
 androidx.appcompat:appcompat:1.3.1
@@ -40,7 +38,6 @@ androidx.coordinatorlayout:coordinatorlayout:1.0.0
 androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.6.0
 androidx.core:core-splashscreen:1.0.0
-androidx.core:core:1.0.0
 androidx.core:core:1.1.0
 androidx.core:core:1.1.0-rc01
 androidx.core:core:1.2.0
@@ -128,13 +125,10 @@ androidx.tracing:tracing:1.1.0
 androidx.transition:transition:1.1.0
 androidx.transition:transition:1.2.0
 androidx.transition:transition:1.2.0-rc01
-androidx.vectordrawable:vectordrawable-animated:1.0.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0-rc01
-androidx.vectordrawable:vectordrawable:1.0.0
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.vectordrawable:vectordrawable:1.1.0-rc01
-androidx.versionedparcelable:versionedparcelable:1.0.0
 androidx.versionedparcelable:versionedparcelable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.1
@@ -784,37 +778,35 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
+org.jetbrains.kotlin:kotlin-android-extensions:1.7.22
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.22
 org.jetbrains.kotlin:kotlin-build-common:1.6.20
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.0
-org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.0
+org.jetbrains.kotlin:kotlin-build-common:1.7.22
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.0
+org.jetbrains.kotlin:kotlin-compiler-runner:1.7.22
 org.jetbrains.kotlin:kotlin-daemon-client:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.0
+org.jetbrains.kotlin:kotlin-daemon-client:1.7.22
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.0
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.0
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.22
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.7.22
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.0
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.22
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-native-utils:1.6.20
-org.jetbrains.kotlin:kotlin-native-utils:1.9.0
+org.jetbrains.kotlin:kotlin-native-utils:1.7.22
 org.jetbrains.kotlin:kotlin-project-model:1.6.20
-org.jetbrains.kotlin:kotlin-project-model:1.9.0
+org.jetbrains.kotlin:kotlin-project-model:1.7.22
 org.jetbrains.kotlin:kotlin-reflect:1.1.3-2
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
 org.jetbrains.kotlin:kotlin-reflect:1.3.20
@@ -822,17 +814,17 @@ org.jetbrains.kotlin:kotlin-reflect:1.3.50
 org.jetbrains.kotlin:kotlin-reflect:1.3.72
 org.jetbrains.kotlin:kotlin-reflect:1.4.32
 org.jetbrains.kotlin:kotlin-reflect:1.5.31
-org.jetbrains.kotlin:kotlin-reflect:1.6.10
 org.jetbrains.kotlin:kotlin-reflect:1.7.10
+org.jetbrains.kotlin:kotlin-reflect:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-common:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.0
-org.jetbrains.kotlin:kotlin-script-runtime:1.9.0
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.22
+org.jetbrains.kotlin:kotlin-script-runtime:1.7.22
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
@@ -841,7 +833,6 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22
-org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
@@ -850,7 +841,6 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
@@ -858,7 +848,6 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.20
@@ -868,13 +857,12 @@ org.jetbrains.kotlin:kotlin-stdlib:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib:1.7.22
-org.jetbrains.kotlin:kotlin-stdlib:1.9.0
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.0
+org.jetbrains.kotlin:kotlin-tooling-core:1.7.22
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
 org.jetbrains.kotlin:kotlin-util-io:1.6.20
-org.jetbrains.kotlin:kotlin-util-io:1.9.0
+org.jetbrains.kotlin:kotlin-util-io:1.7.22
 org.jetbrains.kotlin:kotlin-util-klib:1.6.20
-org.jetbrains.kotlin:kotlin-util-klib:1.9.0
+org.jetbrains.kotlin:kotlin-util-klib:1.7.22
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
 org.jetbrains:markdown-jvm:0.2.1
@@ -942,5 +930,4 @@ org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
 com.android.tools.lint:lint-gradle:30.4.2
 com.android.tools.build:gradle:7.4.2
 com.android.tools.build:aapt2:7.4.2-8841542
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
@@ -697,7 +697,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.24.1/error_prone_annotations-2.24.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.24.0/error_prone_annotations-2.24.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -706,7 +706,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.4.0/error_prone_parent-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.7.1/error_prone_parent-2.7.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.24.1/error_prone_parent-2.24.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.24.0/error_prone_parent-2.24.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -1116,55 +1116,36 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-co
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.5.2/kotlinx-coroutines-core-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.1.0/kotlinx-metadata-jvm-0.1.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.7.22/org.jetbrains.kotlin.jvm.gradle.plugin-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.9.0/org.jetbrains.kotlin.jvm.gradle.plugin-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.6.20/kotlin-android-extensions-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.7.22/kotlin-android-extensions-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.9.0/kotlin-android-extensions-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotations-jvm/1.3.72/kotlin-annotations-jvm-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.6.20/kotlin-annotation-processing-gradle-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.7.22/kotlin-annotation-processing-gradle-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.6.20/kotlin-build-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.7.22/kotlin-build-common-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.9.0/kotlin-build-common-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools-api/1.9.0/kotlin-build-tools-api-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-tools-impl/1.9.0/kotlin-build-tools-impl-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.6.20/kotlin-compiler-embeddable-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.22/kotlin-compiler-embeddable-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.9.0/kotlin-compiler-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.6.20/kotlin-compiler-runner-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.7.22/kotlin-compiler-runner-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.9.0/kotlin-compiler-runner-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.6.20/kotlin-daemon-client-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.7.22/kotlin-daemon-client-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.9.0/kotlin-daemon-client-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.6.20/kotlin-daemon-embeddable-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.22/kotlin-daemon-embeddable-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.9.0/kotlin-daemon-embeddable-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugins-bom/1.9.0/kotlin-gradle-plugins-bom-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-annotations/1.9.0/kotlin-gradle-plugin-annotations-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.20/kotlin-gradle-plugin-api-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.7.22/kotlin-gradle-plugin-api-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.9.0/kotlin-gradle-plugin-api-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.7.22/kotlin-gradle-plugin-idea-proto-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.9.0/kotlin-gradle-plugin-idea-proto-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.7.22/kotlin-gradle-plugin-idea-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.9.0/kotlin-gradle-plugin-idea-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.6.20/kotlin-gradle-plugin-model-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.7.22/kotlin-gradle-plugin-model-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.9.0/kotlin-gradle-plugin-model-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.20/kotlin-gradle-plugin-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.7.22/kotlin-gradle-plugin-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.9.0/kotlin-gradle-plugin-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.6.20/kotlin-klib-commonizer-api-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.7.22/kotlin-klib-commonizer-api-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.9.0/kotlin-klib-commonizer-api-1.9.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.9.0/kotlin-klib-commonizer-embeddable-1.9.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.7.22/kotlin-klib-commonizer-embeddable-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.6.20/kotlin-native-utils-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.7.22/kotlin-native-utils-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.9.0/kotlin-native-utils-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.6.20/kotlin-project-model-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.7.22/kotlin-project-model-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.9.0/kotlin-project-model-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.2.0/kotlin-reflect-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.20/kotlin-reflect-1.3.20.pom
@@ -1172,26 +1153,20 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.50/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.5.31/kotlin-reflect-1.5.31.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta2/kotlin-reflect-2.0.0-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.9.0/kotlin-scripting-common-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.20/kotlin-scripting-compiler-embeddable-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.22/kotlin-scripting-compiler-embeddable-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.9.0/kotlin-scripting-compiler-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.6.20/kotlin-scripting-compiler-impl-embeddable-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.22/kotlin-scripting-compiler-impl-embeddable-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.9.0/kotlin-scripting-compiler-impl-embeddable-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.20/kotlin-scripting-jvm-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.22/kotlin-scripting-jvm-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.0/kotlin-scripting-jvm-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.6.20/kotlin-script-runtime-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.7.22/kotlin-script-runtime-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.9.0/kotlin-script-runtime-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.2.71/kotlin-stdlib-common-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.0/kotlin-stdlib-common-1.3.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.20/kotlin-stdlib-common-1.3.20.pom
@@ -1212,7 +1187,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.22/kotlin-stdlib-common-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom
@@ -1225,7 +1199,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.22/kotlin-stdlib-jdk7-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
@@ -1237,7 +1210,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.22/kotlin-stdlib-jdk8-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0/kotlin-stdlib-jdk8-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/kotlin-stdlib-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.20/kotlin-stdlib-1.2.20.pom
@@ -1261,18 +1233,14 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.22/kotlin-stdlib-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta2/kotlin-stdlib-2.0.0-Beta2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.6.20/kotlin-util-io-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.7.22/kotlin-util-io-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.9.0/kotlin-util-io-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.6.20/kotlin-util-klib-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.7.22/kotlin-util-klib-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.9.0/kotlin-util-klib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown-jvm/0.2.1/markdown-jvm-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown/0.2.1/markdown-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
@@ -1355,11 +1323,11 @@ https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.7.3/utils
 https://repo.maven.apache.org/maven2/org/robolectric/utils/4.7.3/utils-4.7.3.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.1.0-alpha1/slf4j-api-2.1.0-alpha1.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-bom/2.1.0-alpha1/slf4j-bom-2.1.0-alpha1.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-bom/2.0.9/slf4j-bom-2.0.9.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.21/slf4j-parent-1.7.21.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-parent-1.7.30.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.1.0-alpha1/slf4j-parent-2.1.0-alpha1.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.0.9/slf4j-parent-2.0.9.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
@@ -50,8 +50,7 @@ org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
 com.android.tools.lint:lint-gradle:30.4.2
 com.android.tools.build:gradle:7.4.2
 com.android.tools.build:aapt2:7.4.2-8841542
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0' \
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' \
        >> "${DEPS_LIST}"
 }

@@ -37,14 +37,9 @@ SECRETS_ENV_VARS=(
    'ALCHEMY_ARBITRUM_MAINNET_TOKEN'
    'ALCHEMY_OPTIMISM_GOERLI_TOKEN'
    'ALCHEMY_OPTIMISM_MAINNET_TOKEN'
-    'ALCHEMY_ETHEREUM_SEPOLIA_TOKEN'
-    'ALCHEMY_ARBITRUM_SEPOLIA_TOKEN'
-    'ALCHEMY_OPTIMISM_SEPOLIA_TOKEN'
    'INFURA_TOKEN'
    'INFURA_TOKEN_SECRET'
    'OPENSEA_API_KEY'
-    'RARIBLE_MAINNET_API_KEY'
-    'RARIBLE_TESTNET_API_KEY'
    'POKT_TOKEN'
 )

@@ -63,15 +63,10 @@
         {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
          status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
          status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
-          status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
-          status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
          status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
          status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
          status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-          status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
-          status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-          status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+          status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
         :compiler-options {:output-feature-set :es5
                            ;; We disable `:fn-deprecated` warnings because we
                            ;; are managing deprecation via clj-kondo and we
@@ -95,15 +90,10 @@
    {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
     status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
-     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
-     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
     status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
     status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-     status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-     status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+     status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
    :compiler-options {:output-feature-set :es6
                       ;;disable for android build as there
                       ;;is an intermittent warning with deftype
@@ -133,15 +123,10 @@
    status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
    status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
    status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
-    status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
-    status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
    status-im.config/ALCHEMY_ARBITRUM_GOERLI_TOKEN  #shadow/env "ALCHEMY_ARBITRUM_GOERLI_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_GOERLI_TOKEN  #shadow/env "ALCHEMY_OPTIMISM_GOERLI_TOKEN"
    status-im.config/ALCHEMY_OPTIMISM_MAINNET_TOKEN #shadow/env "ALCHEMY_OPTIMISM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"
-    status-im.config/ALCHEMY_ETHEREUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ETHEREUM_SEPOLIA_TOKEN"
-    status-im.config/ALCHEMY_ARBITRUM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_ARBITRUM_SEPOLIA_TOKEN"
-    status-im.config/ALCHEMY_OPTIMISM_SEPOLIA_TOKEN #shadow/env "ALCHEMY_OPTIMISM_SEPOLIA_TOKEN"}
+    status-im.config/ALCHEMY_ARBITRUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ARBITRUM_MAINNET_TOKEN"}
   :compiler-options
   {;; needed because we override require and it
    ;; messes with source-map which reports callstack
@@ -0,0 +1,92 @@
+import { useDerivedValue, withTiming, interpolate, useAnimatedScrollHandler, runOnJS } from 'react-native-reanimated';
+
+export function navigationHeaderOpacity(distanceFromListTop, isAllLoaded, isCalculationsComplete, startPosition) {
+  return useDerivedValue(function () {
+    'worklet';
+    const isCalculationsCompleteValue = isCalculationsComplete.value;
+    if (distanceFromListTop.value < startPosition && isAllLoaded.value) {
+      return isCalculationsCompleteValue ? withTiming(0) : 0;
+    } else {
+      return isCalculationsCompleteValue ? withTiming(1) : 1;
+    }
+  });
+}
+
+export function navigationHeaderPosition(distanceFromListTop, isAllLoaded, topBarHeight, startPosition) {
+  return useDerivedValue(function () {
+    'worklet';
+    return distanceFromListTop.value < startPosition && isAllLoaded.value ? withTiming(topBarHeight) : withTiming(0);
+  });
+}
+
+export function interpolateNavigationViewOpacity(props) {
+  return useDerivedValue(function () {
+    'worklet';
+    const {
+      'all-loaded?': isAllLoaded,
+      'end-position': endPosition,
+      'start-position': startPosition,
+      'distance-from-list-top': distanceFromListTop,
+    } = props;
+    if (isAllLoaded.value) {
+      return interpolate(distanceFromListTop.value, [startPosition, endPosition], [0, 1], {
+        extrapolateLeft: 'clamp',
+        extrapolateRight: 'clamp',
+      });
+    } else {
+      return 1;
+    }
+  });
+}
+
+export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callback) {
+  return function (event) {
+    'worklet';
+    const currentY = event.contentOffset.y;
+    const layoutHeight = event.layoutMeasurement.height;
+    const contentSizeY = event.contentSize.height - layoutHeight;
+    const newDistance = contentSizeY - currentY;
+    distanceFromListTop.value = newDistance;
+    chatListScrollY.value = currentY;
+    runOnJS(callback)(layoutHeight, newDistance);
+  };
+}
+
+export function placeholderOpacity(isCalculationsComplete) {
+  return useDerivedValue(function () {
+    'worklet';
+    return isCalculationsComplete.value ? 0 : 1;
+  });
+}
+
+export function placeholderZIndex(isCalculationsComplete) {
+  return useDerivedValue(function () {
+    'worklet';
+    return isCalculationsComplete.value ? 0 : 2;
+  });
+}
+
+export function scrollDownButtonOpacity(chatListScrollY, isComposerFocused, windowHeight) {
+  return useDerivedValue(function () {
+    'worklet';
+    if (isComposerFocused.value) {
+      return 0;
+    } else {
+      return chatListScrollY.value > windowHeight * 0.75 ? 1 : 0;
+    }
+  });
+}
+
+export function jumpToButtonOpacity(scrollDownButtonOpacity, isComposerFocused) {
+  return useDerivedValue(function () {
+    'worklet';
+    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 0 : 1);
+  });
+}
+
+export function jumpToButtonPosition(scrollDownButtonOpacity, isComposerFocused) {
+  return useDerivedValue(function () {
+    'worklet';
+    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 35 : 0);
+  });
+}
@@ -1,26 +0,0 @@
-import { useDerivedValue, withTiming } from 'react-native-reanimated';
-
-export function scrollDownButtonOpacity(chatListScrollY, isComposerFocused, windowHeight) {
-  return useDerivedValue(function () {
-    'worklet';
-    if (isComposerFocused.value) {
-      return 0;
-    } else {
-      return chatListScrollY.value > windowHeight * 0.75 ? 1 : 0;
-    }
-  });
-}
-
-export function jumpToButtonOpacity(scrollDownButtonOpacity, isComposerFocused) {
-  return useDerivedValue(function () {
-    'worklet';
-    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 0 : 1);
-  });
-}
-
-export function jumpToButtonPosition(scrollDownButtonOpacity, isComposerFocused) {
-  return useDerivedValue(function () {
-    'worklet';
-    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 35 : 0);
-  });
-}
@@ -1,14 +0,0 @@
-import { withTiming, runOnJS } from 'react-native-reanimated';
-
-export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callback) {
-  return function (event) {
-    'worklet';
-    const currentY = event.contentOffset.y;
-    const layoutHeight = event.layoutMeasurement.height;
-    const contentSizeY = event.contentSize.height - layoutHeight;
-    const newDistance = contentSizeY - currentY;
-    distanceFromListTop.value = newDistance;
-    chatListScrollY.value = currentY;
-    runOnJS(callback)(layoutHeight, newDistance);
-  };
-}
@@ -1,40 +0,0 @@
-import { useDerivedValue, withTiming, interpolate } from 'react-native-reanimated';
-
-export function navigationHeaderOpacity(distanceFromListTop, isAllLoaded, isCalculationsComplete, startPosition) {
-  return useDerivedValue(function () {
-    'worklet';
-    const isCalculationsCompleteValue = isCalculationsComplete.value;
-    if (distanceFromListTop.value < startPosition && isAllLoaded.value) {
-      return isCalculationsCompleteValue ? withTiming(0) : 0;
-    } else {
-      return isCalculationsCompleteValue ? withTiming(1) : 1;
-    }
-  });
-}
-
-export function navigationHeaderPosition(distanceFromListTop, isAllLoaded, topBarHeight, startPosition) {
-  return useDerivedValue(function () {
-    'worklet';
-    return distanceFromListTop.value < startPosition && isAllLoaded.value ? withTiming(topBarHeight) : withTiming(0);
-  });
-}
-
-export function interpolateNavigationViewOpacity(props) {
-  return useDerivedValue(function () {
-    'worklet';
-    const {
-      'all-loaded?': isAllLoaded,
-      'end-position': endPosition,
-      'start-position': startPosition,
-      'distance-from-list-top': distanceFromListTop,
-    } = props;
-    if (isAllLoaded.value) {
-      return interpolate(distanceFromListTop.value, [startPosition, endPosition], [0, 1], {
-        extrapolateLeft: 'clamp',
-        extrapolateRight: 'clamp',
-      });
-    } else {
-      return 1;
-    }
-  });
-}
@@ -1,15 +0,0 @@
-import { useDerivedValue } from 'react-native-reanimated';
-
-export function placeholderOpacity(isCalculationsComplete) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isCalculationsComplete.value ? 0 : 1;
-  });
-}
-
-export function placeholderZIndex(isCalculationsComplete) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isCalculationsComplete.value ? 0 : 2;
-  });
-}
@@ -51,9 +51,3 @@
      (visibility-status-updates/<-rpc-settings)
      (set/rename-keys {:compressedKey :compressed-key
                        :emojiHash     :emoji-hash})))
-
-(defn rpc->setting-value
-  [{:keys [name] :as setting}]
-  (condp = name
-    :currency (update setting :value keyword)
-    setting))
@@ -231,7 +231,7 @@
  [db]
  (into #{}
        (remove #(= (:type %) :watch)
-                (map #(eip55/address->checksum (:address %)) (vals (get-in db [:wallet :accounts]))))))
+                (map #(eip55/address->checksum (:address %)) (get db :profile/wallet-accounts)))))

 ;;NOTE we want to handle only last resolve
 (def resolve-last-id (atom nil))
@@ -79,15 +79,10 @@
    "recent-history-ready"                     (recent-history-fetching-ended cofx event)
    "fetching-history-error"                   (fetching-error cofx event)
    "non-archival-node-detected"               (non-archival-node-detected cofx event)
-    "pending-transaction-status-changed"       {:fx
-                                                [[:dispatch
-                                                  [:wallet/pending-transaction-status-changed-received
-                                                   event]]]}
    "wallet-owned-collectibles-filtering-done" {:fx [[:dispatch
                                                      [:wallet/owned-collectibles-filtering-done
                                                       event]]]}
    "wallet-get-collectibles-details-done"     {:fx [[:dispatch
                                                      [:wallet/get-collectible-details-done
                                                       event]]]}
-    "wallet-tick-reload"                       {:fx [[:dispatch [:wallet/reload]]]}
    (log/debug ::unknown-wallet-event :type type :event event)))
@@ -43,7 +43,6 @@
    [react-native.permissions :as permissions]
    [react-native.platform :as platform]
    [status-im.common.biometric.events :as biometric]
-    status-im.common.serialization
    status-im.common.standard-authentication.events
    [status-im.common.theme.core :as theme]
    [status-im.common.universal-links :as universal-links]
@@ -246,7 +246,7 @@
        [rn/touchable-opacity
         {:on-press #(do
                       (rf/dispatch [:pop-to-root :shell-stack])
-                       (rf/dispatch [:communities/navigate-to-community-overview (:id community)])
+                       (rf/dispatch [:navigate-to :community-overview (:id community)])
                       (rf/dispatch [:chat/close]))}
         [rn/text
          {:style {:text-align :center
@@ -377,88 +377,81 @@
 (defn mock
  [module]
  (case module
-    "react-native-languages"                           react-native-languages
-    "react-native-background-timer"                    background-timer
-    "react-native-image-crop-picker"                   image-crop-picker
-    "react-native-gesture-handler"                     react-native-gesture-handler
-    "react-native-static-safe-area-insets"             react-native-static-safe-area-insets
-    "react-native-config"                              config
-    "react-native-iphone-x-helper"                     (clj->js {:getStatusBarHeight (fn [])
-                                                                 :getBottomSpace     (fn [])})
-    "react-native-screens"                             (clj->js {})
-    "react-native-reanimated"                          react-native-reanimated
-    "react-native-redash"                              react-native-redash
-    "react-native-fetch-polyfill"                      fetch
-    "react-native-status-keycard"                      status-keycard
-    "react-native-keychain"                            keychain
-    "react-native-touch-id"                            touchid
-    "@react-native-community/netinfo"                  net-info
-    "react-native-dialogs"                             dialogs
-    "react-native"                                     react-native
-    "react-native-fs"                                  fs
-    "react-native-mail"                                react-native-mail
-    "react-native-image-resizer"                       image-resizer
-    "react-native-haptic-feedback"                     react-native-haptic-feedback
-    "react-native-device-info"                         react-native-device-info
-    "react-native-push-notification"                   react-native-push-notification
-    "react-native-linear-gradient"                     react-native-gradien
-    "@react-native-community/masked-view"              masked-view
-    "react-native-blob-util"                           react-native-blob-util
-    "react-native-navigation"                          react-native-navigation
-    "@react-native-community/push-notification-ios"    push-notification-ios
-    "@react-native-community/blur"                     react-native-blur
-    "@react-native-camera-roll/camera-roll"            react-native-camera-roll
-    "react-native-camera-kit"                          react-native-camera-kit
-    "react-native-permissions"                         react-native-permissions
-    "rn-emoji-keyboard"                                rn-emoji-keyboard
-    "react-native-hole-view"                           react-native-hole-view
-    "react-native-draggable-flatlist"                  react-native-draggable-flatlist
-    "react-native-webview"                             react-native-webview
-    "@react-native-community/audio-toolkit"            react-native-audio-toolkit
-    "react-native-image-viewing"                       react-native-image-viewing
-    "react-native-share"                               react-native-share
-    "@react-native-async-storage/async-storage"        async-storage
-    "react-native-svg"                                 react-native-svg
-    "react-native-transparent-video"                   react-native-transparent-video
-    "react-native-orientation-locker"                  react-native-orientation-locker
-    "react-native-gifted-charts"                       react-native-gifted-charts
-    "../resources/data/emojis/en.json"                 (js/JSON.parse
-                                                        (slurp
-                                                         "./resources/data/emojis/en.json"))
-    "../src/js/worklets/core.js"                       worklet-factory
-    "../src/js/worklets/shell/bottom_tabs.js"          #js {}
-    "../src/js/worklets/shell/home_stack.js"           #js {}
-    "../src/js/worklets/shell/floating_screen.js"      #js {}
-    "../src/js/worklets/bottom_sheet.js"               #js {}
-    "../src/js/worklets/record_audio.js"               #js {}
-    "../src/js/worklets/scroll_view.js"                #js {}
-    "../src/js/worklets/onboarding_carousel.js"        #js {}
-    "../src/js/worklets/chat/messenger/lightbox.js"    #js {}
-    "../src/js/worklets/chat/messenger/messages.js"    #js {}
-    "../src/js/worklets/chat/messenger/navigation.js"  #js {}
-    "../src/js/worklets/chat/messenger/composer.js"    #js {}
-    "../src/js/worklets/chat/messenger/placeholder.js" #js {}
-    "../src/js/worklets/parallax.js"                   #js {}
-    "../src/js/worklets/identifiers_highlighting.js"   #js {}
-    "./fleets.js"                                      default-fleets
-    "../translations/ar.json"                          (js/JSON.parse (slurp "./translations/ar.json"))
-    "../translations/de.json"                          (js/JSON.parse (slurp "./translations/de.json"))
-    "../translations/en.json"                          (js/JSON.parse (slurp "./translations/en.json"))
-    "../translations/es.json"                          (js/JSON.parse (slurp "./translations/es.json"))
-    "../translations/es_419.json"                      (js/JSON.parse (slurp
-                                                                       "./translations/es_419.json"))
-    "../translations/fil.json"                         (js/JSON.parse (slurp "./translations/fil.json"))
-    "../translations/fr.json"                          (js/JSON.parse (slurp "./translations/fr.json"))
-    "../translations/id.json"                          (js/JSON.parse (slurp "./translations/id.json"))
-    "../translations/it.json"                          (js/JSON.parse (slurp "./translations/it.json"))
-    "../translations/ko.json"                          (js/JSON.parse (slurp "./translations/ko.json"))
-    "../translations/pt_BR.json"                       (js/JSON.parse (slurp
-                                                                       "./translations/pt_BR.json"))
-    "../translations/ru.json"                          (js/JSON.parse (slurp "./translations/ru.json"))
-    "../translations/tr.json"                          (js/JSON.parse (slurp "./translations/tr.json"))
-    "../translations/zh.json"                          (js/JSON.parse (slurp "./translations/zh.json"))
-    "../translations/zh_hant.json"                     (js/JSON.parse (slurp
-                                                                       "./translations/zh_hant.json"))
-    "../translations/zh_TW.json"                       (js/JSON.parse (slurp
-                                                                       "./translations/zh_TW.json"))
+    "react-native-languages"                         react-native-languages
+    "react-native-background-timer"                  background-timer
+    "react-native-image-crop-picker"                 image-crop-picker
+    "react-native-gesture-handler"                   react-native-gesture-handler
+    "react-native-static-safe-area-insets"           react-native-static-safe-area-insets
+    "react-native-config"                            config
+    "react-native-iphone-x-helper"                   (clj->js {:getStatusBarHeight (fn [])
+                                                               :getBottomSpace     (fn [])})
+    "react-native-screens"                           (clj->js {})
+    "react-native-reanimated"                        react-native-reanimated
+    "react-native-redash"                            react-native-redash
+    "react-native-fetch-polyfill"                    fetch
+    "react-native-status-keycard"                    status-keycard
+    "react-native-keychain"                          keychain
+    "react-native-touch-id"                          touchid
+    "@react-native-community/netinfo"                net-info
+    "react-native-dialogs"                           dialogs
+    "react-native"                                   react-native
+    "react-native-fs"                                fs
+    "react-native-mail"                              react-native-mail
+    "react-native-image-resizer"                     image-resizer
+    "react-native-haptic-feedback"                   react-native-haptic-feedback
+    "react-native-device-info"                       react-native-device-info
+    "react-native-push-notification"                 react-native-push-notification
+    "react-native-linear-gradient"                   react-native-gradien
+    "@react-native-community/masked-view"            masked-view
+    "react-native-blob-util"                         react-native-blob-util
+    "react-native-navigation"                        react-native-navigation
+    "@react-native-community/push-notification-ios"  push-notification-ios
+    "@react-native-community/blur"                   react-native-blur
+    "@react-native-camera-roll/camera-roll"          react-native-camera-roll
+    "react-native-camera-kit"                        react-native-camera-kit
+    "react-native-permissions"                       react-native-permissions
+    "rn-emoji-keyboard"                              rn-emoji-keyboard
+    "react-native-hole-view"                         react-native-hole-view
+    "react-native-draggable-flatlist"                react-native-draggable-flatlist
+    "react-native-webview"                           react-native-webview
+    "@react-native-community/audio-toolkit"          react-native-audio-toolkit
+    "react-native-image-viewing"                     react-native-image-viewing
+    "react-native-share"                             react-native-share
+    "@react-native-async-storage/async-storage"      async-storage
+    "react-native-svg"                               react-native-svg
+    "react-native-transparent-video"                 react-native-transparent-video
+    "react-native-orientation-locker"                react-native-orientation-locker
+    "react-native-gifted-charts"                     react-native-gifted-charts
+    "../resources/data/emojis/en.json"               (js/JSON.parse (slurp
+                                                                     "./resources/data/emojis/en.json"))
+    "../src/js/worklets/core.js"                     worklet-factory
+    "../src/js/worklets/shell/bottom_tabs.js"        #js {}
+    "../src/js/worklets/shell/home_stack.js"         #js {}
+    "../src/js/worklets/shell/floating_screen.js"    #js {}
+    "../src/js/worklets/bottom_sheet.js"             #js {}
+    "../src/js/worklets/record_audio.js"             #js {}
+    "../src/js/worklets/scroll_view.js"              #js {}
+    "../src/js/worklets/onboarding_carousel.js"      #js {}
+    "../src/js/worklets/chat/lightbox.js"            #js {}
+    "../src/js/worklets/chat/messages.js"            #js {}
+    "../src/js/worklets/parallax.js"                 #js {}
+    "../src/js/worklets/identifiers_highlighting.js" #js {}
+    "./fleets.js"                                    default-fleets
+    "../translations/ar.json"                        (js/JSON.parse (slurp "./translations/ar.json"))
+    "../translations/de.json"                        (js/JSON.parse (slurp "./translations/de.json"))
+    "../translations/en.json"                        (js/JSON.parse (slurp "./translations/en.json"))
+    "../translations/es.json"                        (js/JSON.parse (slurp "./translations/es.json"))
+    "../translations/es_419.json"                    (js/JSON.parse (slurp "./translations/es_419.json"))
+    "../translations/fil.json"                       (js/JSON.parse (slurp "./translations/fil.json"))
+    "../translations/fr.json"                        (js/JSON.parse (slurp "./translations/fr.json"))
+    "../translations/id.json"                        (js/JSON.parse (slurp "./translations/id.json"))
+    "../translations/it.json"                        (js/JSON.parse (slurp "./translations/it.json"))
+    "../translations/ko.json"                        (js/JSON.parse (slurp "./translations/ko.json"))
+    "../translations/pt_BR.json"                     (js/JSON.parse (slurp "./translations/pt_BR.json"))
+    "../translations/ru.json"                        (js/JSON.parse (slurp "./translations/ru.json"))
+    "../translations/tr.json"                        (js/JSON.parse (slurp "./translations/tr.json"))
+    "../translations/zh.json"                        (js/JSON.parse (slurp "./translations/zh.json"))
+    "../translations/zh_hant.json"                   (js/JSON.parse (slurp
+                                                                     "./translations/zh_hant.json"))
+    "../translations/zh_TW.json"                     (js/JSON.parse (slurp "./translations/zh_TW.json"))
    nil))
@@ -11,17 +11,17 @@
 (defn token-requirement-list-row
  [tokens padding?]
  [rn/view {:style (style/token-row padding?)}
-   (map-indexed (fn [token-index {:keys [img-src amount sufficient? purchasable?] :as token}]
-                  ^{:key token-index}
-                  [rn/view {:style style/token-tag-spacing}
-                   [token-tag/view
-                    {:token-symbol  (:symbol token)
-                     :token-img-src img-src
-                     :token-value   amount
-                     :size          :size-24
-                     :options       (cond
-                                      sufficient?  :hold
-                                      purchasable? :add)}]])
+   (map-indexed (fn [token-index token]
+                  (let [{:keys [amount sufficient? purchasable?]} token]
+                    ^{:key token-index}
+                    [rn/view {:style style/token-tag-spacing}
+                     [token-tag/view
+                      {:token-symbol (:symbol token)
+                       :token-value  amount
+                       :size         :size-24
+                       :options      (cond
+                                       sufficient?  :hold
+                                       purchasable? :add)}]]))
                tokens)])

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

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

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

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

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

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

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

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

 (defn- view-internal
-  [{:keys [customization-color opacity container-style height] :or {customization-color :blue}}]
+  [{:keys [customization-color opacity container-style] :or {customization-color :blue}}]
  (let [color-top    (colors/custom-color customization-color 50 20)
        color-bottom (colors/custom-color customization-color 50 0)]
    [linear-gradient/linear-gradient
@@ -14,6 +14,6 @@
      :colors              [color-top color-bottom]
      :start               {:x 0 :y 0}
      :end                 {:x 0 :y 1}
-      :style               (merge (style/root-container opacity height) container-style)}]))
+      :style               (merge (style/root-container opacity) container-style)}]))

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

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

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

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

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

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

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

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

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

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

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

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

 (def view (schema/instrument #'view-internal ?schema))
@@ -33,22 +33,22 @@
    [rn/view
     {:style               style/networks-container
      :accessibility-label :networks}
-     (when (and ethereum (pos? (:amount ethereum)))
+     (when (pos? ethereum)
       [network-amount
        {:network  :ethereum
-         :amount   (str (:amount ethereum) " " (or (:token-symbol ethereum) "ETH"))
+         :amount   (str ethereum " ETH")
         :divider? (or show-arbitrum? show-optimism?)
         :theme    theme}])
     (when show-optimism?
       [network-amount
        {:network  :optimism
-         :amount   (str (:amount optimism) " " (or (:token-symbol optimism) "OPT"))
+         :amount   (str optimism " OPT")
         :divider? show-arbitrum?
         :theme    theme}])
     (when show-arbitrum?
       [network-amount
        {:network :arbitrum
-         :amount  (str (:amount arbitrum) " " (or (:token-symbol arbitrum) "ARB"))
+         :amount  (str arbitrum " ARB")
         :theme   theme}])]))

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 (rf/defn on-handle
  {:events [::match-value]}
-  [cofx url {:keys [type chat-id] :as data}]
+  [cofx url {:keys [type] :as data}]
  (case type
    :group-chat         (handle-group-chat cofx data)
    :private-chat       (handle-private-chat cofx data)
    :community-requests (handle-community-requests cofx data)
-    :community          (communities.events/navigate-to-serialized-community cofx data)
-    :community-chat     {:dispatch [:communities/navigate-to-community-chat chat-id :pop-to-root]}
+    :community          (handle-community cofx data)
+    :desktop-community  (handle-desktop-community cofx data)
+    :community-chat     (handle-community-chat cofx data)
    :contact            (handle-view-profile cofx data)
    :browser            (handle-browse cofx data)
    :eip681             (handle-eip681 cofx data)
@@ -15,11 +15,6 @@
 (goog-define ALCHEMY_OPTIMISM_GOERLI_TOKEN "")
 (goog-define ALCHEMY_OPTIMISM_MAINNET_TOKEN "")
 (goog-define ALCHEMY_ARBITRUM_MAINNET_TOKEN "")
-(goog-define ALCHEMY_ETHEREUM_SEPOLIA_TOKEN "")
-(goog-define ALCHEMY_ARBITRUM_SEPOLIA_TOKEN "")
-(goog-define ALCHEMY_OPTIMISM_SEPOLIA_TOKEN "")
-(goog-define RARIBLE_MAINNET_API_KEY "")
-(goog-define RARIBLE_TESTNET_API_KEY "")
 (goog-define OPENSEA_API_KEY "")

 (def mainnet-rpc-url (str "https://eth-archival.gateway.pokt.network/v1/lb/" POKT_TOKEN))
@@ -219,8 +219,7 @@
 (def regx-community-universal-link #"((^https?://status.app/)|(^status-app://))c/([\x00-\x7F]+)$")
 (def regx-deep-link #"((^ethereum:.*)|(^status-app://[\x00-\x7F]+$))")
 (def regx-ens #"^(?=.{5,255}$)([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.[a-zA-Z]{2,}$")
-(def regx-multichain-address #"^(?:(?:eth:|arb1:|opt:)(?=:|))*0x[0-9a-fA-F]{40}$")
-
+(def regx-address #"^0x[a-fA-F0-9]{40}$")
 (def regx-address-contains #"(?i)0x[a-fA-F0-9]{40}")
 (def regx-starts-with-uuid #"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
 (def regx-full-or-partial-address #"^0x[a-fA-F0-9]{1,40}$")
@@ -338,13 +337,6 @@
 (def ^:const local-pairing-action-sync-device 3)
 (def ^:const local-pairing-action-pairing-installation 4)

-(def ^:const serialization-key
-  "We pass this serialization key as a parameter to MultiformatSerializePublicKey
-  function at status-go, This key determines the output base of the serialization.
-  according to https://specs.status.im/spec/2#public-key-serialization we serialize
-  keys with base58btc encoding"
-  "z")
-
 (def ^:const deserialization-key
  "We pass this deserialization key as a parameter to MultiformatDeserializePublicKey
  function at status-go, This key determines the output base of the deserialization.
@@ -406,14 +398,11 @@

 ;; wallet
 (def ^:const mainnet-chain-id 1)
-(def ^:const goerli-chain-id 5)
-(def ^:const sepolia-chain-id 11155111)
 (def ^:const optimism-chain-id 10)
-(def ^:const optimism-goerli-chain-id 420)
-(def ^:const optimism-sepolia-chain-id 11155420)
+(def ^:const optimism-test-chain-id 420)
 (def ^:const arbitrum-chain-id 42161)
-(def ^:const arbitrum-goerli-chain-id 421613)
-(def ^:const arbitrum-sepolia-chain-id 421614)
+(def ^:const arbitrum-test-chain-id 421613)
+(def ^:const goerli-chain-id 5)

 (def ^:const mainnet-short-name "eth")
 (def ^:const optimism-short-name "opt")
@@ -443,6 +432,3 @@
 (def ^:const send-type-stickers-buy 4)
 (def ^:const send-type-bridge 5)
 (def ^:const send-type-erc-721-transfer 6)
-
-(def ^:const bridge-name-transfer "Transfer")
-(def ^:const bridge-name-erc-721-transfer "ERC721Transfer")
@@ -29,7 +29,7 @@
     {:icon                :i/add-user
      :accessibility-label :add-a-contact
      :label               (i18n/label :t/add-a-contact)
-      :sub-label           (i18n/label :t/enter-chat-key)
+      :sub-label           (i18n/label :t/enter-a-chat-key)
      :add-divider?        true
      :on-press            #(debounce/dispatch-and-chill
                             [:open-modal :new-contact]
@@ -4,12 +4,13 @@
    [legacy.status-im.chat.models.loading :as loading]
    [legacy.status-im.data-store.chats :as chats-store]
    [re-frame.core :as re-frame]
-    status-im.common.lightbox.events
+    [reagent.core :as reagent]
    [status-im.common.muting.helpers :refer [format-mute-till]]
    [status-im.constants :as constants]
    [status-im.contexts.chat.contacts.events :as contacts-store]
    status-im.contexts.chat.effects
    [status-im.contexts.chat.messenger.composer.link-preview.events :as link-preview]
+    status-im.contexts.chat.messenger.lightbox.events
    status-im.contexts.chat.messenger.messages.content.reactions.events
    [status-im.contexts.chat.messenger.messages.delete-message-for-me.events :as delete-for-me]
    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
@@ -393,6 +394,38 @@
  [cofx chat-id]
  (navigation/navigate-to cofx :chat-pinned-messages {:chat-id chat-id}))

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 ;;;; VIEW
 (defn image
@@ -33,7 +33,7 @@
   {:position           :absolute
    :padding-horizontal 20
    :top                (if (or platform/ios? (not landscape?)) top-inset 0)
-    :height             constants/top-view-height
+    :height             c/top-view-height
    :z-index            4
    :flex-direction     :row
    :justify-content    :space-between
@@ -44,7 +44,7 @@
 (defn top-gradient
  [insets]
  {:position :absolute
-   :height   (+ constants/top-view-height (:top insets) 0)
+   :height   (+ c/top-view-height (:top insets) 0)
   :top      (- (:top insets))
   :left     0
   :right    0})
@@ -71,12 +71,12 @@
    :display        (if @transparent? :none :flex)
    :bottom         0
    :padding-bottom (:bottom insets)
-    :padding-top    constants/text-min-height
+    :padding-top    c/text-min-height
    :z-index        3}))

 (defn content-container
  [padding-horizontal]
-  {:padding-vertical   constants/small-list-padding-vertical
+  {:padding-vertical   c/small-list-padding-vertical
   :padding-horizontal padding-horizontal
   :align-items        :center
   :justify-content    :center})
@@ -1,8 +1,8 @@
-(ns status-im.common.lightbox.text-sheet.style
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.style
  (:require
    [quo.foundations.colors :as colors]
    [react-native.reanimated :as reanimated]
-    [status-im.common.lightbox.constants :as constants]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]))

 (defn sheet-container
  [{:keys [height top]}]
@@ -14,10 +14,10 @@
    :right    0}))

 (defn text-style
-  [expandable-text?]
+  [expanding-message?]
  {:color             colors/white
   :margin-horizontal 20
-   :align-items       (when-not expandable-text? :center)
+   :align-items       (when-not expanding-message? :center)
   :flex-grow         1})

 (def bar-container
@@ -1,10 +1,10 @@
-(ns status-im.common.lightbox.text-sheet.utils
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.utils
  (:require
    [oops.core :as oops]
    [react-native.gesture :as gesture]
    [react-native.reanimated :as reanimated]
    [reagent.core :as r]
-    [status-im.common.lightbox.constants :as constants]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]))

 (defn- collapse-sheet
  [{:keys [derived-value overlay-opacity saved-top expanded? overlay-z-index]}]
@@ -16,10 +16,10 @@

 (defn sheet-gesture
  [{:keys [derived-value saved-top overlay-opacity gradient-opacity]}
-   expanded-height max-height full-height overlay-z-index expanded? dragging? expandable-text?]
+   expanded-height max-height full-height overlay-z-index expanded? dragging? expanding-message?]
  (let [disable-gesture-update (r/atom false)]
    (-> (gesture/gesture-pan)
-        (gesture/enabled expandable-text?)
+        (gesture/enabled expanding-message?)
        (gesture/on-start (fn []
                            (reset! overlay-z-index 1)
                            (reset! dragging? true)
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.text-sheet.view
+(ns status-im.contexts.chat.messenger.lightbox.text-sheet.view
  (:require
    [quo.foundations.colors :as colors]
    [react-native.core :as rn]
@@ -8,31 +8,33 @@
    [react-native.reanimated :as reanimated]
    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.text-sheet.style :as style]
-    [status-im.common.lightbox.text-sheet.utils :as utils]))
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.text-sheet.utils :as utils]
+    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]))

 (defn- text-sheet
-  [_]
+  [messages overlay-opacity overlay-z-index text-sheet-lock?]
  (let [text-height (reagent/atom 0)
        expanded?   (reagent/atom false)
        dragging?   (atom false)]
-    (fn [{:keys [overlay-opacity overlay-z-index text-sheet-lock? text-component]}]
-      (let [insets           (safe-area/get-insets)
-            window-height    (:height (rn/get-window))
-            max-height       (- window-height
-                                constants/text-min-height
-                                constants/top-view-height
-                                (:bottom insets)
-                                (when platform/ios? (:top insets)))
-            full-height      (+ constants/bar-container-height
-                                constants/text-margin
-                                constants/line-height
-                                @text-height)
-            expanded-height  (min max-height full-height)
-            animations       (utils/init-animations overlay-opacity)
-            derived          (utils/init-derived-animations animations)
-            expandable-text? (> @text-height (* constants/line-height 2))]
+    (fn []
+      (let [{:keys [chat-id content]} (first messages)
+            insets                    (safe-area/get-insets)
+            window-height             (:height (rn/get-window))
+            max-height                (- window-height
+                                         constants/text-min-height
+                                         constants/top-view-height
+                                         (:bottom insets)
+                                         (when platform/ios? (:top insets)))
+            full-height               (+ constants/bar-container-height
+                                         constants/text-margin
+                                         constants/line-height
+                                         @text-height)
+            expanded-height           (min max-height full-height)
+            animations                (utils/init-animations overlay-opacity)
+            derived                   (utils/init-derived-animations animations)
+            expanding-message?        (> @text-height (* constants/line-height 2))]
        [rn/view
         [reanimated/linear-gradient
          {:colors         [colors/neutral-100-opa-0 colors/neutral-100]
@@ -49,10 +51,10 @@
                                         overlay-z-index
                                         expanded?
                                         dragging?
-                                         expandable-text?)}
+                                         expanding-message?)}
          [gesture/gesture-detector
           {:gesture (-> (gesture/gesture-tap)
-                         (gesture/enabled (and expandable-text? (not @expanded?)))
+                         (gesture/enabled (and expanding-message? (not @expanded?)))
                         (gesture/on-start (fn []
                                             (utils/expand-sheet animations
                                                                 expanded-height
@@ -61,7 +63,7 @@
                                                                 expanded?
                                                                 text-sheet-lock?))))}
           [reanimated/view {:style (style/sheet-container derived)}
-            (when expandable-text?
+            (when expanding-message?
              [rn/view {:style style/bar-container}
               [rn/view {:style style/bar}]])
            [linear-gradient/linear-gradient
@@ -70,17 +72,19 @@
              :end       {:x 0 :y 0}
              :locations [0.7 0.8 1]
              :style     (style/bottom-gradient (:bottom insets))}]
-
            [gesture/scroll-view
             {:scroll-enabled          false
              :scroll-event-throttle   16
              :bounces                 false
              :style                   {:height (- max-height constants/bar-container-height)}
-              :content-container-style {:padding-top (when (not expandable-text?)
+              :content-container-style {:padding-top (when (not expanding-message?)
                                                       constants/bar-container-height)}}
-             [rn/view {:on-layout #(utils/on-layout % text-height)}
-              text-component]]]]]]))))
+             [message-view/render-parsed-text
+              {:content        content
+               :chat-id        chat-id
+               :style-override (style/text-style expanding-message?)
+               :on-layout      #(utils/on-layout % text-height)}]]]]]]))))

 (defn view
-  [props]
-  [:f> text-sheet props])
+  [messages {:keys [overlay-opacity]} {:keys [overlay-z-index]} {:keys [text-sheet-lock?]}]
+  [:f> text-sheet messages overlay-opacity overlay-z-index text-sheet-lock?])
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.top-view
+(ns status-im.contexts.chat.messenger.lightbox.top-view
  (:require
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
@@ -6,9 +6,10 @@
    [react-native.orientation :as orientation]
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
+    [utils.datetime :as datetime]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]
    [utils.url :as url]))
@@ -16,7 +17,7 @@
 (defn animate-rotation
  [result screen-width screen-height insets
   {:keys [rotate top-view-y top-view-x top-view-width top-view-bg]}]
-  (let [top-x (+ (/ constants/top-view-height 2) (:top insets))]
+  (let [top-x (+ (/ c/top-view-height 2) (:top insets))]
    (cond
      (= result orientation/landscape-left)
      (do
@@ -41,9 +42,9 @@
        (anim/animate top-view-bg colors/neutral-100-opa-0)))))

 (defn drawer
-  [images index]
-  (let [{:keys [image]} (nth images index)
-        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
+  [messages index]
+  (let [{:keys [content]} (nth messages index)
+        uri               (url/replace-port (:image content) (rf/sub [:mediaserver/port]))]
    [quo/action-drawer
     [[{:icon                :i/save
        :accessibility-label :save-image
@@ -51,7 +52,7 @@
        :on-press            (fn []
                               (rf/dispatch [:hide-bottom-sheet])
                               (rf/dispatch
-                                [:lightbox/save-image-to-gallery
+                                [:chat.ui/save-image-to-gallery
                                 uri
                                 #(rf/dispatch [:toasts/upsert
                                                {:id              :random-id
@@ -60,19 +61,20 @@
                                                 :text            (i18n/label :t/photo-saved)}])]))}]]]))

 (defn share-image
-  [images index]
-  (let [{:keys [image]} (nth images index)
-        uri             (url/replace-port image (rf/sub [:mediaserver/port]))]
-    (rf/dispatch [:lightbox/share-image uri])))
+  [messages index]
+  (let [{:keys [content]} (nth messages index)
+        uri               (url/replace-port (:image content) (rf/sub [:mediaserver/port]))]
+    (rf/dispatch [:chat.ui/share-image uri])))

 (defn top-view
-  [images insets index animations derived landscape? screen-width]
-  (let [{:keys [description header]} (nth images @index)
-        bg-color                     (if landscape?
-                                       colors/neutral-100-opa-70
-                                       colors/neutral-100-opa-0)
+  [messages insets index animations derived landscape? screen-width]
+  (let [{:keys [from timestamp]}  (first messages)
+        [primary-name _]          (rf/sub [:contacts/contact-two-names-by-identity from])
+        bg-color                  (if landscape?
+                                    colors/neutral-100-opa-70
+                                    colors/neutral-100-opa-0)
        {:keys [background-color opacity
-                overlay-opacity]}    animations]
+                overlay-opacity]} animations]
    [reanimated/view
     {:style
      (style/top-view-container (:top insets) screen-width bg-color landscape? animations derived)}
@@ -90,7 +92,7 @@
                    (anim/animate opacity 0)
                    (anim/animate overlay-opacity 0)
                    (rf/dispatch (if platform/ios?
-                                   [:lightbox/exit-lightbox-signal @index]
+                                   [:chat.ui/exit-lightbox-signal @index]
                                   [:navigate-back])))
        :style    style/close-container}
       [quo/icon :close {:size 20 :color colors/white}]]
@@ -98,22 +100,22 @@
       [quo/text
        {:weight :semi-bold
         :size   :paragraph-1
-         :style  {:color colors/white}} header]
+         :style  {:color colors/white}} primary-name]
       [quo/text
        {:weight :medium
         :size   :paragraph-2
-         :style  {:color colors/neutral-40}} description]]]
+         :style  {:color colors/neutral-40}} (when timestamp (datetime/to-short-str timestamp))]]]
     [rn/view {:style style/top-right-buttons}
      [rn/touchable-opacity
       {:active-opacity      1
        :accessibility-label :share-image
-        :on-press            #(share-image images @index)
+        :on-press            #(share-image messages @index)
        :style               (merge style/close-container {:margin-right 12})}
       [quo/icon :share {:size 20 :color colors/white}]]
      [rn/touchable-opacity
       {:active-opacity      1
        :accessibility-label :image-options
        :on-press            #(rf/dispatch [:show-bottom-sheet
-                                            {:content (fn [] [drawer images @index])}])
+                                            {:content (fn [] [drawer messages @index])}])
        :style               style/close-container}
       [quo/icon :options {:size 20 :color colors/white}]]]]))
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.utils
+(ns status-im.contexts.chat.messenger.lightbox.utils
  (:require
    [clojure.string :as string]
    [oops.core :as oops]
@@ -9,11 +9,11 @@
    [react-native.platform :as platform]
    [react-native.safe-area :as safe-area]
    [reagent.core :as reagent]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.top-view :as top-view]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.top-view :as top-view]
    [utils.re-frame :as rf]
-    [utils.worklets.chat.messenger.lightbox :as worklet]))
+    [utils.worklets.chat.lightbox :as worklet]))

 (defn clear-timers
  [timers]
@@ -46,7 +46,7 @@
                      (if platform/ios? 250 100)))
     (swap! timers assoc :mount-index-lock (js/setTimeout #(reset! scroll-index-lock? false) 300))
     (fn []
-       (rf/dispatch [:lightbox/zoom-out-signal nil])
+       (rf/dispatch [:chat.ui/zoom-out-signal nil])
       (when platform/android?
         (rf/dispatch [:chat.ui/lightbox-scale 1]))
       (clear-timers timers)))))
@@ -69,7 +69,7 @@
        landscape?    (string/includes? result orientation/landscape)
        item-width    (if (and landscape? platform/ios?) screen-height screen-width)]
    (when (or landscape? (= result orientation/portrait))
-      (rf/dispatch [:lightbox/orientation-change result]))
+      (rf/dispatch [:chat.ui/orientation-change result]))
    (cond
      landscape?
      (orientation/lock-to-landscape "lightbox")
@@ -148,11 +148,11 @@
   :timers             (atom {})})

 (defn init-state
-  [images index]
+  [messages index]
  ;; The initial value of data is the image that was pressed (and not the whole album) in order
  ;; for the transition animation to execute properly, otherwise it would animate towards
  ;; outside the screen (even if we have `initialScrollIndex` set).
-  {:data             (reagent/atom (if (number? index) [(nth images index)] []))
+  {:data             (reagent/atom (if (number? index) [(nth messages index)] []))
   :scroll-index     (reagent/atom index)
   :transparent?     (reagent/atom false)
   :set-full-height? (reagent/atom false)
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.view
+(ns status-im.contexts.chat.messenger.lightbox.view
  (:require
    [clojure.string :as string]
    [oops.core :as oops]
@@ -9,13 +9,13 @@
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
    [react-native.safe-area :as safe-area]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.bottom-view :as bottom-view]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.common.lightbox.style :as style]
-    [status-im.common.lightbox.top-view :as top-view]
-    [status-im.common.lightbox.utils :as utils]
-    [status-im.common.lightbox.zoomable-image.view :as zoomable-image]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.bottom-view :as bottom-view]
+    [status-im.contexts.chat.messenger.lightbox.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.top-view :as top-view]
+    [status-im.contexts.chat.messenger.lightbox.utils :as utils]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.view :as zoomable-image]
    [utils.re-frame :as rf]))

 (defn get-item-layout
@@ -33,10 +33,9 @@
      (reset! scroll-index index)
      (when @small-list-ref
        (.scrollToIndex ^js @small-list-ref #js {:animated true :index index}))
-      (rf/dispatch [:lightbox/update-animation-shared-element-id
-                    (:id (oops/oget changed :item))]))))
+      (rf/dispatch [:chat.ui/update-shared-element-id (:message-id (oops/oget changed :item))]))))

-(defn image-view
+(defn image
  [message index _ {:keys [screen-width screen-height] :as args}]
  [rn/view
   {:style (style/image (+ screen-width constants/separator-width) screen-height)}
@@ -44,31 +43,30 @@
   [rn/view {:style {:width constants/separator-width}}]])

 (defn lightbox-content
-  [{:keys [props state animations derived images index handle-items-changed bottom-text-component]}]
-  (let [{:keys [data transparent? scroll-index
-                set-full-height?]} state
-        insets                     (safe-area/get-insets)
-        window                     (rn/get-window)
-        window-width               (:width window)
-        window-height              (if platform/android?
-                                     (+ (:height window) (:top insets))
-                                     (:height window))
-        curr-orientation           (or (rf/sub [:lightbox/orientation]) orientation/portrait)
-        landscape?                 (string/includes? curr-orientation orientation/landscape)
-        horizontal?                (or platform/android? (not landscape?))
-        inverted?                  (and platform/ios? (= curr-orientation orientation/landscape-right))
-        screen-width               (if (or platform/ios? (= curr-orientation orientation/portrait))
-                                     window-width
-                                     window-height)
-        screen-height              (if (or platform/ios? (= curr-orientation orientation/portrait))
-                                     window-height
-                                     window-width)
-        item-width                 (if (and landscape? platform/ios?) screen-height screen-width)]
+  [props {:keys [data transparent? scroll-index set-full-height?] :as state}
+   animations derived messages index handle-items-changed]
+  (let [insets           (safe-area/get-insets)
+        window           (rn/get-window)
+        window-width     (:width window)
+        window-height    (if platform/android?
+                           (+ (:height window) (:top insets))
+                           (:height window))
+        curr-orientation (or (rf/sub [:lightbox/orientation]) orientation/portrait)
+        landscape?       (string/includes? curr-orientation orientation/landscape)
+        horizontal?      (or platform/android? (not landscape?))
+        inverted?        (and platform/ios? (= curr-orientation orientation/landscape-right))
+        screen-width     (if (or platform/ios? (= curr-orientation orientation/portrait))
+                           window-width
+                           window-height)
+        screen-height    (if (or platform/ios? (= curr-orientation orientation/portrait))
+                           window-height
+                           window-width)
+        item-width       (if (and landscape? platform/ios?) screen-height screen-width)]
    [reanimated/view
     {:style (reanimated/apply-animations-to-style {:background-color (:background-color animations)}
                                                   {:height screen-height})}
     (when-not @transparent?
-       [:f> top-view/top-view images insets scroll-index animations derived landscape?
+       [:f> top-view/top-view messages insets scroll-index animations derived landscape?
        screen-width])
     [gesture/gesture-detector
      {:gesture (utils/drag-gesture animations (and landscape? platform/ios?) set-full-height?)}
@@ -94,7 +92,7 @@
         :scroll-event-throttle             8
         :style                             {:width (+ screen-width constants/separator-width)}
         :data                              @data
-         :render-fn                         image-view
+         :render-fn                         image
         :render-data                       {:opacity-value     (:opacity animations)
                                             :overlay-opacity   (:overlay-opacity animations)
                                             :border-value      (:border animations)
@@ -120,47 +118,26 @@
     ;; NOTE: not un-mounting bottom-view based on `transparent?` (like we do with the top-view
     ;;       above), since we need to save the state of the text-sheet position. Instead, we use
     ;;       the `:display` style property to hide the bottom-sheet.
-     (when (and (not landscape?) (or bottom-text-component (> (count images) 1)))
-       [:f> bottom-view/bottom-view
-        {:images                images
-         :index                 index
-         :scroll-index          scroll-index
-         :insets                insets
-         :animations            animations
-         :derived               derived
-         :item-width            item-width
-         :props                 props
-         :state                 state
-         :transparent?          transparent?
-         :bottom-text-component bottom-text-component}])]))
+     (when (not landscape?)
+       [:f> bottom-view/bottom-view messages index scroll-index insets animations derived
+        item-width props state transparent?])]))

 (defn- f-lightbox
  []
-  (let [{:keys [images index bottom-text-component]} (rf/sub [:get-screen-params])
-        props
-        (utils/init-props)
-        state
-        (utils/init-state images index)
-        handle-items-changed
-        (fn [e]
-          (on-viewable-items-changed e props state))]
+  (let [{:keys [messages index]} (rf/sub [:get-screen-params])
+        props                    (utils/init-props)
+        state                    (utils/init-state messages index)
+        handle-items-changed     (fn [e]
+                                   (on-viewable-items-changed e props state))]
    (fn []
-      (let [animations (utils/init-animations (count images) index)
+      (let [animations (utils/init-animations (count messages) index)
            derived    (utils/init-derived-animations animations)]
        (anim/animate (:background-color animations) colors/neutral-100)
-        (reset! (:data state) images)
+        (reset! (:data state) messages)
        (when platform/ios? ; issue: https://github.com/wix/react-native-navigation/issues/7726
          (utils/orientation-change props state animations))
        (utils/effect props animations index)
-        [:f> lightbox-content
-         {:props                 props
-          :state                 state
-          :animations            animations
-          :derived               derived
-          :images                images
-          :index                 index
-          :handle-items-changed  handle-items-changed
-          :bottom-text-component bottom-text-component}]))))
+        [:f> lightbox-content props state animations derived messages index handle-items-changed]))))

 (defn lightbox
  []
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.zoomable-image.constants)
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.constants)

 (def ^:const min-scale 1)

@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.zoomable-image.style
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.style
  (:require
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]))
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.zoomable-image.utils
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.utils
  (:require
    [clojure.string :as string]
    [react-native.core :as rn]
@@ -6,8 +6,8 @@
    [react-native.orientation :as orientation]
    [react-native.platform :as platform]
    [reagent.core :as reagent]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.zoomable-image.constants :as constants]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.constants :as constants]
    [utils.re-frame :as rf]))

 ;;; Helpers
@@ -97,7 +97,7 @@
        (rescale constants/min-scale true)
        (js/setTimeout #(rf/dispatch [:navigate-back]) 70))
      (rf/dispatch [:navigate-back]))
-    (js/setTimeout #(rf/dispatch [:lightbox/exit-lightbox-signal nil]) 500)))
+    (js/setTimeout #(rf/dispatch [:chat.ui/exit-lightbox-signal nil]) 500)))

 (defn handle-zoom-out-signal
  "Zooms out when pressing on another photo from the small bottom list"
@@ -1,4 +1,4 @@
-(ns status-im.common.lightbox.zoomable-image.view
+(ns status-im.contexts.chat.messenger.lightbox.zoomable-image.view
  (:require
    [oops.core :refer [oget]]
    [react-native.core :as rn]
@@ -7,10 +7,10 @@
    [react-native.platform :as platform]
    [react-native.reanimated :as reanimated]
    [reagent.core :as r]
-    [status-im.common.lightbox.animations :as anim]
-    [status-im.common.lightbox.zoomable-image.constants :as c]
-    [status-im.common.lightbox.zoomable-image.style :as style]
-    [status-im.common.lightbox.zoomable-image.utils :as utils]
+    [status-im.contexts.chat.messenger.lightbox.animations :as anim]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.constants :as c]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.style :as style]
+    [status-im.contexts.chat.messenger.lightbox.zoomable-image.utils :as utils]
    [utils.re-frame :as rf]
    [utils.url :as url]))

@@ -206,7 +206,7 @@
             (anim/animate-decay pan-y-start velocity [lower-bound upper-bound]))))))))

 (defn- f-zoomable-image
-  [dimensions animations state rescale curr-orientation image focused? index render-data
+  [dimensions animations state rescale curr-orientation content focused? index render-data
   image-dimensions-nil?]
  (let [{:keys [transparent? set-full-height?]} render-data
        portrait? (= curr-orientation orientation/portrait)
@@ -229,7 +229,7 @@
                               (= curr-orientation orientation/portrait))}
      [reanimated/fast-image
       (merge
-        {:source    {:uri (url/replace-port image (rf/sub [:mediaserver/port]))}
+        {:source    {:uri (url/replace-port (:image content) (rf/sub [:mediaserver/port]))}
         :native-ID (when focused? :shared-element)
         :style     (style/image dimensions animations render-data index)}
        (when image-dimensions-nil?
@@ -238,12 +238,12 @@
 (defn zoomable-image
  []
  (let [state (utils/init-state)]
-    (fn [{:keys [image-width image-height image id]} index render-data]
-      (let [animation-shared-element-id                 (rf/sub [:animation-shared-element-id])
+    (fn [{:keys [image-width image-height content message-id]} index render-data]
+      (let [shared-element-id                           (rf/sub [:shared-element-id])
            exit-lightbox-signal                        (rf/sub [:lightbox/exit-signal])
            zoom-out-signal                             (rf/sub [:lightbox/zoom-out-signal])
            {:keys [set-full-height? curr-orientation]} render-data
-            focused?                                    (= animation-shared-element-id id)
+            focused?                                    (= shared-element-id message-id)
            ;; TODO - remove `image-dimensions` check, once
            ;; https://github.com/status-im/status-desktop/issues/10944 is fixed
            image-dimensions-nil?                       (not (and image-width image-height))
@@ -269,5 +269,5 @@
                                             rescale
                                             set-full-height?))
        (utils/handle-zoom-out-signal zoom-out-signal index (anim/get-val (:scale animations)) rescale)
-        [:f> f-zoomable-image dimensions animations state rescale curr-orientation image focused?
+        [:f> f-zoomable-image dimensions animations state rescale curr-orientation content focused?
         index render-data image-dimensions-nil?]))))
@@ -7,8 +7,6 @@
    [status-im.constants :as constants]
    [status-im.contexts.chat.messenger.messages.content.album.style :as style]
    [status-im.contexts.chat.messenger.messages.content.image.view :as image]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.utils :as lightbox-utils]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.view :as lightbox]
    [status-im.contexts.chat.messenger.messages.content.text.view :as text]
    [utils.re-frame :as rf]
    [utils.url :as url]))
@@ -23,19 +21,17 @@

 (defn album-message
  [{:keys [albumize?] :as message} context on-long-press message-container-data]
-  (let [animation-shared-element-id (rf/sub [:animation-shared-element-id])
-        media-server-port           (rf/sub [:mediaserver/port])
-        album-messages              (:album message)
-        first-image                 (first album-messages)
-        album-style                 (if (> (:image-width first-image) (:image-height first-image))
-                                      :landscape
-                                      :portrait)
-        images-count                (count album-messages)
+  (let [shared-element-id (rf/sub [:shared-element-id])
+        media-server-port (rf/sub [:mediaserver/port])
+        first-image       (first (:album message))
+        album-style       (if (> (:image-width first-image) (:image-height first-image))
+                            :landscape
+                            :portrait)
+        images-count      (count (:album message))
        ;; album images are always square, except when we have 3 images, then they must be
        ;; rectangular
        ;; (portrait or landscape)
-        portrait?                   (and (= images-count rectangular-style-count)
-                                         (= album-style :portrait))]
+        portrait?         (and (= images-count rectangular-style-count) (= album-style :portrait))]
    (if (and albumize? (> images-count 1))
      [:<>
       [rn/view {:style {:margin-bottom 4}} [text/text-content first-image]]
@@ -56,21 +52,14 @@
              {:key            (:message-id item)
               :active-opacity 1
               :on-long-press  #(on-long-press message context)
-               :on-press       #(rf/dispatch
-                                 [:lightbox/navigate-to-lightbox
-                                  (:message-id item)
-                                  {:index index
-                                   :images (into []
-                                                 (map
-                                                  lightbox-utils/convert-message-to-lightbox-image
-                                                  album-messages))
-                                   :bottom-text-component
-                                   [lightbox/bottom-text-for-lightbox
-                                    first-image]}])}
+               :on-press       #(rf/dispatch [:chat.ui/navigate-to-lightbox
+                                              (:message-id item)
+                                              {:messages (:album message)
+                                               :index    index}])}
              [fast-image/fast-image
               {:style     (style/image dimensions index portrait? images-count)
                :source    {:uri (url/replace-port (:image (:content item)) media-server-port)}
-                :native-ID (when (and (= animation-shared-element-id (:message-id item))
+                :native-ID (when (and (= shared-element-id (:message-id item))
                                      (< index constants/max-album-photos))
                             :shared-element)}]
              (when (and (> images-count constants/max-album-photos)
@@ -82,11 +71,11 @@
                   :size   :heading-2
                   :style  {:color colors/white}}
                  (str "+" (- images-count (dec constants/max-album-photos)))]])]))
-         album-messages)]]
+         (:album message))]]
      [:<>
       (map-indexed
        (fn [index item]
          [:<> {:key (:message-id item)}
           [image/image-message index item {:on-long-press #(on-long-press message context)}
            message-container-data]])
-        album-messages)])))
+        (:album message))])))
@@ -4,8 +4,6 @@
    [react-native.fast-image :as fast-image]
    [react-native.safe-area :as safe-area]
    [status-im.constants :as constants]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.utils :as lightbox-utils]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.view :as lightbox]
    [status-im.contexts.chat.messenger.messages.content.text.view :as text]
    [utils.re-frame :as rf]
    [utils.url :as url]))
@@ -41,7 +39,7 @@
                                                            image-height
                                                            max-container-width
                                                            max-container-height)
-        animation-shared-element-id   (rf/sub [:animation-shared-element-id])
+        shared-element-id             (rf/sub [:shared-element-id])
        image-local-url               (url/replace-port (:image content) (rf/sub [:mediaserver/port]))]
    [:<>
     (when (= index 0)
@@ -50,16 +48,13 @@
      {:active-opacity 1
       :style          {:margin-top 4}
       :on-long-press  on-long-press
-       :on-press       #(rf/dispatch [:lightbox/navigate-to-lightbox
+       :on-press       #(rf/dispatch [:chat.ui/navigate-to-lightbox
                                      message-id
-                                      {:images [(lightbox-utils/convert-message-to-lightbox-image
-                                                 message)]
-                                       :index 0
-                                       :insets insets
-                                       :bottom-text-component
-                                       [lightbox/bottom-text-for-lightbox message]}])}
+                                      {:messages [message]
+                                       :index    0
+                                       :insets   insets}])}
      [fast-image/fast-image
       {:source              {:uri image-local-url}
        :style               (merge dimensions {:border-radius 12})
-        :native-ID           (when (= animation-shared-element-id message-id) :shared-element)
+        :native-ID           (when (= shared-element-id message-id) :shared-element)
        :accessibility-label :image-message}]]]))
@@ -1,10 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.lightbox.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn bottom-text
-  [expandable-text?]
-  {:color             colors/white
-   :margin-horizontal 20
-   :align-items       (when-not expandable-text? :center)
-   :flex-grow         1})
@@ -1,14 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.lightbox.utils
-  (:require
-    [utils.datetime :as datetime]
-    [utils.re-frame :as rf]))
-
-(defn convert-message-to-lightbox-image
-  [{:keys [timestamp image-width image-height message-id from content]}]
-  (let [[primary-name _] (rf/sub [:contacts/contact-two-names-by-identity from])]
-    {:image        (:image content)
-     :image-width  image-width
-     :image-height image-height
-     :id           message-id
-     :header       primary-name
-     :description  (when timestamp (datetime/to-short-str timestamp))}))
@@ -1,18 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.lightbox.view
-  (:require
-    [oops.core :as oops]
-    [reagent.core :as reagent]
-    [status-im.common.lightbox.constants :as constants]
-    [status-im.contexts.chat.messenger.messages.content.lightbox.style :as style]
-    [status-im.contexts.chat.messenger.messages.content.text.view :as message-view]))
-
-(defn bottom-text-for-lightbox
-  [_]
-  (let [text-height (reagent/atom 0)]
-    (fn [{:keys [content chat-id] :as _message}]
-      (let [expandable-text? (> @text-height (* constants/line-height 2))]
-        [message-view/render-parsed-text
-         {:content        content
-          :chat-id        chat-id
-          :style-override (style/bottom-text expandable-text?)
-          :on-layout      #(reset! text-height (oops/oget % "nativeEvent.layout.height"))}]))))
@@ -52,7 +52,7 @@
         (get constants/reactions (:emoji-id reaction))))

 (defn- view-internal
-  [{:keys [message-id chat-id pinned-by preview? theme]} user-message-content]
+  [{:keys [message-id chat-id pinned-by theme]} user-message-content]
  (let [reactions (rf/sub [:chats/message-reactions message-id chat-id])]
    [:<>
     (when (seq reactions)
@@ -60,7 +60,7 @@
        {:container-style {:margin-left 44
                           :margin-top  8}
         :reactions       (map add-emoji-key reactions)
-         :add-reaction?   (not preview?)
+         :add-reaction?   true
         :use-case        (when pinned-by :pinned)
         :on-press        #(on-press (assoc % :message-id message-id))
         :on-long-press   #(on-long-press (assoc %
@@ -2,8 +2,6 @@
  (:require
    [quo.foundations.colors :as colors]))

-(def ^:private message-padding-scaling-ratio 4.5)
-
 (defn message-container
  ([]
   (message-container false nil nil false))
@@ -18,16 +16,10 @@
     (assoc :margin-top 4))))

 (defn user-message-content
-  [{:keys [outgoing outgoing-status six-reactions? window-scale small-screen?]}]
+  [{:keys [outgoing outgoing-status]}]
  {:border-radius      16
   :padding-horizontal 8
-   :padding-top        4
-   :padding-bottom     (if (or small-screen?
-                               (and
-                                (> 3 window-scale)
-                                six-reactions?))
-                         (* message-padding-scaling-ratio window-scale)
-                         4)
+   :padding-vertical   4
   :opacity            (if (and outgoing (= outgoing-status :sending))
                         0.5
                         1)})
@@ -119,38 +119,31 @@
  []
  (let [show-delivery-state? (reagent/atom false)]
    (fn [{:keys [message-data context keyboard-shown? show-reactions? in-reaction-and-action-menu?
-                 show-user-info? preview? theme]}]
+                 show-user-info? theme]}]
      (let [{:keys [content-type quoted-message content
-                    outgoing outgoing-status pinned-by
-                    message-id chat-id]} message-data
-            first-image                  (first (:album message-data))
-            outgoing-status              (if (= content-type
-                                                constants/content-type-album)
-                                           (:outgoing-status first-image)
-                                           outgoing-status)
-            outgoing                     (if (= content-type
-                                                constants/content-type-album)
-                                           (:outgoing first-image)
-                                           outgoing)
-            context                      (assoc context
-                                                :on-long-press
-                                                #(on-long-press message-data
-                                                                context
-                                                                keyboard-shown?))
-            response-to                  (:response-to content)
-            height                       (rf/sub [:dimensions/window-height])
-            {window-width :width
-             window-scale :scale}        (rn/get-window)
-            message-container-data       {:window-width           window-width
-                                          :padding-right          20
-                                          :padding-left           20
-                                          :avatar-container-width 32
-                                          :message-margin-left    8}
-            reactions                    (rf/sub [:chats/message-reactions message-id
-                                                  chat-id])
-            six-reactions?               (-> reactions
-                                             count
-                                             (= 6))]
+                    outgoing outgoing-status pinned-by]} message-data
+            first-image                                  (first (:album message-data))
+            outgoing-status                              (if (= content-type
+                                                                constants/content-type-album)
+                                                           (:outgoing-status first-image)
+                                                           outgoing-status)
+            outgoing                                     (if (= content-type
+                                                                constants/content-type-album)
+                                                           (:outgoing first-image)
+                                                           outgoing)
+            context                                      (assoc context
+                                                                :on-long-press
+                                                                #(on-long-press message-data
+                                                                                context
+                                                                                keyboard-shown?))
+            response-to                                  (:response-to content)
+            height                                       (rf/sub [:dimensions/window-height])
+            {window-width :width}                        (rn/get-window)
+            message-container-data                       {:window-width           window-width
+                                                          :padding-right          20
+                                                          :padding-left           20
+                                                          :avatar-container-width 32
+                                                          :message-margin-left    8}]
        [rn/touchable-highlight
         {:accessibility-label (if (and outgoing (= outgoing-status :sending))
                                 :message-sending
@@ -159,10 +152,7 @@
          :style               (style/user-message-content
                                {:first-in-group? (:first-in-group? message-data)
                                 :outgoing        outgoing
-                                 :outgoing-status outgoing-status
-                                 :small-screen?   rn/small-screen?
-                                 :window-scale    window-scale
-                                 :six-reactions?  six-reactions?})
+                                 :outgoing-status outgoing-status})
          :on-press            (fn []
                                 (if (and platform/ios? keyboard-shown?)
                                   (do
@@ -222,7 +212,7 @@
             (when @show-delivery-state?
               [status/status outgoing-status])])]
          (when show-reactions?
-            [reactions/message-reactions-row (assoc message-data :preview? preview?)
+            [reactions/message-reactions-row message-data
             [rn/view {:pointer-events :none}
              [user-message-content-internal
               {:theme           theme
@@ -236,24 +226,20 @@
 (defn on-long-press
  [{:keys [deleted? deleted-for-me?] :as message-data} context keyboard-shown?]
  (rf/dispatch [:dismiss-keyboard])
-  (rf/dispatch
-   [:show-bottom-sheet
-    {:content (drawers/reactions-and-actions message-data context)
-     :border-radius 16
-     :selected-item
-     (if (or deleted? deleted-for-me?)
-       (fn [] [content.deleted/deleted-message message-data])
-       (fn []
-         [rn/view
-          {:pointer-events :none
-           :padding-top    4}
-          [user-message-content
-           {:message-data    message-data
-            :context         context
-            :keyboard-shown? keyboard-shown?
-            :show-reactions? true
-            :show-user-info? true
-            :preview?        true}]]))}]))
+  (rf/dispatch [:show-bottom-sheet
+                {:content (drawers/reactions-and-actions message-data context)
+                 :border-radius 16
+                 :selected-item
+                 (if (or deleted? deleted-for-me?)
+                   (fn [] [content.deleted/deleted-message message-data])
+                   (fn []
+                     [rn/view {:pointer-events :none}
+                      [user-message-content
+                       {:message-data    message-data
+                        :context         context
+                        :keyboard-shown? keyboard-shown?
+                        :show-reactions? true
+                        :show-user-info? true}]]))}]))

 (defn system-message?
  [content-type]
--- a/Show More
+++ b/Show More