fix: chat mention alignment

2023-04-21 20:28:56 +05:30
426 changed files with 10634 additions and 10299 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
-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.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
 status-im.ethereum.abi-spec/bytes-to-hex
 status-im.android.core/init
 status-im.chat.models.message/transport-keys
@@ -7,7 +7,6 @@

 # Xcode
 #
-/ios/.xcode.env.local
 /component-spec
 result/
 build/
@@ -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
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent { label 'linux' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -9,7 +9,7 @@ pipeline {
  options {
    timestamps()
    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 15, unit: 'MINUTES')
+    timeout(time: 10, unit: 'MINUTES')
    /* Limit builds retained */
    buildDiscarder(logRotator(
      numToKeepStr: '10',
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent { label 'macos' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent { label 'linux' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.3'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent {
@@ -18,7 +18,6 @@

 [Working on PR together with QA team](pipeline_process.md)

-[Debugging](debugging.md)


 ## Testing
@@ -91,11 +91,30 @@ These guidelines make db.cljs namespaces the place to go when making changes to

  - If manual QA is not needed but all tests don't pass, you can ping @churik or @Serhy to confirm that failed E2E tests are not unrelated.

+## Enabling debug logs
+Calls to `log/debug` will not be printed to the console by default. It can be enabled under "Advanced settings" in the app:
+
+![Enable Debug Logs](images/codebase-structure-and-guidelines/log-settings.png)
+
 ## Translations
 The app relies on system locale to select a language from the [list of supported languages](https://github.com/status-im/status-mobile/blob/bda73867471cf2bb8a68b1cc27c9f94b92d9a58b/src/status_im/i18n_resources.cljs#L9). It falls back to English in cash the system locale is not supported.

 We use Lokalise App to manage [translations](https://translate.status.im/). In case you need to add/remove a key to translations, you only need to change `en.json`. Missing keys fallback to `en.json`. The actual translations will be added by Lokalise.

+## re-frisk
+re-frisk is a state visualization tool written by our very own Andrey (@flexsurfer). To start re-frisk, execute the following command:
+```bash
+$ yarn shadow-cljs run re-frisk-remote.core/start
+```
+
+or you can also use make:
+
+```bash
+$ make run-re-frisk
+```
+
+A server will be started at http://localhost:4567. It might show "not connected" at first. Don't worry and just start using the app. The events and state will populate.
+
 ## Merging approved PRs

 We don't Github's UI to merge. Instead `./scripts/merge-pr.sh` is used to sign and merge PR to `develop`. You first need to enable [GPG signing on you commits](https://github.com/status-im/status-mobile/blob/develop/STARTING_GUIDE.md#configure-gpg-keys-for-signing-commits).
@@ -1,64 +0,0 @@
-# Debugging
-
-## Inspecting re-frame with re-frisk
-`re-frisk` is a state visualization tool written by our very own Andrey (@flexsurfer). With its help you can inspect the current state of app-db, watch event, etc.
-
-![re-frisk](images/debugging/re-frisk.png)
-
-To start `re-frisk`, execute the following command:
-```bash
-$ yarn shadow-cljs run re-frisk-remote.core/start
-```
-
-or you can also use make:
-
-```bash
-$ make run-re-frisk
-```
-
-A server will be started at http://localhost:4567. It might show "not connected" at first. Don't worry and just start using the app. The events and state will populate.
-
-More details about re-frisk are on the [project page](https://github.com/flexsurfer/re-frisk).
-
-## Enabling debug logs
-Calls to `log/debug` will not be printed to the console by default. It can be enabled under "Advanced settings" in the app:
-
-![Enable Debug Logs](images/debugging/log-settings.png)
-
-
-## Checking status-go logs
-While status mobile works it saves logs from `status-go` to `geth.log` file.
-
-
-### Checking logs from physical device
-To obtain `geth.log` from physical device you need to shake it and in an opened menu select "Share logs". 
-
-![Share logs](images/debugging/share-logs.jpeg)
-
-
-### Checking logs from iOS Simulator
-When developing with iOS simulator it is more convenient to see the `geth.log` updates in real-time.
-To do this:
- open Activity Monitor
- find the "StatusIm" app and doubleclick it
- in the opened window select "Open files and ports" and find the full path to `geth.log` (note that it won't appear until you login to Status app)
-
-![geth.log path](images/debugging/geth-path.png)
-
-
-## Tips
-### From @ilmotta:
-
-Something I find extremely convenient for Android is to use `adb` to tail logs. I don't use macOS so I don't know if the iOS simulator offers a CLI interface with the same capabilities.
-
-But here's what I use for example:
-
-```
- adb shell tail -n 10 -f /storage/emulated/0/Android/data/im.status.ethereum.debug/files/Download/geth.log | grep 'waku.relay'
-``` 
-
-Also to inspect logs in a more flexible manner, instead of the strict output from `make run-metro`, I prefer `adb logcat`. Combined with enabling status-mobile logs in debug by default plus filtering the logs to only what I care during development, I find this helps me inspect the app without running re-frisk because with the debug log level I can already see which events are dispatched (one of the features I like the most from re-frisk).
-
-```
-adb logcat | grep 'ReactNativeJS\|StatusModule\|GoLog'
-```
@@ -36,50 +36,6 @@ Pay special attention to:

 ## Dos and don'ts

-### Hiccup
-
-Never use anonymous inline function in hiccup, this will lead to reinitialization of component on each render of parent component
-
-```clojure
-;; bad
-(defn checkbox-view
-  [{:keys [size]}]
-  [rn/view
-   [(fn [] [rn/view])]])
-
-;; good
-(defn comp []
-  [rn/view])
-
-(defn checkbox-view
-  [{:keys [size]}]
-  [rn/view
-   [comp]])
-```
-
-This mistake mostly happens with functional components
-
-```clojure
-;; bad
-(fn []
-  (let [atom (rf/sub [:sub])]
-    (fn []
-      [:f>
-       (fn []
-         [rn/text atom]
-
-;; good
-(defn f-comp [atom]
- [rn/text atom])
-         
-(fn []
- (let [atom (rf/sub [:sub])]
-   (fn []
-     [:f> f-comp atom]))) 
-```
-
-it's important to name functional components with `f-` prefix
-
 ### Component styles

 Prefer to define styles in a separate file named `style.cljs`, colocated with
@@ -134,38 +90,11 @@ their styles in the top-level of the properties map, prefer to add them inside t
 ]
 ```

-Also its fine to keep one liner styles in view
-
-```clojure
-;; ok
-[rn/view {:style {:flex 1 :padding-top 5}}]
-```
-
-### Don't define properties in styles ns
-
-Properties must be set on view level 
-
-```clojure
-;; bad
-{:style         {:position         :absolute
-                 :left             0
-                 :right            0
-                 :bottom           0}
- :blur-amount   30
- :blur-radius   25
- :blur-type     :transparent
- :overlay-color :transparent}
-
-;; good
-{:position         :absolute
- :left             0
- :right            0
- :bottom           0}
-```
-
-
-### Apply animated styles in the style file
+### Always apply animated styles in the style file

+When implementing styles for reanimated views, we should always define
+them in the style file and apply animations with reanimated/apply-animations-to-style
+in the style definition.

 ```clojure
 ;; bad
@@ -234,7 +234,7 @@ PODS:
    - React
  - react-native-blob-util (0.13.18):
    - React-Core
-  - react-native-blur (4.3.3):
+  - react-native-blur (4.3.2):
    - React-Core
  - react-native-camera-kit (8.0.4):
    - React
@@ -256,6 +256,8 @@ PODS:
    - React-Core
  - react-native-randombytes (3.6.1):
    - React-Core
+  - react-native-safe-area-context (2.0.0):
+    - React
  - react-native-shake (3.4.0):
    - React
  - react-native-slider (3.0.0):
@@ -410,8 +412,6 @@ PODS:
    - Yoga
  - RNShare (7.0.1):
    - React-Core
-  - RNStaticSafeAreaInsets (2.2.0):
-    - React-Core
  - RNSVG (9.13.6):
    - React
  - SDWebImage (5.11.1):
@@ -468,6 +468,7 @@ DEPENDENCIES:
  - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
  - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
  - react-native-randombytes (from `../node_modules/react-native-randombytes`)
+  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
  - react-native-shake (from `../node_modules/react-native-shake`)
  - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
  - react-native-status (from `../modules/react-native-status`)
@@ -502,7 +503,6 @@ DEPENDENCIES:
  - RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
  - RNReanimated (from `../node_modules/react-native-reanimated`)
  - RNShare (from `../node_modules/react-native-share`)
-  - RNStaticSafeAreaInsets (from `../node_modules/react-native-static-safe-area-insets`)
  - RNSVG (from `../node_modules/react-native-svg`)
  - secp256k1 (from `https://github.com/status-im/secp256k1.swift.git`)
  - SQLCipher (~> 3.0)
@@ -589,6 +589,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-orientation-locker"
  react-native-randombytes:
    :path: "../node_modules/react-native-randombytes"
+  react-native-safe-area-context:
+    :path: "../node_modules/react-native-safe-area-context"
  react-native-shake:
    :path: "../node_modules/react-native-shake"
  react-native-slider:
@@ -657,8 +659,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-reanimated"
  RNShare:
    :path: "../node_modules/react-native-share"
-  RNStaticSafeAreaInsets:
-    :path: "../node_modules/react-native-static-safe-area-insets"
  RNSVG:
    :path: "../node_modules/react-native-svg"
  secp256k1:
@@ -682,11 +682,11 @@ SPEC CHECKSUMS:
  boost: a7c83b31436843459a1961bfd74b96033dc77234
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
  FBLazyVector: d2db9d00883282819d03bbd401b2ad4360d47580
  FBReactNativeSpec: 94da4d84ba3b1acf459103320882daa481a2b62d
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
+  glog: 9e3310013355e9221591364060e841c28041dfe3
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
@@ -706,7 +706,7 @@ SPEC CHECKSUMS:
  React-logger: 85f4ef06b9723714b2dfa5b0e5502b673b271b58
  react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
  react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
-  react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
+  react-native-blur: 4db8c7556566df4e8714c1af5762a4ebc99175d5
  react-native-camera-kit: 498a6d111a904834e0824e9073cfadef7303235f
  react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
@@ -716,6 +716,7 @@ SPEC CHECKSUMS:
  react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
  react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
+  react-native-safe-area-context: 60f654e00b6cc416573f6d5dbfce3839958eb57a
  react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
  react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
  react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
@@ -750,7 +751,6 @@ SPEC CHECKSUMS:
  RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
  RNReanimated: 3ad6ec4e147462206be9d1c925df10b6ea850b0e
  RNShare: 2dc2fcac3f7321cfd6b60a23ed4bf4d549f86f5f
-  RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
  RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
  SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
@@ -763,4 +763,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: c29de3b14e3275299c51aa95520622f09d084bcb

-COCOAPODS: 1.12.1
+COCOAPODS: 1.12.0
@@ -1354,12 +1354,11 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
    }

    @ReactMethod
-    public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String keycardUID, final String password,
-                                        final String newPassword, final Callback callback) throws JSONException {
+    public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String password, final String newPassword, final Callback callback) throws JSONException {
        final String keyStoreDir = this.getKeyStorePath(keyUID);
        executeRunnableStatusGoMethod(() -> {
                Statusgo.initKeystore(keyStoreDir);
-                return Statusgo.convertToKeycardAccount(accountData, options, keycardUID, password, newPassword);
+                return Statusgo.convertToKeycardAccount(accountData, options, password, newPassword);
            }, callback);
    }

@@ -692,7 +692,6 @@ RCT_EXPORT_METHOD(reEncryptDbAndKeystore:(NSString *)keyUID
 RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
                  accountData:(NSString *)accountData
                  settings:(NSString *)settings
-                  keycardUID:(NSString *)keycardUID
                  currentPassword:(NSString *)currentPassword
                  newPassword:(NSString *)newPassword
                  callback:(RCTResponseSenderBlock)callback) {
@@ -701,7 +700,7 @@ RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
 #endif
    NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
    StatusgoInitKeystore(multiaccountKeystoreDir.path);
-    NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, keycardUID, currentPassword, newPassword);
+    NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, currentPassword, newPassword);
    callback(@[result]);
 }

@@ -118,6 +118,7 @@ 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
@@ -125,24 +126,28 @@ 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
@@ -155,6 +160,7 @@ 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
@@ -162,6 +168,7 @@ 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
@@ -175,6 +182,7 @@ 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
@@ -184,6 +192,7 @@ 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
@@ -193,16 +202,19 @@ 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
@@ -212,11 +224,13 @@ 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
@@ -226,6 +240,7 @@ 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
@@ -237,6 +252,7 @@ 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
@@ -256,6 +272,7 @@ 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
@@ -272,6 +289,7 @@ com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-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
@@ -289,6 +307,7 @@ 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
@@ -298,6 +317,7 @@ 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
@@ -307,12 +327,14 @@ 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
@@ -322,6 +344,7 @@ 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
@@ -331,6 +354,7 @@ 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
@@ -367,7 +391,7 @@ com.facebook.soloader:annotation:0.10.1
 com.facebook.soloader:nativeloader:0.10.1
 com.facebook.soloader:soloader:0.10.1
 com.facebook.yoga:proguard-annotations:1.19.0
-com.github.Dimezis:BlurView:version-2.0.3
+com.github.Dimezis:BlurView:version-2.0.2
 com.github.bumptech.glide:annotations:4.12.0
 com.github.bumptech.glide:compiler:4.12.0
 com.github.bumptech.glide:disklrucache:4.12.0
@@ -391,11 +415,13 @@ 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
@@ -569,7 +595,10 @@ 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,12 +122,14 @@ 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
@@ -155,28 +157,33 @@ 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
@@ -184,6 +191,7 @@ 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
@@ -194,36 +202,43 @@ 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
@@ -238,24 +253,28 @@ 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
@@ -269,6 +288,7 @@ 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
@@ -279,6 +299,7 @@ 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
@@ -290,18 +311,21 @@ 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
@@ -310,7 +334,7 @@ https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.1.0/zipflinger-
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom
 https://dl.google.com/dl/android/maven2/com/google/test/platform/core-proto/0.0.2-dev/core-proto-0.0.2-dev.pom
-https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.3/BlurView-version-2.0.3.pom
+https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.2/BlurView-version-2.0.2.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/android/3.1.1/android-3.1.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1.pom
@@ -472,15 +496,17 @@ 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.19.0/error_prone_annotations-2.19.0.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
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.19.0/error_prone_parent-2.19.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.18.0/error_prone_parent-2.18.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -546,10 +572,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.2.0/istack-commons-runtime-4.2.0.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/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.2.0/istack-commons-4.2.0.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/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
@@ -577,7 +603,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.2/jakarta.activation-api-2.1.2.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/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
@@ -693,7 +719,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.34.0/checker-qual-3.34.0.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/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
@@ -713,8 +739,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.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/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/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
@@ -735,9 +761,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.10/org.jacoco.build-0.8.10.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.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.10/org.jacoco.core-0.8.10.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.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
@@ -818,6 +844,8 @@ 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
@@ -842,7 +870,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.3/junit-bom-5.9.3.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/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
@@ -852,7 +880,6 @@ 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
@@ -14,12 +14,12 @@ declare -a REPOS=(
  "https://jitpack.io"
 )

-function nix_prefetch() {
-    nix store prefetch-file --json "${1}" 2>/dev/null
+function nix_fetch() {
+    nix-prefetch-url --print-path --type sha256 "${1}" 2>/dev/null
 }

-function get_nix_path() { echo "${1}" | jq -r .storePath; }
-function get_nix_sha() { echo "${1}" | jq -r .hash; }
+function get_nix_path() { echo "${1}" | tail -n1; }
+function get_nix_sha() { echo "${1}" | head -n1; }
 function get_sha1() { sha1sum "${1}" | cut -d' ' -f1; }

 # Assumes REPOS from repos.sh is available
@@ -44,9 +44,9 @@ function fetch_and_template_file() {
    local OBJ_URL OBJ_NIX_FETCH_OUT OBJ_NAME OBJ_PATH

    OBJ_URL="${REPO_URL}/${PKG_PATH}/${FILENAME}"
-    if ! OBJ_NIX_FETCH_OUT=$(nix_prefetch "${OBJ_URL}"); then
+    if ! OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_URL}"); then
        echo " ! Failed to fetch: ${OBJ_URL}" >&2
-        return 1
+        exit 1
    fi

    OBJ_NAME="${FILENAME}"
@@ -58,10 +58,6 @@ 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
@@ -85,7 +81,7 @@ PKG_PATH="${PKG_URL_NO_EXT#"${REPO_URL}/"}"
 PKG_PATH="$(dirname "${PKG_PATH}")"

 # Both JARs and AARs have a POM
-POM_NIX_FETCH_OUT=$(nix_prefetch "${PKG_URL_NO_EXT}.pom")
+POM_NIX_FETCH_OUT=$(nix_fetch "${PKG_URL_NO_EXT}.pom")
 POM_PATH=$(get_nix_path "${POM_NIX_FETCH_OUT}")
 POM_NAME=$(basename "${PKG_URL_NO_EXT}.pom")
 if [[ -z "${POM_PATH}" ]]; then
@@ -115,7 +111,7 @@ echo -ne "
      }"

 # Some deps are just POMs, in which case there is no JAR to fetch.
-[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file_no_fail "${PKG_NAME}.jar"
+[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file "${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,9 +8,6 @@ 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
@@ -16,7 +16,7 @@
    "@babel/preset-typescript": "^7.17.12",
    "@react-native-async-storage/async-storage": "^1.17.9",
    "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
-    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.3-status",
+    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.2-status",
    "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#refs/tags/v4.0.4-status.0",
    "@react-native-community/clipboard": "^1.2.2",
    "@react-native-community/hooks": "^2.5.1",
@@ -63,9 +63,9 @@
    "react-native-randombytes": "^3.6.1",
    "react-native-reanimated": "2.3.3",
    "react-native-redash": "^16.0.11",
+    "react-native-safe-area-context": "^2.0.0",
    "react-native-shake": "^3.3.1",
    "react-native-share": "^7.0.1",
-    "react-native-static-safe-area-insets": "^2.2.0",
    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39",
    "react-native-svg": "^9.8.4",
    "react-native-touch-id": "^4.4.1",
@@ -39,22 +39,9 @@ chmod 644 ${SECRETS_FILE_PATH}
 # If secrets file was created we want to remove it.
 trap "rm -vf ${SECRETS_FILE_PATH}" EXIT ERR INT QUIT

-# Names of variables containing secrets to save in env file.
-SECRETS_ENV_VARS=(
-    'ALCHEMY_ARBITRUM_GOERLI_TOKEN'
-    'ALCHEMY_ARBITRUM_MAINNET_TOKEN'
-    'ALCHEMY_OPTIMISM_GOERLI_TOKEN'
-    'ALCHEMY_OPTIMISM_MAINNET_TOKEN'
-    'INFURA_TOKEN'
-    'INFURA_TOKEN_SECRET'
-    'OPENSEA_API_KEY'
-    'POKT_TOKEN'
-)
-
 # Secrets like this can't be passed via args or they end up in derivation.
-for SECRET_VAR_NAME in "${SECRETS_ENV_VARS[@]}"; do
-    [[ -n "${!SECRET_VAR_NAME}" ]] && append_env_export "${SECRET_VAR_NAME}"
-done
+if [[ -n "${POKT_TOKEN}" ]];    then append_env_export 'POKT_TOKEN';    fi
+if [[ -n "${OPENSEA_API_KEY}" ]]; then append_env_export 'OPENSEA_API_KEY'; fi

 # If no secrets were passed there's no need to pass the 'secretsFile'.
 if [[ -s "${SECRETS_FILE_PATH}" ]]; then
@@ -18,11 +18,11 @@ export function stackOpacity (stackId, selectedStackId) {
  );
 }

-export function stackZIndex (stackId, selectedStackId) {
+export function stackPointer (stackId, selectedStackId) {
  return useDerivedValue(
    function () {
      'worklet'
-      return selectedStackId.value == stackId ? 10 : 9;
+      return selectedStackId.value == stackId ? "auto" : "none";
    }
  );
 }
@@ -141,7 +141,6 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
   {:ClipPath #js {:render identity}
    :Circle   #js {:render identity}
    :Defs     #js {:render identity}
-    :G        #js {:render identity}
    :Path     #js {:render identity}
    :Rect     #js {:render identity}
    :SvgUri   #js {:render identity}
@@ -155,7 +154,10 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
 (def net-info #js {})
 (def touchid #js {})
 (def react-native-image-viewing #js {:default {}})
-(def react-native-static-safe-area-insets #js {:default {}})
+(def safe-area-context
+  (clj->js {:SafeAreaProvider      {:_reactNativeIphoneXHelper {:getStatusBarHeight (fn [])}}
+            :SafeAreaInsetsContext {:Consumer (fn [])}
+            :SafeAreaView          {}}))

 (def back-handler
  #js
@@ -364,7 +366,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
    "react-native-background-timer"                 background-timer
    "react-native-image-crop-picker"                image-crop-picker
    "react-native-gesture-handler"                  react-native-gesture-handler
-    "react-native-static-safe-area-insets"          react-native-static-safe-area-insets
+    "react-native-safe-area-context"                safe-area-context
    "react-native-config"                           config
    "react-native-iphone-x-helper"                  (clj->js {:getStatusBarHeight (fn [])
                                                              :getBottomSpace     (fn [])})
@@ -2,10 +2,10 @@
  (:require [oops.core :refer [oget]]
            [quo.animated :as animated]
            [quo.components.header :as header]
+            [quo.components.safe-area :as safe-area]
            [quo.design-system.colors :as colors]
            [quo.platform :as platform]
-            [reagent.core :as reagent]
-            [react-native.safe-area :as safe-area]))
+            [reagent.core :as reagent]))

 (defn header-wrapper-style
  [{:keys [value offset]}]
@@ -95,9 +95,11 @@
 (defn header
  [{:keys [use-insets] :as props} & children]
  (if use-insets
-    [header-container
-     (-> props
-         (dissoc :use-insets)
-         (assoc :insets (safe-area/get-insets)))
-     children]
+    [safe-area/consumer
+     (fn [insets]
+       [header-container
+        (-> props
+            (dissoc :use-insets)
+            (assoc :insets insets))
+        children])]
    [header-container props children]))
@@ -2,13 +2,13 @@
  (:require [cljs-bean.core :as bean]
            [quo.animated :as animated]
            [quo.components.bottom-sheet.style :as styles]
+            [quo.components.safe-area :as safe-area]
            [quo.design-system.colors :as colors]
            [quo.gesture-handler :as gesture-handler]
            [quo.platform :as platform]
            [quo.react :as react]
            [quo.react-native :as rn]
-            [reagent.core :as reagent]
-            [react-native.safe-area :as safe-area]))
+            [reagent.core :as reagent]))

 (def opacity-coeff 0.8)
 (def close-duration 150)
@@ -43,7 +43,7 @@
        (rn/use-keyboard)
        keyboard-height-android-delta
        (if (and platform/android? keyboard-shown) (+ keyboard-height 20) 0)
-        safe-area (safe-area/get-insets)
+        safe-area (safe-area/use-safe-area)
        window-height (- window-height
                         (if platform/android?
                           (+ 50 keyboard-height-android-delta) ;; TODO : remove 50 when
@@ -0,0 +1,23 @@
+(ns quo.components.safe-area
+  (:require ["react-native-safe-area-context" :as safe-area-context :refer
+             (SafeAreaView SafeAreaProvider SafeAreaInsetsContext useSafeAreaInsets)]
+            [reagent.core :as reagent]))
+
+(def provider (reagent/adapt-react-class SafeAreaProvider))
+(def ^:private consumer-raw (reagent/adapt-react-class (.-Consumer ^js SafeAreaInsetsContext)))
+(def view (reagent/adapt-react-class SafeAreaView))
+
+(defn consumer
+  [component]
+  [consumer-raw
+   (fn [insets]
+     (reagent/as-element
+      [component (js->clj insets :keywordize-keys true)]))])
+
+(defn use-safe-area
+  []
+  (let [insets (useSafeAreaInsets)]
+    {:top    (.-top ^js insets)
+     :bottom (.-bottom ^js insets)
+     :left   (.-left ^js insets)
+     :right  (.-right ^js insets)}))
@@ -8,6 +8,7 @@
            [quo.components.list.header :as list-header]
            [quo.components.list.index :as list-index]
            [quo.components.list.item :as list-item]
+            [quo.components.safe-area :as safe-area]
            [quo.components.separator :as separator]
            [quo.components.text :as text]
            [quo.components.text-input :as text-input]
@@ -28,5 +29,8 @@
 (def switch controls/switch)
 (def radio controls/radio)
 (def checkbox controls/checkbox)
+(def safe-area-provider safe-area/provider)
+(def safe-area-consumer safe-area/consumer)
+(def safe-area-view safe-area/view)
 (def separator separator/separator)
 (def get-color colors/get-color)
@@ -30,7 +30,7 @@
    (reanimated/set-shared-value scroll-y current-y)))

 (defn header
-  [{:keys [theme-color f-display-picture-comp cover-uri title-comp]} top-inset scroll-y]
+  [{:keys [theme-color display-picture-comp cover-uri title-comp]} top-inset scroll-y]
  (let [input-range        [0 (* threshold 0.33)]
        picture-scale-down 0.4
        size-animation     (interpolate scroll-y input-range [80 (* 80 picture-scale-down)])
@@ -48,49 +48,50 @@
     [reanimated/view {:style (style/header-bottom-part border-animation)}
      [title-comp]]
     [reanimated/view {:style (style/entity-picture size-animation)}
-      [:f> f-display-picture-comp image-animation]]]))
-
-(defn- f-animated-header-list
-  [{:keys [header-comp main-comp back-button-on-press] :as params}]
-  (let [window-height           (:height (rn/get-window))
-        {:keys [top bottom]}    (safe-area/get-insets)
-        ;; view height calculation is different because window height is different on iOS and Android:
-        view-height             (if platform/ios?
-                                  (- window-height bottom)
-                                  (+ window-height top))
-        initial-y               (if platform/ios? (- top) 0)
-        scroll-y                (reanimated/use-shared-value initial-y)
-        opacity-animation       (interpolate scroll-y
-                                             [(* threshold 0.33) (* threshold 0.66)]
-                                             [0 1])
-        translate-animation     (interpolate scroll-y [(* threshold 0.66) threshold] [100 56])
-        title-opacity-animation (interpolate scroll-y [(* threshold 0.66) threshold] [0 1])]
-    [rn/view {:style (style/container-view view-height)}
-     [rn/touchable-opacity
-      {:active-opacity 1
-       :on-press       back-button-on-press
-       :style          (style/button-container {:left 20})}
-      [quo/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white)}]]
-     [rn/touchable-opacity
-      {:active-opacity 1
-       :style          (style/button-container {:right 20})}
-      [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white)}]]
-     [reanimated/blur-view
-      {:blurAmount   32
-       :blurType     :light
-       :overlayColor (if platform/ios? colors/white-opa-70 :transparent)
-       :style        (style/blur-view opacity-animation)}
-      [reanimated/view {:style (style/header-comp translate-animation title-opacity-animation)}
-       [header-comp]]]
-     [reanimated/flat-list
-      {:data                  [nil]
-       :render-fn             main-comp
-       :key-fn                str
-       :header                (reagent/as-element (header params top scroll-y))
-       ;; TODO: https://github.com/status-im/status-mobile/issues/14924
-       :scroll-event-throttle 8
-       :on-scroll             (fn [event] (scroll-handler event initial-y scroll-y))}]]))
+      [display-picture-comp image-animation]]]))

 (defn animated-header-list
-  [params]
-  [:f> f-animated-header-list params])
+  [{:keys [header-comp main-comp back-button-on-press] :as parameters}]
+  [safe-area/consumer
+   (fn [insets]
+     (let [window-height     (:height (rn/get-window))
+           status-bar-height (rn/status-bar-height)
+           bottom-inset      (:bottom insets)
+           ;; view height calculation is different because window height is different on iOS and Android:
+           view-height       (if platform/ios?
+                               (- window-height bottom-inset)
+                               (+ window-height status-bar-height))
+           initial-y         (if platform/ios? (- (:top insets)) 0)]
+       [:f>
+        (fn []
+          (let [scroll-y                (reanimated/use-shared-value initial-y)
+                opacity-animation       (interpolate scroll-y
+                                                     [(* threshold 0.33) (* threshold 0.66)]
+                                                     [0 1])
+                translate-animation     (interpolate scroll-y [(* threshold 0.66) threshold] [100 56])
+                title-opacity-animation (interpolate scroll-y [(* threshold 0.66) threshold] [0 1])]
+            [rn/view {:style (style/container-view view-height)}
+             [rn/touchable-opacity
+              {:active-opacity 1
+               :on-press       back-button-on-press
+               :style          (style/button-container {:left 20})}
+              [quo/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white)}]]
+             [rn/touchable-opacity
+              {:active-opacity 1
+               :style          (style/button-container {:right 20})}
+              [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white)}]]
+             [reanimated/blur-view
+              {:blurAmount   32
+               :blurType     :light
+               :overlayColor (if platform/ios? colors/white-opa-70 :transparent)
+               :style        (style/blur-view opacity-animation)}
+              [reanimated/view {:style (style/header-comp translate-animation title-opacity-animation)}
+               [header-comp]]]
+             [reanimated/flat-list
+              {:data                  [nil]
+               :render-fn             main-comp
+               :key-fn                str
+               :header                (reagent/as-element (header parameters (:top insets) scroll-y))
+               ;; TODO: https://github.com/status-im/status-mobile/issues/14924
+               :scroll-event-throttle 8
+               :on-scroll             (fn [event] (scroll-handler event initial-y scroll-y))}]]))]))])
@@ -11,7 +11,7 @@
            :inner                   44
            :status-indicator        12
            :status-indicator-border 2
