velocity gesture test

fix shadow
qa review
2023-05-09 14:47:03 +04:00 · 2023-05-09 13:11:37 +04:00 · 2023-05-09 12:37:58 +04:00 · 2023-05-09 12:37:58 +04:00 · 2023-05-09 12:37:58 +04:00 · 2023-05-09 12:37:58 +04:00
252 changed files with 3675 additions and 6493 deletions
@@ -12,11 +12,11 @@ status-im.chat.models.message-content/actions
 status-im.chat.models.message-content/blank-string
 status-im.chat.models.message-content/sorted-ranges
 status-im.ethereum.mnemonic/words->passphrase
-status-im.native-module.core/listener
-status-im.native-module.core/multiaccount-reset
-status-im.native-module.core/extract-group-membership-signatures
-status-im.native-module.core/sign-group-membership
-status-im.native-module.core/update-mailservers
+native-module.core/listener
+native-module.core/multiaccount-reset
+native-module.core/extract-group-membership-signatures
+native-module.core/sign-group-membership
+native-module.core/update-mailservers
 status-im.ethereum.abi-spec/bytes-to-hex
 status-im.android.core/init
 status-im.chat.models.message/transport-keys
@@ -72,7 +72,7 @@ public class MainApplication extends NavigationApplication {
        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());

        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
