chore_: upgrade status-go

.clj-kondo/config.edn

@@ -10,8 +10,6 @@
                 legacy.status-im.utils.styles/def    clojure.core/def
                 legacy.status-im.utils.styles/defn   clojure.core/defn
                 test-helpers.unit/deftest-sub        clojure.core/defn
-                test-helpers.unit/deftest-event      clojure.core/defn
-
                 taoensso.tufte/defnp                 clojure.core/defn}
  :linters      {:case-duplicate-test           {:level :error}
                 :case-quoted-test              {:level :error}

.github/ISSUE_TEMPLATE/bug-report.md

@@ -2,7 +2,7 @@
 name: MVPBug Report
 about: MVPBug Report
 title: ''
-labels: ['E:Mobile Bug MVP', ':1234: low prio']
+labels: 'E:Mobile Bug MVP'
 assignees: ''
 
 ---

.github/PULL_REQUEST_TEMPLATE.md

@@ -70,19 +70,3 @@ Documentation change PR (review please): https://github.com/status-im/status.im/
 | Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after. |
 
 status: ready <!-- Can be ready or wip -->
-
-<!-- Uncomment this section for status-go upgrade/dogfooding pull requests
-
-- Specify potentially impacted user flows in _Areas that maybe impacted*.
-- Ensure that _Steps to test_ is filled in.
-
-### Risk
-
-Described potential risks and worst case scenarios.
-
-Tick **one**:
-- [ ] Low risk: 2 devs MUST perform testing as specified above and attach their results as comments to this PR **before** merging.
-- [ ] High risk: QA team MUST perform additional testing in the specified affected areas **before** merging.
-
-
--->

.zprintrc

@@ -41,7 +41,6 @@
   "reg-fx"            :arg1-pair
   "testing"           :arg1-body
   "deftest-sub"       :arg1-body
-  "deftest-event"     :arg1-body
   "test-async"        :arg1-body
   "wait-for"          :arg1-body
   "with-deps-check"   :arg1-body

Makefile

@@ -32,7 +32,7 @@ ifndef BUILD_TAG
 export BUILD_TAG := $(shell git rev-parse --short HEAD)
 endif
 
-# We don't want to use /run/user/$UID because it runs out of space too easily.
+# We don't want to use /run/user/$UID because it runs out of space too easilly.
 export TMPDIR = /tmp/tmp-status-mobile-$(BUILD_TAG)
 # This has to be specified for both the Node.JS server process and the Qt process.
 export REACT_SERVER_PORT ?= 5001
@@ -447,16 +447,6 @@ android-devices: export TARGET := android-sdk
 android-devices: ##@other Invoke adb devices
 	adb devices
 
-android-pull-geth: export TARGET := android-sdk
-android-pull-geth: export VERSION ?= debug
-android-pull-geth:
-	adb pull "/storage/emulated/0/Android/data/im.status.ethereum$$( [ "$(VERSION)" = "release" ] || echo ".$(VERSION)" )/files/Download/geth.log"
-
-android-tail-geth: export TARGET := android-sdk
-android-tail-geth: export VERSION ?= debug
-android-tail-geth:
-	adb shell 'while true; do cat; sleep 1; done < /storage/emulated/0/Android/data/im.status.ethereum$$( [ "$(VERSION)" = "release" ] || echo ".$(VERSION)" )/files/Download/geth.log'
-
 android-logcat: export TARGET := android-sdk
 android-logcat: ##@other Read status-mobile logs from Android phone using adb
 	adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG   :' -e 'Go      :' -e 'GoLog   :' -e 'libc    :'

android/app/src/main/AndroidManifest.xml

@@ -70,30 +70,8 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Handles http and https URLs for status.app -->
                 <data android:scheme="http" android:host="status.app" />
                 <data android:scheme="https" android:host="status.app" />
-                <!-- Community paths -->
-                <data android:pathPattern="/c/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/c/.*" android:host="status.app" android:scheme="https" />
-                <!-- Community channel paths -->
-                <data android:pathPattern="/cc/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/cc/.*" android:host="status.app" android:scheme="https" />
-                <!-- User paths -->
-                <data android:pathPattern="/u/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/u/.*" android:host="status.app" android:scheme="https" />
-                <!-- Private chat paths -->
-                <data android:pathPattern="/p/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/p/.*" android:host="status.app" android:scheme="https" />
-                <!-- Community request paths -->
-                <data android:pathPattern="/cr/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/cr/.*" android:host="status.app" android:scheme="https" />
-                <!-- Group chat paths -->
-                <data android:pathPattern="/g/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/g/.*" android:host="status.app" android:scheme="https" />
-                <!-- Wallet paths -->
-                <data android:pathPattern="/wallet/.*" android:host="status.app" android:scheme="http" />
-                <data android:pathPattern="/wallet/.*" android:host="status.app" android:scheme="https" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.8.12'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -71,7 +71,7 @@ pipeline {
         }
         stage('Upload') {
           steps { script {
-            def urls = apks.collect { s5cmd.upload(it) }
+            def urls = apks.collect { s3.uploadArtifact(it) }
             if (urls.size() > 1) { /* Return only the universal APK. */
               env.PKG_URL = urls.find { it.contains('universal') }
             } else { /* If no universal is available pick first. */

ci/Jenkinsfile.combined

@@ -1,7 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
-
-import groovy.json.JsonBuilder
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
   agent { label 'linux' }
@@ -74,7 +72,7 @@ pipeline {
           iOS: utils.pkgUrl(ios),
           Diawi: utils.getEnv(ios, 'DIAWI_URL'),
           /* upload the sha256 checksums file too */
-          SHA: s5cmd.upload(sha),
+          SHA: s3.uploadArtifact(sha),
         ]
         /* add URLs to the build description */
         jenkins.setBuildDesc(urls)
@@ -85,7 +83,7 @@ pipeline {
       steps { script {
         switch (utils.getBuildType()) {
           case 'nightly': /* Create JSON file with newest build URLs */
-            updateBucketJSON(urls, 'latest.json');
+            s3.updateBucketJSON(urls, 'latest.json');
             break;
           case 'release':
             github.publishReleaseFiles(repo: 'status-mobile');
@@ -116,22 +114,3 @@ def Boolean getPublishDefault(Boolean previousValue) {
   if (previousValue != null) { return previousValue }
   return false
 }
-
-/* Helper for updating JSON with newest builds. */
-def updateBucketJSON(urls, fileName) {
-  /* latest.json has slightly different key names */
-  def content = [
-    DIAWI: urls.Diawi,
-    APK: urls.Apk, IOS: urls.iOS,
-    APP: urls.App, MAC: urls.Mac,
-    WIN: urls.Win, SHA: urls.SHA
-  ]
-  def filePath = "${pwd()}/pkg/${fileName}"
-  /* it might not exist */
-  sh "mkdir -p ${pwd()}/pkg"
-  def contentJson = new JsonBuilder(content).toPrettyString()
-  println "${filePath}:\n${contentJson}"
-  writeFile(file: filePath, text: contentJson)
-  return s5cmd.upload(filePath)
-}
-

ci/Jenkinsfile.e2e-nightly

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

ci/Jenkinsfile.ios

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

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.8.12'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -75,7 +75,7 @@ pipeline {
     stage('Upload') {
       steps {
         script {
-          env.PKG_URL = s5cmd.upload(LOG_FILE)
+          env.PKG_URL = s3.uploadArtifact(LOG_FILE)
         }
       }
     }

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-prs

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.nix-cache

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

ci/tools/Jenkinsfile.playstore-meta

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

ci/tools/Jenkinsfile.xcode-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
   agent {

doc/merging-pr-process.md

@@ -32,16 +32,14 @@ status-mobile code that makes it to the `develop` branch, should always point to
 In practice, this means that sometimes they need to be merged in lockstep.
 1) Create a PR in status-go and status-mobile. Update the status-go version to the PR revision `scripts/update-status-go.sh $git_revision`.
 2) Get both PRs reviewed and approved. Once status-mobile PR has been approved, go through manual QA testing if necessary. Don't merge status-mobile PR just yet.
-3) Now that you know the integration between client & server is working, merge the status-go PR first.
-4) Once merged, tag the merged commit with the new version and push the tag:
+3) Now that you know the integration between client & server is working, bump the `VERSION` in status-go and merge it.
+4) Once merged, tag the version with the new version and push the tag:
 ```
   git checkout develop
   git pull develop
-  make tag-version
+  git tag vx.y.z
   git push origin vx.y.z
 ```
-:warning: If a specific commit need to tagged in status-go, use `make tag-version TARGET_COMMIT={hash}`. More info about tagging in [status-go](https://github.com/status-im/status-go/blob/develop/RELEASING.md#tagging-versions).
-
 5) Update status-mobile with the new status-go version, using the new tag `scripts/update-status-go.sh "vx.y.z"`
 6) If you had to rebase status-go to include new changes, e2e test MUST be re-run. If there's any issue you will
    have to fix in status-go with another PR and follow the same process.

doc/ui-guidelines.md

@@ -31,7 +31,7 @@ NOW:
 (defn view
   [{:keys [on-press on-long-press icon]}]
   (let [[pressed? set-pressed] (rn/use-state false)
-        theme                  (theme/use-theme)
+        theme                  (theme/use-theme-value)
         on-press-in            (rn/use-callback #(set-pressed true))
         on-press-out           (rn/use-callback #(set-pressed nil))]
     [rn/pressable
@@ -47,7 +47,7 @@ NOW:
 - We no longer need to create an anonymous function for rendering. This removes unnecessary confusion and the need for specific knowledge on how it works and why it was needed.
 - `rn/use-state` is used instead of `reagent/atom`
 - State values no longer need to be dereferenced; they are accessible as regular symbols. This eliminates a common bug where the "@" symbol was inadvertently omitted.
-- `theme/with-theme` wrapper is not needed anymore, `(theme/use-theme)` hook can be used directly in the components
+- `theme/with-theme` wrapper is not needed anymore, `(theme/use-theme-value)` hook can be used directly in the components
 - `:f>` not needed anymore, all components are functional by default
 - `rn/use-callback` hook should be used for anon callback functions
 

ios/Podfile.lock

@@ -1,5 +1,7 @@
 PODS:
   - boost (1.83.0)
+  - BVLinearGradient (2.8.0):
+    - React-Core
   - CryptoSwift (1.5.1)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.73.5)
@@ -1159,10 +1161,6 @@ PODS:
     - TOCropViewController
   - RNKeychain (8.1.2):
     - React-Core
-  - RNLinearGradient (3.0.0-alpha.1):
-    - glog
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Core
   - RNPermissions (4.1.5):
     - React-Core
   - RNReanimated (3.6.1):
@@ -1190,6 +1188,7 @@ PODS:
 
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
+  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
@@ -1270,7 +1269,6 @@ DEPENDENCIES:
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
   - RNKeychain (from `../node_modules/react-native-keychain`)
-  - RNLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNShare (from `../node_modules/react-native-share`)
@@ -1296,6 +1294,8 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   boost:
     :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
+  BVLinearGradient:
+    :path: "../node_modules/react-native-linear-gradient"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
@@ -1451,8 +1451,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-image-crop-picker"
   RNKeychain:
     :path: "../node_modules/react-native-keychain"
-  RNLinearGradient:
-    :path: "../node_modules/react-native-linear-gradient"
   RNPermissions:
     :path: "../node_modules/react-native-permissions"
   RNReanimated:
@@ -1480,12 +1478,13 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
+  BVLinearGradient: 612a04ff38e8480291f3379ee5b5a2c571f03fe0
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
   FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
   FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 530710e7949eb12c82670bd09e946becf50a3c2a
+  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
@@ -1562,7 +1561,6 @@ SPEC CHECKSUMS:
   RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
   RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
   RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
-  RNLinearGradient: ccaaebce083b54180da61d992e7fa56abfe000d6
   RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903
   RNReanimated: dee37576492f1a375017515f5c77e66e5eec696b
   RNShare: 859ff710211285676b0bcedd156c12437ea1d564

ios/StatusIm.xcodeproj/project.pbxproj

@@ -8,9 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
+		0BF51D8C7FBD6A668E6E1FC0 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45C29909A975E0654116557F /* libPods-Status-StatusIm.a */; };
+		131972279C6DBF736235F9F9 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D9DF8AC0F6547107DE1A25D /* libPods-Status-StatusIm-StatusImTests.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		231CD38186B86957CFCF645E /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
 		3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; };
@@ -40,13 +41,11 @@
 		65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
-		67A3DF2242D5B6C35A4C6A33 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; };
 		715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		A1B6E23C86E6A40AFE74E925 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
@@ -61,6 +60,7 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
+		DE2F1721F9D5702C7CEC5594 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B17DF204648B8189F8ABD0A7 /* libPods-Status-StatusImPR.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,23 +108,23 @@
 		00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
-		2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
+		1B74FBFCB9B8E34B63250A52 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
+		232FE8EAB57384181B0DB836 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
+		2D9DF8AC0F6547107DE1A25D /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		3AAD2ADC24A3A60E0075D594 /* Status PR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Status PR.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
+		45C29909A975E0654116557F /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
-		5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -132,14 +132,16 @@
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
+		7A393286DD0E844D050D0B89 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
+		7BF7B2DB23EE09E5229629DA /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
+		A0B5AD061DF0F6CC98603A99 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
-		A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
+		B17DF204648B8189F8ABD0A7 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = "<group>"; };
@@ -151,9 +153,7 @@
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
-		E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
-		EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
+		D40C4023C7D5B793AEF98426 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				67A3DF2242D5B6C35A4C6A33 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				131972279C6DBF736235F9F9 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +174,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				231CD38186B86957CFCF645E /* libPods-Status-StatusIm.a in Frameworks */,
+				0BF51D8C7FBD6A668E6E1FC0 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +188,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				A1B6E23C86E6A40AFE74E925 /* libPods-Status-StatusImPR.a in Frameworks */,
+				DE2F1721F9D5702C7CEC5594 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */,
-				A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */,
-				0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */,
+				45C29909A975E0654116557F /* libPods-Status-StatusIm.a */,
+				2D9DF8AC0F6547107DE1A25D /* libPods-Status-StatusIm-StatusImTests.a */,
+				B17DF204648B8189F8ABD0A7 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */,
-				5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */,
-				E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */,
-				D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */,
+				A0B5AD061DF0F6CC98603A99 /* Pods-Status-StatusIm.debug.xcconfig */,
+				232FE8EAB57384181B0DB836 /* Pods-Status-StatusIm.release.xcconfig */,
+				D40C4023C7D5B793AEF98426 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				1B74FBFCB9B8E34B63250A52 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				7BF7B2DB23EE09E5229629DA /* Pods-Status-StatusImPR.debug.xcconfig */,
+				7A393286DD0E844D050D0B89 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,12 +341,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				9B331412309D5F5632348AEE /* [CP] Check Pods Manifest.lock */,
+				5937040F3338CDF93E777A93 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				7545D1B37CABFA574D6D6C31 /* [CP] Embed Pods Frameworks */,
-				A3AD03105488DA5BC8E8C199 /* [CP] Copy Pods Resources */,
+				7AD665439C08CFEF5EF84F6A /* [CP] Embed Pods Frameworks */,
+				02C1A8CA208E38DA07BAC311 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -362,15 +362,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				236F25332B0D1B4DCC0E041E /* [CP] Check Pods Manifest.lock */,
+				1DFD6BF757E89B72F40FCEE9 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				37D91248C8178FEAC1661AE0 /* [CP] Embed Pods Frameworks */,
-				BC5CED24C6D00996607C4942 /* [CP] Copy Pods Resources */,
+				50F2A2E15670F86233743A5C /* [CP] Embed Pods Frameworks */,
+				1B623A051F855FC5B09A0480 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -385,15 +385,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				D0B7F25508F9BD7C6B30AF36 /* [CP] Check Pods Manifest.lock */,
+				EB421F3ED78A38D285D771D2 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				5C9736BD9798020B8F31802B /* [CP] Embed Pods Frameworks */,
-				B76C3637DC2DDBB6E8472904 /* [CP] Copy Pods Resources */,
+				F4561A2D3C9E6C4B66F4C4F5 /* [CP] Embed Pods Frameworks */,
+				6FA1467F7B916ED92FA688E0 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -547,7 +547,55 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\n\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n";
 		};
-		236F25332B0D1B4DCC0E041E /* [CP] Check Pods Manifest.lock */ = {
+		02C1A8CA208E38DA07BAC311 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		1B623A051F855FC5B09A0480 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		1DFD6BF757E89B72F40FCEE9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -569,24 +617,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		37D91248C8178FEAC1661AE0 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -615,13 +645,13 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
 		};
-		5C9736BD9798020B8F31802B /* [CP] Embed Pods Frameworks */ = {
+		50F2A2E15670F86233743A5C /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -630,28 +660,10 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7545D1B37CABFA574D6D6C31 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		9B331412309D5F5632348AEE /* [CP] Check Pods Manifest.lock */ = {
+		5937040F3338CDF93E777A93 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -673,31 +685,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A3AD03105488DA5BC8E8C199 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		B76C3637DC2DDBB6E8472904 /* [CP] Copy Pods Resources */ = {
+		6FA1467F7B916ED92FA688E0 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -721,31 +709,39 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		BC5CED24C6D00996607C4942 /* [CP] Copy Pods Resources */ = {
+		7AD665439C08CFEF5EF84F6A /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D0B7F25508F9BD7C6B30AF36 /* [CP] Check Pods Manifest.lock */ = {
+		E3914A731DF919ED00EBB515 /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = "/usr/bin/env sh";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
+		};
+		EB421F3ED78A38D285D771D2 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -767,19 +763,23 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E3914A731DF919ED00EBB515 /* Run Script */ = {
+		F4561A2D3C9E6C4B66F4C4F5 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
+			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
-			name = "Run Script";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
-			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -828,7 +828,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = D40C4023C7D5B793AEF98426 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -865,7 +865,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 1B74FBFCB9B8E34B63250A52 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -898,7 +898,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = A0B5AD061DF0F6CC98603A99 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -980,7 +980,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 232FE8EAB57384181B0DB836 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1055,7 +1055,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 7BF7B2DB23EE09E5229629DA /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1135,7 +1135,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 7A393286DD0E844D050D0B89 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";

ios/StatusIm/Info.plist

@@ -119,6 +119,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -131,7 +133,7 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
+	<false/>
 	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
 	<array>
 		<string>A00000080400010101</string>

modules/react-native-status/android/src/main/java/im/status/ethereum/module/AccountManager.kt

@@ -314,11 +314,6 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
         )
     }
 
-    @ReactMethod
-    fun createAccountFromPrivateKey(json: String, callback: Callback) {
-        utils.executeRunnableStatusGoMethod({ Statusgo.createAccountFromPrivateKey(json) }, callback)
-    }
-
     companion object {
         private const val TAG = "AccountManager"
         private const val gethLogFileName = "geth.log"

modules/react-native-status/ios/RCTStatus/AccountManager.m

@@ -233,12 +233,4 @@ RCT_EXPORT_METHOD(createAccountFromMnemonicAndDeriveAccountsForPaths:(NSString *
     callback(@[result]);
 }
 
-RCT_EXPORT_METHOD(createAccountFromPrivateKey:(NSString *)configJSON callback:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"createAccountFromPrivateKey() method called");
-#endif
-    NSString *result = StatusgoCreateAccountFromPrivateKey(configJSON);
-    callback(@[result]);
-}
-
 @end

nix/deps/gradle/deps.json

@@ -8461,10 +8461,6 @@
         "sha1": "fcfa9f6e411771b8be9bee29e9d318867d3e1bc3",
         "sha256": "sha256-ZMFGqsSRjMPiHhMij1/kF4VZM7GBN0zML4me8eFWsm0="
       },
-      "commons-logging-1.3.2-api.jar": {
-        "sha1": "0cf1bbd995c6ad9a2bf03efa94b4753409afd1d0",
-        "sha256": "sha256-FULIR7cLw1ucpucmKT9wm/5cy26alI+5KjeG/6lWE40="
-      },
       "commons-logging-1.3.2.jar": {
         "sha1": "3dc966156ef19d23c839715165435e582fafa753",
         "sha256": "sha256-a4WEJPUYAV8yv80Rg6Nz9Kgn1y0Ca2Ax2gyRzw6PNIk="
@@ -10955,16 +10951,16 @@
   },
 
   {
-    "path": "com/google/auto/value/auto-value-annotations/1.11.0",
+    "path": "com/google/auto/value/auto-value-annotations/1.10.4",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "auto-value-annotations-1.11.0.pom": {
-        "sha1": "a6b3d6cd083f5e03aad810d4bc2b08755cf91753",
-        "sha256": "sha256-KuwW406j4BFiGgMi9PNvj5v5iLtURitVcJduieoHsSI="
+      "auto-value-annotations-1.10.4.pom": {
+        "sha1": "1625b4e3671cc5ef044f7e0ed98c15bbfeba13bb",
+        "sha256": "sha256-c6W4UV+F+IxAiff/SkPNF5Wkgf2rk/qQULE8+hqNJfc="
       },
-      "auto-value-annotations-1.11.0.jar": {
-        "sha1": "f0d047931d07cfbc6fa4079854f181ff62891d6f",
-        "sha256": "sha256-WgVc5CVTM7M0bhqHA9pb+P8ElTIob9zTFxLWJKvhEd0="
+      "auto-value-annotations-1.10.4.jar": {
+        "sha1": "9679de8286eb0a151db6538ba297a8951c4a1224",
+        "sha256": "sha256-4cRea+ra75eXyw2a/VpFYhrQYc2GMgEvhVgoU6OIeCU="
       }
     }
   },
@@ -11003,12 +10999,12 @@
   },
 
   {
-    "path": "com/google/auto/value/auto-value-parent/1.11.0",
+    "path": "com/google/auto/value/auto-value-parent/1.10.4",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "auto-value-parent-1.11.0.pom": {
-        "sha1": "4d1249846df8ae67b8ad313bc9a6174516fa49b3",
-        "sha256": "sha256-Wg0dcYVS6KRdzOASjRtrliP6lxqCzSRXUyM7pyCMsp0="
+      "auto-value-parent-1.10.4.pom": {
+        "sha1": "08d4397fc90a6bd37db513aee267d40b7639db13",
+        "sha256": "sha256-vsOhnk3ci2QGZyMzzFBbngy2s1WLskIxSGm7bh1ojTA="
       }
     }
   },
@@ -11155,12 +11151,12 @@
   },
 
   {
-    "path": "com/google/code/gson/gson-parent/2.11.0",
+    "path": "com/google/code/gson/gson-parent/2.10.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "gson-parent-2.11.0.pom": {
-        "sha1": "b32d3bc5c89c852efe4c176df6c3fdeccbe150ef",
-        "sha256": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
+      "gson-parent-2.10.1.pom": {
+        "sha1": "67ea6db077285dc50a9b0a627763764f0ef4a770",
+        "sha256": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
       }
     }
   },
@@ -11286,24 +11282,16 @@
   },
 
   {
-    "path": "com/google/code/gson/gson/2.11.0",
+    "path": "com/google/code/gson/gson/2.10.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "gson-2.11.0.pom": {
-        "sha1": "55796dd7cc329027df79e96c4e6631e3c02c93c5",
-        "sha256": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
+      "gson-2.10.1.pom": {
+        "sha1": "ce159faf33c1e665e1f3a785a5d678a2b20151bc",
+        "sha256": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
       },
-      "gson-2.11.0.buildinfo": {
-        "sha1": "4d1c42ee3c07943d8e07fab98bf0491877b4c0c6",
-        "sha256": "sha256-d6O/J0uIwA+ieS0kkb+yLkeL3OUzOMUcMBHW7nDr0pI="
-      },
-      "gson-2.11.0.buildinfo.asc": {
-        "sha1": "ba50162dd390a51e11a706d62ef9a5d120138337",
-        "sha256": "sha256-blLhhVcT0w8htC6V6rrqU+CZ3egMLBv5AgE76D+zGIY="
-      },
-      "gson-2.11.0.jar": {
-        "sha1": "527175ca6d81050b53bdd4c457a6d6e017626b0e",
-        "sha256": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s="
+      "gson-2.10.1.jar": {
+        "sha1": "b3add478d4382b78ea20b1671390a858002feb6c",
+        "sha256": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM="
       }
     }
   },
@@ -11519,31 +11507,16 @@
   },
 
   {
-    "path": "com/google/errorprone/error_prone_annotations/2.27.0",
+    "path": "com/google/errorprone/error_prone_annotations/2.27.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "error_prone_annotations-2.27.0.pom": {
-        "sha1": "85103026aa50b0e4efafee8f486e3ecd9ebfde31",
-        "sha256": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
+      "error_prone_annotations-2.27.1.pom": {
+        "sha1": "432107569fdae073842841c566ea1eea3b2f0a96",
+        "sha256": "sha256-TCN6vSm6OvOcp0TLSkHyRbX/oEXQNskkSvKrPKvKhTc="
       },
-      "error_prone_annotations-2.27.0.jar": {
-        "sha1": "91b2c29d8a6148b5e2e4930f070d4840e2e48e34",
-        "sha256": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU="
-      }
-    }
-  },
-
-  {
-    "path": "com/google/errorprone/error_prone_annotations/2.28.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "error_prone_annotations-2.28.0.pom": {
-        "sha1": "6ab92cea437b733e5ef832e575cbf50fa8aebfad",
-        "sha256": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo="
-      },
-      "error_prone_annotations-2.28.0.jar": {
-        "sha1": "59fc00087ce372de42e394d2c789295dff2d19f0",
-        "sha256": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4="
+      "error_prone_annotations-2.27.1.jar": {
+        "sha1": "a87dac4f79a6e5b1e55c629f16c754c53cbd50ec",
+        "sha256": "sha256-pIlbXbAkNhTZDOKixvgwYkkJwB4xWH2Ow+z1Hl5+dQY="
       }
     }
   },
@@ -11670,23 +11643,12 @@
   },
 
   {
-    "path": "com/google/errorprone/error_prone_parent/2.27.0",
+    "path": "com/google/errorprone/error_prone_parent/2.27.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "error_prone_parent-2.27.0.pom": {
-        "sha1": "336f77abf2668b10cae4ab136ea0c8258875de00",
-        "sha256": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
-      }
-    }
-  },
-
-  {
-    "path": "com/google/errorprone/error_prone_parent/2.28.0",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "error_prone_parent-2.28.0.pom": {
-        "sha1": "5f307de93ba6c82a0ca99404c1ab927f68c7038a",
-        "sha256": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM="
+      "error_prone_parent-2.27.1.pom": {
+        "sha1": "b00504c9994e0c16dc77d661b19421f1ffd179b4",
+        "sha256": "sha256-APlKPmg8fOr5lQFP/EB/INNycrFQ0mEbNVdLjOcYIjY="
       }
     }
   },