-            :font-size               :heading-2}
+            :font-size               :paragraph-1}
   :small  {:outer                   32
            :inner                   28
            :status-indicator        12
@@ -1,20 +0,0 @@
-(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))))
@@ -1,11 +0,0 @@
-(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})
@@ -1,71 +0,0 @@
-(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)]])
@@ -65,10 +65,10 @@
      18 ;; ~ 9 is char width, 18 is width used in Figma.
      (* 9 max-line-digits font-scale))))

-(defn- f-native-renderer
+(defn- native-renderer
  [{:keys [rows max-lines on-copy-press]
    :or   {max-lines ##Inf}}]
-  (let [font-scale          (:font-scale (rn/get-window))
+  (let [font-scale          (:font-scale (rn/use-window-dimensions))
        total-rows          (count rows)
        number-rows-to-show (min (count rows) max-lines)
        line-number-width   (calc-line-number-width font-scale number-rows-to-show)
@@ -100,7 +100,7 @@
   {:language          language
    :renderer          (fn [^js/Object props]
                         (reagent/as-element
-                          [:f> f-native-renderer
+                          [:f> native-renderer
                           {:rows          (-> props .-rows bean/->clj)
                            :on-copy-press #(when on-copy-press (on-copy-press children))
                            :max-lines     max-lines}]))
@@ -11,7 +11,7 @@
 (defn neutral-border-color
  [in-blur-view? override-theme]
  (if in-blur-view?
-    (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-10 override-theme)
+    (colors/theme-colors colors/white-opa-10 colors/neutral-80-opa-5 override-theme)
    (colors/theme-colors colors/neutral-20 colors/neutral-80 override-theme)))

 (def active-background-color (colors/custom-color :blue 50 10))
@@ -1,30 +0,0 @@
-(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)))))
-
@@ -1,10 +0,0 @@
-(ns quo2.components.drawers.documentation-drawers.style)
-
-(def container
-  {:align-items :flex-start
-   :padding     20})
-
-(def content
-  {:margin-top    12
-   :margin-bottom 16})
-
@@ -1,40 +0,0 @@
-(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])]])
-
@@ -43,7 +43,7 @@
  (colors/alpha color 0.6))

 (defn dropdown-comp
-  [{:keys [icon dd-height size disabled? dd-color use-border? border-color]}]
+  [{:keys [icon open? dd-height size disabled? dd-color use-border? border-color]}]
  (let [dark?                                                         (colors/dark?)
        {:keys [width height width-with-icon padding font icon-size]} (size sizes)
        {:keys [padding-with-icon padding-with-no-icon]}              padding
@@ -51,75 +51,74 @@
        spacing                                                       (case size
                                                                        :big    4
                                                                        :medium 2
-                                                                        :small  2)
-        open?                                                         (reagent/atom false)]
-    (fn []
-      [rn/touchable-opacity
-       (cond->
-         {:on-press (fn []
-                      (if (swap! open? not)
-                        (apply-anim dd-height 120)
-                        (apply-anim dd-height 0)))
-          :style    (cond->
-                      (merge
-                       (if icon
-                         padding-with-icon
-                         padding-with-no-icon)
-                       {:width            (if icon
-                                            width-with-icon
-                                            width)
-                        :height           height
-                        :border-radius    (case size
-                                            :big    12
-                                            :medium 10
-                                            :small  8)
-                        :flex-direction   :row
-                        :align-items      :center
-                        :background-color (if @open?
-                                            dd-color
-                                            (color-by-10 dd-color))})
-                      use-border? (assoc :border-width 1
-                                         :border-color (if @open?
-                                                         border-color
-                                                         (color-by-10 border-color))))}
-         disabled? (assoc-in [:style :opacity] 0.3)
-         disabled? (assoc :disabled true))
-       (when icon
-         [icons/icon icon
-          {:no-color        true
-           :size            20
-           :container-style {:margin-right spacing
-                             :margin-top   1
-                             :width        icon-size
-                             :height       icon-size}}])
-       [text/text
-        {:size   font-size
-         :weight :medium
-         :font   :font-medium
-         :color  :main} "Dropdown"]
-       [icons/icon
-        (if @open?
-          (if dark?
-            :main-icons/pullup-dark
-            :main-icons/pullup)
-          (if dark?
-            :main-icons/dropdown-dark
-            :main-icons/dropdown))
-        {:size            20
-         :no-color        true
-         :container-style {:width         (+ icon-size 3)
-                           :border-radius 20
-                           :margin-left   (if (= :small size)
-                                            2
-                                            4)
-                           :margin-top    1
-                           :height        (+ icon-size 4)}}]])))
+                                                                        :small  2)]
+    [rn/touchable-opacity
+     (cond->
+       {:on-press (fn []
+                    (if (swap! open? not)
+                      (apply-anim dd-height 120)
+                      (apply-anim dd-height 0)))
+        :style    (cond->
+                    (merge
+                     (if icon
+                       padding-with-icon
+                       padding-with-no-icon)
+                     {:width            (if icon
+                                          width-with-icon
+                                          width)
+                      :height           height
+                      :border-radius    (case size
+                                          :big    12
+                                          :medium 10
+                                          :small  8)
+                      :flex-direction   :row
+                      :align-items      :center
+                      :background-color (if @open?
+                                          dd-color
+                                          (color-by-10 dd-color))})
+                    use-border? (assoc :border-width 1
+                                       :border-color (if @open?
+                                                       border-color
+                                                       (color-by-10 border-color))))}
+       disabled? (assoc-in [:style :opacity] 0.3)
+       disabled? (assoc :disabled true))
+     (when icon
+       [icons/icon icon
+        {:no-color        true
+         :size            20
+         :container-style {:margin-right spacing
+                           :margin-top   1
+                           :width        icon-size
+                           :height       icon-size}}])
+     [text/text
+      {:size   font-size
+       :weight :medium
+       :font   :font-medium
+       :color  :main} "Dropdown"]
+     [icons/icon
+      (if @open?
+        (if dark?
+          :main-icons/pullup-dark
+          :main-icons/pullup)
+        (if dark?
+          :main-icons/dropdown-dark
+          :main-icons/dropdown))
+      {:size            20
+       :no-color        true
+       :container-style {:width         (+ icon-size 3)
+                         :border-radius 20
+                         :margin-left   (if (= :small size)
+                                          2
+                                          4)
+                         :margin-top    1
+                         :height        (+ icon-size 4)}}]]))

 (defn items-comp
  [{:keys [items on-select]}]
  (let [items-count (count items)]
    [rn/scroll-view
-     {:horizontal          false
+     {:style               {:height "100%"}
+      :horizontal          false
      :nestedScrollEnabled true}
     (doall
      (map-indexed (fn [index item]
@@ -137,29 +136,29 @@
                      [text/text {:style {:text-align :center}} item]])
                   items))]))