-        initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+        //initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    }
    /**
     * Loads Flipper in React Native templates. Call this in the onCreate method with something like
@@ -1859,21 +1859,6 @@
    }
  },

-  {
-    "path": "com/android/databinding/baseLibrary/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "baseLibrary-3.1.4.pom": {
-        "sha1": "b48baeaef73d7763fa92b847c4140f0e0ff71d99",
-        "sha256": "16c6wpphs4b8373w7jdiynv48lgl8sj8sy5gp16cf3qgqgmai4qv"
-      },
-      "baseLibrary-3.1.4.jar": {
-        "sha1": "df1e7638ba852152abe964e86f60fa4ce12e6a6a",
-        "sha256": "0cn50bas33hndr7snlgwpj4vgr66dazkg7ybb04hgc0czdgl9adb"
-      }
-    }
-  },
-
  {
    "path": "com/android/databinding/baseLibrary/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -1964,21 +1949,6 @@
    }
  },

-  {
-    "path": "com/android/databinding/compilerCommon/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "compilerCommon-3.1.4.pom": {
-        "sha1": "0fd23d31fe5e40ac6d203734dcc6b16328ba714c",
-        "sha256": "0sb36alvbmxv05amnc02csm73cg6aib8s16fipjlgqri58cn5yd9"
-      },
-      "compilerCommon-3.1.4.jar": {
-        "sha1": "11005423fee93309c0cd512a8783647702c20c27",
-        "sha256": "0kxd2js2yk7bisiiy1j5i5zgd9h124qac10dan68y8swiddd4hlb"
-      }
-    }
-  },
-
  {
    "path": "com/android/signflinger/4.1.0",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2384,21 +2354,6 @@
    }
  },

-  {
-    "path": "com/android/tools/analytics-library/protos/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "protos-26.1.4.pom": {
-        "sha1": "0c9e7fe6c7c2b0156a87aa626f5463af34669f99",
-        "sha256": "11wnpnlb0ixck525g1qi6lgrjcsca9281kpmwkm3m3r8y1fnl86c"
-      },
-      "protos-26.1.4.jar": {
-        "sha1": "dc5876bb894d87d2088b0a4447b13fdc13ad82fc",
-        "sha256": "1dy9pd8sjkhhip8xqz681i9q66m43iigmnwhdkmk6xm33j0d6cf7"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/analytics-library/protos/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2489,21 +2444,6 @@
    }
  },

-  {
-    "path": "com/android/tools/analytics-library/shared/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "shared-26.1.4.pom": {
-        "sha1": "18ef89a0e8844559433bf6c085b4b86faecb87b6",
-        "sha256": "1m4g32q62mjwmg0z23fvzf40gaf4dgm0jb5cbcv4j36jpgp0yrmm"
-      },
-      "shared-26.1.4.jar": {
-        "sha1": "02a285c67f4b421145e47849d4114f7534707156",
-        "sha256": "08h7w0fwky1mr5j7v4yb4afa3kvvw56bnj4926m4zi62p1qfdxsn"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/analytics-library/shared/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2594,21 +2534,6 @@
    }
  },

-  {
-    "path": "com/android/tools/analytics-library/tracker/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "tracker-26.1.4.pom": {
-        "sha1": "0949ee22e49c32374aa3227b76efdf6b69a85cb0",
-        "sha256": "0077291y8qj555nwqg1ssykdg7cjqgf8866hz9y7rw6sj95h9flw"
-      },
-      "tracker-26.1.4.jar": {
-        "sha1": "fd48066d6c78b78abf5baa335dc2124060e8371c",
-        "sha256": "1yggkx8f5a3w3z924rmc01y06vn4ppz5541s88y6qkd0xbxbdmb6"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/analytics-library/tracker/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2699,21 +2624,6 @@
    }
  },

-  {
-    "path": "com/android/tools/annotations/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "annotations-26.1.4.pom": {
-        "sha1": "d5e8ea57c56cd1f5b6e1e676ab0d489d88b59826",
-        "sha256": "1i6qhh6b5nppvbc465hzjd29ip8j698cs1873yv42dhakc325cyz"
-      },
-      "annotations-26.1.4.jar": {
-        "sha1": "817d5238d9ea07b4b26d04e29e9bada2aacb7245",
-        "sha256": "102r2z2wh3pmaar7f0d3nxksk265m5plbd8cjjvbgll9jkw972k0"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/annotations/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2774,21 +2684,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/aapt2-proto/0.1.0",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "aapt2-proto-0.1.0.pom": {
-        "sha1": "d3492c6cfb99d5d556cf4840c2efd63493ce2ac1",
-        "sha256": "1h9vlambl1k51nx86qm0yfyavpf9qfrh7gja1q3qsqj10jinb8kc"
-      },
-      "aapt2-proto-0.1.0.jar": {
-        "sha1": "d1eb93a21a8d3590c3bfac574a8b6dffb2dbd21c",
-        "sha256": "1x69zbk977hyc97hpc3bxmh19yiiq3hkl3hadjmwps08z4g13990"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/aapt2-proto/0.3.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2894,21 +2789,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/apksig/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "apksig-3.1.4.pom": {
-        "sha1": "a0d953c40691088ad3336fca80b5e2cd3fbd05ec",
-        "sha256": "1jfg6giv1mkg7j72g3w7h5gjvbmpalb03ra7lbdwk350lz76jq23"
-      },
-      "apksig-3.1.4.jar": {
-        "sha1": "e0c4d0059e68e9f64606dfa01e066f86dd07c6cb",
-        "sha256": "0xa5hzkmfymz5pqnrgw7bx9h13rbfnwy3h7nmmnqcrbrlqvc7bar"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/apksig/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3059,21 +2939,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/builder-model/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "builder-model-3.1.4.pom": {
-        "sha1": "2cd8e9360a4114089d33a0ef98927f14d36c8562",
-        "sha256": "0in1yb8n7m28ppj91k5hxclq60qc9141lwm4hyllqsjl2qdns5ys"
-      },
-      "builder-model-3.1.4.jar": {
-        "sha1": "f026c31b8228a84b62bb2fe0ac0544143e9ab27d",
-        "sha256": "0gqa2immwkl4kvg4c233ndxp2bg33ypdbmp6jah5ab0c5azqr3bf"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/builder-model/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3164,21 +3029,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/builder-test-api/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "builder-test-api-3.1.4.pom": {
-        "sha1": "e9843c965bd3ec945ad5e94feebbfe1d47aa5a3b",
-        "sha256": "0adip5p8lvbhcqxhqrpahws9ia9f9q12dkzchf5kj44vgl0r7mbf"
-      },
-      "builder-test-api-3.1.4.jar": {
-        "sha1": "e48338f64f1c8fbef8329eb6d899fb6378fca604",
-        "sha256": "1qjgvj3jmwa7gxc910vfa56rijzin33zymqpb4ikfpsvhk7g2kqz"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/builder-test-api/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3269,21 +3119,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/builder/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "builder-3.1.4.pom": {
-        "sha1": "d33573f1d53514989682eaf85d2c2b98f37aeae2",
-        "sha256": "064y4z05s3r7x74rlb26c8m7aq5pharw5l1yk1ca76h9k0lafslp"
-      },
-      "builder-3.1.4.jar": {
-        "sha1": "afbcd4b7002c61fe898b1b4c50ed9e62386125d8",
-        "sha256": "02wmahn5ibgnxqrk7nqzwdgc4j80iml01g17lmlghdhdmks3y9zy"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/builder/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3344,21 +3179,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/bundletool/0.1.0-alpha01",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "bundletool-0.1.0-alpha01.pom": {
-        "sha1": "834b735a36a399e2bb0276842ce97c55f6d6c072",
-        "sha256": "1271sgv8jxdgsf60chx8yjc0jsfs38xd2jhdmdv8d8h4iwrpcrvc"
-      },
-      "bundletool-0.1.0-alpha01.jar": {
-        "sha1": "f7c303e37818223bd98566fcbea29aa0964c4d06",
-        "sha256": "05bgc6sh1cz4l8mbw6jyx78pq275szq011z5cgpjdkdbpzq5dnrv"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/bundletool/0.5.0",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3449,21 +3269,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/gradle-api/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "gradle-api-3.1.4.pom": {
-        "sha1": "e18ab0b7eee6fc63e65158b4f88bf5c7ce207524",
-        "sha256": "0rjnchkvy8j8k3f12l060p4yg9c784l8j7ngdbphy6jwipvxfz2j"
-      },
-      "gradle-api-3.1.4.jar": {
-        "sha1": "eb41dfb5596afd8933c804595ca8596952fad450",
-        "sha256": "0qqsqjrgnamvzll97ylzw34f75hcp3cmh65dzksqhxgwcfcp9sni"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/gradle-api/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3554,21 +3359,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/gradle-core/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "gradle-core-3.1.4.pom": {
-        "sha1": "38efeb43831cda5d758c52cd62817c3c53ac4722",
-        "sha256": "1kiij87ybp97q5m3w81pr9gy94fpf5jm59jp67ia9h7cz9dj0kv1"
-      },
-      "gradle-core-3.1.4.jar": {
-        "sha1": "4c846d065331c2a11ed605619613833a842a7b8d",
-        "sha256": "1nhx6sjfxfqq63yr59i5j09yvkm383fim93fcfkp6s711ma54pma"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/gradle/3.0.0",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3599,21 +3389,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/gradle/3.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "gradle-3.1.4.pom": {
-        "sha1": "920f69e56d872f11136254d329ccc6825ced29a1",
-        "sha256": "1cs4sqfpwg0fhdhyqdpzq70gkyq9cy9xm11bmvpanfls2wcwyqi5"
-      },
-      "gradle-3.1.4.jar": {
-        "sha1": "08f9a726f69c0c8fa3f447566717a21e6b394ed9",
-        "sha256": "1dxp32ncbrvi8qd9pij9r0mzcn3l6qm7jr0rk86nq5xi0k06ak0g"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/gradle/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3824,21 +3599,6 @@
    }
  },

-  {
-    "path": "com/android/tools/build/manifest-merger/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "manifest-merger-26.1.4.pom": {
-        "sha1": "8b025ca5a54d8e27600470f841f87a77d0a93f56",
-        "sha256": "0xxjj1frb9fqyv6d6kmfhxsy7xqjas8nkv7y0hpk1726q0kqi81v"
-      },
-      "manifest-merger-26.1.4.jar": {
-        "sha1": "ddb4dcb3bb44c7053fa583967dfa9030f43f1c01",
-        "sha256": "1cccgadv0varzj48cpwbk3c0y7hpkl5nxa7v7sds9xd2smkv8q9x"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/build/manifest-merger/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3929,21 +3689,6 @@
    }
  },

-  {
-    "path": "com/android/tools/common/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "common-26.1.4.pom": {
-        "sha1": "0ba42432d38a56a205e7a5f39a67701277c6d818",
-        "sha256": "0xdgznbm17brc3x99p9y4jc082ql0svvxcm36yzlr840iywcl5iy"
-      },
-      "common-26.1.4.jar": {
-        "sha1": "b70b6ef7188fe5a6ad6186f0efb22e536e483b9b",
-        "sha256": "0irdsr5kppk7mw0wjnfpj8h5lixh2p7v4v1ly8z0np95wd6mfnrx"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/common/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4034,21 +3779,6 @@
    }
  },

-  {
-    "path": "com/android/tools/ddms/ddmlib/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "ddmlib-26.1.4.pom": {
-        "sha1": "e18f8f2897b429a9246e9a622608a8b347f73b94",
-        "sha256": "0bq9rr7zwfssz1m6f9qs39s88chqy3siq3hgbfp7f7jc4hgfi1mr"
-      },
-      "ddmlib-26.1.4.jar": {
-        "sha1": "c11fa14b583412aaa9262461299318207439156d",
-        "sha256": "0zzzhjjsrry77yksjdvv5k3a1nhccpnwh9k6vfv51i8mh9mi58x3"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/ddms/ddmlib/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4139,21 +3869,6 @@
    }
  },

-  {
-    "path": "com/android/tools/dvlib/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "dvlib-26.1.4.pom": {
-        "sha1": "49d0672a46075d55b83d2e59e8a7c4af90c4e9f0",
-        "sha256": "1xxdi7fb5ixv850zfjd340ww8gx8vkmlx9jm18ib9w5gj77w4w2s"
-      },
-      "dvlib-26.1.4.jar": {
-        "sha1": "5d443b51ad041e9599cfdb278cd2f6c9d2ccdf28",
-        "sha256": "1kh85j1spdpbd5bwcf2155hjyv7psn3b9qxry7lw0i4cldi862n5"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/dvlib/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4349,21 +4064,6 @@
    }
  },

-  {
-    "path": "com/android/tools/layoutlib/layoutlib-api/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "layoutlib-api-26.1.4.pom": {
-        "sha1": "de645341e6b3b77554bd2510f13fd04513d66324",
-        "sha256": "09229jd3448xaci0xh740v902w1g8xgzrkq1py6949jidzfm814n"
-      },
-      "layoutlib-api-26.1.4.jar": {
-        "sha1": "dad1158a9fc38b711339960b82fd9dcf32009e46",
-        "sha256": "1a5zqp4y43jlqbdnqjw7sis2f4sqa3iixkcj31fq9s72gknwj4fr"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/layoutlib/layoutlib-api/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4514,21 +4214,6 @@
    }
  },

-  {
-    "path": "com/android/tools/lint/lint-gradle-api/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "lint-gradle-api-26.1.4.pom": {
-        "sha1": "8bc04a18da7f891ab4c13a010d422a14f99d8d6d",
-        "sha256": "0b8z7fsfpba2bhx2m0jaca297jgyasy5zhfsx61s40dcp80j89ff"
-      },
-      "lint-gradle-api-26.1.4.jar": {
-        "sha1": "cbc00782604b7d0ad50e9c50b84b074af79394f0",
-        "sha256": "0nipwpq92wvzxnn2wzdff69v8ps9rznwcrj0xagwqfwd85hdkil6"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/lint/lint-gradle-api/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4694,21 +4379,6 @@
    }
  },

-  {
-    "path": "com/android/tools/repository/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "repository-26.1.4.pom": {
-        "sha1": "1b4c88b0253140647c018cce242b688d2ff98cc3",
-        "sha256": "1yinybbnmqlkcw43bqpxi6pq5lwr7ppj8xxfwkx264jqni5phipa"
-      },
-      "repository-26.1.4.jar": {
-        "sha1": "349dfc72ae53dedc32a17f5d47440838fe2527f1",
-        "sha256": "0mskx9a3qm6499415mn0nzir9jvn807pnfwaf8wpymz4gsbfh45l"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/repository/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4799,21 +4469,6 @@
    }
  },

-  {
-    "path": "com/android/tools/sdklib/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "sdklib-26.1.4.pom": {
-        "sha1": "0e7ef3a225517e60891160d63467bc3572de7e58",
-        "sha256": "00bgvi6pq59js519i0xi4zsz3pvvfn1l6dmi50b6k428jhdcljzh"
-      },
-      "sdklib-26.1.4.jar": {
-        "sha1": "7424640f2bd3ca3faccb6f656e29547430cd464a",
-        "sha256": "02p8gsmqk7azzvvnmjnhpc8n49v83yf3pfia2py89j1h5fy7x2bs"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/sdklib/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4904,21 +4559,6 @@
    }
  },

-  {
-    "path": "com/android/tools/sdk-common/26.1.4",
-    "repo": "https://dl.google.com/dl/android/maven2",
-    "files": {
-      "sdk-common-26.1.4.pom": {
-        "sha1": "03b3158f1e0d5eb281d5a6a67435b97dc2d76c21",
-        "sha256": "0a6jjz7fcbky2w2bv0v5qksppgr51nd7lhawr9lva3wg2gpk36mv"
-      },
-      "sdk-common-26.1.4.jar": {
-        "sha1": "5dbdefb2dc6cb5ba1b4b059bf11c964a830c5755",
-        "sha256": "1awy7i7q22avjs8lxys3i0k3b6qdi0kzvs03p2pxvwbm7lckv7bq"
-      }
-    }
-  },
-
  {
    "path": "com/android/tools/sdk-common/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -7445,21 +7085,6 @@
    }
  },

-  {
-    "path": "com/google/errorprone/error_prone_annotations/2.1.2",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "error_prone_annotations-2.1.2.pom": {
-        "sha1": "44f5d3b9781c31822991ff9f948d6cbfb8cdf055",
-        "sha256": "04894gp1inj1cpgp68cjh0rzpv0svfzhv2spak2prvdlp25mh2hq"
-      },
-      "error_prone_annotations-2.1.2.jar": {
-        "sha1": "6dcc08f90f678ac33e5ef78c3c752b6f59e63e0c",
-        "sha256": "0akq6zj7fd6i0abyz5c0q5aikp7lldrbind4lbvn0q60blxqfg6y"
-      }
-    }
-  },
-
  {
    "path": "com/google/errorprone/error_prone_annotations/2.2.0",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -7531,17 +7156,6 @@
    }
  },

-  {
-    "path": "com/google/errorprone/error_prone_parent/2.1.2",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "error_prone_parent-2.1.2.pom": {
-        "sha1": "ae2dd256d508d2ffc9d77fbec0414ee695973a8a",
-        "sha256": "0hx1cf07n7kwcl2pwiab628fm8fmymgy7bwdkvr3nswgvcfxddn6"
-      }
-    }
-  },
-
  {
    "path": "com/google/errorprone/error_prone_parent/2.2.0",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -8474,16 +8088,16 @@
  },

  {
-    "path": "com/sun/istack/istack-commons-runtime/4.1.1",
+    "path": "com/sun/istack/istack-commons-runtime/4.2.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "istack-commons-runtime-4.1.1.pom": {
-        "sha1": "35c136c863b9591c4d5374b76c724e871cbc57aa",
-        "sha256": "17nvihq7f24xrvlqkzxq23qkb4g5f9sl0pq7wsvspl78gbv4ciq1"
+      "istack-commons-runtime-4.2.0.pom": {
+        "sha1": "e00df2d2db8d5459e86a5ef542269ed56c278c66",
+        "sha256": "0wx5n7595af1n4a8rf5xcqmf6nwyhck0sq17yy94pr1f7pmrp20v"
      },
-      "istack-commons-runtime-4.1.1.jar": {
-        "sha1": "9b3769c76235bc283b060da4fae2318c6d53f07e",
-        "sha256": "1lyw30wh3w1xazp0kzb4j5zvz01fz1rihk2kqkwfcnjxpz2li0by"
+      "istack-commons-runtime-4.2.0.jar": {
+        "sha1": "131351109ff27c4aa0958a988bb273e879687232",
+        "sha256": "1xjzfa470birdrq8myd0b57c580gk7jip735vrs3zybf15x5n0i1"
      }
    }
  },
@@ -8511,12 +8125,12 @@
  },

  {
-    "path": "com/sun/istack/istack-commons/4.1.1",
+    "path": "com/sun/istack/istack-commons/4.2.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "istack-commons-4.1.1.pom": {
-        "sha1": "645608b459500510bd8d75686cd4b3a9e9ee36a0",
-        "sha256": "0303sa2xi5ln0ypnwpqizs6zrni8s0dr7wj0d41nkbrg6152fxnf"
+      "istack-commons-4.2.0.pom": {
+        "sha1": "ddebb110777b1340dae08ba3779042ea5b45144e",
+        "sha256": "0z29v0lwwyy5gibffcb91ppjmikvrw90pg76m9l7pidjvcw6cwv6"
      }
    }
  },
@@ -8863,16 +8477,16 @@
  },

  {
-    "path": "jakarta/activation/jakarta.activation-api/2.1.1",
+    "path": "jakarta/activation/jakarta.activation-api/2.1.2",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "jakarta.activation-api-2.1.1.pom": {
-        "sha1": "0c6e1dbee7b7faf7c9c8b7274a8b6279415cac6a",
-        "sha256": "006awx3sv5lc6ngsnrvgij6m9dhhrxqwy1gkkf3p9agdxzw5jck9"
+      "jakarta.activation-api-2.1.2.pom": {
+        "sha1": "233dabc7d6b1784679925cbbfebd2e3dec692591",
+        "sha256": "1phfr3r5gy10si0k7r750fbkvg1rdhxg62c3xv5mscfri87b189c"
      },
-      "jakarta.activation-api-2.1.1.jar": {
-        "sha1": "88c774ab863a21fb2fc4219af95379fafe499a31",
-        "sha256": "010s9784kcs97whlpyy7pd2dp71m62hh5n41zix5mfrdy7qf7fik"
+      "jakarta.activation-api-2.1.2.jar": {
+        "sha1": "640c0d5aff45dbff1e1a1bc09673ff3a02b1ba12",
+        "sha256": "1fwz95v2iygy0bcmvffw4d0zparqkb2ibqm4jp0p0hgbs26mfgzm"
      }
    }
  },
@@ -10387,16 +10001,16 @@
  },

  {
-    "path": "org/checkerframework/checker-qual/3.32.0",
+    "path": "org/checkerframework/checker-qual/3.34.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "checker-qual-3.32.0.pom": {
-        "sha1": "69d7d01436d892d55b202ccec8a7066f0ac41f98",
-        "sha256": "1kvxly5fpws3prsar57rmjqq6hcy2a0b5fpx60fgmpkf59jqhnkr"
+      "checker-qual-3.34.0.pom": {
+        "sha1": "0e3a886c77f8027c96dcbf9516356a42d5b95dad",
+        "sha256": "0dg54xq0mjd4q2kxyg0z3kfi4d7bjnb7pf870r38qf7kqj8yjnca"
      },
-      "checker-qual-3.32.0.jar": {
-        "sha1": "54ebd61f46b58b862c779e034073a93489ab3faf",
-        "sha256": "1k9wsy7wvh5304aaqb51hlgpfciahg5avzgmnzq8bgx6l1fh4vmn"
+      "checker-qual-3.34.0.jar": {
+        "sha1": "fd620da2920cdb0bfcbcde20e309f75940198ccf",
+        "sha256": "1p96cdclxdvsxgd2bv8lscwqc1cd2ak6mvg7llb7mgbmwf1kxl2x"
      }
    }
  },
@@ -10643,27 +10257,27 @@
  },

  {
-    "path": "org/eclipse/angus/angus-activation-project/2.0.0",
+    "path": "org/eclipse/angus/angus-activation-project/2.0.1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "angus-activation-project-2.0.0.pom": {
-        "sha1": "6fafee47a73b1ee5dc0f533bcaebc55743bbee84",
-        "sha256": "17ffihwphiw6vzwxb3gkrxbjcsby640wmadj43rbcfamn6icwrjx"
+      "angus-activation-project-2.0.1.pom": {
+        "sha1": "24682c09b455ad140ee080bd86752f0bf1957c55",
+        "sha256": "1ddiingflsp4wdyaw1az6fm02iacn63imnkg82xnxh8ximcns5y3"
      }
    }
  },

  {
-    "path": "org/eclipse/angus/angus-activation/2.0.0",
+    "path": "org/eclipse/angus/angus-activation/2.0.1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "angus-activation-2.0.0.pom": {
-        "sha1": "87500cdbfdcb4758ece7ca2267469a590e2d9fb9",
-        "sha256": "1sb92gyb9fk3fqysrsr021wdan191i6wgq845gkf4lnk4rbgcqsr"
+      "angus-activation-2.0.1.pom": {
+        "sha1": "b0b59e5f8caaf5afe94cde78d4e98aa1c0a50505",
+        "sha256": "1vs0w1m3hqa0piqq144x3d9jl3bywzzdl0lg34dfl9gmyw7ypib7"
      },
-      "angus-activation-2.0.0.jar": {
-        "sha1": "72369f4e2314d38de2dcbb277141ef0226f73151",
-        "sha256": "0iwi0y1ksir12z47gc0q7y7bfxnylf9yxdprix2sjnpkl0hx64is"
+      "angus-activation-2.0.1.jar": {
+        "sha1": "eaafaf4eb71b400e4136fc3a286f50e34a68ecb7",
+        "sha256": "0cf1nhrkjqz0nihp0l484y627asl5mnixmy1cj4xz3l62lc7c9mj"
      }
    }
  },
@@ -10941,12 +10555,12 @@
  },

  {
-    "path": "org/jacoco/org.jacoco.build/0.8.8",
+    "path": "org/jacoco/org.jacoco.build/0.8.10",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "org.jacoco.build-0.8.8.pom": {
-        "sha1": "b1ec2ce6fa11aa065c5c8cea04be7fa745c9fcbc",
-        "sha256": "1vrarvwmzb8gg8k7fmpxx3fh8n9ik1r8ahigfxngq97xhl90pkpl"
+      "org.jacoco.build-0.8.10.pom": {
+        "sha1": "a129ae2c1a5138a8bdfcfaecde3d1c74cb6d4f23",
+        "sha256": "0fvcpmk09b92985xsry4pdz2ii8jja0h68iw759i9apbipcv1mz3"
      }
    }
  },
@@ -10967,16 +10581,16 @@
  },

  {
-    "path": "org/jacoco/org.jacoco.core/0.8.8",
+    "path": "org/jacoco/org.jacoco.core/0.8.10",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "org.jacoco.core-0.8.8.pom": {
-        "sha1": "887670d63e8ac0302fde83422824b5e39736e262",
-        "sha256": "09g2zsc854m5qxy2byqfh20rpk384c1jcl531qybh8zqinjbbypm"
+      "org.jacoco.core-0.8.10.pom": {
+        "sha1": "e4acd57d7b22eab888cf7a5bac94a2798f6a23cb",
+        "sha256": "12gaf5yl7p4328hvncsgph4ni40lg60k9gplca7b7vww2kayv84k"
      },
-      "org.jacoco.core-0.8.8.jar": {
-        "sha1": "fb1257ce77ec2fe326aad639b2253e76f481ea2e",
-        "sha256": "0hqnc5jh8ga60d44hxp59f80ycwxnyng1nyz2d3r524xh0pphk27"
+      "org.jacoco.core-0.8.10.jar": {
+        "sha1": "669a338279c3f40b154a64c624bab625664a00e6",
+        "sha256": "020fv0bdhl459nr9jqjl7gdcq6wspkxy92lpxqw3jl57jdynd2g7"
      }
    }
  },
@@ -12181,36 +11795,6 @@
    }
  },

-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-jre7-1.2.0.pom": {
-        "sha1": "52d689e2aecf9c5ee2ca40c9512069ea77b4eb06",
-        "sha256": "0j3ka2lfxqxb37dmx4nzm07q88a77yf5wf1mrqs7gayk49y42xr0"
-      },
-      "kotlin-stdlib-jre7-1.2.0.jar": {
-        "sha1": "ec8b969e26fbcf2265a4d1a1539c4d1d4c5af380",
-        "sha256": "09i91z5r1ynll65sa6v61hqkz875q7vaz049zrx7jdyla6whz8n7"
-      }
-    }
-  },
-
-  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "kotlin-stdlib-jre8-1.2.0.pom": {
-        "sha1": "dd37e31bef41f48317214e93134ff54372bad406",
-        "sha256": "0f5c4jjw8rs5jgyjb2d9j6h1nf5nqcj6aq61s7p5cw6546z78ykb"
-      },
-      "kotlin-stdlib-jre8-1.2.0.jar": {
-        "sha1": "505f55b9619bbc5f5e26c77427dd24a6a441eef1",
-        "sha256": "0an8j2wwpx0mapmpl179xqf242kvjbipxaqxrgvl26ggwvp28db3"
-      }
-    }
-  },
-
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -12572,12 +12156,12 @@
  },

  {
-    "path": "org/junit/junit-bom/5.9.2",
+    "path": "org/junit/junit-bom/5.9.3",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "junit-bom-5.9.2.pom": {
-        "sha1": "645a08cbe455cad14d8bfb25a35d7f594c53cafd",
-        "sha256": "01gp6mpz7c4vcyrmm0drb05rvdan82d6qiw6d8rzacaihijpvl1f"
+      "junit-bom-5.9.3.pom": {
+        "sha1": "b1874b6a66656e4f5e4b492ab321249bcb749dc7",
+        "sha256": "1mrf6kf0y6bic98n30w8s9gnxykgzv5j8mx1bh745wkjkv6jj0sd"
      }
    }
  },
@@ -12713,6 +12297,17 @@
    }
  },

+  {
+    "path": "org/ow2/asm/asm-bom/9.5",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "asm-bom-9.5.pom": {
+        "sha1": "2b5d6f54150ef4cbef69c3b09b281353f42e1366",
+        "sha256": "1grm2s0pqc0s2kl79mhbv3l5zcwbgq3z803gh0wbczc3vlsnnxbi"
+      }
+    }
+  },
+
  {
    "path": "org/ow2/asm/asm-commons/5.1",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -118,7 +118,6 @@ com.airbnb.android:lottie:3.4.4
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
-com.android.databinding:baseLibrary:3.1.4
 com.android.databinding:baseLibrary:3.2.1
 com.android.databinding:baseLibrary:3.3.1
 com.android.databinding:baseLibrary:3.5.4
@@ -126,28 +125,24 @@ com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
-com.android.databinding:compilerCommon:3.1.4
 com.android.tools.analytics-library:crash:26.2.1
 com.android.tools.analytics-library:crash:26.3.1
 com.android.tools.analytics-library:crash:26.5.4
 com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
-com.android.tools.analytics-library:protos:26.1.4
 com.android.tools.analytics-library:protos:26.2.1
 com.android.tools.analytics-library:protos:26.3.1
 com.android.tools.analytics-library:protos:26.5.4
 com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
-com.android.tools.analytics-library:shared:26.1.4
 com.android.tools.analytics-library:shared:26.2.1
 com.android.tools.analytics-library:shared:26.3.1
 com.android.tools.analytics-library:shared:26.5.4
 com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
-com.android.tools.analytics-library:tracker:26.1.4
 com.android.tools.analytics-library:tracker:26.2.1
 com.android.tools.analytics-library:tracker:26.3.1
 com.android.tools.analytics-library:tracker:26.5.4
@@ -160,7 +155,6 @@ com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09
-com.android.tools.build:aapt2-proto:0.1.0
 com.android.tools.build:aapt2-proto:0.3.1
 com.android.tools.build:aapt2-proto:0.4.0
 com.android.tools.build:aapt2-proto:4.1.0-6503028
@@ -168,7 +162,6 @@ com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524
 com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
-com.android.tools.build:apksig:3.1.4
 com.android.tools.build:apksig:3.2.1
 com.android.tools.build:apksig:3.3.1
 com.android.tools.build:apksig:3.5.4
@@ -182,7 +175,6 @@ com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.0
 com.android.tools.build:builder-model:3.0.1
-com.android.tools.build:builder-model:3.1.4
 com.android.tools.build:builder-model:3.2.1
 com.android.tools.build:builder-model:3.3.1
 com.android.tools.build:builder-model:3.5.4
@@ -192,7 +184,6 @@ com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.0
 com.android.tools.build:builder-test-api:3.0.1
-com.android.tools.build:builder-test-api:3.1.4
 com.android.tools.build:builder-test-api:3.2.1
 com.android.tools.build:builder-test-api:3.3.1
 com.android.tools.build:builder-test-api:3.5.4
@@ -202,19 +193,16 @@ com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.0
 com.android.tools.build:builder:3.0.1
-com.android.tools.build:builder:3.1.4
 com.android.tools.build:builder:3.2.1
 com.android.tools.build:builder:3.3.1
 com.android.tools.build:builder:3.5.4
 com.android.tools.build:builder:4.1.0
-com.android.tools.build:bundletool:0.1.0-alpha01
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.6.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
 com.android.tools.build:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
-com.android.tools.build:gradle-api:3.1.4
 com.android.tools.build:gradle-api:3.2.1
 com.android.tools.build:gradle-api:3.3.1
 com.android.tools.build:gradle-api:3.5.4
@@ -224,13 +212,11 @@ com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
 com.android.tools.build:gradle-core:3.0.0
 com.android.tools.build:gradle-core:3.0.1
-com.android.tools.build:gradle-core:3.1.4
 com.android.tools.build:gradle:1.1.3
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.0
 com.android.tools.build:gradle:3.0.1
-com.android.tools.build:gradle:3.1.4
 com.android.tools.build:gradle:3.2.1
 com.android.tools.build:gradle:3.3.1
 com.android.tools.build:gradle:3.5.4
@@ -240,7 +226,6 @@ com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.0
 com.android.tools.build:manifest-merger:26.0.1
-com.android.tools.build:manifest-merger:26.1.4
 com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:manifest-merger:26.3.1
 com.android.tools.build:manifest-merger:26.5.4
@@ -252,7 +237,6 @@ com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.0
 com.android.tools.ddms:ddmlib:26.0.1
-com.android.tools.ddms:ddmlib:26.1.4
 com.android.tools.ddms:ddmlib:26.2.1
 com.android.tools.ddms:ddmlib:26.3.1
 com.android.tools.ddms:ddmlib:26.5.4
@@ -272,7 +256,6 @@ com.android.tools.layoutlib:layoutlib-api:24.3.1
 com.android.tools.layoutlib:layoutlib-api:24.5.0
 com.android.tools.layoutlib:layoutlib-api:26.0.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
-com.android.tools.layoutlib:layoutlib-api:26.1.4
 com.android.tools.layoutlib:layoutlib-api:26.2.1
 com.android.tools.layoutlib:layoutlib-api:26.3.1
 com.android.tools.layoutlib:layoutlib-api:26.5.4
@@ -289,7 +272,6 @@ com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-checks:27.1.0
-com.android.tools.lint:lint-gradle-api:26.1.4
 com.android.tools.lint:lint-gradle-api:26.2.1
 com.android.tools.lint:lint-gradle-api:26.3.1
 com.android.tools.lint:lint-gradle-api:26.5.4
@@ -307,7 +289,6 @@ com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.0
 com.android.tools:annotations:26.0.1
-com.android.tools:annotations:26.1.4
 com.android.tools:annotations:26.2.1
 com.android.tools:annotations:26.3.1
 com.android.tools:annotations:26.5.4
@@ -317,7 +298,6 @@ com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.0
 com.android.tools:common:26.0.1
-com.android.tools:common:26.1.4
 com.android.tools:common:26.2.1
 com.android.tools:common:26.3.1
 com.android.tools:common:26.5.4
@@ -327,14 +307,12 @@ com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.0
 com.android.tools:dvlib:26.0.1
-com.android.tools:dvlib:26.1.4
 com.android.tools:dvlib:26.2.1
 com.android.tools:dvlib:26.3.1
 com.android.tools:dvlib:26.5.4
 com.android.tools:dvlib:27.1.0
 com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
-com.android.tools:repository:26.1.4
 com.android.tools:repository:26.2.1
 com.android.tools:repository:26.3.1
 com.android.tools:repository:26.5.4
@@ -344,7 +322,6 @@ com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.0
 com.android.tools:sdklib:26.0.1
-com.android.tools:sdklib:26.1.4
 com.android.tools:sdklib:26.2.1
 com.android.tools:sdklib:26.3.1
 com.android.tools:sdklib:26.5.4
@@ -354,7 +331,6 @@ com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.0
 com.android.tools:sdk-common:26.0.1
-com.android.tools:sdk-common:26.1.4
 com.android.tools:sdk-common:26.2.1
 com.android.tools:sdk-common:26.3.1
 com.android.tools:sdk-common:26.5.4
@@ -415,13 +391,11 @@ com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.2.4
 com.google.code.gson:gson:2.3
-com.google.code.gson:gson:2.7
 com.google.code.gson:gson:2.8.0
 com.google.code.gson:gson:2.8.5
 com.google.code.gson:gson:2.8.6
 com.google.crypto.tink:tink:1.3.0-rc2
 com.google.errorprone:error_prone_annotations:2.0.18
-com.google.errorprone:error_prone_annotations:2.1.2
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.errorprone:error_prone_annotations:2.3.1
 com.google.errorprone:error_prone_annotations:2.3.2
@@ -595,10 +569,7 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30
-org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0
-org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
-org.jetbrains.kotlin:kotlin-stdlib:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
@@ -122,14 +122,12 @@ https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0/comm
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/runtime-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.1.4/baseLibrary-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.3.1/baseLibrary-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.1.4/compilerCommon-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/4.1.0/signflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/26.0.2/animated-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/27.0.1/animated-vector-drawable-27.0.1.pom
@@ -157,33 +155,28 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.1.4/protos-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.3.1/protos-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.1.4/shared-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.3.1/shared-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.1.4/tracker-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.3.1/tracker-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.1.4/annotations-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.3.1/annotations-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.1.0/aapt2-proto-0.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.4.0/aapt2-proto-0.4.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1.0-6503028/aapt2-proto-4.1.0-6503028.pom
@@ -191,7 +184,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/4.1.0/aaptcompiler-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.1.4/apksig-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.3.1/apksig-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
@@ -202,43 +194,36 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.1.4/builder-model-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.3.1/builder-model-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.1.4/builder-test-api-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.3.1/builder-test-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.1.4/builder-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.3.1/builder-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.1.0-alpha01/bundletool-0.1.0-alpha01.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.6.0/bundletool-0.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.9.0/bundletool-0.9.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.0/bundletool-0.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.1.4/gradle-api-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.3.1/gradle-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.1.4/gradle-core-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.0/gradle-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.1.4/gradle-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.3.1/gradle-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
@@ -253,28 +238,24 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifie
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta09/jetifier-processor-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.1.4/manifest-merger-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.3.1/manifest-merger-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/common/26.1.4/common-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.3.1/common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.1.4/ddmlib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.3.1/ddmlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.1.4/dvlib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.3.1/dvlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
@@ -288,7 +269,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/27.1.0/uast-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.1.4/layoutlib-api-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.3.1/layoutlib-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
@@ -299,7 +279,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/27.1.0/l
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/27.1.0/lint-checks-27.1.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.1.4/lint-gradle-api-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
@@ -311,21 +290,18 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/27.1.0/lint-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.1.4/repository-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.3.1/repository-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.1.4/sdklib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.3.1/sdklib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.1.4/sdk-common-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.3.1/sdk-common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
@@ -496,13 +472,11 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.6/gson-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.3.0-rc2/tink-1.3.0-rc2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.1.2/error_prone_annotations-2.1.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.2.0/error_prone_annotations-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.2/error_prone_annotations-2.3.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.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.1.2/error_prone_parent-2.1.2.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
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.2/error_prone_parent-2.3.2.pom
@@ -572,10 +546,10 @@ https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/2.21/istack-commons-runtime-2.21.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.1.1/istack-commons-runtime-4.1.1.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.2.0/istack-commons-runtime-4.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/2.21/istack-commons-2.21.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/3.0.7/istack-commons-3.0.7.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.1/istack-commons-4.1.1.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.2.0/istack-commons-4.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ext-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.2/jaxb-bom-ext-4.0.2.pom
@@ -603,7 +577,7 @@ https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4/4.5/antlr4-4.5.
 https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/3.4.3/gradle-download-task-3.4.3.pom
 https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/4.0.2/gradle-download-task-4.0.2.pom
 https://repo.maven.apache.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
-https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.1/jakarta.activation-api-2.1.1.pom
+https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.2/jakarta.activation-api-2.1.2.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0/jakarta.xml.bind-api-parent-4.0.0.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0/jakarta.xml.bind-api-4.0.0.pom
 https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.pom
@@ -719,7 +693,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.8/checker-qual-2.5.8.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/checker-qual-2.8.1.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.32.0/checker-qual-3.32.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.34.0/checker-qual-3.34.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
@@ -739,8 +713,8 @@ https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/eas
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.1.0/easymock-parent-5.1.0.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock/5.1.0/easymock-5.1.0.pom
-https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.0/angus-activation-project-2.0.0.pom
-https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.0/angus-activation-2.0.0.pom
+https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.1/angus-activation-project-2.0.1.pom
+https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.1/angus-activation-2.0.1.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.7/project-1.0.7.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.8/project-1.0.8.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.pom
@@ -761,9 +735,9 @@ https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-cor
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.8/org.jacoco.build-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.10/org.jacoco.build-0.8.10.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.8/org.jacoco.core-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.10/org.jacoco.core-0.8.10.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
@@ -844,8 +818,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/kotlin-stdlib-jdk8-1.4.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.30/kotlin-stdlib-jdk8-1.5.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0/kotlin-stdlib-jre7-1.2.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.0/kotlin-stdlib-jre8-1.2.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
@@ -870,7 +842,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.4.3
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
 https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20230227/json-20230227.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.2/junit-bom-5.9.2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.3/junit-bom-5.9.3.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
@@ -880,6 +852,7 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.0.3/asm-analysis
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0/asm-analysis-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.5/asm-bom-9.5.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
@@ -30,9 +30,9 @@ react-native-orientation-locker
 react-native-permissions
 react-native-randombytes
 react-native-reanimated
-react-native-safe-area-context
 react-native-shake
 react-native-share
+react-native-static-safe-area-insets
 react-native-status
 react-native-status-keycard
 react-native-svg
@@ -46,7 +46,7 @@ function fetch_and_template_file() {
    OBJ_URL="${REPO_URL}/${PKG_PATH}/${FILENAME}"
    if ! OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_URL}"); then
        echo " ! Failed to fetch: ${OBJ_URL}" >&2
-        exit 1
+        return 1
    fi

    OBJ_NAME="${FILENAME}"
@@ -58,6 +58,10 @@ function fetch_and_template_file() {
      }"
 }

+function fetch_and_template_file_no_fail() {
+    fetch_and_template_file "${1}" 2>/dev/null || true
+}
+
 if [[ -z "${1}" ]]; then
    echo "Required POM URL argument not given!" >&2
    exit 1
@@ -111,7 +115,7 @@ echo -ne "
      }"

 # Some deps are just POMs, in which case there is no JAR to fetch.
-[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file "${PKG_NAME}.jar"
+[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file_no_fail "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" == "jar" ]]     && fetch_and_template_file "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" == "bundle" ]]  && fetch_and_template_file "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" =~ aar* ]]      && fetch_and_template_file "${PKG_NAME}.aar"
@@ -8,6 +8,9 @@ assert stdenv.isDarwin;

 stdenv.mkDerivation {
  name = "xcode-wrapper-${version}${if allowHigher then "-plus" else ""}";
+  # Fix 'xcodebuild: Operation not permitted' when 'sandbox=relaxed' is used.
+  # https://github.com/NixOS/nixpkgs/pull/228696
+  __noChroot = stdenv.isDarwin;
  buildCommand = ''
    mkdir -p $out/bin
    cd $out/bin
@@ -18,11 +18,11 @@ export function stackOpacity (stackId, selectedStackId) {
  );
 }

-export function stackPointer (stackId, selectedStackId) {
+export function stackZIndex (stackId, selectedStackId) {
  return useDerivedValue(
    function () {
      'worklet'
-      return selectedStackId.value == stackId ? "auto" : "none";
+      return selectedStackId.value == stackId ? 10 : 9;
    }
  );
 }
@@ -1,19 +1,19 @@
-(ns status-im.native-module.core
+(ns native-module.core
  (:require ["react-native" :as react-native]
-            [re-frame.core :as re-frame]
-            [status-im2.utils.validators :as validators]
-            [status-im.utils.platform :as platform]
-            [status-im.utils.react-native :as react-native-utils]
-            [status-im.utils.types :as types]
+            [utils.validators :as validators]
            [taoensso.timbre :as log]
-            [status-im2.constants :as constants]))
+            [react-native.platform :as platform]
+            [react-native.core :as rn]
+            [utils.transforms :as types]))

 (defn status
  []
  (when (exists? (.-NativeModules react-native))
    (.-Status ^js (.-NativeModules react-native))))

-(def adjust-resize 16)
+(defn init
+  [handler]
+  (.addListener ^js rn/device-event-emitter "gethEvent" #(handler (.-jsonEvent ^js %))))

 (defn clear-web-data
  []
@@ -72,15 +72,6 @@
     accounts-data
     chat-key)))

-(defn login
-  "NOTE: beware, the password has to be sha3 hashed"
-  [key-uid account-data hashed-password]
-  (log/debug "[native-module] login")
-  (clear-web-data)
-  (init-keystore
-   key-uid
-   #(.login ^js (status) account-data hashed-password)))
-
 (defn login-with-config
  "NOTE: beware, the password has to be sha3 hashed"
  [key-uid account-data hashed-password config]
@@ -123,11 +114,6 @@
  (clear-web-data)
  (.logout ^js (status)))

-(defonce listener
-  (.addListener ^js react-native-utils/device-event-emitter
-                "gethEvent"
-                #(re-frame/dispatch [:signals/signal-received (.-jsonEvent ^js %)])))
-
 (defn multiaccount-load-account
  "NOTE: beware, the password has to be sha3 hashed

@@ -141,14 +127,6 @@
                                              :password hashed-password})
                            callback))

-(defn multiaccount-reset
-  "TODO: this function is not used anywhere
-   if usage isn't planned, remove"
-  [callback]
-  (log/debug "[native-module]  multiaccount-reset")
-  (.multiAccountReset ^js (status)
-                      callback))
-
 (defn multiaccount-derive-addresses
  "NOTE: this should be named derive-accounts
   this only derive addresses, they still need to be stored
@@ -298,43 +276,13 @@
             :key key})
  (.deserializeAndCompressKey ^js (status) key callback))

-
-(defn public-key->compressed-key
-  "Provides public key to status-go and gets back a compressed key via serialization"
-  [public-key callback]
-  (let [serialization-key constants/serialization-key
-        multi-code-prefix constants/multi-code-prefix
-        multi-code-key    (str multi-code-prefix (subs public-key 2))]
-    (log/info "[native-module] Serializing public key"
-              {:fn             :public-key->compressed-key
-               :public-key     public-key
-               :multi-code-key multi-code-key})
-    (.multiformatSerializePublicKey ^js (status) multi-code-key serialization-key callback)))
-
 (defn compressed-key->public-key
  "Provides compressed key to status-go and gets back the uncompressed public key via deserialization"
-  [public-key callback]
-  (let [deserialization-key constants/deserialization-key]
-    (log/info "[native-module] Deserializing compressed key"
-              {:fn         :compressed-key->public-key
-               :public-key public-key})
-    (.multiformatDeserializePublicKey ^js (status) public-key deserialization-key callback)))
-
-(defn decompress-public-key
-  "Provides compressed key to status-go and gets back the uncompressed public key"
-  [public-key callback]
-  (log/info "[native-module] Decompressing public key"
-            {:fn         :decompress-public-key
+  [public-key deserialization-key callback]
+  (log/info "[native-module] Deserializing compressed key"
+            {:fn         :compressed-key->public-key
             :public-key public-key})
-  (.decompressPublicKey ^js (status) public-key callback))
-
-(defn compress-public-key
-  "Provides a public key to status-go and gets back a 33bit compressed key back"
-  [public-key callback]
-  (log/info "[native-module] Compressing public key"
-            {:fn         :compress-public-key
-             :public-key public-key})
-  (.compressPublicKey ^js (status) public-key callback))
+  (.multiformatDeserializePublicKey ^js (status) public-key deserialization-key callback))

 (defn hash-typed-data
  "used for keycard"
@@ -388,11 +336,6 @@
  (log/debug "[native-module] send-logs")
  (.sendLogs ^js (status) dbJson js-logs callback))

-(defn add-peer
-  [enode on-result]
-  (log/debug "[native-module] add-peer")
-  (.addPeer ^js (status) enode on-result))
-
 (defn close-application
  []
  (log/debug "[native-module] close-application")
@@ -408,11 +351,6 @@
  (log/debug "[native-module] app-state-change")
  (.appStateChange ^js (status) state))

-(defn stop-local-notifications
-  []
-  (log/debug "[native-module] stop-local-notifications")
-  (.stopLocalNotifications ^js (status)))
-
 (defn start-local-notifications
  []
  (log/debug "[native-module] start-local-notifications")
@@ -433,26 +371,11 @@
     :build-id  (.-buildId status)
     :device-id (.-deviceId status)}))

-(defn extract-group-membership-signatures
-  [signature-pairs callback]
-  (log/debug "[native-module] extract-group-membership-signatures")
-  (.extractGroupMembershipSignatures ^js (status) signature-pairs callback))
-
-(defn sign-group-membership
-  [content callback]
-  (log/debug "[native-module] sign-group-membership")
-  (.signGroupMembership ^js (status) content callback))
-
 (defn get-node-config
  [callback]
  (log/debug "[native-module] get-node-config")
  (.getNodeConfig ^js (status) callback))

-(defn update-mailservers
-  [enodes on-result]
-  (log/debug "[native-module] update-mailservers")
-  (.updateMailservers ^js (status) enodes on-result))
-
 (defn toggle-webview-debug
  [on]
  (log/debug "[native-module] toggle-webview-debug" on)
@@ -483,12 +406,6 @@
  (when (validators/valid-public-key? public-key)
    (.generateAlias ^js (status) public-key)))

-(defn generate-gfycat-async
-  "Generate a 3 words random name based on the user public-key, asynchronously"
-  [public-key callback]
-  (when (validators/valid-public-key? public-key)
-    (.generateAliasAsync ^js (status) public-key callback)))
-
 (defn identicon
  "Generate a icon based on a string, synchronously"
  [seed]
@@ -500,11 +417,6 @@
  (log/debug "[native-module] encode-transfer")
  (.encodeTransfer ^js (status) to-norm amount-hex))

-(defn encode-function-call
-  [method params]
-  (log/debug "[native-module] encode-function-call")
-  (.encodeFunctionCall ^js (status) method (types/clj->json params)))
-
 (defn decode-parameters
  [bytes-string types]
  (log/debug "[native-module] decode-parameters")
@@ -555,11 +467,6 @@
  (log/debug "[native-module] to-checksum-address")
  (.toChecksumAddress ^js (status) address))

-(defn identicon-async
-  "Generate a icon based on a string, asynchronously"
-  [seed callback]
-  (.identiconAsync ^js (status) seed callback))
-
 (defn gfycat-identicon-async
  "Generate an icon based on a string and 3 words random name asynchronously"
  [seed callback]
@@ -585,16 +492,6 @@
  (log/debug "[native-module] delete-imported-key")
  (.deleteImportedKey ^js (status) key-uid address hashed-password callback))

-(defn activate-keep-awake
-  []
-  (log/debug "[native-module] activateKeepAwake")
-  (.activateKeepAwake ^js (status)))
-
-(defn deactivate-keep-awake
-  []
-  (log/debug "[native-module] deactivateKeepAwake")
-  (.deactivateKeepAwake ^js (status)))
-
 (defn reset-keyboard-input
  [input selection]
  (log/debug "[native-module] resetKeyboardInput")
@@ -1,10 +1,10 @@
-(ns status-im.native-module.core-test
+(ns native-module.core-test
  (:require [cljs.test :refer [deftest is testing]]
-            [status-im.native-module.core :as status]))
+            [native-module.core :as native-module]))

 (deftest identicon-test
  (testing "check if identicon test works"
    (is
     (=
      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAjklEQVR4nOzXsQmAMBQGYRV3cUAdQwd0Gm2sJIWSBI6f+0oR8XjwSKYhhCE0htAYQmMITUzI/PXF49yv0vN12cYWP1L7/ZiJGEJjCE31xvm7bXptv5iJGEJjCE31WasVz1oPQ2gMoWlyuyvpfaN8i5mIITSG0BhCYwiNIeokZiKG0BhCYwiNITR3AAAA//+A3RtWaKqXgQAAAABJRU5ErkJggg=="
-      (status/identicon "a")))))
+      (native-module/identicon "a")))))
@@ -11,7 +11,7 @@
            :inner                   44
            :status-indicator        12
            :status-indicator-border 2
-            :font-size               :paragraph-1}
+            :font-size               :heading-2}
   :small  {:outer                   32
            :inner                   28
            :status-indicator        12
@@ -0,0 +1,20 @@
+(ns quo2.components.buttons.predictive-keyboard.component-spec
+  (:require [quo2.components.buttons.predictive-keyboard.view :as predictive-keyboard]
+            [test-helpers.component :as h]))
+
+(h/describe "predictive-keyboard"
+  (h/test "basic render"
+    (h/render [predictive-keyboard/view {:type :error :text "Error message"}])
+    (h/is-truthy (h/get-by-label-text :predictive-keyboard)))
+  (h/test "rendered with correct text"
+    (h/render [predictive-keyboard/view {:type :info :text "Error message"}])
+    (h/is-truthy (h/get-by-text "Error message")))
+  (h/test "rendered with correct words"
+    (h/render [predictive-keyboard/view {:type :words :words ["lab" "label"]}])
+    (h/is-truthy (h/get-by-text "lab"))
+    (h/is-truthy (h/get-by-text "label")))
+  (h/test "word press event"
+    (let [event (h/mock-fn)]
+      (h/render [predictive-keyboard/view {:type :words :words ["lab" "label"] :on-press #(event %)}])
+      (h/fire-event :press (h/get-by-text "lab"))
+      (h/was-called event))))
@@ -0,0 +1,11 @@
+(ns quo2.components.buttons.predictive-keyboard.style)
+
+(defn wrapper
+  [type]
+  {:flex               1
+   :min-height         48
+   :padding-vertical   8
+   :justify-content    :center
+   :padding-horizontal (if (= type :words) 0 20)})
+
+(def word-list {:align-items :center :padding-horizontal 20})
@@ -0,0 +1,71 @@
+(ns quo2.components.buttons.predictive-keyboard.view
+  (:require [react-native.core :as rn]
+            [quo2.components.buttons.predictive-keyboard.style :as style]
+            [quo2.components.info.info-message :as info-message]
+            [react-native.linear-gradient :as linear-gradient]
+            [quo2.foundations.colors :as colors]
+            [quo2.components.buttons.button :as button]))
+
+(def ^:private gradients
+  {:light [(colors/alpha colors/neutral-40 0.05) (colors/alpha colors/neutral-40 0)]
+   :dark  [(colors/alpha colors/neutral-80 0.7) (colors/alpha colors/neutral-80 0)]
+   :blur  [colors/white-opa-5 colors/white-opa-0]})
+
+(defn- word-component
+  [word _ _ {:keys [blur? on-press]}]
+  [button/button
+   (merge {:type     :blur-bg
+           :size     32
+           :on-press #(on-press word)}
+          (when blur? {:override-theme :dark}))
+   word])
+
+(defn- separator
+  []
+  [rn/view {:style {:width 8}}])
+
+(defn view
+  "Options
+   - `type` `:words`/`:error`/`:info`/`:empty`.
+   - `blur?` Boolean to enable blur background support.
+   - `text`  error/info text.
+   - `words` List of words to display in the keyboard.
+   - `on-press` Callback called when a word is pressed `(fn [word])`."
+  [{:keys [type blur? text words on-press]}]
+  [linear-gradient/linear-gradient
+   {:style               {:flex-direction :row}
+    :accessibility-label :predictive-keyboard
+    :colors              (if blur?
+                           (gradients :blur)
+                           (colors/theme-colors (gradients :light) (gradients :dark)))}
+   [rn/view {:style (style/wrapper type)}
+    (case type
+      :words
+      [rn/flat-list
+       {:data                              words
+        :content-container-style           style/word-list
+        :render-fn                         word-component
+        :render-data                       {:blur?    blur?
+                                            :on-press on-press}
+        :shows-horizontal-scroll-indicator false
+        :separator                         [separator]
+        :horizontal                        true
+        :key-fn                            str}]
+
+      :error
+      [info-message/info-message
+       {:icon :i/info
+        :size :default
+        :type :error}
+       text]
+
+      :info
+      [info-message/info-message
+       (merge {:icon :i/info
+               :size :default
+               :type (if (= type :error) :error :default)}
+              (when blur?
+                {:text-color colors/white-opa-70
+                 :icon-color colors/white-opa-70}))
+       text]
+      nil)]])
@@ -0,0 +1,30 @@
+(ns quo2.components.drawers.documentation-drawers.component-spec
+  (:require [quo2.components.drawers.documentation-drawers.view :as documentation-drawers]
+            [test-helpers.component :as h]))
+
+(h/describe "Documentation drawers component"
+  (h/test "render component without button"
+    (h/render [documentation-drawers/view {:title "Documentation"} "Content"])
+    (-> (h/expect (h/get-by-label-text :documentation-drawer-title))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-label-text :documentation-drawer-content))
+        (.toBeTruthy)))
+  (h/test "render component with button"
+    (h/render [documentation-drawers/view
+               {:title "Documentation" :show-button? true :button-label "Read more"} "Content"])
+    (-> (h/expect (h/get-by-label-text :documentation-drawer-title))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-label-text :documentation-drawer-content))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-label-text :documentation-drawer-button))
+        (.toBeTruthy)))
+  (h/test "button is pressed"
+    (let [event (h/mock-fn)]
+      (h/render
+       [documentation-drawers/view
+        {:title "Documentation" :show-button? true :button-label "Read more" :on-press-button event}
+        "Content"])
+      (h/fire-event :press (h/get-by-label-text :documentation-drawer-button))
+      (-> (h/expect event)
+          (.toHaveBeenCalled)))))
+
@@ -0,0 +1,10 @@
+(ns quo2.components.drawers.documentation-drawers.style)
+
+(def container
+  {:align-items :flex-start
+   :padding     20})
+
+(def content
+  {:margin-top    12
+   :margin-bottom 16})
+
@@ -0,0 +1,40 @@
+(ns quo2.components.drawers.documentation-drawers.view
+  (:require [quo2.components.markdown.text :as text]
+            [quo2.components.drawers.documentation-drawers.style :as style]
+            [react-native.core :as rn]
+            [react-native.gesture :as gesture]
+            [quo2.components.buttons.button :as button]
+            [quo2.foundations.colors :as colors]))
+
+(defn view
+  "Options
+   - `title` Title text
+   - `show-button?` Show button
+   - `button-label` button label
+   - `button-icon` button icon
+   - `on-press-button` On press handler for the button
+   - `shell?` use shell theme
+
+   `content` Content of the drawer
+   "
+  [{:keys [title show-button? on-press-button button-label button-icon shell?]} content]
+  [gesture/scroll-view
+   [rn/view {:style style/container}
+    [text/text
+     {:size                :heading-2
+      :accessibility-label :documentation-drawer-title
+      :style               {:color (colors/theme-colors colors/neutral-100
+                                                        colors/white
+                                                        (when shell? :dark))}
+      :weight              :semi-bold} title]
+    [rn/view {:style style/content :accessibility-label :documentation-drawer-content}
+     content]
+    (when show-button?
+      [button/button
+       (merge {:size                24
+               :type                (if shell? :blur-bg-outline :outline)
+               :on-press            on-press-button
+               :accessibility-label :documentation-drawer-button
+               :after               button-icon}
+              (when shell? {:override-theme :dark})) button-label])]])
+
@@ -6,10 +6,10 @@
            [react-native.core :as rn]))

 (def themes
-  {:light {:default colors/neutral-40
+  {:light {:default colors/neutral-50
           :success colors/success-50
           :error   colors/danger-50}
-   :dark  {:default colors/neutral-60
+   :dark  {:default colors/neutral-40
           :success colors/success-60
           :error   colors/danger-60}})

@@ -27,18 +27,20 @@
   :icon-color     colors/white    ;; icon color override
   :no-icon-color? false       ;; disable tint color for icon"
  [{:keys [type size icon text-color icon-color no-icon-color? style]} message]
-  (let [weight     (if (= size :default) :regular :medium)
-        size       (if (= size :default) :paragraph-2 :label)
-        text-color (or text-color (get-color type))
-        icon-color (or icon-color text-color)]
+  (let [weight          (if (= size :default) :regular :medium)
+        icon-size       (if (= size :default) 16 12)
+        icon-margin-top (if (= size :default) 2 3)
+        size            (if (= size :default) :paragraph-2 :label)
+        text-color      (or text-color (get-color type))
+        icon-color      (or icon-color text-color)]
    [rn/view
     {:style (merge {:flex-direction :row}
                    style)}
     [quo2.icons/icon icon
      {:color           icon-color
       :no-color        no-icon-color?
-       :size            12
-       :container-style {:margin-top 3}}]
+       :size            icon-size
+       :container-style {:margin-top icon-margin-top}}]
     [text/text
      {:size   size
       :weight weight
@@ -1,5 +1,6 @@
 (ns quo2.components.inputs.title-input.style
-  (:require [quo2.foundations.colors :as colors]))
+  (:require [quo2.foundations.colors :as colors]
+            [react-native.platform :as platform]))

 (defn get-focused-placeholder-color
  [blur? override-theme]
@@ -28,9 +29,11 @@

 (defn get-selection-color
  [customization-color blur? override-theme]
-  (if blur?
-    (colors/theme-colors colors/neutral-100 colors/white override-theme)
-    (colors/custom-color customization-color (if (or (= :dark override-theme) colors/dark?) 60 50))))
+  (colors/alpha (if blur?
+                  (colors/theme-colors colors/neutral-100 colors/white override-theme)
+                  (colors/custom-color customization-color
+                                       (if (or (= :dark override-theme) colors/dark?) 60 50)))
+                (if platform/ios? 1 0.2)))

 (def text-input-container {:flex 1})

@@ -154,12 +154,12 @@
           ready-to-send? (reagent/atom false)
           ready-to-lock? (reagent/atom false)
           ready-to-delete? (reagent/atom false)
-           reviewing-audio? (reagent/atom false)
+           reviewing-audio? (reagent/atom (some? audio-file))
           playing-audio? (reagent/atom false)
           recording-length-ms (reagent/atom 0)
           audio-current-time-ms (reagent/atom 0)
           seeking-audio? (reagent/atom false)
-           force-show-controls? (reagent/atom false)
+           force-show-controls? (reagent/atom (some? audio-file))
           clear-timeout (atom nil)
           record-button-at-initial-position? (atom true)
           record-button-is-animating? (atom false)
@@ -169,7 +169,7 @@
           touch-active? (atom false)
           recording-timer (atom nil)
           playing-timer (atom nil)
-           output-file (atom nil)
+           output-file (atom audio-file)
           reached-max-duration? (atom false)
           touch-timestamp (atom nil)
           disabled? (atom false)
@@ -512,10 +512,7 @@
                         (on-init reset-recorder))
                       (when audio-file
                         (let [filename (last (string/split audio-file "/"))]
-                           (reload-player filename)
-                           (reset! output-file audio-file)
-                           (reset! reviewing-audio? true)
-                           (reset! force-show-controls? true)))))
+                           (reload-player filename)))))
         [rn/view
          {:style          style/bar-container
           :pointer-events :box-none}
@@ -525,7 +522,7 @@
              seeking-audio?]
             [:f> soundtrack/f-soundtrack
              {:audio-current-time-ms audio-current-time-ms
-               :player-ref            player-ref
+               :player-ref            @player-ref
               :seeking-audio?        seeking-audio?}]])
          (when (or @recording? @reviewing-audio?)
            [:f> f-time-counter @recording? @recording-length-ms @ready-to-delete? @reviewing-audio?
@@ -19,7 +19,7 @@
      (let [player-ref            (reagent/atom {})
            audio-current-time-ms (reagent/atom 0)]
        (h/render [:f> soundtrack/f-soundtrack
-                   {:player-ref            player-ref
+                   {:player-ref            @player-ref
                    :audio-current-time-ms audio-current-time-ms}])
        (-> (h/expect (h/get-by-test-id "soundtrack"))
            (.toBeTruthy)))))
@@ -31,7 +31,7 @@
            audio-current-time-ms (reagent/atom 0)]
        (h/render [:f> soundtrack/f-soundtrack
                   {:seeking-audio?        seeking-audio?
-                    :player-ref            player-ref
+                    :player-ref            @player-ref
                    :audio-current-time-ms audio-current-time-ms}])
        (h/fire-event
         :on-sliding-start
@@ -47,7 +47,7 @@
            audio-current-time-ms (reagent/atom 0)]
        (h/render [:f> soundtrack/f-soundtrack
                   {:seeking-audio?        seeking-audio?
-                    :player-ref            player-ref
+                    :player-ref            @player-ref
                    :audio-current-time-ms audio-current-time-ms}])
        (h/fire-event
         :on-sliding-start
@@ -69,7 +69,7 @@
            audio-current-time-ms (reagent/atom 0)]
        (h/render [:f> soundtrack/f-soundtrack
                   {:seeking-audio?        seeking-audio?
-                    :player-ref            player-ref
+                    :player-ref            @player-ref
                    :audio-current-time-ms audio-current-time-ms}])
        (h/fire-event
         :on-sliding-start
@@ -10,12 +10,14 @@
 (def ^:private thumb-dark (js/require "../resources/images/icons2/12x12/thumb-dark.png"))

 (defn f-soundtrack
-  [{:keys [audio-current-time-ms player-ref seeking-audio?]}]
-  (let [audio-duration-ms (audio/get-player-duration @player-ref)]
+  [{:keys [audio-current-time-ms player-ref style seeking-audio?]}]
+  (let [audio-duration-ms (audio/get-player-duration player-ref)]
    [:<>
     [slider/slider
      {:test-ID                  "soundtrack"
-       :style                    (style/player-slider-container)
+       :style                    (merge
+                                  (style/player-slider-container)
+                                  (or style {}))
       :minimum-value            0
       :maximum-value            audio-duration-ms
       :value                    @audio-current-time-ms
@@ -23,7 +25,7 @@
       :on-sliding-complete      (fn [seek-time]
                                   (reset! seeking-audio? false)
                                   (audio/seek-player
-                                    @player-ref
+                                    player-ref
                                    seek-time
                                    #(log/debug "[record-audio] on seek - seek time: " seek-time)
                                    #(log/error "[record-audio] on seek - error: " %)))
@@ -5,15 +5,17 @@
            [react-native.core :as rn]))

 (defn view
-  [{:keys [checked? blur? on-change accessibility-label container-style]} label]
-  [rn/view
-   {:style (merge container-style (style/container blur?))}
-   [selectors/checkbox
-    {:accessibility-label accessibility-label
-     :blur?               blur?
-     :checked?            checked?
-     :on-change           on-change}]
-   [text/text
-    {:size  :paragraph-2
-     :style style/text}
-    label]])
+  [{:keys [checked? blur? accessibility-label container-style on-change]} label]
+  [rn/touchable-opacity
+   {:on-press            on-change
+    :accessibility-label "disclaimer-touchable-opacity"}
+   [rn/view {:style (merge container-style (style/container blur?))}
+    [selectors/checkbox
+     {:accessibility-label accessibility-label
+      :blur?               blur?
+      :checked?            checked?
+      :on-change           on-change}]
+    [text/text
+     {:size  :paragraph-2
+      :style style/text}
+     label]]])
@@ -10,6 +10,7 @@
    quo2.components.banners.banner.view
    quo2.components.buttons.button
    quo2.components.buttons.dynamic-button
+    quo2.components.buttons.predictive-keyboard.view
    quo2.components.colors.color-picker.view
    quo2.components.community.community-card-view
    quo2.components.community.community-list-view
@@ -24,6 +25,7 @@
    quo2.components.dividers.new-messages
    quo2.components.dividers.strength-divider.view
    quo2.components.drawers.action-drawers.view
+    quo2.components.drawers.documentation-drawers.view
    quo2.components.drawers.drawer-buttons.view
    quo2.components.drawers.permission-context.view
    quo2.components.dropdowns.dropdown
@@ -62,6 +64,7 @@
    quo2.components.profile.select-profile.view
    quo2.components.reactions.reaction
    quo2.components.record-audio.record-audio.view
+    quo2.components.record-audio.soundtrack.view
    quo2.components.selectors.disclaimer.view
    quo2.components.selectors.filter.view
    quo2.components.selectors.selectors.view
@@ -81,8 +84,6 @@
    quo2.components.tags.token-tag
    quo2.components.text-combinations.title.view))

-(def button quo2.components.buttons.button/button)
-(def dynamic-button quo2.components.buttons.dynamic-button/dynamic-button)
 (def text quo2.components.markdown.text/text)
 (def icon quo2.components.icon/icon)
 (def separator quo2.components.separator/separator)
@@ -118,6 +119,11 @@
 ;;;; BANNER
 (def banner quo2.components.banners.banner.view/banner)

+;;;; BUTTONS
+(def button quo2.components.buttons.button/button)
+(def dynamic-button quo2.components.buttons.dynamic-button/dynamic-button)
+(def predictive-keyboard quo2.components.buttons.predictive-keyboard.view/view)
+
 ;;;; CARDS
 (def small-option-card quo2.components.onboarding.small-option-card.view/small-option-card)

@@ -151,6 +157,7 @@

 ;;;; DRAWERS
 (def action-drawer quo2.components.drawers.action-drawers.view/action-drawer)
+(def documentation-drawers quo2.components.drawers.documentation-drawers.view/view)
 (def drawer-buttons quo2.components.drawers.drawer-buttons.view/view)
 (def permission-context quo2.components.drawers.permission-context.view/view)

@@ -184,6 +191,7 @@

 ;;;; RECORD AUDIO
 (def record-audio quo2.components.record-audio.record-audio.view/record-audio)
+(def soundtrack quo2.components.record-audio.soundtrack.view/f-soundtrack)

 ;;;; SETTINGS
 (def privacy-option quo2.components.settings.privacy-option/card)
@@ -3,12 +3,14 @@
    [quo2.components.avatars.user-avatar.component-spec]
    [quo2.components.banners.banner.component-spec]
    [quo2.components.buttons.--tests--.buttons-component-spec]
+    [quo2.components.buttons.predictive-keyboard.component-spec]
    [quo2.components.colors.color-picker.component-spec]
    [quo2.components.counter.--tests--.counter-component-spec]
    [quo2.components.counter.step.component-spec]
    [quo2.components.dividers.--tests--.divider-label-component-spec]
    [quo2.components.dividers.strength-divider.component-spec]
    [quo2.components.drawers.action-drawers.component-spec]
+    [quo2.components.drawers.documentation-drawers.component-spec]
    [quo2.components.drawers.drawer-buttons.component-spec]
    [quo2.components.drawers.permission-context.component-spec]
    [quo2.components.inputs.input.component-spec]
@@ -37,6 +37,8 @@

 (def dismiss-keyboard! #(.dismiss keyboard))

+(def device-event-emitter (.-DeviceEventEmitter ^js react-native))
+
 (defn hide-splash-screen
  []
  (.hide ^js (-> react-native .-NativeModules .-SplashScreen)))
@@ -128,6 +130,9 @@
  (when (exists? (.-NativeModules ^js react-native))
    (.-RNSelectableTextInputManager ^js (.-NativeModules ^js react-native))))

+;; TODO: iOS native implementation https://github.com/status-im/status-mobile/issues/14137
 (defonce selectable-text-input
-  (reagent/adapt-react-class
-   (.requireNativeComponent ^js react-native "RNSelectableTextInput")))
+  (if platform/android?
+    (reagent/adapt-react-class
+     (.requireNativeComponent ^js react-native "RNSelectableTextInput"))
+    view))
@@ -1,102 +0,0 @@
-(ns status-im.add-new.core
-  (:require [clojure.string :as string]
-            [re-frame.core :as re-frame]
-            [status-im.add-new.db :as db]
-            [status-im2.contexts.chat.events :as chat]
-            [status-im2.contexts.contacts.events :as contact]
-            [status-im.ethereum.core :as ethereum]
-            [status-im.ethereum.ens :as ens]
-            [status-im.ethereum.stateofus :as stateofus]
-            [utils.i18n :as i18n]
-            [status-im.router.core :as router]
-            [status-im.utils.db :as utils.db]
-            [utils.re-frame :as rf]
-            [status-im.utils.random :as random]
-            [status-im.utils.utils :as utils]
-            [status-im2.navigation.events :as navigation]))
-
-(re-frame/reg-fx
- :resolve-public-key
- (fn [{:keys [chain-id contact-identity cb]}]
-   (let [ens-name (stateofus/ens-name-parse contact-identity)]
-     (ens/pubkey chain-id ens-name cb))))
-
-;;NOTE we want to handle only last resolve
-(def resolve-last-id (atom nil))
-
-(rf/defn new-chat-set-new-identity
-  {:events [:new-chat/set-new-identity]}
-  [{db :db} new-identity-raw new-ens-name id]
-  (let [ens-error (and (= new-identity-raw "0x") (not (string/blank? new-ens-name)))]
-    (when (or (not id) (= id @resolve-last-id))
-      (if ens-error
-        {:db (assoc-in db [:contacts/new-identity :state] :error)}
-        (let [new-identity   (utils/safe-trim new-identity-raw)
-              is-public-key? (and (string? new-identity)
-                                  (utils.db/valid-public-key? new-identity))
-              is-ens?        (and (not is-public-key?)
-                                  (ens/valid-eth-name-prefix? new-identity))
-              error          (db/validate-pub-key db new-identity)]
-          (reset! resolve-last-id nil)
-          (merge {:db (assoc db
-                             :contacts/new-identity
-                             {:public-key new-identity
-                              :state      (cond is-ens?
-                                                :searching
-                                                (and (string/blank? new-identity) (not new-ens-name))
-                                                :empty
-                                                error
-                                                :error
-                                                :else
-                                                :valid)
-                              :error      error
-                              :ens-name   (stateofus/ens-name-parse new-ens-name)})}
-                 (when is-ens?
-                   (reset! resolve-last-id (random/id))
-                   {:resolve-public-key
-                    {:chain-id         (ethereum/chain-id db)
-                     :contact-identity new-identity
-                     :cb               #(re-frame/dispatch [:new-chat/set-new-identity
-                                                            %
-                                                            new-identity
-                                                            @resolve-last-id])}})))))))
-
-(rf/defn clear-new-identity
-  {:events [::clear-new-identity ::new-chat-focus]}
-  [{:keys [db]}]
-  {:db (dissoc db :contacts/new-identity)})
-
-(rf/defn qr-code-handled
-  {:events [::qr-code-handled]}
-  [{:keys [db] :as cofx} {:keys [type public-key chat-id data ens-name]}
-   {:keys [new-contact? nickname] :as opts}]
-  (let [public-key?       (and (string? data)
-                               (string/starts-with? data "0x"))
-        chat-key          (cond
-                            (= type :private-chat) chat-id
-                            (= type :contact) public-key
-                            (and (= type :undefined)
-                                 public-key?)
-                            data)
-        validation-result (db/validate-pub-key db chat-key)]
-    (if-not validation-result
-      (if new-contact?
-        (rf/merge cofx
-                  (contact/send-contact-request chat-key)
-                  (navigation/navigate-to :contacts-list {}))
-        (chat/start-chat cofx chat-key ens-name))
-      {:utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
-                          :content    (case validation-result
-                                        :invalid
-                                        (i18n/label :t/use-valid-contact-code)
-                                        :yourself
-                                        (i18n/label :t/can-not-add-yourself))
-                          :on-dismiss #(re-frame/dispatch [:pop-to-root :shell-stack])}})))
-
-(rf/defn qr-code-scanned
-  {:events [:contact/qr-code-scanned]}
-  [{:keys [db]} data opts]
-  {::router/handle-uri {:chain (ethereum/chain-keyword db)
-                        :chats (get db :chats)
-                        :uri   data
-                        :cb    #(re-frame/dispatch [::qr-code-handled % opts])}})
@@ -1,30 +0,0 @@
-(ns status-im.add-new.db
-  (:require [cljs.spec.alpha :as spec]
-            [status-im.ethereum.ens :as ens]
-            [status-im2.utils.validators :as validators]))
-
-(defn own-public-key?
-  [{:keys [multiaccount]} public-key]
-  (= (:public-key multiaccount) public-key))
-
-(defn validate-pub-key
-  [db public-key]
-  (cond
-    (or (not (validators/valid-public-key? public-key))
-        (= public-key ens/default-key))
-    :invalid
-    (own-public-key? db public-key)
-    :yourself))
-
-(spec/def ::name (spec/and string? not-empty))
-
-(spec/def ::topic
-  (spec/and string?
-            not-empty
-            (partial re-matches #"[a-z0-9\-]+")))
-
-(defn valid-topic?
-  [topic]
-  (and topic
-       (spec/valid? ::topic topic)
-       (not (validators/valid-public-key? topic))))
@@ -1,7 +1,6 @@
 (ns status-im.bottom-sheet.sheets
  (:require [utils.re-frame :as rf]
            [status-im.ui.screens.about-app.views :as about-app]
-            [status-im.ui.screens.home.sheet.views :as home.sheet]
            [status-im.ui.screens.keycard.views :as keycard]
            [status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
            [status-im.ui.screens.multiaccounts.key-storage.views :as key-storage]
@@ -27,9 +26,6 @@
          (= view :mobile-network-offline)
          (merge mobile-network-settings/offline-sheet)

-          (= view :add-new)
-          (merge home.sheet/add-new)
-
          (= view :keycard.login/more)
          (merge keycard/more-sheet)

@@ -13,7 +13,7 @@
    [status-im.ethereum.ens :as ens]
    [utils.i18n :as i18n]
    [status-im.multiaccounts.update.core :as multiaccounts.update]
-    [status-im.native-module.core :as status]
+    [native-module.core :as native-module]
    [status-im.signing.core :as signing]
    [status-im.ui.components.list-selection :as list-selection]
    [utils.re-frame :as rf]
@@ -537,7 +537,7 @@
 (re-frame/reg-fx
 :browser/call-rpc
 (fn [[payload callback]]
-   (status/call-rpc
+   (native-module/call-rpc
    (types/clj->json payload)
    (fn [response]
      (if (= "" response)
@@ -559,7 +559,7 @@
 (re-frame/reg-fx
 :browser/clear-web-data
 (fn []
-   (status/clear-web-data)))
+   (native-module/clear-web-data)))

 (defn share-link
  [url]
@@ -1,35 +0,0 @@
-(ns status-im.chat.models
-  (:require [utils.i18n :as i18n]
-            [re-frame.core :as re-frame]
-            [utils.re-frame :as rf]
-            [taoensso.timbre :as log]
-            [status-im.add-new.db :as new-public-chat.db]
-            [status-im.data-store.chats :as chats-store]))
-
-;; OLD
-
-(rf/defn handle-public-chat-created
-  {:events [::public-chat-created]}
-  [{:keys [db]} chat-id response]
-  {:db       (-> db
-                 (assoc-in [:chats chat-id] (chats-store/<-rpc (first (:chats response))))
-                 (update :chats-home-list conj chat-id))
-   :dispatch [:chat/navigate-to-chat chat-id]})
-
-(rf/defn create-public-chat-go
-  [_ chat-id]
-  {:json-rpc/call [{:method     "wakuext_createPublicChat"
-                    :params     [{:id chat-id}]
-                    :on-success #(re-frame/dispatch [::public-chat-created chat-id %])
-                    :on-error   #(log/error "failed to create public chat" chat-id %)}]})
-
-(rf/defn start-public-chat
-  "Starts a new public chat"
-  {:events [:chat.ui/start-public-chat]}
-  [cofx topic]
-  (if (new-public-chat.db/valid-topic? topic)
-    (create-public-chat-go
-     cofx
-     topic)
-    {:utils/show-popup {:title   (i18n/label :t/cant-open-public-chat)
-                        :content (i18n/label :t/invalid-public-chat-topic)}}))
@@ -6,13 +6,11 @@
            [status-im.chat.models.mentions :as mentions]
            [status-im.chat.models.message :as chat.message]
            [status-im.chat.models.message-content :as message-content]
-            [status-im2.config :as config]
            [status-im2.constants :as constants]
            [utils.re-frame :as rf]
            [utils.i18n :as i18n]
            [status-im.utils.utils :as utils]
-            [taoensso.timbre :as log]
-            [status-im.ui.screens.chat.components.input :as input]))
+            [taoensso.timbre :as log]))

 (defn text->emoji
  "Replaces emojis in a specified `text`"
@@ -36,9 +34,12 @@
  "Set input text for current-chat. Takes db and input text and cofx
         as arguments and returns new fx. Always clear all validation messages."
  {:events [:chat.ui/set-chat-input-text]}
-  [{db :db} new-input chat-id]
+  [{:keys [db] :as cofx} new-input chat-id]
  (let [current-chat-id (or chat-id (:current-chat-id db))]
-    {:db (assoc-in db [:chat/inputs current-chat-id :input-text] (text->emoji new-input))}))
+    (rf/merge cofx
+              {:db (assoc-in db [:chat/inputs current-chat-id :input-text] (text->emoji new-input))}
+              (when (empty? new-input)
+                (mentions/clear-mentions)))))

 (rf/defn set-input-content-height
  {:events [:chat.ui/set-input-content-height]}
@@ -52,6 +53,18 @@
  (let [current-chat-id (or chat-id (:current-chat-id db))]
    {:db (assoc-in db [:chat/inputs current-chat-id :input-maximized?] maximized?)}))

+(rf/defn set-input-focused
+  {:events [:chat.ui/set-input-focused]}
+  [{db :db} focused? chat-id]
+  (let [current-chat-id (or chat-id (:current-chat-id db))]
+    {:db (assoc-in db [:chat/inputs current-chat-id :focused?] focused?)}))
+
+(rf/defn set-input-audio
+  {:events [:chat.ui/set-input-audio]}
+  [{db :db} audio chat-id]
+  (let [current-chat-id (or chat-id (:current-chat-id db))]
+    {:db (assoc-in db [:chat/inputs current-chat-id :audio] audio)}))
+
 (rf/defn select-mention
  {:events [:chat.ui/select-mention]}
  [{:keys [db] :as cofx} text-input-ref {:keys [primary-name searched-text match public-key] :as user}]
@@ -93,16 +106,14 @@
  [{:keys [db] :as cofx} message]
  (let [current-chat-id (:current-chat-id db)
        text            (get-in message [:content :text])]
-    (rf/merge cofx
-              {:db (-> db
-                       (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
-                                 message)
-                       (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
-                       (update-in [:chat/inputs current-chat-id :metadata]
-                                  dissoc
-                                  :sending-image))}
-              (when-not config/new-composer-enabled?
-                (input/set-input-text text current-chat-id)))))
+    {:db       (-> db
+                   (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
+                             message)
+                   (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
+                   (update-in [:chat/inputs current-chat-id :metadata]
+                              dissoc
+                              :sending-image))
+     :dispatch [:mention/to-input-field text current-chat-id]}))

 (rf/defn show-contact-request-input
  "Sets reference to previous chat message and focuses on input"
@@ -154,10 +165,7 @@
             :image-path   (utils/safe-replace resized-uri #"file://" "")
             :image-width  width
             :image-height height
-             ;; TODO: message not received if text field is
-             ;; nil or empty, issue:
-             ;; https://github.com/status-im/status-mobile/issues/14754
-             :text         (or input-text "placeholder")
+             :text         input-text
             :response-to  message-id})
          images)))

@@ -177,8 +185,6 @@
  [{:keys [db] :as cofx}]
  (let [current-chat-id (:current-chat-id db)]
    (rf/merge cofx
-              (when-not config/new-composer-enabled?
-                {:set-text-input-value [current-chat-id ""]})
              (clean-input current-chat-id)
              (mentions/clear-mentions))))

@@ -272,13 +278,12 @@
  {:events [:contacts/send-contact-request]}
  [{:keys [db] :as cofx} public-key message]
  (rf/merge cofx
-            {:chat.ui/clear-inputs     nil
-             :chat.ui/clear-inputs-old nil
-             :json-rpc/call            [{:method      "wakuext_sendContactRequest"
-                                         :js-response true
-                                         :params      [{:id public-key :message message}]
-                                         :on-error    #(log/warn "failed to send a contact request" %)
-                                         :on-success  #(re-frame/dispatch [:transport/message-sent %])}]}
+            {:chat.ui/clear-inputs nil
+             :json-rpc/call        [{:method      "wakuext_sendContactRequest"
+                                     :js-response true
+                                     :params      [{:id public-key :message message}]
+                                     :on-error    #(log/warn "failed to send a contact request" %)
+                                     :on-success  #(re-frame/dispatch [:transport/message-sent %])}]}
            (mentions/clear-mentions)
            (clean-input (:current-chat-id db))))

@@ -4,9 +4,8 @@
            [quo.react-native :as rn]
            [re-frame.core :as re-frame]
            [utils.re-frame :as rf]
-            [status-im.utils.platform :as platform]
            [taoensso.timbre :as log]
-            [status-im.native-module.core :as status]))
+            [native-module.core :as native-module]))

 (defn- transfer-input-segments
  [segments]
@@ -56,8 +55,8 @@
                                     :ensVerified   :ens-verified
                                     :added         :added?
                                     :displayName   :display-name
-                                     :searchedText  :searched-text
-                                    })))
+                                     :searchedText  :searched-text})))
+
          {}
          mentionable-users))
 (defn- transfer-mention-result
@@ -81,48 +80,51 @@
  (log/error "[mentions] on-error"
             {:context context
              :error   error}))
+
+(rf/defn to-input-field
+  {:events [:mention/to-input-field]}
+  [_ text chat-id]
+  (let [params [chat-id text]
+        method "wakuext_chatMentionToInputField"]
+    (log/debug "[mentions] to-input-field" {:params params})
+    {:json-rpc/call [{:method     method
+                      :params     params
+                      :on-success #(rf/dispatch [:mention/on-to-input-field-success %])
+                      :on-error   #(rf/dispatch [:mention/on-error
+                                                 {:method method
+                                                  :params params} %])}]}))
 (rf/defn on-to-input-field-success
  {:events [:mention/on-to-input-field-success]}
  [{:keys [db]} result]
  (log/debug "[mentions] on-to-input-field-success" {:result result})
  (let [{:keys [input-segments state chat-id new-text]} (transfer-mention-result result)]
-    {:set-text-input-value [chat-id new-text]
-     :db                   (-> db
-                               (assoc-in [:chats/mentions chat-id :mentions] state)
-                               (assoc-in [:chat/inputs-with-mentions chat-id] input-segments))}))
+    {:db (-> db
+             (assoc-in [:chats/mentions chat-id :mentions] state)
+             (assoc-in [:chat/inputs-with-mentions chat-id] input-segments))}))

-(rf/defn on-text-input
-  {:events [:mention/on-text-input]}
-  [{:keys [db]} {:keys [previous-text start end] :as args}]
-  (let [previous-text
-        ;; NOTE(rasom): on iOS `previous-text` contains entire input's text. To
-        ;; get only removed part of text we have cut it.
-        (if platform/android?
-          previous-text
-          (subs previous-text start end))
-        chat-id       (:current-chat-id db)
-        state         (merge args {:previous-text previous-text})
-        state         (set/rename-keys state
-                                       {:previous-text :PreviousText
-                                        :new-text      :NewText
-                                        :start         :Start
-                                        :end           :End})
-        params        [chat-id state]
-        method        "wakuext_chatMentionOnTextInput"]
-    (log/debug "[mentions] on-text-input" {:params params})
+(rf/defn on-change-text
+  {:events [:mention/on-change-text]}
+  [{:keys [db]} text]
+  (let [chat-id (:current-chat-id db)
+        params  [chat-id text]
+        method  "wakuext_chatMentionOnChangeText"]
+    (log/debug "[mentions] on-change-text" {:params params})
    {:json-rpc/call [{:method     method
-                      :params     [chat-id state]
-                      :on-success #(rf/dispatch [:mention/on-text-input-success %])
+                      :params     params
+                      :on-success #(rf/dispatch [:mention/on-change-text-success %])
                      :on-error   #(rf/dispatch [:mention/on-error
                                                 {:method method
                                                  :params params} %])}]}))

-(rf/defn on-text-input-success
-  {:events [:mention/on-text-input-success]}
+(rf/defn on-change-text-success
+  {:events [:mention/on-change-text-success]}
  [{:keys [db]} result]
  (log/debug "[mentions] on-text-input-success" {:result result})
-  (let [{:keys [state chat-id]} (transfer-mention-result result)]
-    {:db (assoc-in db [:chats/mentions chat-id :mentions] state)}))
+  (let [{:keys [state chat-id mentionable-users input-segments]} (transfer-mention-result result)]
+    {:db (-> db
+             (assoc-in [:chats/mention-suggestions chat-id] mentionable-users)
+             (assoc-in [:chats/mentions chat-id :mentions] state)
+             (assoc-in [:chat/inputs-with-mentions chat-id] input-segments))}))

 (rf/defn recheck-at-idxs
  [{:keys [db]} public-key]
@@ -159,32 +161,11 @@
              :match         match
              :searched-text searched-text
              :public-key    public-key})
-  (let [{:keys [new-text state chat-id]} (transfer-mention-result result)
-        {:keys [at-sign-idx]}            state
-        cursor                           (+ at-sign-idx (count primary-name) 2)]
+  (let [{:keys [new-text chat-id]} (transfer-mention-result result)]
    (rf/merge
     cofx
-     {:db                   (-> db
-                                (assoc-in [:chats/mention-suggestions chat-id] nil))
-      :set-text-input-value [chat-id new-text text-input-ref]
-      :dispatch             [:chat.ui/set-chat-input-text new-text chat-id]}
-     ;; NOTE(rasom): Some keyboards do not react on selection property passed to
-     ;; text input (specifically Samsung keyboard with predictive text set on).
-     ;; In this case, if the user continues typing after the programmatic change,
-     ;; the new text is added to the last known cursor position before
-     ;; programmatic change. By calling `reset-text-input-cursor` we force the
-     ;; keyboard's cursor position to be changed before the next input.
-     (reset-text-input-cursor text-input-ref cursor)
-     ;; NOTE(roman): on-text-input event is not dispatched when we change input
-     ;; programmatically, so we have to call `on-text-input` manually
-     (on-text-input
-      (let [match-len (count match)
-            start     (inc at-sign-idx)
-            end       (+ start match-len)]
-        {:new-text      match
-         :previous-text searched-text
-         :start         start
-         :end           end}))
+     {:db       (assoc-in db [:chats/mention-suggestions chat-id] nil)
+      :dispatch [:chat.ui/set-chat-input-text new-text chat-id]}
     (recheck-at-idxs public-key))))

 (rf/defn clear-suggestions
@@ -220,7 +201,7 @@
    (when text
      (log/debug "[mentions] check-selection" {:params params})
      {:json-rpc/call [{:method     method
-                        :params     [chat-id text start end]
+                        :params     params
                        :on-success #(rf/dispatch [:mention/on-handle-selection-change-success %])
                        :on-error   #(rf/dispatch [:mention/on-error
                                                   {:method method
@@ -230,38 +211,16 @@
  {:events [:mention/on-handle-selection-change-success]}
  [{:keys [db]} result]
  (log/debug "[mentions] on-check-selection-success" {:result result})
-  (let [{:keys [state chat-id]} (transfer-mention-result result)]
-    {:db (assoc-in db [:chats/mentions chat-id :mentions] (rename-state state))}))
-
-(re-frame/reg-fx
- ::reset-text-input-cursor
- (fn [[ref cursor]]
-   (when ref
-     (status/reset-keyboard-input
-      (rn/find-node-handle (react/current-ref ref))
-      cursor))))
-
-(rf/defn calculate-suggestions
-  {:events [:mention/calculate-suggestions]}
-  [{:keys [db]}]
-  (let [chat-id (:current-chat-id db)
-        text    (get-in db [:chat/inputs chat-id :input-text])
-        params  [chat-id text]
-        method  "wakuext_chatMentionCalculateSuggestions"]
-    (log/debug "[mentions] calculate-suggestions" {:params params})
-    {:json-rpc/call [{:method     method
-                      :params     [chat-id text]
-                      :on-success #(rf/dispatch [:mention/on-calculate-suggestions-success %])
-                      :on-error   #(rf/dispatch [:mention/on-error
-                                                 {:method method
-                                                  :params params} %])}]}))
-
-(rf/defn on-calculate-suggestions-success
-  {:events [:mention/on-calculate-suggestions-success]}
-  [{:keys [db]} result]
-  (log/debug "[mentions] on-calculate-suggestions-success" {:result result})
  (let [{:keys [state chat-id mentionable-users input-segments]} (transfer-mention-result result)]
    {:db (-> db
             (assoc-in [:chats/mention-suggestions chat-id] mentionable-users)
             (assoc-in [:chats/mentions chat-id :mentions] state)
             (assoc-in [:chat/inputs-with-mentions chat-id] input-segments))}))
+
+(re-frame/reg-fx
+ ::reset-text-input-cursor
+ (fn [[ref cursor]]
+   (when ref
+     (native-module/reset-keyboard-input
+      (rn/find-node-handle (react/current-ref ref))
+      cursor))))
@@ -505,7 +505,7 @@
            (handle-response response-js)))

 (rf/defn open-create-community
-  {:events [::open-create-community]}
+  {:events [:legacy-only-for-e2e/open-create-community]}
  [{:keys [db] :as cofx}]
  (rf/merge cofx
            {:db (assoc db :communities/create {:membership constants/community-no-membership-access})}
@@ -9,8 +9,7 @@
 (defn rpc->type
  [{:keys [chat-type name] :as chat}]
  (cond
-    (or (= constants/public-chat-type chat-type)
-        (= constants/profile-chat-type chat-type)
+    (or (= constants/profile-chat-type chat-type)
        (= constants/timeline-chat-type chat-type))
    (assoc chat
           :chat-name  (str "#" name)
@@ -39,10 +38,6 @@
 (defn- unmarshal-members
  [{:keys [members chat-type] :as chat}]
  (cond
-    (= constants/public-chat-type chat-type) (assoc chat
-                                                    :contacts       #{}
-                                                    :admins         #{}
-                                                    :members-joined #{})
    (= constants/private-group-chat-type chat-type) (merge chat
                                                           (reduce members-reducer
                                                                   {:admins         #{}
@@ -96,10 +91,16 @@
       :chat-type               (.-chatType chat)
       :unviewed-messages-count (.-unviewedMessagesCount chat)
       :unviewed-mentions-count (.-unviewedMentionsCount chat)
-       :last-message            {:content      {:text        (.-text chat)
-                                                :parsed-text (types/js->clj (.-parsedText chat))}
-                                 :content-type (.-contentType chat)
-                                 :community-id (.-contentCommunityId chat)}
+       :last-message            {:content            {:text        (.-text chat)
+                                                      :parsed-text (types/js->clj (.-parsedText chat))
+                                                      :response-to (.-responseTo chat)}
+                                 :content-type       (.-contentType chat)
+                                 :community-id       (.-contentCommunityId chat)
+                                 :outgoing           (boolean (.-outgoingStatus chat))
+                                 :album-images-count (.-albumImagesCount chat)
+                                 :from               (.-from chat)
+                                 :deleted?           (.-deleted chat)
+                                 :deleted-for-me?    (.-deletedForMe chat)}
       :last-clock-value        (.-lastClockValue chat)
       :profile-public-key      (.-profile chat)
       :highlight               (.-highlight chat)
@@ -42,7 +42,8 @@
        :imageWidth               :image-width
        :imageHeight              :image-height
        :new                      :new?
-        :albumImagesCount         :album-images-count})
+        :albumImagesCount         :album-images-count
+        :displayName              :display-name})

      (update :quoted-message
              set/rename-keys
@@ -1,23 +1,23 @@
 (ns status-im.ethereum.core
  (:require [clojure.string :as string]
            [status-im.ethereum.eip55 :as eip55]
-            [status-im.native-module.core :as status]))
+            [native-module.core :as native-module]))

 (defn sha3
  [s]
  (when s
-    (status/sha3 (str s))))
+    (native-module/sha3 (str s))))

 (defn utf8-to-hex
  [s]
-  (let [hex (status/utf8-to-hex (str s))]
+  (let [hex (native-module/utf8-to-hex (str s))]
    (if (empty? hex)
      nil
      hex)))

 (defn hex-to-utf8
  [s]
-  (let [utf8 (status/hex-to-utf8 s)]
+  (let [utf8 (native-module/hex-to-utf8 s)]
    (if (empty? utf8)
      nil
      utf8)))
@@ -118,7 +118,7 @@
 (defn address?
  [s]
  (when s
-    (status/address? s)))
+    (native-module/address? s)))

 (defn network->chain-id
  [network]
@@ -5,7 +5,7 @@

   e.g. 0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"
  (:require [clojure.string :as string]
-            [status-im.native-module.core :as status]))
+            [native-module.core :as native-module]))

 (def hex-prefix "0x")

@@ -13,7 +13,7 @@
  "Converts an arbitrary case address to one with correct checksum case."
  [address]
  (when address
-    (status/to-checksum-address
+    (native-module/to-checksum-address
     (if (string/starts-with? address hex-prefix)
       address
       (str hex-prefix address)))))
@@ -21,4 +21,4 @@
 (defn valid-address-checksum?
  "Checks address checksum validity."
  [address]
-  (status/check-address-checksum address))
+  (native-module/check-address-checksum address))
@@ -1,6 +1,6 @@
 (ns status-im.ethereum.encode
-  (:require [status-im.native-module.core :as status]))
+  (:require [native-module.core :as native-module]))

 (defn uint
  [x]
-  (str "0x" (status/number-to-hex x)))
+  (str "0x" (native-module/number-to-hex x)))
@@ -1,6 +1,6 @@
 (ns status-im.ethereum.ens
  (:require [clojure.string :as string]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im2.common.json-rpc.events :as json-rpc]))

 ;; this is the addresses of ens registries for the different networks
@@ -66,7 +66,7 @@
                  :params     [chain-id ens-name]
                  :on-success
                  ;;NOTE: returns a timestamp in s and we want ms
-                  #(cb (* (js/Number (status/hex-to-number %)) 1000))}))
+                  #(cb (* (js/Number (native-module/hex-to-number %)) 1000))}))

 (defn register-prepare-tx
  [chain-id from ens-name pubkey cb]
@@ -7,7 +7,6 @@
    status-im.bootnodes.core
    status-im.browser.core
    status-im.browser.permissions
-    status-im.chat.models
    status-im.chat.models.images
    status-im.chat.models.input
    status-im.chat.models.loading
@@ -30,7 +29,7 @@
    status-im.multiaccounts.logout.core
    [status-im.multiaccounts.model :as multiaccounts.model]
    status-im.multiaccounts.update.core
-    [status-im.native-module.core :as status]
+    [native-module.core :as native-module]
    status-im.network.net-info
    status-im.pairing.core
    status-im.profile.core
@@ -60,6 +59,9 @@
    status-im2.contexts.onboarding.events
    status-im.chat.models.gaps
    [status-im2.navigation.events :as navigation]
+    [status-im2.common.theme.core :as theme]
+    [react-native.core :as rn]
+    [react-native.platform :as platform]
    status-im2.contexts.chat.home.events))

 (re-frame/reg-fx
@@ -85,12 +87,16 @@
 (re-frame/reg-fx
 :ui/close-application
 (fn [_]
-   (status/close-application)))
+   (native-module/close-application)))

 (re-frame/reg-fx
 ::app-state-change-fx
 (fn [state]
-   (status/app-state-change state)))
+   (when (and platform/ios? (= state "active"))
+     ;; Change the app theme if the ios device theme was updated when the app was in the background
+     ;; https://github.com/status-im/status-mobile/issues/15708
+     (theme/change-device-theme (rn/get-color-scheme)))
+   (native-module/app-state-change state)))

 (re-frame/reg-fx
 :ui/listen-to-window-dimensions-change
@@ -142,7 +148,8 @@

 (rf/defn on-return-from-background
  [{:keys [db now] :as cofx}]
-  (let [app-in-background-since (get db :app-in-background-since)
+  (let [new-account?            (get db :onboarding-2/new-account?)
+        app-in-background-since (get db :app-in-background-since)
        signed-up?              (get-in db [:multiaccount :signed-up?])
        biometric-auth?         (= (:auth-method db) "biometric")
        requires-bio-auth       (and
@@ -155,7 +162,8 @@
              {:db (dissoc db :app-in-background-since)}
              (mailserver/process-next-messages-request)
              (wallet/restart-wallet-service-after-background app-in-background-since)
-              (universal-links/process-stored-event)
+              (when-not new-account?
+                (universal-links/process-stored-event))
              #(when-let [chat-id (:current-chat-id db)]
                 {:dispatch [:chat/mark-all-as-read chat-id]})
              #(when requires-bio-auth
@@ -2,21 +2,6 @@
  (:require [re-frame.core :as re-frame]
            [status-im.utils.http :as http]))

-(re-frame/reg-fx
- :http-get
- (fn [{:keys [url response-validator on-success on-error timeout-ms]}]
-   (let [opts {:valid-response? response-validator
-               :timeout-ms      timeout-ms}]
-     (http/get url on-success on-error opts))))
-
-(re-frame/reg-fx
- :http-get-n
- (fn [calls]
-   (doseq [{:keys [url response-validator on-success on-error timeout-ms]} calls]
-     (let [opts {:valid-response? response-validator
-                 :timeout-ms      timeout-ms}]
-       (http/get url on-success on-error opts)))))
-
 (re-frame/reg-fx
 :http-post
 (fn [{:keys [url data response-validator on-success on-error timeout-ms opts]}]
@@ -125,7 +125,7 @@
       (rf-test/wait-for ; wait for login
         [::transport/messenger-started]
         (assert-messenger-started)
-         (rf/dispatch-sync [:status-im.communities.core/open-create-community])
+         (rf/dispatch-sync [:legacy-only-for-e2e/open-create-community])
         (doseq [[k v] (dissoc community :membership)]
           (rf/dispatch-sync [:status-im.communities.core/create-field k v]))
         (rf/dispatch [:status-im.communities.core/create-confirmation-pressed])
@@ -3,7 +3,7 @@
            ["react-native" :refer (BackHandler)]
            [re-frame.core :as re-frame]
            [status-im.keycard.card :as card]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.utils.types :as types]
            [taoensso.timbre :as log]))

@@ -202,7 +202,7 @@
 (re-frame/reg-fx
 :keycard/generate-name-and-photo
 (fn [{:keys [public-key on-success]}]
-   (status/gfycat-identicon-async
+   (native-module/gfycat-identicon-async
    public-key
    (fn [whisper-name photo-path]
      (re-frame/dispatch
@@ -4,7 +4,7 @@
            [clojure.string :as string]
            [status-im.ethereum.core :as ethereum]
            [status-im.keycard.keycard :as keycard]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.utils.platform :as platform]
            [status-im.utils.types :as types]
            [taoensso.timbre :as log]))
@@ -296,7 +296,7 @@

 (defn save-multiaccount-and-login
  [{:keys [key-uid multiaccount-data password settings node-config accounts-data chat-key]}]
-  (status/save-multiaccount-and-login-with-keycard
+  (native-module/save-multiaccount-and-login-with-keycard
   key-uid
   (types/clj->json multiaccount-data)
   password
@@ -307,15 +307,15 @@

 (defn login
  [args]
-  (status/login-with-keycard args))
+  (native-module/login-with-keycard args))

 (defn send-transaction-with-signature
  [{:keys [transaction signature on-completed]}]
-  (status/send-transaction-with-signature transaction signature on-completed))
+  (native-module/send-transaction-with-signature transaction signature on-completed))

 (defn delete-multiaccount-before-migration
  [{:keys [key-uid on-success on-error]}]
-  (status/delete-multiaccount
+  (native-module/delete-multiaccount
   key-uid
   (fn [result]
     (let [{:keys [error]} (types/json->clj result)]
@@ -10,7 +10,7 @@
            status-im.keycard.fx
            [status-im.multiaccounts.create.core :as multiaccounts.create]
            [status-im.multiaccounts.model :as multiaccounts.model]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.popover.core :as popover]
            [utils.re-frame :as rf]
            [utils.datetime :as datetime]
@@ -250,14 +250,14 @@
 (re-frame/reg-fx
 ::finish-migration
 (fn [[account settings password encryption-pass login-params]]
-   (status/convert-to-keycard-account
+   (native-module/convert-to-keycard-account
    account
    settings
    password
    encryption-pass
    #(let [{:keys [error]} (types/json->clj %)]
       (if (string/blank? error)
-         (status/login-with-keycard login-params)
+         (native-module/login-with-keycard login-params)
         (throw
          (js/Error.
           "Please shake the phone to report this error and restart the app. Migration failed unexpectedly.")))))))
@@ -7,7 +7,7 @@
            [utils.i18n :as i18n]
            [status-im.keycard.keycard :as keycard]
            [status-im.multiaccounts.create.core :as multiaccounts.create]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.node.core :as node]
            [status-im.utils.types :as types]
            [status-im.utils.utils :as utils]
@@ -249,14 +249,14 @@
  [{:keys [password on-success]}]
  (when (and (not @initialization)
             (not @derived-acc))
-    (status/multiaccount-import-mnemonic
+    (native-module/multiaccount-import-mnemonic
     "night fortune spider version version armed amused winner matter tonight cave flag"
     nil
     (fn [result]
       (let [{:keys [id] :as root-data}
             (multiaccounts.create/normalize-multiaccount-data-keys
              (types/json->clj result))]
-         (status-im.native-module.core/multiaccount-derive-addresses
+         (native-module.core/multiaccount-derive-addresses
          id
          [constants/path-wallet-root
           constants/path-eip1581
@@ -266,7 +266,7 @@
            (let [derived-data (multiaccounts.create/normalize-derived-data-keys
                                (types/json->clj result))
                  public-key   (get-in derived-data [constants/path-whisper-keyword :public-key])]
-              (status/gfycat-identicon-async
+              (native-module/gfycat-identicon-async
               public-key
               (fn [name photo-path]
                 (let [derived-data-extended
@@ -294,7 +294,7 @@
            (if delete-multiaccount?
              (fn [on-deletion-success]
                (js/alert "OH SHEET")
-                (status/delete-multiaccount
+                (native-module/delete-multiaccount
                 key-uid
                 (fn [result]
                   (let [{:keys [error]} (types/json->clj result)]
@@ -304,7 +304,7 @@
              (fn [cb] (cb)))]
        (deletion-wrapper
         (fn []
-           (status/multiaccount-store-derived
+           (native-module/multiaccount-store-derived
            id
            (:key-uid response)
            [constants/path-wallet-root
@@ -398,14 +398,14 @@
          path-num (inc (get-in @re-frame.db/app-db
                                [:multiaccount :latest-derived-path]))
          path (str "m/" path-num)]
-      (status/multiaccount-load-account
+      (native-module/multiaccount-load-account
       wallet-root-address
       hashed-password
       (fn [value]
         (let [{:keys [id error]} (types/json->clj value)]
           (if error
             (re-frame/dispatch [::new-account-error :password-error error])
-             (status/multiaccount-derive-addresses
+             (native-module/multiaccount-derive-addresses
              id
              [path]
              (fn [derived]
@@ -413,7 +413,7 @@
                  (if (some (fn [a] (= derived-address (get a :address))) accounts)
                    (re-frame/dispatch [::new-account-error :account-error
                                        (i18n/label :t/account-exists-title)])
-                    (status/multiaccount-store-derived
+                    (native-module/multiaccount-store-derived
                     id
                     key-uid
                     [path]
@@ -436,7 +436,7 @@
                (swap! state assoc-in
                  [:application-info :key-uid]
                  (:key-uid keys))
-                (status/multiaccount-store-derived
+                (native-module/multiaccount-store-derived
                 id
                 (:key-uid keys)
                 [constants/path-wallet-root
@@ -473,7 +473,7 @@
                               {:account  address
                                :password password
                                :data     (or data (str "0x" hash))})]
-                   (status/sign-message
+                   (native-module/sign-message
                    params
                    (fn [res]
                      (let [signature (-> res
@@ -481,7 +481,7 @@
                                          :result
                                          ethereum/normalized-hex)]
                        (on-success signature)))))
-                 (status/sign-typed-data
+                 (native-module/sign-typed-data
                  data
                  address
                  password
@@ -498,7 +498,7 @@

 (defn save-multiaccount-and-login
  [{:keys [key-uid multiaccount-data password settings node-config accounts-data]}]
-  (status/save-account-and-login
+  (native-module/save-account-and-login
   key-uid
   (types/clj->json multiaccount-data)
   password
@@ -508,11 +508,11 @@

 (defn login
  [{:keys [key-uid multiaccount-data password]}]
-  (status/login-with-config key-uid multiaccount-data password node/login-node-config))
+  (native-module/login-with-config key-uid multiaccount-data password node/login-node-config))

 (defn send-transaction-with-signature
  [{:keys [transaction on-completed]}]
-  (status/send-transaction transaction account-password on-completed))
+  (native-module/send-transaction transaction account-password on-completed))

 (defn delete-multiaccount-before-migration
  [{:keys [on-success]}]
@@ -3,7 +3,7 @@
            [quo.design-system.colors :as colors]
            [re-frame.core :as re-frame]
            [utils.i18n :as i18n]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.popover.core :as popover]
            [utils.re-frame :as rf]
            [status-im.utils.keychain.core :as keychain]
@@ -17,7 +17,7 @@

 ;;; android blacklist based on device info:

-(def deviceinfo (status/get-device-model-info))
+(def deviceinfo (native-module/get-device-model-info))

 ;; {:model     ?
 ;;   :brand     "Xiaomi"
@@ -4,7 +4,7 @@
            [re-frame.core :as re-frame]
            [status-im.bottom-sheet.events :as bottom-sheet]
            [status-im.multiaccounts.update.core :as multiaccounts.update]
-            [status-im.native-module.core :as native-module]
+            [native-module.core :as native-module]
            [utils.re-frame :as rf]
            [quo2.foundations.colors :as colors]
            [status-im2.constants :as constants]
@@ -150,6 +150,7 @@
     (re-frame/dispatch [:change-shell-status-bar-style
                         (if (shell.animation/home-stack-open?) status-bar-theme :light)])
     (when reload-ui?
+       (rf/dispatch [:dissmiss-all-overlays])
       (hot-reload/reload)
       (when-not (= view-id :shell-stack)
         (re-frame/dispatch [:change-shell-nav-bar-color nav-bar-color]))))))
@@ -6,7 +6,7 @@
            [status-im.ethereum.core :as ethereum]
            [status-im.ethereum.eip55 :as eip55]
            [utils.i18n :as i18n]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.node.core :as node]
            [status-im2.config :as config]
            [utils.re-frame :as rf]
@@ -44,7 +44,7 @@
 (re-frame/reg-fx
 ::store-multiaccount
 (fn [[id key-uid hashed-password callback]]
-   (status/multiaccount-store-derived
+   (native-module/multiaccount-store-derived
    id
    key-uid
    [constants/path-wallet-root
@@ -69,7 +69,7 @@
      (fn [result]
        (let [derived-data (normalize-derived-data-keys (types/json->clj result))
              public-key   (get-in derived-data [constants/path-whisper-keyword :public-key])]
-          (status/gfycat-identicon-async
+          (native-module/gfycat-identicon-async
           public-key
           (fn [name identicon]
             (let [derived-whisper       (derived-data constants/path-whisper-keyword)
@@ -81,7 +81,7 @@
 (re-frame/reg-fx
 :multiaccount-generate-and-derive-addresses
 (fn []
-   (status/multiaccount-generate-and-derive-addresses
+   (native-module/multiaccount-generate-and-derive-addresses
    5
    12
    [constants/path-whisper
@@ -127,7 +127,7 @@
 (re-frame/reg-fx
 ::save-account-and-login
 (fn [[key-uid multiaccount-data hashed-password settings config accounts-data]]
-   (status/save-account-and-login
+   (native-module/save-account-and-login
    key-uid
    multiaccount-data
    hashed-password
@@ -11,7 +11,7 @@
            [status-im.multiaccounts.logout.core :as multiaccounts.logout]
            [status-im.multiaccounts.model :as multiaccounts.model]
            [status-im.multiaccounts.recover.core :as multiaccounts.recover]
-            [status-im.native-module.core :as native-module]
+            [native-module.core :as native-module]
            [status-im.popover.core :as popover]
            [utils.re-frame :as rf]
            [status-im.utils.types :as types]
@@ -20,7 +20,7 @@
    [status-im.mobile-sync-settings.core :as mobile-network]
    [status-im.multiaccounts.biometric.core :as biometric]
    [status-im.multiaccounts.core :as multiaccounts]
-    [status-im.native-module.core :as status]
+    [native-module.core :as native-module]
    [status-im.node.core :as node]
    [status-im.notifications.core :as notifications]
    [status-im.popover.core :as popover]
@@ -58,22 +58,22 @@
 (re-frame/reg-fx
 ::login
 (fn [[key-uid account-data hashed-password]]
-   (status/login-with-config key-uid account-data hashed-password node/login-node-config)))
+   (native-module/login-with-config key-uid account-data hashed-password node/login-node-config)))

 (re-frame/reg-fx
 ::export-db
 (fn [[key-uid account-data hashed-password callback]]
-   (status/export-db key-uid account-data hashed-password callback)))
+   (native-module/export-db key-uid account-data hashed-password callback)))

 (re-frame/reg-fx
 ::import-db
 (fn [[key-uid account-data hashed-password]]
-   (status/import-db key-uid account-data hashed-password)))
+   (native-module/import-db key-uid account-data hashed-password)))

 (re-frame/reg-fx
 ::enable-local-notifications
 (fn []
-   (status/start-local-notifications)))
+   (native-module/start-local-notifications)))

 (re-frame/reg-fx
 ::initialize-wallet-connect
@@ -363,7 +363,7 @@

 (rf/defn get-node-config
  [_]
-  (status/get-node-config #(re-frame/dispatch [::get-node-config-callback %])))
+  (native-module/get-node-config #(re-frame/dispatch [::get-node-config-callback %])))

 (rf/defn redirect-to-root
  "Decides which root should be initialised depending on user and app state"
@@ -2,7 +2,7 @@
  (:require [re-frame.core :as re-frame]
            [utils.i18n :as i18n]
            [status-im.multiaccounts.core :as multiaccounts]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.notifications.core :as notifications]
            [utils.re-frame :as rf]
            [status-im.utils.keychain.core :as keychain]
@@ -16,7 +16,6 @@
    (rf/merge cofx
              {:set-root                             :progress
               :chat.ui/clear-inputs                 nil
-               :chat.ui/clear-inputs-old             nil
               :shell/reset-bottom-tabs              nil
               :hide-popover                         nil
               ::logout                              nil
@@ -62,4 +61,4 @@
 (re-frame/reg-fx
 ::logout
 (fn []
-   (status/logout)))
+   (native-module/logout)))
@@ -9,7 +9,7 @@
            [status-im.keycard.nfc :as nfc]
            [status-im.multiaccounts.core :as multiaccounts]
            [status-im.multiaccounts.create.core :as multiaccounts.create]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.popover.core :as popover]
            [utils.re-frame :as rf]
            [status-im.utils.types :as types]
@@ -89,14 +89,14 @@
 ::import-multiaccount
 (fn [{:keys [passphrase password success-event]}]
   (log/debug "[recover] ::import-multiaccount")
-   (status/multiaccount-import-mnemonic
+   (native-module/multiaccount-import-mnemonic
    passphrase
    password
    (fn [result]
      (let [{:keys [id] :as root-data}
            (multiaccounts.create/normalize-multiaccount-data-keys
             (types/json->clj result))]
-        (status-im.native-module.core/multiaccount-derive-addresses
+        (native-module.core/multiaccount-derive-addresses
         id
         [constants/path-wallet-root
          constants/path-eip1581
@@ -106,7 +106,7 @@
           (let [derived-data (multiaccounts.create/normalize-derived-data-keys
                               (types/json->clj result))
                 public-key   (get-in derived-data [constants/path-whisper-keyword :public-key])]
-             (status/gfycat-identicon-async
+             (native-module/gfycat-identicon-async
              public-key
              (fn [name identicon]
                (let [derived-data-extended
@@ -2,7 +2,7 @@
  (:require [clojure.string :as string]
            [re-frame.core :as re-frame]
            [status-im.ethereum.core :as ethereum]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.popover.core :as popover]
            [utils.re-frame :as rf]
            [status-im.utils.keychain.core :as keychain]
@@ -59,7 +59,7 @@
 (re-frame/reg-fx
 ::change-db-password
 (fn [[key-uid {:keys [current-password new-password]}]]
-   (status/reset-password
+   (native-module/reset-password
    key-uid
    (ethereum/sha3 (security/safe-unmask-data current-password))
    (ethereum/sha3 (security/safe-unmask-data new-password))
@@ -88,9 +88,9 @@
 ::validate-current-password-and-reset
 (fn [{:keys [address current-password] :as form-vals}]
   (let [hashed-pass (ethereum/sha3 (security/safe-unmask-data current-password))]
-     (status/verify address
-                    hashed-pass
-                    (partial handle-verification form-vals)))))
+     (native-module/verify address
+                           hashed-pass
+                           (partial handle-verification form-vals)))))

 (rf/defn reset
  {:events [::reset]}
@@ -2,7 +2,7 @@
  (:require ["@react-native-community/netinfo" :default net-info]
            [re-frame.core :as re-frame]
            [status-im.mobile-sync-settings.core :as mobile-network]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [utils.re-frame :as rf]
            [status-im.wallet.core :as wallet]
            [taoensso.timbre :as log]))
@@ -59,4 +59,4 @@
 (re-frame/reg-fx
 :network/notify-status-go
 (fn [[network-type expensive?]]
-   (status/connection-change network-type expensive?)))
+   (native-module/connection-change network-type expensive?)))
@@ -1,6 +1,6 @@
 (ns status-im.node.core
  (:require [re-frame.core :as re-frame]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im2.config :as config]
            [utils.re-frame :as rf]
            [status-im.utils.platform :as utils.platform]
@@ -221,4 +221,4 @@ app-db"
 (re-frame/reg-fx
 ::prepare-new-config
 (fn [[key-uid config callback]]
-   (status/prepare-dir-and-update-config key-uid config callback)))
+   (native-module/prepare-dir-and-update-config key-uid config callback)))
@@ -11,9 +11,9 @@
            [status-im.notifications.android :as pn-android]
            [utils.re-frame :as rf]
            [status-im.utils.money :as money]
-            [status-im.utils.react-native :as react-native-utils]
            [status-im.utils.types :as types]
-            [status-im.utils.utils :as utils]))
+            [status-im.utils.utils :as utils]
+            [react-native.core :as rn]))

 (def default-erc20-token
  {:symbol   :ERC20
@@ -56,7 +56,7 @@
                       (fn [notification]
                         (handle-notification-press {:userInfo (bean/bean (.getData ^js
                                                                                    notification))})))
-    (.addListener ^js react-native-utils/device-event-emitter
+    (.addListener ^js rn/device-event-emitter
                  notification-event-android
                  (fn [^js data]
                    (when (and data (.-dataJSON data))
@@ -1,7 +1,5 @@
 (ns status-im.qr-scanner.core
  (:require [re-frame.core :as re-frame]
-            [status-im.add-new.db :as new-chat.db]
-            [status-im.chat.models :as chat]
            [status-im.ethereum.core :as ethereum]
            [status-im.group-chats.core :as group-chats]
            [utils.i18n :as i18n]
@@ -43,25 +41,24 @@
            {:browser/show-browser-selection url}
            (navigation/navigate-back)))

+(defn own-public-key?
+  [{:keys [multiaccount]} public-key]
+  (= (:public-key multiaccount) public-key))
+
 (rf/defn handle-private-chat
  [{:keys [db] :as cofx} {:keys [chat-id]}]
-  (if-not (new-chat.db/own-public-key? db chat-id)
+  (if-not (own-public-key? db chat-id)
    {:dispatch [:chat.ui/start-chat chat-id]}
    {:utils/show-popup {:title   (i18n/label :t/unable-to-read-this-code)
                        :content (i18n/label :t/can-not-add-yourself)}}))

-(rf/defn handle-public-chat
-  [cofx {:keys [topic]}]
-  (when (seq topic)
-    (chat/start-public-chat cofx topic)))
-
 (rf/defn handle-group-chat
  [cofx params]
  (group-chats/create-from-link cofx params))

 (rf/defn handle-view-profile
  [{:keys [db] :as cofx} {:keys [public-key ens-name]}]
-  (let [own (new-chat.db/own-public-key? db public-key)]
+  (let [own (own-public-key? db public-key)]
    (cond
      (and public-key own)
      (rf/merge cofx
@@ -85,11 +82,6 @@
            (navigation/change-tab :wallet-stack)
            (navigation/pop-to-root :shell-stack)))

-(rf/defn handle-wallet-connect
-  {:events [::handle-wallet-connect-uri]}
-  [cofx data]
-  {:dispatch [:wallet-connect/pair data]})
-
 (rf/defn handle-local-pairing
  {:events [::handle-local-pairing-uri]}
  [_ data]
@@ -99,7 +91,6 @@
  {:events [::match-scanned-value]}
  [cofx {:keys [type] :as data}]
  (case type
-    :public-chat  (handle-public-chat cofx data)
    :group-chat   (handle-group-chat cofx data)
    :private-chat (handle-private-chat cofx data)
    :contact      (handle-view-profile cofx data)
@@ -65,11 +65,3 @@
           k
           (get ui k))
         k)))
-
-(def reactions-old
-  {:love        (js/require "../resources/images/reactions/love.png")
-   :angry       (js/require "../resources/images/reactions/angry.png")
-   :sad         (js/require "../resources/images/reactions/sad.png")
-   :laugh       (js/require "../resources/images/reactions/laugh.png")
-   :thumbs-up   (js/require "../resources/images/reactions/thumbs-up.png")
-   :thumbs-down (js/require "../resources/images/reactions/thumbs-down.png")})
@@ -2,16 +2,15 @@
  (:require [bidi.bidi :as bidi]
            [clojure.string :as string]
            [re-frame.core :as re-frame]
-            [status-im.add-new.db :as public-chat.db]
            [status-im2.contexts.chat.events :as chat.events]
            [status-im2.constants :as constants]
            [status-im.ethereum.core :as ethereum]
            [status-im.ethereum.eip681 :as eip681]
            [status-im.ethereum.ens :as ens]
            [status-im.utils.types :as types]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.ethereum.stateofus :as stateofus]
-            [status-im2.utils.validators :as validators]
+            [utils.validators :as validators]
            [status-im.utils.http :as http]
            [status-im.utils.wallet-connect :as wallet-connect]
            [taoensso.timbre :as log]
@@ -21,8 +20,6 @@

 (def uri-schemes ["status-im://" "status-im:"])

-(def wallet-connect-scheme "wc:")
-
 (def web-prefixes ["https://" "http://" "https://www." "http://wwww."])

 (def web2-domain "join.status.im")
@@ -48,9 +45,7 @@

 (def routes
  [""
-   {handled-schemes {["" :chat-id]         :public-chat
-                     "chat"                {["/public/" :chat-id] :public-chat}
-                     "b/"                  browser-extractor
+   {handled-schemes {"b/"                  browser-extractor
                     "browser/"            browser-extractor
                     ["p/" :chat-id]       :private-chat
                     ["cr/" :community-id] :community-requests
@@ -83,8 +78,9 @@
                 :ens-name   ens-name})

      valid-compressed-key?
-      (status/compressed-key->public-key
+      (native-module/compressed-key->public-key
       user-id
+       constants/deserialization-key
       (fn [response]
         (let [{:keys [error]} (types/json->clj response)]
           (when-not error
@@ -106,14 +102,6 @@
      (callback {:type  :contact
                 :error :not-found}))))

-(defn match-public-chat
-  [{:keys [chat-id]}]
-  (if (public-chat.db/valid-topic? chat-id)
-    {:type  :public-chat
-     :topic chat-id}
-    {:type  :public-chat
-     :error :invalid-topic}))
-
 (defn match-group-chat
  [chats {:strs [a a1 a2]}]
  (let [[admin-pk encoded-chat-name chat-id] [a a1 a2]
@@ -224,8 +212,6 @@
  (let [{:keys [handler route-params query-params]} (match-uri uri)]
    (log/info "[router] uri " uri " matched " handler " with " route-params)
    (cond
-      (= handler :public-chat)
-      (cb (match-public-chat route-params))

      (= handler :browser)
      (cb (match-browser uri route-params))
@@ -18,9 +18,6 @@
                          :query-params (when (= 3 (count expected)) (last expected))
                          :uri          uri})

-   "status-im://status"
-    [:public-chat {:chat-id "status"}]
-
   "status-im://u/statuse2e"
    [:user {:user-id "statuse2e"}]

@@ -36,9 +33,6 @@
   (str "https://join.status.im/g/args?a=" public-key "&a1=" chat-name-url "&a2=" chat-id)
    [:group-chat {:params "arg"} {"a" public-key "a1" chat-name "a2" chat-id}]

-   "https://join.status.im/status"
-    [:public-chat {:chat-id "status"}]
-
   "https://join.status.im/u/statuse2e"
    [:user {:user-id "statuse2e"}]

@@ -9,7 +9,7 @@
            [utils.i18n :as i18n]
            [status-im.keycard.card :as keycard.card]
            [status-im.keycard.common :as keycard.common]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.signing.eip1559 :as eip1559]
            [status-im.signing.keycard :as signing.keycard]
            [utils.re-frame :as rf]
@@ -26,9 +26,9 @@
 (re-frame/reg-fx
 :signing/send-transaction-fx
 (fn [{:keys [tx-obj hashed-password cb]}]
-   (status/send-transaction (types/clj->json tx-obj)
-                            hashed-password
-                            cb)))
+   (native-module/send-transaction (types/clj->json tx-obj)
+                                   hashed-password
+                                   cb)))

 (re-frame/reg-fx
 :signing/show-transaction-error
@@ -43,21 +43,21 @@
 (re-frame/reg-fx
 :signing.fx/sign-message
 (fn [{:keys [params on-completed]}]
-   (status/sign-message (types/clj->json params)
-                        on-completed)))
+   (native-module/sign-message (types/clj->json params)
+                               on-completed)))

 (re-frame/reg-fx
 :signing.fx/recover-message
 (fn [{:keys [params on-completed]}]
-   (status/recover-message (types/clj->json params)
-                           on-completed)))
+   (native-module/recover-message (types/clj->json params)
+                                  on-completed)))

 (re-frame/reg-fx
 :signing.fx/sign-typed-data
 (fn [{:keys [v4 data account on-completed hashed-password]}]
   (if v4
-     (status/sign-typed-data-v4 data account hashed-password on-completed)
-     (status/sign-typed-data data account hashed-password on-completed))))
+     (native-module/sign-typed-data-v4 data account hashed-password on-completed)
+     (native-module/sign-typed-data data account hashed-password on-completed))))

 (defn get-contact
  [db to]
@@ -109,18 +109,18 @@
      (sign-message cofx)
      (let [tx-obj-to-send (merge tx-obj
                                  (when gas
-                                    {:gas (str "0x" (status/number-to-hex gas))})
+                                    {:gas (str "0x" (native-module/number-to-hex gas))})
                                  (when gasPrice
-                                    {:gasPrice (str "0x" (status/number-to-hex gasPrice))})
+                                    {:gasPrice (str "0x" (native-module/number-to-hex gasPrice))})
                                  (when nonce
-                                    {:nonce (str "0x" (status/number-to-hex nonce))})
+                                    {:nonce (str "0x" (native-module/number-to-hex nonce))})
                                  (when maxPriorityFeePerGas
                                    {:maxPriorityFeePerGas (str "0x"
-                                                                (status/number-to-hex
+                                                                (native-module/number-to-hex
                                                                 (js/parseInt maxPriorityFeePerGas)))})
                                  (when maxFeePerGas
                                    {:maxFeePerGas (str "0x"
-                                                        (status/number-to-hex
+                                                        (native-module/number-to-hex
                                                         (js/parseInt maxFeePerGas)))}))]
        (when-not in-progress?
          {:db                          (update db :signing/sign assoc :error nil :in-progress? true)
@@ -184,7 +184,7 @@
  (let [{:keys [symbol decimals] :as token} (tokens/address->token (:wallet/all-tokens db) to)]
    (when (and token data (string? data))
      (when-let [type (get-method-type data)]
-        (let [[address value _] (status/decode-parameters
+        (let [[address value _] (native-module/decode-parameters
                                 (str "0x" (subs data 10))
                                 (if (= type :approve-and-call)
                                   ["address" "uint256" "bytes"]
@@ -476,7 +476,7 @@
  {:events [:wallet.ui/sign-transaction-button-clicked-from-chat]}
  [{:keys [db] :as cofx} {:keys [to amount from token]}]
  (let [{:keys [symbol address]} token
-        amount-hex               (str "0x" (status/number-to-hex amount))
+        amount-hex               (str "0x" (native-module/number-to-hex amount))
        to-norm                  (ethereum/normalized-hex (if (string? to) to (:address to)))
        from-address             (:address from)
        identity                 (:current-chat-id db)
@@ -495,7 +495,7 @@
                         :from     from-address
                         :chat-id  identity
                         :command? true
-                         :data     (status/encode-transfer to-norm amount-hex)})}))
+                         :data     (native-module/encode-transfer to-norm amount-hex)})}))
      {:db db
       :json-rpc/call
       [{:method      "wakuext_requestAddressForTransaction"
@@ -512,7 +512,7 @@
  [{:keys [db] :as cofx} {:keys [amount from token]}]
  (let [{:keys [request-parameters chat-id]} (:wallet/prepare-transaction db)
        {:keys [symbol address]}             token
-        amount-hex                           (str "0x" (status/number-to-hex amount))
+        amount-hex                           (str "0x" (native-module/number-to-hex amount))
        to-norm                              (:address request-parameters)
        from-address                         (:address from)]
    (rf/merge cofx
@@ -532,13 +532,13 @@
                             :command?   true
                             :message-id (:id request-parameters)
                             :chat-id    chat-id
-                             :data       (status/encode-transfer to-norm amount-hex)})})))))
+                             :data       (native-module/encode-transfer to-norm amount-hex)})})))))

 (rf/defn sign-transaction-button-clicked
  {:events [:wallet.ui/sign-transaction-button-clicked]}
  [{:keys [db] :as cofx} {:keys [to amount from token gas gasPrice maxFeePerGas maxPriorityFeePerGas]}]
  (let [{:keys [symbol address]} token
-        amount-hex               (str "0x" (status/number-to-hex amount))
+        amount-hex               (str "0x" (native-module/number-to-hex amount))
        to-norm                  (ethereum/normalized-hex (if (string? to) to (:address to)))
        from-address             (:address from)]
    (rf/merge cofx
@@ -558,7 +558,7 @@
                                 {:to    to-norm
                                  :value amount-hex}
                                 {:to   (ethereum/normalized-hex address)
-                                  :data (status/encode-transfer to-norm amount-hex)}))}))))
+                                  :data (native-module/encode-transfer to-norm amount-hex)}))}))))

 (re-frame/reg-fx
 :signing/get-transaction-by-hash-fx
@@ -1,15 +1,15 @@
 (ns status-im.signing.core-test
  (:require [cljs.test :refer-macros [deftest is testing]]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.signing.core :as signing]))

 (deftest signing-test
  (testing "showing sheet"
    (let [to          "0x2f88d65f3cb52605a54a833ae118fb1363acccd2"
          contract    "0xc55cf4b03948d7ebc8b9e8bad92643703811d162"
-          amount1-hex (str "0x" (status/number-to-hex "10000000000000000000"))
-          amount2-hex (str "0x" (status/number-to-hex "100000000000000000000"))
-          data        (status/encode-transfer to amount2-hex)
+          amount1-hex (str "0x" (native-module/number-to-hex "10000000000000000000"))
+          amount2-hex (str "0x" (native-module/number-to-hex "100000000000000000000"))
+          data        (native-module/encode-transfer to amount2-hex)
          first-tx    {:tx-obj {:to    to
                                :from  nil
                                :value amount1-hex}}
@@ -1,7 +1,7 @@
 (ns status-im.signing.keycard
  (:require [re-frame.core :as re-frame]
            [utils.i18n :as i18n]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [utils.re-frame :as rf]
            [status-im.utils.types :as types]
            [taoensso.timbre :as log]))
@@ -9,19 +9,19 @@
 (re-frame/reg-fx
 ::hash-transaction
 (fn [{:keys [transaction on-completed]}]
-   (status/hash-transaction (types/clj->json transaction) on-completed)))
+   (native-module/hash-transaction (types/clj->json transaction) on-completed)))

 (re-frame/reg-fx
 ::hash-message
 (fn [{:keys [message on-completed]}]
-   (status/hash-message message on-completed)))
+   (native-module/hash-message message on-completed)))

 (re-frame/reg-fx
 ::hash-typed-data
 (fn [{:keys [v4 data on-completed]}]
   (if v4
-     (status/hash-typed-data-v4 data on-completed)
-     (status/hash-typed-data data on-completed))))
+     (native-module/hash-typed-data-v4 data on-completed)
+     (native-module/hash-typed-data data on-completed))))

 (defn prepare-transaction
  [{:keys [gas gasPrice data nonce tx-obj] :as params}]
@@ -37,17 +37,17 @@
      maxPriorityFeePerGas
      (assoc :maxPriorityFeePerGas
             (str "0x"
-                  (status/number-to-hex
+                  (native-module/number-to-hex
                   (js/parseInt maxPriorityFeePerGas))))
      maxFeePerGas
      (assoc :maxFeePerGas
             (str "0x"
-                  (status/number-to-hex
+                  (native-module/number-to-hex
                   (js/parseInt maxFeePerGas))))
      gas
-      (assoc :gas (str "0x" (status/number-to-hex gas)))
+      (assoc :gas (str "0x" (native-module/number-to-hex gas)))
      gasPrice
-      (assoc :gasPrice (str "0x" (status/number-to-hex gasPrice)))
+      (assoc :gasPrice (str "0x" (native-module/number-to-hex gasPrice)))
      data
      (assoc :data data)
      nonce
@@ -45,11 +45,13 @@
  {:events [::messenger-started]}
  [{:keys [db] :as cofx} {:keys [mailservers] :as response}]
  (log/info "Messenger started")
-  (rf/merge cofx
-            {:db (-> db
-                     (assoc :messenger/started? true)
-                     (add-mailservers mailservers))}
-            (fetch-node-info-fx)
-            (pairing/init)
-            (stickers/load-packs)
-            (universal-links/process-stored-event)))
+  (let [new-account? (get db :onboarding-2/new-account?)]
+    (rf/merge cofx
+              {:db (-> db
+                       (assoc :messenger/started? true)
+                       (add-mailservers mailservers))}
+              (fetch-node-info-fx)
+              (pairing/init)
+              (stickers/load-packs)
+              (when-not new-account?
+                (universal-links/process-stored-event)))))
@@ -1,362 +0,0 @@
-(ns status-im.ui.screens.add-new.new-chat.views
-  (:require
-    [clojure.string :as string]
-    [quo.core :as quo]
-    [quo.design-system.colors :as colors]
-    [quo.platform :as platform]
-    [quo.react-native :as rn]
-    [re-frame.core :as re-frame]
-    [reagent.core :as reagent]
-    [status-im.ethereum.ens :as ens]
-    [utils.i18n :as i18n]
-    [status-im.multiaccounts.core :as multiaccounts]
-    [status-im.qr-scanner.core :as qr-scanner]
-    [status-im.ui.components.animation :as animation]
-    [status-im.ui.components.chat-icon.screen :as chat-icon]
-    [status-im.ui.components.icons.icons :as icons]
-    [status-im.ui.components.invite.views :as invite]
-    [status-im.ui.components.keyboard-avoid-presentation :as kb-presentation]
-    [status-im.ui.components.list.views :as list]
-    [status-im.ui.components.react :as react]
-    [status-im.ui.components.topbar :as topbar]
-    [status-im.ui.screens.chat.photos :as photos]
-    [status-im2.utils.validators :as validators]
-    [status-im.utils.gfycat.core :as gfycat]
-    [status-im.utils.identicon :as identicon]
-    [status-im.utils.utils :as utils]
-    [utils.debounce :as debounce])
-  (:require-macros [status-im.utils.views :as views]))
-
-(defn- render-row
-  [row]
-  [quo/list-item
-   {:title    (:primary-name row)
-    :icon     [chat-icon/contact-icon-contacts-tab
-               (multiaccounts/displayed-photo row)]
-    :on-press #(re-frame/dispatch [:chat.ui/start-chat
-                                   (:public-key row)])}])
-
-(defn- icon-wrapper
-  [color icon]
-  [react/view
-   {:style {:width            32
-            :height           32
-            :border-radius    25
-            :align-items      :center
-            :justify-content  :center
-            :background-color color}}
-   icon])
-
-(defn- input-icon
-  [state new-contact? entered-nickname blocked?]
-  (let [icon (if new-contact? :main-icons/add :main-icons/arrow-right)]
-    (cond
-      (= state :searching)
-      [icon-wrapper colors/gray
-       [react/activity-indicator {:color colors/white-persist}]]
-
-      (and (= state :valid) (not blocked?))
-      [react/touchable-highlight
-       {:on-press #(debounce/dispatch-and-chill [:contact.ui/contact-code-submitted new-contact?
-                                                 entered-nickname]
-                                                3000)}
-       [icon-wrapper colors/blue
-        [icons/icon icon {:color colors/white-persist}]]]
-
-      :else
-      [icon-wrapper colors/gray
-       [icons/icon icon {:color colors/white-persist}]])))
-
-(defn get-validation-label
-  [value]
-  (case value
-    :invalid
-    (i18n/label :t/profile-not-found)
-    :yourself
-    (i18n/label :t/can-not-add-yourself)))
-
-(defn search-contacts
-  [filter-text {:keys [name alias nickname]}]
-  (or
-   (string/includes? (string/lower-case (str name)) filter-text)
-   (string/includes? (string/lower-case (str alias)) filter-text)
-   (when nickname
-     (string/includes? (string/lower-case (str nickname)) filter-text))))
-
-(defn filter-contacts
-  [filter-text contacts]
-  (let [lower-filter-text (string/lower-case filter-text)]
-    (if filter-text
-      (filter (partial search-contacts lower-filter-text) contacts)
-      contacts)))
-
-(defn is-public-key?
-  [k]
-  (and
-   (string? k)
-   (string/starts-with? k "0x")))
-
-(defn is-valid-username?
-  [username]
-  (let [is-chat-key? (and (is-public-key? username)
-                          (= (count username) 132))
-        is-ens?      (ens/valid-eth-name-prefix? username)]
-    (or is-chat-key? is-ens?)))
-
-(defn translate-anim
-  [translate-y-value translate-y-anim-value]
-  (animation/start
-   (animation/timing translate-y-anim-value
-                     {:toValue         translate-y-value
-                      :duration        200
-                      :useNativeDriver true})))
-(views/defview new-chat
-  []
-  (views/letsubs [contacts                                  [:contacts/active]
-                  {:keys [state ens-name public-key error]} [:contacts/new-identity]
-                  search-value                              (reagent/atom "")
-                  account                                   @(re-frame/subscribe [:multiaccount])
-                  on-share                                  #(re-frame/dispatch
-                                                              [:show-popover
-                                                               {:view     :share-chat-key
-                                                                :address  (account :public-key)
-                                                                :ens-name (account :preferred-name)}])
-                  my-profile-button-anim-y                  (animation/create-value 0)
-                  keyboard-show-listener                    (atom nil)
-                  keyboard-hide-listener                    (atom nil)
-                  on-keyboard-show                          (fn []
-                                                              ;; 42 is the bottom position so we
-                                                              ;; translate it by 32 pts to leave 10 as
-                                                              ;; margin
-                                                              (translate-anim 32
-                                                                              my-profile-button-anim-y))
-                  on-keyboard-hide                          (fn []
-                                                              (translate-anim 0
-                                                                              my-profile-button-anim-y))
-                  keyboard-show-event                       (if platform/android?
-                                                              "keyboardDidShow"
-                                                              "keyboardWillShow")
-                  keyboard-hide-event                       (if platform/android?
-                                                              "keyboardDidHide"
-                                                              "keyboardWillHide")]
-    {:component-did-mount
-     (fn [_]
-       (reset! keyboard-show-listener (.addListener react/keyboard keyboard-show-event on-keyboard-show))
-       (reset! keyboard-hide-listener (.addListener react/keyboard
-                                                    keyboard-hide-event
-                                                    on-keyboard-hide)))
-     :component-will-unmount
-     (fn []
-       (some-> ^js @keyboard-show-listener
-               .remove)
-       (some-> ^js @keyboard-hide-listener
-               .remove))}
-    [kb-presentation/keyboard-avoiding-view {:style {:flex 1}}
-     [react/view {:style {:flex 1}}
-      [topbar/topbar
-       {:title (i18n/label :t/new-chat)
-        :modal? true
-        :right-accessories
-        [{:icon                :qr
-          :accessibility-label :scan-contact-code-button
-          :on-press            #(re-frame/dispatch [::qr-scanner/scan-code
-                                                    {:title   (i18n/label :t/new-chat)
-                                                     :handler :contact/qr-code-scanned}])}]}]
-      [react/view
-       {:flex-direction :row
-        :padding        16}
-       [react/view {:flex 1}
-        [quo/text-input
-         {:on-change-text
-          #(do
-             (reset! search-value %)
-             (re-frame/dispatch [:set-in [:contacts/new-identity :state] :empty])
-             (debounce/debounce-and-dispatch [:contacts/set-new-identity %] 600))
-          :on-submit-editing
-          #(when (= state :valid)
-             (debounce/dispatch-and-chill [:contact.ui/contact-code-submitted false nil] 3000))
-          :placeholder (i18n/label :t/enter-contact-code)
-          :show-cancel false
-          :accessibility-label :enter-contact-code-input
-          :auto-capitalize :none
-          :return-key-type :go
-          :monospace true
-          :auto-correct false}]]]
-      [react/scroll-view
-       {:style                        {:flex 1}
-        :keyboard-dismiss-mode        :on-drag
-        :keyboard-should-persist-taps :handled}
-       [react/view
-        (when (and
-               (= (count contacts) 0)
-               (= @search-value ""))
-          {:flex 1})
-        (if (and
-             (= (count contacts) 0)
-             (= @search-value ""))
-          [react/view
-           {:flex               1
-            :align-items        :center
-            :padding-horizontal 58
-            :padding-top        160}
-           [quo/text
-            {:size  :base
-             :align :center
-             :color :secondary}
-            (i18n/label :t/you-dont-have-contacts-invite-friends)]
-           [invite/button]]
-          [list/flat-list
-           {:data      (filter-contacts @search-value contacts)
-            :key-fn    :address
-            :render-fn render-row}])]
-       (when-not (= @search-value "")
-         [react/view
-          [quo/text
-           {:style {:margin-horizontal 16
-                    :margin-vertical   14}
-            :size  :base
-            :align :left
-            :color :secondary}
-           (i18n/label :t/non-contacts)]
-          (when (and (= state :searching)
-                     (is-valid-username? @search-value))
-            [rn/activity-indicator
-             {:color colors/gray
-              :size  (if platform/android? :large :small)}])
-          (if (= state :valid)
-            [quo/list-item
-             (merge
-              {:title    (or ens-name (gfycat/generate-gfy public-key))
-               :subtitle (if ens-name
-                           (gfycat/generate-gfy public-key)
-                           (utils/get-shortened-address public-key))
-               :icon     [chat-icon/contact-icon-contacts-tab
-                          (identicon/identicon public-key)]
-               :on-press #(do
-                            (debounce/dispatch-and-chill [:contact.ui/contact-code-submitted false] 3000)
-                            (re-frame/dispatch [:search/home-filter-changed nil]))}
-              (when ens-name {:subtitle-secondary public-key}))]
-            [quo/text
-             {:style {:margin-horizontal 16}
-              :size  :base
-              :align :center
-              :color :secondary}
-             (if (is-valid-username? @search-value)
-               (when (= state :error)
-                 (get-validation-label error))
-               (i18n/label :t/invalid-username-or-key))])])]
-      (when-not (and
-                 (= (count contacts) 0)
-                 (= @search-value ""))
-        [react/animated-view
-         {:style {:height     36
-                  :width      124
-                  :position   :absolute
-                  :bottom     42
-                  :transform  [{:translateY my-profile-button-anim-y}]
-                  :align-self :center}}
-         [react/touchable-opacity
-          {:style    {:padding-horizontal 2
-                      :height             36
-                      :width              124
-                      :background-color   colors/blue
-                      :border-radius      18
-                      :elevation          4
-                      :shadow-offset      {:width 0 :height 4}
-                      :shadow-color       "rgba(0, 34, 51, 0.16)"
-                      :shadow-radius      4
-                      :shadow-opacity     1}
-           :on-press on-share}
-          [react/view
-           {:style {:flex           1
-                    :flex-direction :row
-                    :align-items    :center}}
-           [photos/photo
-            (multiaccounts/displayed-photo account)
-            {:size                32
-             :accessibility-label :current-account-photo}]
-           [quo/text
-            {:size   :base
-             :weight :medium
-             :color  :inverse
-             :style  {:margin-left 6}}
-            (i18n/label :t/my-profile)]]]])]]))
-
-(defn- nickname-input
-  [entered-nickname]
-  [quo/text-input
-   {:on-change-text      #(reset! entered-nickname %)
-    :auto-capitalize     :none
-    :max-length          32
-    :auto-focus          false
-    :accessibility-label :nickname-input
-    :placeholder         (i18n/label :t/add-nickname)
-    :return-key-type     :done
-    :auto-correct        false}])
-
-(defn new-contact
-  []
-  (let [entered-nickname (reagent/atom "")]
-    (fn []
-      (let [{:keys [state ens-name public-key error]} @(re-frame/subscribe [:contacts/new-identity])
-            blocked?                                  (and
-                                                       (validators/valid-public-key? (or public-key ""))
-                                                       @(re-frame/subscribe [:contacts/contact-blocked?
-                                                                             public-key]))]
-        [react/view {:style {:flex 1}}
-         [topbar/topbar
-          {:title (i18n/label :t/new-contact)
-           :modal? true
-           :right-accessories
-           [{:icon                :qr
-             :accessibility-label :scan-contact-code-button
-             :on-press            #(re-frame/dispatch [::qr-scanner/scan-code
-                                                       {:title        (i18n/label :t/new-contact)
-                                                        :handler      :contact/qr-code-scanned
-                                                        :new-contact? true
-                                                        :nickname     @entered-nickname}])}]}]
-         [react/view
-          {:flex-direction :row
-           :padding        16}
-          [react/view
-           {:flex          1
-            :padding-right 16}
-           [quo/text-input
-            {:on-change-text
-             #(do
-                (re-frame/dispatch [:set-in [:contacts/new-identity :state] :searching])
-                (debounce/debounce-and-dispatch [:contacts/set-new-identity %] 600))
-             :on-submit-editing
-             #(when (= state :valid)
-                (debounce/dispatch-and-chill [:contact.ui/contact-code-submitted true @entered-nickname]
-                                             3000))
-             :placeholder (i18n/label :t/enter-contact-code)
-             :show-cancel false
-             :accessibility-label :enter-contact-code-input
-             :auto-capitalize :none
-             :return-key-type :go}]]
-          [react/view
-           {:justify-content :center
-            :align-items     :center}
-           [input-icon state true @entered-nickname blocked?]]]
-         [react/view {:min-height 30 :justify-content :flex-end :margin-bottom 16}
-          [quo/text
-           {:style {:margin-horizontal 16}
-            :size  :small
-            :align :center
-            :color :secondary}
-           (cond (= state :error)
-                 (get-validation-label error)
-                 (= state :valid)
-                 (str (when ens-name (str ens-name " • "))
-                      (utils/get-shortened-address public-key))
-                 :else "")]]
-         [react/text {:style {:margin-horizontal 16 :color colors/gray}}
-          (i18n/label :t/nickname-description)]
-         [react/view {:padding 16}
-          [nickname-input entered-nickname]
-          [react/text
-           {:style {:align-self :flex-end
-                    :margin-top 16
-                    :color      colors/gray}}
-           (str (count @entered-nickname) " / 32")]]]))))
@@ -1,50 +0,0 @@
-(ns status-im.ui.screens.add-new.new-public-chat.view
-  (:require [quo.core :as quo]
-            [quo.design-system.colors :as colors]
-            [re-frame.core :as re-frame]
-            [status-im.add-new.db :as db]
-            [status-im.react-native.resources :as resources]
-            [status-im.ui.components.icons.icons :as icons]
-            [status-im.ui.components.react :as react]
-            [utils.i18n :as i18n])
-  (:require-macros [status-im.utils.views :as views]))
-
-(defn- start-chat
-  [topic]
-  (re-frame/dispatch [:chat.ui/start-public-chat topic])
-  (re-frame/dispatch [:set :public-group-topic nil]))
-
-(defn- hash-icon
-  []
-  [icons/icon :main-icons/channel {:color colors/gray}])
-
-(defn- chat-name-input
-  [topic error]
-  [quo/text-input
-   {:on-change-text      #(re-frame/dispatch [:set :public-group-topic %])
-    :on-submit-editing   #(when (db/valid-topic? topic) (start-chat topic))
-    :auto-capitalize     :none
-    :auto-focus          false
-    :accessibility-label :chat-name-input
-    :before              {:component [hash-icon]}
-    ;; Set default-value as otherwise it will
-    ;; be erased in global `onWillBlur` handler
-    :default-value       topic
-    :placeholder         "chat-name"
-    :return-key-type     :go
-    :auto-correct        false
-    :error               error}])
-
-(views/defview new-public-chat
-  []
-  (views/letsubs [topic [:public-group-topic]
-                  error [:public-chat.new/topic-error-message]]
-    [react/scroll-view {:style {:flex 1}}
-     [react/view {:padding-horizontal 16}
-      [react/view {:align-items :center :padding-vertical 8}
-       [react/image
-        {:source (:new-chat-header resources/ui)
-         :style  {:width 160 :height 160}}]]
-      [react/text {:style {:text-align :center :margin-bottom 16 :line-height 22}}
-       (i18n/label :t/public-chat-description)]
-      [chat-name-input topic error]]]))
@@ -41,8 +41,7 @@
 (defn browser-options
  [url account empty-tab name]
  (fn []
-    (let [topic       (http/topic-from-url url)
-          bookmarks   @(re-frame/subscribe [:bookmarks/active])
+    (let [bookmarks   @(re-frame/subscribe [:bookmarks/active])
          permissions @(re-frame/subscribe [:dapps/permissions])
          fav?        (get bookmarks url)
          connected?  (some #{constants/dapp-permission-web3}
@@ -85,15 +84,6 @@
                                   (js/setTimeout
                                    #(browser/share-link url)
                                    200))}]
-          [quo/list-item
-           {:icon                [chat-icon/custom-icon-view-list
-                                  topic
-                                  (rand-nth colors/chat-colors)]
-            :accessibility-label :open-chat
-            :title               (str "#" topic)
-            :subtitle            (i18n/label :t/open-chat)
-            :on-press            #(hide-sheet-and-dispatch [:chat.ui/start-public-chat topic])
-            :chevron             true}]
          [components/separator]])
       (if connected?
         [quo/list-item
@@ -1,157 +0,0 @@
-(ns status-im.ui.screens.chat.components.accessory
-  (:require [cljs-bean.core :as bean]
-            [quo.animated :as animated]
-            [quo.design-system.colors :as colors]
-            [quo.platform :as platform]
-            [quo.react :as react]
-            [quo.react-native :as rn]
-            [reagent.core :as reagent]
-            [status-im.ui.components.tabbar.core :as tabbar]
-            [status-im.ui.screens.chat.components.hooks :refer [use-keyboard-dimension]]
-            [react-native.safe-area :as safe-area]))
-
-(def duration 250)
-
-(defn create-pan-responder
-  [y pan-active]
-  (when-not platform/android?
-    (js->clj
-     (.-panHandlers
-      ^js
-      (.create
-       ^js rn/pan-responder
-       #js
-        {:onPanResponderGrant     (fn []
-                                    (animated/set-value pan-active 1))
-         :onPanResponderMove      (fn [_ ^js state]
-                                    (animated/set-value y (.-moveY state)))
-         :onPanResponderRelease   (fn []
-                                    (animated/set-value pan-active 0)
-                                    (js/setTimeout
-                                     #(animated/set-value y 0)
-                                     100))
-         :onPanResponderTerminate (fn []
-                                    (animated/set-value pan-active 0)
-                                    (js/setTimeout
-                                     #(animated/set-value y 0)
-                                     100))})))))
-
-(def ios-view
-  (reagent/adapt-react-class
-   (react/memo
-    (fn [props]
-      (let [{on-update-inset :onUpdateInset
-             y               :y
-             pan-state       :panState
-             on-close        :onClose
-             has-panel       :hasPanel
-             children        :children}
-            (bean/bean props)
-            {keyboard-height       :height
-             keyboard-max-height   :max-height
-             keyboard-end-position :end-position}
-            (use-keyboard-dimension)
-            bottom (safe-area/get-bottom)
-            {on-layout  :on-layout
-             bar-height :height}
-            (rn/use-layout)
-
-            visible (or has-panel (pos? keyboard-height))
-            anim-visible (animated/use-value visible)
-            kb-on-screen (if platform/android? 0 (* -1 (- keyboard-height bottom (tabbar/get-height))))
-            panel-on-screen (* -1 (- keyboard-max-height bottom (tabbar/get-height)))
-            max-delta (min 0 (if has-panel panel-on-screen kb-on-screen))
-            panel-height (* -1 max-delta)
-            end-position (- keyboard-end-position (when has-panel keyboard-max-height))
-            delay (+ (/ (- keyboard-max-height panel-height)
-                        (/ keyboard-max-height duration))
-                     16)
-            drag-diff (animated/clamp (animated/sub y end-position) 0 keyboard-max-height)
-            animated-y (react/use-memo
-                        (fn []
-                          (animated/mix
-                           (animated/with-timing-transition anim-visible
-                                                            {:duration (- duration delay)
-                                                             :easing   (:keyboard animated/easings)})
-                           0
-                           panel-on-screen))
-                        [panel-on-screen])
-            delta-y (animated/clamp (animated/add drag-diff animated-y) max-delta 0)
-            on-update (fn []
-                        (when on-update-inset
-                          (on-update-inset (+ bar-height panel-height))))
-            children (react/get-children children)]
-        (react/effect! on-update [panel-height bar-height])
-        (animated/code!
-         (fn []
-           (when has-panel
-             ;; TODO: Check also velocity
-             (animated/cond* (animated/and* (animated/greater-or-eq drag-diff (* 0.6 panel-height))
-                                            (animated/not* pan-state))
-                             [(animated/call* [] on-close)])))
-         [delta-y pan-state has-panel on-close])
-        (animated/code!
-         (fn []
-           (animated/delay
-            (animated/set anim-visible (if visible 1 0))
-            (if visible delay 0)))
-         [visible keyboard-max-height delay])
-        (reagent/as-element
-         [animated/view
-          {:style {:position         :absolute
-                   :left             0
-                   :right            0
-                   :background-color (:ui-background @colors/theme)
-                   :bottom           max-delta
-                   :transform        [{:translateY delta-y}]}}
-          [rn/view {:on-layout on-layout}
-           (first children)]
-          [rn/view
-           {:style {:flex   1
-                    :height (when (pos? panel-height) panel-height)}}
-           (second children)]]))))))
-
-(def android-view
-  (reagent/adapt-react-class
-   (react/memo
-    (fn [props]
-      (let [{on-update-inset :onUpdateInset
-             on-close        :onClose
-             has-panel       :hasPanel
-             children        :children}
-            (bean/bean props)
-            {keyboard-max-height :max-height} (use-keyboard-dimension)
-            bottom (safe-area/get-bottom)
-            {on-layout  :on-layout
-             bar-height :height}
-            (rn/use-layout)
-
-            visible has-panel
-            panel-on-screen (* -1 (- keyboard-max-height bottom (tabbar/get-height)))
-            max-delta (min 0 (if has-panel panel-on-screen 0))
-            panel-height (* -1 max-delta)
-            on-update (fn []
-                        (when on-update-inset
-                          (on-update-inset (+ bar-height panel-height))))
-            children (react/get-children children)]
-        (react/effect! on-update [panel-height bar-height])
-        (rn/use-back-handler
-         (fn []
-           (when visible
-             (on-close))
-           visible))
-        (reagent/as-element
-         [animated/view
-          {:style {:position         :absolute
-                   :left             0
-                   :right            0
-                   :bottom           0
-                   :background-color (:ui-background @colors/theme)}}
-          [rn/view {:on-layout on-layout}
-           (first children)]
-          [rn/view
-           {:style {:flex   1
-                    :height (when (pos? panel-height) panel-height)}}
-           (second children)]]))))))
-
-(def view (if platform/android? android-view ios-view))
@@ -1,98 +0,0 @@
-(ns status-im.ui.screens.chat.components.contact-request
-  (:require [clojure.string :as string]
-            [quo.core :as quo]
-            [quo.design-system.colors :as quo.colors]
-            [quo.react :as quo.react]
-            [quo.react-native :as rn]
-            [re-frame.core :as re-frame]
-            [status-im.ethereum.stateofus :as stateofus]
-            [utils.i18n :as i18n]
-            [status-im.ui.screens.chat.components.style :as styles])
-  (:require-macros [status-im.utils.views :refer [defview letsubs]]))
-
-(def ^:private contact-request-symbol "↪ ")
-
-(defn input-focus
-  [text-input-ref]
-  (some-> ^js (quo.react/current-ref text-input-ref)
-          .focus))
-
-(defn format-author
-  [contact-name]
-  (let [author (if (or (= (aget contact-name 0) "@")
-                       ;; in case of replies
-                       (= (aget contact-name 1) "@"))
-                 (or (stateofus/username contact-name)
-                     (subs contact-name 0 81))
-                 contact-name)]
-    (i18n/label :contact-requesting-to {:author author})))
-
-(defn format-contact-request-author
-  [from username current-public-key]
-  (or (and (= from current-public-key)
-           (str contact-request-symbol (i18n/label :t/You)))
-      (str contact-request-symbol (format-author username))))
-
-(defn get-quoted-text-with-mentions
-  [parsed-text]
-  (string/join
-   (mapv (fn [{:keys [type literal children]}]
-           (cond
-             (= type "paragraph")
-             (get-quoted-text-with-mentions children)
-
-             (= type "mention")
-             @(re-frame/subscribe [:messages/resolve-mention literal])
-
-             (seq children)
-             (get-quoted-text-with-mentions children)
-
-             :else
-             literal))
-         parsed-text)))
-
-(defn contact-request-message
-  [their-public-key]
-  (let [{:keys [input-text]} @(re-frame/subscribe [:chats/current-chat-input])]
-    [rn/view {:style {:flex-direction :row}}
-     [rn/view {:style (styles/contact-request-content)}
-      [quo/button
-       {:type            :secondary
-        :weight          :medium
-        :number-of-lines 1
-        :style           {:line-height 18}
-        :on-press        #(re-frame/dispatch [:chat.ui/cancel-contact-request])}
-       (i18n/label :t/cancel)]
-      [quo/button
-       {:type     :secondary
-        :disabled (string/blank? input-text)
-        :weight   :medium
-        :after    :main-icons/send
-        :on-press #(re-frame/dispatch [:contacts/send-contact-request their-public-key input-text])
-        :style    {:line-height 18}}
-       (i18n/label :t/send-request)]]]))
-
-(defn focus-input-on-contact-request
-  [contact-request had-contact-request text-input-ref]
-  ;;when we show contact-request we focus input
-  (when-not (= contact-request @had-contact-request)
-    (reset! had-contact-request contact-request)
-    (when contact-request
-      (js/setTimeout #(input-focus text-input-ref) 250))))
-
-(defn contact-request-message-wrapper
-  [contact-request]
-  [rn/view
-   {:style {:padding-horizontal 15
-            :border-top-width   1
-            :border-top-color   (:ui-01 @quo.colors/theme)
-            :padding-vertical   8}}
-   [contact-request-message contact-request]])
-
-(defview contact-request-message-auto-focus-wrapper
-  [text-input-ref]
-  (letsubs [had-reply       (atom nil)
-            contact-request @(re-frame/subscribe [:chats/sending-contact-request])]
-    {:component-did-mount #(focus-input-on-contact-request contact-request had-reply text-input-ref)}
-    (when contact-request
-      [contact-request-message-wrapper contact-request])))
@@ -1,59 +0,0 @@
-(ns status-im.ui.screens.chat.components.edit
-  (:require [quo.components.animated.pressable :as pressable]
-            [quo.core :as quo]
-            [quo.design-system.colors :as quo.colors]
-            [quo.react :as quo.react]
-            [quo.react-native :as rn]
-            [re-frame.core :as re-frame]
-            [utils.i18n :as i18n]
-            [status-im.ui.components.icons.icons :as icons]
-            [status-im.ui.screens.chat.components.style :as styles]))
-
-(defn input-focus
-  [text-input-ref]
-  (some-> ^js (quo.react/current-ref text-input-ref)
-          .focus))
-
-(defn edit-message
-  []
-  [rn/view {:style {:flex-direction :row}}
-   [rn/view {}
-    [icons/icon :tiny-icons/tiny-edit {:container-style {:margin-top 5}}]]
-   [rn/view {:style (styles/reply-content)}
-    [quo/text
-     {:weight          :medium
-      :number-of-lines 1}
-     (i18n/label :t/editing-message)]]
-   [rn/view
-    [pressable/pressable
-     {:on-press            #(re-frame/dispatch [:chat.ui/cancel-message-edit])
-      :accessibility-label :cancel-message-reply}
-     [icons/icon :main-icons/close-circle
-      {:container-style (styles/close-button)
-       :color           (:icon-02 @quo.colors/theme)}]]]])
-
-(defn focus-input-on-edit
-  [edit had-edit text-input-ref]
-  ;;when we show edit we focus input
-  (when-not (= edit @had-edit)
-    (reset! had-edit edit)
-    (when edit
-      (js/setTimeout #(input-focus text-input-ref) 250))))
-
-(defn edit-message-wrapper
-  [edit]
-  [rn/view
-   {:style {:padding-horizontal 15
-            :border-top-width   1
-            :border-top-color   (:ui-01 @quo.colors/theme)
-            :padding-vertical   8}}
-   [edit-message edit]])
-
-(defn edit-message-auto-focus-wrapper
-  [text-input-ref]
-  (let [had-edit (atom nil)]
-    (fn []
-      (let [edit @(re-frame/subscribe [:chats/edit-message])]
-        (focus-input-on-edit edit had-edit text-input-ref)
-        (when edit
-          [edit-message-wrapper])))))
@@ -1,50 +0,0 @@
-(ns status-im.ui.screens.chat.components.hooks
-  (:require [quo.platform :as platform]
-            [quo.react :as react]
-            [quo.react-native :refer [use-window-dimensions] :as rn]
-            [react-native.safe-area :as safe-area]))
-
-(def ^:private keyboard-change-event (if platform/android? "keyboardDidShow" "keyboardWillChangeFrame"))
-
-(def default-kb-height (if platform/ios? 258 272))
-(def min-duration 100)
-
-(defn use-keyboard-dimension
-  []
-  (let [{:keys [height]}  (use-window-dimensions)
-        bottom            (safe-area/get-bottom)
-        keyboard-listener (atom nil)
-        keyboard          (react/state
-                           {:height       0
-                            :duration     min-duration
-                            :end-position height
-                            :max-height   (+ (if platform/ios? bottom 0) default-kb-height)})]
-    (react/effect!
-     (fn []
-       (letfn
-         [(dimensions-change [evt]
-            (swap! keyboard assoc :end-position (-> ^js evt .-window .-height)))
-          (keyboard-dimensions [evt]
-            (let [duration   (.-duration ^js evt)
-                  easing     (.-easing ^js evt)
-                  screen-y   (-> ^js evt .-endCoordinates .-screenY)
-                  new-height (- height screen-y)]
-              (when-not (= new-height (:height @keyboard))
-                (when (and duration easing platform/ios?)
-                  (rn/configure-next
-                   #js
-                    {:duration (max min-duration duration)
-                     :update   #js
-                                {:duration (max min-duration duration)
-                                 :type     (-> ^js rn/layout-animation .-Types (aget easing))}})))
-              (reset! keyboard {:height       new-height
-                                :end-position screen-y
-                                :duration     (max min-duration duration)
-                                :max-height   (max new-height (:max-height @keyboard))})))]
-         (.addEventListener rn/dimensions "change" dimensions-change)
-         (reset! keyboard-listener (.addListener rn/keyboard keyboard-change-event keyboard-dimensions))
-         (fn []
-           (.removeEventListener rn/dimensions "change" dimensions-change)
-           (some-> ^js @keyboard-listener
-                   .remove)))))
-    @keyboard))
@@ -1,428 +0,0 @@
-(ns status-im.ui.screens.chat.components.input
-  (:require [clojure.string :as string]
-            [quo.components.animated.pressable :as pressable]
-            [quo.components.list.item :as list-item]
-            [quo.components.text :as text]
-            [quo.design-system.colors :as colors]
-            [quo.platform :as platform]
-            [quo.react :as quo.react]
-            [quo.react-native :as rn]
-            [re-frame.core :as re-frame]
-            [reagent.core :as reagent]
-            [status-im2.constants :as chat.constants]
-            [utils.i18n :as i18n]
-            [status-im.ui.components.icons.icons :as icons]
-            [status-im.ui.components.list.views :as list]
-            [status-im.ui.screens.chat.components.reply :as reply]
-            [status-im.ui.screens.chat.components.style :as styles]
-            [status-im.ui.screens.chat.photos :as photos]
-            [utils.re-frame :as rf]
-            [status-im.utils.utils :as utils.utils]))
-
-(defn input-focus
-  [text-input-ref]
-  (some-> ^js (quo.react/current-ref text-input-ref)
-          .focus))
-
-(def panel->icons
-  {:extensions :main-icons/commands
-   :images     :main-icons/photo})
-
-(defn touchable-icon
-  [{:keys [panel active set-active accessibility-label]}]
-  [pressable/pressable
-   {:type                :scale
-    :accessibility-label accessibility-label
-    :on-press            #(set-active (when-not (= active panel) panel))}
-   [rn/view {:style (styles/touchable-icon)}
-    [icons/icon
-     (panel->icons panel)
-     (styles/icon (= active panel))]]])
-
-(defn touchable-stickers-icon
-  [{:keys [panel active set-active accessibility-label input-focus]}]
-  [pressable/pressable
-   {:type                :scale
-    :accessibility-label accessibility-label
-    :on-press            #(if (= active panel)
-                            (input-focus)
-                            (set-active panel))}
-   [rn/view {:style (styles/in-input-touchable-icon)}
-    (if (= active panel)
-      [icons/icon :main-icons/keyboard (styles/icon false)]
-      [icons/icon :main-icons/stickers (styles/icon false)])]])
-
-;; TODO(Ferossgp): Move this into audio panel.
-;; Instead of not changing panel we can show a placeholder with no permission
-(defn- request-record-audio-permission
-  [set-active panel]
-  (re-frame/dispatch
-   [:request-permissions
-    {:permissions [:record-audio]
-     :on-allowed
-     #(set-active panel)
-     :on-denied
-     #(utils.utils/set-timeout
-       (fn []
-         (utils.utils/show-popup
-          (i18n/label :t/audio-recorder-error)
-          (i18n/label :t/audio-recorder-permissions-error)))
-       50)}]))
-
-(defn touchable-audio-icon
-  [{:keys [panel active set-active accessibility-label input-focus]}]
-  [pressable/pressable
-   {:type                :scale
-    :accessibility-label accessibility-label
-    :on-press            #(if (= active panel)
-                            (input-focus)
-                            (request-record-audio-permission set-active panel))}
-   [rn/view {:style (styles/in-input-touchable-icon)}
-    (if (= active panel)
-      [icons/icon :main-icons/keyboard (styles/icon false)]
-      [icons/icon :main-icons/speech (styles/icon false)])]])
-
-(defn send-button
-  [on-send contact-request]
-  [rn/touchable-opacity {:on-press-in on-send}
-   [rn/view {:style (styles/send-message-button)}
-    (when-not contact-request
-      [icons/icon :main-icons/arrow-up
-       {:container-style     (styles/send-message-container contact-request)
-        :accessibility-label :send-message-button
-        :color               (styles/send-icon-color)}])]])
-
-(defn on-selection-change
-  [timeout-id last-text-change args]
-  (let [selection (.-selection ^js (.-nativeEvent ^js args))
-        start     (.-start selection)
-        end       (.-end selection)]
-    ;; NOTE(rasom): on iOS we do not dispatch this event immediately
-    ;; because it is needed only in case if selection is changed without
-    ;; typing. Timeout might be canceled on `on-change`.
-    (when platform/ios?
-      (reset!
-        timeout-id
-        (utils.utils/set-timeout
-         #(re-frame/dispatch [:mention/on-selection-change
-                              {:start start
-                               :end   end}])
-         50)))
-    ;; NOTE(rasom): on Android we dispatch event only in case if there
-    ;; was no text changes during last 50ms. `on-selection-change` is
-    ;; dispatched after `on-change`, that's why there is no another way
-    ;; to know whether selection was changed without typing.
-    (when (and platform/android?
-               (or (not @last-text-change)
-                   (< 50 (- (js/Date.now) @last-text-change))))
-      (re-frame/dispatch [:mention/on-selection-change
-                          {:start start
-                           :end   end}]))))
-
-(defonce input-texts (atom {}))
-(defonce mentions-enabled (reagent/atom {}))
-(defonce chat-input-key (reagent/atom 1))
-
-(re-frame/reg-fx
- :chat.ui/clear-inputs-old
- (fn []
-   (reset! input-texts {})
-   (reset! mentions-enabled {})
-   (reset! chat-input-key 1)))
-
-(defn force-text-input-update!
-  "force-text-input-update! forces the
-  input to re-render, necessary when we are setting value"
-  []
-  (swap! chat-input-key inc))
-
-(defn show-send
-  [{:keys [actions-ref send-ref sticker-ref]}]
-  (when actions-ref
-    (quo.react/set-native-props actions-ref #js {:width 0 :left -88}))
-  (quo.react/set-native-props send-ref #js {:width nil :right nil})
-  (when sticker-ref
-    (quo.react/set-native-props sticker-ref #js {:width 0 :right -100})))
-
-(defn hide-send
-  [{:keys [actions-ref send-ref sticker-ref]}]
-  (when actions-ref
-    (quo.react/set-native-props actions-ref #js {:width nil :left nil}))
-  (quo.react/set-native-props send-ref #js {:width 0 :right -100})
-  (when sticker-ref
-    (quo.react/set-native-props sticker-ref #js {:width nil :right nil})))
-
-(defn reset-input
-  [refs chat-id]
-  (some-> ^js (quo.react/current-ref (:text-input-ref refs))
-          .clear)
-  (swap! mentions-enabled update :render not)
-  (swap! input-texts dissoc chat-id))
-
-(defn clear-input
-  [chat-id refs]
-  (hide-send refs)
-  (if (get @mentions-enabled chat-id)
-    (do
-      (swap! mentions-enabled dissoc chat-id)
-      ;;we need this timeout, because if we clear text input and first index was a mention object with
-      ;;blue color,
-      ;;after clearing text will be typed with this blue color, so we render white text first and then
-      ;;clear it
-      (js/setTimeout #(reset-input refs chat-id) 50))
-    (reset-input refs chat-id)))
-
-(defn on-text-change
-  [val chat-id]
-  (swap! input-texts assoc chat-id val)
-  ;;we still store it in app-db for mentions, we don't have reactions in views
-  (re-frame/dispatch [:chat.ui/set-chat-input-text val]))
-
-(defn on-change
-  [last-text-change timeout-id refs chat-id sending-image args]
-  (let [text      (.-text ^js (.-nativeEvent ^js args))
-        prev-text (get @input-texts chat-id)]
-    (when (and (seq prev-text) (empty? text) (not sending-image))
-      (hide-send refs))
-    (when (and (empty? prev-text) (seq text))
-      (show-send refs))
-
-    (when (and (not (get @mentions-enabled chat-id)) (string/index-of text "@"))
-      (swap! mentions-enabled assoc chat-id true))
-
-    ;; NOTE(rasom): on iOS `on-selection-change` is canceled in case if it
-    ;; happens during typing because it is not needed for mention
-    ;; suggestions calculation
-    (when (and platform/ios? @timeout-id)
-      (utils.utils/clear-timeout @timeout-id))
-    (when platform/android?
-      (reset! last-text-change (js/Date.now)))
-
-    (on-text-change text chat-id)
-    ;; NOTE(rasom): on iOS `on-change` is dispatched after `on-text-input`,
-    ;; that's why mention suggestions are calculated on `on-change`
-    (when platform/ios?
-      (re-frame/dispatch [:mention/calculate-suggestions]))))
-
-(rf/defn set-input-text
-  "Set input text for current-chat. Takes db and input text and cofx
-  as arguments and returns new fx. Always clear all validation messages."
-  {:events [:chat.ui.input/set-chat-input-text]}
-  [{:keys [db]} text chat-id]
-  (let [params [chat-id text]
-        method "wakuext_chatMentionToInputField"]
-    {:json-rpc/call [{:method     method
-                      :params     params
-                      :on-success #(rf/dispatch [:mention/on-to-input-field-success %])
-                      :on-error   #(rf/dispatch [:mention/on-error
-                                                 {:method method
-                                                  :params params} %])}]}))
-
-(defn on-text-input
-  [chat-id args]
-  (let [native-event  (.-nativeEvent ^js args)
-        text          (.-text ^js native-event)
-        previous-text (.-previousText ^js native-event)
-        range         (.-range ^js native-event)
-        start         (.-start ^js range)
-        end           (.-end ^js range)]
-    (when (and (not (get @mentions-enabled chat-id)) (string/index-of text "@"))
-      (swap! mentions-enabled assoc chat-id true))
-
-    (re-frame/dispatch
-     [:mention/on-text-input
-      {:new-text      text
-       :previous-text previous-text
-       :start         start
-       :end           end}])
-    ;; NOTE(rasom): on Android `on-text-input` is dispatched after
-    ;; `on-change`, that's why mention suggestions are calculated
-    ;; on `on-change`
-    (when platform/android?
-      (re-frame/dispatch [:mention/calculate-suggestions]))))
-
-(defn text-input
-  [{:keys [set-active-panel refs chat-id sending-image]}]
-  (let [cooldown-enabled? @(re-frame/subscribe [:chats/current-chat-cooldown-enabled?])
-        timeout-id        (atom nil)
-        last-text-change  (atom nil)
-        mentions-enabled  (get @mentions-enabled chat-id)
-        contact-request   @(re-frame/subscribe [:chats/sending-contact-request])]
-
-    [rn/text-input
-     {:style (styles/text-input contact-request)
-      :ref (:text-input-ref refs)
-      :max-font-size-multiplier 1
-      :accessibility-label :chat-message-input
-      :text-align-vertical :center
-      :multiline true
-      :editable (not cooldown-enabled?)
-      :blur-on-submit false
-      :auto-focus false
-      :on-focus #(set-active-panel nil)
-      :max-length chat.constants/max-text-size
-      :placeholder-text-color (:text-02 @colors/theme)
-      :placeholder (if cooldown-enabled?
-                     (i18n/label :cooldown/text-input-disabled)
-                     (i18n/label :t/type-a-message))
-      :underline-color-android :transparent
-      :auto-capitalize :sentences
-      :on-selection-change (partial on-selection-change
-                                    timeout-id
-                                    last-text-change)
-      :on-change
-      (partial on-change last-text-change timeout-id refs chat-id sending-image)
-      :on-text-input (partial on-text-input chat-id)}
-     (if mentions-enabled
-       (for [[idx [type text]] (map-indexed
-                                (fn [idx item]
-                                  [idx item])
-                                @(re-frame/subscribe [:chat/input-with-mentions]))]
-         ^{:key (str idx "_" type "_" text)}
-         [rn/text (when (= type :mention) {:style {:color "#0DA4C9"}})
-          text])
-       (get @input-texts chat-id))]))
-
-(defn mention-item
-  [[public-key {:keys [alias name nickname] :as user}] _ _ text-input-ref]
-  (let [ens-name? (not= alias name)]
-    [list-item/list-item
-     (cond->
-       {:icon [photos/member-photo public-key]
-        :size :small
-        :text-size :small
-        :title
-        [text/text
-         {:weight          :medium
-          :ellipsize-mode  :tail
-          :number-of-lines 1
-          :size            :small}
-         (if nickname
-           nickname
-           name)
-         (when nickname
-           [text/text
-            {:weight         :regular
-             :color          :secondary
-             :ellipsize-mode :tail
-             :size           :small}
-            " "
-            (when ens-name?
-              "@")
-            name])]
-        :title-text-weight :medium
-        :on-press
-        (fn []
-          (re-frame/dispatch [:chat.ui/select-mention text-input-ref user]))}
-
-       ens-name?
-       (assoc :subtitle alias))]))
-
-(def chat-toolbar-height (reagent/atom nil))
-
-(defn autocomplete-mentions
-  [text-input-ref bottom]
-  (let [suggestions @(re-frame/subscribe [:chat/mention-suggestions])]
-    (when (seq suggestions)
-      (let [height (+ 16 (* 52 (min 4.5 (count suggestions))))]
-        [rn/view
-         {:style               (styles/autocomplete-container bottom)
-          :accessibility-label :suggestions-list}
-         [rn/view
-          {:style {:height height}}
-          [list/flat-list
-           {:keyboard-should-persist-taps :always
-            :footer                       [rn/view {:style {:height 8}}]
-            :header                       [rn/view {:style {:height 8}}]
-            :data                         suggestions
-            :key-fn                       first
-            :render-data                  text-input-ref
-            :render-fn                    mention-item}]]]))))
-
-(defn on-chat-toolbar-layout
-  [^js ev]
-  (reset! chat-toolbar-height (-> ev .-nativeEvent .-layout .-height)))
-
-(defn send-image
-  []
-  (let [sending-image @(re-frame/subscribe [:chats/sending-image])]
-    (when (seq sending-image)
-      [reply/send-image sending-image])))
-
-(defn actions
-  [extensions image show-send actions-ref active-panel set-active-panel contact-request]
-  [rn/view
-   {:style (styles/actions-wrapper (and (not contact-request) show-send))
-    :ref   actions-ref}
-   (when extensions
-     [touchable-icon
-      {:panel               :extensions
-       :accessibility-label :show-extensions-icon
-       :active              active-panel
-       :set-active          set-active-panel}])
-   (when image
-     [touchable-icon
-      {:panel               :images
-       :accessibility-label :show-photo-icon
-       :active              active-panel
-       :set-active          set-active-panel}])])
-
-(defn chat-toolbar
-  [{:keys [chat-id]}]
-  (let [actions-ref     (quo.react/create-ref)
-        send-ref        (quo.react/create-ref)
-        sticker-ref     (quo.react/create-ref)
-        toolbar-options (re-frame/subscribe [:chats/chat-toolbar])
-        show-send       (seq (get @input-texts chat-id))]
-    (fn [{:keys [active-panel set-active-panel text-input-ref chat-id]}]
-      (let [;we want to control components on native level, so instead of RN state we set native props
-            ;via reference
-            ;we don't react on input text in this view, @input-texts below is a regular atom
-            refs                    {:actions-ref    actions-ref
-                                     :send-ref       send-ref
-                                     :sticker-ref    sticker-ref
-                                     :text-input-ref text-input-ref}
-            {:keys [send stickers image extensions audio
-                    sending-image]} @toolbar-options
-            show-send               (or show-send sending-image)
-            contact-request         @(re-frame/subscribe [:chats/sending-contact-request])]
-        [rn/view
-         {:style     (styles/toolbar)
-          :on-layout on-chat-toolbar-layout}
-         ;; EXTENSIONS and IMAGE buttons
-         [actions extensions image show-send actions-ref active-panel set-active-panel contact-request]
-         [rn/view {:style (styles/input-container contact-request)}
-          [send-image]
-          [rn/view {:style styles/input-row}
-           [text-input
-            {:chat-id          chat-id
-             :sending-image    sending-image
-             :refs             refs
-             :set-active-panel set-active-panel}]
-           ;; SEND button
-           [rn/view {:ref send-ref :style (when-not show-send {:width 0 :right -100})}
-            (when send
-              [send-button
-               #(do (clear-input chat-id refs)
-                    (re-frame/dispatch [:chat.ui/send-current-message]))
-               contact-request])]
-
-           ;; STICKERS and AUDIO buttons
-           (when-not @(re-frame/subscribe [:chats/edit-message])
-             [rn/view
-              {:style (merge {:flex-direction :row} (when show-send {:width 0 :right -100}))
-               :ref   sticker-ref}
-              (when stickers
-                [touchable-stickers-icon
-                 {:panel               :stickers
-                  :accessibility-label :show-stickers-icon
-                  :active              active-panel
-                  :input-focus         #(input-focus text-input-ref)
-                  :set-active          set-active-panel}])
-              (when audio
-                [touchable-audio-icon
-                 {:panel               :audio
-                  :accessibility-label :show-audio-message-icon
-                  :active              active-panel
-                  :input-focus         #(input-focus text-input-ref)
-                  :set-active          set-active-panel}])])]]]))))
@@ -1,121 +0,0 @@
-(ns status-im.ui.screens.chat.components.reply
-  (:require [clojure.string :as string]
-            [quo.components.animated.pressable :as pressable]
-            [quo.core :as quo]
-            [quo.design-system.colors :as quo.colors]
-            [quo.react :as quo.react]
-            [quo.react-native :as rn]
-            [re-frame.core :as re-frame]
-            [status-im.ethereum.stateofus :as stateofus]
-            [utils.i18n :as i18n]
-            [status-im.ui.components.icons.icons :as icons]
-            [status-im.ui.screens.chat.components.style :as styles]))
-
-(def ^:private reply-symbol "↪ ")
-
-(defn input-focus
-  [text-input-ref]
-  (some-> ^js (quo.react/current-ref text-input-ref)
-          .focus))
-
-(defn format-author
-  [contact-name]
-  (let [author (if (or (= (aget contact-name 0) "@")
-                       ;; in case of replies
-                       (= (aget contact-name 1) "@"))
-                 (or (stateofus/username contact-name)
-                     (subs contact-name 0 81))
-                 contact-name)]
-    (i18n/label :replying-to {:author author})))
-
-(defn format-reply-author
-  [from username current-public-key]
-  (or (and (= from current-public-key)
-           (str reply-symbol (i18n/label :t/You)))
-      (str reply-symbol (format-author username))))
-
-(defn get-quoted-text-with-mentions
-  [parsed-text]
-  (string/join
-   (mapv (fn [{:keys [type literal children]}]
-           (cond
-             (= type "paragraph")
-             (get-quoted-text-with-mentions children)
-
-             (= type "mention")
-             @(re-frame/subscribe [:messages/resolve-mention literal])
-
-             (seq children)
-             (get-quoted-text-with-mentions children)
-
-             :else
-             literal))
-         parsed-text)))
-
-(defn reply-message
-  [{:keys [from]}]
-  (let [contact-name       @(re-frame/subscribe [:contacts/contact-name-by-identity from])
-        current-public-key @(re-frame/subscribe [:multiaccount/public-key])]
-    [rn/view {:style {:flex-direction :row}}
-     [rn/view {:style (styles/reply-content)}
-      [quo/text
-       {:weight          :medium
-        :number-of-lines 1
-        :style           {:line-height 18}}
-       (format-reply-author from contact-name current-public-key)]]
-     [rn/view
-      [pressable/pressable
-       {:on-press            #(re-frame/dispatch [:chat.ui/cancel-message-reply])
-        :accessibility-label :cancel-message-reply}
-       [icons/icon :main-icons/close-circle
-        {:container-style (styles/close-button)
-         :color           (:icon-02 @quo.colors/theme)}]]]]))
-
-(defn send-image
-  [images]
-  [rn/view {:style (styles/reply-container-image)}
-   [rn/scroll-view
-    {:horizontal true
-     :style      (styles/reply-content)}
-    (for [{:keys [uri]} (vals images)]
-      ^{:key uri}
-      [rn/image
-       {:source {:uri uri}
-        :style  {:width         56
-                 :height        56
-                 :border-radius 4
-                 :margin-right  4}}])]
-   [rn/view
-    [pressable/pressable
-     {:on-press            #(re-frame/dispatch [:chat.ui/cancel-sending-image])
-      :accessibility-label :cancel-send-image}
-     [icons/icon :main-icons/close-circle
-      {:container-style (styles/close-button)
-       :color           quo.colors/white}]]]])
-
-(defn focus-input-on-reply
-  [reply had-reply text-input-ref]
-  ;;when we show reply we focus input
-  (when-not (= reply @had-reply)
-    (reset! had-reply reply)
-    (when reply
-      ;; A setTimeout of 0 is necessary to ensure the statement is enqueued and will get executed ASAP.
-      (js/setTimeout #(input-focus text-input-ref) 0))))
-
-(defn reply-message-wrapper
-  [reply]
-  [rn/view
-   {:style {:padding-horizontal 15
-            :border-top-width   1
-            :border-top-color   (:ui-01 @quo.colors/theme)
-            :padding-vertical   8}}
-   [reply-message reply]])
-
-(defn reply-message-auto-focus-wrapper
-  [text-input-ref]
-  (let [had-reply (atom nil)]
-    (fn []
-      (let [reply @(re-frame/subscribe [:chats/reply-message])]
-        (focus-input-on-reply reply had-reply text-input-ref)
-        (when reply
-          [reply-message-wrapper reply])))))
@@ -1,152 +0,0 @@
-(ns status-im.ui.screens.chat.components.style
-  (:require [quo.design-system.colors :as colors]
-            [quo.design-system.typography :as typography]
-            [quo.platform :as platform]))
-
-(defn toolbar
-  []
-  {:min-height       52
-   :padding-vertical 8
-   :border-top-width 1
-   :border-top-color (:ui-01 @colors/theme)
-   :align-items      :flex-end
-   :flex-direction   :row})
-
-(defn input-container
-  [contact-request]
-  {:background-color           (:ui-01 @colors/theme)
-   :flex                       1
-   :height                     (when contact-request 44)
-   :border-top-left-radius     (if contact-request 8 16)
-   :border-top-right-radius    (if contact-request 8 16)
-   :border-bottom-right-radius (if contact-request 8 4)
-   :border-bottom-left-radius  (if contact-request 8 16)
-   :margin-horizontal          8})
-
-(def input-row
-  {:flex-direction :row
-   :overflow       :hidden
-   :align-items    :flex-end})
-
-(defn text-input-wrapper
-  []
-  (merge {:flex-direction :row
-          :align-items    :flex-start
-          :flex           1
-          :min-height     34
-          :max-height     144}
-         (when platform/ios?
-           {:padding-top 2})))
-
-(defn text-input
-  [contact-request]
-  (merge typography/font-regular
-         typography/base
-         {:flex               1
-          :min-height         34
-          :max-height         144
-          :margin             0
-          :flex-shrink        1
-          :color              (:text-01 @colors/theme)
-          :padding-horizontal 12}
-         (if platform/android?
-           {:padding-vertical 2}
-           {:padding-top    (if contact-request 10 2)
-            :padding-bottom (if contact-request 5 6)})))
-
-(defn actions-wrapper
-  [show-send]
-  (merge (when show-send
-           {:width 0 :left -88})
-         {:flex-direction :row
-          :padding-left   4
-          :min-height     34}))
-
-(defn touchable-icon
-  []
-  {:padding-horizontal 10
-   :padding-vertical   5
-   :justify-content    :center
-   :align-items        :center})
-
-(defn in-input-touchable-icon
-  []
-  {:padding-horizontal 6
-   :padding-vertical   5
-   :justify-content    :center
-   :align-items        :center})
-
-(defn icon
-  [active]
-  {:color (if active
-            (:icon-04 @colors/theme)
-            (:icon-02 @colors/theme))})
-
-(defn reply-container-image
-  []
-  {:border-top-left-radius     14
-   :border-top-right-radius    14
-   :border-bottom-right-radius 4
-   :border-bottom-left-radius  14
-   :margin                     2
-   :flex-direction             :row
-   :background-color           (:ui-03 @colors/theme)})
-
-(defn reply-container
-  []
-  {:flex-direction :row})
-
-(defn reply-content
-  []
-  {:padding-vertical   6
-   :padding-horizontal 10
-   :flex               1})
-
-(defn quoted-message
-  [pin?]
-  (merge {:flex-direction :row
-          :align-items    :center
-          :width          "45%"}
-         (when-not pin?
-           {:position :absolute
-            :left     34
-            :top      3})))
-
-(defn contact-request-content
-  []
-  {:flex            1
-   :flex-direction  :row
-   :justify-content :space-between})
-
-(defn close-button
-  []
-  {:margin-top 3})
-
-(defn send-message-button
-  []
-  {:margin-vertical   4
-   :margin-horizontal 5})
-
-(defn send-message-container
-  [contact-request]
-  {:background-color (:interactive-01 @colors/theme)
-   :width            26
-   :height           (if contact-request 44 26)
-   :border-radius    (if contact-request 22 13)
-   :justify-content  :center
-   :align-items      :center})
-
-(defn send-icon-color
-  []
-  colors/white)
-
-(defn autocomplete-container
-  [bottom]
-  {:position         :absolute
-   :left             0
-   :right            0
-   :bottom           bottom
-   :background-color (colors/get-color :ui-background)
-   :border-top-width 1
-   :border-top-color (colors/get-color :ui-01)
-   :z-index          3})
@@ -4,10 +4,8 @@
            [status-im2.constants :as constants]
            [utils.i18n :as i18n]
            [status-im.ui.components.chat-icon.screen :as chat-icon]
-            [status-im.ui.components.list-selection :as list-selection]
            [status-im.ui.components.react :as react]
-            [status-im.ui.screens.chat.styles.message.sheets :as sheets.styles]
-            [status-im.utils.universal-links.utils :as universal-links]))
+            [status-im.ui.screens.chat.styles.message.sheets :as sheets.styles]))

 (defn hide-sheet-and-dispatch
  [event]
@@ -42,41 +40,6 @@
       :icon                :main-icons/delete
       :on-press            #(re-frame/dispatch [:chat.ui/show-remove-confirmation chat-id])}]]))

-(defn public-chat-accents
-  [chat-id]
-  (let [link    (universal-links/generate-link :public-chat :external chat-id)
-        message (i18n/label :t/share-public-chat-text {:link link})]
-    [react/view
-     [quo/list-item
-      {:theme               :accent
-       :title               (i18n/label :t/share-chat)
-       :accessibility-label :share-chat-button
-       :icon                :main-icons/share
-       :on-press            (fn []
-                              (re-frame/dispatch [:bottom-sheet/hide-old])
-                              ;; https://github.com/facebook/react-native/pull/26839
-                              (js/setTimeout
-                               #(list-selection/open-share {:message message})
-                               250))}]
-     [quo/list-item
-      {:theme               :accent
-       :title               (i18n/label :t/mark-all-read)
-       :accessibility-label :mark-all-read-button
-       :icon                :main-icons/check
-       :on-press            #(hide-sheet-and-dispatch [:chat.ui/mark-all-read-pressed chat-id])}]
-     [quo/list-item
-      {:theme               :accent
-       :title               (i18n/label :t/clear-history)
-       :accessibility-label :clear-history-button
-       :icon                :main-icons/close
-       :on-press            #(re-frame/dispatch [:chat.ui/show-clear-history-confirmation chat-id])}]
-     [quo/list-item
-      {:theme               :negative
-       :title               (i18n/label :t/delete-chat)
-       :accessibility-label :delete-chat-button
-       :icon                :main-icons/delete
-       :on-press            #(re-frame/dispatch [:chat.ui/show-remove-confirmation chat-id])}]]))
-
 (defn community-chat-accents
  []
  (fn [{:keys [chat-id group-chat chat-name color emoji]}]
@@ -150,11 +113,6 @@
  [{:keys [chat-type chat-id]
    :as   current-chat}]
  (cond
-    (#{constants/public-chat-type
-       constants/profile-chat-type
-       constants/timeline-chat-type}
-     chat-type)
-    [public-chat-accents chat-id]

    (= chat-type constants/community-chat-type)
    [community-chat-accents current-chat]
@@ -19,10 +19,10 @@
    [status-im.ui.components.topbar :as topbar]
    [status-im.ui.screens.chat.photos :as photos]
    [status-im.ui.screens.chat.sheets :as sheets]
-    [status-im.ui.screens.home.views.inner-item :as inner-item]
    [status-im.utils.core :as utils]
    [utils.datetime :as datetime]
-    [utils.re-frame :as rf]))
+    [utils.re-frame :as rf]
+    [status-im.ui.screens.home.views.inner-item :as inner-item]))

 (def request-cooldown-ms (* 24 60 60 1000))

@@ -1,183 +0,0 @@
-(ns status-im.ui.screens.communities.views
-  (:require [quo.core :as quo]
-            [quo.design-system.colors :as quo.colors]
-            [status-im.communities.core :as communities]
-            [status-im2.constants :as constants]
-            [utils.i18n :as i18n]
-            [status-im.ui.components.badge :as badge]
-            [status-im.ui.components.copyable-text :as copyable-text]
-            [status-im.ui.components.list.views :as list]
-            [status-im.ui.components.react :as react]
-            [status-im.ui.components.toolbar :as toolbar]
-            [status-im.ui.components.topbar :as topbar]
-            [status-im.ui.screens.communities.community :as community]
-            [status-im.ui.screens.communities.icon :as communities.icon]
-            [status-im.utils.core :as utils]
-            [utils.re-frame :as rf]))
-
-(defn hide-sheet-and-dispatch
-  [event]
-  (rf/dispatch [:bottom-sheet/hide-old])
-  (rf/dispatch event))
-
-(defn community-unviewed-count
-  [id]
-  (let [{:keys [unviewed-messages-count unviewed-mentions-count]} (rf/sub [:communities/unviewed-counts
-                                                                           id])]
-    (cond
-      (pos? unviewed-mentions-count)
-      [badge/message-counter unviewed-mentions-count]
-
-      (pos? unviewed-messages-count)
-      [react/view
-       {:style               {:background-color quo.colors/blue
-                              :border-radius    6
-                              :margin-right     5
-                              :margin-top       2
-                              :width            12
-                              :height           12}
-        :accessibility-label :unviewed-messages-public}])))
-
-(defn community-home-list-item
-  [{:keys [id name last?] :as community}]
-  [react/touchable-opacity
-   {:style         (merge {:height 64}
-                          (when last?
-                            {:border-bottom-color (quo.colors/get-color :ui-01)
-                             :border-bottom-width 1}))
-    :on-press      (fn []
-                     (rf/dispatch [:communities/load-category-states id])
-                     (rf/dispatch [:dismiss-keyboard])
-                     (rf/dispatch [:navigate-to :community-overview id]))
-    :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet-old
-                                  {:content (fn []
-                                              [community/community-actions community])}])}
-   [:<>
-    [react/view {:top 12 :left 16 :position :absolute}
-     [communities.icon/community-icon community]]
-    [react/view
-     {:style               {:margin-left    72
-                            :flex-direction :row
-                            :flex           1}
-      :accessibility-label :chat-name-text}
-     [react/view
-      {:flex-direction :row
-       :flex           1
-       :padding-right  16
-       :align-items    :center}
-      [quo/text
-       {:weight              :medium
-        :accessibility-label :chat-name-text
-        :font-size           17
-        :ellipsize-mode      :tail
-        :number-of-lines     1}
-       name]]
-     [react/view
-      {:flex-direction  :row
-       :flex            1
-       :margin-right    15
-       :justify-content :flex-end
-       :align-items     :center}
-      [community-unviewed-count id]]]]])
-
-(defn community-list-item
-  [{:keys [id permissions members name description] :as community}]
-  (let [members-count       (count members)
-        show-members-count? (not= (:access permissions) constants/community-no-membership-access)]
-    [quo/list-item
-     {:icon                      [communities.icon/community-icon community]
-      :title                     [react/view
-                                  {:flex-direction :row
-                                   :flex           1
-                                   :padding-right  16
-                                   :align-items    :center}
-                                  [quo/text
-                                   {:weight              :medium
-                                    :accessibility-label :community-name-text
-                                    :ellipsize-mode      :tail
-                                    :number-of-lines     1}
-                                   (utils/truncate-str name 30)]]
-      :title-accessibility-label :community-name-text
-      :subtitle                  [react/view
-                                  [quo/text {:number-of-lines 1}
-                                   description]
-                                  [quo/text
-                                   {:number-of-lines 1
-                                    :color           :secondary}
-                                   (if show-members-count?
-                                     (i18n/label-pluralize members-count
-                                                           :t/community-members
-                                                           {:count members-count})
-                                     (i18n/label :t/open-membership))]]
-      :on-press                  #(do
-                                    (rf/dispatch [:dismiss-keyboard])
-                                    (rf/dispatch [:navigate-to :community-overview id]))}]))
-
-(defn communities-actions
-  []
-  [:<>
-   [quo/list-item
-    {:theme               :accent
-     :title               (i18n/label :t/import-community)
-     :accessibility-label :community-import-community
-     :icon                :main-icons/objects
-     :on-press            #(hide-sheet-and-dispatch [:navigate-to :community-import])}]
-   [quo/list-item
-    {:theme               :accent
-     :title               (i18n/label :t/create-community)
-     :accessibility-label :community-create-community
-     :icon                :main-icons/add
-     :on-press            #(hide-sheet-and-dispatch [::communities/open-create-community])}]])
-
-(defn communities-list
-  [communities]
-  [list/section-list
-   {:content-container-style        {:padding-vertical 8}
-    :key-fn                         :id
-    :keyboard-should-persist-taps   :always
-    :sticky-section-headers-enabled false
-    :sections                       communities
-    :render-section-header-fn       quo/list-index
-    :render-fn                      community-list-item}])
-
-(defn communities
-  []
-  (let [communities (rf/sub [:communities/section-list])]
-    [:<>
-     [topbar/topbar
-      {:title (i18n/label :t/communities)
-       :right-accessories
-       [{:icon :main-icons/more
-         :accessibility-label :chat-menu-button
-         :on-press
-         #(rf/dispatch [:bottom-sheet/show-sheet-old
-                        {:content (fn []
-                                    [communities-actions])
-                         :height  256}])}]}]
-     [communities-list communities]
-     [toolbar/toolbar
-      {:show-border? true
-       :center       [quo/button
-                      {:on-press #(rf/dispatch [::communities/open-create-community])
-                       :type     :secondary}
-                      (i18n/label :t/create-community)]}]]))
-
-(defn export-community
-  []
-  (let [{:keys [community-key]} (rf/sub [:popover/popover])]
-    [react/view
-     {:style {:padding-top        16
-              :padding-horizontal 16}}
-     [quo/text
-      {:size  :x-large
-       :align :center}
-      (i18n/label :t/community-private-key)]
-     [copyable-text/copyable-text-view
-      {:container-style {:padding-vertical 12}
-       :copied-text     community-key}
-      [quo/text
-       {:number-of-lines     1
-        :ellipsize-mode      :middle
-        :accessibility-label :chat-key
-        :monospace           true}
-       community-key]]]))
@@ -11,8 +11,7 @@
    :title (i18n/label :t/faq)
    :accessibility-label :faq-button
    :on-press
-    #(.openURL ^js react/linking
-               constants/faq)
+    #(.openURL ^js react/linking constants/faq)
    :chevron true}
   {:size :small
    :title (i18n/label :t/glossary)
@@ -25,13 +24,6 @@
    :accessibility-label :submit-bug-button
    :on-press
    #(re-frame/dispatch [:open-modal :bug-report])
-    :chevron true}
-   {:size :small
-    :title (i18n/label :t/request-feature)
-    :accessibility-label :request-a-feature-button
-    :on-press
-    #(re-frame/dispatch [:chat.ui/start-public-chat
-                         "support"])
    :chevron true}])

 (defn help-center
@@ -1,7 +0,0 @@
-(ns status-im.ui.screens.home.sheet.styles)
-(def add-new-view-wrapper
-  {:style {:flex-direction  :row
-           :padding-left    16
-           :padding-right   8
-           :justify-content :space-between
-           :align-items     :center}})
@@ -1,62 +0,0 @@
-(ns status-im.ui.screens.home.sheet.views
-  (:require [quo.core :as quo]
-            [utils.re-frame :as rf]
-            [utils.i18n :as i18n]
-            [status-im.qr-scanner.core :as qr-scanner]
-            [status-im.ui.components.invite.views :as invite]
-            [status-im.ui.components.react :as rn]
-            [status-im2.config :as config]
-            [status-im.ui.screens.home.sheet.styles :as style]))
-
-(defn- hide-sheet-and-dispatch
-  [event]
-  (rf/dispatch [:bottom-sheet/hide-old])
-  (rf/dispatch event))
-
-(defn add-new-view
-  []
-  [rn/view
-   [rn/view style/add-new-view-wrapper
-    [quo/text
-     {:size   :large
-      :weight :bold}
-     (i18n/label :t/open-home)]
-    [quo/button
-     {:type                :icon
-      :theme               :icon
-      :accessibility-label :universal-qr-scanner
-      :on-press            #(hide-sheet-and-dispatch
-                             [::qr-scanner/scan-code
-                              {:handler ::qr-scanner/on-scan-success}])}
-     :main-icons/qr]]
-   [quo/list-item
-    {:theme               :accent
-     :title               (i18n/label :t/start-new-chat)
-     :accessibility-label :start-1-1-chat-button
-     :icon                :main-icons/one-on-one-chat
-     :on-press            #(hide-sheet-and-dispatch [:open-modal :new-chat])}]
-   (when config/group-chat-enabled?
-     [quo/list-item
-      {:theme               :accent
-       :title               (i18n/label :t/start-group-chat)
-       :accessibility-label :start-group-chat-button
-       :icon                :main-icons/group-chat
-       :on-press            #(hide-sheet-and-dispatch [:contact.ui/start-group-chat-pressed])}])
-   [quo/list-item
-    {:theme               :accent
-     :title               (i18n/label :t/new-public-group-chat)
-     :accessibility-label :join-public-chat-button
-     :icon                :main-icons/public-chat
-     :on-press            #(hide-sheet-and-dispatch [:open-modal :new-public-chat])}]
-   [quo/list-item
-    {:theme               :accent
-     :title               (i18n/label :t/communities-alpha)
-     :accessibility-label :communities-button
-     :icon                :main-icons/communities
-     :on-press            #(hide-sheet-and-dispatch [:navigate-to :communities])}]
-   [invite/list-item
-    {:accessibility-label :chats-menu-invite-friends-button}]])
-
-;; Deprecated
-(def add-new
-  {:content add-new-view})
@@ -1,375 +0,0 @@
-(ns status-im.ui.screens.home.views
-  (:require
-    [quo.core :as quo]
-    [quo.design-system.colors :as colors]
-    [quo2.components.buttons.button :as quo2.button]
-    [quo2.components.markdown.text :as quo2.text]
-    [quo2.foundations.colors :as quo2.colors]
-    [re-frame.core :as re-frame]
-    [reagent.core :as reagent]
-    [status-im.add-new.db :as db]
-    [utils.i18n :as i18n]
-    [status-im.qr-scanner.core :as qr-scanner]
-    [status-im.react-native.resources :as resources]
-    [status-im.ui.components.chat-icon.screen :as chat-icon.screen]
-    [status-im.ui.components.chat-icon.styles :as chat-icon.styles]
-    [status-im.ui.components.connectivity.view :as connectivity]
-    [status-im.ui.components.icons.icons :as icons]
-    [status-im.ui.components.invite.views :as invite]
-    [status-im.ui.components.list.views :as list]
-    [status-im.ui.components.plus-button :as components.plus-button]
-    [status-im.ui.components.react :as react]
-    [status-im.ui.components.search-input.view :as search-input]
-    [status-im.ui.components.topbar :as topbar]
-    [status-im.ui.screens.chat.sheets :as sheets]
-    [status-im.ui.screens.communities.views :as communities.views]
-    [status-im.ui.screens.home.styles :as styles]
-    [status-im.ui.screens.home.views.inner-item :as inner-item]
-    [status-im.utils.utils :as utils]
-    [utils.debounce :as debounce])
-  (:require-macros [status-im.utils.views :as views]))
-
-(defn home-tooltip-view
-  []
-  [react/view (styles/chat-tooltip)
-   [react/view
-    {:style {:width            66
-             :position         :absolute
-             :top              -6
-             :background-color colors/white
-             :align-items      :center}}
-    [react/image
-     {:source (resources/get-image :empty-chats-header)
-      :style  {:width 50 :height 50}}]]
-   [react/touchable-highlight
-    {:style               {:position        :absolute
-                           :right           0
-                           :top             0
-                           :width           44
-                           :height          44
-                           :align-items     :center
-                           :justify-content :center}
-     :on-press            #(re-frame/dispatch [:multiaccounts.ui/hide-home-tooltip])
-     :accessibility-label :hide-home-button}
-    [icons/icon :main-icons/close-circle {:color colors/gray}]]
-   [react/i18n-text {:style styles/no-chats-text :key :chat-and-transact}]
-   [react/view
-    {:align-items   :center
-     :margin-top    8
-     :margin-bottom 12}
-    [invite/button]]])
-
-(defn welcome-blank-page
-  []
-  [react/view {:style {:flex 1 :flex-direction :row :align-items :center :justify-content :center}}
-   [react/i18n-text {:style styles/welcome-blank-text :key :welcome-blank-message}]])
-
-(defonce search-active? (reagent/atom false))
-
-(defn search-input-wrapper
-  [search-filter chats-empty]
-  [react/view
-   {:padding-horizontal 16
-    :padding-vertical   10}
-   [search-input/search-input
-    {:search-active? search-active?
-     :placeholder    (i18n/label :t/search)
-     :border-radius  10
-     :search-filter  search-filter
-     :before         true
-     :on-cancel      #(re-frame/dispatch [:search/home-filter-changed nil])
-     :on-blur        (fn []
-                       (when chats-empty
-                         (re-frame/dispatch [:search/home-filter-changed nil]))
-                       (re-frame/dispatch [:contacts/clear-new-identity]))
-     :on-focus       (fn [search-filter]
-                       (when-not search-filter
-                         (re-frame/dispatch [:search/home-filter-changed ""])
-                         (re-frame/dispatch [:contacts/clear-new-identity])))
-     :on-change      (fn [text]
-                       (re-frame/dispatch [:search/home-filter-changed text])
-                       (re-frame/dispatch [:set-in [:contacts/new-identity :state] :searching])
-                       (debounce/debounce-and-dispatch [:contacts/set-new-identity text] 300))}]])
-
-(defn search-input-wrapper-old
-  [search-filter chats-empty]
-  [react/view
-   {:padding-horizontal 16
-    :padding-vertical   10}
-   [search-input/search-input-old
-    {:search-active? search-active?
-     :search-filter  search-filter
-     :on-cancel      #(re-frame/dispatch [:search/home-filter-changed nil])
-     :on-blur        (fn []
-                       (when chats-empty
-                         (re-frame/dispatch [:search/home-filter-changed nil]))
-                       (re-frame/dispatch [:contacts/clear-new-identity]))
-     :on-focus       (fn [search-filter]
-                       (when-not search-filter
-                         (re-frame/dispatch [:search/home-filter-changed ""])
-                         (re-frame/dispatch [:contacts/clear-new-identity])))
-     :on-change      (fn [text]
-                       (re-frame/dispatch [:search/home-filter-changed text])
-                       (re-frame/dispatch [:set-in [:contacts/new-identity :state] :searching])
-                       (debounce/debounce-and-dispatch [:new-chat/set-new-identity text] 300))}]])
-
-(defn start-suggestion
-  [search-value]
-  (let [{:keys [state ens-name public-key compressed-key]}
-        @(re-frame/subscribe [:contacts/new-identity])
-        valid-private? (= state :valid)
-        valid-public? (db/valid-topic? search-value)]
-    (when (or valid-public? valid-private?)
-      [react/view
-       [quo/list-header (i18n/label :t/search-no-chat-found)]
-       (when valid-private?
-         [quo/list-item
-          {:theme    :accent
-           :icon     :main-icons/private-chat
-           :title    (or ens-name
-                         (utils/get-shortened-address
-                          (or compressed-key public-key)))
-           :subtitle (i18n/label :t/join-new-private-chat)
-           :on-press (fn []
-                       (debounce/dispatch-and-chill [:contact.ui/contact-code-submitted false] 3000)
-                       (re-frame/dispatch [:search/home-filter-changed nil]))}])
-       (when valid-public?
-         [quo/list-item
-          {:theme    :accent
-           :icon     :main-icons/public-chat
-           :title    (str "#" search-value)
-           :subtitle (i18n/label :t/join-new-public-chat)
-           :on-press (fn []
-                       (re-frame/dispatch [:chat.ui/start-public-chat search-value])
-                       (re-frame/dispatch [:set :public-group-topic nil])
-                       (re-frame/dispatch [:search/home-filter-changed nil]))}])])))
-
-(defn render-fn
-  [{:keys [chat-id] :as home-item}]
-  ;; We use `chat-id` to distinguish communities from chats
-  (if chat-id
-    [inner-item/home-list-item
-     home-item
-     {:on-press      (fn []
-                       (re-frame/dispatch [:dismiss-keyboard])
-                       (re-frame/dispatch [:chat/navigate-to-chat chat-id])
-                       (re-frame/dispatch [:search/home-filter-changed nil]))
-      :on-long-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
-                                          {:content (fn []
-                                                      [sheets/actions home-item])}])}]
-    [communities.views/community-home-list-item home-item]))
-
-(defn render-fn-old
-  [{:keys [chat-id] :as home-item}]
-  ;; We use `chat-id` to distinguish communities from chats
-  (if chat-id
-    [inner-item/home-list-item-old
-     home-item
-     {:on-press      (fn []
-                       (re-frame/dispatch [:dismiss-keyboard])
-                       (re-frame/dispatch [:chat/navigate-to-chat chat-id])
-                       (re-frame/dispatch [:search/home-filter-changed nil]))
-      :on-long-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
-                                          {:content (fn []
-                                                      [sheets/actions home-item])}])}]
-    [communities.views/community-home-list-item home-item]))
-
-(defn chat-list-key-fn
-  [item]
-  (or (:chat-id item) (:id item)))
-
-(defn get-item-layout
-  [_ index]
-  #js {:length 64 :offset (* 64 index) :index index})
-
-(views/defview communities-and-chats
-  []
-  (views/letsubs [{:keys [items search-filter]} [:home-items]
-                  hide-home-tooltip?            [:hide-home-tooltip?]]
-    (if (and (empty? items)
-             (empty? search-filter)
-             hide-home-tooltip?
-             (not @search-active?))
-      [welcome-blank-page]
-      [list/flat-list
-       {:key-fn                       chat-list-key-fn
-        :getItemLayout                get-item-layout
-        :on-end-reached               #(re-frame/dispatch [:chat/show-more-chats])
-        :keyboard-should-persist-taps :always
-        :data                         items
-        :render-fn                    render-fn
-        :header                       [:<>
-                                       (when (or (seq items) @search-active? (seq search-filter))
-                                         [search-input-wrapper search-filter (empty? items)])
-                                       (when (and (empty? items)
-                                                  (or @search-active? (seq search-filter)))
-                                         [start-suggestion search-filter])]
-        :footer                       (if (and (not hide-home-tooltip?) (not @search-active?))
-                                        [home-tooltip-view]
-                                        [react/view {:height 68}])}])))
-
-(views/defview communities-and-chats-old
-  []
-  (views/letsubs [{:keys [items search-filter]} [:home-items]
-                  hide-home-tooltip?            [:hide-home-tooltip?]]
-    (if (and (empty? items)
-             (empty? search-filter)
-             hide-home-tooltip?
-             (not @search-active?))
-      [welcome-blank-page]
-      [list/flat-list
-       {:key-fn                       chat-list-key-fn
-        :getItemLayout                get-item-layout
-        :on-end-reached               #(re-frame/dispatch [:chat/show-more-chats])
-        :keyboard-should-persist-taps :always
-        :data                         items
-        :render-fn                    render-fn-old
-        :header                       [:<>
-                                       (when (or (seq items) @search-active? (seq search-filter))
-                                         [search-input-wrapper-old search-filter (empty? items)])
-                                       (when (and (empty? items)
-                                                  (or @search-active? (seq search-filter)))
-                                         [start-suggestion search-filter])]
-        :footer                       (if (and (not hide-home-tooltip?) (not @search-active?))
-                                        [home-tooltip-view]
-                                        [react/view {:height 68}])}])))
-
-(views/defview chats-list
-  []
-  (views/letsubs [loading? [:chats/loading?]]
-    [:<>
-     [connectivity/loading-indicator]
-     (if loading?
-       [react/view {:flex 1 :align-items :center :justify-content :center}
-        [react/activity-indicator {:animating true}]]
-       [communities-and-chats])]))
-
-(views/defview chats-list-old
-  []
-  (views/letsubs [loading? [:chats/loading?]]
-    [:<>
-     [connectivity/loading-indicator]
-     (if loading?
-       [react/view {:flex 1 :align-items :center :justify-content :center}
-        [react/activity-indicator {:animating true}]]
-       [communities-and-chats-old])]))
-
-(views/defview plus-button
-  []
-  (views/letsubs [logging-in? [:multiaccounts/login]]
-    [components.plus-button/plus-button-old
-     {:on-press            (when-not logging-in?
-                             (fn []
-                               (re-frame/dispatch [:group-chat/clear-contacts])
-                               (re-frame/dispatch [:bottom-sheet/show-sheet-old :start-a-new-chat {}])))
-      :loading             logging-in?
-      :accessibility-label :new-chat-button}]))
-
-(views/defview plus-button-old
-  []
-  (views/letsubs [logging-in? [:multiaccounts/login]]
-    [components.plus-button/plus-button-old
-     {:on-press            (when-not logging-in?
-                             (fn []
-                               (re-frame/dispatch [:group-chat/clear-contacts])
-                               (re-frame/dispatch [:bottom-sheet/show-sheet-old :start-a-new-chat {}])))
-      :loading             logging-in?
-      :accessibility-label :new-chat-button}]))
-
-(views/defview notifications-button
-  []
-  (views/letsubs [notif-count [:activity-center/unread-count]]
-    [react/view
-     [quo2.button/button
-      {:type                :grey
-       :size                32
-       :width               32
-       :style               {:margin-left 12}
-       :accessibility-label :notifications-button
-       :on-press            #(re-frame/dispatch [:activity-center/open])}
-      [icons/icon :main-icons/notification2
-       {:color (quo2.colors/theme-colors quo2.colors/neutral-100 quo2.colors/white)}]]
-     (when (pos? notif-count)
-       [react/view
-        {:style          (merge (styles/counter-public-container) {:top 5 :right 5})
-         :pointer-events :none}
-        [react/view
-         {:style               styles/counter-public
-          :accessibility-label :notifications-unread-badge}]])]))
-
-(defn qr-button
-  []
-  [quo2.button/button
-   {:type                :grey
-    :accessibility-label "qr-button"
-    :size                32
-    :width               32
-    :style               {:margin-left 12}
-    :on-press            #(do
-                            (re-frame/dispatch [::qr-scanner/scan-code
-                                                {:handler ::qr-scanner/on-scan-success}]))}
-   [icons/icon :main-icons/qr2
-    {:color (quo2.colors/theme-colors quo2.colors/neutral-100 quo2.colors/white)}]])
-
-(defn scan-button
-  []
-  [quo2.button/button
-   {:type                :grey
-    :size                32
-    :width               32
-    :accessibility-label "scan-button"
-    :on-press            #(do
-                            (re-frame/dispatch [::qr-scanner/scan-code
-                                                {:handler ::qr-scanner/on-scan-success}]))}
-   [icons/icon :main-icons/scan2
-    {:color (quo2.colors/theme-colors quo2.colors/neutral-100 quo2.colors/white)}]])
-
-(views/defview profile-button
-  []
-  (views/letsubs [{:keys [public-key preferred-name emoji]} [:multiaccount]]
-    [react/view
-     [chat-icon.screen/emoji-chat-icon-view public-key false preferred-name emoji
-      {:size      28
-       :chat-icon chat-icon.styles/chat-icon-chat-list}]]))
-
-(defn home
-  []
-  [react/keyboard-avoiding-view
-   {:style         {:flex             1
-                    :background-color (quo2.colors/theme-colors quo2.colors/neutral-5
-                                                                quo2.colors/neutral-95)}
-    :ignore-offset true}
-   [topbar/topbar
-    {:navigation      :none
-     :use-insets      true
-     :background      (quo2.colors/theme-colors quo2.colors/neutral-5 quo2.colors/neutral-95)
-     :left-component  [react/view {:flex-direction :row :margin-left 16}
-                       [profile-button]]
-     :right-component [react/view {:flex-direction :row :margin-right 16}
-                       [scan-button]
-                       [qr-button]
-                       [notifications-button]]
-     :border-bottom   false}]
-   [react/view
-    {:flex-direction    :row
-     :justify-content   :space-between
-     :align-items       :center
-     :margin-horizontal 16
-     :margin-top        15
-     :margin-bottom     8}
-    [quo2.text/text {:size :heading-1 :weight :semi-bold} (i18n/label :t/messages)]
-    [plus-button]]
-   [chats-list]])
-
-(defn home-old
-  []
-  [react/keyboard-avoiding-view
-   {:style         {:flex 1}
-    :ignore-offset true}
-   [topbar/topbar
-    {:title           (i18n/label :t/chat)
-     :navigation      :none
-     :right-component [react/view {:flex-direction :row :margin-right 16}
-                       [connectivity/connectivity-button]]}]
-   [chats-list-old]
-   [plus-button-old]])
@@ -2,7 +2,7 @@
  (:require [re-frame.core :as re-frame]
            [reagent.core :as reagent]
            [status-im.ethereum.decode :as decode]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [status-im.ui.components.react :as react]
            [status-im2.common.json-rpc.events :as json-rpc]
            [utils.datetime :as datetime]))
@@ -36,7 +36,7 @@
             (reset! latest-block res)
             (get-block
              (str "0x"
-                   (status/number-to-hex
+                   (native-module/number-to-hex
                    (last-loaded-block-number)))
              (fn [res]
                (reset! last-loaded-block res))))))]
@@ -7,7 +7,6 @@
            [status-im.ui.components.animation :as anim]
            [status-im.ui.components.react :as react]
            [status-im.ui.screens.biometric.views :as biometric]
-            [status-im.ui.screens.communities.views :as communities]
            [status-im.ui.screens.keycard.frozen-card.view :as frozen-card]
            [status-im.ui.screens.keycard.views :as keycard.views]
            [status-im.ui.screens.multiaccounts.key-storage.views :as multiaccounts.key-storage]
@@ -167,9 +166,6 @@
                  (= :blocked-card view)
                  [keycard.views/blocked-card-popover]

-                  (= :export-community view)
-                  [communities/export-community]
-
                  (= :seed-key-uid-mismatch view)
                  [multiaccounts.key-storage/seed-key-uid-mismatch-popover]

@@ -3,7 +3,7 @@
            [re-frame.core :as re-frame]
            [status-im.ethereum.core :as ethereum]
            [utils.i18n :as i18n]
-            [status-im.native-module.core :as status]
+            [native-module.core :as native-module]
            [utils.re-frame :as rf]
            [status-im.utils.types :as types]
            [taoensso.timbre :as log]
@@ -21,7 +21,7 @@
         (-> masked-password
             security/safe-unmask-data
             ethereum/sha3)]
-     (status/verify
+     (native-module/verify
      address
      hashed-password
      (fn [result]
@@ -29,7 +29,7 @@
          (log/info "[delete-profile] verify-password" result error)
          (if-not (safe-blank? error)
            (callback :wrong-password nil)
-            (status/delete-multiaccount
+            (native-module/delete-multiaccount
             key-uid
             (fn [result]
               (let [{:keys [error]} (types/json->clj result)]
@@ -4,8 +4,6 @@
    [utils.i18n :as i18n]
    [status-im.ui.components.icons.icons :as icons]
    [status-im.ui.screens.about-app.views :as about-app]
-    [status-im.ui.screens.add-new.new-chat.views :as new-chat]
-    [status-im.ui.screens.add-new.new-public-chat.view :as new-public-chat]
    [status-im.ui.screens.advanced-settings.views :as advanced-settings]
    [status-im.ui.screens.appearance.views :as appearance]
    [status-im.ui.screens.backup-settings.view :as backup-settings]
@@ -30,7 +28,6 @@
    [status-im.ui.screens.communities.reorder-categories :as reorder-categories]
    [status-im.ui.screens.communities.requests-to-join :as requests-to-join]
    [status-im.ui.screens.communities.select-category :as select-category]
-    [status-im.ui.screens.communities.views :as communities]
    [status-im.ui.screens.contacts-list.views :as contacts-list]
    [status-im.ui.screens.currency-settings.views :as currency-settings]
    [status-im.ui.screens.dapps-permissions.views :as dapps-permissions]
@@ -198,7 +195,7 @@

   ;;CHAT
   {:name      :start-a-new-chat
-    :options   {:sheet? true :insets {:top? true}}
+    :options   {:sheet? true}
    :component new-chat-aio/contact-selection-list}

   {:name      :group-chat-profile
@@ -277,13 +274,10 @@
    :options   {:insets {:top? true}}
    ;;TODO custom subtitle
    :component group-chat/new-group}
-   {:name      :communities
-    ;;TODO custom
-    :options   {:insets {:top? true}}
-    :component communities/communities}
   {:name      :community-import
    :options   {:topBar {:title {:text (i18n/label :t/import-community-title)}}
-                :insets {:top? true}}
+                :insets {:top?    true
+                         :bottom? true}}
    :component communities.import/view}
   {:name      :community-edit
    :options   {:topBar {:title {:text (i18n/label :t/community-edit-title)}}
@@ -291,11 +285,13 @@
    :component community.edit/edit}
   {:name      :community-create
    :options   {:topBar {:title {:text (i18n/label :t/new-community-title)}}
-                :insets {:top? true}}
+                :insets {:top?    true
+                         :bottom? true}}
    :component communities.create/view}
   {:name      :community-membership
    :options   {:topBar {:title {:text (i18n/label :t/membership-title)}}
-                :insets {:top? true}}
+                :insets {:top?    true
+                         :bottom? true}}
    :component membership/membership}

   ;;WALLET
@@ -576,20 +572,6 @@

   ;;MODALS

-   ;[Chat] New Chat
-   {:name      :new-chat
-    :on-focus  [:contacts/new-chat-focus]
-    ;;TODO accessories
-    :options   {:insets {:top? true}}
-    :component new-chat/new-chat}
-
-   ;[Chat] New Public chat
-   {:name      :new-public-chat
-    :options   {:topBar {:title {:text (i18n/label :t/new-public-group-chat)}}
-                :insets {:bottom? true
-                         :top?    true}}
-    :component new-public-chat/new-public-chat}
-
   ;[Chat] Link preview settings
   {:name      :link-preview-settings
    :options   {:topBar {:title {:text (i18n/label :t/chat-link-previews)}}
@@ -610,13 +592,6 @@
    :options   {:insets {:top? true}}
    :component new-chat-aio/contact-selection-list}

-   ;[Chat] New Public chat
-   {:name      :new-public-chat
-    :options   {:topBar {:title {:text (i18n/label :t/new-public-group-chat)}}
-                :insets {:bottom? true
-                         :top?    true}}
-    :component new-public-chat/new-public-chat}
-
   ;[Group chat] Add participants
   {:name      :add-participants-toggle-list
    :on-focus  [:group/add-participants-toggle-list]
@@ -1,25 +0,0 @@
-(ns status-im.ui2.screens.chat.components.edit.style)
-
-(def container
-  {:flex-direction :row
-   :height         24})
-
-(def content-container
-  {:padding-horizontal 10
-   :flex               1
-   :flex-direction     :row})
-
-(def icon-container
-  {:position :absolute
-   :left     10
-   :bottom   -4
-   :width    16
-   :height   16})
-
-(def text-container
-  {:position       :absolute
-   :left           36
-   :right          54
-   :top            3
-   :flex-direction :row
-   :align-items    :center})
@@ -1,33 +0,0 @@
-(ns status-im.ui2.screens.chat.components.edit.view
-  (:require [utils.i18n :as i18n]
-            [quo2.core :as quo]
-            [quo2.foundations.colors :as colors]
-            [re-frame.core :as rf]
-            [react-native.core :as rn]
-            [status-im.ui2.screens.chat.components.edit.style :as style]))
-
-(defn edit-message
-  [on-cancel]
-  [rn/view
-   {:style               style/container
-    :accessibility-label :edit-message}
-   [rn/view {:style style/content-container}
-    [quo/icon :i/connector
-     {:size            16
-      :color           (colors/theme-colors colors/neutral-40 colors/neutral-60)
-      :container-style style/icon-container}]
-    [rn/view {:style style/text-container}
-     [quo/text
-      {:weight :medium
-       :size   :paragraph-2}
-      (i18n/label :t/editing-message)]]]
-   [quo/button
-    {:width               24
-     :size                24
-     :accessibility-label :reply-cancel-button
-     :on-press            #(do (on-cancel)
-                               (rf/dispatch [:chat.ui/cancel-message-edit]))
-     :type                :outline}
-    [quo/icon :i/close
-     {:size  16
-      :color (colors/theme-colors colors/neutral-100 colors/neutral-40)}]]])
@@ -1,37 +0,0 @@
-(ns status-im.ui2.screens.chat.components.reply.style)
-
-(defn reply-content
-  [pin?]
-  {:padding-horizontal (when-not pin? 10)
-   :flex               1
-   :flex-direction     :row})
-
-(defn quoted-message
-  [pin? in-chat-input?]
-  (merge {:flex-direction :row
-          :flex           1
-          :align-items    :center
-          :width          (if in-chat-input? "100%" "45%")}
-         (when-not pin?
-           {:left         22
-            :margin-right 22})))
-
-(def reply-from
-  {:flex-direction :row
-   :align-items    :center})
-
-(def message-author-text
-  {:margin-left 4})
-
-(def message-text
-  {:text-transform :none
-   :margin-left    4
-   :margin-top     2
-   :flex           1})
-
-(def gradient
-  {:position :absolute
-   :right    0
-   :top      0
-   :bottom   0
-   :width    "50%"})
@@ -1,142 +0,0 @@
-(ns status-im.ui2.screens.chat.components.reply.view
-  (:require [clojure.string :as string]
-            [utils.i18n :as i18n]
-            [quo.react-native :as rn]
-            [quo2.components.buttons.button :as quo2.button]
-            [quo2.components.icon :as quo2.icon]
-            [quo2.components.markdown.text :as quo2.text]
-            [quo2.foundations.colors :as colors]
-            [status-im2.constants :as constants]
-            [status-im.ethereum.stateofus :as stateofus]
-            [status-im.ui.components.icons.icons :as icons]
-            [status-im2.contexts.chat.messages.avatar.view :as avatar]
-            [utils.re-frame :as rf]
-            [status-im.ui2.screens.chat.components.reply.style :as style]
-            [react-native.linear-gradient :as linear-gradient]))
-
-(defn get-quoted-text-with-mentions
-  [parsed-text]
-  (string/join
-   (mapv (fn [{:keys [type literal children]}]
-           (cond
-             (= type "paragraph")
-             (get-quoted-text-with-mentions children)
-
-             (= type "mention")
-             (rf/sub [:messages/resolve-mention literal])
-
-             (seq children)
-             (get-quoted-text-with-mentions children)
-
-             :else
-             literal))
-         parsed-text)))
-
-(defn format-author
-  [contact-name]
-  (let [author (if (or (= (aget contact-name 0) "@")
-                       ;; in case of replies
-                       (= (aget contact-name 1) "@"))
-                 (or (stateofus/username contact-name)
-                     (subs contact-name 0 81))
-                 contact-name)]
-    author))
-
-(defn format-reply-author
-  [from username current-public-key]
-  (or (and (= from current-public-key)
-           (i18n/label :t/You))
-      (when username (format-author username))))
-
-(defn reply-deleted-message
-  []
-  [rn/view
-   {:style {:flex-direction :row
-            :align-items    :center}}
-   [quo2.icon/icon :sad-face {:size 16}]
-   [quo2.text/text
-    {:number-of-lines     1
-     :size                :label
-     :weight              :regular
-     :accessibility-label :quoted-message
-     :style               {:text-transform :none
-                           :margin-left    4
-                           :margin-top     2}}
-    (i18n/label :t/message-deleted)]])
-
-(defn reply-from
-  [{:keys [from contact-name current-public-key]}]
-  [rn/view {:style style/reply-from}
-   [avatar/avatar from :xxxs]
-   [quo2.text/text
-    {:weight          :semi-bold
-     :size            :paragraph-2
-     :number-of-lines 1
-     :style           style/message-author-text}
-    (format-reply-author from contact-name current-public-key)]])
-
-(defn reply-message
-  [{:keys [from identicon content-type contentType parsed-text content deleted? deleted-for-me?
-           album-images-count]}
-   in-chat-input? pin? recording-audio?]
-  (let [contact-name       (rf/sub [:contacts/contact-name-by-identity from])
-        current-public-key (rf/sub [:multiaccount/public-key])
-        content-type       (or content-type contentType)]
-    [rn/view
-     {:style {:flex-direction      :row
-              :height              (when-not pin? 24)
-              :accessibility-label :reply-message}}
-     [rn/view {:style (style/reply-content pin?)}
-      (when-not pin?
-        ;;TODO quo2 icon should be used
-        [icons/icon :main-icons/connector
-         {:color           (colors/theme-colors colors/neutral-40 colors/neutral-60)
-          :container-style {:position :absolute :left 10 :bottom -4 :width 16 :height 16}}])
-      (if (or deleted? deleted-for-me?)
-        [rn/view {:style (style/quoted-message pin? in-chat-input?)}
-         [reply-deleted-message]]
-        [rn/view {:style (style/quoted-message pin? in-chat-input?)}
-         [reply-from
-          {:from               from
-           :identicon          identicon
-           :contact-name       contact-name
-           :current-public-key current-public-key}]
-         [quo2.text/text
-          {:number-of-lines     1
-           :size                :label
-           :weight              :regular
-           :accessibility-label :quoted-message
-           :ellipsize-mode      :tail
-           :style               (merge
-                                 style/message-text
-                                 (when (or (= constants/content-type-image content-type)
-                                           (= constants/content-type-sticker content-type)
-                                           (= constants/content-type-audio content-type))
-                                   {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}))}
-          (case (or content-type contentType)
-            constants/content-type-image   (if album-images-count
-                                             (i18n/label :t/images-albums-count
-                                                         {:album-images-count album-images-count})
-                                             (i18n/label :t/image))
-            constants/content-type-sticker (i18n/label :t/sticker)
-            constants/content-type-audio   (i18n/label :t/audio)
-            (get-quoted-text-with-mentions (or parsed-text (:parsed-text content))))]])]
-     (when (and in-chat-input? (not recording-audio?))
-       [quo2.button/button
-        {:width               24
-         :size                24
-         :type                :outline
-         :accessibility-label :reply-cancel-button
-         :on-press            #(rf/dispatch [:chat.ui/cancel-message-reply])}
-        ;;TODO quo2 icon should be used
-        [icons/icon :main-icons/close
-         {:width  16
-          :height 16
-          :color  (colors/theme-colors colors/neutral-100 colors/neutral-40)}]])
-     (when (and in-chat-input? recording-audio?)
-       [linear-gradient/linear-gradient
-        {:colors [(colors/theme-colors colors/white-opa-0 colors/neutral-90-opa-0)
-                  (colors/theme-colors colors/white colors/neutral-90)]
-         :start  {:x 0 :y 0}
-         :end    {:x 0.7 :y 0}
-         :style  style/gradient}])]))
@@ -1,5 +0,0 @@
-(ns status-im.ui2.screens.chat.composer.edit.style)
-
-(def container
-  {:padding-horizontal 15
-   :padding-vertical   8})
@@ -1,23 +0,0 @@
-(ns status-im.ui2.screens.chat.composer.edit.view
-  (:require [react-native.core :as rn]
-            [status-im.ui2.screens.chat.components.edit.view :as edit]
-            [status-im.ui2.screens.chat.composer.edit.style :as style]
-            [status-im.ui2.screens.chat.composer.input :as input]))
-
-(defn- focus-input-on-edit
-  [edit had-edit text-input-ref]
-  ;;when we show edit we focus input
-  (when-not (= edit @had-edit)
-    (reset! had-edit edit)
-    (when edit
-      ;; A setTimeout of 0 is necessary to ensure the statement is enqueued and will get executed ASAP.
-      (js/setTimeout #(input/input-focus text-input-ref) 0))))
-
-(defn edit-message-auto-focus-wrapper
-  [text-input-ref _]
-  (let [had-edit (atom nil)]
-    (fn [_ edit on-cancel]
-      (focus-input-on-edit edit had-edit text-input-ref)
-      (when edit
-        [rn/view {:style style/container}
-         [edit/edit-message on-cancel]]))))
@@ -1,11 +0,0 @@
-(ns status-im.ui2.screens.chat.composer.images.style)
-
-(def remove-photo-container
-  {:position :absolute
-   :top      5
-   :right    5})
-
-(def small-image
-  {:width         56
-   :height        56
-   :border-radius 8})
@@ -1,35 +0,0 @@
-(ns status-im.ui2.screens.chat.composer.images.view
-  (:require [quo2.core :as quo]
-            [quo2.foundations.colors :as colors]
-            [re-frame.core :as rf]
-            [react-native.core :as rn]
-            [status-im.ui2.screens.chat.composer.images.style :as style]))
-
-(defn image
-  [item]
-  ;; there is a bug on Android https://github.com/facebook/react-native/issues/12534
-  ;; so we need some magic here with paddings so close button isn't cut
-  [rn/view {:padding-top 12 :padding-bottom 8 :padding-right 12}
-   [rn/image
-    {:source {:uri (:resized-uri (val item))}
-     :style  style/small-image}]
-   [rn/touchable-opacity
-    {:on-press (fn [] (rf/dispatch [:chat.ui/image-unselected (val item)]))
-     :style    style/remove-photo-container
-     :hit-slop {:right  5
-                :left   5
-                :top    10
-                :bottom 10}}
-    [quo/icon :i/clear
-     {:size  20
-      :color (colors/theme-colors colors/neutral-50 colors/neutral-60)}]]])
-
-(defn images-list
-  [images]
-  (when (seq images)
-    [rn/flat-list
-     {:key-fn                       first
-      :render-fn                    image
-      :data                         images
-      :horizontal                   true
-      :keyboard-should-persist-taps :handled}]))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Omar Basem	b00f0971bc	velocity gesture test	2023-05-09 14:47:03 +04:00
Omar Basem	a6fdc9b118	fix shadow	2023-05-09 13:11:37 +04:00
Omar Basem	4d1ff17ba1	qa review	2023-05-09 12:37:58 +04:00
Omar Basem	8a02803d9f	updates	2023-05-09 12:37:58 +04:00
Omar Basem	f9ee7e0559	review	2023-05-09 12:37:58 +04:00
Omar Basem	978540d5b7	lint	2023-05-09 12:37:58 +04:00
Omar Basem	3c02518d4a	fix	2023-05-09 12:37:57 +04:00
Omar Basem	7bafb3d82b	formatting	2023-05-09 12:37:57 +04:00
Omar Basem	59d1383177	lint	2023-05-09 12:37:57 +04:00
Omar Basem	5fb48949ae	lint	2023-05-09 12:37:56 +04:00
Omar Basem	78e9102264	review	2023-05-09 12:37:56 +04:00
Omar Basem	2b2170dfff	review	2023-05-09 12:37:56 +04:00
Omar Basem	ab94f9b017	qa review	2023-05-09 12:37:56 +04:00
Omar Basem	1f5047eea7	review	2023-05-09 12:37:55 +04:00
Omar Basem	e6e77e4a58	fix test	2023-05-09 12:37:55 +04:00
Omar Basem	22d9c14ae6	lint	2023-05-09 12:37:55 +04:00
Omar Basem	84bbfe8f9d	feat: new composer review lint review udpates updates updates udpates updates updates lint updates composer shell button updates updates updates updates updates updates updates updates updates updates updates updates updates lint review review review review revert podfile.lock selectable-input updates updates updates updates	2023-05-09 12:37:55 +04:00
Ibrahem Khalil	ab973076eb	[15612] Only allow showing universal links after clicking start using status (#15786 )	2023-05-09 10:49:25 +03:00
Volodymyr Kozieiev	c78bdda717	Last message preview improvings (#15613 )	2023-05-08 18:37:26 +01:00
jakub	b7a138118a	nix: update Gradle dependencies Contains changes that should have been included in: https://github.com/status-im/status-mobile/pull/15713 Signed-off-by: Jakub Sokołowski <jakub@status.im>	2023-05-08 16:22:18 +02:00
jakub	f03e11c877	nix: fix handling POMs without JARs Otherwise we can get a failure like this: ``` Regenerating Nix files... Found 40 sub-projects... Found 609 direct dependencies... Found 889 dependency URLs... ! Failed to fetch: https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.5/asm-bom-9.5.jar ``` When using `make nix-update-gradle`. Signed-off-by: Jakub Sokołowski <jakub@status.im>	2023-05-08 15:48:19 +02:00
Omar Basem	6c5350573d	refactor: remove images placeholder text (#15830 ) * refactor: remove placeholder images text	2023-05-08 15:03:51 +04:00
Omar Basem	521765e312	fix: new-chat-insets (#15829 )	2023-05-08 12:20:35 +04:00
Ajay Sivan	5f362f333f	quo2 predictive keyboard component (#15806 )	2023-05-05 20:41:57 +05:30
Ajay Sivan	6aae68ba04	fix: incorrect font-size in user-avatar(size: medium) (#15801 )	2023-05-04 21:41:46 +05:30
Churikova Tetiana	dbaaa54c83	e2e: remove/switch profiles	2023-05-04 16:27:55 +02:00
Brian Sztamfater	e5913cc3ea	feat: audio component Signed-off-by: Brian Sztamfater <brian@status.im>	2023-05-04 10:48:05 -03:00
Ajay Sivan	0226a92c07	quo2 documentation drawer component (#15674 )	2023-05-04 19:15:13 +05:30
Roman Volosovskyi	d7db401cb2	[#15798 ] Fix issue with android dev env by disabling flipper	2023-05-04 11:18:14 +02:00
Omar Basem	7e54aa0b0d	New mentions design (#15799 ) * feat: mentions new design	2023-05-04 13:12:42 +04:00
Alexander	4774b0f5e5	Fix for mention text overlaying message text when mention is added during message editing (Android) (#15778 )	2023-05-03 18:26:37 +02:00
Siddarth Kumar	6aa38de7c7	set checked for communities disclaimer explicitly (#15804 )	2023-05-03 21:24:19 +05:30
Omar Basem	a973976123	New composer - add audio comp (#15790 ) * feat: composer - add audio comp	2023-05-03 09:54:23 +04:00
Ajay Sivan	03aac0e4ce	fix: quo2 title-input component selection style fix for android (#15717 )	2023-05-02 17:01:09 +05:30
Siddarth Kumar	fac368521b	(fix) modify disclaimer component for on tap UX (#15757 )	2023-05-02 15:55:49 +05:30
Omar Basem	51b9253734	revert podfile.lock (#15791 ) * revert podfile.lock	2023-05-02 09:27:47 +04:00
Omar Basem	08e6b8164e	feat: composer - edit message (#15772 ) * feat: new composer - edit message	2023-05-01 20:39:07 +04:00
Parvesh Monu	9a8354f783	Improve dissmiss all overlays (#15773 )	2023-04-28 20:52:34 +05:30
Churikova Tetiana	6c0c742676	e2e: align with new communities / cleanup	2023-04-28 13:56:31 +02:00
flexsurfer	e0ed2a250b	clean old code, remove public chat, implement drawers for home screens (#15766 )	2023-04-28 13:42:38 +02:00
jakub	2f988fcd47	nix: disable sandboxing for xcodewrapper Otherwise we see weird errors like this: ``` /nix/store/g0jijpgcb4q54zbvz5p8yvxcnb6lshnk-stdenv-darwin/setup: line 1391: /nix/store/sja8sqq4y5s9ijkb97i3pi2jrhsy40cz-xcode-wrapper-14.3/bin/xcodebuild: Operation not permitted We require xcodebuild version: 14.3 error: builder for '/nix/store/d1dji0ywl851wgj9vv58ibpm32gq3wsm-xcode-wrapper-14.3.drv' failed with exit code 1; last 2 log lines: > /nix/store/g0jijpgcb4q54zbvz5p8yvxcnb6lshnk-stdenv-darwin/setup: line 1391: /nix/store/sja8sqq4y5s9ijkb97i3pi2jrhsy40cz-xcode-wrapper-14.3/bin/xcodebuild: Operation not permitted > We require xcodebuild version: 14.3 ``` Related to: https://github.com/NixOS/nixpkgs/pull/228696 Signed-off-by: Jakub Sokołowski <jakub@status.im>	2023-04-28 11:24:16 +02:00
frank	ee71117111	remove unused code relate to old text-input component (#15765 ) * remove unused code relate to old text-input component * removed tow lines	2023-04-28 09:37:13 +08:00
Omar Basem	3e9d5dde54	Reimplement composer: add reply (#15736 ) * feat: add composer reply	2023-04-27 20:20:00 +04:00
Siddarth Kumar	2eed30be8f	(chore) : Improve QR code quo2 component (#15755 ) This PR adds the ability to : - Generate a QR by passing any url. - See different error correction levels. - Shows the media server url for that specific QR code. - Moved media server URI generation logic to `image_server.cljs`	2023-04-27 19:25:49 +05:30
Parvesh Monu	8e49a06dbe	fix UI freeze issue (#15761 )	2023-04-27 17:26:33 +05:30
Roman Volosovskyi	fb326bbf4e	[#15741 ] Fix error on tapping pinned message	2023-04-27 10:23:16 +02:00
Jamie Caprani	52c6687608	feat: add identifiers screen to onboarding-flow (#15684 )	2023-04-26 21:26:32 -07:00
frank	cfefef6b75	fix [#15616 ] Sometimes mentions list does not appear after typing @ in chat input filed (#15622 )	2023-04-27 11:37:01 +08:00
flexsurfer	e6ba40ac17	fix quo hotreload (#15760 )	2023-04-26 18:14:58 +02:00
flexsurfer	efbf93f6e2	move status native module (#15749 )	2023-04-26 18:14:14 +02:00
Mohamed Javid	6eb2029c51	Show "Kicked from community" notification in Activity Center (#15734 ) * [Feature] Implement Community Kicked notification * Status Go Update	2023-04-26 19:56:33 +05:30
Parvesh Monu	55bab9454a	fix status bar font color (#15744 )	2023-04-26 19:35:51 +05:30
flexsurferandChurikova Tetiana	0ca6ee3934	Request to join community screen is not scrollable on Android #15748 (#15750 ) Co-authored-by: Churikova Tetiana <tatiana@status.im>	2023-04-26 13:33:00 +02:00
Parvesh Monu	0649c66dde	fix device theme change listener in ios (#15724 )	2023-04-26 16:41:11 +05:30
Roman Volosovskyi	1b0374a156	[#15655 ] Resolve messages with markdown on Jump To screen	2023-04-26 11:55:45 +02:00