@@ -11880,27 +11842,27 @@
   },
 
   {
-    "path": "com/google/guava/guava-parent/33.2.1-jre",
+    "path": "com/google/guava/guava-parent/33.2.0-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-parent-33.2.1-jre.pom": {
-        "sha1": "fc55955fab23e86fad230acc81bf570deb5660bd",
-        "sha256": "sha256-kJX22O43ZZUCB1EHhYMMwigOeBBnkV+pnP4XQNSGXBQ="
+      "guava-parent-33.2.0-jre.pom": {
+        "sha1": "f5bfac48964350d7ad36aa378acff0ed379f816b",
+        "sha256": "sha256-Ng5j7DRbu9j6pK3YluMlAt//9U6DQJhFyzPB+tN7WYU="
       }
     }
   },
 
   {
-    "path": "com/google/guava/guava-testlib/33.2.1-jre",
+    "path": "com/google/guava/guava-testlib/33.2.0-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-testlib-33.2.1-jre.pom": {
-        "sha1": "3b95376190925f23c89d9f2f990f2eb0bab9d2b2",
-        "sha256": "sha256-ZAiayFTlu6dVYLw9PB/dPqQ1cpFXJvYMgjcsq/qnTuQ="
+      "guava-testlib-33.2.0-jre.pom": {
+        "sha1": "1d0c542e891776dcb545a86de861afb18bc79540",
+        "sha256": "sha256-HQFL2lY+v0p64DOKef0JPulhIctiQz0g61uejCvIroo="
       },
-      "guava-testlib-33.2.1-jre.jar": {
-        "sha1": "ba7d569795211c283c4576d17528534a618a5d59",
-        "sha256": "sha256-XsFBByZYQk9AzTC5FGf1zmPA5he5Hskn33JW79/S2Eo="
+      "guava-testlib-33.2.0-jre.jar": {
+        "sha1": "4678a8fd0e7fba71a4283154fd4979f51ba294d5",
+        "sha256": "sha256-HK2mwu+stz+eoRk7sMeKr/qT2DjtAGrIBtDXoeYMQlo="
       }
     }
   },
@@ -12086,20 +12048,20 @@
   },
 
   {
-    "path": "com/google/guava/guava/33.2.1-jre",
+    "path": "com/google/guava/guava/33.2.0-jre",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "guava-33.2.1-jre.pom": {
-        "sha1": "5f72123f1bb7d99af8b4a67745fb8309b73a6294",
-        "sha256": "sha256-QoF73BwMjHN9a0Ec+vSoR2nn0nHoebAW/QhQJIoG2rU="
+      "guava-33.2.0-jre.pom": {
+        "sha1": "e78e6bc096ac140596ce47c2cd6e90f12a417779",
+        "sha256": "sha256-7YMRSBtY5QTb/BtfR3C/B13BL2yshV3X1/NqUNTEGRA="
       },
-      "guava-33.2.1-jre.jar": {
-        "sha1": "818e780da2c66c63bbb6480fef1f3855eeafa3e4",
-        "sha256": "sha256-RSstl4e302b6jPXtmhxAQEVC0F7/p6WY2gO7u7dtnzE="
+      "guava-33.2.0-jre.jar": {
+        "sha1": "e264781dadc4967e5292f3c4d05f1d153631f7b4",
+        "sha256": "sha256-mfSR6GJizjjROzWB1A93rNtGlqlQVEfDFUR0wxkpCN0="
       },
-      "guava-33.2.1-jre.module": {
-        "sha1": "35b3a43a28bf269178f01d7097263d9ef95cac8b",
-        "sha256": "sha256-0j7aahwsC9JfijNGzd7sQ7Ufdb+Bm5MeqpgybqZEdCI="
+      "guava-33.2.0-jre.module": {
+        "sha1": "5ee9e7ff047a61986890f7ea80a2695c7239169c",
+        "sha256": "sha256-eSlFEwC6UJb1M6LiPOqpManfGBIy21emmK1+PB4TD/g="
       }
     }
   },
@@ -12272,12 +12234,12 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-bom/4.27.0",
+    "path": "com/google/protobuf/protobuf-bom/4.27.0-RC3",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-bom-4.27.0.pom": {
-        "sha1": "56b4bb710c104ec9486c27b0f8e032d1bc11e9ed",
-        "sha256": "sha256-kbRq1aEDFnGx0+fzkPdYkVkXnXIP9CbHMXiYCTfeDbE="
+      "protobuf-bom-4.27.0-RC3.pom": {
+        "sha1": "bd9f15b87d06e839222b2dadcd90272013557048",
+        "sha256": "sha256-S1fPaw/YOC7Ntmsg4yYX+nDJh3kcIsYiOw9GMFhCogI="
       }
     }
   },