-(defn- f-dropdown
-  [{:keys [items icon text default-item on-select size disabled? border-color use-border? dd-color]}]
-  (let [dd-height (reanimated/use-shared-value 0)]
-    [rn/view {:style {:flex-grow 1}}
-     [dropdown-comp
-      {:items        items
-       :icon         icon
-       :disabled?    disabled?
-       :size         size
-       :dd-color     dd-color
-       :text         text
-       :border-color (colors/custom-color-by-theme border-color 50 60)
-       :use-border?  use-border?
-       :default-item default-item
-       :dd-height    dd-height}]
-     [reanimated/view
-      {:style (reanimated/apply-animations-to-style
-               {:height dd-height}
-               {})}
-      [items-comp
-       {:items     items
-        :on-select on-select}]]]))
-
 (defn dropdown
-  [params]
-  [:f> f-dropdown params])
+  [{:keys [items icon text default-item on-select size disabled? border-color use-border? dd-color]}]
+  [:f>
+   (fn []
+     (let [open?     (reagent/atom false)
+           dd-height (reanimated/use-shared-value 0)]
+       [rn/view {:style {:flex-grow 1}}
+        [dropdown-comp
+         {:items        items
+          :icon         icon
+          :disabled?    disabled?
+          :size         size
+          :dd-color     dd-color
+          :text         text
+          :border-color (colors/custom-color-by-theme border-color 50 60)
+          :use-border?  use-border?
+          :default-item default-item
+          :open?        open?
+          :dd-height    dd-height}]
+        [reanimated/view
+         {:style (reanimated/apply-animations-to-style
+                  {:height dd-height}
+                  {:height dd-height})}
+         [items-comp
+          {:items     items
+           :on-select on-select}]]]))])
@@ -1,43 +1,29 @@
 (ns quo2.components.icon
  (:require [clojure.string :as string]
            [quo2.components.icons.icons :as icons]
-            [quo2.components.icons.svg :as icons.svg]
            [quo2.foundations.colors :as colors]
            [react-native.core :as rn]))

