Improvements

In this commit we nuke the unmaintained library `react-native-mail` and move over the logic to our native modules.
This also helps to fix `make nix-update-gradle` which would fail because of that library.

- Android
- iOS

status: ready

.env

@@ -35,4 +35,4 @@ LOCAL_PAIRING_ENABLED=1
 TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
-SHOW_NOT_IMPLEMENTED_FEATURES=1
+SHOW_NOT_IMPLEMENTED_FEATURES=0

.env.e2e

@@ -35,3 +35,5 @@ LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=1
+DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000
+DELETE_MESSAGE_UNDO_TIME_LIMIT=10000

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,13 @@
           xmlns:tools="http://schemas.android.com/tools"
           android:installLocation="auto">
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.SEND_MULTIPLE" />
+            <data android:mimeType="*/*" />
+        </intent>
+    </queries>
+
     <!-- non-dangerous permissions -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>

ci/tests/Jenkinsfile.e2e-nightly

@@ -36,6 +36,12 @@ pipeline {
     ))
   }
 
+  environment {
+    /* Avoid race conditions with other builds using virtualenv. */
+    VIRTUAL_ENV = "${WORKSPACE_TMP}/venv"
+    PATH = "${VIRTUAL_ENV}/bin:${PATH}"
+  }
+
   stages {
     stage('Fetch') {
       steps { script {
@@ -52,7 +58,8 @@ pipeline {
     stage('Setup') {
       steps { script {
         dir('test/appium') {
-          sh 'pip3 install --user -r requirements.txt'
+          sh "python3 -m venv ${VIRTUAL_ENV}"
+          sh 'pip3 install -r requirements.txt'
         }
       } }
     }

ci/tests/Jenkinsfile.e2e-prs

@@ -54,6 +54,12 @@ pipeline {
     ))
   }
 
+  environment {
+    /* Avoid race conditions with other builds using virtualenv. */
+    VIRTUAL_ENV = "${WORKSPACE_TMP}/venv"
+    PATH = "${VIRTUAL_ENV}/bin:${PATH}"
+  }
+
   stages {
     stage('Prep') {
       steps { script {
@@ -79,7 +85,8 @@ pipeline {
     stage('Setup') {
       steps { script {
         dir('test/appium') {
-          sh 'pip3 install --user -r requirements.txt'
+          sh "python3 -m venv ${VIRTUAL_ENV}"
+          sh 'pip3 install -r requirements.txt'
         }
       } }
     }

ci/tests/Jenkinsfile.e2e-upgrade

@@ -35,6 +35,11 @@ pipeline {
     ))
   }
 
+  environment {
+    /* Avoid race conditions with other builds using virtualenv. */
+    VIRTUAL_ENV = "${WORKSPACE_TMP}/venv"
+    PATH = "${VIRTUAL_ENV}/bin:${PATH}"
+  }
 
   stages {
     stage('Prep') {
@@ -51,7 +56,8 @@ pipeline {
     stage('Setup') {
       steps { script {
         dir('test/appium') {
-          sh 'pip3 install --user -r requirements.txt'
+          sh "python3 -m venv ${VIRTUAL_ENV}"
+          sh 'pip3 install -r requirements.txt'
         }
       } }
     }

doc/pipeline_process.md

@@ -8,7 +8,7 @@ The generally accepted requirements for its use are described below:
 - Once a PR is created, it moves to the ```REVIEW``` column where a review will be requested automatically.
 - You can also request a review inside the PR from a particular person if needed.
 - When creating a PR, do not forget to assign it to yourself.
-- Also in case the PR adds new functionality, a short description would be appreciated.
+- Also in case the PR adds new functionality, a description **MUST** be added.
 
 ### What if the work is still in progress?
 
@@ -28,26 +28,11 @@ Ready for testing, a PR should meet the following criteria:
 4. Has the label: `request-manual-qa` or `skip-manual-qa`.
 5. PRs **MUST** identify what area is affected and should have a description.
 
-**NOTE:** Make sure that QAs are OK with that
-
-### Adding `skip-manual-qa`
-
-- Please ask another team member before adding the `skip-manual-qa` label (PR/Status community/DMs) so that there's a second opinion.
-- The PR MUST have a proper reasoning why manual QA is skipped.
-- The PR MUST include the steps of testing that has been done by the developer prior to moving it forward.
-**From the perspective of a developer it means that once work on PR is finished:**
-
-1. It should be rebased to the latest `develop`. If there are conflicts - they should be resolved if possible.
-2. If the PR was in the `Contributor` column - it should be moved to `Review` column.
-3. Wait for the review.
-4. Make sure that after review and before requesting manual QA your PR is rebased to current develop.
-5. The PR **MUST** be moved to the E2E column when it is ready for testing (**mandatory for all PRs**).
-That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
-
-6. After that - PR will be taken into manual testing by the QA team.
 
 ### E2E tests and analyzing the results
 
+The PR **MUST** be moved to the E2E column when it is ready for testing (**mandatory for all PRs**).
+That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
 This step cannot be skipped. So, at least one comment from the `status-im-auto` bot with results is a prerequisite for moving forward.
 Information on how to analyze tests can be found [here](https://github.com/status-im/status-mobile/blob/develop/doc/how-to-launch-e2e.md).
 Tests might be flaky, as they depend on infrastructure - SauceLabs and Waku.
@@ -59,6 +44,20 @@ Please, respect this rule.**
 
 ## Testing PR
 
+### Adding `skip-manual-qa`
+
+**Do not hesitate to use a `skip-manual-qa`** if you're sure that it is a simple flow and you checked it. 
+- Please ask another team member before adding the `skip-manual-qa` label (PR/Status community/DMs) so that there's a second opinion.
+- The PR MUST have a proper reasoning why manual QA is skipped.
+- The PR MUST include the steps of testing that has been done by the developer prior to moving it forward.
+
+**NOTE:** Make sure that QAs are OK with that;
+
+Before merging PRs, please make sure that information is added about how you tested the PRs, that e2s have been passed and their results have been reviewed. 
+
+The QA team appreciates your help!
+
+
 ### Manual testing
 
 #### Prerequisites for manual testing
@@ -99,7 +98,7 @@ There are three possible scenarios when the design review is completed:
 ---
 **Notes:**
 - If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
-- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality.
+- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality (see `skip-manual-qa` label)
 ---        
 
 #### Why my PR is in `Contributor` column?

doc/troubleshooting.md

@@ -128,3 +128,19 @@ Status-mobile uses `shadow-cljs` for hot reloading changes and uses its own [rel
 
 ### Solution
 Open react native's [In-App Developer Menu](https://reactnative.dev/docs/debugging#accessing-the-in-app-developer-menu) and press "Disable Fast Refresh" or "Disable Hot Reloading"
+
+# App crashing after running `make run-ios`
+
+### Cause
+It's possible that installing XCode from a `.xip` file might cause XCode to act funny
+Since it's not installed from the App Store, Or you might be missing a Rosetta installation.
+
+[Reference/Similar issue](https://github.com/expo/expo-cli/issues/3197)
+
+You might see something like this after running `make run-ios`:
+```
+Underlying error (domain=FBSOpenApplicationServiceErrorDomain, code=1):
+```
+### Solution
+Run `softwareupdate --install-rosetta --agree-to-license`
+to accept XCode's license and install Rosetta.

fastlane/Fastfile

@@ -164,7 +164,7 @@ def build_ios_e2e
     # 3. directory where to up StatusIm.app
     derived_data_path: 'status-ios',
     output_name: 'StatusIm.app',
-    buildlog_path: 'ios/logs',
+    buildlog_path: 'logs',
     # -------------------------------------
     # Normal stuff
     scheme: 'StatusIm',
@@ -231,7 +231,7 @@ platform :ios do
       clean: true,
       export_method: 'app-store',
       output_directory: 'status-ios',
-      buildlog_path: 'ios/logs',
+      buildlog_path: 'logs',
       include_symbols: false,
       export_options: {
         "combileBitcode": true,

ios/Podfile

@@ -1,13 +1,28 @@
-# Resolve react_native_pods.rb with node to allow for hoisting
-require Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-    "react-native/scripts/react_native_pods.rb",
-    {paths: [process.argv[1]]},
-  )', __dir__]).strip
+def node_require(script)
+   # Resolve script with node to allow for hoisting
+   require Pod::Executable.execute_command('node', ['-p',
+     "require.resolve(
+       '#{script}',
+       {paths: [process.argv[1]]},
+     )", __dir__]).strip
+end
+
+node_require('react-native/scripts/react_native_pods.rb')
+node_require('react-native-permissions/scripts/setup.rb')
 
 platform :ios, min_ios_version_supported
 prepare_react_native_project!
 
+setup_permissions([
+  'Camera',
+  'FaceID',
+  'MediaLibrary',
+  'Microphone',
+  'Notifications',
+  'PhotoLibrary',
+  'PhotoLibraryAddOnly',
+])
+
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
   Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -43,9 +58,6 @@ abstract_target 'Status' do
 
   pod 'SSZipArchive', '2.4.3'
 
-  permissions_path = '../node_modules/react-native-permissions/ios'
-  pod 'Permission-Microphone', :path => "#{permissions_path}/Microphone/Permission-Microphone.podspec"
-  pod 'Permission-Camera', :path => "#{permissions_path}/Camera/Permission-Camera.podspec"
   pod "react-native-status-keycard", path: "../node_modules/react-native-status-keycard"
   pod "react-native-status", path: "../modules/react-native-status"
   pod "Keycard", git: "https://github.com/status-im/Keycard.swift.git"

ios/Podfile.lock

@@ -28,10 +28,6 @@ PODS:
   - libwebp/mux (1.2.4):
     - libwebp/demux
   - libwebp/webp (1.2.4)
-  - Permission-Camera (3.8.0):
-    - RNPermissions
-  - Permission-Microphone (3.8.0):
-    - RNPermissions
   - RCT-Folly (2022.05.16.00):
     - boost
     - DoubleConversion
@@ -879,9 +875,13 @@ PODS:
     - React-Core
   - react-native-blob-util (0.13.18):
     - React-Core
-  - react-native-blur (4.3.3):
+  - react-native-blur (4.4.0):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core
-  - react-native-cameraroll (5.10.0):
+  - react-native-cameraroll (7.5.2):
+    - glog
+    - RCT-Folly (= 2022.05.16.00)
     - React-Core
   - react-native-config (1.5.0):
     - react-native-config/App (= 1.5.0)
@@ -893,8 +893,6 @@ PODS:
     - React
   - react-native-lottie-splash-screen (1.1.2):
     - React
-  - react-native-mail (6.1.1):
-    - React-Core
   - react-native-netinfo (4.7.0):
     - React
   - react-native-orientation-locker (1.5.0):
@@ -1121,7 +1119,7 @@ PODS:
     - TOCropViewController
   - RNKeychain (8.1.2):
     - React-Core
-  - RNPermissions (3.8.0):
+  - RNPermissions (4.1.5):
     - React-Core
   - RNReanimated (3.6.1):
     - glog
@@ -1154,8 +1152,6 @@ DEPENDENCIES:
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - Keycard (from `https://github.com/status-im/Keycard.swift.git`)
-  - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera/Permission-Camera.podspec`)
-  - Permission-Microphone (from `../node_modules/react-native-permissions/ios/Microphone/Permission-Microphone.podspec`)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -1188,7 +1184,6 @@ DEPENDENCIES:
   - react-native-hole-view (from `../node_modules/react-native-hole-view`)
   - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
   - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`)
-  - react-native-mail (from `../node_modules/react-native-mail`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
   - react-native-shake (from `../node_modules/react-native-shake`)
@@ -1265,10 +1260,6 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
   Keycard:
     :git: https://github.com/status-im/Keycard.swift.git
-  Permission-Camera:
-    :path: "../node_modules/react-native-permissions/ios/Camera/Permission-Camera.podspec"
-  Permission-Microphone:
-    :path: "../node_modules/react-native-permissions/ios/Microphone/Permission-Microphone.podspec"
   RCT-Folly:
     :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -1329,8 +1320,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-image-resizer"
   react-native-lottie-splash-screen:
     :path: "../node_modules/react-native-lottie-splash-screen"
-  react-native-mail:
-    :path: "../node_modules/react-native-mail"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
   react-native-orientation-locker:
@@ -1448,8 +1437,6 @@ SPEC CHECKSUMS:
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
-  Permission-Camera: e6d142d7d8b714afe0a83e5e6ae17eb949f1e3e9
-  Permission-Microphone: 644b1de8bcc2afcaf934e09a22bee507a95796a7
   RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
   RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87
   RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c
@@ -1474,13 +1461,12 @@ SPEC CHECKSUMS:
   react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
   react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
-  react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
-  react-native-cameraroll: 4701ae7c3dbcd3f5e9e150ca17f250a276154b35
+  react-native-blur: 799045500f56146afc46245148080e7b7623cb75
+  react-native-cameraroll: af8eec1e585d053ff485d98ec837f9a8a11b5745
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
   react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
   react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
-  react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
   react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
   react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
   react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
@@ -1521,7 +1507,7 @@ SPEC CHECKSUMS:
   RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
   RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
   RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
-  RNPermissions: 215c54462104b3925b412b0fb3c9c497b21c358b
+  RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903
   RNReanimated: dee37576492f1a375017515f5c77e66e5eec696b
   RNShare: 859ff710211285676b0bcedd156c12437ea1d564
   RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
@@ -1534,6 +1520,6 @@ SPEC CHECKSUMS:
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7
 
-PODFILE CHECKSUM: c9c6dfac28e31314e1a2ee2dc47364ad151f13f2
+PODFILE CHECKSUM: bb02c595a4aa4430da978b55da5440811cbd9d91
 
 COCOAPODS: 1.13.0

ios/StatusIm.xcodeproj/project.pbxproj

@@ -11,7 +11,6 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
-		2B6F8F28B81E862D44C8723D /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */; };
 		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 */; };
 		3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2626CE245C3F2200D5F94B /* Dummy.swift */; };
@@ -36,7 +35,7 @@
 		3AAD2AD324A3A60E0075D594 /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
 		3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; };
-		42AC64E4D3CA4E676400C598 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */; };
+		4A976A097386605EB7E85E28 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 804FB5E6B0FBBDB034E6CD09 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; };
 		65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
@@ -46,11 +45,11 @@
 		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 */; };
-		8CF1CA9463A4048F97BABB82 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.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 */; };
 		BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; };
+		C0BA109CA441C3DB93714F1D /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA288D7C6590DC9ED1F8657F /* libPods-Status-StatusIm.a */; };
 		C14C5F8D29C0A149005C58A7 /* launch-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */; };
 		C14C5F9129C0AD9C005C58A7 /* launch-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */; };
 		C14C5F9329C0ADB5005C58A7 /* launch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9229C0ADB5005C58A7 /* launch-icon.png */; };
@@ -58,6 +57,7 @@
 		C1715FFB29C0BCE50088FA8B /* launch-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */; };
 		C1715FFC29C0BCE80088FA8B /* launch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9229C0ADB5005C58A7 /* launch-icon.png */; };
 		CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.xcframework */; };
+		D0B4A2EA5E72EDB67CE6DA66 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B63C43A120FA22BB78FCC059 /* libPods-Status-StatusImPR.a */; };
 		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 */; };
@@ -108,36 +108,34 @@
 		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>"; };
-		0C331FD392B615DDAD0997F5 /* 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>"; };
 		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>"; };
-		2756A97EBFF084FA94990AA5 /* 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>"; };
-		2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.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>"; };
-		466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3DE83268BA3216610DFF6337 /* 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>"; };
 		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; };
-		5AAC8D9B1AF8BB7C8AB89845 /* 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>"; };
 		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>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
-		680C14B0F642A5F544C397B7 /* 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>"; };
 		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>"; };
-		7FA4F04CE45319370F87C4FD /* 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>"; };
-		87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		78655BCD07318E9885F5214B /* 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>"; };
+		804FB5E6B0FBBDB034E6CD09 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		857B0CA5528DF4E460CECF05 /* 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>"; };
+		870C29BCADFAAEC7F7C0ADD0 /* 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>"; };
 		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>"; };
+		94F1B9FD13C8504F50E31C94 /* 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>"; };
 		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>"; };
 		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>"; };
@@ -147,13 +145,15 @@
 		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>"; };
 		B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = "<group>"; };
 		B321D25F4493470980039457 /* Inter-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BoldItalic.otf"; path = "../resources/fonts/Inter-BoldItalic.otf"; sourceTree = "<group>"; };
+		B63C43A120FA22BB78FCC059 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
 		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>"; };
-		D42A8AC52E48DA4C89F20C13 /* 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>"; };
+		D272F46F39D037EC0EAB65C8 /* 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>"; };
+		EA288D7C6590DC9ED1F8657F /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8CF1CA9463A4048F97BABB82 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				4A976A097386605EB7E85E28 /* 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 */,
-				42AC64E4D3CA4E676400C598 /* libPods-Status-StatusIm.a in Frameworks */,
+				C0BA109CA441C3DB93714F1D /* 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 */,
-				2B6F8F28B81E862D44C8723D /* libPods-Status-StatusImPR.a in Frameworks */,
+				D0B4A2EA5E72EDB67CE6DA66 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				2D2D9E4943562065BF98E304 /* libPods-Status-StatusIm.a */,
-				466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.a */,
-				87038678EE47E8EF6E93EB54 /* libPods-Status-StatusImPR.a */,
+				EA288D7C6590DC9ED1F8657F /* libPods-Status-StatusIm.a */,
+				804FB5E6B0FBBDB034E6CD09 /* libPods-Status-StatusIm-StatusImTests.a */,
+				B63C43A120FA22BB78FCC059 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				680C14B0F642A5F544C397B7 /* Pods-Status-StatusIm.debug.xcconfig */,
-				7FA4F04CE45319370F87C4FD /* Pods-Status-StatusIm.release.xcconfig */,
-				D42A8AC52E48DA4C89F20C13 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				2756A97EBFF084FA94990AA5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				5AAC8D9B1AF8BB7C8AB89845 /* Pods-Status-StatusImPR.debug.xcconfig */,
-				0C331FD392B615DDAD0997F5 /* Pods-Status-StatusImPR.release.xcconfig */,
+				857B0CA5528DF4E460CECF05 /* Pods-Status-StatusIm.debug.xcconfig */,
+				78655BCD07318E9885F5214B /* Pods-Status-StatusIm.release.xcconfig */,
+				870C29BCADFAAEC7F7C0ADD0 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				94F1B9FD13C8504F50E31C94 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				3DE83268BA3216610DFF6337 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				D272F46F39D037EC0EAB65C8 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				99EA576680D5849CA4274106 /* [CP] Check Pods Manifest.lock */,
+				53D1210C251AB35BB66F64D1 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				835B3E5945D5F723935FD4E1 /* [CP] Copy Pods Resources */,
+				2E8578589647F2D1AB7D69B0 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				140572B0EA34D6F884AB6CC4 /* [CP] Check Pods Manifest.lock */,
+				0792D7C164832E59371E617A /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				5BEC29A10D63DFF8AFF5B788 /* [CP] Copy Pods Resources */,
+				70A851EF00039276F55A4FB3 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				78F85303177A5D4820A08DC1 /* [CP] Check Pods Manifest.lock */,
+				16ECB1DEB0091DFC0F3DED3C /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				776D3E96946780BFE216ACF2 /* [CP] Copy Pods Resources */,
+				C15E3DDA7B1E1CB5EDF76A1E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,7 +544,7 @@
 			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";
 		};
-		140572B0EA34D6F884AB6CC4 /* [CP] Check Pods Manifest.lock */ = {
+		0792D7C164832E59371E617A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -566,6 +566,52 @@
 			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;
 		};
+		16ECB1DEB0091DFC0F3DED3C /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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;
+		};
+		2E8578589647F2D1AB7D69B0 /* [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;
+		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -594,95 +640,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
 		};
-		5BEC29A10D63DFF8AFF5B788 /* [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}/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}/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;
-		};
-		776D3E96946780BFE216ACF2 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.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}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		78F85303177A5D4820A08DC1 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			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;
-		};
-		835B3E5945D5F723935FD4E1 /* [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}/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}/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;
-		};
-		99EA576680D5849CA4274106 /* [CP] Check Pods Manifest.lock */ = {
+		53D1210C251AB35BB66F64D1 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -704,6 +662,54 @@
 			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;
 		};