@@ -12523,16 +12485,16 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-java/4.27.0",
+    "path": "com/google/protobuf/protobuf-java/4.27.0-RC3",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-java-4.27.0.pom": {
-        "sha1": "03ea82f584b3f703357c571b521cc84fa80b977c",
-        "sha256": "sha256-JCl1NSx41sxgr7EY6uYMHFFNZfkwdhwG2w3Rsj4lD6A="
+      "protobuf-java-4.27.0-RC3.pom": {
+        "sha1": "eb6c9cf9ce563effc186f0a8bbc35aa53bbcf74e",
+        "sha256": "sha256-tYj2q0siUF4fcX4dwZ/NhbsHbICJkDDlOE0fX0+lb1s="
       },
-      "protobuf-java-4.27.0.jar": {
-        "sha1": "c60880f1aa87ae87b9d4346f0a87c511919c2c42",
-        "sha256": "sha256-kHLmD+Zs/11sDxGh3yHY8+Sym17ngrRcP8dfWfviuDk="
+      "protobuf-java-4.27.0-RC3.jar": {
+        "sha1": "b8abf4eca2730bf6de63f187eb1c15dd512cbe83",
+        "sha256": "sha256-BTKtECTWI2FWGsrtuXTX0WiJ52cLNuI+kyHda50zTvk="
       }
     }
   },
@@ -12652,12 +12614,12 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-parent/4.27.0",
+    "path": "com/google/protobuf/protobuf-parent/4.27.0-RC3",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-parent-4.27.0.pom": {
-        "sha1": "10de155e31cfe0f8f7999b8436ff2b016d108591",
-        "sha256": "sha256-Zft+ZHmFhOzaC6xG5HOEWol1l2vCRspXsy/01tU1U6k="
+      "protobuf-parent-4.27.0-RC3.pom": {
+        "sha1": "896b7ebb6bf6d26d64bf7b92e41d5e4f6c097a8b",
+        "sha256": "sha256-i7Fdb53i0Q8PlqmPKfkl+9T/oA/VEOyse5X3QjIYhvc="
       }
     }
   },