-(defn- valid-color?
-  [color]
-  (or (keyword? color)
-      (and (string? color)
-           (not (string/blank? color)))))
-
 (defn memo-icon-fn
  ([icon-name] (memo-icon-fn icon-name nil))
  ([icon-name
-    {:keys [color color-2 no-color
-            container-style size accessibility-label]
+    {:keys [color container-style size
+            accessibility-label no-color]
     :or   {accessibility-label :icon}}]
   (let [size (or size 20)]
     ^{:key icon-name}
-     (if-let [svg-icon (icons.svg/get-icon icon-name size)]
-       [svg-icon
-        {:size                size
-         :color               (when (valid-color? color) color)
-         :color-2             (when (valid-color? color-2) color-2)
-         :accessibility-label accessibility-label
-         :style               container-style}]
-       [rn/image
-        {:style
-         (merge {:width  size
-                 :height size}
+     [rn/image
+      {:style
+       (merge {:width  size
+               :height size}

-                (when (not no-color)
-                  {:tint-color (if (and (string? color) (not (string/blank? color)))
-                                 color
-                                 (colors/theme-colors colors/neutral-100 colors/white))})
+              (when (not no-color)
+                {:tint-color (if (and (string? color) (not (string/blank? color)))
+                               color
+                               (colors/theme-colors colors/neutral-100 colors/white))})

-                container-style)
-         :accessibility-label accessibility-label
-         :source (icons/icon-source (str (name icon-name) size))}]))))
+              container-style)
+       :accessibility-label accessibility-label
+       :source (icons/icon-source (str (name icon-name) size))}])))

 (def icon (memoize memo-icon-fn))
@@ -2,9 +2,9 @@
  (:require [clojure.java.io :as io]
            [clojure.string :as string]))

-(def ^:private icon-path "./resources/images/icons2/")
+(def icon-path "./resources/images/icons2/")