+		70A851EF00039276F55A4FB3 /* [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;
+		};
+		C15E3DDA7B1E1CB5EDF76A1E /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-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-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -765,7 +771,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D42A8AC52E48DA4C89F20C13 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 870C29BCADFAAEC7F7C0ADD0 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -802,7 +808,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2756A97EBFF084FA94990AA5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 94F1B9FD13C8504F50E31C94 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -835,7 +841,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 680C14B0F642A5F544C397B7 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 857B0CA5528DF4E460CECF05 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -917,7 +923,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7FA4F04CE45319370F87C4FD /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 78655BCD07318E9885F5214B /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -992,7 +998,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5AAC8D9B1AF8BB7C8AB89845 /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 3DE83268BA3216610DFF6337 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1072,7 +1078,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0C331FD392B615DDAD0997F5 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = D272F46F39D037EC0EAB65C8 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";

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

@@ -0,0 +1,133 @@
+package im.status.ethereum.module
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Callback
+import android.util.Log
+import android.content.Intent
+import android.net.Uri
+import android.content.pm.PackageManager
+import java.io.File
+import androidx.core.content.FileProvider
+import android.text.Html
+
+class MailManager(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    private val utils = Utils(reactContext)
+
+    override fun getName() = "MailManager"
+
+        @ReactMethod
+        fun mail(options: ReadableMap, callback: Callback) {
+            Log.d(TAG, "attempting to send email")
+            val i = Intent(Intent.ACTION_SEND_MULTIPLE)
+            val selectorIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
+            i.selector = selectorIntent
+
+            if (options.hasKey("subject") && !options.isNull("subject")) {
+                i.putExtra(Intent.EXTRA_SUBJECT, options.getString("subject"))
+            }
+
+            if (options.hasKey("body") && !options.isNull("body")) {
+                val body = options.getString("body")
+                if (options.hasKey("isHTML") && options.getBoolean("isHTML")) {
+                    i.putExtra(Intent.EXTRA_TEXT, Html.fromHtml(body))
+                } else {
+                    i.putExtra(Intent.EXTRA_TEXT, body)
+                }
+            }
+
+            if (options.hasKey("recipients") && !options.isNull("recipients")) {
+                val recipients = options.getArray("recipients")
+                i.putExtra(Intent.EXTRA_EMAIL, this.utils.readableArrayToStringArray(recipients!!))
+            }
+
+            if (options.hasKey("ccRecipients") && !options.isNull("ccRecipients")) {
+                val ccRecipients = options.getArray("ccRecipients")
+                i.putExtra(Intent.EXTRA_CC, this.utils.readableArrayToStringArray(ccRecipients!!))
+            }
+
+            if (options.hasKey("bccRecipients") && !options.isNull("bccRecipients")) {
+                val bccRecipients = options.getArray("bccRecipients")
+                i.putExtra(Intent.EXTRA_BCC, this.utils.readableArrayToStringArray(bccRecipients!!))
+            }
+
+            if (options.hasKey("attachments") && !options.isNull("attachments")) {
+                val r = options.getArray("attachments")
+                val length = r?.size() ?: 0
+
+                val provider = reactContext.applicationContext.packageName + ".rnmail.provider"
+                val resolvedIntentActivities = reactContext.packageManager.queryIntentActivities(i,
+                        PackageManager.MATCH_DEFAULT_ONLY)
+
+                val uris = ArrayList<Uri>()
+                for (keyIndex in 0 until length) {
+                    val clip = r?.getMap(keyIndex)
+                    val uri: Uri
+                    if (clip?.hasKey("path") == true && !clip.isNull("path")) {
+                        val path = clip.getString("path")
+                        val file = File(path)
+                        uri = FileProvider.getUriForFile(reactContext, provider, file)
+                    } else if (clip?.hasKey("uri") == true && !clip.isNull("uri")) {
+                        val uriPath = clip.getString("uri")
+                        uri = Uri.parse(uriPath)
+                    } else {
+                        callback.invoke("not_found")
+                        return
+                    }
+                    uris.add(uri)
+
+                    for (resolvedIntentInfo in resolvedIntentActivities) {
+                        val packageName = resolvedIntentInfo.activityInfo.packageName
+                        reactContext.grantUriPermission(packageName, uri,
+                                Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    }
+                }
+
+                i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                i.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris)
+            }
+
+            val manager = reactContext.packageManager
+            val list = manager.queryIntentActivities(i, 0)
+
+            if (list == null || list.isEmpty()) {
+                Log.d(TAG, "not_available")
+                callback.invoke("not_available")
+                return
+            }
+
+            if (list.size == 1) {
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                try {
+                    reactContext.startActivity(i)
+                } catch (ex: Exception) {
+                    Log.e(TAG, ex.message!!)
+                    callback.invoke("error")
+                }
+            } else {
+                var chooserTitle = "Send Mail"
+
+                if (options.hasKey("customChooserTitle") && !options.isNull("customChooserTitle")) {
+                    chooserTitle = options.getString("customChooserTitle") ?: ""
+                }
+
+                val chooser = Intent.createChooser(i, chooserTitle)
+                chooser.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+
+                try {
+                    reactContext.startActivity(chooser)
+                } catch (ex: Exception) {
+                    Log.e(TAG, ex.message!!)
+                    callback.invoke("error")
+                }
+            }
+        }
+
+    companion object {
+        private const val TAG = "MailManager"
+    }
+
+}

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

@@ -74,4 +74,5 @@ class NetworkManager(private val reactContext: ReactApplicationContext) : ReactC
     fun recover(rpcParams: String, callback: Callback) {
         utils.executeRunnableStatusGoMethod({ Statusgo.recover(rpcParams) }, callback)
     }
+
 }

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

@@ -43,7 +43,6 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va
     }
 
     override fun handleSignal(jsonEventString: String) {
-        Log.d(TAG, "Signal event")
         val params = Arguments.createMap()
         params.putString("jsonEvent", jsonEventString)
         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("gethEvent", params)

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

@@ -24,6 +24,7 @@ class StatusPackage(private val rootedDevice: Boolean) : ReactPackage {
             add(LogManager(reactContext))
             add(Utils(reactContext))
             add(NetworkManager(reactContext))
+            add(MailManager(reactContext))
             add(RNSelectableTextInputModule(reactContext))
         }
 

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

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableArray;
 import android.util.Log
 import org.json.JSONException
 import org.json.JSONObject
@@ -141,4 +142,15 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
     fun toChecksumAddress(address: String): String {
         return Statusgo.toChecksumAddress(address)
     }
+
+    fun readableArrayToStringArray(r: ReadableArray): Array<String> {
+        val length = r.size()
+        val strArray = Array(length) { "" }
+
+        for (keyIndex in 0 until length) {
+            strArray[keyIndex] = r.getString(keyIndex) ?: ""
+        }
+
+        return strArray
+    }
 }

modules/react-native-status/android/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="rnmail_dl" path="Download/" />
+    <cache-path name="rnmail_cache" path="/" />
+    <root-path name="rnmail_sdcard" path="." />
+</paths>

modules/react-native-status/ios/RCTStatus/MailManager.h

@@ -0,0 +1,9 @@
+#import <sys/utsname.h>
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <React/RCTBridgeModule.h>
+#import "RCTLog.h"
+
+@interface MailManager : NSObject <RCTBridgeModule, MFMailComposeViewControllerDelegate>
+
+@end

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

@@ -0,0 +1,207 @@
+#import <MessageUI/MessageUI.h>
+#import "MailManager.h"
+#import <React/RCTConvert.h>
+#import <React/RCTLog.h>
+#import "React/RCTBridge.h"
+#import "React/RCTEventDispatcher.h"
+
+@implementation MailManager
+{
+    NSMutableDictionary *_callbacks;
+}
+
+- (instancetype)init
+{
+    if ((self = [super init])) {
+        _callbacks = [[NSMutableDictionary alloc] init];
+    }
+    return self;
+}
+
+- (dispatch_queue_t)methodQueue
+{
+    return dispatch_get_main_queue();
+}
+
++ (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(mail:(NSDictionary *)options
+                  callback: (RCTResponseSenderBlock)callback)
+{
+    if ([MFMailComposeViewController canSendMail])
+    {
+        MFMailComposeViewController *mail = [[MFMailComposeViewController alloc] init];
+        mail.mailComposeDelegate = self;
+        _callbacks[RCTKeyForInstance(mail)] = callback;
+
+        if (options[@"subject"]){
+            NSString *subject = [RCTConvert NSString:options[@"subject"]];
+            [mail setSubject:subject];
+        }
+
+        BOOL isHTML = NO;
+
+        if (options[@"isHTML"]){
+            isHTML = [options[@"isHTML"] boolValue];
+        }
+
+        if (options[@"body"]){
+            NSString *body = [RCTConvert NSString:options[@"body"]];
+            [mail setMessageBody:body isHTML:isHTML];
+        }
+
+        if (options[@"recipients"]){
+            NSArray *recipients = [RCTConvert NSArray:options[@"recipients"]];
+            [mail setToRecipients:recipients];
+        }
+
+        if (options[@"ccRecipients"]){
+            NSArray *ccRecipients = [RCTConvert NSArray:options[@"ccRecipients"]];
+            [mail setCcRecipients:ccRecipients];
+        }
+
+        if (options[@"bccRecipients"]){
+            NSArray *bccRecipients = [RCTConvert NSArray:options[@"bccRecipients"]];
+            [mail setBccRecipients:bccRecipients];
+        }
+        if (options[@"attachments"]) {
+            NSArray *attachments = [RCTConvert NSArray:options[@"attachments"]];
+            for (NSDictionary *attachment in attachments) {
+                if ((attachment[@"path"] || attachment[@"uri"]) && (attachment[@"type"] || attachment[@"mimeType"])) {
+                    NSString *attachmentPath = [RCTConvert NSString:attachment[@"path"]];
+                    NSString *attachmentUri = [RCTConvert NSString:attachment[@"uri"]];
+                    NSString *attachmentType = [RCTConvert NSString:attachment[@"type"]];
+                    NSString *attachmentName = [RCTConvert NSString:attachment[@"name"]];
+                    NSString *attachmentMimeType = [RCTConvert NSString:attachment[@"mimeType"]];
+
+                    // Set default filename if not specificed
+                    if (!attachmentName) {
+                        attachmentName = [[attachmentPath lastPathComponent] stringByDeletingPathExtension];
+                    }
+
+                    NSData *fileData;
+                    if (attachmentPath) {
+                        NSFileManager *fileManager = [NSFileManager defaultManager];
+                        if (![fileManager fileExistsAtPath:attachmentPath]){
+                            callback(@[[NSString stringWithFormat: @"attachment file with path '%@' does not exist", attachmentPath]]);
+                            return;
+                        }
+                        // Get the resource path and read the file using NSData
+                        fileData = [NSData dataWithContentsOfFile:attachmentPath];
+                    } else if (attachmentUri) {
+                        // Get the URI and read it using NSData
+                        NSURL *attachmentURL = [[NSURLComponents componentsWithString:attachmentUri] URL];
+                        NSError *error = nil;
+                        fileData = [NSData dataWithContentsOfURL:attachmentURL options:0 error:&error];
+                        if (!fileData) {
+                            callback(@[[NSString stringWithFormat: @"attachment file with uri '%@' does not exist", attachmentUri]]);
+                            return;
+                        }
+                    }
+
+                    // Determine the MIME type
+                    NSString *mimeType;
+                    if (attachmentType) {
+                        /*
+                         * Add additional mime types and PR if necessary. Find the list
+                         * of supported formats at http://www.iana.org/assignments/media-types/media-types.xhtml
+                         */
+                        NSDictionary *supportedMimeTypes = @{
+                            @"jpeg" : @"image/jpeg",
+                            @"jpg" : @"image/jpeg",
+                            @"png" : @"image/png",
+                            @"doc" : @"application/msword",
+                            @"docx" : @"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+                            @"ppt" : @"application/vnd.ms-powerpoint",
+                            @"pptx" : @"application/vnd.openxmlformats-officedocument.presentationml.presentation",
+                            @"html" : @"text/html",
+                            @"csv" : @"text/csv",
+                            @"pdf" : @"application/pdf",
+                            @"vcard" : @"text/vcard",
+                            @"json" : @"application/json",
+                            @"zip" : @"application/zip",
+                            @"text" : @"text/*",
+                            @"mp3" : @"audio/mpeg",
+                            @"wav" : @"audio/wav",
+                            @"aiff" : @"audio/aiff",
+                            @"flac" : @"audio/flac",
+                            @"ogg" : @"audio/ogg",
+                            @"xls" : @"application/vnd.ms-excel",
+                            @"ics" : @"text/calendar",
+                            @"xlsx" : @"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                        };
+                        if([supportedMimeTypes objectForKey:attachmentType]) {
+                            mimeType = [supportedMimeTypes objectForKey:attachmentType];
+                        } else {
+                            callback(@[[NSString stringWithFormat: @"Mime type '%@' for attachment is not handled", attachmentType]]);
+                            return;
+                        }
+                    } else if (attachmentMimeType) {
+                        mimeType = attachmentMimeType;
+                    }
+
+                    // Add attachment
+                    [mail addAttachmentData:fileData mimeType:mimeType fileName:attachmentName];
+                }
+            }
+        }
+
+        UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+
+        while (root.presentedViewController) {
+            root = root.presentedViewController;
+        }
+        [root presentViewController:mail animated:YES completion:nil];
+    } else {
+        callback(@[@"not_available"]);
+    }
+}
+
+#pragma mark MFMailComposeViewControllerDelegate Methods
+
+- (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error
+{
+    NSString *key = RCTKeyForInstance(controller);
+    RCTResponseSenderBlock callback = _callbacks[key];
+    if (callback) {
+        switch (result) {
+            case MFMailComposeResultSent:
+                callback(@[[NSNull null] , @"sent"]);
+                break;
+            case MFMailComposeResultSaved:
+                callback(@[[NSNull null] , @"saved"]);
+                break;
+            case MFMailComposeResultCancelled:
+                callback(@[[NSNull null] , @"cancelled"]);
+                break;
+            case MFMailComposeResultFailed:
+                callback(@[@"failed"]);
+                break;
+            default:
+                callback(@[@"error"]);
+                break;
+        }
+        [_callbacks removeObjectForKey:key];
+    } else {
+        RCTLogWarn(@"No callback registered for mail: %@", controller.title);
+    }
+    UIViewController *ctrl = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+    while (ctrl.presentedViewController && ctrl != controller) {
+        ctrl = ctrl.presentedViewController;
+    }
+    [ctrl dismissViewControllerAnimated:YES completion:nil];
+}
+
+#pragma mark Private
+
+static NSString *RCTKeyForInstance(id instance)
+{
+    return [NSString stringWithFormat:@"%p", instance];
+}
+
+@end

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

@@ -38,9 +38,6 @@ static RCTBridge *bridge;
         return;
     }
 
-#if DEBUG
-    NSLog(@"[handleSignal] Received an event from Status-Go: %@", signal);
-#endif
     [bridge.eventDispatcher sendAppEventWithName:@"gethEvent"
                                             body:@{@"jsonEvent": signal}];
 

modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		CE4E31B11D86951A0033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B01D86951A0033ED64 /* Statusgo.xcframework */; };
 		E92244EB2B485F2400915F4C /* UIHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E92244E92B485F2400915F4C /* UIHelper.m */; };
 		E967A3AC2B47BD5A00FB19B2 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = E967A3AB2B47BD5A00FB19B2 /* Utils.m */; };
+		E9AEB5FE2BD8EEB100FB2926 /* MailManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */; };
 		E9BEF3602B470BF1001F6755 /* NetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9BEF35E2B470BF1001F6755 /* NetworkManager.m */; };
 		E9C33AA62B4828A60074B1C5 /* DatabaseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9C33AA52B4828A60074B1C5 /* DatabaseManager.m */; };
 		E9DB08932B4858B400F51053 /* LogManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9DB08912B4858B400F51053 /* LogManager.m */; };
@@ -42,6 +43,8 @@
 		E92244EA2B485F2400915F4C /* UIHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHelper.h; sourceTree = "<group>"; };
 		E967A3AA2B47BD5A00FB19B2 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
 		E967A3AB2B47BD5A00FB19B2 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
+		E9AEB5FC2BD8EEB100FB2926 /* MailManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MailManager.h; sourceTree = "<group>"; };
+		E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MailManager.m; sourceTree = "<group>"; };
 		E9BEF35E2B470BF1001F6755 /* NetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkManager.m; sourceTree = "<group>"; };
 		E9BEF35F2B470BF1001F6755 /* NetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkManager.h; sourceTree = "<group>"; };
 		E9C33AA42B4828A60074B1C5 /* DatabaseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseManager.h; sourceTree = "<group>"; };
@@ -86,6 +89,8 @@
 		206C9F3C1D474E910063E3E6 /* Status */ = {
 			isa = PBXGroup;
 			children = (
+				E9AEB5FC2BD8EEB100FB2926 /* MailManager.h */,
+				E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */,
 				E92244EA2B485F2400915F4C /* UIHelper.h */,
 				E92244E92B485F2400915F4C /* UIHelper.m */,
 				E9DB08922B4858B400F51053 /* LogManager.h */,
@@ -163,6 +168,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E9DB08932B4858B400F51053 /* LogManager.m in Sources */,
+				E9AEB5FE2BD8EEB100FB2926 /* MailManager.m in Sources */,
 				E9F5C3322B483B6C001A7F40 /* EncryptionUtils.m in Sources */,
 				E967A3AC2B47BD5A00FB19B2 /* Utils.m in Sources */,
 				E92244EB2B485F2400915F4C /* UIHelper.m in Sources */,

modules/react-native-status/nodejs/status.cpp

@@ -1128,8 +1128,6 @@ Persistent<Function> r_call;
 std::queue<std::string> q;
 
 void run(char *json) {
-  printf("signal received %s\n", json);
-
   std::string str(json);
   q.push(str);
 }

nix/deps/gradle/deps.json

@@ -1165,6 +1165,21 @@
     }
   },
 
+  {
+    "path": "androidx/databinding/databinding-common/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "databinding-common-3.5.3.pom": {
+        "sha1": "0f85f7500d68d4eaed465ec194e18779374a7a68",
+        "sha256": "sha256-paY7t0Iz/AxIVcvQLT4sAPgqTvvMChxgS3SmWRod2tw="
+      },
+      "databinding-common-3.5.3.jar": {
+        "sha1": "72bb6cb779ae61710a01ff76d9d3cab355c44a4f",
+        "sha256": "sha256-WRoV+qBtmUWoqA8m8n2vBosrLirqakvhN7/SixHZVgA="
+      }
+    }
+  },
+
   {
     "path": "androidx/databinding/databinding-common/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -1274,6 +1289,21 @@
     }
   },
 
+  {
+    "path": "androidx/databinding/databinding-compiler-common/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "databinding-compiler-common-3.5.3.pom": {
+        "sha1": "345b6f4cea120faa14f118c08150de5d8afccce1",
+        "sha256": "sha256-LRdv8FuX6tdlmxdHuhK/a/bhc8zIONVFAniG0toDu+A="
+      },
+      "databinding-compiler-common-3.5.3.jar": {
+        "sha1": "32bfc30c00fdc550723ffd9bff3ef2471fbd4a3a",
+        "sha256": "sha256-yDZslWiT00cwjhF5Be1v2xq+gFW54gEhOrjyMO3GNRg="
+      }
+    }
+  },
+
   {
     "path": "androidx/databinding/databinding-compiler-common/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -2972,6 +3002,21 @@
     }
   },
 