@@ -16719,20 +16681,20 @@
   },
 
   {
-    "path": "org/checkerframework/checker-qual/3.44.0",
+    "path": "org/checkerframework/checker-qual/3.43.0",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "checker-qual-3.44.0.pom": {
-        "sha1": "fec730b84f3509af3f10d2062cae751f14ee1978",
-        "sha256": "sha256-A7MppYafkeWYICzJNzaso3h8r0kUtUQfLAkA5fts/GU="
+      "checker-qual-3.43.0.pom": {
+        "sha1": "48ad8955d64547b84ef581361c29c030e56430cb",
+        "sha256": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM="
       },
-      "checker-qual-3.44.0.jar": {
-        "sha1": "e026b198319ea9dd3f221fab367d2099215079e5",
-        "sha256": "sha256-MO1DlgK2wtSq6iqF5Y44hVbwzHrmjtKWSbwc0MAQLNk="
+      "checker-qual-3.43.0.jar": {
+        "sha1": "9425eee39e56b116d2b998b7c2cebcbd11a3c98b",
+        "sha256": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY="
       },
-      "checker-qual-3.44.0.module": {
-        "sha1": "d87549604f8dab86b3bdd7e6c2a1d1edc2ecd9c2",
-        "sha256": "sha256-6oWA9FjrXS7Jw0KDiLpQm8yvZSP2kfJtv0BxZ5jvoi4="
+      "checker-qual-3.43.0.module": {
+        "sha1": "3020cf05cf20a5f6e2137e59291be76cd1252b83",
+        "sha256": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ="
       }
     }
   },
@@ -19266,16 +19228,16 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0",
+    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC3",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-reflect-2.0.0.pom": {
-        "sha1": "b4563487290a5acea0a569621f441266f36001bd",
-        "sha256": "sha256-ikQrns4+Vt+fEm8xxiodKjEkir7CiLbYMLrncjcYSLA="
+      "kotlin-reflect-2.0.0-RC3.pom": {
+        "sha1": "a7730291ea955a34868c94a9409c048c15107d94",
+        "sha256": "sha256-9aeMqntbuaejEkPzeT4Nj+3/q1d6KNW7pXlyMFkU5nU="
       },
-      "kotlin-reflect-2.0.0.jar": {
-        "sha1": "9c3d75110945233bf77d2e1a90604b100884db94",
-        "sha256": "sha256-ERvZBpIZN/dtoXdgZBEW0EtXp6Evz5gO/nxnZ/RRefA="
+      "kotlin-reflect-2.0.0-RC3.jar": {
+        "sha1": "2de9acd396986f0130a7015ca18caa593915b077",
+        "sha256": "sha256-bFXdlUw7yRgPPDvM+D9PAf+ifqvMVlWdLKw2Z6FbjMo="
       }
     }
   },
@@ -20853,28 +20815,28 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC3",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-stdlib-2.0.0.pom": {
-        "sha1": "028759a886ea2f745a324c2d58ae631692dac90f",
-        "sha256": "sha256-WQ5ia8kzl6XnXMeI8s7INbN6HuLlSDmvMNvY1bocLvI="
+      "kotlin-stdlib-2.0.0-RC3.pom": {
+        "sha1": "7fb5dbef4bdc345da221fecbd12ddbcf6bbe3160",
+        "sha256": "sha256-zUpUNgRDkBPpPf5Czq/zFbV0Fy6PWdc4u7Ast9mrP38="
       },
-      "kotlin-stdlib-2.0.0-all.jar": {
+      "kotlin-stdlib-2.0.0-RC3-all.jar": {
         "sha1": "e6142a28b5fa6722cd811dd86278ad056784fa40",
         "sha256": "sha256-MOBSIrwGf/+4lqMna18ePylFC/HZRh0noZzg78eTtc0="
       },
-      "kotlin-stdlib-2.0.0-common.jar": {
+      "kotlin-stdlib-2.0.0-RC3-common.jar": {
         "sha1": "281e03983850e590dcc0d2474758f2fa8dd0e96a",
         "sha256": "sha256-EsHDu0lApPmVlUD/tc8uLl6brNtoywDEvSidFjm9HSc="
       },
-      "kotlin-stdlib-2.0.0.jar": {
-        "sha1": "b48df2c4aede9586cc931ead433bc02d6fd7879e",
-        "sha256": "sha256-JAk4xKq45z6IhwPj59P4c4P/5b1TbW1ePBANTNA3n88="
+      "kotlin-stdlib-2.0.0-RC3.jar": {
+        "sha1": "37bea4f33a0d1823317f1210048928030077ec38",
+        "sha256": "sha256-B2a3hUy+BDpaysUyZ3CUvh9ua0iT54/a2SXC64Mks3Y="
       },
-      "kotlin-stdlib-2.0.0.module": {
-        "sha1": "2753eb5e4958b5462bcc3bd38458a9589cdd1fd3",
-        "sha256": "sha256-ZPluqOe5iWcxBSJB/9OiZfgnTXYeX+ncCIrEWzFxg0E="
+      "kotlin-stdlib-2.0.0-RC3.module": {
+        "sha1": "83a7913d9fd48986a323feb3fccc2b1049182fab",
+        "sha256": "sha256-vpppwKPQSAwqZ2ff0DPELmM87yPovzFuqKy8Osz9piE="
       }
     }
   },
@@ -21154,16 +21116,16 @@
   },
 
   {
-    "path": "org/junit/junit-bom/5.11.0-M2",
+    "path": "org/junit/junit-bom/5.11.0-M1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "junit-bom-5.11.0-M2.pom": {
-        "sha1": "6c517cddae7893aba5bf9f051c44860a4fc18211",
-        "sha256": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="
+      "junit-bom-5.11.0-M1.pom": {
+        "sha1": "afec72e7b7df3cd97c3fe53164c3f5dfc6a0ff94",
+        "sha256": "sha256-tQl19cuoYgSr2j3Nbwl6+Rn+IuIe9pR43WuRn2x0DYU="
       },
-      "junit-bom-5.11.0-M2.module": {
-        "sha1": "4546561225def9f7f99c7c1abc3828dec51aad2a",
-        "sha256": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4="
+      "junit-bom-5.11.0-M1.module": {
+        "sha1": "8824de265f75444b83779557736d03b4c8fac3f7",
+        "sha256": "sha256-j2MviWXptvQGnj1YueomuaW8dqmOibQyM3d6zm2tsjc="
       }
     }
   },

nix/deps/gradle/deps.list

@@ -4,10 +4,12 @@ androidx.activity:activity:1.2.4
 androidx.activity:activity:1.6.0
 androidx.annotation:annotation-experimental:1.1.0
 androidx.annotation:annotation-experimental:1.3.0
+androidx.annotation:annotation-jvm:1.6.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
+androidx.annotation:annotation:1.6.0
 androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
@@ -486,6 +488,7 @@ com.facebook.fresco:nativeimagetranscoder:3.1.3
 com.facebook.fresco:soloader:3.1.3
 com.facebook.fresco:ui-common:3.1.3
 com.facebook.infer.annotation:infer-annotation:0.18.0
+com.facebook.react:hermes-android:0.73.5
 com.facebook.react:react-android:0.73.5
 com.facebook.soloader:annotation:0.10.5
 com.facebook.soloader:nativeloader:0.10.5
@@ -940,7 +943,4 @@ com.android.tools.build:gradle:8.1.1
 com.google.errorprone:error_prone_annotations:2.7.1
 com.android.tools.lint:lint-gradle:31.1.1
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
-com.android.tools.build:gradle:3.5.4
-androidx.annotation:annotation:1.6.0
-androidx.annotation:annotation-jvm:1.6.0
-com.facebook.react:hermes-android:0.73.5
+com.android.tools.build:gradle:3.5.4

nix/deps/gradle/deps.urls

@@ -671,11 +671,11 @@ https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/7/auto-parent-7
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.3/auto-value-annotations-1.6.3.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.11.0/auto-value-annotations-1.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.10.4/auto-value-annotations-1.10.4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.2/auto-value-parent-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.3/auto-value-parent-1.6.3.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.7.4/auto-value-parent-1.7.4.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.11.0/auto-value-parent-1.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.10.4/auto-value-parent-1.10.4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom
@@ -687,7 +687,7 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.5/gson
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.6/gson-parent-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.9/gson-parent-2.8.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.9.1/gson-parent-2.9.1.pom
-https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.11.0/gson-parent-2.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.10.1/gson-parent-2.10.1.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.2.4.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.pom
@@ -696,7 +696,7 @@ 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/code/gson/gson/2.8.9/gson-2.8.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.9.1/gson-2.9.1.pom
-https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.11.0/gson-2.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.10.1/gson-2.10.1.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/crypto/tink/tink/1.7.0/tink-1.7.0.pom
 https://repo.maven.apache.org/maven2/com/google/dagger/dagger/2.28.3/dagger-2.28.3.pom
@@ -711,8 +711,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.0/error_prone_annotations-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.28.0/error_prone_annotations-2.28.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.1/error_prone_annotations-2.27.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -724,8 +723,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.0/error_prone_parent-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.28.0/error_prone_parent-2.28.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.1/error_prone_parent-2.27.1.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
@@ -742,8 +740,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.2.1-jre/guava-parent-33.2.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.2.1-jre/guava-testlib-33.2.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.2.0-jre/guava-parent-33.2.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.2.0-jre/guava-testlib-33.2.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -756,7 +754,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.2.1-jre/guava-33.2.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.2.0-jre/guava-33.2.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -770,7 +768,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.17.2/protobuf-bom-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.2/protobuf-bom-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.3/protobuf-bom-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.27.0/protobuf-bom-4.27.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.27.0-RC3/protobuf-bom-4.27.0-RC3.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -787,7 +785,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/pr
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.17.2/protobuf-java-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.27.0/protobuf-java-4.27.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.27.0-RC3/protobuf-java-4.27.0-RC3.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -798,7 +796,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.2/protobuf-parent-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.3/protobuf-parent-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.27.0/protobuf-parent-4.27.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.27.0-RC3/protobuf-parent-4.27.0-RC3.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.2/truth-parent-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
@@ -1091,7 +1089,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.44.0/checker-qual-3.44.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
@@ -1248,7 +1246,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0/kotlin-reflect-2.0.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC3/kotlin-reflect-2.0.0-RC3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
@@ -1353,7 +1351,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-R
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0/kotlin-stdlib-2.0.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC3/kotlin-stdlib-2.0.0-RC3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
@@ -1372,7 +1370,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trov
 https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20240303/json-20240303.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0-M2/junit-bom-5.11.0-M2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0-M1/junit-bom-5.11.0-M1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom

nix/deps/gradle/generate.sh

@@ -56,8 +56,6 @@ com.google.errorprone:error_prone_annotations:2.7.1
 com.android.tools.lint:lint-gradle:31.1.1
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
 com.android.tools.build:gradle:3.5.4
-androidx.annotation:annotation:1.6.0
-androidx.annotation:annotation-jvm:1.6.0
 com.facebook.react:hermes-android:0.73.5' \
         >> "${DEPS_LIST}"
 }

nix/overlay.nix

@@ -57,7 +57,7 @@ in {
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
   openjdk = super.openjdk11_headless;
   xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    versions = ["15.1" "15.2" "15.3" "15.4"];
+    versions = ["15.1" "15.2" "15.3"];
   };
   go = super.go_1_21;
   clang = super.clang_15;
@@ -80,7 +80,7 @@ in {
     androidPkgs = self.androidEnvCustom.compose;
   };
 
-  # Android environment
+  # Android environement
   androidEnvCustom = callPackage ./pkgs/android-sdk { };
   androidPkgs = self.androidEnvCustom.pkgs;
   androidShell = self.androidEnvCustom.shell;

package.json

@@ -20,10 +20,9 @@
     "@react-native-community/netinfo": "^4.4.0",
     "@react-native-community/push-notification-ios": "^1.4.1",
     "@react-native-community/slider": "^3.0.0",
-    "@walletconnect/react-native-compat": "2.11.2",
-    "@walletconnect/web3wallet": "1.10.2",
+    "@walletconnect/react-native-compat": "^2.12.2",
+    "@walletconnect/web3wallet": "^1.11.2",
     "base-64": "^1.0.0",
-    "big-integer": "1.6.51",
     "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/v4.0.2-status",
     "chance": "^1.1.0",
     "emojilib": "^2.4.0",
@@ -54,7 +53,7 @@
     "react-native-image-crop-picker": "0.40.0",
     "react-native-image-resizer": "^1.2.3",
     "react-native-keychain": "8.1.2",
-    "react-native-linear-gradient": "3.0.0-alpha.1",
+    "react-native-linear-gradient": "^2.8.0",
     "react-native-lottie-splash-screen": "^1.0.1",
     "react-native-navigation": "7.39.0",
     "react-native-orientation-locker": "^1.5.0",

shadow-cljs.edn

@@ -131,8 +131,7 @@
    :output-dir "target/test"
    :optimizations :simple
    :target :node-test
-   :dev {:devtools {:preloads [status-im.setup.schema-preload
-                               status-im.setup.test-preload]}}
+   :dev {:devtools {:preloads [status-im.setup.schema-preload]}}
    ;; Uncomment line below to `make test-watch` a specific file
    :ns-regexp #shadow/env "SHADOW_NS_REGEXP"
    :main legacy.status-im.test-runner/main

src/legacy/status_im/data_store/chats.cljs

@@ -38,12 +38,10 @@
     :always
     (update :contacts conj (:id member))))
 
-(defn community-chat-id->channel-id [chat-id] (subs chat-id constants/community-id-length))
-
 (defn decode-chat-id
   [chat-id]
   (let [community-id (subs chat-id 0 constants/community-id-length)
-        channel-id   (community-chat-id->channel-id chat-id)]
+        channel-id   (subs chat-id constants/community-id-length)]
     {:community-id community-id
      :channel-id   channel-id}))
 

src/legacy/status_im/events.cljs

@@ -135,8 +135,7 @@
                                  (>= (- now app-in-background-since)
                                      constants/ms-in-bg-for-require-bioauth))]
     (rf/merge cofx
-              {:db                                   (dissoc db :app-in-background-since)
-               :effects.biometric/get-supported-type nil}
+              {:db (dissoc db :app-in-background-since)}
               (mailserver/process-next-messages-request)
               (when-not new-account?
                 (universal-links/process-stored-event))

src/legacy/status_im/multiaccounts/logout/core.cljs

@@ -28,7 +28,7 @@
   [{:keys [db] :as cofx} {:keys [auth-method logout?]}]
   (let [key-uid (get-in db [:profile/profile :key-uid])]
     (rf/merge cofx
-              {:dispatch                               [:init-root :progress]
+              {:set-root                               :progress
                :effects.shell/reset-state              nil
                :hide-popover                           nil
                ::logout                                nil

src/legacy/status_im/subs/root.cljs

@@ -17,7 +17,7 @@
 (reg-root-key-sub :ui/search :ui/search)
 (reg-root-key-sub :network/type :network/type)
 (reg-root-key-sub :network-status :network-status)
-(reg-root-key-sub :peer-stats/count :peer-stats/count)
+(reg-root-key-sub :peers-count :peers-count)
 (reg-root-key-sub :peers-summary :peers-summary)
 (reg-root-key-sub :web3-node-version :web3-node-version)
 

src/legacy/status_im/ui/components/connectivity/view.cljs

@@ -1,9 +1,14 @@
 (ns legacy.status-im.ui.components.connectivity.view
   (:require
+    [clojure.string :as string]
     [legacy.status-im.ui.components.animation :as animation]
     [legacy.status-im.ui.components.colors :as colors]
-    [legacy.status-im.ui.components.react :as react])
-  (:require-macros [legacy.status-im.utils.views :as views]))
+    [legacy.status-im.ui.components.core :as quo]
+    [legacy.status-im.ui.components.list.item :as list.item]
+    [legacy.status-im.ui.components.react :as react]
+    [re-frame.core :as re-frame]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views :refer [defview letsubs]]))
 
 (defn easing
   [direction n]
@@ -67,3 +72,112 @@
                                           colors/white)
                       :left
                       (* 0.15 parent-width))}]]]))
+
+(defview loading-indicator
+  []
+  (letsubs [fetching?    [:mailserver/fetching?]
+            window-width [:dimensions/window-width]]
+    (when fetching?
+      [loading-indicator-anim window-width])))
+
+(defn hide-sheet-and-dispatch
+  [event]
+  (re-frame/dispatch [:bottom-sheet/hide-old])
+  (re-frame/dispatch event))
+
+(defview connectivity-sheet
+  []
+  (letsubs [{:keys [peers node mobile sync]}     [:connectivity/state]
+            current-mailserver-name              [:mailserver/current-name]
+            peers-count                          [:peers-count]
+            {:keys [syncing-on-mobile-network?]} [:profile/profile]]
+    [:<>
+     [quo/header {:title (i18n/label :t/connection-status) :border-bottom false}]
+     [quo/list-header (i18n/label :t/peer-to-peer)]
+     (if (= peers :offline)
+       [list.item/list-item
+        {:title               (i18n/label :t/not-connected-to-peers)
+         :accessibility-label "not-connected-to-peers"
+         :subtitle            (i18n/label :t/unable-to-send-messages)
+         :subtitle-max-lines  2
+         :theme               :negative
+         :icon                :main-icons/network}]
+       [list.item/list-item
+        {:title               (str (i18n/label :t/connected-to)
+                                   " " peers-count
+                                   " " (string/lower-case (i18n/label :t/peers)))
+         :accessibility-label "connected-to-n-peers"
+         :subtitle            (i18n/label :t/can-send-messages)
+         :subtitle-max-lines  2
+         :theme               :positive
+         :icon                :main-icons/network}])
+     [quo/list-header (i18n/label :t/history-nodes)]
+     (cond
+       (#{:error :offline} node)
+       [list.item/list-item
+        {:title               (i18n/label :t/not-connected-nodes)
+         :accessibility-label "not-connected-nodes"
+         :subtitle            (i18n/label :t/unable-to-fetch)
+         :theme               :negative
+         :icon                :main-icons/mailserver}]
+       (= node :disabled)
+       [list.item/list-item
+        {:title               (i18n/label :t/nodes-disabled)
+         :accessibility-label "nodes-disabled"
+         :subtitle            (i18n/label :t/unable-to-fetch)
+         :disabled            true
+         :icon                :main-icons/mailserver}]
+       (and mobile (not sync))
+       [list.item/list-item
+        {:title               (i18n/label :t/waiting-wi-fi)
+         :accessibility-label "waiting-wi-fi"
+         :subtitle            (i18n/label :t/unable-to-fetch)
+         :disabled            true
+         :icon                :main-icons/mailserver}]
+       (= node :connecting)
+       [list.item/list-item
+        {:title               (i18n/label :t/connecting)
+         :accessibility-label "connecting"
+         :subtitle            (i18n/label :t/unable-to-fetch)
+         :icon                :main-icons/mailserver}]
+       (= node :online)
+       [list.item/list-item
+        {:title               (str (i18n/label :t/connected-to) " " current-mailserver-name)
+         :accessibility-label "connected-to-mailserver"
+         :subtitle            (i18n/label :t/you-can-fetch)
+         :theme               :positive
+         :icon                :main-icons/mailserver}])
+     [list.item/list-item
+      {:title               (i18n/label :t/settings)
+       :accessibility-label "settings"
+       :theme               :accent
+       :on-press            #(hide-sheet-and-dispatch [:navigate-to :legacy-sync-settings])
+       :icon                :main-icons/settings}]
+     (when mobile
+       [:<>
+        [react/view
+         {:margin-vertical  8
+          :background-color colors/gray-lighter
+          :height           36
+          :align-items      :center
+          :justify-content  :center}
+         [react/text {:style {:color colors/gray}} (i18n/label :t/youre-on-mobile-network)]]
+        [list.item/list-item
+         {:title               (i18n/label :t/mobile-network-use-mobile)
+          :accessibility-label "mobile-network-use-mobile"
+          :accessory           :switch
+          :on-press            #(re-frame/dispatch [:mobile-network/set-syncing
+                                                    (not syncing-on-mobile-network?)])
+          :active              syncing-on-mobile-network?}]
+        [react/text {:style {:margin-horizontal 16 :margin-bottom 12 :color colors/gray}}
+         (i18n/label :t/status-mobile-descr)]])]))
+
+(defn get-icon
+  [{:keys [peers node mobile sync]}]
+  (if (or (= peers :offline)
+          (= node :offline)
+          (= node :connecting))
+    :main-icons/offline
+    (if mobile
+      (if sync :main-icons/mobile-sync :main-icons/mobile-sync-off)
+      (when (#{:error :disabled} node) :main-icons/node-offline))))

src/legacy/status_im/ui/components/keyboard_avoid_presentation.cljs

@@ -10,7 +10,7 @@
     (reagent/as-element
      (into [react/keyboard-avoiding-view
             (update props
-                    :keyboard-vertical-offset
+                    :keyboardVerticalOffset
                     +
                     20
                     (if (:ignore-offset props) 44 0))]

src/legacy/status_im/ui/components/react.cljs

@@ -275,7 +275,7 @@
          (merge (when platform/ios? {:behavior :padding})
                 (if (:ignore-offset props)
                   props
-                  (update props :keyboard-vertical-offset + 44 (:status-bar-height @navigation-const))))]
+                  (update props :keyboardVerticalOffset + 44 (:status-bar-height @navigation-const))))]
         children))
 
 (defn keyboard-avoiding-view-new
@@ -284,7 +284,7 @@
          (merge (when platform/ios? {:behavior :padding})
                 (if (:ignore-offset props)
                   props
-                  (update props :keyboard-vertical-offset + 44)))]
+                  (update props :keyboardVerticalOffset + 44)))]
         children))
 
 (defn scroll-view

src/legacy/status_im/ui/screens/default_sync_period_settings/view.cljs

@@ -13,7 +13,6 @@
    constants/one-day    (i18n/label :t/one-day)
    constants/three-days (i18n/label :t/three-days)
    constants/one-week   (i18n/label :t/one-week)
-   constants/nine-days  (i18n/label :t/nine-days)
    constants/one-month  (i18n/label :t/one-month)})
 
 (defn radio-item
@@ -35,5 +34,4 @@
      [radio-item constants/one-day default-sync-period]
      [radio-item constants/three-days default-sync-period]
      [radio-item constants/one-week default-sync-period]
-     [radio-item constants/nine-days default-sync-period]
      [radio-item constants/one-month default-sync-period]]))