-(defn- require-icon
+(defn require-icon
  [size path]
  (fn [el]
    (let [s (str "." path el ".png")
@@ -15,7 +15,7 @@
                (str size))]
      [k `(js/require ~s)])))

-(defn- get-files
+(defn get-files
  [path]
  (->> (io/file path)
       file-seq
@@ -23,7 +23,7 @@
       (map #(first (string/split (.getName %) #"@")))
       distinct))

-(defn- get-icons
+(defn get-icons
  [size]
  (let [path (str icon-path size "x" size "/")]
    (into {} (map (require-icon size path) (get-files path)))))
@@ -2,7 +2,7 @@
  (:require-macros [quo2.components.icons.icons :as icons])
  (:require [taoensso.timbre :as log]))

-(def ^:private icons (icons/resolve-icons))
+(def icons (icons/resolve-icons))

 (defn icon-source
  [icon]
@@ -1,48 +0,0 @@
-(ns quo2.components.icons.svg
-  "Declare icons in this namespace when they have two possible colors, because the
-  ReactNative `:tint-color` prop affects all non-transparent pixels of PNGs. If
-  the icon has only one color, prefer a PNG.
-
-  Keep all SVG components private and expose them by name in the `icons` var."
-  (:require [react-native.svg :as svg]
-            [quo2.foundations.colors :as colors]))
-
-(defn- container
-  [{:keys [size accessibility-label style]
-    :or   {size 20}}
-   & children]
-  (into [svg/svg
-         {:accessibility-label accessibility-label
-          :style               style
-          :width               size
-          :height              size
-          :view-box            (str "0 0 " size " " size)
-          :fill                :none}]
-        children))
-
-(defn- clear-20
-  [{:keys [color color-2] :as props}]
-  (let [color   (or color colors/neutral-100)
-        color-2 (or color-2 colors/white)]
-    [container props
-     [svg/path
-      {:d
-       "M3 10C3 6.13401 6.13401 3 10 3C13.866 3 17 6.13401 17 10C17 13.866 13.866 17 10 17C6.13401 17 3 13.866 3 10Z"
-       :fill color}]
-     [svg/path
-      {:d
-       "M9.15142 9.99998L7.07566 12.0757L7.9242 12.9243L9.99994 10.8485L12.0757 12.9242L12.9242 12.0757L10.8485 9.99998L12.9242 7.92421L12.0757 7.07568L9.99994 9.15145L7.92421 7.07572L7.07568 7.92425L9.15142 9.99998Z"
-       :fill color-2}]]))
-
-(def ^:private icons
-  {:i/clear-20 clear-20})
-
-(defn- append-to-keyword
-  [k & xs]
-  (keyword (apply str
-                  (subs (str k) 1)
-                  xs)))
-
-(defn get-icon
-  [icon-name size]
-  (get icons (append-to-keyword icon-name "-" size)))
@@ -6,10 +6,10 @@
            [react-native.core :as rn]))

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

@@ -27,20 +27,18 @@
   :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)
-        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)]
+  (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)]
    [rn/view
     {:style (merge {:flex-direction :row}
                    style)}
     [quo2.icons/icon icon
      {:color           icon-color
       :no-color        no-icon-color?
-       :size            icon-size
-       :container-style {:margin-top icon-margin-top}}]
+       :size            12
+       :container-style {:margin-top 3}}]
     [text/text
      {:size   size
       :weight weight
@@ -1,59 +0,0 @@
-(ns quo2.components.inputs.recovery-phrase.component-spec
-  (:require [clojure.string :as string]
-            [oops.core :as oops]
-            [quo2.components.inputs.recovery-phrase.view :as recovery-phrase]
-            [test-helpers.component :as h]))
-
-(h/describe "Recovery phrase input"
-  (h/test "Default render"
-    (h/render [recovery-phrase/recovery-phrase-input {}])
-    (h/is-truthy (h/get-by-label-text :recovery-phrase-input)))
-
-  (h/test "Renders specified text"
-    (let [text-expected "My custom text"]
-      (h/render [recovery-phrase/recovery-phrase-input {} text-expected])
-      (h/is-equal (oops/oget (h/get-by-label-text :recovery-phrase-input) "props" "children")
-                  text-expected)))
-
-  (h/test "Text changes and dispatches on-change-text"
-    (let [new-text       "New text"
-          on-change-mock (h/mock-fn)
-          get-new-text   #(-> % (oops/oget "props" "onChangeText" "mock" "calls") (aget 0 0))]
-      (h/render [recovery-phrase/recovery-phrase-input {:on-change-text on-change-mock}
-                 "Old text"])
-      (h/fire-event :change-text (h/get-by-label-text :recovery-phrase-input) new-text)
-      (h/is-equal (get-new-text (h/get-by-label-text :recovery-phrase-input)) new-text)
-      (h/was-called on-change-mock)))
-
-  (h/describe "Error text"
-    (h/test "Marked when words doesn't satisfy a predicate"
-      (h/render [recovery-phrase/recovery-phrase-input
-                 {:mark-errors? true
-                  :error-pred   #(>= (count %) 5)}
-                 "Text with some error words that don't satisfy the predicate"])
-      (let [children-text-nodes            (-> (h/get-by-label-text :recovery-phrase-input)
-                                               (oops/oget "props" "children" "props" "children")
-                                               (js->clj :keywordize-keys true))
-            {:keys [ok-words error-words]} (group-by #(if (string? %) :ok-words :error-words)
-                                                     children-text-nodes)]
-        (h/is-equal (apply str ok-words) "Text with some   that   the ")
-        (h/is-truthy (= (map #(-> % :props :argv second) error-words)
-                        ["error" "words" "don't" "satisfy" "predicate"]))))
-
-    (h/test "Marked when words exceed the limit given"
-      (h/render [recovery-phrase/recovery-phrase-input
-                 {:mark-errors? true
-                  :word-limit   4}
-                 "these are ok words, these words exceed the limit"])
-      (let [children-text-nodes            (-> (h/get-by-label-text :recovery-phrase-input)
-                                               (oops/oget "props" "children" "props" "children")
-                                               (js->clj :keywordize-keys true))
-            {:keys [ok-words error-words]} (group-by #(if (string? %) :ok-words :error-words)
-                                                     children-text-nodes)]
-        (h/is-equal (string/trim (apply str ok-words))
-                    "these are ok words,")
-        (h/is-equal (->> error-words
-                         (map #(-> % :props :argv second))
-                         (interpose " ")
-                         (apply str))
-                    "these words exceed the limit")))))
@@ -1,45 +0,0 @@
-(ns quo2.components.inputs.recovery-phrase.style
-  (:require [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
-
-(def container
-  {:min-height         40
-   :flex               1
-   :padding-vertical   4
-   :padding-horizontal 20})
-
-(defn input
-  []
-  (assoc (text/text-style {})
-         :height              32
-         :flex-grow           1
-         :padding-vertical    5
-         :text-align-vertical :top))
-
-(defn placeholder-color
-  [input-state override-theme blur?]
-  (cond
-    (and (= input-state :focused) blur?)
-    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 override-theme)
-
-    (= input-state :focused) ; Not blur
-    (colors/theme-colors colors/neutral-30 colors/neutral-60 override-theme)
-
-    blur? ; :default & blur
-    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 override-theme)
-
-    :else ; :default & not blur
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
-
-(defn cursor-color
-  [customization-color override-theme]
-  (colors/theme-colors (colors/custom-color customization-color 50)
-                       (colors/custom-color customization-color 60)
-                       override-theme))
-
-(defn error-word
-  []
-  {:height             22
-   :padding-horizontal 20
-   :background-color   colors/danger-50-opa-10
-   :color              (colors/theme-colors colors/danger-50 colors/danger-60)})
@@ -1,55 +0,0 @@
-(ns quo2.components.inputs.recovery-phrase.view
-  (:require [clojure.string :as string]
-            [quo2.components.inputs.recovery-phrase.style :as style]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]))
-
-(def ^:private custom-props
-  [:customization-color :override-theme :blur? :cursor-color :multiline :on-focus :on-blur
-   :placeholder-text-color :mark-errors? :error-pred :word-limit])
-
-(defn- error-word
-  [text]
-  [rn/text {:style (style/error-word)}
-   text])
-
-(defn- mark-error-words
-  [pred text word-limit]
-  (let [word-limit (or word-limit ##Inf)]
-    (into [:<>]
-          (comp (map-indexed (fn [idx word]
-                               (if (or (pred word) (>= idx word-limit))
-                                 [error-word word]
-                                 word)))
-                (interpose " "))
-          (string/split text #" "))))
-
-(defn recovery-phrase-input
-  [_ _]
-  (let [state       (reagent/atom :default)
-        set-focused #(reset! state :focused)
-        set-default #(reset! state :default)]
-    (fn [{:keys [customization-color override-theme blur? on-focus on-blur mark-errors?
-                 error-pred word-limit]
-          :or   {customization-color :blue
-                 error-pred          (constantly false)}
-          :as   props}
-         text]
-      (let [extra-props (apply dissoc props custom-props)]
-        [rn/view {:style style/container}
-         [rn/text-input
-          (merge {:accessibility-label    :recovery-phrase-input
-                  :style                  (style/input)
-                  :placeholder-text-color (style/placeholder-color @state override-theme blur?)
-                  :cursor-color           (style/cursor-color customization-color override-theme)
-                  :multiline              true
-                  :on-focus               (fn []
-                                            (set-focused)
-                                            (when on-focus (on-focus)))
-                  :on-blur                (fn []
-                                            (set-default)
-                                            (when on-blur (on-blur)))}
-                 extra-props)
-          (if mark-errors?
-            (mark-error-words error-pred text word-limit)
-            text)]]))))
@@ -28,7 +28,7 @@
  [blur? override-theme]
  (if blur?
    (colors/theme-colors colors/neutral-80-opa-30 colors/white-opa-10 override-theme)
-    (colors/theme-colors colors/neutral-40 colors/neutral-60 override-theme)))
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))

 (defn cursor
  [customization-color override-theme]
@@ -1,6 +1,5 @@
 (ns quo2.components.inputs.title-input.style
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.platform :as platform]))
+  (:require [quo2.foundations.colors :as colors]))

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

 (defn get-selection-color
  [customization-color blur? override-theme]
-  (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)))
+  (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))))

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

@@ -1,43 +0,0 @@
-(ns quo2.components.links.link-preview.component-spec
-  (:require [quo2.components.links.link-preview.view :as view]
-            [test-helpers.component :as h]))
-
-(def props
-  {:title       "Some title"
-   :description "Some description"
-   :link        "status.im"
-   :thumbnail   "data:image/png,whatever"})
-
-(h/describe "Links - Link Preview"
-  (h/test "default render"
-    (h/render [view/view])
-    (h/is-truthy (h/query-by-label-text :link-preview))
-    (h/is-null (h/query-by-label-text :button-enable-preview)))
-
-  (h/test "renders with most common props"
-    (h/render [view/view props])
-    (h/is-truthy (h/query-by-text (:title props)))
-    (h/is-truthy (h/query-by-text (:description props)))
-    (h/is-truthy (h/query-by-text (:link props)))
-    (h/is-truthy (h/query-by-label-text :thumbnail)))
-
-  (h/test "does not render thumbnail if prop is not present"
-    (h/render [view/view (dissoc props :thumbnail)])
-    (h/is-null (h/query-by-label-text :thumbnail)))
-
-  (h/test "shows button to enable preview when preview is disabled"
-    (h/render [view/view
-               (assoc props
-                      :enabled?      false
-                      :disabled-text "I'm disabled")])
-    (h/is-truthy (h/query-by-label-text :button-enable-preview))
-    (h/is-truthy (h/query-by-text "I'm disabled")))
-
-  (h/test "on-enable event"
-    (let [on-enable (h/mock-fn)]
-      (h/render [view/view
-                 (assoc props
-                        :enabled?  false
-                        :on-enable on-enable)])
-      (h/fire-event :press (h/get-by-label-text :button-enable-preview))
-      (h/was-called on-enable))))
@@ -1,43 +0,0 @@
-(ns quo2.components.links.link-preview.style
-  (:require
-    [quo2.foundations.colors :as colors]))
-
-(defn container
-  [preview-enabled?]
-  (merge {:border-width       1
-          :border-color       (colors/theme-colors colors/neutral-20 colors/neutral-80)
-          :background-color   (colors/theme-colors colors/white colors/neutral-80-opa-40)
-          :border-radius      16
-          :padding-horizontal 12
-          :padding-top        10
-          :padding-bottom     12}
-         (when-not preview-enabled?
-           {:height          139
-            :align-items     :center
-            :justify-content :center})))
-
-(def header-container
-  {:flex-direction :row
-   :align-items    :center})
-
-(def title
-  {:flex          1
-   :margin-bottom 2})
-
-(defn link
-  []
-  {:margin-top 8
-   :color      (colors/theme-colors colors/neutral-50 colors/neutral-40)})
-
-(defn thumbnail
-  [size]
-  {:width         "100%"
-   :height        (if (= size :large) 271 139)
-   :margin-top    12
-   :border-radius 12})
-
-(def logo
-  {:margin-right  6
-   :width         16
-   :height        16
-   :border-radius 8})
@@ -1,77 +0,0 @@
-(ns quo2.components.links.link-preview.view
-  (:require [quo2.components.buttons.button :as button]
-            [quo2.components.links.link-preview.style :as style]
-            [quo2.components.markdown.text :as text]
-            [react-native.core :as rn]))
-
-(defn- button-disabled
-  [disabled-text on-enable]
-  [button/button
-   {:before              :i/reveal
-    :size                32
-    :type                :grey
-    :on-press            on-enable
-    :accessibility-label :button-enable-preview}
-   disabled-text])
-
-(defn- description-comp
-  [description]
-  [text/text
-   {:size                :paragraph-2
-    :number-of-lines     3
-    :accessibility-label :description}
-   description])
-
-(defn- link-comp
-  [link]
-  [text/text
-   {:size                :paragraph-2
-    :weight              :medium
-    :style               (style/link)
-    :accessibility-label :link}
-   link])
-
-(defn- title-comp
-  [title]
-  [text/text
-   {:size                :paragraph-1
-    :number-of-lines     1
-    :weight              :semi-bold
-    :style               style/title
-    :accessibility-label :title}
-   title])
-
-(defn- thumbnail-comp
-  [thumbnail size]
-  [rn/image
-   {:style               (style/thumbnail size)
-    :source              (if (string? thumbnail)
-                           {:uri thumbnail}
-                           thumbnail)
-    :accessibility-label :thumbnail}])
-
-(defn- logo-comp
-  [logo]
-  [rn/image
-   {:accessibility-label :logo
-    :source              logo
-    :style               style/logo}])
-
-(defn view
-  [{:keys [title logo description link thumbnail
-           enabled? on-enable disabled-text
-           container-style thumbnail-size]
-    :or   {enabled? true}}]
-  [rn/view
-   {:style               (merge (style/container enabled?) container-style)
-    :accessibility-label :link-preview}
-   (if enabled?
-     [:<>
-      [rn/view {:style style/header-container}
-       [logo-comp logo]
-       [title-comp title]]
-      [description-comp description]
-      [link-comp link]
-      (when thumbnail
-        [thumbnail-comp thumbnail thumbnail-size])]
-     [button-disabled disabled-text on-enable])])
@@ -48,6 +48,10 @@
  {:text-transform :lowercase
   :color          (colors/theme-colors colors/neutral-50 colors/neutral-40)})

+(def clear-button
+  {:border-color colors/danger-50
+   :border-width 1})
+
 (def clear-button-container
  {:width       20
   :height      20
@@ -39,8 +39,9 @@
    :hit-slop            {:top 3 :right 3 :bottom 3 :left 3}
    :accessibility-label :button-clear-preview}
   [icon/icon :i/clear
-    {:size  20
-     :color (colors/theme-colors colors/neutral-50 colors/neutral-60)}]])
+    {:size            20
+     :container-style style/clear-button
+     :color           (colors/theme-colors colors/neutral-50 colors/neutral-60)}]])

 (defn view
  [{:keys [title body logo on-clear loading? loading-message container-style]}]
@@ -50,7 +50,7 @@
    (- (oops/oget e "nativeEvent.layout.width")
       (* 2 horizontal-spacing))))

-(defn- f-view
+(defn- view-component
  []
  (let [preview-width (reagent/atom 0)
        flat-list-ref (atom nil)]
@@ -83,4 +83,4 @@

 (defn view
  [props]
-  [:f> f-view props])
+  [:f> view-component props])
@@ -20,59 +20,61 @@
    :message 144}])

 ;; Standlone message skeleton
-(defn- f-message-skeleton
+(defn message-skeleton
  []
-  (let [color                   (colors/theme-colors colors/neutral-5 colors/neutral-70)
-        loading-color           (colors/theme-colors colors/neutral-10 colors/neutral-60)
-        content-width           (rand-nth message-content-width)
-        author-width            (content-width :author)
-        message-width           (content-width :message)
-        {window-width :width}   (rn/get-window)
-        translate-x             (reanimated/use-shared-value (- window-width))
-        animated-gradient-style (reanimated/apply-animations-to-style
-                                 {:transform [{:translateX translate-x}]}
-                                 {:width  window-width
-                                  :height "100%"})]
-    (reanimated/animate-shared-value-with-repeat translate-x window-width 1000 :linear (- 1) false)
-    [masked-view/masked-view
-     {:style       {:height message-skeleton-height}
-      :maskElement (reagent/as-element
-                    [rn/view
-                     {:style {:height           message-skeleton-height
-                              :flex-direction   :row
-                              :padding-vertical 11
-                              :background-color :transparent
-                              :padding-left     21}}
-                     [rn/view
-                      {:style {:height           avatar-skeleton-size
-                               :width            avatar-skeleton-size
-                               :border-radius    (/ avatar-skeleton-size 2)
-                               :background-color color
-                               :overflow         :hidden}}]
-                     [rn/view
-                      {:style {:padding-left     8
-                               :background-color :transparent}}
-                      [rn/view
-                       {:style {:height           8
-                                :width            author-width
-                                :border-radius    6
-                                :background-color color
-                                :margin-bottom    8
-                                :overflow         :hidden}}]
-                      [rn/view
-                       {:style {:height           16
-                                :width            message-width
-                                :border-radius    6
-                                :overflow         :hidden
-                                :background-color color}}]]])}
-     [rn/view
-      {:style {:flex             1
-               :background-color color}}
-      [reanimated/linear-gradient
-       {:colors [color color loading-color color color]
-        :start  {:x 0 :y 0}
-        :end    {:x 1 :y 0}
-        :style  animated-gradient-style}]]]))
+  [:f>
+   (fn []
+     (let [color                   (colors/theme-colors colors/neutral-5 colors/neutral-70)
+           loading-color           (colors/theme-colors colors/neutral-10 colors/neutral-60)
+           content-width           (rand-nth message-content-width)
+           author-width            (content-width :author)
+           message-width           (content-width :message)
+           {window-width :width}   (rn/use-window-dimensions)
+           translate-x             (reanimated/use-shared-value (- window-width))
+           animated-gradient-style (reanimated/apply-animations-to-style
+                                    {:transform [{:translateX translate-x}]}
+                                    {:width  window-width
+                                     :height "100%"})]
+       (reanimated/animate-shared-value-with-repeat translate-x window-width 1000 :linear (- 1) false)
+       [masked-view/masked-view
+        {:style       {:height message-skeleton-height}
+         :maskElement (reagent/as-element
+                       [rn/view
+                        {:style {:height           message-skeleton-height
+                                 :flex-direction   :row
+                                 :padding-vertical 11
+                                 :background-color :transparent
+                                 :padding-left     21}}
+                        [rn/view
+                         {:style {:height           avatar-skeleton-size
+                                  :width            avatar-skeleton-size
+                                  :border-radius    (/ avatar-skeleton-size 2)
+                                  :background-color color
+                                  :overflow         :hidden}}]
+                        [rn/view
+                         {:style {:padding-left     8
+                                  :background-color :transparent}}
+                         [rn/view
+                          {:style {:height           8
+                                   :width            author-width
+                                   :border-radius    6
+                                   :background-color color
+                                   :margin-bottom    8
+                                   :overflow         :hidden}}]
+                         [rn/view
+                          {:style {:height           16
+                                   :width            message-width
+                                   :border-radius    6
+                                   :overflow         :hidden
+                                   :background-color color}}]]])}
+        [rn/view
+         {:style {:flex             1
+                  :background-color color}}
+         [reanimated/linear-gradient
+          {:colors [color color loading-color color color]
+           :start  {:x 0 :y 0}
+           :end    {:x 1 :y 0}
+           :style  animated-gradient-style}]]]))])

 (defn skeleton
  [parent-height]
@@ -82,6 +84,5 @@
                                 colors/white
                                 colors/neutral-90)
              :flex             1}}
-     (doall
-      (for [n (range number-of-skeletons)]
-        [:f> f-message-skeleton {:key n}]))]))
+     (for [n (range number-of-skeletons)]
+       [message-skeleton {:key n}])]))
@@ -10,62 +10,64 @@

 (defn author
  [{:keys [primary-name secondary-name short-chat-key time-str contact? verified? untrustworthy?]}]
-  [rn/view {:style style/container}
-   [:<>
-    [text/text
-     {:weight          :semi-bold
-      :size            :paragraph-2
-      :number-of-lines 1
-      :style           {:color (colors/theme-colors colors/neutral-100 colors/white)}}
-     primary-name]
-    (when (not (string/blank? secondary-name))
+  [:f>
+   (fn []
+     [rn/view {:style style/container}
      [:<>
       [text/text
-        {:size            :paragraph-2
-         :number-of-lines 1
-         :style           style/middle-dot-nickname}
-        middle-dot]
-       [text/text
-        {:weight          :medium
+        {:weight          :semi-bold
         :size            :paragraph-2
         :number-of-lines 1
-         :style           {:color (colors/theme-colors colors/neutral-60 colors/neutral-40)}}
-        secondary-name]])]
-   (when contact?
-     [icons/icon :main-icons2/contact
-      {:size            12
-       :no-color        true
-       :container-style style/icon-container}])
-   (cond
-     verified?
-     [icons/icon :main-icons2/verified
-      {:size            12
-       :no-color        true
-       :container-style style/icon-container}]
-     untrustworthy?
-     [icons/icon :main-icons2/untrustworthy
-      {:size            12
-       :no-color        true
-       :container-style style/icon-container}])
-   (when (and (not verified?) short-chat-key)
-     [text/text
-      {:monospace       true
-       :size            :paragraph-2
-       :number-of-lines 1
-       :style           style/chat-key-text}
-      short-chat-key])
-   (when (and (not verified?) time-str)
-     [text/text
-      {:monospace       true
-       :size            :paragraph-2
-       :number-of-lines 1
-       :style           style/middle-dot-chat-key}
-      middle-dot])
-   (when time-str
-     [text/text
-      {:monospace           true
-       :size                :paragraph-2
-       :accessibility-label :message-timestamp
-       :number-of-lines     1
-       :style               (style/time-text verified?)}
-      time-str])])
+         :style           {:color (colors/theme-colors colors/neutral-100 colors/white)}}
+        primary-name]
+       (when (not (string/blank? secondary-name))
+         [:<>
+          [text/text
+           {:size            :paragraph-2
+            :number-of-lines 1
+            :style           style/middle-dot-nickname}
+           middle-dot]
+          [text/text
+           {:weight          :medium
+            :size            :paragraph-2
+            :number-of-lines 1
+            :style           {:color (colors/theme-colors colors/neutral-60 colors/neutral-40)}}
+           secondary-name]])]
+      (when contact?
+        [icons/icon :main-icons2/contact
+         {:size            12
+          :no-color        true
+          :container-style style/icon-container}])
+      (cond
+        verified?
+        [icons/icon :main-icons2/verified
+         {:size            12
+          :no-color        true
+          :container-style style/icon-container}]
+        untrustworthy?
+        [icons/icon :main-icons2/untrustworthy
+         {:size            12
+          :no-color        true
+          :container-style style/icon-container}])
+      (when (and (not verified?) short-chat-key)
+        [text/text
+         {:monospace       true
+          :size            :paragraph-2
+          :number-of-lines 1
+          :style           style/chat-key-text}
+         short-chat-key])
+      (when (and (not verified?) time-str)
+        [text/text
+         {:monospace       true
+          :size            :paragraph-2
+          :number-of-lines 1
+          :style           style/middle-dot-chat-key}
+         middle-dot])
+      (when time-str
+        [text/text
+         {:monospace           true
+          :size                :paragraph-2
+          :accessibility-label :message-timestamp
+          :number-of-lines     1
+          :style               (style/time-text verified?)}
+         time-str])])])
@@ -172,33 +172,31 @@
          :style {:color (get-color :time)}}
         (utils/truncate-str (:info content) 24)])]]]])

-(defn- f-system-message
-  [{:keys [type style non-pressable? animate-landing? labels on-long-press] :as message}]
-  (let [sv-color (reanimated/use-shared-value
-                  (get-color :bg (if animate-landing? :landed :default) type))]
-    (when animate-landing?
-      (reanimated/animate-shared-value-with-delay
-       sv-color
-       (get-color :bg :default type)
-       0
-       :linear
-       1000))
-    [reanimated/touchable-opacity
-     {:on-press      #(when-not non-pressable?
-                        (reanimated/set-shared-value sv-color (get-color :bg :pressed type)))
-      :on-long-press on-long-press
-      :style         (reanimated/apply-animations-to-style
-                      {:background-color sv-color}
-                      (merge
-                       {:flex-direction     :row
-                        :flex               1
-                        :border-radius      16
-                        :padding-vertical   9
-                        :padding-horizontal 11
-                        :background-color   sv-color}
-                       style))}
-     [sm-render message labels]]))
-
 (defn system-message
-  [message]
-  [:f> f-system-message message])
+  [{:keys [type style non-pressable? animate-landing? labels on-long-press] :as message}]
+  [:f>
+   (fn []
+     (let [sv-color (reanimated/use-shared-value
+                     (get-color :bg (if animate-landing? :landed :default) type))]
+       (when animate-landing?
+         (reanimated/animate-shared-value-with-delay
+          sv-color
+          (get-color :bg :default type)
+          0
+          :linear
+          1000))
+       [reanimated/touchable-opacity
+        {:on-press      #(when-not non-pressable?
+                           (reanimated/set-shared-value sv-color (get-color :bg :pressed type)))
+         :on-long-press on-long-press
+         :style         (reanimated/apply-animations-to-style
+                         {:background-color sv-color}
+                         (merge
+                          {:flex-direction     :row
+                           :flex               1
+                           :border-radius      16
+                           :padding-vertical   9
+                           :padding-horizontal 11
+                           :background-color   sv-color}
+                          style))}
+        [sm-render message labels]]))])
@@ -16,7 +16,7 @@
     pass-through? colors/white-opa-5
     :else         colors/neutral-70)))

-(defn- f-bottom-nav-tab
+(defn bottom-nav-tab
  "[bottom-nav-tab opts]
   opts
   {:icon                   :i/communities
@@ -29,68 +29,66 @@
  "
  [{:keys [icon new-notifications? notification-indicator counter-label
           on-press pass-through? icon-color-anim accessibility-label test-ID]}]
-  (let [icon-animated-style       (reanimated/apply-animations-to-style
-                                   {:tint-color icon-color-anim}
-                                   {:width       24
-                                    :height      24
-                                    :margin-left 33
-                                    :margin-top  8})
-        background-color          (reanimated/use-shared-value "transparent")
-        background-animated-style (reanimated/apply-animations-to-style
-                                   {:background-color background-color}
-                                   {:width         90
-                                    :height        40
-                                    :border-radius 10})]
-    [rn/touchable-without-feedback
-     {:test-ID             test-ID
-      :on-press            on-press
-      :on-press-in         #(toggle-background-color background-color false pass-through?)
-      :on-press-out        #(toggle-background-color background-color true pass-through?)
-      :accessibility-label accessibility-label}
-     [reanimated/view {:style background-animated-style}
-      ;; In android animations are not working for the animated components which are nested by
-      ;; hole-view,
-      ;; Interestingly this only happens when hole view and blur view are used together
-      ;; Similar behavior is also seen while removing holes, and to fix that we used key and
-      ;; force-rendered view
-      ;; But we need animations faster for tab clicks, so we can't rely on reagent atoms,
-      ;; so for now only using hole view for the ios tab icon notification boundary
-      (if platform/ios?
-        [hole-view/hole-view
-         {:key   new-notifications? ;; Key is required to force removal of holes
-          :holes (cond
-                   (not new-notifications?) ;; No new notifications, remove holes
-                   []
+  [:f>
+   (fn []
+     (let [icon-animated-style       (reanimated/apply-animations-to-style
+                                      {:tint-color icon-color-anim}
+                                      {:width       24
+                                       :height      24
+                                       :margin-left 33
+                                       :margin-top  8})
+           background-color          (reanimated/use-shared-value "transparent")
+           background-animated-style (reanimated/apply-animations-to-style
+                                      {:background-color background-color}
+                                      {:width         90
+                                       :height        40
+                                       :border-radius 10})]
+       [rn/touchable-without-feedback
+        {:test-ID             test-ID
+         :on-press            on-press
+         :on-press-in         #(toggle-background-color background-color false pass-through?)
+         :on-press-out        #(toggle-background-color background-color true pass-through?)
+         :accessibility-label accessibility-label}
+        [reanimated/view {:style background-animated-style}
+         ;; In android animations are not working for the animated components which are nested by
+         ;; hole-view,
+         ;; Interestingly this only happens when hole view and blur view are used together
+         ;; Similar behavior is also seen while removing holes, and to fix that we used key and
+         ;; force-rendered view
+         ;; But we need animations faster for tab clicks, so we can't rely on reagent atoms,
+         ;; so for now only using hole view for the ios tab icon notification boundary
+         (if platform/ios?
+           [hole-view/hole-view
+            {:key   new-notifications? ;; Key is required to force removal of holes
+             :holes (cond
+                      (not new-notifications?) ;; No new notifications, remove holes
+                      []

-                   (= notification-indicator :unread-dot)
-                   [{:x 50 :y 5 :width 10 :height 10 :borderRadius 5}]
+                      (= notification-indicator :unread-dot)
+                      [{:x 50 :y 5 :width 10 :height 10 :borderRadius 5}]

-                   :else
-                   [{:x 47 :y 1 :width 18 :height 18 :borderRadius 7}])}
-         [reanimated/image
-          {:style  icon-animated-style
-           :source (icons/icon-source (keyword (str icon 24)))}]]
-        [reanimated/image
-         {:style  icon-animated-style
-          :source (icons/icon-source (keyword (str icon 24)))}])
-      (when new-notifications?
-        (if (= notification-indicator :counter)
-          [counter/counter
-           {:override-text-color colors/white
-            :override-bg-color   colors/primary-50
-            :style               {:position :absolute
-                                  :left     48
-                                  :top      2}}
-           counter-label]
-          [rn/view
-           {:style {:width            8
-                    :height           8
-                    :border-radius    4
-                    :top              6
-                    :left             51
-                    :position         :absolute
-                    :background-color colors/primary-50}}]))]]))
-
-(defn bottom-nav-tab
-  [opts]
-  [:f> f-bottom-nav-tab opts])
+                      :else
+                      [{:x 47 :y 1 :width 18 :height 18 :borderRadius 7}])}
+            [reanimated/image
+             {:style  icon-animated-style
+              :source (icons/icon-source (keyword (str icon 24)))}]]
+           [reanimated/image
+            {:style  icon-animated-style
+             :source (icons/icon-source (keyword (str icon 24)))}])
+         (when new-notifications?
+           (if (= notification-indicator :counter)
+             [counter/counter
+              {:override-text-color colors/white
+               :override-bg-color   colors/primary-50
+               :style               {:position :absolute
+                                     :left     48
+                                     :top      2}}
+              counter-label]
+             [rn/view
+              {:style {:width            8
+                       :height           8
+                       :border-radius    4
+                       :top              6
+                       :left             51
+                       :position         :absolute
+                       :background-color colors/primary-50}}]))]]))])
@@ -14,42 +14,40 @@
      :style               style
      :customization-color customization-color}]))

-(defn- f-floating-shell-button
-  [dynamic-buttons style opacity-anim]
-  (let [original-style (merge {:flex-direction    :row
-                               :margin-horizontal 12
-                               :pointer-events    :box-none}
-                              style)
-        animated-style (reanimated/apply-animations-to-style
-                        (if opacity-anim
-                          {:opacity opacity-anim}
-                          {})
-                        original-style)]
-    [reanimated/view {:style animated-style}
-     ;; Left Section
-     [rn/view {:style {:flex 1}}
-      [dynamic-button-view :search dynamic-buttons
-       {:position :absolute
-        :right    8}]]
-     ;; Mid Section (jump-to)
-     [dynamic-button-view :jump-to dynamic-buttons nil]
-     ;; Right Section
-     [rn/view {:style {:flex 1}}
-      [rn/view
-       {:style {:position       :absolute
-                :flex-direction :row
-                :right          0}}
-       [dynamic-button-view :mention dynamic-buttons {:margin-left 8}]
-       [dynamic-button-view :notification-down dynamic-buttons {:margin-left 8}]
-       [dynamic-button-view :notification-up dynamic-buttons {:margin-left 8}]
-       [dynamic-button-view :scroll-to-bottom dynamic-buttons {:margin-left 8}]]]]))
-
 (defn floating-shell-button
  "[floating-shell-button dynamic-buttons style opacity-anim pointer-anim]
  dynamic-buttons {:button-type {:on-press on-press :count count}}
  style           override style
  opacity-anim    reanimated value (optional)"
-  ([dynamic-buttons style]
-   [:f> f-floating-shell-button dynamic-buttons style nil])
+  ([dynamic-button style]
+   (floating-shell-button dynamic-button style nil))
  ([dynamic-buttons style opacity-anim]
-   [:f> f-floating-shell-button dynamic-buttons style opacity-anim]))
+   [:f>
+    (fn []
+      (let [original-style (merge {:flex-direction    :row
+                                   :margin-horizontal 12
+                                   :pointer-events    :box-none}
+                                  style)
+            animated-style (reanimated/apply-animations-to-style
+                            (if opacity-anim
+                              {:opacity opacity-anim}
+                              {})
+                            original-style)]
+        [reanimated/view {:style animated-style}
+         ;; Left Section
+         [rn/view {:style {:flex 1}}
+          [dynamic-button-view :search dynamic-buttons
+           {:position :absolute
+            :right    8}]]
+         ;; Mid Section (jump-to)
+         [dynamic-button-view :jump-to dynamic-buttons nil]
+         ;; Right Section
+         [rn/view {:style {:flex 1}}
+          [rn/view
+           {:style {:position       :absolute
+                    :flex-direction :row
+                    :right          0}}
+           [dynamic-button-view :mention dynamic-buttons {:margin-left 8}]
+           [dynamic-button-view :notification-down dynamic-buttons {:margin-left 8}]
+           [dynamic-button-view :notification-up dynamic-buttons {:margin-left 8}]
+           [dynamic-button-view :scroll-to-bottom dynamic-buttons {:margin-left 8}]]]]))]))
@@ -10,7 +10,7 @@
            [quo2.components.profile.profile-card.style :as style]
            [quo2.components.avatars.user-avatar.view :as user-avatar]))

-(defn- f-profile-card-component
+(defn- profile-card-component
  [{:keys [keycard-account? profile-picture name hash
           customization-color emoji-hash on-options-press
           show-emoji-hash? show-options-button? show-user-hash?
@@ -25,7 +25,7 @@
           last-item?           false
           card-style           {:padding-horizontal 20
                                 :flex               1}}}]
-  (let [{:keys [width]}      (rn/get-window)
+  (let [{:keys [width]}      (rn/use-window-dimensions)
        padding-bottom       (cond
                               login-card?      38
                               show-emoji-hash? 12
@@ -104,4 +104,4 @@

 (defn profile-card
  [props]
-  [:f> f-profile-card-component props])
+  [:f> profile-card-component props])
@@ -6,83 +6,85 @@
            [react-native.core :refer [use-effect]]
            [quo2.components.record-audio.record-audio.helpers :as helpers]))

-(defn f-delete-button
+(defn delete-button
  [recording? ready-to-delete? reviewing-audio? force-show-controls?]
-  (let [opacity                   (reanimated/use-shared-value (if force-show-controls? 1 0))
-        translate-x               (reanimated/use-shared-value (if force-show-controls? 35 20))
-        scale                     (reanimated/use-shared-value (if force-show-controls? 0.75 1))
-        connector-opacity         (reanimated/use-shared-value 0)
-        connector-width           (reanimated/use-shared-value 24)
-        connector-height          (reanimated/use-shared-value 12)
-        border-radius-first-half  (reanimated/use-shared-value 8)
-        border-radius-second-half (reanimated/use-shared-value 8)
-        start-x-animation         (fn []
-                                    (helpers/animate-linear-with-delay translate-x 12 50 133.33)
-                                    (helpers/animate-easing-with-delay connector-opacity 1 0 93.33)
-                                    (helpers/animate-easing-with-delay connector-width 56 83.33 80)
-                                    (helpers/animate-easing-with-delay connector-height 56 83.33 80)
-                                    (helpers/animate-easing-with-delay border-radius-first-half
-                                                                       28
-                                                                       83.33
-                                                                       80)
-                                    (helpers/animate-easing-with-delay border-radius-second-half
-                                                                       28
-                                                                       83.33
-                                                                       80))
-        reset-x-animation         (fn []
-                                    (helpers/animate-linear translate-x 0 100)
-                                    (helpers/set-value connector-opacity 0)
-                                    (helpers/set-value connector-width 24)
-                                    (helpers/set-value connector-height 12)
-                                    (helpers/set-value border-radius-first-half 8)
-                                    (helpers/set-value border-radius-second-half 16))
-        fade-in-animation         (fn []
-                                    (helpers/animate-linear translate-x 0 200)
-                                    (helpers/animate-linear opacity 1 200))
-        fade-out-animation        (fn []
-                                    (helpers/animate-linear
-                                     translate-x
-                                     (if @reviewing-audio? 35 20)
-                                     200)
-                                    (if @reviewing-audio?
-                                      (helpers/animate-linear scale 0.75 200)
-                                      (helpers/animate-linear opacity 0 200))
-                                    (helpers/set-value connector-opacity 0)
-                                    (helpers/set-value connector-width 24)
-                                    (helpers/set-value connector-height 12)
-                                    (helpers/set-value border-radius-first-half 8)
-                                    (helpers/set-value border-radius-second-half 16))
-        fade-out-reset-animation  (fn []
-                                    (helpers/animate-linear opacity 0 200)
-                                    (helpers/animate-linear-with-delay translate-x 20 0 200)
-                                    (helpers/animate-linear-with-delay scale 1 0 200))]
-    (use-effect (fn []
-                  (if @recording?
-                    (fade-in-animation)
-                    (fade-out-animation)))
-                [@recording?])
-    (use-effect (fn []
-                  (when-not @reviewing-audio?
-                    (fade-out-reset-animation)))
-                [@reviewing-audio?])
-    (use-effect (fn []
-                  (cond
-                    @ready-to-delete?
-                    (start-x-animation)
-                    @recording?
-                    (reset-x-animation)))
-                [@ready-to-delete?])
-    [:<>
-     [reanimated/view {:style (style/delete-button-container opacity)}
-      [reanimated/view
-       {:style (style/delete-button-connector connector-opacity
-                                              connector-width
-                                              connector-height
-                                              border-radius-first-half
-                                              border-radius-second-half)}]]
-     [reanimated/view
-      {:style          (style/delete-button scale translate-x opacity)
-       :pointer-events :none}
-      [icons/icon :i/delete
-       {:color colors/white
-        :size  20}]]]))
+  [:f>
+   (fn []
+     (let [opacity                   (reanimated/use-shared-value (if force-show-controls? 1 0))
+           translate-x               (reanimated/use-shared-value (if force-show-controls? 35 20))
+           scale                     (reanimated/use-shared-value (if force-show-controls? 0.75 1))
+           connector-opacity         (reanimated/use-shared-value 0)
+           connector-width           (reanimated/use-shared-value 24)
+           connector-height          (reanimated/use-shared-value 12)
+           border-radius-first-half  (reanimated/use-shared-value 8)
+           border-radius-second-half (reanimated/use-shared-value 8)
+           start-x-animation         (fn []
+                                       (helpers/animate-linear-with-delay translate-x 12 50 133.33)
+                                       (helpers/animate-easing-with-delay connector-opacity 1 0 93.33)
+                                       (helpers/animate-easing-with-delay connector-width 56 83.33 80)
+                                       (helpers/animate-easing-with-delay connector-height 56 83.33 80)
+                                       (helpers/animate-easing-with-delay border-radius-first-half
+                                                                          28
+                                                                          83.33
+                                                                          80)
+                                       (helpers/animate-easing-with-delay border-radius-second-half
+                                                                          28
+                                                                          83.33
+                                                                          80))
+           reset-x-animation         (fn []
+                                       (helpers/animate-linear translate-x 0 100)
+                                       (helpers/set-value connector-opacity 0)
+                                       (helpers/set-value connector-width 24)
+                                       (helpers/set-value connector-height 12)
+                                       (helpers/set-value border-radius-first-half 8)
+                                       (helpers/set-value border-radius-second-half 16))
+           fade-in-animation         (fn []
+                                       (helpers/animate-linear translate-x 0 200)
+                                       (helpers/animate-linear opacity 1 200))
+           fade-out-animation        (fn []
+                                       (helpers/animate-linear
+                                        translate-x
+                                        (if @reviewing-audio? 35 20)
+                                        200)
+                                       (if @reviewing-audio?
+                                         (helpers/animate-linear scale 0.75 200)
+                                         (helpers/animate-linear opacity 0 200))
+                                       (helpers/set-value connector-opacity 0)
+                                       (helpers/set-value connector-width 24)
+                                       (helpers/set-value connector-height 12)
+                                       (helpers/set-value border-radius-first-half 8)
+                                       (helpers/set-value border-radius-second-half 16))
+           fade-out-reset-animation  (fn []
+                                       (helpers/animate-linear opacity 0 200)
+                                       (helpers/animate-linear-with-delay translate-x 20 0 200)
+                                       (helpers/animate-linear-with-delay scale 1 0 200))]
+       (use-effect (fn []
+                     (if @recording?
+                       (fade-in-animation)
+                       (fade-out-animation)))
+                   [@recording?])
+       (use-effect (fn []
+                     (when-not @reviewing-audio?
+                       (fade-out-reset-animation)))
+                   [@reviewing-audio?])
+       (use-effect (fn []
+                     (cond
+                       @ready-to-delete?
+                       (start-x-animation)
+                       @recording?
+                       (reset-x-animation)))
+                   [@ready-to-delete?])
+       [:<>
+        [reanimated/view {:style (style/delete-button-container opacity)}
+         [reanimated/view
+          {:style (style/delete-button-connector connector-opacity
+                                                 connector-width
+                                                 connector-height
+                                                 border-radius-first-half
+                                                 border-radius-second-half)}]]
+        [reanimated/view
+         {:style          (style/delete-button scale translate-x opacity)
+          :pointer-events :none}
+         [icons/icon :i/delete
+          {:color colors/white
+           :size  20}]]]))])
@@ -6,74 +6,76 @@
            [react-native.core :refer [use-effect]]
            [quo2.components.record-audio.record-audio.helpers :as helpers]))

-(defn f-lock-button
+(defn lock-button
  [recording? ready-to-lock? locked?]
-  (let [translate-x-y             (reanimated/use-shared-value 20)
-        opacity                   (reanimated/use-shared-value 0)
-        connector-opacity         (reanimated/use-shared-value 0)
-        width                     (reanimated/use-shared-value 24)
-        height                    (reanimated/use-shared-value 12)
-        border-radius-first-half  (reanimated/use-shared-value 8)
-        border-radius-second-half (reanimated/use-shared-value 8)
-        start-x-y-animation       (fn []
-                                    (helpers/animate-linear-with-delay translate-x-y 8 50 116.66)
-                                    (helpers/animate-easing-with-delay connector-opacity 1 0 80)
-                                    (helpers/animate-easing-with-delay width 56 83.33 63.33)
-                                    (helpers/animate-easing-with-delay height 56 83.33 63.33)
-                                    (helpers/animate-easing-with-delay border-radius-first-half
-                                                                       28
-                                                                       83.33
-                                                                       63.33)
-                                    (helpers/animate-easing-with-delay border-radius-second-half
-                                                                       28
-                                                                       83.33
-                                                                       63.33))
-        reset-x-y-animation       (fn []
-                                    (helpers/animate-linear translate-x-y 0 100)
-                                    (helpers/set-value connector-opacity 0)
-                                    (helpers/set-value width 24)
-                                    (helpers/set-value height 12)
-                                    (helpers/set-value border-radius-first-half 8)
-                                    (helpers/set-value border-radius-second-half 16))
-        fade-in-animation         (fn []
-                                    (helpers/animate-linear translate-x-y 0 220)
-                                    (helpers/animate-linear opacity 1 220))
-        fade-out-animation        (fn []
-                                    (helpers/animate-linear translate-x-y 20 200)
-                                    (helpers/animate-linear opacity 0 200)
-                                    (helpers/set-value connector-opacity 0)
-                                    (helpers/set-value width 24)
-                                    (helpers/set-value height 12)
-                                    (helpers/set-value border-radius-first-half 8)
-                                    (helpers/set-value border-radius-second-half 16))]
-    (use-effect (fn []
-                  (if @recording?
-                    (fade-in-animation)
-                    (fade-out-animation)))
-                [@recording?])
-    (use-effect (fn []
-                  (cond
-                    @ready-to-lock?
-                    (start-x-y-animation)
-                    (and @recording? (not @locked?))
-                    (reset-x-y-animation)))
-                [@ready-to-lock?])
-    (use-effect (fn []
-                  (if @locked?
-                    (fade-out-animation)
-                    (reset-x-y-animation)))
-                [@locked?])
-    [:<>
-     [reanimated/view {:style (style/lock-button-container opacity)}
-      [reanimated/view
-       {:style (style/lock-button-connector connector-opacity
-                                            width
-                                            height
-                                            border-radius-first-half
-                                            border-radius-second-half)}]]
-     [reanimated/view
-      {:style          (style/lock-button translate-x-y opacity)
-       :pointer-events :none}
-      [icons/icon (if @ready-to-lock? :i/locked :i/unlocked)
-       {:color (colors/theme-colors colors/black colors/white)
-        :size  20}]]]))
+  [:f>
+   (fn []
+     (let [translate-x-y             (reanimated/use-shared-value 20)
+           opacity                   (reanimated/use-shared-value 0)
+           connector-opacity         (reanimated/use-shared-value 0)
+           width                     (reanimated/use-shared-value 24)
+           height                    (reanimated/use-shared-value 12)
+           border-radius-first-half  (reanimated/use-shared-value 8)
+           border-radius-second-half (reanimated/use-shared-value 8)
+           start-x-y-animation       (fn []
+                                       (helpers/animate-linear-with-delay translate-x-y 8 50 116.66)
+                                       (helpers/animate-easing-with-delay connector-opacity 1 0 80)
+                                       (helpers/animate-easing-with-delay width 56 83.33 63.33)
+                                       (helpers/animate-easing-with-delay height 56 83.33 63.33)
+                                       (helpers/animate-easing-with-delay border-radius-first-half
+                                                                          28
+                                                                          83.33
+                                                                          63.33)
+                                       (helpers/animate-easing-with-delay border-radius-second-half
+                                                                          28
+                                                                          83.33
+                                                                          63.33))
+           reset-x-y-animation       (fn []
+                                       (helpers/animate-linear translate-x-y 0 100)
+                                       (helpers/set-value connector-opacity 0)
+                                       (helpers/set-value width 24)
+                                       (helpers/set-value height 12)
+                                       (helpers/set-value border-radius-first-half 8)
+                                       (helpers/set-value border-radius-second-half 16))
+           fade-in-animation         (fn []
+                                       (helpers/animate-linear translate-x-y 0 220)
+                                       (helpers/animate-linear opacity 1 220))
+           fade-out-animation        (fn []
+                                       (helpers/animate-linear translate-x-y 20 200)
+                                       (helpers/animate-linear opacity 0 200)
+                                       (helpers/set-value connector-opacity 0)
+                                       (helpers/set-value width 24)
+                                       (helpers/set-value height 12)
+                                       (helpers/set-value border-radius-first-half 8)
+                                       (helpers/set-value border-radius-second-half 16))]
+       (use-effect (fn []
+                     (if @recording?
+                       (fade-in-animation)
+                       (fade-out-animation)))
+                   [@recording?])
+       (use-effect (fn []
+                     (cond
+                       @ready-to-lock?
+                       (start-x-y-animation)
+                       (and @recording? (not @locked?))
+                       (reset-x-y-animation)))
+                   [@ready-to-lock?])
+       (use-effect (fn []
+                     (if @locked?
+                       (fade-out-animation)
+                       (reset-x-y-animation)))
+                   [@locked?])
+       [:<>
+        [reanimated/view {:style (style/lock-button-container opacity)}
+         [reanimated/view
+          {:style (style/lock-button-connector connector-opacity
+                                               width
+                                               height
+                                               border-radius-first-half
+                                               border-radius-second-half)}]]
+        [reanimated/view
+         {:style          (style/lock-button translate-x-y opacity)
+          :pointer-events :none}
+         [icons/icon (if @ready-to-lock? :i/locked :i/unlocked)
+          {:color (colors/theme-colors colors/black colors/white)
+           :size  20}]]]))])
--- a/Show More
+++ b/Show More