+  {
+    "path": "com/android/databinding/baseLibrary/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "baseLibrary-3.5.3.pom": {
+        "sha1": "81372394c257edc4595cf19c33f7460892eeaa3e",
+        "sha256": "sha256-knlU7d5unzROdh7YkGliIzSrDWc3i9B2rDIkfhX/Bmk="
+      },
+      "baseLibrary-3.5.3.jar": {
+        "sha1": "5da8b7daa2f10ec359a13ee778eeabf15c1758b1",
+        "sha256": "sha256-zebU7vY+5eBbiqtY/4Xq85zD5u2E/RhL9lWNgvjZwGc="
+      }
+    }
+  },
+
   {
     "path": "com/android/databinding/baseLibrary/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3475,6 +3520,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/analytics-library/crash/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "crash-26.5.3.pom": {
+        "sha1": "2b6f117c8542a9132bbd1982960ff93be002eb77",
+        "sha256": "sha256-ZrYgjqqWCNZ7K84UQIlBptcRC4ePlCVTmsIeuEWnqBU="
+      },
+      "crash-26.5.3.jar": {
+        "sha1": "d199e964be1fa3e7162344b91336afae6c7ea789",
+        "sha256": "sha256-86x29qjj+M7mPiqew2n87T3przHhRQzZOdiHXWcT758="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/analytics-library/crash/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3599,6 +3659,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/analytics-library/protos/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "protos-26.5.3.pom": {
+        "sha1": "a2452eb3233ef51f1dda9b5508cfe340134b4978",
+        "sha256": "sha256-FYV7IPvj+TmJoQA2xD32xOTygrtjh07jAghoOH7gRuY="
+      },
+      "protos-26.5.3.jar": {
+        "sha1": "16d70f0d597eac5d39180b1ce2d9b274f8802cf9",
+        "sha256": "sha256-8uut8euJZzFc/sTTw3UkQFSh8W15+N4l0eiYPVq0D70="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/analytics-library/protos/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3723,6 +3798,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/analytics-library/shared/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "shared-26.5.3.pom": {
+        "sha1": "14c908921dd73687f66f496dfc73fa807d57e40d",
+        "sha256": "sha256-FkUuC4D4/OiS5yBlJvWnupvlSungNjArA0ktU240P54="
+      },
+      "shared-26.5.3.jar": {
+        "sha1": "594abc68f0518057cdb150e4c8cc73bc5c94183e",
+        "sha256": "sha256-dpzYinI6GR6dmPsEGULf5Irzo+8kqP6wCI2NTNfhurA="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/analytics-library/shared/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3847,6 +3937,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/analytics-library/tracker/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "tracker-26.5.3.pom": {
+        "sha1": "8551b232bde0e0cd7a9983f4acc716ed2fa8d59b",
+        "sha256": "sha256-fAbjPrxxjgXSaoM5kD9ZoVTedhcXTPha/bxi0Nsgnkc="
+      },
+      "tracker-26.5.3.jar": {
+        "sha1": "6a84a345f5155eca774cd238c233a2f6fad551b9",
+        "sha256": "sha256-dqhsU6BlaXcW4tXGEAyd4LrpHVacu5vRn6U+Pw5n63M="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/analytics-library/tracker/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -3971,6 +4076,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/annotations/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "annotations-26.5.3.pom": {
+        "sha1": "03c6890f54f0b7c91aaeb7d66e87c52e53b10d79",
+        "sha256": "sha256-4vEHB5aOWAXrLslhHTRa1GVrKLeEpApil0rlXPIQzh4="
+      },
+      "annotations-26.5.3.jar": {
+        "sha1": "87a36f2086b41d1ec162a6e74c4f999d58eb1310",
+        "sha256": "sha256-/js3c6HdNGlY2KFUess2UN/74HfTmtdMX3b7f6k/NYw="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/annotations/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4383,6 +4503,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/apksig/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apksig-3.5.3.pom": {
+        "sha1": "fe080d599c11357971f21a2b7475d9915515d363",
+        "sha256": "sha256-5sSQBWPiQJf82rf++W6oPPf6sfSTn6teEVRL8Ng0LZ0="
+      },
+      "apksig-3.5.3.jar": {
+        "sha1": "d5ffda89f909743ad8e77b3c28ed351695037543",
+        "sha256": "sha256-SMfd+nhnEtdmpzyt1+3JGGhsGv1s6FcRyvUQYx+0CQ8="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/apksig/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4492,6 +4627,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/apkzlib/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apkzlib-3.5.3.pom": {
+        "sha1": "d41d21481aa9ea302638d5008d1c54e391981843",
+        "sha256": "sha256-unLu4SDrvKUNUxJUZlaH2INOewFTQfQfdi2GKoiPDrI="
+      },
+      "apkzlib-3.5.3.jar": {
+        "sha1": "8e17d7b8bb5f756c139619d86facca1675bc6164",
+        "sha256": "sha256-aNpGeSdH6yIHK7PygeptifcYAB6Mmaa75oYJM/73qdw="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/apkzlib/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4616,6 +4766,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/builder-model/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-model-3.5.3.pom": {
+        "sha1": "64d0223622a2c59fb67f8fb5c22b6535efef29b5",
+        "sha256": "sha256-8kaKB3hYve1NA/D8BkGjtpr5zskjdqqjht3XoSTIQQM="
+      },
+      "builder-model-3.5.3.jar": {
+        "sha1": "775377503072e1b6a701c3ea923c468cedd4e2eb",
+        "sha256": "sha256-U1xpawkp6LOZLwiCPpTFtci+UzCVThX8TuFhCW+gT6I="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/builder-model/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4752,6 +4917,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/builder-test-api/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-test-api-3.5.3.pom": {
+        "sha1": "f910b8864ae8e3e3c39823ca7ca6ba99a09d7564",
+        "sha256": "sha256-9IV0lJ6wAgzUWwuGES1aMXxpH+0OPxPYzY7VNbmksUI="
+      },
+      "builder-test-api-3.5.3.jar": {
+        "sha1": "cf9ce50cd19a816c5bc7d4c6362699aa98c8ac0f",
+        "sha256": "sha256-euZFcKEsjav85tiA+KSNsVqoMRHbcC2iTAWvv3H8FUc="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/builder-test-api/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -4888,6 +5068,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/builder/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-3.5.3.pom": {
+        "sha1": "b327e842abd63da2281e74c59de69ab2b5998443",
+        "sha256": "sha256-dNWTs6MgZG6PVaytZxU/2aWQk8a3lqkGYmbXPzO99ZA="
+      },
+      "builder-3.5.3.jar": {
+        "sha1": "39bba1af533b25f6c1140e3c795ff815a6ad86ba",
+        "sha256": "sha256-BcvZGDubmg4SisvDkSVAwXLg11pcNY2kZcb3F5JMV0E="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/builder/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5129,6 +5324,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/gradle-api/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-api-3.5.3.pom": {
+        "sha1": "ef22e3a71efd8cb517d4b039076f4b69013c0208",
+        "sha256": "sha256-1T+FRJWgpHkt+LVOWXFAdtk3HW9ah5AABwdUoYDS7kU="
+      },
+      "gradle-api-3.5.3.jar": {
+        "sha1": "c1d6a6b3e5b744caaf6eea2452d8db62c8e2882f",
+        "sha256": "sha256-yOi/eI7S+LRswAqWJOAKivQLwx/x2CmL10DxhAC9PS4="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/gradle-api/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5299,6 +5509,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/gradle/3.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-3.5.3.pom": {
+        "sha1": "6bfb2b4c34c37c4f2addcb6d99db19fa7a1a5810",
+        "sha256": "sha256-k8NC3tdmWdVBdyaKn9lBLf4HLozxd26vtHxZCBmOZdI="
+      },
+      "gradle-3.5.3.jar": {
+        "sha1": "12e36e5f81cc2face28e0c14cb98941d773cae6a",
+        "sha256": "sha256-Zyk97dM5uJypz2xEAJvNj4Bb9CnCVYYuq/LeuBDYuRA="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/gradle/3.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5563,6 +5788,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/build/manifest-merger/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "manifest-merger-26.5.3.pom": {
+        "sha1": "4cc40406dfe779b3b575e66c970ae0e9986b0c94",
+        "sha256": "sha256-ZjxoTo8jLgEYXLnqBwjqCRwxAhYiDHlQthqQZlX0Vj4="
+      },
+      "manifest-merger-26.5.3.jar": {
+        "sha1": "36674041b9d2644a30b75b6d8b7106bc16eac78a",
+        "sha256": "sha256-tGBtBgLyH5GhdM+4UWtabpj/rJWNPzzYmTuVDvSbgEk="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/build/manifest-merger/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5699,6 +5939,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/common/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "common-26.5.3.pom": {
+        "sha1": "ace0f2945bba30c12223d7634a69da21a4242fd7",
+        "sha256": "sha256-9ikVDGRk14qviKUSEpiyeycF0HdW2W5hH6/yuJgdgeQ="
+      },
+      "common-26.5.3.jar": {
+        "sha1": "47409edcd2331596b42c33160101a86046e1c6f5",
+        "sha256": "sha256-YAVo9B+xn8eWSHtvxTnlKr0Jj60cZ4vONcAqMVGeJPY="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/common/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5823,6 +6078,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/ddms/ddmlib/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "ddmlib-26.5.3.pom": {
+        "sha1": "f69c10111005d9ed625cc0b75fed9c5c2fcd1bcb",
+        "sha256": "sha256-y79URq2NFK1PQ/kl063FlIr3hP7NdEvk04bf50sXe1s="
+      },
+      "ddmlib-26.5.3.jar": {
+        "sha1": "804a61e67286eeec17d195c78a135f0ed2fbdb8a",
+        "sha256": "sha256-IlrK31Fopg4wIKM81mm6TYatse+ePnEhcREd4t+RrCs="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/ddms/ddmlib/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -5947,6 +6217,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/dvlib/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "dvlib-26.5.3.pom": {
+        "sha1": "1983f43ea2ef12519c4ac4579930af7494b4fb1c",
+        "sha256": "sha256-HNYT321rRp1fKslux7VIkAzONv7xDrPJAZVIITehh5c="
+      },
+      "dvlib-26.5.3.jar": {
+        "sha1": "9caa13fe83508ba5687199c02b7ddb885abd8f14",
+        "sha256": "sha256-+f3/TUDUJ1vhgAWJ2GlS33ErcQa7MD2o5f5zaqIogGU="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/dvlib/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6146,6 +6431,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/layoutlib/layoutlib-api/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "layoutlib-api-26.5.3.pom": {
+        "sha1": "75263963e8b5baa185153cbdf1a5347628a71927",
+        "sha256": "sha256-Qs1kefYxk/LNrFGbBIi08IbYhToLabRA84yCWHE09eE="
+      },
+      "layoutlib-api-26.5.3.jar": {
+        "sha1": "6549e729f3f27c7d05049494f25cfd01890c00e0",
+        "sha256": "sha256-/7VaULd7u4vTgnr7gpGhRVzZU7EmBYzP3db/rvkwM9A="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/layoutlib/layoutlib-api/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6315,6 +6615,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/lint/lint-gradle-api/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "lint-gradle-api-26.5.3.pom": {
+        "sha1": "ce7c04f4c18db0fe372667092500726dc1436b2b",
+        "sha256": "sha256-tD6Ht965r/ZdBmPvIpAUoOyV9OsgUpxwTbEXrkq7I00="
+      },
+      "lint-gradle-api-26.5.3.jar": {
+        "sha1": "34f6edb87863c7e9f89f24c36485374ad350166a",
+        "sha256": "sha256-+xQk+cpYS2WRw5znSR5tiXYAVx4XPPkogrqTQWPGDMQ="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/lint/lint-gradle-api/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6559,6 +6874,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/repository/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "repository-26.5.3.pom": {
+        "sha1": "f8f4198066a0abb5dd28ddf7e7bbb9ce9c6df714",
+        "sha256": "sha256-1VAgYQtJuNTY+UgjN7nkcyAEjcxoEYb4tLuJAxaMxUE="
+      },
+      "repository-26.5.3.jar": {
+        "sha1": "91466e99a63da0267b17bdfb617f54582e311618",
+        "sha256": "sha256-X8tsUpwFkmiZtGzyUA46ChpjOV59RY6na8sHXKoF1Lg="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/repository/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6683,6 +7013,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/sdklib/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdklib-26.5.3.pom": {
+        "sha1": "08fa943d8253d6301e2dd02bb953fe73bd1406f7",
+        "sha256": "sha256-UQ3bott3wc/Uw37/g/L25qPv4gXqt8Zkgu7QAUgtsTs="
+      },
+      "sdklib-26.5.3.jar": {
+        "sha1": "8c305bc044ad81115859eb964c2829cbea70b036",
+        "sha256": "sha256-H8X6i5qnJUBBwF5s8fPrqfR7BJH3p4ZDwhy+eylFHkI="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/sdklib/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -6807,6 +7152,21 @@
     }
   },
 
+  {
+    "path": "com/android/tools/sdk-common/26.5.3",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdk-common-26.5.3.pom": {
+        "sha1": "3fda12d2fca4442d791813f7a73399ff5f6e1973",
+        "sha256": "sha256-RenED9V2i7mYpkVhbqjSVGv15o9fBkL34FpKhwZElZk="
+      },
+      "sdk-common-26.5.3.jar": {
+        "sha1": "cce8ff081940bb7c9b1368a4052f987091996887",
+        "sha256": "sha256-kDfQjhoo5b8rEzc6Dyo/hxRsRG/gkYeNNOtvHxyIBgk="
+      }
+    }
+  },
+
   {
     "path": "com/android/tools/sdk-common/26.5.4",
     "repo": "https://dl.google.com/dl/android/maven2",
@@ -8041,16 +8401,16 @@
   },
 
   {
-    "path": "commons-io/commons-io/2.16.0",
+    "path": "commons-io/commons-io/2.16.1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "commons-io-2.16.0.pom": {
-        "sha1": "22e76fdc24c77e80b362d1f060a3cc073de3f0a9",
-        "sha256": "sha256-9EvmklZbB2a+vlkKSwQdm12rJP7QtGqs7niXBCiISlY="
+      "commons-io-2.16.1.pom": {
+        "sha1": "553d6f69e338060a231755afe0ebf99d14b45da6",
+        "sha256": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8="
       },
-      "commons-io-2.16.0.jar": {
-        "sha1": "27875a7935f1ddcc13267eb6fae1f719e0409572",
-        "sha256": "sha256-0eQXkBI1+uOqDLlza66vW3Tec0mBfRxyOQ2C49g9Opc="
+      "commons-io-2.16.1.jar": {
+        "sha1": "377d592e740dc77124e0901291dbfaa6810a200e",
+        "sha256": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8="
       }
     }
   },
@@ -11878,12 +12238,12 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-bom/4.26.1",
+    "path": "com/google/protobuf/protobuf-bom/4.27.0-RC1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-bom-4.26.1.pom": {
-        "sha1": "7c6506f4a6d11e3aa7c3591c494433926eb4fefa",
-        "sha256": "sha256-hmAoc/EHNFQ9kMB/D/e/3+OXSeHCViGEwMiQmpJqbaw="
+      "protobuf-bom-4.27.0-RC1.pom": {
+        "sha1": "27a037f37e7e95b5e28ec5cd410ed99d34eb0a29",
+        "sha256": "sha256-ilnU8jEpEPRz7kIC0n8QQBt1nSyGY6xr/dQP299Bfy4="
       }
     }
   },
@@ -12129,16 +12489,16 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-java/4.26.1",
+    "path": "com/google/protobuf/protobuf-java/4.27.0-RC1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-java-4.26.1.pom": {
-        "sha1": "5d394cabfc69ca65c22694fabcc074f324a7af43",
-        "sha256": "sha256-Gqr40NPAcUMZpemmtrMDxw4PYHa3t0vTvz/bh133mXE="
+      "protobuf-java-4.27.0-RC1.pom": {
+        "sha1": "8c2f747548d2fafc3e9b057cee34c343dc47e78e",
+        "sha256": "sha256-n9A6OYpEYg/F4Um5bKFXFb/1zQkxiNk7nGaSmmj087w="
       },
-      "protobuf-java-4.26.1.jar": {
-        "sha1": "594fabdcbceb7edfb883fe621d3e97d9cc05fa73",
-        "sha256": "sha256-CRkz5YcK+BB0gyb3rOSmc6ynISUxd1QoQvBEtUbxQoI="
+      "protobuf-java-4.27.0-RC1.jar": {
+        "sha1": "f37d7fb8ab06eee5ae3dd11c121f63a8b209e74f",
+        "sha256": "sha256-MW6bDi8Ee6d42j4PgT+0lqqzysiu/qRTRiIAi2bAcyk="
       }
     }
   },
@@ -12258,12 +12618,12 @@
   },
 
   {
-    "path": "com/google/protobuf/protobuf-parent/4.26.1",
+    "path": "com/google/protobuf/protobuf-parent/4.27.0-RC1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "protobuf-parent-4.26.1.pom": {
-        "sha1": "cc071c128d5a376a30a2ecf145127532e7a17bae",
-        "sha256": "sha256-rMorllL7bwEHXmdbfDShbtGZIVlUb651lvKZ2HYnbY0="
+      "protobuf-parent-4.27.0-RC1.pom": {
+        "sha1": "59b00c8642d1166a189ebdcc529d3de170c8c56c",
+        "sha256": "sha256-mdkAVgkc3DOMTzc5ghqX3ICl1+ajWVFVWdw//1f73+E="
       }
     }
   },
@@ -15585,6 +15945,17 @@
     }
   },
 
+  {
+    "path": "org/apache/commons/commons-parent/69",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "commons-parent-69.pom": {
+        "sha1": "6ebeacd37818d945d96c06b44af10e050d2ef7c4",
+        "sha256": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
+      }
+    }
+  },
+
   {
     "path": "org/apache/httpcomponents/httpclient/4.1.1",
     "repo": "https://repo.maven.apache.org/maven2",
@@ -17141,12 +17512,12 @@
   },
 
   {
-    "path": "org/jacoco/org.jacoco.build/0.8.11",
+    "path": "org/jacoco/org.jacoco.build/0.8.12",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "org.jacoco.build-0.8.11.pom": {
-        "sha1": "e5a356ca72993fc163a454402a55c2043071d350",
-        "sha256": "sha256-W4SxXPLu8+WeuRvCJ4SDMQCwnfmRHjMZAww7xki9iws="
+      "org.jacoco.build-0.8.12.pom": {
+        "sha1": "ae9ec17957c52ffa34ec82bb59bc0a2b9b3554c0",
+        "sha256": "sha256-JQ3MmhAD6CCVkz9khpI3dS825wy4pj8s35mwyWE8Cbk="
       }
     }
   },
@@ -17167,16 +17538,16 @@
   },
 
   {
-    "path": "org/jacoco/org.jacoco.core/0.8.11",
+    "path": "org/jacoco/org.jacoco.core/0.8.12",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "org.jacoco.core-0.8.11.pom": {
-        "sha1": "e1aa8f9270a5fcc432cf0c185c871b3e4820f5e9",
-        "sha256": "sha256-u2E18Qo2NJy4SlYA/Yz3P8EpahNbLxStzYPejPJMq7E="
+      "org.jacoco.core-0.8.12.pom": {
+        "sha1": "bc76db6af48fc259f0c66ac8b6d9ce2dd73ea77b",
+        "sha256": "sha256-qgsnc3hohtUdGI1+0aQ/Z276ISeFIERb/vDMtdjL5xc="
       },
-      "org.jacoco.core-0.8.11.jar": {
-        "sha1": "2ea73c899b5d6cde2a0a5e0ca29268b37622845d",
-        "sha256": "sha256-/NGIxohHP8jcwMbKrzVeeziVAiQ1J8M7lZej7Ch5H0c="
+      "org.jacoco.core-0.8.12.jar": {
+        "sha1": "c2a45bd054bbacfe9998cbbf1a49010c62e48cbc",
+        "sha256": "sha256-/KJts3wMX71dxJhSN+uChm35eZ1Qgq+JlHWnP5H1sDU="
       }
     }
   },
@@ -18867,16 +19238,16 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta5",
+    "path": "org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-reflect-2.0.0-Beta5.pom": {
-        "sha1": "dd7f7eb5dfa88db62699bcd48d1b6e1ef4ff48fc",
-        "sha256": "sha256-vZDJOB++CfFO6xpEb8Z+gk4Geh4UEr6WVoNRB4hcpxQ="
+      "kotlin-reflect-2.0.0-RC1.pom": {
+        "sha1": "b08c97cfaffcdf60a6db35b13def6cde1aed6d31",
+        "sha256": "sha256-9NoPwtEYJp0xCTkijwRiV3ri4UFEdh0PojqTWH/nvpI="
       },
-      "kotlin-reflect-2.0.0-Beta5.jar": {
-        "sha1": "ecb1578f5e5a1fa0cec6f4e926ced14989724274",
-        "sha256": "sha256-4xzU/UOloKuez/MUVapHwTl9ZzvkJ8FjkqxNQBf+BOo="
+      "kotlin-reflect-2.0.0-RC1.jar": {
+        "sha1": "3d4ec6ec94e86fd10957c78471f98373e899dd2e",
+        "sha256": "sha256-BsavyQLOwArroQNLg97ck3PaB6kJBpyLZDwq+mAvW5w="
       }
     }
   },
@@ -20409,28 +20780,28 @@
   },
 
   {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta5",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC1",
     "repo": "https://repo.maven.apache.org/maven2",
     "files": {
-      "kotlin-stdlib-2.0.0-Beta5.pom": {
-        "sha1": "cfb0a9c66ddf657aac640d1a38169eb12de0f557",
-        "sha256": "sha256-NAO5vBthXEMJKGzn8eQ6teYhT5Brf53uG5G90li4pNk="
+      "kotlin-stdlib-2.0.0-RC1.pom": {
+        "sha1": "acf44b7e30e2500a0e1fed7bfc0c9bc6cc8fe65e",
+        "sha256": "sha256-nVnonn+ye/SexoelpxZXCz8srOtUH95WNwKKAPXf86I="
       },
-      "kotlin-stdlib-2.0.0-Beta5-all.jar": {
-        "sha1": "e18c835dd9fe6430f006ef2060595f3e5c0473bf",
-        "sha256": "sha256-o+o5Diku/+bWDD4IQjottN68NiB4sQvtHmE7qy7ru3U="
+      "kotlin-stdlib-2.0.0-RC1-all.jar": {
+        "sha1": "496ce100c4aa6dabf67dc1c0443076f42197a535",
+        "sha256": "sha256-aiXa9C5VAsj0YGF053MUD2Olq3z1Vj9CD849pASBoIo="
       },
-      "kotlin-stdlib-2.0.0-Beta5-common.jar": {
+      "kotlin-stdlib-2.0.0-RC1-common.jar": {
         "sha1": "281e03983850e590dcc0d2474758f2fa8dd0e96a",
         "sha256": "sha256-EsHDu0lApPmVlUD/tc8uLl6brNtoywDEvSidFjm9HSc="
       },
-      "kotlin-stdlib-2.0.0-Beta5.jar": {
-        "sha1": "763714203113a7f4a5477122be0c6c588df0116e",
-        "sha256": "sha256-vJdkbUp8fwtJ6An+ZapdbGVNWfM3rQziphgPVxdpfWk="
+      "kotlin-stdlib-2.0.0-RC1.jar": {
+        "sha1": "ad47aa314788daa709fe419d843fccc28a6c6edf",
+        "sha256": "sha256-u7LJuBPmGW+a+p+a3Ys5XuOEqxdjoIgOCE0pQiFPHDA="
       },
-      "kotlin-stdlib-2.0.0-Beta5.module": {
-        "sha1": "e4e16c1cf436d27d4d80cd504e636feaffbc376a",
-        "sha256": "sha256-ZBntY3Vrx0lM5sR2jdkZhsSPB1ZTdTOSi5uggHroWjk="
+      "kotlin-stdlib-2.0.0-RC1.module": {
+        "sha1": "d59c1362007ed529e61cabb999c5fba72ce232d2",
+        "sha256": "sha256-NZ7bRyR/SM+y/HVTWPsjAXt0sN1GUsynslWbvCKMu30="
       }
     }
   },

nix/deps/gradle/deps.list

@@ -53,14 +53,14 @@ androidx.core:core:1.9.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
-androidx.databinding:databinding-common:3.5.4
+androidx.databinding:databinding-common:3.5.3
 androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
 androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
 androidx.databinding:databinding-common:8.1.1
 androidx.databinding:databinding-compiler-common:3.2.1
-androidx.databinding:databinding-compiler-common:3.5.4
+androidx.databinding:databinding-compiler-common:3.5.3
 androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
@@ -164,7 +164,7 @@ com.almworks.sqlite4java:sqlite4java:1.0.392
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.1
 com.android.databinding:baseLibrary:3.2.1
-com.android.databinding:baseLibrary:3.5.4
+com.android.databinding:baseLibrary:3.5.3
 com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
@@ -173,7 +173,7 @@ com.android.databinding:baseLibrary:8.1.1
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.1
 com.android.tools.analytics-library:crash:26.2.1
-com.android.tools.analytics-library:crash:26.5.4
+com.android.tools.analytics-library:crash:26.5.3
 com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
@@ -181,7 +181,7 @@ com.android.tools.analytics-library:crash:30.3.1
 com.android.tools.analytics-library:crash:31.1.1
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
-com.android.tools.analytics-library:protos:26.5.4
+com.android.tools.analytics-library:protos:26.5.3
 com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
@@ -189,7 +189,7 @@ com.android.tools.analytics-library:protos:30.3.1
 com.android.tools.analytics-library:protos:31.1.1
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
-com.android.tools.analytics-library:shared:26.5.4
+com.android.tools.analytics-library:shared:26.5.3
 com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
@@ -197,7 +197,7 @@ com.android.tools.analytics-library:shared:30.3.1
 com.android.tools.analytics-library:shared:31.1.1
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
-com.android.tools.analytics-library:tracker:26.5.4
+com.android.tools.analytics-library:tracker:26.5.3
 com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
@@ -226,14 +226,14 @@ com.android.tools.build:aaptcompiler:7.3.1
 com.android.tools.build:aaptcompiler:8.1.1
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
-com.android.tools.build:apksig:3.5.4
+com.android.tools.build:apksig:3.5.3
 com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
 com.android.tools.build:apksig:7.2.1
 com.android.tools.build:apksig:7.3.1
 com.android.tools.build:apksig:8.1.1
 com.android.tools.build:apkzlib:3.2.1
-com.android.tools.build:apkzlib:3.5.4
+com.android.tools.build:apkzlib:3.5.3
 com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
@@ -243,7 +243,7 @@ com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.1
 com.android.tools.build:builder-model:3.2.1
-com.android.tools.build:builder-model:3.5.4
+com.android.tools.build:builder-model:3.5.3
 com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
@@ -253,7 +253,7 @@ com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.1
 com.android.tools.build:builder-test-api:3.2.1
-com.android.tools.build:builder-test-api:3.5.4
+com.android.tools.build:builder-test-api:3.5.3
 com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
@@ -263,7 +263,7 @@ com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.1
 com.android.tools.build:builder:3.2.1
-com.android.tools.build:builder:3.5.4
+com.android.tools.build:builder:3.5.3
 com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
@@ -278,7 +278,7 @@ com.android.tools.build:bundletool:1.9.0
 com.android.tools.build:bundletool:1.14.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
-com.android.tools.build:gradle-api:3.5.4
+com.android.tools.build:gradle-api:3.5.3
 com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
@@ -292,7 +292,7 @@ com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.1
 com.android.tools.build:gradle:3.2.1
-com.android.tools.build:gradle:3.5.4
+com.android.tools.build:gradle:3.5.3
 com.android.tools.build:gradle:4.1.0
 com.android.tools.build:gradle:7.0.4
 com.android.tools.build:gradle:7.2.1
@@ -301,7 +301,7 @@ com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.1
 com.android.tools.build:manifest-merger:26.2.1
-com.android.tools.build:manifest-merger:26.5.4
+com.android.tools.build:manifest-merger:26.5.3
 com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
@@ -313,7 +313,7 @@ com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.1
 com.android.tools.ddms:ddmlib:26.2.1
-com.android.tools.ddms:ddmlib:26.5.4
+com.android.tools.ddms:ddmlib:26.5.3
 com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
@@ -328,7 +328,7 @@ com.android.tools.layoutlib:layoutlib-api:24.3.1
 com.android.tools.layoutlib:layoutlib-api:24.5.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
 com.android.tools.layoutlib:layoutlib-api:26.2.1
-com.android.tools.layoutlib:layoutlib-api:26.5.4
+com.android.tools.layoutlib:layoutlib-api:26.5.3
 com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
@@ -341,7 +341,7 @@ com.android.tools.lint:lint-checks:24.3.1
 com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-gradle-api:26.2.1
-com.android.tools.lint:lint-gradle-api:26.5.4
+com.android.tools.lint:lint-gradle-api:26.5.3
 com.android.tools.lint:lint-gradle-api:27.1.0
 com.android.tools.lint:lint-model:27.1.0
 com.android.tools.lint:lint-model:30.0.4
@@ -382,7 +382,7 @@ com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.1
 com.android.tools:annotations:26.2.1
-com.android.tools:annotations:26.5.4
+com.android.tools:annotations:26.5.3
 com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
@@ -392,7 +392,7 @@ com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.1
 com.android.tools:common:26.2.1
-com.android.tools:common:26.5.4
+com.android.tools:common:26.5.3
 com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
@@ -402,7 +402,7 @@ com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.1
 com.android.tools:dvlib:26.2.1
-com.android.tools:dvlib:26.5.4
+com.android.tools:dvlib:26.5.3
 com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
@@ -410,7 +410,7 @@ com.android.tools:dvlib:30.3.1
 com.android.tools:dvlib:31.1.1
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
-com.android.tools:repository:26.5.4
+com.android.tools:repository:26.5.3
 com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
@@ -420,7 +420,7 @@ com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.1
 com.android.tools:sdklib:26.2.1
-com.android.tools:sdklib:26.5.4
+com.android.tools:sdklib:26.5.3
 com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
@@ -430,7 +430,7 @@ com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.1
 com.android.tools:sdk-common:26.2.1
-com.android.tools:sdk-common:26.5.4
+com.android.tools:sdk-common:26.5.3
 com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
@@ -942,4 +942,5 @@ org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
 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
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
+com.android.tools.build:gradle:3.5.4

nix/deps/gradle/deps.urls

@@ -68,6 +68,7 @@ https://dl.google.com/dl/android/maven2/androidx/core/core/1.9.0/core-1.9.0.pom
 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.3/databinding-common-3.5.3.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.4/databinding-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/4.1.0/databinding-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom
@@ -75,6 +76,7 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.1/databinding-common-7.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/8.1.1/databinding-common-8.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.3/databinding-compiler-common-3.5.3.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.4/databinding-compiler-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/4.1.0/databinding-compiler-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom
@@ -181,6 +183,7 @@ https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0/comm
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/runtime-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.3/baseLibrary-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom
@@ -214,6 +217,7 @@ https://dl.google.com/dl/android/maven2/com/android/support/support-v4/26.0.2/su
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/26.0.2/support-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawable/27.0.1/support-vector-drawable-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.2.1/crash-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.3/crash-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.4/crash-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom
@@ -222,6 +226,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/31.1.1/crash-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.3/protos-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom
@@ -230,6 +235,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/31.1.1/protos-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.3/shared-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom
@@ -238,6 +244,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/31.1.1/shared-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.3/tracker-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom
@@ -246,6 +253,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/31.1.1/tracker-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.3/annotations-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom
@@ -270,6 +278,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/8.1.1/aaptcompiler-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.3/apksig-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apksig-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom
@@ -277,6 +286,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.1/apksig-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/8.1.1/apksig-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.3/apkzlib-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/apkzlib-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom
@@ -285,6 +295,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.1/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/8.1.1/apkzlib-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.3/builder-model-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom
@@ -293,6 +304,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/8.1.1/builder-model-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.3/builder-test-api-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom
@@ -301,6 +313,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/8.1.1/builder-test-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.3/builder-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom
@@ -316,6 +329,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.9.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.14.0/bundletool-1.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.3/gradle-api-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom
@@ -326,6 +340,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-api/8.1.1/gradle-settings-api-8.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.3/gradle-3.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gradle-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom
@@ -342,6 +357,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifie
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta10/jetifier-processor-1.0.0-beta10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.3/manifest-merger-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom
@@ -350,6 +366,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/31.1.1/manifest-merger-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.3/common-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom
@@ -358,6 +375,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.1/common-3
 https://dl.google.com/dl/android/maven2/com/android/tools/common/31.1.1/common-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.3/ddmlib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom
@@ -366,6 +384,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.1/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/31.1.1/ddmlib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.3/dvlib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom
@@ -379,6 +398,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/31.1.1/uast-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.3/layoutlib-api-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/27.1.0/layoutlib-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom
@@ -390,6 +410,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/31.1.1/l
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/31.1.1/lint-checks-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.3/lint-gradle-api-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/31.1.1/lint-gradle-31.1.1.pom
@@ -406,6 +427,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/31.1.1/lint-
 https://dl.google.com/dl/android/maven2/com/android/tools/play-sdk-proto/31.1.1/play-sdk-proto-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.3/repository-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom
@@ -414,6 +436,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.1/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/31.1.1/repository-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.3/sdklib-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom
@@ -422,6 +445,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.1/sdklib-3
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/31.1.1/sdklib-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.3/sdk-common-26.5.3.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom
@@ -501,7 +525,7 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-co
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
-https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.0/commons-io-2.16.0.pom
+https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.1/commons-logging-1.3.1.pom
@@ -744,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.26.1/protobuf-bom-4.26.1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.27.0-RC1/protobuf-bom-4.27.0-RC1.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
@@ -761,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.26.1/protobuf-java-4.26.1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.27.0-RC1/protobuf-java-4.27.0-RC1.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
@@ -772,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.26.1/protobuf-parent-4.26.1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.27.0-RC1/protobuf-parent-4.27.0-RC1.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
@@ -1012,6 +1036,7 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/66/commons-parent-66.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/67/commons-parent-67.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1125,9 +1150,9 @@ https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-cor
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.11/org.jacoco.build-0.8.11.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.12/org.jacoco.build-0.8.12.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.11/org.jacoco.core-0.8.11.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.12/org.jacoco.core-0.8.12.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
@@ -1223,7 +1248,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-Beta5/kotlin-reflect-2.0.0-Beta5.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC1/kotlin-reflect-2.0.0-RC1.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
@@ -1325,7 +1350,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-Beta5/kotlin-stdlib-2.0.0-Beta5.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC1/kotlin-stdlib-2.0.0-RC1.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

nix/deps/gradle/generate.sh

@@ -54,7 +54,8 @@ org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
 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' \
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
+com.android.tools.build:gradle:3.5.4' \
         >> "${DEPS_LIST}"
 }
 

nix/deps/gradle/proj.list

@@ -22,7 +22,6 @@ react-native-image-resizer
 react-native-keychain
 react-native-linear-gradient
 react-native-lottie-splash-screen
-react-native-mail
 react-native-navigation
 react-native-nfc-manager
 react-native-orientation-locker

nix/overlay.nix

@@ -60,10 +60,10 @@ in {
     version = "15.0";
     allowHigher = true;
   };
-  go = super.go_1_19;
+  go = super.go_1_20;
   clang = super.clang_15;
-  buildGoPackage = super.buildGo119Package;
-  buildGoModule = super.buildGo119Module;
+  buildGoPackage = super.buildGo120Package;
+  buildGoModule = super.buildGo120Module;
   gomobile = (super.gomobile.overrideAttrs (old: {
     patches = [
       (self.fetchurl { # https://github.com/golang/mobile/pull/84

package.json

@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "1.19.3",
-    "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
+    "@react-native-camera-roll/camera-roll": "7.5.2",
     "@react-native-clipboard/clipboard": "1.13.2",
     "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
-    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status",
+    "@react-native-community/blur": "4.4.0",
     "@react-native-community/hooks": "^3.0.0",
     "@react-native-community/masked-view": "^0.1.6",
     "@react-native-community/netinfo": "^4.4.0",
@@ -48,10 +48,9 @@
     "react-native-keychain": "8.1.2",
     "react-native-linear-gradient": "^2.8.0",
     "react-native-lottie-splash-screen": "^1.0.1",
-    "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#refs/tags/v6.1.2-status",
     "react-native-navigation": "7.38.3",
     "react-native-orientation-locker": "^1.5.0",
-    "react-native-permissions": "3.8.0",
+    "react-native-permissions": "4.1.5",
     "react-native-reanimated": "3.6.1",
     "react-native-redash": "18.1.0",
     "react-native-shadow-2": "^7.0.8",
@@ -94,7 +93,6 @@
     "prettier": "^2.8.8",
     "process": "0.11.10",
     "react-test-renderer": "18.1.0",
-    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "2.26.2"
   },
   "binary": {

patches/BlurView-build.gradle.patch

@@ -0,0 +1,11 @@
+--- /tmp/tmp-status-mobile-851dbcb56/tmp.gcyqIAUEIA/build.gradle	2024-04-16 18:11:12.481819000 +0200
++++ ./node_modules/@react-native-community/blur/android/build.gradle	2024-04-16 18:11:18.889991702 +0200
+@@ -5,7 +5,7 @@
+   }
+ 
+   dependencies {
+-    classpath 'com.android.tools.build:gradle:3.5.3'
++    classpath 'com.android.tools.build:gradle:3.5.4'
+   }
+ }
+ 

patches/BlurView.ios.tsx.patch

@@ -0,0 +1,10 @@
+--- /tmp/tmp-status-mobile-61974dae4/tmp.6k5ZPUa0Hp/BlurView.ios.tsx	2024-04-16 17:07:33.229847000 +0200
++++ ./node_modules/@react-native-community/blur/src/components/BlurView.ios.tsx	2024-04-16 17:07:58.540617624 +0200
+@@ -6,6 +6,7 @@
+   | 'dark'
+   | 'light'
+   | 'xlight'
++  | 'transparent'
+   | 'prominent'
+   | 'regular'
+   | 'extraDark'

patches/BlurView.mm.patch

@@ -0,0 +1,57 @@
+--- /tmp/tmp-status-mobile-851dbcb56/tmp.beqWjtcNwi/BlurView.mm	2024-04-16 17:55:00.688450000 +0200
++++ ./node_modules/@react-native-community/blur/ios/BlurView.mm	2024-04-16 17:56:17.772952042 +0200
+@@ -73,7 +73,7 @@
+ {
+   const auto &oldViewProps = *std::static_pointer_cast<const BlurViewProps>(_props);
+   const auto &newViewProps = *std::static_pointer_cast<const BlurViewProps>(props);
+-  
++
+   if (oldViewProps.blurAmount != newViewProps.blurAmount) {
+     NSNumber *blurAmount = [NSNumber numberWithInt:newViewProps.blurAmount];
+     [self setBlurAmount:blurAmount];
+@@ -83,12 +83,12 @@
+     NSString *blurType = [NSString stringWithUTF8String:toString(newViewProps.blurType).c_str()];
+     [self setBlurType:blurType];
+   }
+-  
++
+   if (oldViewProps.reducedTransparencyFallbackColor != newViewProps.reducedTransparencyFallbackColor) {
+     UIColor *color = RCTUIColorFromSharedColor(newViewProps.reducedTransparencyFallbackColor);
+     [self setReducedTransparencyFallbackColor:color];
+   }
+-  
++
+   [super updateProps:props oldProps:oldProps];
+ }
+ #endif // RCT_NEW_ARCH_ENABLED
+@@ -131,6 +131,7 @@
+ 
+ - (UIBlurEffectStyle)blurEffectStyle
+ {
++  if ([self.blurType isEqual: @"transparent"]) return UIBlurEffectStyleDark;
+   if ([self.blurType isEqual: @"xlight"]) return UIBlurEffectStyleExtraLight;
+   if ([self.blurType isEqual: @"light"]) return UIBlurEffectStyleLight;
+   if ([self.blurType isEqual: @"dark"]) return UIBlurEffectStyleDark;
+@@ -160,7 +161,7 @@
+     if ([self.blurType isEqual: @"thinMaterialLight"]) return UIBlurEffectStyleSystemThinMaterialLight;
+     if ([self.blurType isEqual: @"ultraThinMaterialLight"]) return UIBlurEffectStyleSystemUltraThinMaterialLight;
+   #endif
+-    
++
+   #if TARGET_OS_TV
+     if ([self.blurType isEqual: @"regular"]) return UIBlurEffectStyleRegular;
+     if ([self.blurType isEqual: @"prominent"]) return UIBlurEffectStyleProminent;
+@@ -183,6 +184,13 @@
+   UIBlurEffectStyle style = [self blurEffectStyle];
+   self.blurEffect = [BlurEffectWithAmount effectWithStyle:style andBlurAmount:self.blurAmount];
+   self.blurEffectView.effect = self.blurEffect;
++
++  if ([self.blurType isEqual: @"transparent"]) {
++    for (UIView *subview in self.blurEffectView.subviews) {
++      subview.backgroundColor = [UIColor clearColor];
++    }
++  }
++
+ }
+ 
+ - (void)updateFallbackView

patches/BlurViewNativeComponent.ts.patch

@@ -0,0 +1,10 @@
+--- /tmp/tmp-status-mobile-61974dae4/tmp.NHLSFZG6LG/BlurViewNativeComponent.ts	2024-04-16 17:08:42.755929000 +0200
++++ ./node_modules/@react-native-community/blur/src/fabric/BlurViewNativeComponent.ts	2024-04-16 17:08:57.634037113 +0200
+@@ -10,6 +10,7 @@
+     | 'dark'
+     | 'light'
+     | 'xlight'
++    | 'transparent'
+     | 'prominent'
+     | 'regular'
+     | 'extraDark'

patches/CameraRoll.ts.patch

@@ -0,0 +1,22 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.re8kHerusA/CameraRoll.ts	2024-04-16 15:17:12.942432000 +0200
++++ ./node_modules/@react-native-camera-roll/camera-roll/src/CameraRoll.ts	2024-04-16 15:17:42.455250986 +0200
+@@ -239,6 +239,19 @@
+   }
+ 
+   /**
++   * Returns total iOS image count
++   */
++  static getPhotosCountiOS(): Promise<number> {
++    return RNCCameraRoll.getPhotosCountiOS('');
++  }
++  /**
++   * Returns favorites and their count iOS
++   */
++  static getFavoritesiOS(): Promise<Album> {
++    return RNCCameraRoll.getFavoritesiOS('');
++  }
++
++  /**
+    * Saves the photo or video to the camera roll or photo library, and returns the URI of the newly created asset.
+    *
+    * @deprecated `save(...)` is deprecated - use `saveAsset(...)` instead.

patches/NativeCameraRollModule.ts.patch

@@ -0,0 +1,11 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.juxTO1BeCM/NativeCameraRollModule.ts	2024-04-16 15:21:28.379979000 +0200
++++ ./node_modules/@react-native-camera-roll/camera-roll/src/NativeCameraRollModule.ts	2024-04-16 15:21:40.490391291 +0200
+@@ -81,6 +81,8 @@
+   getPhotos(params: Object): Promise<PhotoIdentifiersPage>;
+   getAlbums(params: Object): Promise<Album[]>;
+   deletePhotos(photoUris: Array<string>): Promise<void>;
++  getPhotosCountiOS(arg: string): Promise<number>;
++  getFavoritesiOS(arg: string): Promise<Album>;
+   getPhotoByInternalID(
+     internalID: string,
+     options: Object,

patches/RNCCameraRoll.mm.patch

@@ -0,0 +1,56 @@
+--- /tmp/tmp-status-mobile-3907e6b2e/tmp.O0mkyjqnsy/RNCCameraRoll.mm	2024-04-16 15:26:23.070258000 +0200
++++ ./node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm	2024-04-16 15:26:32.664996066 +0200
+@@ -955,6 +955,53 @@
+     return [albumTitles copy];
+ }
+ 
++RCT_EXPORT_METHOD(getPhotosCountiOS:(NSString *)blank
++                  resolve:(RCTPromiseResolveBlock)resolve
++                  reject:(RCTPromiseRejectBlock)reject)
++{
++    __block NSInteger intTotalCount=0;
++    PHFetchOptions *allPhotosOptions = [PHFetchOptions new];
++    allPhotosOptions.predicate = [NSPredicate predicateWithFormat:@"mediaType == %d ",PHAssetMediaTypeImage];
++    PHFetchResult *allPhotosResult = [PHAsset fetchAssetsWithOptions:allPhotosOptions];
++    intTotalCount+=allPhotosResult.count;
++
++    resolve(@(intTotalCount));
++}
++
++RCT_EXPORT_METHOD(getFavoritesiOS:(NSString *)blank
++                  resolve:(RCTPromiseResolveBlock)resolve
++                  reject:(RCTPromiseRejectBlock)reject)
++{
++    __block NSInteger intTotalCount=0;
++    PHFetchOptions *fetchOptions = [PHFetchOptions new];
++    NSString *format = @"(favorite == true)";
++    fetchOptions.predicate = [NSPredicate predicateWithFormat:format];
++    PHFetchResult<PHAsset *> *const assetsFetchResult = [PHAsset fetchAssetsWithOptions:fetchOptions];
++    PHAsset *imageAsset = [assetsFetchResult firstObject];
++    NSMutableArray * result = [NSMutableArray new];
++
++    for (PHAsset* asset in assetsFetchResult) {
++        NSArray *resources = [PHAssetResource assetResourcesForAsset:asset ];
++        if ([resources count] < 1) continue;
++        NSString *orgFilename = ((PHAssetResource*)resources[0]).originalFilename;
++        NSString *uit = ((PHAssetResource*)resources[0]).uniformTypeIdentifier;
++        NSString *mimeType = (NSString *)CFBridgingRelease(UTTypeCopyPreferredTagWithClass((__bridge CFStringRef _Nonnull)(uit), kUTTagClassMIMEType));
++        CFStringRef extension = UTTypeCopyPreferredTagWithClass((__bridge CFStringRef _Nonnull)(uit), kUTTagClassFilenameExtension);
++        [result addObject:@{
++            @"width": @([asset pixelWidth]),
++            @"height": @([asset pixelHeight]),
++            @"filename": orgFilename ?: @"",
++            @"mimeType": mimeType ?: @"",
++            @"id": [asset localIdentifier],
++            @"creationDate": [asset creationDate],
++            @"uri": [NSString stringWithFormat:@"ph://%@", [asset localIdentifier]],
++            @"duration": @([asset duration])
++        }];
++    }
++    [result addObject:@{@"count": @(assetsFetchResult.count)}];
++    resolve(result);
++}
++
+ static void checkPhotoLibraryConfig()
+ {
+ #if RCT_DEV

patches/VibrancyViewNativeComponent.ts.patch

@@ -0,0 +1,10 @@
+--- /tmp/tmp-status-mobile-61974dae4/tmp.zy6uXqO4gW/VibrancyViewNativeComponent.ts	2024-04-16 17:09:23.772623000 +0200
++++ ./node_modules/@react-native-community/blur/src/fabric/VibrancyViewNativeComponent.ts	2024-04-16 17:09:39.033737349 +0200
+@@ -10,6 +10,7 @@
+     | 'dark'
+     | 'light'
+     | 'xlight'
++    | 'transparent'
+     | 'prominent'
+     | 'regular'
+     | 'extraDark'

scripts/lint/re-frame-in-quo-components.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env sh
 
-INVALID_CHANGES=$(grep -E -r '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im\.)' --include '*.cljs' --include '*.clj' './src/quo')
+INVALID_CHANGES=$(grep -E -r '(/atom|re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im\.)' --include '*.cljs' --include '*.clj' './src/quo')
 
 if test -n "$INVALID_CHANGES"; then
-    echo "WARNING: re-frame, status-im are not allowed in quo components"
+    echo "WARNING: re-frame, status-im, reagent atoms are not allowed in quo components"
     echo ''
     echo "$INVALID_CHANGES"
     exit 1

src/legacy/status_im/bottom_sheet/events.cljs

@@ -1,31 +0,0 @@
-(ns legacy.status-im.bottom-sheet.events
-  (:require
-    [utils.re-frame :as rf]))
-
-(rf/defn show-bottom-sheet-old
-  [{:keys [db]} {:keys [view options]}]
-  {:dismiss-keyboard              nil
-   :show-bottom-sheet-overlay-old nil
-   :db                            (assoc db
-                                         :bottom-sheet/show?   true
-                                         :bottom-sheet/view    view
-                                         :bottom-sheet/options options)})
-
-(rf/defn show-bottom-sheet-event
-  {:events [:bottom-sheet/show-sheet-old]}
-  [cofx view options]
-  (show-bottom-sheet-old
-   cofx
-   {:view    view
-    :options options}))
-
-(rf/defn hide-bottom-sheet-old
-  {:events [:bottom-sheet/hide-old]}
-  [{:keys [db]}]
-  {:db                               (assoc db :bottom-sheet/show? false)
-   :dismiss-bottom-sheet-overlay-old nil})
-
-(rf/defn hide-bottom-sheet-navigation-overlay
-  {:events [:bottom-sheet/hide-old-navigation-overlay]}
-  [{}]
-  {:dismiss-bottom-sheet-overlay-old nil})

src/legacy/status_im/bottom_sheet/sheets.cljs

@@ -1,38 +0,0 @@
-(ns legacy.status-im.bottom-sheet.sheets
-  (:require
-    [legacy.status-im.bottom-sheet.view :as bottom-sheet]
-    [legacy.status-im.ui.screens.about-app.views :as about-app]
-    [legacy.status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
-    [quo.theme :as theme]
-    [react-native.core :as rn]
-    [utils.re-frame :as rf]))
-
-(defn bottom-sheet
-  []
-  (let [dismiss-bottom-sheet-callback (fn []
-                                        (rf/dispatch [:bottom-sheet/hide-old])
-                                        true)
-        {:keys [show? view options]} (rf/sub [:bottom-sheet-old])
-        {:keys [content]
-         :as   opts}
-        (cond-> {:visible? show?}
-          (map? view)
-          (merge view)
-
-          (= view :mobile-network-offline)
-          (merge mobile-network-settings/offline-sheet)
-
-          (= view :learn-more)
-          (merge about-app/learn-more))
-        page-theme (:theme options)]
-
-    [:f>
-     (fn []
-       (rn/use-mount (fn []
-                       (rn/hw-back-add-listener dismiss-bottom-sheet-callback)
-                       (fn []
-                         (rn/hw-back-remove-listener dismiss-bottom-sheet-callback))))
-       [theme/provider {:theme (or page-theme (theme/get-theme))}
-        [bottom-sheet/bottom-sheet opts
-         (when content
-           [content (when options options)])]])]))

src/legacy/status_im/bottom_sheet/styles.cljs

@@ -1,59 +0,0 @@
-(ns legacy.status-im.bottom-sheet.styles
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(def border-radius 20)
-
-(defn handle
-  [override-theme]
-  {:position         :absolute
-   :top              8
-   :width            32
-   :height           4
-   :background-color (colors/theme-colors colors/neutral-100 colors/white override-theme)
-   :opacity          0.1
-   :border-radius    100
-   :align-self       :center})
-
-(def backdrop
-  {:position :absolute
-   :left     0
-   :right    0
-   :bottom   0
-   :top      0})
-
-(def backdrop-color
-  {:background-color colors/neutral-100})
-
-(def container
-  {:position :absolute
-   :left     0
-   :right    0
-   :top      0
-   :bottom   0
-   :overflow :hidden})
-
-(defn content-style
-  [insets bottom-safe-area-spacing?]
-  {:position       :absolute
-   :left           0
-   :right          0
-   :top            0
-   :padding-top    border-radius
-   :padding-bottom (if bottom-safe-area-spacing? (:bottom insets) 0)})
-
-(defn selected-background
-  [override-theme]
-  {:border-radius     12
-   :padding-left      12
-   :margin-horizontal 8
-   :margin-bottom     10
-   :height            48
-   :background-color  (colors/theme-colors colors/white colors/neutral-90 override-theme)})
-
-(defn background
-  [override-theme]
-  {:background-color        (colors/theme-colors colors/white colors/neutral-95 override-theme)
-   :flex                    1
-   :border-top-left-radius  border-radius
-   :border-top-right-radius border-radius})

src/legacy/status_im/bottom_sheet/view.cljs

@@ -1,240 +0,0 @@
-(ns legacy.status-im.bottom-sheet.view
-  (:require
-    [legacy.status-im.bottom-sheet.styles :as styles]
-    [oops.core :refer [oget]]
-    [re-frame.core :as re-frame]
-    [react-native.background-timer :as timer]
-    [react-native.core :as react]
-    [react-native.core :as rn]
-    [react-native.gesture :as gesture]
-    [react-native.hooks :as hooks]
-    [react-native.platform :as platform]
-    [react-native.reanimated :as reanimated]
-    [react-native.safe-area :as safe-area]
-    [reagent.core :as reagent]
-    [utils.worklets.bottom-sheet :as worklets.bottom-sheet]))
-
-(def animation-delay 450)
-
-(defn with-animation
-  [value]
-  (reanimated/with-spring
-   value
-   (clj->js {:mass      2
-             :stiffness 500
-             :damping   200})))
-
-(defn get-bottom-sheet-gesture
-  [pan-y translate-y bg-height bg-height-expanded
-   window-height keyboard-shown disable-drag? expandable?
-   show-bottom-sheet? expanded? close-bottom-sheet gesture-running?]
-  (-> (gesture/gesture-pan)
-      (gesture/on-start
-       (fn [_]
-         (reset! gesture-running? true)
-         (when (and keyboard-shown (not disable-drag?) show-bottom-sheet?)
-           (re-frame/dispatch [:dismiss-keyboard]))))
-      (gesture/on-update
-       (fn [evt]
-         (when (and (not disable-drag?) show-bottom-sheet?)
-           (let [max-pan-up   (if (or @expanded? (not expandable?))
-                                0
-                                (- (- bg-height-expanded bg-height)))
-                 max-pan-down (if @expanded?
-                                bg-height-expanded
-                                bg-height)]
-             (reanimated/set-shared-value pan-y
-                                          (max
-                                           (min
-                                            (.-translationY evt)
-                                            max-pan-down)
-                                           max-pan-up))))))
-      (gesture/on-end
-       (fn [_]
-         (reset! gesture-running? false)
-         (when (and (not disable-drag?) show-bottom-sheet?)
-           (let [end-pan-y                  (- window-height (.-value translate-y))
-                 expand-threshold           (min (* bg-height 1.1) (+ bg-height 50))
-                 collapse-threshold         (max (* bg-height-expanded 0.9) (- bg-height-expanded 50))
-                 should-close-bottom-sheet? (< end-pan-y (max (* bg-height 0.7) 50))]
-             (cond
-               should-close-bottom-sheet?
-               (close-bottom-sheet)
-
-               (and (not @expanded?) (> end-pan-y expand-threshold))
-               (reset! expanded? true)
-
-               (and @expanded? (< end-pan-y collapse-threshold))
-               (reset! expanded? false))))))))
-
-(defn handle-view
-  [window-width override-theme]
-  [rn/view
-   {:style {:width            window-width
-            :position         :absolute
-            :background-color :transparent
-            :top              0
-            :height           20}}
-   [rn/view {:style (styles/handle override-theme)}]])
-
-(defn bottom-sheet
-  [props children]
-  (let [{on-cancel                 :on-cancel
-         disable-drag?             :disable-drag?
-         show-handle?              :show-handle?
-         visible?                  :visible?
-         backdrop-dismiss?         :backdrop-dismiss?
-         expandable?               :expandable?
-         bottom-safe-area-spacing? :bottom-safe-area-spacing?
-         selected-item             :selected-item
-         is-initially-expanded?    :expanded?
-         override-theme            :override-theme
-         :or                       {show-handle?              true
-                                    backdrop-dismiss?         true
-                                    expandable?               false
-                                    bottom-safe-area-spacing? true
-                                    is-initially-expanded?    false}}
-        props
-        content-height (reagent/atom nil)
-        show-bottom-sheet? (reagent/atom nil)
-        keyboard-was-shown? (reagent/atom false)
-        expanded? (reagent/atom is-initially-expanded?)
-        gesture-running? (reagent/atom false)
-        reset-atoms (fn []
-                      (reset! show-bottom-sheet? nil)
-                      (reset! content-height nil)
-                      (reset! expanded? false)
-                      (reset! keyboard-was-shown? false)
-                      (reset! gesture-running? false))
-        close-bottom-sheet (fn []
-                             (reset! show-bottom-sheet? false)
-                             (when (fn? on-cancel) (on-cancel))
-                             (timer/set-timeout
-                              #(do
-                                 (re-frame/dispatch [:bottom-sheet/hide-old-navigation-overlay])
-                                 (reset-atoms))
-                              animation-delay))]
-    [:f>
-     (fn []
-       (let [{height       :height
-              window-width :width}
-             (rn/get-window)
-             window-height (if selected-item (- height 72) height)
-             {:keys [keyboard-shown]} (hooks/use-keyboard)
-             insets (safe-area/get-insets)
-             bg-height-expanded (- window-height (:top insets))
-             bg-height (max (min @content-height bg-height-expanded) 109)
-             bottom-sheet-dy (reanimated/use-shared-value 0)
-             pan-y (reanimated/use-shared-value 0)
-             translate-y (worklets.bottom-sheet/use-translate-y window-height bottom-sheet-dy pan-y)
-             bg-opacity
-             (worklets.bottom-sheet/use-background-opacity translate-y bg-height window-height 0.7)
-             on-content-layout (fn [evt]
-                                 (let [height (oget evt "nativeEvent" "layout" "height")]
-                                   (reset! content-height height)))
-             on-expanded (fn []
-                           (reanimated/set-shared-value bottom-sheet-dy bg-height-expanded)
-                           (reanimated/set-shared-value pan-y 0))
-             on-collapsed (fn []
-                            (reanimated/set-shared-value bottom-sheet-dy bg-height)
-                            (reanimated/set-shared-value pan-y 0))
-             bottom-sheet-gesture (get-bottom-sheet-gesture
-                                   pan-y
-                                   translate-y
-                                   bg-height
-                                   bg-height-expanded
-                                   window-height
-                                   keyboard-shown
-                                   disable-drag?
-                                   expandable?
-                                   show-bottom-sheet?
-                                   expanded?
-                                   close-bottom-sheet
-                                   gesture-running?)
-             handle-comp [gesture/gesture-detector {:gesture bottom-sheet-gesture}
-                          [handle-view window-width override-theme]]]
-
-         (react/use-effect #(do
-                              (cond
-                                (and
-                                 (nil? @show-bottom-sheet?)
-                                 visible?
-                                 (some? @content-height)
-                                 (> @content-height 0))
-                                (reset! show-bottom-sheet? true)
-
-                                (and @show-bottom-sheet? (not visible?))
-                                (close-bottom-sheet)))
-                           [@show-bottom-sheet? @content-height visible?])
-         (react/use-effect #(do
-                              (when @show-bottom-sheet?
-                                (cond
-                                  keyboard-shown
-                                  (do
-                                    (reset! keyboard-was-shown? true)
-                                    (reset! expanded? true))
-                                  (and @keyboard-was-shown? (not keyboard-shown))
-                                  (reset! expanded? false))))
-                           [@show-bottom-sheet? @keyboard-was-shown? keyboard-shown])
-         (react/use-effect #(do
-                              (when-not @gesture-running?
-                                (cond
-                                  @show-bottom-sheet?
-                                  (if @expanded?
-                                    (do
-                                      (reanimated/set-shared-value
-                                       bottom-sheet-dy
-                                       (with-animation (+ bg-height-expanded (.-value pan-y))))
-                                      ;; Workaround for
-                                      ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741
-                                      ;; withTiming/withSpring callback not working on-expanded
-                                      ;; should be called as a callback of with-animation instead,
-                                      ;; once this issue has been resolved
-                                      (timer/set-timeout on-expanded animation-delay))
-                                    (do
-                                      (reanimated/set-shared-value
-                                       bottom-sheet-dy
-                                       (with-animation (+ bg-height (.-value pan-y))))
-                                      ;; Workaround for
-                                      ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741
-                                      ;; withTiming/withSpring callback not working on-collapsed
-                                      ;; should be called as a callback of with-animation instead,
-                                      ;; once this issue has been resolved
-                                      (timer/set-timeout on-collapsed animation-delay)))
-
-                                  (= @show-bottom-sheet? false)
-                                  (reanimated/set-shared-value bottom-sheet-dy (with-animation 0)))))
-                           [@show-bottom-sheet? @expanded? @gesture-running?])
-
-         [:<>
-          [rn/pressable
-           {:on-press (when backdrop-dismiss? close-bottom-sheet)
-            :style    styles/backdrop}
-           [reanimated/view
-            {:style (reanimated/apply-animations-to-style
-                     {:opacity bg-opacity}
-                     styles/backdrop-color)}]]
-          (cond->> [reanimated/view
-                    {:style (reanimated/apply-animations-to-style
-                             {:transform [{:translateY translate-y}]}
-                             {:width  window-width
-                              :height window-height})}
-                    [rn/view {:style styles/container}
-                     (when selected-item
-                       [rn/view {:style (styles/selected-background override-theme)}
-                        [selected-item]])
-                     [rn/view {:style (styles/background override-theme)}
-                      [rn/keyboard-avoiding-view
-                       {:behaviour (if platform/ios? :padding :height)
-                        :style     {:flex 1}}
-                       [rn/view
-                        {:style     (styles/content-style insets bottom-safe-area-spacing?)
-                         :on-layout (when-not (and
-                                               (some? @content-height)
-                                               (> @content-height 0))
-                                      on-content-layout)}
-                        children]]
-                      (when show-handle?
-                        handle-comp)]]]
-            (not show-handle?)
-            (conj [gesture/gesture-detector {:gesture bottom-sheet-gesture}]))]))]))

src/legacy/status_im/browser/core.cljs

@@ -2,7 +2,6 @@
   (:require
     ["eth-phishing-detect" :as eth-phishing-detect]
     [clojure.string :as string]
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
     [legacy.status-im.browser.permissions :as browser.permissions]
     [legacy.status-im.browser.webview-ref :as webview-ref]
     [legacy.status-im.ethereum.ens :as ens]
@@ -519,7 +518,7 @@
   [{:keys [db] :as cofx} address]
   (rf/merge cofx
             {:browser/clear-web-data nil}
-            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/hide-bottom-sheet)
             (browser.permissions/clear-dapps-permissions)
             (multiaccounts.update/multiaccount-update :dapps-address address {})
             #(when (= (:view-id db) :browser)

src/legacy/status_im/communities/core.cljs

@@ -1,9 +1,9 @@
 (ns legacy.status-im.communities.core
   (:require
     [clojure.set :as set]
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
     legacy.status-im.communities.e2e
     [re-frame.core :as re-frame]
+    [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
@@ -22,60 +22,10 @@
           {}
           requests))
 
-(defn- fetch-community-id-input
-  [{:keys [db]}]
-  (:communities/community-id-input db))
-
 (rf/defn handle-response
   [_ response-js]
   {:dispatch [:sanitize-messages-and-process-response response-js]})
 
-(rf/defn invite-users
-  {:events [::invite-people-confirmation-pressed]}
-  [cofx user-pk contacts]
-  (let [community-id (fetch-community-id-input cofx)
-        pks          (if (seq user-pk)
-                       (conj contacts user-pk)
-                       contacts)]
-    (when (seq pks)
-      {:json-rpc/call [{:method      "wakuext_inviteUsersToCommunity"
-                        :params      [{:communityId community-id
-                                       :users       pks}]
-                        :js-response true
-                        :on-success  #(re-frame/dispatch [::people-invited %])
-                        :on-error    #(do
-                                        (log/error "failed to invite-user community" %)
-                                        (re-frame/dispatch [::failed-to-invite-people %]))}]})))
-
-(rf/defn share-community
-  {:events [::share-community-confirmation-pressed]}
-  [cofx user-pk contacts]
-  (let [community-id (fetch-community-id-input cofx)
-        pks          (if (seq user-pk)
-                       (conj contacts user-pk)
-                       contacts)]
-    (when (seq pks)
-      {:json-rpc/call [{:method      "wakuext_shareCommunity"
-                        :params      [{:communityId community-id
-                                       :users       pks}]
-                        :js-response true
-                        :on-success  #(re-frame/dispatch [::people-invited %])
-                        :on-error    #(do
-                                        (log/error "failed to invite-user community" %)
-                                        (re-frame/dispatch [::failed-to-share-community %]))}]})))
-
-(re-frame/reg-event-fx :communities/invite-people-pressed
- (fn [{:keys [db]} [id]]
-   {:db (assoc db :communities/community-id-input id)
-    :fx [[:dispatch [:hide-bottom-sheet]]
-         [:dispatch [:open-modal :legacy-invite-people-community {:invite? true}]]]}))
-
-(re-frame/reg-event-fx :communities/share-community-pressed
- (fn [{:keys [db]} [id]]
-   {:db (assoc db :communities/community-id-input id)
-    :fx [[:dispatch [:hide-bottom-sheet]]
-         [:dispatch [:open-modal :legacy-invite-people-community {}]]]}))
-
 (rf/defn people-invited
   {:events [::people-invited]}
   [cofx response-js]
@@ -83,12 +33,13 @@
             (navigation/navigate-back)
             (handle-response response-js)))
 
-(re-frame/reg-event-fx ::member-banned
- (fn [{:keys [db]} [response-js]]
-   {:db (assoc db :bottom-sheet/show? false)
-    :fx [[:dismiss-bottom-sheet-overlay-old]
-         [:sanitize-messages-and-process-response response-js]
-         [:activity-center.notifications/fetch-unread-count]]}))
+(rf/defn member-banned
+  {:events [::member-banned]}
+  [cofx response-js]
+  (rf/merge cofx
+            (navigation/hide-bottom-sheet)
+            (handle-response response-js)
+            (activity-center/notifications-fetch-unread-count)))
 
 (rf/defn member-ban
   {:events [::member-ban]}
@@ -107,7 +58,7 @@
   {:events [::member-kicked]}
   [cofx response-js]
   (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/hide-bottom-sheet)
             (handle-response response-js)))
 
 (rf/defn member-kick
@@ -141,7 +92,7 @@
   {:events [:community.member/role-updated]}
   [cofx response-js]
   (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/hide-bottom-sheet)
             (handle-response response-js)))
 
 (rf/defn add-role-to-member

src/legacy/status_im/contact/block.cljs

@@ -1,99 +0,0 @@
-(ns legacy.status-im.contact.block
-  (:require
-    [legacy.status-im.contact.db :as contact.db]
-    [legacy.status-im.data-store.chats :as chats-store]
-    [legacy.status-im.utils.deprecated-types :as types]
-    [re-frame.core :as re-frame]
-    [status-im.contexts.chat.contacts.events :as contacts-store]
-    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
-    [status-im.navigation.events :as navigation]
-    [utils.re-frame :as rf]))
-
-(rf/defn clean-up-chat
-  [{:keys [db]}
-   public-key
-   {:keys [chat-id
-           unviewed-messages-count
-           unviewed-mentions-count
-           last-message]}]
-  (let [removed-messages-ids (keep
-                              (fn [[message-id {:keys [from]}]]
-                                (when (= from public-key)
-                                  message-id))
-                              (get-in db [:messages chat-id]))
-        db                   (-> db
-                                 ;; remove messages
-                                 (update-in [:messages chat-id]
-                                            #(apply dissoc % removed-messages-ids))
-                                 (update-in [:chats chat-id]
-                                            assoc
-                                            :unviewed-messages-count unviewed-messages-count
-                                            :unviewed-mentions-count unviewed-mentions-count
-                                            :last-message            last-message))]
-    {:db (assoc-in db
-          [:message-lists chat-id]
-          (message-list/add-many nil (vals (get-in db [:messages chat-id]))))}))
-
-(rf/defn contact-blocked
-  {:events [:contacts/blocked]}
-  [{:keys [db] :as cofx} {:keys [public-key]} chats-js]
-  (let [fxs (when chats-js
-              (map #(->> (chats-store/<-rpc %)
-                         (clean-up-chat public-key))
-                   (types/js->clj chats-js)))]
-    (apply
-     rf/merge
-     cofx
-     {:db (->
-            db
-            (update :chats dissoc public-key)
-            (update :chats-home-list disj public-key)
-            (assoc-in [:contacts/contacts public-key
-                       :added?]
-                      false))
-      :fx [[:activity-center.notifications/fetch-unread-count]
-           [:effects/push-notifications-clear-message-notifications [public-key]]
-           [:dispatch-later
-            [{:ms       500
-              :dispatch [:chat.ui/close-and-remove-chat public-key]}]]]}
-     fxs)))
-
-(rf/defn block-contact
-  {:events [:contact.ui/block-contact-confirmed]}
-  [{:keys [db] :as cofx} public-key]
-  (let [contact               (-> (contact.db/public-key->contact
-                                   (:contacts/contacts db)
-                                   public-key)
-                                  (assoc :blocked? true
-                                         :added?   false
-                                         :active?  false))
-        current-chat-id       (:current-chat-id db)
-        from-one-to-one-chat? (not (get-in db [:chats current-chat-id :group-chat]))]
-    (rf/merge cofx
-              {:db (assoc-in db [:contacts/contacts public-key] contact)}
-              (contacts-store/block
-               public-key
-               (fn [^js block-contact]
-                 (re-frame/dispatch [:contacts/blocked contact (.-chats block-contact)])
-                 (re-frame/dispatch [:sanitize-messages-and-process-response block-contact])
-                 (re-frame/dispatch [:hide-popover])))
-              ;; reset navigation to avoid going back to non existing one to one chat
-              (when current-chat-id
-                (if from-one-to-one-chat?
-                  (navigation/pop-to-root :shell-stack)
-                  (navigation/navigate-back))))))
-
-(rf/defn contact-unblocked
-  {:events [:contacts/unblocked]}
-  [{:keys [db]} contact-id]
-  (let [contact (-> (get-in db [:contacts/contacts contact-id])
-                    (assoc :blocked? false))]
-    {:db (assoc-in db [:contacts/contacts contact-id] contact)}))
-
-(rf/defn unblock-contact
-  {:events [:contact.ui/unblock-contact-pressed]}
-  [cofx contact-id]
-  (contacts-store/unblock
-   cofx
-   contact-id
-   #(re-frame/dispatch [:contacts/unblocked contact-id])))

src/legacy/status_im/contact/db.cljs

@@ -1,87 +0,0 @@
-(ns legacy.status-im.contact.db
-  (:require
-    [clojure.set :as set]
-    [clojure.string :as string]
-    [status-im.constants :as constants]
-    [utils.address :as address]))
-
-(defn public-key-and-ens-name->new-contact
-  [public-key ens-name]
-  (let [contact {:public-key public-key}]
-    (if ens-name
-      (-> contact
-          (assoc :ens-name ens-name)
-          (assoc :ens-verified true)
-          (assoc :name ens-name))
-      contact)))
-
-(defn public-key->contact
-  [contacts public-key]
-  (when public-key
-    (get contacts public-key {:public-key public-key})))
-
-(defn- contact-by-address
-  [[addr contact] address]
-  (when (address/address= addr address)
-    contact))
-
-(defn find-contact-by-address
-  [contacts address]
-  (some #(contact-by-address % address) contacts))
-
-(defn sort-contacts
-  [contacts]
-  (sort (fn [c1 c2]
-          (let [name1 (:primary-name c1)
-                name2 (:primary-name c2)]
-            (when (and name1 name2)
-              (compare (string/lower-case name1)
-                       (string/lower-case name2)))))
-        (vals contacts)))
-
-(defn query-chat-contacts
-  [{:keys [contacts]} all-contacts query-fn]
-  (let [participant-set (into #{} (filter identity) contacts)]
-    (query-fn (comp participant-set :public-key) (vals all-contacts))))
-
-(defn get-all-contacts-in-group-chat
-  [members admins contacts {:keys [public-key preferred-name name display-name] :as current-account}]
-  (let [current-contact (some->
-                          current-account
-                          (select-keys [:name :preferred-name :public-key :images :compressed-key])
-                          (set/rename-keys {:name :alias :preferred-name :name})
-                          (assoc :primary-name (or display-name preferred-name name)))
-        all-contacts    (cond-> contacts
-                          current-contact
-                          (assoc public-key current-contact))]
-    (->> members
-         (map #(or (get all-contacts %)
-                   {:public-key %}))
-         (sort-by (comp string/lower-case
-                        (fn [{:keys [primary-name name alias public-key]}]
-                          (or primary-name
-                              name
-                              alias
-                              public-key))))
-         (map #(if (get admins (:public-key %))
-                 (assoc % :admin? true)
-                 %)))))
-
-(defn enrich-contact
-  ([contact] (enrich-contact contact nil nil))
-  ([{:keys [public-key] :as contact} setting own-public-key]
-   (cond-> contact
-     (and setting
-          (not= public-key own-public-key)
-          (or (= setting constants/profile-pictures-visibility-none)
-              (and (= setting constants/profile-pictures-visibility-contacts-only)
-                   (not (:added? contact)))))
-     (dissoc :images))))
-
-(defn enrich-contacts
-  [contacts profile-pictures-visibility own-public-key]
-  (reduce-kv
-   (fn [acc public-key contact]
-     (assoc acc public-key (enrich-contact contact profile-pictures-visibility own-public-key)))
-   {}
-   contacts))

src/legacy/status_im/contact/db_test.cljs

@@ -1,49 +0,0 @@
-(ns legacy.status-im.contact.db-test
-  (:require [cljs.test :refer-macros [deftest is testing]]
-            [legacy.status-im.contact.db :as contact.db]))
-
-(deftest contacts-subs
-  (testing "get-all-contacts-in-group-chat"
-    (let
-      [chat-contact-ids
-       #{"0x04fcf40c526b09ff9fb22f4a5dbd08490ef9b64af700870f8a0ba2133f4251d5607ed83cd9047b8c2796576bc83fa0de23a13a4dced07654b8ff137fe744047917"
-         "0x04985040682b77a32bb4bb58268a0719bd24ca4d07c255153fe1eb2ccd5883669627bd1a092d7cc76e8e4b9104327667b19dcda3ac469f572efabe588c38c1985f"
-         "0x048a2f8b80c60f89a91b4c1316e56f75b087f446e7b8701ceca06a40142d8efe1f5aa36bd0fee9e248060a8d5207b43ae98bef4617c18c71e66f920f324869c09f"}
-       admins
-       #{"0x04fcf40c526b09ff9fb22f4a5dbd08490ef9b64af700870f8a0ba2133f4251d5607ed83cd9047b8c2796576bc83fa0de23a13a4dced07654b8ff137fe744047917"}
-
-       contacts
-       {"0x04985040682b77a32bb4bb58268a0719bd24ca4d07c255153fe1eb2ccd5883669627bd1a092d7cc76e8e4b9104327667b19dcda3ac469f572efabe588c38c1985f"
-        {:last-updated 0
-         :name "User B"
-         :primary-name "User B"
-         :last-online 0
-         :public-key
-         "0x04985040682b77a32bb4bb58268a0719bd24ca4d07c255153fe1eb2ccd5883669627bd1a092d7cc76e8e4b9104327667b19dcda3ac469f572efabe588c38c1985f"}}
-       current-multiaccount
-       {:last-updated 0
-        :signed-up? true
-        :sharing-usage-data? false
-        :primary-name "User A"
-        :name "User A"
-        :public-key
-        "0x048a2f8b80c60f89a91b4c1316e56f75b087f446e7b8701ceca06a40142d8efe1f5aa36bd0fee9e248060a8d5207b43ae98bef4617c18c71e66f920f324869c09f"}]
-      (is
-       (=
-        (contact.db/get-all-contacts-in-group-chat chat-contact-ids
-                                                   admins
-                                                   contacts
-                                                   current-multiaccount)
-        [{:admin? true
-          :public-key
-          "0x04fcf40c526b09ff9fb22f4a5dbd08490ef9b64af700870f8a0ba2133f4251d5607ed83cd9047b8c2796576bc83fa0de23a13a4dced07654b8ff137fe744047917"}
-         {:alias "User A"
-          :primary-name "User A"
-          :public-key
-          "0x048a2f8b80c60f89a91b4c1316e56f75b087f446e7b8701ceca06a40142d8efe1f5aa36bd0fee9e248060a8d5207b43ae98bef4617c18c71e66f920f324869c09f"}
-         {:last-updated 0
-          :name "User B"
-          :primary-name "User B"
-          :last-online 0
-          :public-key
-          "0x04985040682b77a32bb4bb58268a0719bd24ca4d07c255153fe1eb2ccd5883669627bd1a092d7cc76e8e4b9104327667b19dcda3ac469f572efabe588c38c1985f"}])))))

src/legacy/status_im/ens/core.cljs

@@ -3,7 +3,6 @@
   (:require
     [clojure.set :as set]
     [clojure.string :as string]
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
     [legacy.status-im.ethereum.ens :as ens]
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
     [legacy.status-im.utils.random :as random]
@@ -288,7 +287,7 @@
   [{:keys [db] :as cofx} _ {:keys [address]}]
   (rf/merge cofx
             {:db (assoc-in db [:ens/registration :address] address)}
-            (bottom-sheet/hide-bottom-sheet-old)))
+            (navigation/hide-bottom-sheet)))
 
 (rf/defn save-preferred-name
   {:events [::save-preferred-name]}

src/legacy/status_im/events.cljs

@@ -5,7 +5,6 @@
     legacy.status-im.browser.core
     legacy.status-im.browser.permissions
     legacy.status-im.chat.models.loading
-    legacy.status-im.contact.block
     legacy.status-im.currency.core
     legacy.status-im.data-store.chats
     legacy.status-im.data-store.switcher-cards
@@ -189,8 +188,8 @@
                :db                        (assoc db :screens/was-focused-once? true)}
 
               (not (get db :screens/was-focused-once?))
-              {:db (assoc db :screens/was-focused-once? true)})
-  ))
+              {:db (assoc db :screens/was-focused-once? true)})))
+
 
 ;;TODO :replace by named events
 (rf/defn set-event

src/legacy/status_im/mobile_sync_settings/core.cljs

@@ -1,6 +1,5 @@
 (ns legacy.status-im.mobile-sync-settings.core
   (:require
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
     [legacy.status-im.mailserver.core :as mailserver]
     [legacy.status-im.multiaccounts.model :as multiaccounts.model]
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
@@ -31,7 +30,7 @@
               (assoc :mailserver/current-request true))
         :fx [(when fetch-historic-messages?
                [:mailserver/request-all-historic-messages])
-             [:dismiss-bottom-sheet-overlay-old]
+             [:dispatch [:hide-bottom-sheet]]
              (when previously-initialized?
                (let [new-identity-input (get-in db [:contacts/new-identity :input])]
                  [:dispatch [:contacts/set-new-identity {:input new-identity-input}]]))]}
@@ -101,10 +100,10 @@
   [cofx]
   (rf/merge
    cofx
-   (bottom-sheet/hide-bottom-sheet-old)
+   (navigation/hide-bottom-sheet)
    (navigation/navigate-to :mobile-network-settings nil)))
 
 (rf/defn mobile-network-show-offline-sheet
   {:events [:mobile-network/show-offline-sheet]}
   [cofx]
-  (bottom-sheet/hide-bottom-sheet-old cofx))
+  (navigation/hide-bottom-sheet cofx))

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

@@ -59,7 +59,7 @@
                                      :selected-storage-type :default
                                      :selected-id           (-> result first :id)
                                      :step                  :choose-key))))
-   :navigate-to :choose-name})
+   :navigate-to [:choose-name (:theme db)]})
 
 (rf/defn generate-and-derive-addresses
   {:events [:generate-and-derive-addresses]}

src/legacy/status_im/node/core.cljs

@@ -3,7 +3,8 @@
     [clojure.string :as string]
     [legacy.status-im.utils.deprecated-types :as types]
     [react-native.platform :as platform]
-    [status-im.config :as config]))
+    [status-im.config :as config]
+    [utils.ethereum.chain :as chain]))
 
 (defn- add-log-level
   [config log-level]
@@ -105,7 +106,7 @@
     (some #(string/includes? (str %) "waku") ks)))
 
 (defn get-multiaccount-node-config
-  [{:keys [profile/profile :networks/networks :networks/current-network]
+  [{:keys [profile/profile :networks/current-network]
     :as   db}]
   (let [wakuv2-config (get profile :wakuv2-config {})
         fleet-key (current-fleet-key db)
@@ -116,7 +117,10 @@
         {:keys [installation-id log-level
                 waku-bloom-filter-mode]}
         profile]
-    (cond-> (get-in networks [current-network :config])
+    (cond-> {:NetworkId      (chain/chain-keyword->chain-id :mainnet)
+             :DataDir        "/ethereum/mainnet_rpc"
+             :UpstreamConfig {:Enabled true
+                              :URL     config/mainnet-rpc-url}}
       :always
       (get-base-node-config)
 
@@ -173,5 +177,3 @@
 
       :always
       (add-log-level log-level))))
-
-

src/legacy/status_im/ui/components/chat_icon/screen.cljs

@@ -8,7 +8,7 @@
     [legacy.status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils]
     [quo.components.avatars.user-avatar.style :as user-avatar.style]
     [quo.core :as quo]
-    [quo.theme :as theme]
+    [quo.theme]
     [re-frame.core :as re-frame.core]
     [react-native.core :as rn]
     [status-im.contexts.profile.utils :as profile.utils]
@@ -52,7 +52,8 @@
 
 (defn profile-photo-plus-dot-view
   [{:keys [public-key full-name customization-color photo-container photo-path community?]}]
-  (let [photo-container         (if (nil? photo-container)
+  (let [theme                   @(re-frame.core/subscribe [:theme])
+        photo-container         (if (nil? photo-container)
                                   styles/container-chat-list
                                   photo-container)
         size                    (:width photo-container)
@@ -71,8 +72,7 @@
                {:size             size
                 :full-name        full-name
                 :font-size        (get text-style :font-size)
-                :background-color (user-avatar.style/customization-color customization-color
-                                                                         (theme/get-theme))
+                :background-color (user-avatar.style/customization-color customization-color theme)
                 :indicator-size   0
                 :indicator-border 0
                 :indicator-color  "#000000"

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

@@ -2,6 +2,7 @@
   (:require
     [legacy.status-im.ui.components.core :as quo]
     [quo.foundations.colors :as quo.colors]
+    [quo.theme]
     [re-frame.core :as re-frame]
     [react-native.safe-area :as safe-area]))
 
@@ -32,7 +33,8 @@
     :or   {border-bottom? true
            new-ui?        false}
     :as   props}]
-  (let [navigation (if (= navigation :none)
+  (let [theme      (quo.theme/use-theme)
+        navigation (if (= navigation :none)
                      nil
                      [(default-navigation modal? navigation)])]
     [quo/header
@@ -47,4 +49,5 @@
               {:right-accessories right-accessories})
             (when new-ui?
               {:background (quo.colors/theme-colors quo.colors/neutral-5
-                                                    quo.colors/neutral-95)}))]))
+                                                    quo.colors/neutral-95
+                                                    theme)}))]))

src/legacy/status_im/ui/screens/browser/empty_tab/views.cljs

@@ -31,7 +31,7 @@
         :on-press            #(re-frame/dispatch [:browser.ui/open-url url])
         :on-long-press       (fn []
                                (re-frame/dispatch
-                                [:bottom-sheet/show-sheet-old
+                                [:show-bottom-sheet
                                  {:content (fn []
                                              [react/view {:flex 1}
                                               [list.item/list-item
@@ -110,7 +110,7 @@
      [quo/button
       {:accessibility-label :select-account
        :type                :scale
-       :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+       :on-press            #(re-frame/dispatch [:show-bottom-sheet
                                                  {:content (accounts/accounts-list accounts
                                                                                    dapps-account)}])}
       [react/view (styles/dapps-account color)

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

@@ -2,7 +2,6 @@
   (:require
     [legacy.status-im.browser.core :as browser]
     [legacy.status-im.browser.webview-ref :as webview-ref]
-    [legacy.status-im.qr-scanner.core :as qr-scanner]
     [legacy.status-im.ui.components.chat-icon.screen :as chat-icon]
     [legacy.status-im.ui.components.colors :as colors]
     [legacy.status-im.ui.components.connectivity.view :as connectivity]
@@ -92,7 +91,7 @@
       [icons/icon :main-icons/arrow-right {:color colors/black}]]
      [react/touchable-highlight
       {:accessibility-label :select-account
-       :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+       :on-press            #(re-frame/dispatch [:show-bottom-sheet
                                                  {:content (accounts/accounts-list accounts
                                                                                    dapps-account)}])}
       [chat-icon/custom-icon-view-list (:name dapps-account) (:color dapps-account) 32]]
@@ -105,13 +104,11 @@
      (if empty-tab
        [react/touchable-highlight
         {:accessibility-label :universal-qr-scanner
-         :on-press            #(re-frame/dispatch
-                                [::qr-scanner/scan-code
-                                 {:handler ::qr-scanner/on-scan-success}])}
+         :on-press            #(re-frame/dispatch [:open-modal :shell-qr-reader])}
         [icons/icon :main-icons/qr {:color colors/black}]]
        [react/touchable-highlight
         {:on-press            #(re-frame/dispatch
-                                [:bottom-sheet/show-sheet-old
+                                [:show-bottom-sheet
                                  {:content (options/browser-options
                                             url
                                             dapps-account
@@ -165,7 +162,7 @@
 (defn request-resources-access-for-page
   [resources url webview-ref]
   (re-frame/dispatch
-   [:bottom-sheet/show-sheet-old
+   [:show-bottom-sheet
     {:content            (fn [] [request-resources-panel resources url webview-ref])
      :show-handle?       false
      :backdrop-dismiss?  false
@@ -175,7 +172,7 @@
 (defn block-resources-access-and-notify-user
   [url]
   (.answerPermissionRequest ^js @webview-ref/webview-ref false)
-  (re-frame/dispatch [:bottom-sheet/show-sheet-old
+  (re-frame/dispatch [:show-bottom-sheet
                       {:content (fn [] [block-resources-panel url])}]))
 
 ;; should-component-update is called only when component's props are changed,

src/legacy/status_im/ui/screens/chat/message/legacy_style.cljs

@@ -46,22 +46,22 @@
    :color      colors/gray})
 
 (defn message-default-style
-  []
+  [theme]
   {:font-family    "Inter-Regular"
-   :color          (quo.colors/theme-colors quo.colors/neutral-100 quo.colors/white)
+   :color          (quo.colors/theme-colors quo.colors/neutral-100 quo.colors/white theme)
    :font-size      15
    :line-height    21.75
    :letter-spacing -0.135})
 
 ;; Markdown styles
 (defn default-text-style
-  []
+  [theme]
   {:max-font-size-multiplier react/max-font-size-multiplier
-   :style                    (message-default-style)})
+   :style                    (message-default-style theme)})
 
 (defn system-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
           :style       assoc
           :color       colors/gray
           :line-height 20
@@ -70,65 +70,65 @@
           :font-weight "400"))
 
 (defn text-style
-  [content-type in-popover?]
+  [content-type in-popover? theme]
   (merge
    (when in-popover? {:number-of-lines 2})
    (cond
-     (= content-type constants/content-type-system-text)           (system-text-style)
-     (= content-type constants/content-type-system-pinned-message) (system-text-style)
-     :else                                                         (default-text-style))))
+     (= content-type constants/content-type-system-text)           (system-text-style theme)
+     (= content-type constants/content-type-system-pinned-message) (system-text-style theme)
+     :else                                                         (default-text-style theme))))
 
 (defn emph-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
           :style
           assoc
           :font-style :italic))
 
 (defn emph-style
-  []
-  (emph-text-style))
+  [theme]
+  (emph-text-style theme))
 
 (defn strong-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
           :style
           assoc
           :font-weight "700"))
 
 (defn outgoing-strong-text-style
-  []
-  (update (strong-text-style)
+  [theme]
+  (update (strong-text-style theme)
           :style
           assoc
           :color colors/white-persist))
 
 (defn strong-style
-  []
-  (outgoing-strong-text-style)
-  (strong-text-style))
+  [theme]
+  (outgoing-strong-text-style theme)
+  (strong-text-style theme))
 
 (defn strong-emph-style
-  []
-  (update (strong-style)
+  [theme]
+  (update (strong-style theme)
           :style
           assoc
           :font-style :italic))
 
 (defn strikethrough-style
-  []
-  (cond-> (update (default-text-style)
+  [theme]
+  (cond-> (update (default-text-style theme)
                   :style
                   assoc
                   :text-decoration-line :line-through)))
 
 (defn edited-style
-  []
+  [theme]
   (cond->
-    (update (default-text-style)
+    (update (default-text-style theme)
             :style
             assoc
-            :color (quo.colors/theme-colors quo.colors/neutral-40 quo.colors/neutral-50)
+            :color (quo.colors/theme-colors quo.colors/neutral-40 quo.colors/neutral-50 theme)
             :font-size 13
             :line-height 18.2
             :letter-spacing (typography/tracking 13))))
@@ -149,8 +149,8 @@
   (default-blockquote-style))
 
 (defn default-blockquote-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
           :style
           assoc
           :line-height 19
@@ -158,16 +158,16 @@
           :color colors/black-transparent-50))
 
 (defn outgoing-blockquote-text-style
-  []
-  (update (default-blockquote-text-style)
+  [theme]
+  (update (default-blockquote-text-style theme)
           :style
           assoc
           :color colors/white-transparent-70-persist))
 
 (defn blockquote-text-style
-  []
-  (outgoing-blockquote-text-style)
-  (default-blockquote-text-style))
+  [theme]
+  (outgoing-blockquote-text-style theme)
+  (default-blockquote-text-style theme))
 
 (defn community-verified
   []

src/legacy/status_im/ui/screens/chat/message/legacy_view.cljs

@@ -6,6 +6,7 @@
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [quo.foundations.typography :as typography]
+    [quo.theme]
     [react-native.core :as rn]
     [status-im.constants :as constants]
     [status-im.contexts.chat.messenger.messages.delete-message-for-me.events]
@@ -26,7 +27,7 @@
 
 (defn render-inline
   [_message-text content-type acc {:keys [type literal destination]}
-   community-id]
+   community-id theme]
   (case type
     ""
     (conj acc literal)
@@ -35,24 +36,25 @@
     (conj acc [rn/text literal])
 
     "emph"
-    (conj acc [rn/text (style/emph-style) literal])
+    (conj acc [rn/text (style/emph-style theme) literal])
 
     "strong"
-    (conj acc [rn/text (style/strong-style) literal])
+    (conj acc [rn/text (style/strong-style theme) literal])
 
     "strong-emph"
-    (conj acc [quo/text (style/strong-emph-style) literal])
+    (conj acc [quo/text (style/strong-emph-style theme) literal])
 
     "del"
-    (conj acc [rn/text (style/strikethrough-style) literal])
+    (conj acc [rn/text (style/strikethrough-style theme) literal])
 
     "link"
-    (conj acc
-          [rn/text
-           {:style    {:color                (colors/theme-colors colors/primary-50 colors/primary-60)
-                       :text-decoration-line :underline}
-            :on-press #(rf/dispatch [:browser.ui/message-link-pressed destination])}
-           destination])
+    (conj
+     acc
+     [rn/text
+      {:style    {:color                (colors/theme-colors colors/primary-50 colors/primary-60 theme)
+                  :text-decoration-line :underline}
+       :on-press #(rf/dispatch [:browser.ui/message-link-pressed destination])}
+      destination])
 
     "mention"
     (conj
@@ -66,17 +68,18 @@
                     #(rf/dispatch [:chat.ui/show-profile literal]))}
        [mention-element literal]]])
     "status-tag"
-    (conj acc
-          [rn/text
-           (when community-id
-             {:style    {:color                (colors/theme-colors colors/primary-50 colors/primary-60)
-                         :text-decoration-line :underline}
-              :on-press #(rf/dispatch [:communities/status-tag-pressed community-id literal])})
-           "#"
-           literal])
+    (conj
+     acc
+     [rn/text
+      (when community-id
+        {:style    {:color                (colors/theme-colors colors/primary-50 colors/primary-60 theme)
+                    :text-decoration-line :underline}
+         :on-press #(rf/dispatch [:communities/status-tag-pressed community-id literal])})
+      "#"
+      literal])
 
     "edited"
-    (conj acc [rn/text (style/edited-style) (str " (" (i18n/label :t/edited) ")")])
+    (conj acc [rn/text (style/edited-style theme) (str " (" (i18n/label :t/edited) ")")])
 
     (conj acc literal)))
 
@@ -84,7 +87,7 @@
 (defn render-block
   [{:keys [content content-type edited-at in-popover?]} acc
    {:keys [type ^js literal children]}
-   community-id]
+   community-id theme]
 
   (case type
 
@@ -96,8 +99,9 @@
                             content-type
                             acc
                             e
-                            community-id))
-           [rn/text (style/text-style content-type in-popover?)]
+                            community-id
+                            theme))
+           [rn/text (style/text-style content-type in-popover? theme)]
            (conj
             children
             (when edited-at
@@ -106,7 +110,7 @@
     "blockquote"
     (conj acc
           [rn/view (style/blockquote-style)
-           [rn/text (style/blockquote-text-style)
+           [rn/text (style/blockquote-text-style theme)
             (.substring literal 0 (.-length literal))]])
 
     "codeblock"
@@ -119,12 +123,14 @@
 (defn render-parsed-text
   [{:keys [content chat-id]
     :as   message-data}]
-  (let [community-id (rf/sub [:community-id-by-chat-id chat-id])]
+  (let [community-id (rf/sub [:community-id-by-chat-id chat-id])
+        theme        (quo.theme/use-theme)]
     (reduce (fn [acc e]
               (render-block message-data
                             acc
                             e
-                            community-id))
+                            community-id
+                            theme))
             [:<>]
             (:parsed-text content))))
 
@@ -137,12 +143,13 @@
 ;; STATUS ? whats that ?
 (defmethod ->message constants/content-type-status
   [{:keys [content content-type]}]
-  [rn/view style/status-container
-   [rn/text {:style (style/status-text)}
-    (reduce
-     (fn [acc e] (render-inline (:text content) content-type acc e nil))
-     [rn/text {:style (style/status-text)}]
-     (-> content :parsed-text peek :children))]])
+  (let [theme (quo.theme/use-theme)]
+    [rn/view style/status-container
+     [rn/text {:style (style/status-text)}
+      (reduce
+       (fn [acc e] (render-inline (:text content) content-type acc e nil theme))
+       [rn/text {:style (style/status-text)}]
+       (-> content :parsed-text peek :children))]]))
 
 (defn contact-request-status-pending
   []

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

@@ -1,16 +1,15 @@
 (ns legacy.status-im.ui.screens.communities.invite
   (:require
     [clojure.string :as string]
-    [legacy.status-im.communities.core :as communities]
     [legacy.status-im.ui.components.chat-icon.screen :as chat-icon.screen]
     [legacy.status-im.ui.components.core :as quo]
     [legacy.status-im.ui.components.list.item :as list.item]
     [legacy.status-im.ui.components.toolbar :as toolbar]
     [legacy.status-im.ui.components.topbar :as topbar]
+    [quo.theme]
     [react-native.core :as rn]
     [reagent.core :as reagent]
     [status-im.constants :as constants]
-    [utils.debounce :as debounce]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -49,18 +48,35 @@
         contacts-selected (reagent/atom #{})
         {:keys [invite?]} (rf/sub [:get-screen-params])]
     (fn []
-      (let [contacts-data (rf/sub [:contacts/active])
-            {:keys [permissions
-                    can-manage-users?]}
+      (let [theme (quo.theme/use-theme)
+            contacts-data (rf/sub [:contacts/active])
+            {community-id :id
+             :keys        [permissions
+                           can-manage-users?]}
             (rf/sub [:communities/edited-community])
             selected @contacts-selected
+            selected-contacts-count (count selected)
             contacts (map (fn [{:keys [public-key] :as contact}]
                             (assoc contact :active (contains? selected public-key)))
                           contacts-data)
             ;; no-membership communities can only be shared
             can-invite? (and can-manage-users?
                              invite?
-                             (not= (:access permissions) constants/community-no-membership-access))]
+                             (not= (:access permissions) constants/community-no-membership-access))
+            on-press-share-community (rn/use-callback
+                                      (fn []
+                                        (rf/dispatch [:communities/share-community-confirmation-pressed
+                                                      selected community-id])
+                                        (rf/dispatch [:navigate-back])
+                                        (rf/dispatch [:toasts/upsert
+                                                      {:type  :positive
+                                                       :theme theme
+                                                       :text  (if (= 1 selected-contacts-count)
+                                                                (i18n/label :t/one-user-was-invited)
+                                                                (i18n/label
+                                                                 :t/n-users-were-invited
+                                                                 {:count selected-contacts-count}))}]))
+                                      [community-id selected selected-contacts-count theme])]
         [:<>
          [topbar/topbar
           {:title  (i18n/label (if can-invite?
@@ -81,11 +97,8 @@
            :center
            [quo/button
             {:disabled            (and (string/blank? @user-pk)
-                                       (zero? (count selected)))
+                                       (zero? selected-contacts-count))
              :accessibility-label :share-community-link
              :type                :secondary
-             :on-press            #(debounce/throttle-and-dispatch
-                                    [::communities/share-community-confirmation-pressed @user-pk
-                                     selected]
-                                    3000)}
+             :on-press            on-press-share-community}
             (i18n/label (if can-invite? :t/invite :t/share))]}]]))))

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

@@ -73,7 +73,7 @@
       :accessory           (when (not= public-key my-public-key)
                              [quo/button
                               {:on-press
-                               #(rf/dispatch [:bottom-sheet/show-sheet-old
+                               #(rf/dispatch [:show-bottom-sheet
                                               {:content (fn []
                                                           [member-sheet primary-name member community-id
                                                            can-kick-users? can-manage-users? admin?])}])

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

@@ -757,7 +757,7 @@
         [profile.components/settings-item
          {:label-kw  :ens-primary-username
           :value     preferred-name
-          :action-fn #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+          :action-fn #(re-frame/dispatch [:show-bottom-sheet
                                           {:content
                                            (fn [] (name-list names preferred-name))}])}]])]]])
 

src/legacy/status_im/ui/screens/profile/components/sheets.cljs

@@ -22,7 +22,7 @@
         :loading             @in-progress?
         :accessibility-label :block-contact-confirm
         :on-press            #(do (reset! in-progress? true)
-                                  (re-frame/dispatch [:contact.ui/block-contact-confirmed public-key]))}
+                                  (re-frame/dispatch [:contact/block-contact public-key]))}
        (i18n/label :t/block)]
       [react/view {:height 8}]
       [quo/button

src/legacy/status_im/ui/screens/profile/contact/views.cljs

@@ -11,7 +11,7 @@
     [legacy.status-im.ui.components.topbar :as topbar]
     [legacy.status-im.ui.screens.profile.components.sheets :as sheets]
     [quo.components.avatars.user-avatar.style :as user-avatar.style]
-    [quo.theme :as theme]
+    [quo.theme]
     [re-frame.core :as re-frame]
     [reagent.core :as reagent]
     [status-im.constants :as constants]
@@ -56,7 +56,7 @@
             :selected            blocked?
             :icon                :main-icons/cancel
             :action              (if blocked?
-                                   #(re-frame/dispatch [:contact.ui/unblock-contact-pressed public-key])
+                                   #(re-frame/dispatch [:contact/unblock-contact public-key])
                                    #(re-frame/dispatch [:show-popover
                                                         {:view             sheets/block-contact
                                                          :prevent-closing? true
@@ -184,6 +184,7 @@
          :as   profile}     @(re-frame/subscribe [:contacts/current-contact])
         muted?              @(re-frame/subscribe [:chats/muted public-key])
         customization-color (or customization-color :primary)
+        theme               @(re-frame/subscribe [:theme])
         on-share            #(re-frame/dispatch [:show-popover
                                                  (merge
                                                   {:view    :share-chat-key
@@ -205,8 +206,7 @@
           {:on-press         on-share
            :bottom-separator false
            :title            (profile.utils/displayed-name profile)
-           :color            (user-avatar.style/customization-color customization-color
-                                                                    (theme/get-theme))
+           :color            (user-avatar.style/customization-color customization-color theme)
            :photo            (profile.utils/photo profile)
            :monospace        (not ens-verified)
            :subtitle         secondary-name

src/legacy/status_im/ui/screens/profile/group_chat/views.cljs

@@ -74,7 +74,7 @@
                  (not= public-key current-user-identity))
         {:accessory [quo/button
                      {:on-press            #(re-frame/dispatch
-                                             [:bottom-sheet/show-sheet-old
+                                             [:bottom-sheet/show-sheet
                                               {:content (fn []
                                                           [member-sheet chat-id member admin?])}])
                       :type                :icon
@@ -146,7 +146,7 @@
     [list.item/list-item
      {:title    (profile.utils/displayed-name contact)
       :icon     [chat-icon/contact-icon-contacts-tab contact]
-      :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+      :on-press #(re-frame/dispatch [:show-bottom-sheet
                                      {:content (fn []
                                                  [invitation-sheet invitation contact])}])}]))
 

src/legacy/status_im/ui/screens/profile/user/views.cljs

@@ -14,7 +14,7 @@
     [legacy.status-im.ui.screens.profile.visibility-status.views :as visibility-status]
     [legacy.status-im.utils.utils :as utils]
     [quo.components.avatars.user-avatar.style :as user-avatar.style]
-    [quo.theme :as theme]
+    [quo.theme]
     [re-frame.core :as re-frame]
     [reagent.core :as reagent]
     [status-im.common.qr-codes.view :as qr-codes]
@@ -200,6 +200,7 @@
           @(re-frame/subscribe [:profile/profile-with-image])
           customization-color (or (:color @(re-frame/subscribe [:onboarding/profile]))
                                   @(re-frame/subscribe [:profile/customization-color key-uid]))
+          theme @(re-frame/subscribe [:theme])
           on-share #(re-frame/dispatch [:show-popover
                                         {:view     :share-chat-key
                                          :address  (or compressed-key
@@ -217,11 +218,11 @@
          :use-insets        true
          :extended-header   (profile-header/extended-header
                              {:on-press  on-share
-                              :on-edit   #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+                              :on-edit   #(re-frame/dispatch [:show-bottom-sheet
                                                               {:content (edit/bottom-sheet
                                                                          has-picture)}])
                               :color     (user-avatar.style/customization-color customization-color
-                                                                                (theme/get-theme))
+                                                                                theme)
                               :title     (profile.utils/displayed-name profile)
                               :photo     (profile.utils/photo profile)
                               :monospace (not ens-verified)

src/legacy/status_im/ui/screens/profile/visibility_status/styles.cljs

@@ -17,14 +17,14 @@
    :padding-right          12})
 
 (defn visibility-status-dot
-  [{:keys [color size new-ui?]}]
+  [{:keys [color size new-ui?]} theme]
   (if new-ui?
     {:background-color color
      :width            size
      :height           size
      :border-radius    (/ size 2)
      :border-width     3.5
-     :border-color     (quo.colors/theme-colors quo.colors/white quo.colors/neutral-90)}
+     :border-color     (quo.colors/theme-colors quo.colors/white quo.colors/neutral-90 theme)}
     {:background-color color
      :width            size
      :height           size
@@ -33,10 +33,11 @@
      :border-color     colors/white}))
 
 (defn visibility-status-profile-dot
-  [{:keys [color size border-width margin-left new-ui?]}]
+  [{:keys [color size border-width margin-left new-ui?]} theme]
   (merge (visibility-status-dot {:color   color
                                  :size    size
-                                 :new-ui? new-ui?})
+                                 :new-ui? new-ui?}
+                                theme)
          {:margin-right 6
           :margin-left  margin-left
           :border-width border-width}))

src/legacy/status_im/ui/screens/profile/visibility_status/utils.cljs

@@ -3,6 +3,7 @@
     [legacy.status-im.ui.components.colors :as colors]
     [legacy.status-im.ui.screens.profile.visibility-status.styles :as styles]
     [quo.foundations.colors :as quo.colors]
+    [quo.theme]
     [status-im.constants :as constants]
     [utils.datetime :as datetime]
     [utils.i18n :as i18n]
@@ -90,13 +91,15 @@
 (defn icon-visibility-status-dot
   [public-key container-size]
   (let [status    (rf/sub [:visibility-status-updates/visibility-status-update public-key])
+        theme     (quo.theme/use-theme)
         size      (icon-dot-size container-size)
         margin    -2
         dot-color (icon-dot-color status)
         new-ui?   true]
     (merge (styles/visibility-status-dot {:color   dot-color
                                           :size    size
-                                          :new-ui? new-ui?})
+                                          :new-ui? new-ui?}
+                                         theme)
            {:bottom              margin
             :right               margin
             :position            :absolute

src/legacy/status_im/ui/screens/profile/visibility_status/views.cljs

@@ -37,7 +37,7 @@
      (dispatch-popover page-y))))
 
 (defn profile-visibility-status-dot
-  [status-type color]
+  [status-type color theme]
   (let [automatic?                      (= status-type
                                            constants/visibility-status-automatic)
         [border-width margin-left size] (if automatic? [1 -10 12] [0 6 10])
@@ -50,14 +50,16 @@
                   :size         size
                   :border-width border-width
                   :margin-left  6
-                  :new-ui?      new-ui?})}])
+                  :new-ui?      new-ui?}
+                 theme)}])
      [rn/view
       {:style (styles/visibility-status-profile-dot
                {:color        color
                 :size         size
                 :border-width border-width
                 :margin-left  margin-left
-                :new-ui?      new-ui?})}]]))
+                :new-ui?      new-ui?}
+               theme)}]]))
 
 (defn visibility-status-button
   [on-press props]

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

@@ -2,17 +2,16 @@
   (:require
     [clojure.string :as string]
     [goog.string :as gstring]
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
     [legacy.status-im.ui.components.react :as react]
     [legacy.status-im.utils.build :as build]
     [legacy.status-im.utils.deprecated-types :as types]
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
-    [react-native.mail :as react-native-mail]
     [react-native.platform :as platform]
     [status-im.common.json-rpc.events :as json-rpc]
     [status-im.common.log :as log]
     [status-im.config :as config]
+    [status-im.navigation.events :as navigation]
     [utils.datetime :as datetime]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -182,7 +181,7 @@
 (re-frame/reg-fx
  :email/send
  (fn [[opts callback]]
-   (react-native-mail/mail (clj->js opts) callback)))
+   (native-module/mail (clj->js opts) callback)))
 
 (re-frame/reg-fx
  ::share-archive
@@ -226,7 +225,7 @@
     {:db (assoc db :bug-report/description-error error)}
     (rf/merge
      cofx
-     (bottom-sheet/hide-bottom-sheet-old)
+     (navigation/hide-bottom-sheet)
      (send-logs :email))))
 
 (re-frame/reg-fx
@@ -254,5 +253,5 @@
   (rf/merge
    cofx
    {:db (dissoc db :bug-report/details)}
-   (bottom-sheet/hide-bottom-sheet-old)
+   (navigation/hide-bottom-sheet)
    (submit-issue)))

src/native_module/core.cljs

@@ -46,6 +46,15 @@
   (when (exists? (.-NativeModules react-native))
     (.-NetworkManager ^js (.-NativeModules react-native))))
 
+(defn mail-manager
+  []
+  (when (exists? (.-NativeModules react-native))
+    (.-MailManager ^js (.-NativeModules react-native))))
+
+(defn mail
+  [opts callback]
+  (.mail ^js (mail-manager) (clj->js opts) callback))
+
 (defn init
   [handler]
   (.addListener ^js (.-DeviceEventEmitter ^js react-native) "gethEvent" #(handler (.-jsonEvent ^js %))))

src/quo/components/animated_header_flatlist/view.cljs

@@ -54,7 +54,7 @@
 
 (defn- f-animated-header-list
   [{:keys [header-comp main-comp back-button-on-press] :as params}]
-  (let [theme                   (quo.theme/use-theme-value)
+  (let [theme                   (quo.theme/use-theme)
         window-height           (:height (rn/get-window))
         {:keys [top bottom]}    (safe-area/get-insets)
         ;; view height calculation is different because window height is different on iOS and

src/quo/components/avatars/account_avatar/component_spec.cljs

@@ -29,7 +29,7 @@
                    {:height          (:size opts)
                     :width           (:size opts)
                     :borderRadius    (style/get-border-radius (:size opts))
-                    :backgroundColor (colors/resolve-color (:customization-color opts) :dark)})
+                    :backgroundColor (colors/resolve-color (:customization-color opts) :light)})
       (h/is-truthy (h/query-by-label-text :account-emoji))
       (h/has-style (h/query-by-label-text :account-emoji)
                    {:fontSize (style/get-emoji-size (:size opts))})
@@ -65,7 +65,7 @@
                    {:height          (:size opts)
                     :width           (:size opts)
                     :borderRadius    (style/get-border-radius (:size opts))
-                    :backgroundColor (colors/resolve-color (:customization-color opts) :dark)})
+                    :backgroundColor (colors/resolve-color (:customization-color opts) :light)})
       (h/is-truthy (h/query-by-label-text :account-emoji))
       (h/has-style (h/query-by-label-text :account-emoji)
                    {:fontSize (style/get-emoji-size (:size opts))})

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

@@ -56,9 +56,10 @@
 
 
 (defn root-container
-  [{:keys [type size theme customization-color]
+  [{:keys [type size customization-color]
     :or   {size                default-size
-           customization-color :blue}}]
+           customization-color :blue}}
+   theme]
   (let [watch-only? (= type :watch-only)
         width       (cond-> size
                       (keyword? size) (container-size size))]

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

@@ -5,7 +5,7 @@
     [quo.theme :as quo.theme]
     [react-native.core :as rn]))
 
-(defn- view-internal
+(defn view
   "Opts:
    
     :type  - keyword -> :default/:watch-only
@@ -21,15 +21,14 @@
     :or   {size  style/default-size
            emoji "🍑"}
     :as   opts}]
-  (let [emoji-size (style/get-emoji-size size)]
+  (let [theme      (quo.theme/use-theme)
+        emoji-size (style/get-emoji-size size)]
     [rn/view
      {:accessible          true
       :accessibility-label :account-avatar
-      :style               (style/root-container opts)}
+      :style               (style/root-container opts theme)}
      [rn/text
       {:accessibility-label      :account-emoji
        :adjusts-font-size-to-fit true
        :style                    {:font-size emoji-size}}
       (when emoji (string/trim emoji))]]))
-
-(def view (quo.theme/with-theme view-internal))

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

@@ -34,7 +34,7 @@
        :container-style style/lock-icon
        :size            12}]]))
 
-(defn- view-internal
+(defn view
   "Options:
 
   :size - keyword (default nil) - Container size, for the moment,
@@ -52,22 +52,21 @@
   :full-name - string (default nil) - When :emoji is blank, this value will be
   used to extract the initials.
   "
-  [{:keys [size emoji customization-color locked? full-name theme]}]
-  [rn/view
-   {:accessibility-label :channel-avatar
-    :style               (style/outer-container {:theme               theme
-                                                 :size                size
-                                                 :customization-color customization-color})}
-   (if (string/blank? emoji)
-     [initials
-      {:full-name           full-name
-       :size                size
-       :customization-color customization-color
-       :theme               theme}]
-     [rn/text
-      {:style               (style/emoji-size size)
-       :accessibility-label :emoji}
-      (when emoji (string/trim emoji))])
-   [lock locked? size theme]])
-
-(def view (quo.theme/with-theme view-internal))
+  [{:keys [size emoji customization-color locked? full-name]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:accessibility-label :channel-avatar
+      :style               (style/outer-container {:theme               theme
+                                                   :size                size
+                                                   :customization-color customization-color})}
+     (if (string/blank? emoji)
+       [initials
+        {:full-name           full-name
+         :size                size
+         :customization-color customization-color
+         :theme               theme}]
+       [rn/text
+        {:style               (style/emoji-size size)
+         :accessibility-label :emoji}
+        (when emoji (string/trim emoji))])
+     [lock locked? size theme]]))

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

@@ -4,15 +4,16 @@
     [quo.theme :as quo.theme]
     [react-native.fast-image :as fast-image]))
 
-(defn- view-internal
+(defn view
   "Opts:
    
     :image - collection image
     :theme - keyword -> :light/:dark"
-  [{:keys [image theme size] :or {size :size-24}}]
-  [fast-image/fast-image
-   {:accessibility-label :collection-avatar
-    :source              image
-    :style               (style/collection-avatar theme size)}])
-
-(def view (quo.theme/with-theme view-internal))
+  [{:keys [image size on-load-end on-error] :or {size :size-24}}]
+  (let [theme (quo.theme/use-theme)]
+    [fast-image/fast-image
+     {:accessibility-label :collection-avatar
+      :source              image
+      :on-load-end         on-load-end
+      :on-error            on-error
+      :style               (style/collection-avatar theme size)}]))

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

@@ -13,3 +13,11 @@
    :background-color (colors/theme-colors (colors/custom-color customization-color 50)
                                           (colors/custom-color customization-color 60)
                                           theme)})
+
+(defn avatar-identifier
+  [theme]
+  {:text-align :center
+   :font-size  36
+   :color      (colors/theme-colors colors/black
+                                    colors/white
+                                    theme)})

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

@@ -1,7 +1,9 @@
 (ns quo.components.avatars.group-avatar.view
   (:require
+    [clojure.string :as string]
     [quo.components.avatars.group-avatar.style :as style]
     [quo.components.icon :as icon]
+    [quo.components.markdown.text :as text]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
@@ -19,27 +21,44 @@
    :size-80 {:icon      32
              :container 80}})
 
-(defn- view-internal
-  [_]
-  (fn [{:keys [size theme customization-color picture icon-name]
-        :or   {size                :size-20
-               customization-color :blue
-               picture             nil
-               icon-name           :i/members}}]
-    (let [container-size (get-in sizes [size :container])
-          icon-size      (get-in sizes [size :icon])]
-      [rn/view
-       {:accessibility-label :group-avatar
-        :style               (style/container {:container-size      container-size
-                                               :customization-color customization-color
-                                               :theme               theme})}
-       (if picture
-         [fast-image/fast-image
-          {:source picture
-           :style  {:width  container-size
-                    :height container-size}}]
+(defn view
+  [{:keys [size customization-color picture icon-name emoji chat-name]
+    :or   {size                :size-20
+           customization-color :blue
+           picture             nil
+           icon-name           :i/members}}]
+  (let [theme          (quo.theme/use-theme)
+        container-size (get-in sizes [size :container])
+        icon-size      (get-in sizes [size :icon])]
+    [rn/view
+     {:accessibility-label :group-avatar
+      :style               (style/container {:container-size      container-size
+                                             :customization-color customization-color
+                                             :theme               theme})}
+     (if picture
+       [fast-image/fast-image
+        {:source picture
+         :style  {:width  container-size
+                  :height container-size}}]
+       (cond
+         emoji
+         (if (= size :size-80)
+           [rn/text
+            {:style (style/avatar-identifier theme)}
+            emoji]
+           [text/text
+            {:size  :paragraph-1
+             :style (dissoc (style/avatar-identifier theme) :font-size)}
+            emoji])
+         chat-name
+         (if (= size :size-80)
+           [rn/text
+            {:style (style/avatar-identifier theme)}
+            ((comp first string/upper-case) chat-name)]
+           [text/text
+            {:size :paragraph-1}
+            ((comp first string/upper-case) chat-name)])
+         :else
          [icon/icon icon-name
           {:size  icon-size
-           :color colors/white-opa-70}])])))
-
-(def view (quo.theme/with-theme view-internal))
+           :color colors/white-opa-70}]))]))

src/quo/components/avatars/icon_avatar.cljs

@@ -15,11 +15,12 @@
    :size-20 {:component 20
              :icon      12}})
 
-(defn icon-avatar-internal
-  [{:keys [size icon color opacity border? theme]
+(defn icon-avatar
+  [{:keys [size icon color opacity border?]
     :or   {opacity 20
            size    :size-32}}]
-  (let [{component-size :component icon-size :icon} (get sizes size)
+  (let [theme                                       (quo.theme/use-theme)
+        {component-size :component icon-size :icon} (get sizes size)
         circle-color                                (colors/resolve-color color theme opacity)
         icon-color                                  (colors/resolve-color color theme)]
     (if (keyword? icon)
@@ -38,5 +39,3 @@
       [rn/image
        {:source icon
         :style  {:width component-size :height component-size}}])))
-
-(def icon-avatar (quo.theme/with-theme icon-avatar-internal))

src/quo/components/avatars/user_avatar/schema.cljs

@@ -14,7 +14,6 @@
       [:status-indicator? {:optional true} [:maybe boolean?]]
       [:online? {:optional true} [:maybe boolean?]]
       [:ring? {:optional true} [:maybe boolean?]]
-      [:theme :schema.common/theme]
       [:profile-picture
        {:optional true}
        [:maybe :schema.quo/profile-picture-source]]]]]

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

@@ -66,8 +66,8 @@
      :background-color (colors/resolve-color customization-color theme)}))
 
 (defn indicator-color
-  []
-  {:online  (colors/theme-colors colors/success-50 colors/success-60)
+  [theme]
+  {:online  (colors/theme-colors colors/success-50 colors/success-60 theme)
    :offline colors/neutral-40})
 
 (defn outer

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

@@ -11,9 +11,10 @@
     utils.string))
 
 (defn initials-avatar
-  [{:keys [full-name size customization-color theme]
+  [{:keys [full-name size customization-color]
     :or   {customization-color :blue}}]
-  (let [font-size       (get-in style/sizes [size :font-size])
+  (let [theme           (quo.theme/use-theme)
+        font-size       (get-in style/sizes [size :font-size])
         amount-initials (if (#{:xs :xxs :xxxs} size) 1 2)]
     [rn/view
      {:accessibility-label :initials-avatar
@@ -31,14 +32,14 @@
    When calling the `profile-picture-fn` and passing the `:ring?` key, be aware that the `profile-picture-fn`
    may have an `:override-ring?` value. If it does then the `:ring?` value will not be used.
    For reference, refer to the `utils.image-server` namespace for these `profile-picture-fn` are generated."
-  [{:keys [full-name size profile-picture static?
-           status-indicator? online? ring? theme]
+  [{:keys [full-name size profile-picture static? status-indicator? online? ring?]
     :or   {size              :big
            status-indicator? true
            online?           true
            ring?             true}
     :as   props}]
-  (let [full-name          (or full-name "Your Name")
+  (let [theme              (quo.theme/use-theme)
+        full-name          (or full-name "Your Name")
         ;; image generated with `profile-picture-fn` is round cropped
         ;; no need to add border-radius for them
         outer-styles       (style/outer size (not (:fn profile-picture)))
@@ -49,7 +50,7 @@
         font-size          (get-in style/sizes [size :font-size])
         amount-initials    (if (#{:xs :xxs :xxxs} size) 1 2)
         sizes              (get style/sizes size)
-        indicator-color    (get (style/indicator-color) (if online? :online :offline))
+        indicator-color    (get (style/indicator-color theme) (if online? :online :offline))
         profile-picture-fn (:fn profile-picture)]
 
     [rn/view {:style outer-styles :accessibility-label :user-avatar}
@@ -66,7 +67,8 @@
                       {:length                   amount-initials
                        :full-name                full-name
                        :font-size                (:font-size (text/text-style {:size
-                                                                               font-size}))
+                                                                               font-size}
+                                                                              nil))
                        :indicator-size           (when status-indicator?
                                                    (:status-indicator sizes))
                        :indicator-border         (when status-indicator?
@@ -87,6 +89,4 @@
 
                :else {:uri profile-picture})}])]))
 
-(def user-avatar
-  (quo.theme/with-theme
-   (schema/instrument #'user-avatar-internal component-schema/?schema)))
+(def user-avatar (schema/instrument #'user-avatar-internal component-schema/?schema))

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

@@ -34,7 +34,7 @@
       (= size second-smallest-possible)))
 (def biggest-possible (last (keys properties)))
 
-(defn- view-internal
+(defn wallet-user-avatar
   "Options:
 
   :full-name - string (default: nil) - used to generate initials
@@ -44,9 +44,10 @@
   :monospace? - boolean (default: false) - use monospace font
   :lowercase? - boolean (default: false) - lowercase text
   :neutral? - boolean (default: false) - use neutral colors variant"
-  [{:keys [full-name customization-color size theme monospace? lowercase? neutral?]
+  [{:keys [full-name customization-color size monospace? lowercase? neutral?]
     :or   {size biggest-possible}}]
-  (let [circle-size (:size (size properties))
+  (let [theme       (quo.theme/use-theme)
+        circle-size (:size (size properties))
         small?      (check-if-size-small size)
         initials    (utils.string/get-initials full-name (if small? 1 2))]
     [rn/view
@@ -57,5 +58,3 @@
        :weight              (if monospace? :monospace (:font-weight (size properties)))
        :style               (style/text customization-color neutral? theme)}
       (if (and initials lowercase?) (string/lower-case initials) initials)]]))
-
-(def wallet-user-avatar (quo.theme/with-theme view-internal))

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

@@ -8,27 +8,26 @@
     [quo.theme :as quo.theme]
     [react-native.core :as rn]))
 
-(defn- view-internal
-  [{:keys [hide-pin? latest-pin-text pins-count on-press theme]}]
-  (when (pos? pins-count)
-    [rn/touchable-opacity
-     {:accessibility-label :pinned-banner
-      :style               style/container
-      :active-opacity      1
-      :on-press            on-press}
-     (when-not hide-pin?
-       [rn/view {:style style/icon}
-        [icons/icon :i/pin
-         {:color (colors/theme-colors colors/neutral-100 colors/white theme)
-          :size  20}]])
-     [rn/view {:style (style/text hide-pin?)}
-      [text/text
-       {:number-of-lines 1
-        :size            :paragraph-2}
-       latest-pin-text]]
-     [rn/view
-      {:accessibility-label :pins-count
-       :style               style/counter}
-      [counter/view {:type :secondary} pins-count]]]))
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [hide-pin? latest-pin-text pins-count on-press]}]
+  (let [theme (quo.theme/use-theme)]
+    (when (pos? pins-count)
+      [rn/touchable-opacity
+       {:accessibility-label :pinned-banner
+        :style               style/container
+        :active-opacity      1
+        :on-press            on-press}
+       (when-not hide-pin?
+         [rn/view {:style style/icon}
+          [icons/icon :i/pin
+           {:color (colors/theme-colors colors/neutral-100 colors/white theme)
+            :size  20}]])
+       [rn/view {:style (style/text hide-pin?)}
+        [text/text
+         {:number-of-lines 1
+          :size            :paragraph-2}
+         latest-pin-text]]
+       [rn/view
+        {:accessibility-label :pins-count
+         :style               style/counter}
+        [counter/view {:type :secondary} pins-count]]])))

src/quo/components/browser/browser_input/style.cljs

@@ -17,7 +17,8 @@
 (defn input
   [disabled?]
   (assoc (text/text-style {:size   :paragraph-1
-                           :weight :regular})
+                           :weight :regular}
+                          nil)
          :flex       1
          :min-height 36
          :min-width  120
@@ -45,11 +46,12 @@
    :z-index            10})
 
 (defn text
-  []
+  [theme]
   (assoc (text/text-style {:size   :paragraph-1
-                           :weight :medium})
+                           :weight :medium}
+                          nil)
          :color
-         (colors/theme-colors colors/neutral-100 colors/white)))
+         (colors/theme-colors colors/neutral-100 colors/white theme)))
 
 (def root-container
   {:height             60

src/quo/components/browser/browser_input/view.cljs

@@ -121,7 +121,7 @@
             :size                favicon-size}])
         [rn/text
          {:accessibility-label :browser-input-label
-          :style               (style/text)}
+          :style               (style/text theme)}
          (remove-http-https-www value)]
         (when locked?
           [lock-icon {:blur? blur? :theme theme}])])

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

@@ -5,7 +5,7 @@
     [quo.components.icon :as quo.icons]
     [quo.components.markdown.text :as text]
     [quo.foundations.customization-colors :as customization-colors]
-    [quo.theme :as theme]
+    [quo.theme]
     [react-native.blur :as blur]
     [react-native.core :as rn]))
 
@@ -28,15 +28,15 @@
     :theme :light/:dark
    only icon
    [button {:icon-only? true} :i/close-circle]"
-  [{:keys [on-press on-long-press disabled? type background size icon-left icon-right icon-top
-           customization-color accessibility-label icon-only? container-style inner-style
-           pressed? on-press-in on-press-out allow-multiple-presses?]
+  [{:keys [on-press on-long-press disabled? type background size icon-left icon-left-color icon-right
+           icon-right-color icon-top icon-top-color customization-color accessibility-label icon-only?
+           container-style inner-style pressed? on-press-in on-press-out allow-multiple-presses?]
     :or   {type                :primary
            size                40
            customization-color (if (= type :primary) :blue nil)}}
    children]
   (let [[pressed-state? set-pressed-state] (rn/use-state false)
-        theme (theme/use-theme-value)
+        theme (quo.theme/use-theme)
         {:keys [icon-color background-color label-color border-color blur-type
                 blur-overlay-color border-radius overlay-customization-color]}
         (button-properties/get-values {:customization-color customization-color
@@ -94,7 +94,7 @@
           [quo.icons/icon icon-top
            {:container-style {:margin-bottom 2
                               :opacity       (when disabled? 0.3)}
-            :color           icon-color
+            :color           (or icon-top-color icon-color)
             :size            icon-size}]])
        (when icon-left
          [rn/view
@@ -103,7 +103,7 @@
                     :icon-size icon-size
                     :disabled? disabled?})}
           [quo.icons/icon icon-left
-           {:color icon-color
+           {:color (or icon-left-color icon-color)
             :size  icon-size}]])
        [rn/view
         (cond
@@ -130,5 +130,5 @@
                     :icon-size icon-size
                     :disabled? disabled?})}
           [quo.icons/icon icon-right
-           {:color icon-color
+           {:color (or icon-right-color icon-color)
             :size  icon-size}]])]]]))

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

@@ -2,13 +2,13 @@
   (:require
     [quo.components.buttons.composer-button.style :as style]
     [quo.components.icon :as quo.icons]
-    [quo.theme :as theme]
+    [quo.theme]
     [react-native.core :as rn]))
 
 (defn view
   [{:keys [on-press on-long-press disabled? blur? icon accessibility-label container-style]}]
   (let [[pressed? set-pressed] (rn/use-state false)
-        theme                  (theme/use-theme-value)
+        theme                  (quo.theme/use-theme)
         on-press-in            (rn/use-callback #(set-pressed true))
         on-press-out           (rn/use-callback #(set-pressed nil))]
     [rn/pressable

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

@@ -52,7 +52,7 @@
     :count               mentions or notifications count
     :customization-color customize jump-to and mention button color}"
   [{:keys [type label on-press customization-color style] :as args}]
-  (let [theme                  (quo.theme/use-theme-value)
+  (let [theme                  (quo.theme/use-theme)
         [pressed? set-pressed] (rn/use-state false)
         button-color           (get-button-color {:type                type
                                                   :pressed?            pressed?

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

@@ -10,7 +10,7 @@
 
 (defn view
   [{:keys [on-press on-long-press disabled? container-style]}]
-  (let [theme                  (quo.theme/use-theme-value)
+  (let [theme                  (quo.theme/use-theme)
         [pressed? set-pressed] (rn/use-state false)
         on-press-in            (rn/use-callback #(set-pressed true))
         on-press-out           (rn/use-callback #(set-pressed nil))]

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

@@ -4,7 +4,7 @@
     [quo.components.buttons.predictive-keyboard.style :as style]
     [quo.components.info.info-message :as info-message]
     [quo.foundations.colors :as colors]
-    [quo.theme :as theme]
+    [quo.theme]
     [react-native.core :as rn]
     [react-native.linear-gradient :as linear-gradient]))
 
@@ -26,7 +26,7 @@
   []
   [rn/view {:style {:width 8}}])
 
-(defn- view-internal
+(defn view
   "Options
    - `type` `:words`/`:error`/`:info`/`:empty`.
    - `blur?` Boolean to enable blur background support.
@@ -34,43 +34,42 @@
    - `words` List of words to display in the keyboard.
    - `on-press` Callback called when a word is pressed `(fn [word])`
    - `theme` :light or :dark, received from with-theme HOC."
-  [{:keys [type blur? text words on-press theme]}]
-  [linear-gradient/linear-gradient
-   {:style               {:flex-direction :row}
-    :accessibility-label :predictive-keyboard
-    :colors              (if blur?
-                           (gradients :blur)
-                           (colors/theme-colors (gradients :light) (gradients :dark) theme))}
-   [rn/view {:style (style/wrapper type)}
-    (case type
-      :words
-      [rn/flat-list
-       {:keyboard-should-persist-taps      :always
-        :data                              words
-        :content-container-style           style/word-list
-        :render-fn                         word-component
-        :render-data                       {:on-press on-press}
-        :shows-horizontal-scroll-indicator false
-        :separator                         [separator]
-        :horizontal                        true
-        :key-fn                            str}]
+  [{:keys [type blur? text words on-press]}]
+  (let [theme (quo.theme/use-theme)]
+    [linear-gradient/linear-gradient
+     {:style               {:flex-direction :row}
+      :accessibility-label :predictive-keyboard
+      :colors              (if blur?
+                             (gradients :blur)
+                             (colors/theme-colors (gradients :light) (gradients :dark) theme))}
+     [rn/view {:style (style/wrapper type)}
+      (case type
+        :words
+        [rn/flat-list
+         {:keyboard-should-persist-taps      :always
+          :data                              words
+          :content-container-style           style/word-list
+          :render-fn                         word-component
+          :render-data                       {:on-press on-press}
+          :shows-horizontal-scroll-indicator false
+          :separator                         [separator]
+          :horizontal                        true
+          :key-fn                            str}]
 
-      :error
-      [info-message/info-message
-       {:icon :i/info
-        :size :default
-        :type :error}
-       text]
+        :error
+        [info-message/info-message
+         {:icon :i/info
+          :size :default
+          :type :error}
+         text]
 
-      :info
-      [info-message/info-message
-       (merge {:icon :i/info
-               :size :default
-               :type (if (= type :error) :error :default)}
-              (when blur?
-                {:text-color colors/white-opa-70
-                 :icon-color colors/white-opa-70}))
-       text]
-      nil)]])
-
-(def view (theme/with-theme view-internal))
+        :info
+        [info-message/info-message
+         (merge {:icon :i/info
+                 :size :default
+                 :type (if (= type :error) :error :default)}
+                (when blur?
+                  {:text-color colors/white-opa-70
+                   :icon-color colors/white-opa-70}))
+         text]
+        nil)]]))

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

@@ -48,7 +48,7 @@
   "
   [{:keys [on-complete track-text track-icon disabled? customization-color size
            container-style type blur?]}]
-  (let [theme                         (quo.theme/use-theme-value)
+  (let [theme                         (quo.theme/use-theme)
         x-pos                         (reanimated/use-shared-value 0)
         [track-width set-track-width] (rn/use-state nil)
         [sliding-complete?

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

@@ -3,12 +3,12 @@
     [quo.components.buttons.wallet-button.style :as style]
     [quo.components.icon :as quo.icons]
     [quo.foundations.colors :as colors]
-    [quo.theme :as theme]
+    [quo.theme]
     [react-native.core :as rn]))
 
 (defn view
   [{:keys [on-press on-long-press disabled? icon accessibility-label container-style]}]
-  (let [theme                  (theme/use-theme-value)
+  (let [theme                  (quo.theme/use-theme)
         [pressed? set-pressed] (rn/use-state false)
         on-press-in            (rn/use-callback #(set-pressed true))
         on-press-out           (rn/use-callback #(set-pressed nil))]

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

@@ -23,32 +23,31 @@
      :style  {:margin-top 4
               :color      (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}} text]])
 
-(defn view-internal
-  [{:keys [theme buy-action send-action receive-action bridge-action]}]
-  [rn/view {:style style/container}
-   [action-button
-    {:icon                :i/add
-     :text                (i18n/label :t/buy)
-     :on-press            buy-action
-     :theme               theme
-     :accessibility-label :buy}]
-   [action-button
-    {:icon                :i/send
-     :text                (i18n/label :t/send)
-     :on-press            send-action
-     :theme               theme
-     :accessibility-label :send}]
-   [action-button
-    {:icon                :i/receive
-     :text                (i18n/label :t/receive)
-     :on-press            receive-action
-     :theme               theme
-     :accessibility-label :receive}]
-   [action-button
-    {:icon                :i/bridge
-     :text                (i18n/label :t/bridge)
-     :on-press            bridge-action
-     :theme               theme
-     :accessibility-label :bridge}]])
-
-(def view (quo.theme/with-theme view-internal))
+(defn view
+  [{:keys [buy-action send-action receive-action bridge-action]}]
+  (let [theme (quo.theme/use-theme)]
+    [rn/view {:style style/container}
+     [action-button
+      {:icon                :i/add
+       :text                (i18n/label :t/buy)
+       :on-press            buy-action
+       :theme               theme
+       :accessibility-label :buy}]
+     [action-button
+      {:icon                :i/send
+       :text                (i18n/label :t/send)
+       :on-press            send-action
+       :theme               theme
+       :accessibility-label :send}]
+     [action-button
+      {:icon                :i/receive
+       :text                (i18n/label :t/receive)
+       :on-press            receive-action
+       :theme               theme
+       :accessibility-label :receive}]
+     [action-button
+      {:icon                :i/bridge
+       :text                (i18n/label :t/bridge)
+       :on-press            bridge-action
+       :theme               theme
+       :accessibility-label :bridge}]]))

src/quo/components/calendar/calendar/month_picker/view.cljs

@@ -4,13 +4,14 @@
     [quo.components.calendar.calendar.month-picker.style :as style]
     [quo.components.calendar.calendar.month-picker.utils :as utils]
     [quo.components.markdown.text :as text]
-    [quo.theme :as theme]
+    [quo.theme]
     [react-native.core :as rn]
     [utils.number :as utils.number]))
 
-(defn- view-internal
-  [{:keys [year month on-change theme]}]
-  (let [year  (utils.number/parse-int year)
+(defn view
+  [{:keys [year month on-change]}]
+  (let [theme (quo.theme/use-theme)
+        year  (utils.number/parse-int year)
         month (utils.number/parse-int month)]
     [rn/view
      {:style style/container}
@@ -35,5 +36,3 @@
        :type                    :outline
        :on-press                #(on-change (utils/next-month year month))}
       :i/chevron-right]]))
-
-(def view (theme/with-theme view-internal))

src/quo/components/calendar/calendar/view.cljs

@@ -6,13 +6,13 @@
     [quo.components.calendar.calendar.utils :as utils]
     [quo.components.calendar.calendar.weekdays-header.view :as weekdays-header]
     [quo.components.calendar.calendar.years-list.view :as years-list]
-    [quo.theme :as theme]
+    [quo.theme]
     [react-native.core :as rn]
     [utils.number :as utils.number]))
 
 (defn view
   [{:keys [on-change start-date end-date]}]
-  (let [theme                               (theme/use-theme-value)
+  (let [theme                               (quo.theme/use-theme)
         [selected-year set-selected-year]   (rn/use-state (utils/current-year))
         [selected-month set-selected-month] (rn/use-state (utils/current-month))
         on-change-year                      (rn/use-callback #(set-selected-year %))

src/quo/components/calendar/calendar/weekdays_header/view.cljs

@@ -2,23 +2,22 @@
   (:require
     [quo.components.calendar.calendar.weekdays-header.style :as style]
     [quo.components.markdown.text :as text]
-    [quo.theme :as theme]
+    [quo.theme]
     [react-native.core :as rn]
     [utils.datetime :as datetime]
     [utils.i18n :as i18n]))
 
-(defn- view-internal
-  [theme]
-  [rn/view
-   {:style style/container-weekday-row}
-   (for [weekday datetime/weekday-names]
-     [rn/view
-      {:style style/container-weekday
-       :key   weekday}
-      [text/text
-       {:weight :medium
-        :size   :paragraph-2
-        :style  (style/text-weekdays theme)}
-       (str (i18n/label weekday))]])])
-
-(def view (theme/with-theme view-internal))
+(defn view
+  []
+  (let [theme (quo.theme/use-theme)]
+    [rn/view
+     {:style style/container-weekday-row}
+     (for [weekday datetime/weekday-names]
+       [rn/view
+        {:style style/container-weekday
+         :key   weekday}
+        [text/text
+         {:weight :medium
+          :size   :paragraph-2
+          :style  (style/text-weekdays theme)}
+         (str (i18n/label weekday))]])]))