src/legacy/status_im/ui/screens/notifications_settings/views.cljs

@@ -6,7 +6,6 @@
     [legacy.status-im.ui.components.react :as react]
     [quo.core :as quo]
     [react-native.platform :as platform]
-    [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -58,15 +57,7 @@
        :accessibility-label :local-notifications-settings-button
        :subtitle            (i18n/label :t/local-notifications-subtitle)
        :active              notifications-enabled?
-       :on-press            (fn []
-                              (when-not notifications-enabled?
-                                (rf/dispatch
-                                 [:request-permissions
-                                  {:permissions [:post-notifications]
-                                   :on-allowed  #(log/info "push notification permissions were allowed")
-                                   :on-denied   #(log/error
-                                                  "user denied push notification permissions")}]))
-                              (rf/dispatch [:push-notifications/switch (not notifications-enabled?)]))
+       :on-press            #(rf/dispatch [:push-notifications/switch (not notifications-enabled?)])
        :accessory           :switch}]]))
 
 (defn notifications-settings

src/legacy/status_im/ui/screens/peers_stats.cljs

@@ -1,21 +1,17 @@
 (ns legacy.status-im.ui.screens.peers-stats
   (:require
-    [react-native.core :as rn]
+    [react-native.core :as react-native.core]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
+    [utils.re-frame :as re-frame]))
 
 (defn peers-stats
   []
-  (let [peers-count (rf/sub [:peer-stats/count])]
-    (rn/use-mount
-     (fn []
-       (rf/dispatch [:peer-stats/get-count])))
-
-    [rn/view
-     {:style {:flex              1
-              :margin-horizontal 8}}
-     [rn/view
+  (let [peers-count (re-frame/sub [:peers-count])]
+    [react-native.core/view
+     {:flex              1
+      :margin-horizontal 8}
+     [react-native.core/view
       {:style {:flex-direction  :row
                :margin-vertical 8
                :justify-content :space-between}}
-      [rn/text (str (i18n/label :t/peers-count) ": " peers-count)]]]))
+      [react-native.core/text (str (i18n/label :t/peers-count) ": " peers-count)]]]))

src/legacy/status_im/ui/screens/screens.cljs

@@ -53,8 +53,7 @@
   []
   [;;PROGRESS
    {:name      :progress
-    :options   {:insets {:top? true}
-                :theme  :dark}
+    :options   {:insets {:top? true}}
     :component progress/progress}
 
    ;;COMMUNITY

src/legacy/status_im/ui/screens/sync_settings/views.cljs

@@ -57,21 +57,14 @@
         :accessory-text      (cond
                                (= default-sync-period constants/two-mins)
                                (i18n/label :t/two-minutes)
-
                                (or
                                 (nil? default-sync-period)
                                 (= default-sync-period constants/one-day))
                                (i18n/label :t/one-day)
-
                                (= default-sync-period constants/three-days)
                                (i18n/label :t/three-days)
-
-                               (= default-sync-period constants/nine-days)
-                               (i18n/label :t/nine-days)
-
                                (= default-sync-period constants/one-week)
                                (i18n/label :t/one-week)
-
                                (= default-sync-period constants/one-month)
                                (i18n/label :t/one-month))}]
       [list.item/list-item

src/legacy/status_im/utils/logging/core.cljs

@@ -128,6 +128,7 @@
                                                  :current-chat-id
                                                  :network
                                                  :network-status
+                                                 :peers-count
                                                  :peers-summary
                                                  :sync-state
                                                  :view-id

src/legacy/status_im/visibility_status_updates/core.cljs

@@ -130,7 +130,7 @@
              status-type]}]
           (and
            (= status-type constants/visibility-status-inactive)
-           (pos? (:peer-stats/count db)))
+           (> (:peers-count db) 0))
           ;; Disable broadcasting further updates
           (conj {:ms 1000
                  :dispatch

src/native_module/core.cljs

@@ -636,14 +636,3 @@
                                                         connection-string
                                                         config-json
                                                         callback)))
-
-(defn create-account-from-private-key
-  "Validate that a mnemonic conforms to BIP39 dictionary/checksum standards"
-  ([private-key]
-   (native-utils/promisify-native-module-call create-account-from-private-key private-key))
-  ([private-key callback]
-   (log/debug "[native-module] create-account-from-private-key")
-
-   (.createAccountFromPrivateKey ^js (account-manager)
-                                 (types/clj->json {:privateKey private-key})
-                                 callback)))

src/quo/components/animated_header_flatlist/style.cljs

@@ -1,7 +1,6 @@
 (ns quo.components.animated-header-flatlist.style
   (:require
     [quo.foundations.colors :as colors]
-    [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]))
 
 (defn container-view
@@ -29,18 +28,16 @@
     :right            right}))
 
 (defn blur-view
-  [animation theme]
+  [animation]
   (reanimated/apply-animations-to-style
    {:opacity animation}
-   {:position         :absolute
-    :top              0
-    :left             0
-    :right            0
-    :height           100
-    :z-index          2
-    :overflow         :hidden
-    :background-color (when platform/android?
-                        (colors/theme-colors colors/white colors/neutral-80 theme))}))
+   {:position :absolute
+    :top      0
+    :left     0
+    :right    0
+    :height   100
+    :z-index  2
+    :overflow :hidden}))
 
 (defn entity-picture
   [animation theme]

src/quo/components/animated_header_flatlist/view.cljs

@@ -83,7 +83,7 @@
       {:blurAmount   32
        :blurType     :light
        :overlayColor (if platform/ios? colors/white-opa-70 :transparent)
-       :style        (style/blur-view opacity-animation theme)}
+       :style        (style/blur-view opacity-animation)}
       [reanimated/view {:style (style/header-comp translate-animation title-opacity-animation)}
        [header-comp]]]
      [reanimated/flat-list

src/quo/components/avatars/dapp_avatar/style.cljs

@@ -1,59 +1,23 @@
 (ns quo.components.avatars.dapp-avatar.style)
 
-(defn- size->int
-  [size]
-  (case size
-    :size-32 32
-    :size-64 64
-    32))
+(def ^:const size 32)
 
-(defn container
-  [size]
-  (let [container-size (size->int size)]
-    {:height container-size
-     :width  container-size}))
+(def container
+  {:height size
+   :width  size})
 
-(defn hole-view
-  [size]
-  (let [container-size (size->int size)]
-    {:width  container-size
-     :height container-size}))
+(def hole-view
+  {:width  size
+   :height size})
 
-(defn context
-  [size]
-  (let [context-size (case size
-                       :size-32 16
-                       :size-64 20
-                       20)
-        offset       (case size
-                       :size-32 -4
-                       :size-64 0
-                       -4)]
-    {:width         context-size
-     :height        context-size
-     :border-radius (/ context-size 2)
-     :position      :absolute
-     :right         offset
-     :bottom        offset}))
+(def context
+  {:width         16
+   :height        16
+   :border-radius 8
+   :position      :absolute
+   :right         -4
+   :bottom        -4})
 
-(defn context-hole
-  [size]
-  (let [context-hole-size (case size
-                            :size-32 18
-                            :size-64 24
-                            18)
-        offset            (case size
-                            :size-32 19
-                            :size-64 42
-                            19)]
-    {:x            offset
-     :y            offset
-     :width        context-hole-size
-     :height       context-hole-size
-     :borderRadius (/ context-hole-size 2)}))
-
-(defn image
-  [size]
-  (let [container-size (size->int size)]
-    {:width  container-size
-     :height container-size}))
+(def image
+  {:width  size
+   :height size})

src/quo/components/avatars/dapp_avatar/view.cljs

@@ -11,30 +11,32 @@
     [:props
      [:map {:closed true}
       [:context? {:optional true} [:maybe :boolean]]
-      [:size {:optional true} [:maybe [:enum :size-32 :size-64]]]
       [:image :schema.common/image-source]
       [:network-image {:optional true} [:maybe :schema.common/image-source]]
       [:container-style {:optional true} [:maybe :map]]]]]
    :any])
 
 (defn- view-internal
-  [{:keys [context? size image network-image container-style]}]
+  [{:keys [context? image network-image container-style]}]
   [rn/view
-   {:style               (-> (style/container size)
-                             (merge container-style))
+   {:style               (merge style/container container-style)
     :accessibility-label :dapp-avatar}
    [hole-view/hole-view
     (cond-> {:holes (if context?
-                      [(style/context-hole size)]
+                      [{:x            19
+                        :y            19
+                        :width        18
+                        :height       18
+                        :borderRadius 9}]
                       [])
-             :style (style/hole-view size)}
+             :style style/hole-view}
       platform/android? (assoc :key context?))
     [rn/image
      {:source image
-      :style  (style/image size)}]]
+      :style  style/image}]]
    (when context?
      [rn/image
       {:source network-image
-       :style  (style/context size)}])])
+       :style  style/context}])])
 
 (def view (schema/instrument #'view-internal ?schema))

src/quo/components/avatars/icon_avatar.cljs

@@ -16,7 +16,7 @@
              :icon      12}})
 
 (defn icon-avatar
-  [{:keys [size icon color opacity border? blur?]
+  [{:keys [size icon color opacity border?]
     :or   {opacity 20
            size    :size-32}}]
   (let [theme                                       (quo.theme/use-theme)
@@ -29,9 +29,7 @@
                 :height           component-size
                 :border-radius    component-size
                 :border-width     (when border? 1)
-                :border-color     (if blur?
-                                    colors/white-opa-5
-                                    (colors/theme-colors colors/neutral-20 colors/neutral-80 theme))
+                :border-color     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
                 :background-color circle-color
                 :justify-content  :center
                 :align-items      :center}}

src/quo/components/banners/alert_banner/component_spec.cljs

@@ -1,35 +0,0 @@
-(ns quo.components.banners.alert-banner.component-spec
-  (:require
-    [quo.components.banners.alert-banner.view :as alert-banner]
-    [test-helpers.component :as h]))
-
-(h/describe "Alert Banner"
-  (h/test "Render without props is not throwing any error"
-    (h/render [alert-banner/view {}])
-    (h/is-truthy (h/query-by-label-text :alert-banner)))
-
-  (h/test "Button is not displayed when :action? prop is false"
-    (h/render [alert-banner/view {}])
-    (h/is-falsy (h/query-by-label-text :button)))
-
-  (h/test "Button is displayed when :action? prop is true"
-    (h/render [alert-banner/view {:action? true}])
-    (h/is-truthy (h/query-by-label-text :button)))
-
-  (h/test "Button text is displayed when :action? prop is true and :button-text prop is set"
-    (h/render [alert-banner/view
-               {:action?     true
-                :button-text "button"}])
-    (h/is-truthy (h/get-by-text "button")))
-
-  (h/test "Button is called when it's pressed and :action? prop is true"
-    (let [event (h/mock-fn)]
-      (h/render [alert-banner/view
-                 {:action?         true
-                  :on-button-press event}])
-      (h/fire-event :press (h/query-by-label-text :button))
-      (h/was-called event)))
-
-  (h/test "Text message is displayed :text prop is passed"
-    (h/render [alert-banner/view {:text "message"}])
-    (h/is-truthy (h/get-by-text "message"))))

src/quo/components/banners/alert_banner/schema.cljs

@@ -1,12 +0,0 @@
-(ns quo.components.banners.alert-banner.schema)
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:action? {:optional true} [:maybe boolean?]]
-      [:text {:optional true} [:maybe string?]]
-      [:button-text {:optional true} [:maybe string?]]
-      [:on-button-press {:optional true} [:maybe fn?]]]]]
-   :any])

src/quo/components/banners/alert_banner/style.cljs

@@ -1,18 +0,0 @@
-(ns quo.components.banners.alert-banner.style
-  (:require [quo.foundations.colors :as colors]))
-
-(def container
-  {:flex-direction     :row
-   :align-items        :center
-   :height             50
-   :padding-horizontal 20
-   :padding-vertical   12})
-
-(defn label
-  [theme]
-  {:flex              1
-   :color             (colors/resolve-color :danger theme)
-   :margin-horizontal 4})
-
-(def button-text
-  {:color colors/white})

src/quo/components/banners/alert_banner/view.cljs

@@ -1,48 +0,0 @@
-(ns quo.components.banners.alert-banner.view
-  (:require [quo.components.banners.alert-banner.schema :as component-schema]
-            [quo.components.banners.alert-banner.style :as style]
-            [quo.components.buttons.button.view :as button]
-            [quo.components.icon :as icon]
-            [quo.components.markdown.text :as text]
-            [quo.foundations.colors :as colors]
-            [quo.theme]
-            [react-native.core :as rn]
-            [react-native.linear-gradient :as linear-gradient]
-            [schema.core :as schema]))
-
-(defn- view-internal
-  [{:keys [action? text button-text on-button-press]}]
-  (let [theme (quo.theme/use-theme)]
-    [rn/view
-     {:accessibility-label :alert-banner}
-     [linear-gradient/linear-gradient
-      {:style  style/container
-       :start  {:x 0 :y 0}
-       :end    {:x 0 :y 1}
-       :colors [(colors/theme-colors
-                 colors/danger-50-opa-5
-                 colors/danger-50-opa-10
-                 theme)
-                colors/danger-50-opa-0]}
-      [icon/icon
-       :i/alert
-       {:color (colors/resolve-color :danger theme)
-        :size  16}]
-      [text/text
-       {:style           (style/label theme)
-        :size            :paragraph-2
-        :number-of-lines 1}
-       text]
-      (when action?
-        [button/button
-         {:accessibility-label :button
-          :type                :danger
-          :size                24
-          :on-press            on-button-press}
-         [text/text
-          {:style  style/button-text
-           :size   :paragraph-2
-           :weight :medium}
-          button-text]])]]))
-
-(def view (schema/instrument #'view-internal component-schema/?schema))

src/quo/components/blur/view.cljs

@@ -1,20 +0,0 @@
-(ns quo.components.blur.view
-  (:require [quo.foundations.colors :as colors]
-            [quo.theme]
-            [react-native.blur :as blur]
-            [react-native.core :as rn]
-            [react-native.platform :as platform]))
-
-(defn- view-android
-  ([props] (view-android props nil))
-  ([{:keys [style]} child]
-   (let [theme (quo.theme/use-theme)]
-     [rn/view
-      {:style (assoc style
-                     :pointer-events :box-none
-                     :background-color
-                     (or (:background-color style)
-                         (colors/theme-colors colors/white colors/neutral-80 theme)))}
-      child])))
-
-(def view (if platform/ios? blur/view view-android))

src/quo/components/buttons/button/view.cljs

@@ -1,12 +1,12 @@
 (ns quo.components.buttons.button.view
   (:require
-    [quo.components.blur.view :as blur]
     [quo.components.buttons.button.properties :as button-properties]
     [quo.components.buttons.button.style :as style]
     [quo.components.icon :as quo.icons]
     [quo.components.markdown.text :as text]
     [quo.foundations.customization-colors :as customization-colors]
     [quo.theme]
+    [react-native.blur :as blur]
     [react-native.core :as rn]))
 
 (defn button

src/quo/components/buttons/predictive_keyboard/view.cljs

@@ -2,7 +2,7 @@
   (:require
     [quo.components.buttons.button.view :as button]
     [quo.components.buttons.predictive-keyboard.style :as style]
-    [quo.components.info.info-message.view :as info-message]
+    [quo.components.info.info-message :as info-message]
     [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
@@ -57,17 +57,17 @@
           :key-fn                            str}]
 
         :error
-        [info-message/view
-         {:icon   :i/info
-          :size   :default
-          :status :error}
+        [info-message/info-message
+         {:icon :i/info
+          :size :default
+          :type :error}
          text]
 
         :info
-        [info-message/view
-         (merge {:icon   :i/info
-                 :size   :default
-                 :status (if (= type :error) :error :default)}
+        [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-40}))

src/quo/components/buttons/slide_button/view.cljs

@@ -14,7 +14,9 @@
     [react-native.reanimated :as reanimated]))
 
 (defn drag-gesture
-  [x-pos disabled? track-width sliding-complete? set-sliding-complete on-complete reset-fn]
+  [x-pos disabled? track-width sliding-complete?
+   set-sliding-complete
+   on-complete reset-fn]
   (-> (gesture/gesture-pan)
       (gesture/with-test-ID :slide-button-gestures)
       (gesture/enabled (not disabled?))
@@ -26,8 +28,7 @@
                              (reanimated/set-shared-value x-pos clamped-x)
                              (when (and reached-end? (not sliding-complete?))
                                (set-sliding-complete true)
-                               (when on-complete
-                                 (on-complete reset-fn))))))
+                               (when on-complete (on-complete reset-fn))))))
       (gesture/on-end (fn [event]
                         (let [x-translation (oops/oget event "translationX")
                               reached-end?  (>= x-translation track-width)]
@@ -55,10 +56,9 @@
         on-track-layout               (rn/use-callback
                                        #(set-track-width (oops/oget % "nativeEvent.layout.width")))
         reset-fn                      (rn/use-callback
-                                       (fn [keep-at-end-after-slide?]
+                                       (fn []
                                          (set-sliding-complete false)
-                                         (when-not keep-at-end-after-slide?
-                                           (animations/reset-track-position x-pos))))
+                                         (animations/reset-track-position x-pos)))
         dimensions                    (rn/use-callback
                                        (partial utils/get-dimensions
                                                 (or track-width constants/default-width)
@@ -71,16 +71,14 @@
                                                 (dimensions :thumb))
                                        [dimensions])
         custom-color                  (if (= type :danger) :danger customization-color)
-        gesture                       (rn/use-memo
-                                       (fn []
-                                         (drag-gesture x-pos
-                                                       disabled?
-                                                       (dimensions :usable-track)
-                                                       sliding-complete?
-                                                       set-sliding-complete
-                                                       on-complete
-                                                       reset-fn))
-                                       [sliding-complete? disabled? on-complete])]
+        gesture                       (rn/use-memo #(drag-gesture x-pos
+                                                                  disabled?
+                                                                  (dimensions :usable-track)
+                                                                  sliding-complete?
+                                                                  set-sliding-complete
+                                                                  on-complete
+                                                                  reset-fn)
+                                                   [sliding-complete? disabled?])]
     [gesture/gesture-detector
      {:gesture gesture}
      [reanimated/view

src/quo/components/drawers/action_drawers/view.cljs

@@ -8,11 +8,10 @@
     [react-native.core :as rn]))
 
 (defn- get-icon-color
-  [blur? danger? theme]
-  (cond
-    danger? (colors/theme-colors colors/danger-50 colors/danger-60 theme)
-    blur?   colors/white-opa-70
-    :else   (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
+  [danger? theme]
+  (if danger?
+    (colors/theme-colors colors/danger-50 colors/danger-60 theme)
+    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
 
 (defn- divider
   [theme blur?]
@@ -52,7 +51,7 @@
            :accessible          true
            :style               (style/left-icon sub-label)}
           [icon/icon icon
-           {:color    (or icon-color (get-icon-color blur? danger? theme))
+           {:color    (or icon-color (get-icon-color danger? theme))
             :no-color no-icon-color?
             :size     20}]])
        [rn/view
@@ -85,7 +84,7 @@
               :accessible          true
               :accessibility-label :right-icon-for-action}
              [icon/icon right-icon
-              {:color (get-icon-color blur? danger? theme)
+              {:color (get-icon-color danger? theme)
                :size  20}]])
           (when (= state :selected)
             [rn/view {:style style/right-icon}

src/quo/components/drawers/bottom_actions/style.cljs

@@ -20,9 +20,8 @@
   {:background-color (when-not (or scroll? blur?)
                        (colors/theme-colors colors/white colors/neutral-95 theme))})
 
-(defn buttons-container
-  [actions]
-  {:flex-direction     (if (= actions :two-vertical-actions) :column :row)
+(def buttons-container
+  {:flex-direction     :row
    :justify-content    :space-around
    :padding-vertical   12
    :gap                12

src/quo/components/drawers/bottom_actions/view.cljs

@@ -4,7 +4,6 @@
     [quo.components.drawers.bottom-actions.style :as style]
     [quo.components.icon :as icon]
     [quo.components.markdown.text :as text]
-    [quo.components.tags.context-tag.schema :as context-tag.schema]
     [quo.components.tags.context-tag.view :as context-tag]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
@@ -17,13 +16,12 @@
    [:catn
     [:props
      [:map {:closed true}
-      [:actions [:maybe [:enum :one-action :two-actions :two-vertical-actions]]]
+      [:actions [:maybe [:enum :one-action :two-actions]]]
       [:description {:optional true} [:maybe [:enum :top :bottom :top-error]]]
-      [:description-text {:optional true} [:maybe [:or :string :schema.common/hiccup]]]
+      [:description-text {:optional true} [:maybe :string]]
       [:description-top-text {:optional true} [:maybe :string]]
       [:error-message {:optional true} [:maybe :string]]
       [:role {:optional true} [:maybe [:enum :admin :member :token-master :owner]]]
-      [:context-tag-props {:optional true} [:maybe context-tag.schema/?schema]]
       [:button-one-label {:optional true} [:maybe :string]]
       [:button-two-label {:optional true} [:maybe :string]]
       [:button-one-props {:optional true} [:maybe :map]]
@@ -41,8 +39,7 @@
 
 (defn- view-internal
   [{:keys [actions description description-text description-top-text error-message role button-one-label
-           button-two-label blur? button-one-props button-two-props scroll? container-style
-           context-tag-props]}]
+           button-two-label blur? button-one-props button-two-props scroll? container-style]}]
   (let [theme (quo.theme/use-theme)]
     [rn/view
      {:style (merge (style/container scroll? blur? theme) container-style)}
@@ -57,24 +54,21 @@
           :style {:color (colors/theme-colors colors/danger-50 colors/danger-60 theme)}}
          error-message]])
 
-     (when (and (= description :top) (or role context-tag-props))
+     (when (and (= description :top) role)
        [rn/view {:style style/description-top}
         [text/text
          {:size  :paragraph-2
           :style (style/description-top-text scroll? blur? theme)}
          (or description-top-text (i18n/label :t/eligible-to-join-as))]
         [context-tag/view
-         (if role
-           {:type    :icon
-            :size    24
-            :icon    (role role-icon)
-            :blur?   blur?
-            :context (i18n/label (keyword "t" role))}
-           context-tag-props)]])
+         {:type    :icon
+          :size    24
+          :icon    (role role-icon)
+          :blur?   blur?
+          :context (i18n/label (keyword "t" role))}]])
 
-     [rn/view {:style (style/buttons-container actions)}
-      (when (or (= actions :two-actions)
-                (= actions :two-vertical-actions))
+     [rn/view {:style style/buttons-container}
+      (when (= actions :two-actions)
         [button/button
          (merge
           {:size                40
@@ -94,10 +88,8 @@
         button-one-props)
        button-one-label]]
      (when (= description :bottom)
-       (if (string? description-text)
-         [text/text
-          {:size  :paragraph-2
-           :style (style/description-bottom scroll? blur? theme)} description-text]
-         description-text))]))
+       [text/text
+        {:size  :paragraph-2
+         :style (style/description-bottom scroll? blur? theme)} description-text])]))
 
 (def view (schema/instrument #'view-internal ?schema))

src/quo/components/drawers/drawer_action/component_spec.cljs

@@ -47,14 +47,6 @@
     (h/has-style (h/query-by-label-text :container)
                  {:backgroundColor :transparent}))
 
-  (h/test "render :input action"
-    (h/render-with-theme-provider
-     [drawer-action/view
-      {:action      :input
-       :input-props {:placeholder "Type something"}
-       :state       :selected}])
-    (h/is-truthy (h/query-by-label-text "input")))
-
   (h/test "render default action with icon, title, description"
     (h/render-with-theme-provider [drawer-action/view
                                    {:icon        :i/contact

src/quo/components/drawers/drawer_action/schema.cljs

@@ -6,13 +6,12 @@
     [:map {:closed true}
      [:accessibility-label {:optional true} [:maybe :keyword]]
      [:type {:optional true} [:maybe [:enum :main :danger]]]
-     [:action {:optional true} [:maybe [:enum :arrow :toggle :input]]]
+     [:action {:optional true} [:maybe [:enum :arrow :toggle]]]
      [:icon {:optional true} [:maybe :keyword]]
      [:description {:optional true} [:maybe :string]]
      [:state {:optional true} [:maybe [:enum :selected]]]
      [:title {:optional true} :string]
      [:on-press {:optional true} [:maybe fn?]]
-     [:input-props {:optional true} [:maybe :map]]
      [:customization-color {:optional true}
       [:maybe :schema.common/customization-color]]
      [:blur? {:optional true} [:maybe :boolean]]]]

src/quo/components/drawers/drawer_action/style.cljs

@@ -4,7 +4,7 @@
 
 (defn- background-color
   [{:keys [state action customization-color theme pressed? blur?]}]
-  (let [checked? (and (= :selected state) (or (nil? action) (= action :input)))]
+  (let [checked? (and (= :selected state) (nil? action))]
     (cond
       (and (or checked? pressed?) blur?)
       colors/white-opa-5
@@ -15,25 +15,23 @@
       :else :transparent)))
 
 (defn container
-  [{:keys [description? action state] :as props}]
-  {:padding-top        (if description? 8 13)
-   :padding-bottom     (if (and (= action :input)
-                                (= state :selected))
-                         12
-                         (if description? 8 13))
+  [{:keys [description?] :as props}]
+  {:flex-direction     :row
+   :align-items        :center
+   :padding-vertical   (if description? 8 13)
    :padding-horizontal 13
    :border-radius      12
-   :gap                8
    :background-color   (background-color props)})
 
-(def text-container
+(defn text-container
+  []
   {:flex         1
    :margin-right 12})
 
 (defn text
   [{:keys [theme blur? type]}]
   (let [base {:weight :medium}
-        theme-with-blur (if blur? :blur theme)
+        theme-with-blur (if blur? :blue theme)
         matcher [theme-with-blur type]
         color
         (case matcher
@@ -53,7 +51,8 @@
     colors/white-70-blur
     (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
 
-(def left-icon
+(defn left-icon
+  []
   {:align-self   :flex-start
    :margin-right 13
    :margin-top   1})

src/quo/components/drawers/drawer_action/view.cljs

@@ -3,7 +3,6 @@
     [quo.components.drawers.drawer-action.schema :as component-schema]
     [quo.components.drawers.drawer-action.style :as style]
     [quo.components.icon :as icon]
-    [quo.components.inputs.input.view :as input]
     [quo.components.markdown.text :as text]
     [quo.components.selectors.selectors.view :as selectors]
     [quo.theme]
@@ -12,7 +11,7 @@
 
 (defn view-internal
   [{:keys       [action icon description state title on-press customization-color
-                 blur? accessibility-label input-props]
+                 blur? accessibility-label]
     action-type :type
     :or         {customization-color :blue
                  blur?               false}}]
@@ -21,7 +20,6 @@
         [pressed? set-pressed] (rn/use-state false)
         on-press-in            (rn/use-callback #(set-pressed true))
         on-press-out           (rn/use-callback #(set-pressed false))]
-
     [rn/pressable
      {:on-press            on-press
       :on-press-in         on-press-in
@@ -34,59 +32,50 @@
                                              :description?        (not-empty description)
                                              :blur?               blur?})
       :accessibility-label accessibility-label}
+     (when icon
+       [icon/icon icon
+        {:accessibility-label :left-icon
+         :container-style     (style/left-icon)
+         :color               (style/icon-color {:theme theme
+                                                 :type  action-type
+                                                 :blur? blur?})}])
+
      [rn/view
-      {:style {:flex-direction :row
-               :align-items    :center}}
-      (when icon
-        [icon/icon icon
-         {:accessibility-label :left-icon
-          :container-style     style/left-icon
-          :color               (style/icon-color {:theme theme
-                                                  :type  action-type
-                                                  :blur? blur?})}])
+      {:style (style/text-container)}
+      [text/text
+       (style/text {:theme theme
+                    :type  action-type
+                    :blur? blur?})
+       title]
 
-      [rn/view
-       {:style style/text-container}
-       [text/text
-        (style/text {:theme theme
-                     :type  action-type
-                     :blur? blur?})
-        title]
+      (when (seq description)
+        [text/text
+         {:size  :paragraph-2
+          :style (style/desc {:theme theme
+                              :blur? blur?})}
+         description])]
 
-       (when (seq description)
-         [text/text
-          {:size  :paragraph-2
-           :style (style/desc {:theme theme
-                               :blur? blur?})}
-          description])]
+     (cond
+       (= action :toggle)
+       [selectors/view
+        {:theme               theme
+         :label-prefix        "toggle"
+         :customization-color customization-color
+         :type                :toggle
+         :checked?            (= state :selected)}]
 
-      (cond
-        (= action :toggle)
-        [selectors/view
-         {:theme               theme
-          :label-prefix        "toggle"
-          :customization-color customization-color
-          :type                :toggle
-          :checked?            (= state :selected)}]
+       (= action :arrow)
+       [icon/icon :i/chevron-right
+        {:accessibility-label :arrow-icon
+         :color               (style/icon-color {:theme theme
+                                                 :type  action-type
+                                                 :blur? blur?})}]
 
-        (= action :arrow)
-        [icon/icon :i/chevron-right
-         {:accessibility-label :arrow-icon
-          :color               (style/icon-color {:theme theme
-                                                  :type  action-type
-                                                  :blur? blur?})}]
-
-        (= state :selected)
-        [icon/icon :i/check
-         {:accessibility-label :check-icon
-          :color               (style/check-color {:theme               theme
-                                                   :blur?               blur?
-                                                   :customization-color customization-color})}])]
-
-     (when (and (= action :input) (= state :selected))
-       [input/input
-        (assoc input-props
-               :blur?               blur?
-               :accessibility-label :input)])]))
+       (= state :selected)
+       [icon/icon :i/check
+        {:accessibility-label :check-icon
+         :color               (style/check-color {:theme               theme
+                                                  :blur?               blur?
+                                                  :customization-color customization-color})}])]))
 
 (def view (schema/instrument #'view-internal component-schema/?schema))

src/quo/components/drawers/drawer_buttons/view.cljs

@@ -1,10 +1,10 @@
 (ns quo.components.drawers.drawer-buttons.view
   (:require
-    [quo.components.blur.view :as blur]
     [quo.components.drawers.drawer-buttons.style :as style]
     [quo.components.icon :as icon]
     [quo.components.markdown.text :as text]
     [quo.foundations.colors :as colors]
+    [react-native.blur :as blur]
     [react-native.core :as rn]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]

src/quo/components/drawers/drawer_top/view.cljs

@@ -18,7 +18,7 @@
 
 (defn- left-image
   [{:keys [type customization-color account-avatar-emoji account-avatar-type icon-avatar
-           profile-picture blur?]}]
+           profile-picture]}]
   (case type
     :account         [account-avatar/view
                       {:customization-color customization-color
@@ -28,7 +28,6 @@
     :keypair         [icon-avatar/icon-avatar
                       {:icon    icon-avatar
                        :border? true
-                       :blur?   blur?
                        :color   :neutral}]
 
     :default-keypair [user-avatar/user-avatar
@@ -214,7 +213,6 @@
        [rn/view {:style style/left-container}
         [left-image
          {:type                 type
-          :blur?                blur?
           :customization-color  customization-color
           :account-avatar-emoji account-avatar-emoji
           :account-avatar-type  account-avatar-type

src/quo/components/drawers/permission_context/style.cljs

@@ -1,13 +1,12 @@
 (ns quo.components.drawers.permission-context.style
   (:require
     [quo.foundations.colors :as colors]
-    [react-native.platform :as platform]
     [react-native.safe-area :as safe-area]))
 
 (def ^:private radius 20)
 
 (def blur-container
-  {:background-color (when platform/ios? :transparent)
+  {:background-color :transparent
    :position         :absolute
    :top              0
    :left             0

src/quo/components/drawers/permission_context/view.cljs

@@ -1,7 +1,6 @@
 (ns quo.components.drawers.permission-context.view
   (:require
     [clojure.string :as string]
-    [quo.components.blur.view :as blur]
     [quo.components.buttons.button.view :as button]
     [quo.components.drawers.permission-context.schema :as component-schema]
     [quo.components.drawers.permission-context.style :as style]
@@ -11,6 +10,7 @@
     [quo.components.tags.token-tag.view :as token-tag]
     [quo.foundations.colors :as colors]
     [quo.theme]
+    [react-native.blur :as blur]
     [react-native.core :as rn]
     [react-native.platform :as platform]
     [react-native.shadow :as shadow]

src/quo/components/dropdowns/dropdown/view.cljs

@@ -1,12 +1,12 @@
 (ns quo.components.dropdowns.dropdown.view
   (:require
-    [quo.components.blur.view :as blur]
     [quo.components.dropdowns.dropdown.properties :as properties]
     [quo.components.dropdowns.dropdown.style :as style]
     [quo.components.icon :as icon]
     [quo.components.markdown.text :as text]
     [quo.foundations.customization-colors :as customization-colors]
     [quo.theme]
+    [react-native.blur :as blur]
     [react-native.core :as rn]))
 
 (defn view

src/quo/components/info/info_message.cljs

@@ -0,0 +1,48 @@
+(ns quo.components.info.info-message
+  (:require
+    [quo.components.icon :as quo.icons]
+    [quo.components.markdown.text :as text]
+    [quo.foundations.colors :as colors]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]))
+
+(defn get-color
+  [k theme]
+  (case k
+    :success (colors/resolve-color :success theme)
+    :error   (colors/resolve-color :danger theme)
+    :warning (colors/resolve-color :warning theme)
+    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
+
+(defn info-message
+  "[info-message opts \"message\"]
+  opts
+  {:type           :default/:success/:error
+   :size           :default/:tiny
+   :icon           :i/info       ;; info message icon
+   :text-color     colors/white  ;; text color override
+   :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 accessibility-label
+           container-style]} message]
+  (let [theme      (quo.theme/use-theme)
+        weight     (if (= size :default) :regular :medium)
+        icon-size  (if (= size :default) 16 12)
+        size       (if (= size :default) :paragraph-2 :label)
+        text-color (or text-color (get-color type theme))
+        icon-color (or icon-color text-color)]
+    [rn/view
+     {:style (merge {:flex-direction :row
+                     :align-items    :center}
+                    style
+                    container-style)}
+     [quo.icons/icon icon
+      {:color    icon-color
+       :no-color no-icon-color?
+       :size     icon-size}]
+     [text/text
+      {:accessibility-label accessibility-label
+       :size                size
+       :weight              weight
+       :style               {:color             text-color
+                             :margin-horizontal 4}} message]]))

src/quo/components/info/info_message/component_spec.cljs

@@ -1,32 +0,0 @@
-(ns quo.components.info.info-message.component-spec
-  (:require
-    [quo.components.info.info-message.view :as info-message]
-    [test-helpers.component :as h]))
-
-(h/describe "Info: Info Message"
-  (h/test "basic render"
-    (h/render-with-theme-provider
-     [info-message/view
-      {:status              :default
-       :size                :default
-       :accessibility-label :info-message
-       :icon                :i/placeholder} "Message"])
-    (h/is-truthy (h/get-by-label-text :info-message)))
-
-  (h/test "render with correct message"
-    (h/render-with-theme-provider
-     [info-message/view
-      {:status              :default
-       :size                :default
-       :accessibility-label :info-message
-       :icon                :i/placeholder} "Message"])
-    (h/is-truthy (h/get-by-text "Message")))
-
-  (h/test "render icon"
-    (h/render-with-theme-provider
-     [info-message/view
-      {:status              :default
-       :size                :default
-       :accessibility-label :info-message
-       :icon                :i/placeholder} "Message"])
-    (h/is-truthy (h/get-by-label-text :icon))))

src/quo/components/info/info_message/style.cljs

@@ -1,6 +0,0 @@
-(ns quo.components.info.info-message.style)
-
-(def container
-  {:flex-direction :row
-   :gap            4
-   :align-items    :center})

src/quo/components/info/info_message/view.cljs

@@ -1,53 +0,0 @@
-(ns quo.components.info.info-message.view
-  (:require [quo.components.icon :as icons]
-            [quo.components.info.info-message.style :as style]
-            [quo.components.markdown.text :as text]
-            [quo.foundations.colors :as colors]
-            [quo.theme :as quo.theme]
-            [react-native.core :as rn]
-            [schema.core :as schema]))
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:status {:optional true} [:maybe [:enum :default :success :error :warning]]]
-      [:size {:optional true} [:maybe [:enum :default :tiny]]]
-      [:blur? {:optional true} [:maybe :boolean]]
-      [:icon :keyword]
-      [:color {:optional true} [:maybe :string]]
-      [:text-color {:optional true} [:maybe :string]]
-      [:icon-color {:optional true} [:maybe :string]]
-      [:no-icon-color? {:optional true} [:maybe :boolean]]
-      [:accessibility-label {:optional true} [:maybe :keyword]]
-      [:container-style {:optional true} [:maybe :map]]]]
-    [:message :string]]
-   :any])
-
-(defn- get-color
-  [status theme blur?]
-  (case status
-    :success (if blur? colors/success-60 (colors/resolve-color :success theme))
-    :error   (if blur? colors/danger-60 (colors/resolve-color :danger theme))
-    :warning (if blur? colors/warning-60 (colors/resolve-color :warning theme))
-    (if blur? colors/white-opa-40 (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))))
-
-(defn view-internal
-  [{:keys [status size blur? icon color icon-color text-color no-icon-color? container-style
-           accessibility-label]} message]
-  (let [theme         (quo.theme/use-theme)
-        default-color (get-color status theme blur?)
-        text-color    (or text-color color default-color)
-        icon-color    (or icon-color color default-color)]
-    [rn/view {:style (merge style/container container-style)}
-     [icons/icon icon
-      {:size      (if (= size :tiny) 12 16)
-       :color     icon-color
-       :no-color? no-icon-color?}]
-     [text/text
-      {:size                (if (= size :tiny) :label :paragraph-2)
-       :accessibility-label accessibility-label
-       :style               {:color text-color}} message]]))
-
-(def view (schema/instrument #'view-internal ?schema))

src/quo/components/inputs/search_input/style.cljs

@@ -4,19 +4,19 @@
     [quo.foundations.colors :as colors]))
 
 (defn placeholder-color
-  [state blur? theme]
+  [state blur? override-theme]
   (cond
     (and blur? (= state :active))
-    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 theme)
+    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 override-theme)
 
     blur? ; state is default
-    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 theme)
+    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 override-theme)
 
     (= state :active)
-    (colors/theme-colors colors/neutral-30 colors/neutral-60 theme)
+    (colors/theme-colors colors/neutral-30 colors/neutral-60 override-theme)
 
     :else ; Not blur and state is default
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)))
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
 
 (def clear-icon-container
   {:justify-content :center
@@ -26,14 +26,16 @@
    :width           20})
 
 (defn clear-icon
-  [blur? theme]
+  [blur? override-theme]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-30 colors/white-opa-10 theme)
-    (colors/theme-colors colors/neutral-40 colors/neutral-60 theme)))
+    (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)))
 
 (defn cursor
-  [customization-color theme]
-  (colors/resolve-color customization-color theme))
+  [customization-color override-theme]
+  (colors/theme-colors (colors/custom-color customization-color 50)
+                       (colors/custom-color customization-color 60)
+                       override-theme))
 
 (def tag-separator {:width 8})
 
@@ -59,10 +61,10 @@
    :justify-content :flex-start})
 
 (defn input-text
-  [disabled? theme]
+  [disabled?]
   (assoc (text/text-style {:size   :paragraph-1
                            :weight :regular}
-                          theme)
+                          nil)
          :flex             1
          :padding-vertical 5
          :min-width        120

src/quo/components/inputs/search_input/view.cljs

@@ -4,7 +4,6 @@
     [quo.components.icon :as icon]
     [quo.components.inputs.search-input.style :as style]
     [quo.foundations.colors :as colors]
-    [quo.theme]
     [react-native.core :as rn]))
 
 (def ^:private tag-separator [rn/view {:style style/tag-separator}])
@@ -16,12 +15,12 @@
         tags-coll))
 
 (defn- clear-button
-  [{:keys [on-press blur? theme]}]
+  [{:keys [on-press blur? override-theme]}]
   [rn/touchable-opacity
    {:style    style/clear-icon-container
     :on-press on-press}
    [icon/icon :i/clear
-    {:color (style/clear-icon blur? theme)
+    {:color (style/clear-icon blur? override-theme)
      :size  20}]])
 
 (defn- handle-backspace
@@ -32,7 +31,7 @@
 
 (def ^:private props-to-remove
   [:cursor-color :placeholder-text-color :editable :on-change-text :on-focus
-   :on-blur :on-clear :value :tags :disabled? :blur? :customization-color])
+   :on-blur :on-clear :value :tags :disabled? :blur? :customization-color :override-theme])
 
 (defn- add-children
   [text-input children]
@@ -41,13 +40,12 @@
     text-input))
 
 (defn search-input
-  [{:keys [value tags disabled? blur? on-change-text customization-color show-clear-button?
-           on-clear on-focus on-blur container-style]
+  [{:keys [value tags disabled? blur? on-change-text customization-color
+           on-clear on-focus on-blur override-theme container-style]
     :or   {customization-color :blue}
     :as   props}
    & children]
-  (let [theme              (quo.theme/use-theme)
-        [state set-state]  (rn/use-state :default)
+  (let [[state set-state]  (rn/use-state :default)
         on-focus           (rn/use-callback
                             (fn []
                               (set-state :active)
@@ -74,20 +72,20 @@
         [inner-tags tags])
       (add-children
        [rn/text-input
-        (cond-> {:style                  (style/input-text disabled? theme)
-                 :cursor-color           (style/cursor customization-color theme)
-                 :placeholder-text-color (style/placeholder-color state blur? theme)
+        (cond-> {:style                  (style/input-text disabled?)
+                 :cursor-color           (style/cursor customization-color override-theme)
+                 :placeholder-text-color (style/placeholder-color state blur? override-theme)
                  :editable               (not disabled?)
                  :on-key-press           on-key-press
-                 :keyboard-appearance    (colors/theme-colors :light :dark theme)
+                 :keyboard-appearance    (colors/theme-colors :light :dark override-theme)
                  :on-change-text         on-change-text
                  :on-focus               on-focus
                  :on-blur                on-blur}
           use-value?        (assoc :value value)
           (seq clean-props) (merge clean-props))]
        (when-not use-value? children))]
-     (when (or (seq value) (seq children) show-clear-button?)
+     (when (or (seq value) (seq children))
        [clear-button
-        {:on-press on-clear
-         :blur?    blur?
-         :theme    theme}])]))
+        {:on-press       on-clear
+         :blur?          blur?
+         :override-theme override-theme}])]))

src/quo/components/inputs/title_input/component_spec.cljs

@@ -13,7 +13,7 @@
                {:value      ""
                 :max-length 24}])
     (h/fire-event :on-focus (h/query-by-label-text :profile-title-input))
-    (-> (h/wait-for #(h/get-by-text "0"))
+    (-> (h/wait-for #(h/get-by-text "00"))
         (.then #(h/is-truthy (h/query-by-text "/24")))))
 
   (h/test "renders with max length digits and character count"
@@ -22,7 +22,7 @@
                 :max-length    24}
                "abc"])
     (h/fire-event :on-focus (h/query-by-label-text :profile-title-input))
-    (-> (h/wait-for #(h/get-by-text "3"))
+    (-> (h/wait-for #(h/get-by-text "03"))
         (.then #(h/is-truthy (h/query-by-text "/24")))))
 
   (h/test "text updates on change"

src/quo/components/inputs/title_input/view.cljs

@@ -71,7 +71,9 @@
          [text/text
           {:style (style/char-count blur? theme)
            :size  :paragraph-2}
-          (str (count value))]
+          (pad-0
+           (str
+            (count value)))]
          [text/text
           {:style (style/char-count blur? theme)
            :size  :paragraph-2}

src/quo/components/list_items/account/view.cljs

@@ -30,7 +30,10 @@
                                 (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))
          :container-style     style/title-icon-container
          :accessibility-label :title-icon}])]
-    [address-text/view (assoc account-props :format :short)]]])
+    [address-text/view
+     {:networks (:networks account-props)
+      :address  (:address account-props)
+      :format   :short}]]])
 
 (defn- balance-view
   [{:keys [balance-props type theme]}]

src/quo/components/list_items/account_list_card/view.cljs

@@ -31,8 +31,7 @@
          :size   :paragraph-2}
         (:name account-props)]
        [address-text/view
-        {:blur?    blur?
-         :networks networks
+        {:networks networks
          :address  (:address account-props)
          :format   :short}]]]
      (when (= action :icon)

src/quo/components/list_items/dapp/style.cljs

@@ -34,8 +34,7 @@
 
 (def container-info
   {:flex-direction :row
-   :align-items    :center
-   :flex           1})
+   :align-items    :center})
 
 (def user-info
   {:margin-left 8})

src/quo/components/list_items/dapp/view.cljs

@@ -25,16 +25,14 @@
         :style  {:width 32 :height 32}}]
       [rn/view {:style style/user-info}
        [text/text
-        {:weight          :semi-bold
-         :size            :paragraph-1
-         :number-of-lines 1
-         :style           (style/style-text-name theme)}
+        {:weight :semi-bold
+         :size   :paragraph-1
+         :style  (style/style-text-name theme)}
         (:name dapp)]
        [text/text
-        {:weight          :regular
-         :size            :paragraph-2
-         :number-of-lines 1
-         :style           (style/style-text-value theme)}
+        {:weight :regular
+         :size   :paragraph-2
+         :style  (style/style-text-value theme)}
         (:value dapp)]]]
      (when right-component
        [right-component dapp])]))

src/quo/components/list_items/missing_keypair/view.cljs

@@ -11,8 +11,8 @@
     [schema.core :as schema]))
 
 (defn- internal-view
-  [{{:keys [accounts name type]} :keypair
-    :keys                        [keypair blur? on-options-press]}]
+  [{{:keys [accounts name]} :keypair
+    :keys                   [keypair blur? on-options-press]}]
   (let [theme                    (quo.theme/use-theme)
         on-keypair-options-press (rn/use-callback
                                   (fn [event]
@@ -22,15 +22,15 @@
      {:style               (style/container {:theme theme
                                              :blur? blur?})
       :accessibility-label :missing-keypair-item}
-     [icon-avatar/icon-avatar
-      {:size    :size-32
-       :icon    (case type
-                  :seed :i/seed
-                  :key  :i/password
-                  nil)
-       :color   :neutral
-       :blur?   true
-       :border? true}]
+     [rn/view
+      {:style               (style/icon-container {:theme theme
+                                                   :blur? blur?})
+       :accessibility-label :icon}
+      [icon-avatar/icon-avatar
+       {:size    :size-32
+        :icon    :i/seed
+        :color   :neutral
+        :border? false}]]
      [rn/view
       {:style               style/name-container
        :accessibility-label :name}

src/quo/components/list_items/network_list/view.cljs

@@ -44,14 +44,13 @@
       [:label :string]
       [:fiat-value :string]
       [:token-value :string]
-      [:container-style {:optional true} [:maybe :map]]
       [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
       [:state {:optional true} [:enum :pressed :active :disabled :default]]
       [:on-press {:optional true} [:maybe fn?]]]]]
    :any])
 
 (defn- view-internal
-  [{:keys [on-press container-style state customization-color]
+  [{:keys [on-press state customization-color]
     :as   props
     :or   {customization-color :blue}}]
   (let [theme                  (quo.theme/use-theme)
@@ -60,8 +59,7 @@
         on-press-out           (rn/use-callback #(set-pressed false))
         internal-state         (if pressed? :pressed state)]
     [rn/pressable
-     {:style               (merge (style/container internal-state customization-color theme)
-                                  container-style)
+     {:style               (style/container internal-state customization-color theme)
       :on-press-in         (when-not (= state :disabled) on-press-in)
       :on-press-out        (when-not (= state :disabled) on-press-out)
       :on-press            (when-not (= state :disabled) on-press)

src/quo/components/list_items/user.cljs

@@ -8,7 +8,7 @@
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]))
 
-(def container
+(def container-style
   {:margin-horizontal  8
    :padding-vertical   8
    :padding-horizontal 12
@@ -43,9 +43,9 @@
 (defn user
   [{:keys [short-chat-key primary-name secondary-name photo-path online? contact? verified?
            untrustworthy? on-press on-long-press accessory customization-color theme
-           allow-multiple-presses? disabled? container-style]}]
+           allow-multiple-presses? disabled?]}]
   [rn/touchable-highlight
-   {:style                   (merge container container-style)
+   {:style                   container-style
     :underlay-color          (colors/resolve-color customization-color theme 5)
     :allow-multiple-presses? allow-multiple-presses?
     :accessibility-label     :user-list

src/quo/components/navigation/page_nav/view.cljs

@@ -25,12 +25,12 @@
    :blur        :grey})
 
 (defn- page-nav-base
-  [{:keys [margin-top background on-press accessibility-label icon-name behind-overlay? align-center?]
+  [{:keys [margin-top background on-press accessibility-label icon-name behind-overlay?]
     :or   {background :white}}
    & children]
   (into [rn/view {:style (style/container margin-top)}
          (when icon-name
-           [rn/view (when align-center? {:style style/icon-container})
+           [rn/view {:style style/icon-container}
             [button/button
              {:type                (button-type background)
               :icon-only?          true