commit : stage wip stuff

2024-04-01 11:45:41 +05:30
293 changed files with 4176 additions and 5368 deletions
@@ -441,10 +441,6 @@ _list: SHELL := /bin/sh
 _list:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'

-patch-file: export TARGET := default
-patch-file: ##@other Generates patch file for npm deps
-	@scripts/patch-npm-lib.sh
-
 #--------------
 # REPLs
 #--------------
@@ -81,7 +81,7 @@ pipeline {
    stage('Publish') {
      when { expression { params.PUBLISH } }
      steps { script {
-        switch (utils.getBuildType()) {
+        switch (btype) {
          case 'nightly': /* Create JSON file with newest build URLs */
            s3.updateBucketJSON(urls, 'latest.json');
            break;
@@ -20,6 +20,12 @@ required by bignumber.js otherwise there is a compilation error

 used to generate guids and random values in `status-im.utils.random`

+## "create-react-class": "15.6.2"
+
+fixed version because even bugfix update causes compilation error with current version of react-native (0.59)
+
+internal react library, used by figwheel for instance but also probably react
+
 ## "emojilib": "^2.4.0"

 used for emojis
@@ -107,6 +113,11 @@ used for profile picture
 used for storing password when user saves password
 TODO: check if fork is necessary, merge with upstream?

+## "react-native-languages": "^3.0.2"
+
+TODO DEPRECATED, should be replaced with https://github.com/react-native-community/react-native-localize
+used to get user language and interact with i18n.js
+
 ## "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#v3.0.8_status"

 used to send email to support when phone is shaked
@@ -120,7 +131,6 @@ TODO: update once bug is fixed for Android that causes crash when app is back fr
 ## "react-native-shake": "^3.3.1"

 used to send email to support when phone is shaked
-
 ## "react-native-lottie-splash-screen": "^1.0.1"

 used to make splash screen with lottie animation during initial loading for android, also used as replacement of "react-native-splash-screen" for iOS
@@ -147,10 +157,10 @@ used for browser
 used for native navigation
 fixed because even bugfix version upgrade causes runtime errors with current version of react-native

+## "rn-emoji-keyboard": "https://github.com/status-im/rn-emoji-keyboard"
+
+Used for taking emoji input, for custom emoji thumbnails for community channels
+
 ## "react-native-draggable-flatlist": "https://github.com/computerjazz/react-native-draggable-flatlist"

 A drag-and-drop-enabled FlatList component for React Native
-
-## "react-native-shadow-2": "https://github.com/SrBrahma/react-native-shadow-2"
-
-A shadow component that is consistent across both platforms
@@ -2,7 +2,7 @@

 [Pipeline for QA](https://github.com/status-im/status-mobile/projects/7) is a project board for developers and testers used to track the status of a pull request, get reviews and manual testing, and run autotests.

-The generally accepted requirements for its use are described below:
+The generally accepted recommendations for its use are described below:

 ## Opening a PR
 - Once a PR is created, it moves to the ```REVIEW``` column where a review will be requested automatically.
@@ -13,70 +13,35 @@ The generally accepted requirements for its use are described below:
 ### What if the work is still in progress?

 - If PR work is not finished yet, please mark it as a draft or add [WIP] to the title and keep it in the `CONTRIBUTOR` column until it's ready to be reviewed/tested.
- Alternatively, you can open a `draft`.

-### When is a PR considered ready to move forward?

-Ready for testing, a PR should meet the following criteria:
+### When is a PR considered to be Ready for testing by QA team?   
+Ready for testing PR should meet the following criteria: 

-1. Reviewed and has at least 1 approval.
-2. Rebased to the `develop` branch (both `status-mobile` and `status-go` if needed, depending on what part has changes).
-   - **NOTE:** QAs can use the `Update with rebase` button from GitHub if:
-        - The PR has no `status-go` changes.
-        - The PR has no conflict with the develop branch.
-3. All possible conflicts have been resolved.
-4. Has the label: `request-manual-qa` or `skip-manual-qa`.
-5. PRs **MUST** identify what area is affected and should have a description.
+1. Reviewed and has at least 1 approval
+2. Rebased to `develop` branch (both `status-mobile` and `status-go` if needed, depending on what part has changes) 
+3. All possible conflicts have been resolved 
+4. Has the label: `request-manual-qa`

-**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. 
+5. Once the PR has been approved by reviewer(s) - label `request-manual-qa` should be applied to the PR
+6. Move PR 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
-
-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.
-
-If there are `Failed tests` and you are not sure about the reason, you can always ping the mobile QAs for help (preferably in PRs by `@status-im/mobile-qa`).
-
-**For now, it is the only reliable source of regression in the app because, due to time constraints, it is not possible to test thoroughly each PR.
-Please, respect this rule.**
+After that - PR will be taken into manual testing by the QA team.

 ## Testing PR

 ### Manual testing
-
-#### Prerequisites for manual testing
-1. PR has a description of the change and details the area of the application affected by the change.
-2. PR has automation results from the previous E2E test run step.
-3. PR includes a demo, test steps, and any possible regression(s)
-4. If appropriate, PR details what elements of a feature are out of scope.
-
-**If one of the prerequisites is missing, the PR will be moved to the contributor folder with a corresponding comment.**
-
- If you think a PR needs and is ready for manual testing, please add the `request-manual-qa` label.
+- If you think PR needs and is ready for manual testing, please add the ```request-manual-qa``` label. 
 - QA engineer picks up one of PRs with the ```request-manual-qa``` label, drags the item to the ```IN TESTING``` column and assigns it to themselves.
 - During testing, QA will add comments describing the issues found, and also review automation tests results.
 Usually found issues are numbered as "Issue 1, Issue 2", etc.
-When the first round of testing is completed and all issues for this stage are found, the QA can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional. 
-
-**IMPORTANT NOTE:** when the issues are fixed, developer **MUST** notify the QA that it is ready to be re-tested again by mention them in the PR.
-
+When the first round of testing is completed and all issues for this stage are found, the QA can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional.
 - When manual testing of the PR is fully completed and all the issues are fixed, the QA adds the ```Tested - OK``` label and drags the card to the ```Design review``` column (the cases when design review is necessary are described below).
 - If design review is not required, the QA drags the PR to the ```MERGE``` column. After that the developer merges PR into develop.
 - If design review has been done, the designer (```@Francesca-G```) drags the PR to the ```MERGE``` column.
@@ -103,7 +68,7 @@ There are three possible scenarios when the design review is completed:
 ---        

 #### Why my PR is in `Contributor` column?
-PR can be moved to this column by the ```status-github-bot``` or by QA engineer with label `Tested-issues` or if one of the requirements for manual QA was not met.
+PR can be moved to this column by the ```status-github-bot``` or by QA engineer with label `Tested-issues`.
 In the first case most often this happens due to conflicting files in PR.
 In the second case - after fixing of all found issues, the developer should ping the QA in the PR comments for retesting.

@@ -121,6 +86,7 @@ In the second case - after fixing of all found issues, the developer should ping
 6. In case of manual testing - the label ```Tested - OK``` from QA
 7. In case of design review - the approval from the designer

+
 You can merge your PR into develop - some useful clues you can find [here](https://notes.status.im/setup-e2e#3-Merging-PR) 

 HAPPY DEVELOPMENT! :tada: 
@@ -217,7 +217,6 @@ GEM

 PLATFORMS
  arm64-darwin-22
-  x86_64-darwin-22

 DEPENDENCIES
  activesupport (>= 6.1.7.3, < 7.1.0)
@@ -891,7 +891,7 @@ PODS:
    - React-Core
  - react-native-image-resizer (1.2.3):
    - React
-  - react-native-lottie-splash-screen (1.1.2):
+  - react-native-lottie-splash-screen (1.0.1):
    - React
  - react-native-mail (6.1.1):
    - React-Core
@@ -899,6 +899,8 @@ PODS:
    - React
  - react-native-orientation-locker (1.5.0):
    - React-Core
+  - react-native-randombytes (3.6.1):
+    - React-Core
  - react-native-shake (3.4.0):
    - React
  - react-native-slider (3.0.0):
@@ -1121,8 +1123,12 @@ PODS:
    - TOCropViewController
  - RNKeychain (8.1.2):
    - React-Core
+  - RNLanguages (3.0.2):
+    - React
  - RNPermissions (3.8.0):
    - React-Core
+  - RNReactNativeHapticFeedback (1.9.0):
+    - React
  - RNReanimated (3.6.1):
    - glog
    - RCT-Folly (= 2022.05.16.00)
@@ -1191,6 +1197,7 @@ DEPENDENCIES:
  - 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-randombytes (from `../node_modules/react-native-randombytes`)
  - react-native-shake (from `../node_modules/react-native-shake`)
  - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
  - react-native-status (from `../modules/react-native-status`)
@@ -1229,7 +1236,9 @@ DEPENDENCIES:
  - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
  - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
  - RNKeychain (from `../node_modules/react-native-keychain`)
+  - RNLanguages (from `../node_modules/react-native-languages`)
  - RNPermissions (from `../node_modules/react-native-permissions`)
+  - RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
  - RNReanimated (from `../node_modules/react-native-reanimated`)
  - RNShare (from `../node_modules/react-native-share`)
  - RNStaticSafeAreaInsets (from `../node_modules/react-native-static-safe-area-insets`)
@@ -1335,6 +1344,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/@react-native-community/netinfo"
  react-native-orientation-locker:
    :path: "../node_modules/react-native-orientation-locker"
+  react-native-randombytes:
+    :path: "../node_modules/react-native-randombytes"
  react-native-shake:
    :path: "../node_modules/react-native-shake"
  react-native-slider:
@@ -1411,8 +1422,12 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-image-crop-picker"
  RNKeychain:
    :path: "../node_modules/react-native-keychain"
+  RNLanguages:
+    :path: "../node_modules/react-native-languages"
  RNPermissions:
    :path: "../node_modules/react-native-permissions"
+  RNReactNativeHapticFeedback:
+    :path: "../node_modules/react-native-haptic-feedback"
  RNReanimated:
    :path: "../node_modules/react-native-reanimated"
  RNShare:
@@ -1444,7 +1459,7 @@ SPEC CHECKSUMS:
  FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
  FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 37f1918ec8d57cbace2b409e117ef06bade68a64
+  glog: 5ce14391bd2885c921f691b0abdff44138728fac
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
@@ -1479,10 +1494,11 @@ SPEC CHECKSUMS:
  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
  react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
  react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
-  react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
+  react-native-lottie-splash-screen: 068688c15dd478301fda00f8d87d7fb7d5b9a93e
  react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
  react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
+  react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
  react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
  react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
  react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
@@ -1521,7 +1537,9 @@ SPEC CHECKSUMS:
  RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
  RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
  RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
+  RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
  RNPermissions: 215c54462104b3925b412b0fb3c9c497b21c358b
+  RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
  RNReanimated: dee37576492f1a375017515f5c77e66e5eec696b
  RNShare: 859ff710211285676b0bcedd156c12437ea1d564
  RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
@@ -1536,4 +1554,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: c9c6dfac28e31314e1a2ee2dc47364ad151f13f2

-COCOAPODS: 1.13.0
+COCOAPODS: 1.12.0
@@ -8,10 +8,11 @@

 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
+		061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */; };
 		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 +37,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 */; };
+		536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F311917BE57976CED3B9842 /* 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,7 +47,6 @@
 		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 */; };
@@ -61,6 +61,8 @@
 		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 */; };
+		E9AC7FD92BB8FDAB0024A0AF /* HelloWorldJSI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9AC7FD72BB8FDAB0024A0AF /* HelloWorldJSI.cpp */; };
+		E9AC7FDA2BB8FDAB0024A0AF /* HelloWorldJSI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9AC7FD72BB8FDAB0024A0AF /* HelloWorldJSI.cpp */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -108,39 +110,37 @@
 		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; };
+		1E0A54C37353D912620563B4 /* 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>"; };
+		1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		3AAD2ADC24A3A60E0075D594 /* Status PR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Status PR.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
-		466C47BA171B53CAE0AD6A19 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		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; };
+		7625793B15B3B2A8E58F6277 /* 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>"; };
+		79B38E3D4B033A711A7852FF /* 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>"; };
+		7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
 		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>"; };
+		AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
@@ -150,10 +150,14 @@
 		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>"; };
+		C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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>"; };
+		CA58075FD8E5F9A0CA74E512 /* 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>"; };
 		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>"; };
+		D1CE733E3486B3A8B9185945 /* 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>"; };
+		E9AC7FD72BB8FDAB0024A0AF /* HelloWorldJSI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldJSI.cpp; path = "../modules/react-native-status/jsi/HelloWorldJSI.cpp"; sourceTree = "<group>"; };
+		E9AC7FD82BB8FDAB0024A0AF /* HelloWorldJSI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldJSI.h; path = "../modules/react-native-status/jsi/HelloWorldJSI.h"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +165,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8CF1CA9463A4048F97BABB82 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +178,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				42AC64E4D3CA4E676400C598 /* libPods-Status-StatusIm.a in Frameworks */,
+				17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +192,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				2B6F8F28B81E862D44C8723D /* libPods-Status-StatusImPR.a in Frameworks */,
+				061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -268,6 +272,8 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				E9AC7FD72BB8FDAB0024A0AF /* HelloWorldJSI.cpp */,
+				E9AC7FD82BB8FDAB0024A0AF /* HelloWorldJSI.h */,
 				65F6941825780A4F00A45E76 /* Bridge.swift */,
 				3AAD2AB624A3A5F10075D594 /* StatusImPR */,
 				13B07FAE1A68108700A75B9A /* StatusIm */,
@@ -314,9 +320,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 */,
+				7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */,
+				1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */,
+				C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +330,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 */,
+				AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */,
+				1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */,
+				D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +347,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				99EA576680D5849CA4274106 /* [CP] Check Pods Manifest.lock */,
+				8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				835B3E5945D5F723935FD4E1 /* [CP] Copy Pods Resources */,
+				1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +367,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				140572B0EA34D6F884AB6CC4 /* [CP] Check Pods Manifest.lock */,
+				FD7194DC9A3E5A5277869CFC /* [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 */,
+				88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +389,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				78F85303177A5D4820A08DC1 /* [CP] Check Pods Manifest.lock */,
+				4EE2E0EC4F119397E1A6B768 /* [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 */,
+				1B5C687FDBFFB60FD1043432 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -542,125 +548,9 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			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";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ../logs/react-native-xcode.log 2>&1";
 		};
-		140572B0EA34D6F884AB6CC4 /* [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-StatusIm-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;
-		};
-		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Bundle React Native code and images";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			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";
-		};
-		3AAD2AD724A3A60E0075D594 /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
-		};
-		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 */ = {
+		1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -682,7 +572,101 @@
 			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 */ = {
+		1B5C687FDBFFB60FD1043432 /* [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;
+		};
+		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Bundle React Native code and images";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			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\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ../logs/react-native-xcode.log 2>&1";
+		};
+		3AAD2AD724A3A60E0075D594 /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = "/usr/bin/env sh";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
+		};
+		4EE2E0EC4F119397E1A6B768 /* [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;
+		};
+		88DEE6D9CF4D6BA6F6D8DCB5 /* [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;
+		};
+		8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -716,7 +700,29 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
+		};
+		FD7194DC9A3E5A5277869CFC /* [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-StatusIm-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;
 		};
 /* End PBXShellScriptBuildPhase section */

@@ -737,6 +743,7 @@
 				65F6941925780A4F00A45E76 /* Bridge.swift in Sources */,
 				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
 				3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */,
+				E9AC7FD92BB8FDAB0024A0AF /* HelloWorldJSI.cpp in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -748,6 +755,7 @@
 				65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */,
 				3AAD2ABC24A3A60E0075D594 /* AppDelegate.mm in Sources */,
 				3AAD2ABD24A3A60E0075D594 /* Dummy.swift in Sources */,
+				E9AC7FDA2BB8FDAB0024A0AF /* HelloWorldJSI.cpp in Sources */,
 				3AAD2ABE24A3A60E0075D594 /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -765,7 +773,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D42A8AC52E48DA4C89F20C13 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -795,14 +803,14 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusImTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.2;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm";
 			};
 			name = Debug;
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2756A97EBFF084FA94990AA5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -828,14 +836,14 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusImTests-Bridging-Header.h";
-				SWIFT_VERSION = 5.2;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm";
 			};
 			name = Release;
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 680C14B0F642A5F544C397B7 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -901,14 +909,14 @@
 					"$(inherited)",
 					"-lc++",
 					"-ObjC",
-					"-lresolv",
 				);
+				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "x86_64 arm64";
 				"VALID_ARCHS[sdk=iphonesimulator*]" = "x86_64 ";
@@ -917,7 +925,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7FA4F04CE45319370F87C4FD /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -977,14 +985,14 @@
 					"$(inherited)",
 					"-lc++",
 					"-ObjC",
-					"-lresolv",
 				);
+				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
 				PROVISIONING_PROFILE = "e2202b12-7a66-4ff7-af3c-a52e35f32dc1";
 				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
-				SWIFT_VERSION = 5.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = arm64;
 			};
@@ -992,7 +1000,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5AAC8D9B1AF8BB7C8AB89845 /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1057,14 +1065,13 @@
 					"$(inherited)",
 					"-lc++",
 					"-ObjC",
-					"-lresolv",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
 				PRODUCT_NAME = "Status PR";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum.pr";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = arm64;
 			};
@@ -1072,7 +1079,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0C331FD392B615DDAD0997F5 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1131,13 +1138,12 @@
 					"$(inherited)",
 					"-lc++",
 					"-ObjC",
-					"-lresolv",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
 				PRODUCT_NAME = "Status PR";
 				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum.pr";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
-				SWIFT_VERSION = 5.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = arm64;
 			};
@@ -1176,7 +1182,6 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1231,6 +1236,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
+				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = false;
@@ -1272,7 +1278,6 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
-				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -1318,6 +1323,7 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = "$(inherited)";
+				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = false;
@@ -73,6 +73,17 @@ extern "C" NSString* StatusgoImageServerTLSCert();
  [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults];

  [RNSplashScreen show];
+  
+  RCTCxxBridge *bridge = (RCTCxxBridge *)[[_bridge batchedBridge] valueForKey:@"_batchedBridge"];
+  facebook::react::RCTJSIExecutorFactory *executorFactory = [bridge jsExecutorFactoryForBridge:bridge];
+
+  if (executorFactory) {
+      bridge.jsiExecutorFactory = ^{
+          facebook::jsi::Runtime *runtime = executorFactory();
+          HelloWorldJSI::install(*runtime);
+          return runtime;
+      };
+  }

  UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
  center.delegate = self;
@@ -22,8 +22,6 @@ This directory is the destination of logs created during build time of debug bui
 These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`.

 * `react-native-xcode.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`.
-  - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj` for "Bundle React Native code and images" build Phase.
-* `set_xcode_version.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`.
-  - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj` for "Run Script" build Phase.
+  - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj`.
 * `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/).
  - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.
@@ -210,14 +210,18 @@ public class AccountManager extends ReactContextBaseJavaModule {

    @ReactMethod
    public void saveAccountAndLoginWithKeycard(final String multiaccountData, final String password, final String settings, final String config, final String accountsData, final String chatKey) {
-        Log.d(TAG, "saveAccountAndLoginWithKeycard");
-        String finalConfig = prepareDirAndUpdateConfig(config, this.utils.getKeyUID(multiaccountData));
-        String result = Statusgo.saveAccountAndLoginWithKeycard(multiaccountData, password, settings, finalConfig, accountsData, chatKey);
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "saveAccountAndLoginWithKeycard result: " + result);
-            Log.d(TAG, "Geth node started");
-        } else {
-            Log.e(TAG, "saveAccountAndLoginWithKeycard failed: " + result);
+        try {
+            Log.d(TAG, "saveAccountAndLoginWithKeycard");
+            String finalConfig = prepareDirAndUpdateConfig(config, this.utils.getKeyUID(multiaccountData));
+            String result = Statusgo.saveAccountAndLoginWithKeycard(multiaccountData, password, settings, finalConfig, accountsData, chatKey);
+            if (result.startsWith("{\"error\":\"\"")) {
+                Log.d(TAG, "saveAccountAndLoginWithKeycard result: " + result);
+                Log.d(TAG, "Geth node started");
+            } else {
+                Log.e(TAG, "saveAccountAndLoginWithKeycard failed: " + result);
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "JSON conversion failed: " + e.getMessage());
        }
    }

@@ -0,0 +1,147 @@
+package im.status.ethereum.module;
+
+import android.app.Activity;
+import android.util.Log;
+import android.view.Window;
+import android.view.WindowManager;
+import android.os.Build;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import statusgo.SignalHandler;
+import statusgo.Statusgo;
+
+import org.json.JSONException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventListener, SignalHandler {
+
+    private static final String TAG = "StatusModule";
+    private static StatusModule module;
+    private ReactApplicationContext reactContext;
+    private boolean rootedDevice;
+    private boolean background;
+    private Utils utils;
+
+
+    StatusModule(ReactApplicationContext reactContext, boolean rootedDevice) {
+        super(reactContext);
+        this.reactContext = reactContext;
+        this.rootedDevice = rootedDevice;
+        this.utils = new Utils(reactContext);
+
+        reactContext.addLifecycleEventListener(this);
+    }
+
+    @Override
+    public String getName() {
+        return "Status";
+    }
+
+    @Override
+    public void onHostResume() {
+        module = this;
+        this.background = false;
+        Statusgo.setMobileSignalHandler(this);
+    }
+
+    @Override
+    public void onHostPause() {
+        this.background = true;
+    }
+
+    @Override
+    public void onHostDestroy() {
+        Log.d(TAG, "******************* ON HOST DESTROY *************************");
+    }
+
+    public void handleSignal(final String jsonEventString) {
+        Log.d(TAG, "Signal event");
+        WritableMap params = Arguments.createMap();
+        params.putString("jsonEvent", jsonEventString);
+        this.getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("gethEvent", params);
+    }
+
+    @ReactMethod
+    public void closeApplication() {
+        System.exit(0);
+    }
+
+    @ReactMethod
+    public void connectionChange(final String type, final boolean isExpensive) {
+        Log.d(TAG, "ConnectionChange: " + type + ", is expensive " + isExpensive);
+        Statusgo.connectionChange(type, isExpensive ? 1 : 0);
+    }
+
+    @ReactMethod
+    public void appStateChange(final String type) {
+        Log.d(TAG, "AppStateChange: " + type);
+        Statusgo.appStateChange(type);
+    }
+
+    @ReactMethod
+    public void startLocalNotifications() {
+        Log.d(TAG, "startLocalNotifications");
+        Statusgo.startLocalNotifications();
+    }
+
+    @ReactMethod
+    public void getNodeConfig(final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.getNodeConfig(), callback);
+    }
+
+    @ReactMethod
+    public void deleteImportedKey(final String keyUID, final String address, final String password, final Callback callback) throws JSONException {
+        final String keyStoreDir = this.utils.getKeyStorePath(keyUID);
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deleteImportedKey(address, password, keyStoreDir), callback);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String fleets() {
+        return Statusgo.fleets();
+    }
+
+    @Override
+    public @Nullable
+    Map<String, Object> getConstants() {
+        HashMap<String, Object> constants = new HashMap<String, Object>();
+
+        constants.put("is24Hour", this.utils.is24Hour());
+        constants.put("model", Build.MODEL);
+        constants.put("brand", Build.BRAND);
+        constants.put("buildId", Build.ID);
+        constants.put("deviceId", Build.BOARD);
+        return constants;
+    }
+
+    @ReactMethod
+    public void isDeviceRooted(final Callback callback) {
+        callback.invoke(rootedDevice);
+    }
+
+    @ReactMethod
+    public void deactivateKeepAwake() {
+        final Activity activity = getCurrentActivity();
+
+        if (activity != null) {
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    activity.getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                }
+            });
+        }
+    }
+
+}
+
@@ -1,114 +0,0 @@
-package im.status.ethereum.module
-
-import android.app.Activity
-import android.os.Build
-import android.util.Log
-import com.facebook.react.bridge.*
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import statusgo.SignalHandler
-import statusgo.Statusgo
-import org.json.JSONException
-import android.view.WindowManager
-
-class StatusModule(private val reactContext: ReactApplicationContext, private val rootedDevice: Boolean) : ReactContextBaseJavaModule(reactContext), LifecycleEventListener, SignalHandler {
-
-    companion object {
-        private const val TAG = "StatusModule"
-        private var module: StatusModule? = null
-    }
-
-    private val utils: Utils = Utils(reactContext)
-    private var background: Boolean = false
-
-    init {
-        reactContext.addLifecycleEventListener(this)
-    }
-
-    override fun getName(): String {
-        return "Status"
-    }
-
-    override fun onHostResume() {
-        module = this
-        background = false
-        Statusgo.setMobileSignalHandler(this)
-    }
-
-    override fun onHostPause() {
-        background = true
-    }
-
-    override fun onHostDestroy() {
-        Log.d(TAG, "******************* ON HOST DESTROY *************************")
-    }
-
-    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)
-    }
-
-    @ReactMethod
-    fun closeApplication() {
-        System.exit(0)
-    }
-
-    @ReactMethod
-    fun connectionChange(type: String, isExpensive: Boolean) {
-        Log.d(TAG, "ConnectionChange: $type, is expensive $isExpensive")
-        Statusgo.connectionChange(type, if (isExpensive) 1 else 0)
-    }
-
-    @ReactMethod
-    fun appStateChange(type: String) {
-        Log.d(TAG, "AppStateChange: $type")
-        Statusgo.appStateChange(type)
-    }
-
-    @ReactMethod
-    fun startLocalNotifications() {
-        Log.d(TAG, "startLocalNotifications")
-        Statusgo.startLocalNotifications()
-    }
-
-    @ReactMethod
-    fun getNodeConfig(callback: Callback) {
-        utils.executeRunnableStatusGoMethod({ Statusgo.getNodeConfig() }, callback)
-    }
-
-    @ReactMethod
-    fun deleteImportedKey(keyUID: String, address: String, password: String, callback: Callback) {
-        val keyStoreDir = utils.getKeyStorePath(keyUID)
-        utils.executeRunnableStatusGoMethod({ Statusgo.deleteImportedKey(address, password, keyStoreDir) }, callback)
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun fleets(): String {
-        return Statusgo.fleets()
-    }
-
-    override fun getConstants(): Map<String, Any>? {
-        return hashMapOf(
-            "is24Hour" to utils.is24Hour(),
-            "model" to Build.MODEL,
-            "brand" to Build.BRAND,
-            "buildId" to Build.ID,
-            "deviceId" to Build.BOARD
-        )
-    }
-
-    @ReactMethod
-    fun isDeviceRooted(callback: Callback) {
-        callback.invoke(rootedDevice)
-    }
-
-    @ReactMethod
-    fun deactivateKeepAwake() {
-        val activity = currentActivity
-
-        activity?.runOnUiThread {
-            activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        }
-    }
-}
@@ -0,0 +1,51 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import statusgo.Statusgo;
+
+public class StatusPackage implements ReactPackage {
+
+    private boolean rootedDevice;
+
+    public static String getImageTLSCert() {
+        return Statusgo.imageServerTLSCert();
+    }
+
+    public StatusPackage(boolean rootedDevice) {
+        this.rootedDevice = rootedDevice;
+    }
+
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        List<NativeModule> modules = new ArrayList<>();
+
+        modules.add(new StatusModule(reactContext, this.rootedDevice));
+        modules.add(new AccountManager(reactContext));
+        modules.add(new EncryptionUtils(reactContext));
+        modules.add(new DatabaseManager(reactContext));
+        modules.add(new UIHelper(reactContext));
+        modules.add(new LogManager(reactContext));
+        modules.add(new Utils(reactContext));
+        modules.add(new NetworkManager(reactContext));
+        modules.add(new RNSelectableTextInputModule(reactContext));
+
+        return modules;
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Arrays.<ViewManager>asList(
+                new RNSelectableTextInputViewManager()
+        );
+    }
+}
@@ -1,38 +0,0 @@
-package im.status.ethereum.module
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-import statusgo.Statusgo
-
-class StatusPackage(private val rootedDevice: Boolean) : ReactPackage {
-
-    companion object {
-        fun getImageTLSCert(): String = Statusgo.imageServerTLSCert()
-    }
-
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        val modules = mutableListOf<NativeModule>()
-
-        modules.apply {
-            add(StatusModule(reactContext, rootedDevice))
-            add(AccountManager(reactContext))
-            add(EncryptionUtils(reactContext))
-            add(DatabaseManager(reactContext))
-            add(UIHelper(reactContext))
-            add(LogManager(reactContext))
-            add(Utils(reactContext))
-            add(NetworkManager(reactContext))
-            add(RNSelectableTextInputModule(reactContext))
-        }
-
-        return modules
-    }
-
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return listOf(
-            RNSelectableTextInputViewManager()
-        )
-    }
-}
@@ -0,0 +1,155 @@
+package im.status.ethereum.module;
+
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import android.util.Log;
+import java.util.function.Supplier;
+import java.io.File;
+import android.content.Context;
+import android.os.Environment;
+import org.json.JSONObject;
+import org.json.JSONException;
+import statusgo.Statusgo;
+
+public class Utils extends ReactContextBaseJavaModule  {
+    private static final String gethLogFileName = "geth.log";
+
+    private static final String TAG = "Utils";
+    private ReactApplicationContext reactContext;
+
+    public Utils(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+    }
+
+    @Override
+    public String getName() {
+        return "Utils";
+    }
+    public String getNoBackupDirectory() {
+        return this.getReactApplicationContext().getNoBackupFilesDir().getAbsolutePath();
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String backupDisabledDataDir() {
+        return getNoBackupDirectory();
+    }
+
+    public File getPublicStorageDirectory() {
+        final Context context = this.getReactApplicationContext();
+        // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
+        // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
+        return context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+    }
+
+    public File getLogsFile() {
+        final File pubDirectory = getPublicStorageDirectory();
+        final File logFile = new File(pubDirectory, gethLogFileName);
+
+        return logFile;
+    }
+
+    public String getKeyUID(final String json) throws JSONException {
+        final JSONObject jsonObj = new JSONObject(json);
+        return jsonObj.getString("key-uid");
+    }
+
+    public String pathCombine(final String path1, final String path2) {
+        // Replace this logic with Paths.get(path1, path2) once API level 26+ becomes the minimum supported API level
+        final File file = new File(path1, path2);
+        return file.getAbsolutePath();
+    }
+
+    public String getKeyStorePath(String keyUID) {
+        final String commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore");
+        final String keydir = pathCombine(commonKeydir, keyUID);
+
+        return keydir;
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String keystoreDir() {
+        final String absRootDirPath = getNoBackupDirectory();
+        return pathCombine(absRootDirPath, "keystore");
+    }
+
+    public void migrateKeyStoreDir(final String accountData, final String password) {
+        try {
+            final String commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore");
+            final String keydir = getKeyStorePath(getKeyUID(accountData));
+            Log.d(TAG, "before migrateKeyStoreDir " + keydir);
+
+            File keydirFile = new File(keydir);
+            if(!keydirFile.exists() || keydirFile.list().length == 0) {
+                Log.d(TAG, "migrateKeyStoreDir");
+                Statusgo.migrateKeyStoreDir(accountData, password, commonKeydir, keydir);
+                Statusgo.initKeystore(keydir);
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "JSON conversion failed: " + e.getMessage());
+        }
+    }
+
+    public boolean checkAvailability() {
+        // We wait at least 10s for getCurrentActivity to return a value,
+        // otherwise we give up
+        for (int attempts = 0; attempts < 100; attempts++) {
+            if (getCurrentActivity() != null) {
+                return true;
+            }
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ex) {
+                if (getCurrentActivity() != null) {
+                    return true;
+                }
+                Log.d(TAG, "Activity doesn't exist");
+                return false;
+            }
+        }
+
+        Log.d(TAG, "Activity doesn't exist");
+        return false;
+    }
+
+    public void executeRunnableStatusGoMethod(Supplier<String> method, Callback callback) throws JSONException {
+        if (!checkAvailability()) {
+            callback.invoke(false);
+            return;
+        }
+
+        Runnable runnableTask = () -> {
+            String res = method.get();
+            callback.invoke(res);
+        };
+
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
+    }
+
+    @ReactMethod
+    public void validateMnemonic(final String seed, final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.validateMnemonic(seed), callback);
+    }
+
+    public Boolean is24Hour() {
+        return android.text.format.DateFormat.is24HourFormat(this.reactContext.getApplicationContext());
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String checkAddressChecksum(final String address) {
+        return Statusgo.checkAddressChecksum(address);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String isAddress(final String address) {
+        return Statusgo.isAddress(address);
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String toChecksumAddress(final String address) {
+        return Statusgo.toChecksumAddress(address);
+    }
+
+}
@@ -1,144 +0,0 @@
-package im.status.ethereum.module
-
-import android.content.Context
-import android.os.Environment
-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 android.util.Log
-import org.json.JSONException
-import org.json.JSONObject
-import java.io.File
-import java.util.function.Supplier
-import statusgo.Statusgo
-
-class Utils(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-
-    companion object {
-        private const val gethLogFileName = "geth.log"
-        private const val TAG = "Utils"
-    }
-
-    override fun getName(): String {
-        return "Utils"
-    }
-
-    fun getNoBackupDirectory(): String {
-        return reactContext.noBackupFilesDir.absolutePath
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun backupDisabledDataDir(): String {
-        return getNoBackupDirectory()
-    }
-
-    fun getPublicStorageDirectory(): File? {
-        // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
-        // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
-        return reactContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
-    }
-
-    fun getLogsFile(): File {
-        val pubDirectory = getPublicStorageDirectory()
-        return File(pubDirectory, gethLogFileName)
-    }
-
-    fun getKeyUID(json: String): String {
-        val jsonObj = JSONObject(json)
-        return jsonObj.getString("key-uid")
-    }
-
-    fun pathCombine(path1: String, path2: String): String {
-        val file = File(path1, path2)
-        return file.absolutePath
-    }
-
-    fun getKeyStorePath(keyUID: String): String {
-        val commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore")
-        return pathCombine(commonKeydir, keyUID)
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun keystoreDir(): String {
-        val absRootDirPath = getNoBackupDirectory()
-        return pathCombine(absRootDirPath, "keystore")
-    }
-
-    fun migrateKeyStoreDir(accountData: String, password: String) {
-        try {
-            val commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore")
-            val keydir = getKeyStorePath(getKeyUID(accountData))
-            Log.d(TAG, "before migrateKeyStoreDir $keydir")
-
-            val keydirFile = File(keydir)
-            if (!keydirFile.exists() || keydirFile.list().isEmpty()) {
-                Log.d(TAG, "migrateKeyStoreDir")
-                Statusgo.migrateKeyStoreDir(accountData, password, commonKeydir, keydir)
-                Statusgo.initKeystore(keydir)
-            }
-        } catch (e: JSONException) {
-            Log.e(TAG, "JSON conversion failed: ${e.message}")
-        }
-    }
-
-    fun checkAvailability(): Boolean {
-        // We wait at least 10s for getCurrentActivity to return a value,
-        // otherwise we give up
-        for (attempts in 0 until 100) {
-            if (currentActivity != null) {
-                return true
-            }
-            try {
-                Thread.sleep(100)
-            } catch (ex: InterruptedException) {
-                if (currentActivity != null) {
-                    return true
-                }
-                Log.d(TAG, "Activity doesn't exist")
-                return false
-            }
-        }
-
-        Log.d(TAG, "Activity doesn't exist")
-        return false
-    }
-
-    fun executeRunnableStatusGoMethod(method: Supplier<String>, callback: Callback) {
-        if (!checkAvailability()) {
-            callback.invoke(false)
-            return
-        }
-
-        val runnableTask = Runnable {
-            val res = method.get()
-            callback.invoke(res)
-        }
-
-        StatusThreadPoolExecutor.getInstance().execute(runnableTask)
-    }
-
-    @ReactMethod
-    fun validateMnemonic(seed: String, callback: Callback) {
-        executeRunnableStatusGoMethod({ Statusgo.validateMnemonic(seed) }, callback)
-    }
-
-    fun is24Hour(): Boolean {
-        return android.text.format.DateFormat.is24HourFormat(reactContext.applicationContext)
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun checkAddressChecksum(address: String): String {
-        return Statusgo.checkAddressChecksum(address)
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun isAddress(address: String): String {
-        return Statusgo.isAddress(address)
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun toChecksumAddress(address: String): String {
-        return Statusgo.toChecksumAddress(address)
-    }
-}
@@ -0,0 +1,17 @@
+#include "HelloWorldJSI.h"
+#include <jsi/jsi.h>
+#include <iostream>
+
+using namespace facebook::jsi;
+
+void HelloWorldJSI::install(Runtime& runtime) {
+    auto helloWorldFunction = Function::createFromHostFunction(runtime,
+        PropNameID::forAscii(runtime, "helloWorld"),
+        0,
+        [](Runtime& runtime, Value thisValue, Value* arguments, size_t count) -> Value {
+            std::cout << "Hello, World! from C++" << std::endl;
+            return Value::undefined();
+        });
+
+    runtime.global().setProperty(runtime, "helloWorld", std::move(helloWorldFunction));
+}
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+using namespace facebook::jsi;
+
+class HelloWorldJSI {
+public:
+    static void install(Runtime& runtime);
+
+private:
+    static void helloWorld(Runtime& runtime, Value thisValue, Value* arguments, size_t count);
+};
@@ -162,6 +162,7 @@ com.afollestad.material-dialogs:core:0.9.6.0
 com.airbnb.android:lottie:3.4.4
 com.almworks.sqlite4java:sqlite4java:1.0.392
 com.android.databinding:baseLibrary:1.0-rc5
+com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
 com.android.databinding:baseLibrary:3.2.1
 com.android.databinding:baseLibrary:3.5.4
@@ -171,6 +172,7 @@ com.android.databinding:baseLibrary:7.2.1
 com.android.databinding:baseLibrary:7.3.1
 com.android.databinding:baseLibrary:8.1.1
 com.android.databinding:compilerCommon:1.0-rc5
+com.android.databinding:compilerCommon:3.0.0
 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
@@ -179,6 +181,7 @@ com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
 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.0
 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
@@ -187,6 +190,7 @@ com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
 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.0
 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
@@ -195,6 +199,7 @@ com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
 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.0
 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
@@ -224,6 +229,7 @@ com.android.tools.build:aaptcompiler:7.0.4
 com.android.tools.build:aaptcompiler:7.2.1
 com.android.tools.build:aaptcompiler:7.3.1
 com.android.tools.build:aaptcompiler:8.1.1
+com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
 com.android.tools.build:apksig:3.5.4
@@ -241,6 +247,7 @@ com.android.tools.build:apkzlib:7.3.1
 com.android.tools.build:apkzlib:8.1.1
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
+com.android.tools.build:builder-model:3.0.0
 com.android.tools.build:builder-model:3.0.1
 com.android.tools.build:builder-model:3.2.1
 com.android.tools.build:builder-model:3.5.4
@@ -251,6 +258,7 @@ com.android.tools.build:builder-model:7.3.1
 com.android.tools.build:builder-model:8.1.1
 com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
+com.android.tools.build:builder-test-api:3.0.0
 com.android.tools.build:builder-test-api:3.0.1
 com.android.tools.build:builder-test-api:3.2.1
 com.android.tools.build:builder-test-api:3.5.4
@@ -261,6 +269,7 @@ com.android.tools.build:builder-test-api:7.3.1
 com.android.tools.build:builder-test-api:8.1.1
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
+com.android.tools.build:builder:3.0.0
 com.android.tools.build:builder:3.0.1
 com.android.tools.build:builder:3.2.1
 com.android.tools.build:builder:3.5.4
@@ -276,6 +285,7 @@ com.android.tools.build:bundletool:1.6.0
 com.android.tools.build:bundletool:1.8.2
 com.android.tools.build:bundletool:1.9.0
 com.android.tools.build:bundletool:1.14.0
+com.android.tools.build:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
 com.android.tools.build:gradle-api:3.5.4
@@ -286,10 +296,12 @@ com.android.tools.build:gradle-api:7.3.1
 com.android.tools.build:gradle-api:8.1.1
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
+com.android.tools.build:gradle-core:3.0.0
 com.android.tools.build:gradle-core:3.0.1
 com.android.tools.build:gradle-settings-api:8.1.1
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
+com.android.tools.build:gradle:3.0.0
 com.android.tools.build:gradle:3.0.1
 com.android.tools.build:gradle:3.2.1
 com.android.tools.build:gradle:3.5.4
@@ -299,6 +311,7 @@ com.android.tools.build:gradle:7.2.1
 com.android.tools.build:gradle:7.3.1
 com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
+com.android.tools.build:manifest-merger:26.0.0
 com.android.tools.build:manifest-merger:26.0.1
 com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:manifest-merger:26.5.4
@@ -311,6 +324,7 @@ com.android.tools.build:transform-api:1.5.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
 com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
+com.android.tools.ddms:ddmlib:26.0.0
 com.android.tools.ddms:ddmlib:26.0.1
 com.android.tools.ddms:ddmlib:26.2.1
 com.android.tools.ddms:ddmlib:26.5.4
@@ -319,13 +333,16 @@ com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
 com.android.tools.ddms:ddmlib:30.3.1
 com.android.tools.ddms:ddmlib:31.1.1
+com.android.tools.external.com-intellij:intellij-core:26.0.0
 com.android.tools.external.com-intellij:intellij-core:26.0.1
 com.android.tools.external.lombok:lombok-ast:0.2.3
+com.android.tools.external.org-jetbrains:uast:26.0.0
 com.android.tools.external.org-jetbrains:uast:26.0.1
 com.android.tools.jack:jack-api:0.9.0
 com.android.tools.jill:jill-api:0.9.0
 com.android.tools.layoutlib:layoutlib-api:24.3.1
 com.android.tools.layoutlib:layoutlib-api:24.5.0
+com.android.tools.layoutlib:layoutlib-api:26.0.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
 com.android.tools.layoutlib:layoutlib-api:26.2.1
 com.android.tools.layoutlib:layoutlib-api:26.5.4
@@ -336,9 +353,11 @@ com.android.tools.layoutlib:layoutlib-api:30.3.1
 com.android.tools.layoutlib:layoutlib-api:31.1.1
 com.android.tools.lint:lint-api:24.3.1
 com.android.tools.lint:lint-api:24.5.0
+com.android.tools.lint:lint-api:26.0.0
 com.android.tools.lint:lint-api:26.0.1
 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.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
@@ -353,6 +372,7 @@ com.android.tools.lint:lint-typedef-remover:30.3.1
 com.android.tools.lint:lint-typedef-remover:31.1.1
 com.android.tools.lint:lint:24.3.1
 com.android.tools.lint:lint:24.5.0
+com.android.tools.lint:lint:26.0.0
 com.android.tools.lint:lint:26.0.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.1
@@ -380,6 +400,7 @@ com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.1
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
+com.android.tools:annotations:26.0.0
 com.android.tools:annotations:26.0.1
 com.android.tools:annotations:26.2.1
 com.android.tools:annotations:26.5.4
@@ -390,6 +411,7 @@ com.android.tools:annotations:30.3.1
 com.android.tools:annotations:31.1.1
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
+com.android.tools:common:26.0.0
 com.android.tools:common:26.0.1
 com.android.tools:common:26.2.1
 com.android.tools:common:26.5.4
@@ -400,6 +422,7 @@ com.android.tools:common:30.3.1
 com.android.tools:common:31.1.1
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
+com.android.tools:dvlib:26.0.0
 com.android.tools:dvlib:26.0.1
 com.android.tools:dvlib:26.2.1
 com.android.tools:dvlib:26.5.4
@@ -408,6 +431,7 @@ com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
 com.android.tools:dvlib:30.3.1
 com.android.tools:dvlib:31.1.1
+com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
 com.android.tools:repository:26.5.4
@@ -418,6 +442,7 @@ com.android.tools:repository:30.3.1
 com.android.tools:repository:31.1.1
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
+com.android.tools:sdklib:26.0.0
 com.android.tools:sdklib:26.0.1
 com.android.tools:sdklib:26.2.1
 com.android.tools:sdklib:26.5.4
@@ -428,6 +453,7 @@ com.android.tools:sdklib:30.3.1
 com.android.tools:sdklib:31.1.1
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
+com.android.tools:sdk-common:26.0.0
 com.android.tools:sdk-common:26.0.1
 com.android.tools:sdk-common:26.2.1
 com.android.tools:sdk-common:26.5.4
@@ -179,6 +179,7 @@ https://dl.google.com/dl/android/maven2/androidx/webkit/webkit/1.4.0/webkit-1.4.
 https://dl.google.com/dl/android/maven2/android/arch/core/common/1.0.0/common-1.0.0.pom
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0/common-1.0.0.pom
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/runtime-1.0.0.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
@@ -187,6 +188,7 @@ https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.2.1/baseLibrary-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.3.1/baseLibrary-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/8.1.1/baseLibrary-8.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/4.1.0/signflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.0.4/signflinger-7.0.4.pom
@@ -220,6 +222,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/30.2.1/crash-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.3.1/crash-30.3.1.pom
 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.0/protos-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
@@ -228,6 +231,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/30.2.1/protos-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.3.1/protos-30.3.1.pom
 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.0/shared-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
@@ -236,6 +240,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/30.2.1/shared-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.3.1/shared-30.3.1.pom
 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.0/tracker-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
@@ -244,6 +249,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/30.2.1/tracker-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.3.1/tracker-30.3.1.pom
 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.0/annotations-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
@@ -268,6 +274,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.2.1/aaptcompiler-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3.1/aaptcompiler-7.3.1.pom
 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.0/apksig-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
@@ -283,6 +290,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/ap
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.2.1/apkzlib-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.1/apkzlib-7.3.1.pom
 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.0/builder-model-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
@@ -291,6 +299,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/7.2.1/builder-model-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.3.1/builder-model-7.3.1.pom
 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.0/builder-test-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.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.4/builder-test-api-3.5.4.pom
@@ -299,6 +308,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/7.2.1/builder-test-api-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.3.1/builder-test-api-7.3.1.pom
 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.0/builder-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
@@ -314,6 +324,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.6.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.8.2/bundletool-1.8.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.9.0/bundletool-1.9.0.pom
 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.0/gradle-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
@@ -322,8 +333,10 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.2.1/gradle-api-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.3.1/gradle-api-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/8.1.1/gradle-api-8.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-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.0/gradle-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
@@ -340,6 +353,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-beta04/jetifier-processor-1.0.0-beta04.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta09/jetifier-processor-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/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.0/manifest-merger-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
@@ -348,6 +362,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/30.2.1/manifest-merger-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.3.1/manifest-merger-30.3.1.pom
 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.0/common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
@@ -356,6 +371,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-3
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.2.1/common-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.1/common-30.3.1.pom
 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.0/ddmlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
@@ -364,6 +380,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.2.1/ddmlib-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.1/ddmlib-30.3.1.pom
 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.0/dvlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
@@ -372,11 +389,14 @@ https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.1/dvlib-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.3.1/dvlib-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/31.1.1/dvlib-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/31.1.1/intellij-core-31.1.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/31.1.1/kotlin-compiler-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1.pom
 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.0/layoutlib-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
@@ -385,8 +405,10 @@ https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-ap
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.2.1/layoutlib-api-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.3.1/layoutlib-api-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/31.1.1/layoutlib-api-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/31.1.1/lint-api-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/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
@@ -401,9 +423,11 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/31.1.1
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.2.1/lint-typedef-remover-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.3.1/lint-typedef-remover-30.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/31.1.1/lint-typedef-remover-31.1.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.0/lint-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/31.1.1/lint-31.1.1.pom
 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.0/repository-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
@@ -412,6 +436,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.2.1/repository-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.1/repository-30.3.1.pom
 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.0/sdklib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
@@ -420,6 +445,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-3
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.2.1/sdklib-30.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.1/sdklib-30.3.1.pom
 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.0/sdk-common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
@@ -501,10 +527,10 @@ 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.15.1/commons-io-2.15.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
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.0/commons-logging-1.3.0.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
@@ -604,22 +630,22 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloa
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.5/soloader-0.10.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.0/jackson-annotations-2.17.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.0-rc1/jackson-annotations-2.17.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.0/jackson-core-2.17.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.0-rc1/jackson-core-2.17.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0/jackson-databind-2.17.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0-rc1/jackson-databind-2.17.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.0/jackson-base-2.17.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.0-rc1/jackson-base-2.17.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.0/jackson-bom-2.17.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.0-rc1/jackson-bom-2.17.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.17/jackson-parent-2.17.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.17-rc1/jackson-parent-2.17-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.0/jackson-modules-base-2.17.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.0-rc1/jackson-modules-base-2.17.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.0/jackson-module-jaxb-annotations-2.17.0.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.0-rc1/jackson-module-jaxb-annotations-2.17.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/58/oss-parent-58.pom
@@ -687,7 +713,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.26.1/error_prone_annotations-2.26.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.25.0/error_prone_annotations-2.25.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -699,7 +725,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.26.1/error_prone_parent-2.26.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.25.0/error_prone_parent-2.25.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -716,8 +742,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.1.0-jre/guava-parent-33.1.0-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.1.0-jre/guava-testlib-33.1.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.0.0-jre/guava-parent-33.0.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.0.0-jre/guava-testlib-33.0.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -730,12 +756,12 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.1.0-jre/guava-33.1.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.0.0-jre/guava-33.0.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.pom
-https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.pom
+https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.pom
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-1.1.pom
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.7.1/protobuf-bom-3.7.1.pom
@@ -744,7 +770,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.26.0-RC3/protobuf-bom-4.26.0-RC3.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -761,7 +787,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.26.0-RC3/protobuf-java-4.26.0-RC3.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -772,7 +798,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.26.0-RC3/protobuf-parent-4.26.0-RC3.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.2/truth-parent-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
@@ -789,7 +815,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.9.2/okhttp-4.9.2.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.9.0/okio-jvm-3.9.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.8.0/okio-jvm-3.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-metadata/2.8.0/okio-metadata-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.13.0/okio-parent-1.13.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom
@@ -799,7 +825,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.p
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.9.0/okio-3.9.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.8.0/okio-3.8.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.1/all-1.2.1.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.2/all-1.2.2.pom
@@ -815,18 +841,18 @@ https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.2.0/istack-
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ext-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.3.2/jaxb-bom-ext-2.3.2.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.5/jaxb-bom-ext-4.0.5.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.4/jaxb-bom-ext-4.0.4.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-parent-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.3.2/jaxb-parent-2.3.2.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.5/jaxb-parent-4.0.5.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.4/jaxb-parent-4.0.4.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/jaxb-runtime-parent-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.1/jaxb-runtime-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.2/jaxb-runtime-parent-2.3.2.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/jaxb-txw-parent-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.3.1/jaxb-txw-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.3.2/jaxb-txw-parent-2.3.2.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.5/jaxb-txw-parent-4.0.5.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.4/jaxb-txw-parent-4.0.4.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.13/FastInfoset-1.2.13.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.pom
@@ -905,9 +931,9 @@ https://repo.maven.apache.org/maven2/io/netty/netty-resolver/4.1.52.Final/netty-
 https://repo.maven.apache.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-resolver/5.0.0.Alpha2/netty-resolver-5.0.0.Alpha2.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.pom
-https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.65.Final/netty-tcnative-classes-2.0.65.Final.pom
+https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-classes/2.0.63.Final/netty-tcnative-classes-2.0.63.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.46.Final/netty-tcnative-parent-2.0.46.Final.pom
-https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.65.Final/netty-tcnative-parent-2.0.65.Final.pom
+https://repo.maven.apache.org/maven2/io/netty/netty-tcnative-parent/2.0.63.Final/netty-tcnative-parent-2.0.63.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.34.Final/netty-transport-4.1.34.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.52.Final/netty-transport-4.1.52.Final.pom
 https://repo.maven.apache.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.pom
@@ -921,9 +947,9 @@ https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/1
 https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.pom
 https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.3/jakarta.activation-api-2.1.3.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/2.3.2/jakarta.xml.bind-api-parent-2.3.2.pom
-https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.2/jakarta.xml.bind-api-parent-4.0.2.pom
+https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.1/jakarta.xml.bind-api-parent-4.0.1.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.pom
-https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.2/jakarta.xml.bind-api-4.0.2.pom
+https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.1/jakarta.xml.bind-api-4.0.1.pom
 https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.pom
 https://repo.maven.apache.org/maven2/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.pom
 https://repo.maven.apache.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.pom
@@ -1010,8 +1036,8 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 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/65/commons-parent-65.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/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
@@ -1097,6 +1123,7 @@ https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.2/project-1.0.
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.5/project-1.0.5.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.6/project-1.0.6.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.7/project-1.0.7.pom
+https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.8/project-1.0.8.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.9/project-1.0.9.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.pom
@@ -1110,16 +1137,16 @@ https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18.
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb-bom-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.1/jaxb-bom-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.2/jaxb-bom-2.3.2.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.5/jaxb-bom-4.0.5.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.4/jaxb-bom-4.0.4.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/2.2.11/jaxb-core-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.5/jaxb-core-4.0.5.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.4/jaxb-core-4.0.4.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.2.11/jaxb-runtime-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runtime-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.2.11/txw2-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.5/txw2-4.0.5.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.4/txw2-4.0.4.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
@@ -1223,7 +1250,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-Beta4/kotlin-reflect-2.0.0-Beta4.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 +1352,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-Beta4/kotlin-stdlib-2.0.0-Beta4.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
@@ -1364,14 +1391,14 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.0/asm-analysis-7
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.7/asm-bom-9.7.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.6/asm-bom-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.7/asm-commons-9.7.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/6.0_BETA/asm-debug-all-6.0_BETA.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1.pom
@@ -1386,7 +1413,7 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.7/asm-tree-9.7.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0/asm-util-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/7.0/asm-util-7.0.pom
@@ -1400,7 +1427,7 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/8.0.1/asm-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.6/asm-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom
@@ -16,10 +16,12 @@ react-native-dialogs
 react-native-fast-image
 react-native-fs
 react-native-gesture-handler
+react-native-haptic-feedback
 react-native-hole-view
 react-native-image-crop-picker
 react-native-image-resizer
 react-native-keychain
+react-native-languages
 react-native-linear-gradient
 react-native-lottie-splash-screen
 react-native-mail
@@ -27,6 +29,7 @@ react-native-navigation
 react-native-nfc-manager
 react-native-orientation-locker
 react-native-permissions
+react-native-randombytes
 react-native-reanimated
 react-native-shake
 react-native-share
@@ -4,16 +4,16 @@

 { stdenv, deps, nodejs, patchMavenSources }:

-let
-  patchesDir = ./../../../patches;
-  patches = builtins.attrNames (builtins.readDir patchesDir);
-in
 stdenv.mkDerivation {
  name = "${deps.nodejs.name}-patched";
  phases = [
    "unpackPhase"
    "patchGradlePhase"
-    "patchNodeLibsPhase"
+    "patchBuildIdPhase"
+    "patchKeyChainPhase"
+    "patchGlogPhase"
+    "patchNativeNavigationPhase"
+    "patchRNScriptPhase"
    "installPhase"
  ];

@@ -50,15 +50,49 @@ stdenv.mkDerivation {
    done
  '';

+  # Do not add a BuildId to the generated libraries, for reproducibility
+  patchBuildIdPhase = ''
+    substituteInPlace ./node_modules/react-native/ReactAndroid/src/main/jni/CMakeLists.txt --replace \
+      '-Wl,--build-id' \
+      '-Wl,--build-id=none'
+  '';
+
  installPhase = ''
    mkdir -p $out
    cp -R node_modules $out/
  '';

-  patchNodeLibsPhase = ''
-    for patch in ${toString patches}; do
-      patch -p1 < ${patchesDir}/$patch
-    done
+  # Remove gradle-test-logger-plugin:
+  # https://github.com/oblador/react-native-keychain/issues/595
+  # TODO: remove this patch when we this library fixes above issue
+  patchKeyChainPhase = ''
+    sed -i -e '/classpath/d' \
+      -e '/apply plugin: "com\.adarshr\.test-logger"/d' \
+      ./node_modules/react-native-keychain/android/build.gradle
+  '';
+
+  # Fix pod issue after upgrading to MacOS Sonoma and Xcode 15
+  # https://github.com/status-im/status-mobile/issues/17682
+  patchGlogPhase = ''
+    substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh \
+    --replace 'export CC="' '#export CC="' \
+    --replace 'export CXX="' '#export CXX="'
+  '';
+
+  # https://github.com/wix/react-native-navigation/issues/7819
+  patchNativeNavigationPhase = ''
+    substituteInPlace ./node_modules/react-native-navigation/lib/android/app/build.gradle \
+      --replace 'JavaVersion.VERSION_1_8' 'JavaVersion.VERSION_17'
+
+    substituteInPlace ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt \
+      --replace 'host: View?,' 'host: View,' \
+      --replace 'info: AccessibilityNodeInfoCompat?' 'info: AccessibilityNodeInfoCompat'
+  '';
+  
+  # to fix https://github.com/status-im/status-mobile/issues/18548
+  patchRNScriptPhase = ''
+    substituteInPlace ./node_modules/react-native/scripts/react_native_pods_utils/script_phases.sh \
+      --replace 'cp -R -X' 'cp -R'
  '';

  # The ELF types are incompatible with the host platform, so let's not even try
@@ -27,6 +27,7 @@ deps  node_modules
 > ls node_modules | grep react-native-image
 react-native-image-crop-picker
 react-native-image-resizer
+react-native-image-viewing
 ```

 # Known Issues
@@ -51,7 +51,7 @@ in {
  };

  # Package version adjustments
-  gradle = super.gradle_8;
+  gradle = super.gradle_8_3;
  nodejs = super.nodejs-18_x;
  ruby = super.ruby_3_1;
  yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
@@ -65,16 +65,10 @@ in {
  buildGoPackage = super.buildGo119Package;
  buildGoModule = super.buildGo119Module;
  gomobile = (super.gomobile.overrideAttrs (old: {
-    patches = [
-      (self.fetchurl { # https://github.com/golang/mobile/pull/84
-        url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
-        sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
-      })
-      (self.fetchurl { # https://github.com/golang/go/issues/58426
-        url = "https://github.com/golang/mobile/commit/406ed3a7b8e44dc32844953647b49696d8847d51.patch";
-        sha256 = "sha256-dqbYukHkQEw8npOkKykOAzMC3ot/Y4DEuh7fE+ptlr8=";
-      })
-    ];
+    patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
+      url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
+      sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
+    };
  })).override {
    # FIXME: No Android SDK packages for aarch64-darwin.
    withAndroidPkgs = stdenv.system != "aarch64-darwin";
@@ -90,4 +84,6 @@ in {
  aapt2 = callPackage ./pkgs/aapt2 { };
  patchMavenSources = callPackage ./pkgs/patch-maven-srcs { };
  goMavenResolver = callPackage ./pkgs/go-maven-resolver { };
+  xcbeautify = callPackage ./pkgs/xcbeautify { };
+  idb-companion = callPackage ./pkgs/idb-companion { };
 }
@@ -6,11 +6,10 @@ let
  # For testing local version of nixpkgs
  #nixpkgsSrc = (import <nixpkgs> { }).lib.cleanSource "/home/jakubgs/work/nixpkgs";

-  # We follow release 23-11 of nixpkgs
-  # https://github.com/NixOS/nixpkgs/releases/tag/23.11
+  # We follow a fork of nixpkgs where we bump gradle to 8.3 and update build tools
  nixpkgsSrc = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/224fd9a362487ab2894dac0df161c84ab1d8880b.tar.gz";
-    sha256 = "sha256:1syvl39pi1h8lf5gkd9h7ksn5hp34cj7pa3abr59217kv0bdklhy";
+    url = "https://github.com/status-im/nixpkgs/archive/44d8b23ebbe40ed16ef1aecef6c5354657c48b19.tar.gz";
+    sha256 = "sha256:0s7kjnc8drchzp268yzbv5snc4702hswcns9hrncjq4im8cv6mf9";
  };

  # Status specific configuration defaults
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, lib }:
+
+stdenv.mkDerivation rec {
+  pname = "idb-companion";
+  version = "1.1.8";
+
+  src = fetchurl {
+    url = "https://github.com/facebook/idb/releases/download/v${version}/idb-companion.universal.tar.gz";
+    sha256 = "sha256-O3LMappbGiKhiCBahAkNOilDR6hGGA79dVzxo8hI4+c=";
+  };
+
+  buildInputs = [ ];
+
+  unpackPhase = ''
+    tar -xzf $src
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r ./* $out/bin/
+  '';
+
+  meta = with lib; {
+    description = "A powerful command line tool for automating iOS simulators and devices";
+    homepage = "https://github.com/facebook/idb";
+    license = licenses.mit;
+    platforms = platforms.darwin;
+  };
+}
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip, lib }:
+
+let
+  inherit (lib) getAttr;
+in
+stdenv.mkDerivation rec {
+  pname = "xcbeautify";
+  version = "1.4.0";
+  arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
+
+
+  src = fetchurl {
+    url = "https://github.com/cpisciotta/xcbeautify/releases/download/${version}/xcbeautify-${version}-${arch}-apple-macosx.zip";
+    sha256 = getAttr arch {
+            arm64 = "sha256-4b4mXT5IfNOS8iOrZASDhTrmOehG4mePcoiKxR+IdZk=";
+            x86_64 = "sha256-adEfAK7n3Q/Yd1deyJx7htX7hZaGDztEeBv4z2A0wzg=";
+        };
+    };
+
+  buildInputs = [ unzip ];
+
+  unpackPhase = ''
+    unzip $src
+  '';
+
+  installPhase = ''
+    install -D xcbeautify $out/bin/xcbeautify
+  '';
+
+  meta = with lib; {
+    description = "A little beautifier tool for xcodebuild";
+    homepage = "https://github.com/cpisciotta/xcbeautify";
+    license = licenses.mit;
+    platforms = platforms.darwin;
+  };
+}
@@ -8,6 +8,7 @@
    "preinstall": "scripts/check-nix-shell.sh && make status-go-library"
  },
  "dependencies": {
+    "@babel/preset-typescript": "^7.17.12",
    "@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-clipboard/clipboard": "1.13.2",
@@ -21,6 +22,7 @@
    "base-64": "^1.0.0",
    "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/v4.0.2-status",
    "chance": "^1.1.0",
+    "create-react-class": "^15.6.2",
    "emojilib": "^2.4.0",
    "eth-phishing-detect": "^1.2.0",
    "form-data": "^4.0.0",
@@ -42,19 +44,22 @@
    "react-native-fs": "^2.14.1",
    "react-native-gesture-handler": "2.14.1",
    "react-native-gifted-charts": "^1.3.2",
+    "react-native-haptic-feedback": "^1.9.0",
    "react-native-hole-view": "^3.0.0-alpha4",
    "react-native-image-crop-picker": "0.40.0",
    "react-native-image-resizer": "^1.2.3",
+    "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#refs/tags/v0.2.1.status",
    "react-native-keychain": "8.1.2",
+    "react-native-languages": "^3.0.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-randombytes": "^3.6.1",
    "react-native-reanimated": "3.6.1",
    "react-native-redash": "18.1.0",
-    "react-native-shadow-2": "^7.0.8",
    "react-native-shake": "^3.3.1",
    "react-native-share": "10.0.2",
    "react-native-static-safe-area-insets": "^2.2.0",
@@ -62,7 +67,9 @@
    "react-native-svg": "13.10.0",
    "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
    "react-native-webview": "13.6.3",
-    "react-syntax-highlighter": "^15.5.0"
+    "react-syntax-highlighter": "^15.5.0",
+    "rn-emoji-keyboard": "0.7.0",
+    "tdigest": "^0.1.1"
  },
  "devDependencies": {
    "@babel/core": "^7.20.0",
@@ -1,12 +0,0 @@
-# Do not add a BuildId to the generated libraries, for reproducibility
--- ./node_modules/react-native/ReactAndroid/src/main/jni/CMakeLists.txt
-+++ ./node_modules/react-native/ReactAndroid/src/main/jni/CMakeLists-patched.txt
-@@ -21,7 +21,7 @@
- endif(CCACHE_FOUND)
-
- # Make sure every shared lib includes a .note.gnu.build-id header
-add_link_options(-Wl,--build-id)
-+add_link_options(-Wl,--build-id=none)
- add_compile_options(-Wall -Werror -std=c++20)
-
- function(add_react_android_subdir relative_path)
@@ -1,20 +0,0 @@
-# Remove gradle-test-logger-plugin:
-# https://github.com/oblador/react-native-keychain/issues/595
-# TODO: remove this patch when we this library fixes above issue
-
--- ./node_modules/react-native-keychain/android/build.gradle
-+++ ./node_modules/react-native-keychain/android/build-patched.gradle
-@@ -4,13 +4,9 @@
-       url 'https://plugins.gradle.org/m2/'
-     }
-   }
-  dependencies {
-    classpath 'com.adarshr:gradle-test-logger-plugin:2.0.0'
-  }
- }
-
- apply plugin: 'com.android.library'
-apply plugin: "com.adarshr.test-logger"
-
- def safeExtGet(prop, fallback) {
-   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -1,22 +0,0 @@
-# https://github.com/wix/react-native-navigation/issues/7819
-
--- ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt
-+++ ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter-patched.kt
-@@ -194,8 +194,8 @@
-
-                 class WixAccessibilityDelegateCompat: AccessibilityDelegateCompat(){
-                     override fun onInitializeAccessibilityNodeInfo(
-                        host: View?,
-                        info: AccessibilityNodeInfoCompat?
-+                        host: View,
-+                        info: AccessibilityNodeInfoCompat
-                     ) {
-                         super.onInitializeAccessibilityNodeInfo(host, info)
-
-@@ -216,4 +216,4 @@
-     }
-
-
-}
-\ No newline at end of file
-+}
@@ -1,19 +0,0 @@
-# https://github.com/wix/react-native-navigation/issues/7819
-
--- ./node_modules/react-native-navigation/lib/android/app/build.gradle
-+++ ./node_modules/react-native-navigation/lib/android/app/build-patched.gradle
-@@ -62,11 +62,11 @@
-         }
-     }
-     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-+        sourceCompatibility JavaVersion.VERSION_17
-+        targetCompatibility JavaVersion.VERSION_17
-     }
-     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-+        jvmTarget = JavaVersion.VERSION_17
-     }
-
-     flavorDimensions "RNN.reactNativeVersion"
@@ -1,13 +0,0 @@
-# to fix https://github.com/status-im/status-mobile/issues/18548
-
--- ./node_modules/react-native/scripts/react_native_pods_utils/script_phases.sh
-+++ ./node_modules/react-native/scripts/react_native_pods_utils/script_phases-patched.sh
-@@ -104,7 +104,7 @@
-     mkdir -p "$RCT_SCRIPT_OUTPUT_DIR"
-
-     # Copy all output to output_dir
-    cp -R -X "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
-+    cp -R "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
-     echo "$LIBRARY_NAME output has been written to $RCT_SCRIPT_OUTPUT_DIR:" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
-     ls -1 "$RCT_SCRIPT_OUTPUT_DIR" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
- }
@@ -1,15 +0,0 @@
-# Fix pod issue after upgrading to MacOS Sonoma and Xcode 15
-# https://github.com/status-im/status-mobile/issues/17682
-
--- ./node_modules/react-native/scripts/ios-configure-glog.sh
-+++ ./node_modules/react-native/scripts/ios-configure-glog-patched.sh
-@@ -42,9 +42,6 @@
-     patch -p1 config.sub fix_glog_0.3.5_apple_silicon.patch
- fi
-
-export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
-export CXX="$CC"
-
- # Remove automake symlink if it exists
- if [ -h "test-driver" ]; then
-     rm test-driver
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-
-read -p "Enter the path of the file to patch: " FILE_PATH
-
-if [ ! -f "${FILE_PATH}" ]; then
-  echo "File not found: ${FILE_PATH}" >&2
-  exit 1
-fi
-
-if [[ "${FILE_PATH}" == *"node_modules"* ]]; then
-  if [[ "${FILE_PATH}" != *"./node_modules"* ]]; then
-    echo "Please prefix the file path like this './node_modules/'. The path you provided was: ${FILE_PATH}" >&2
-    exit 1
-  fi
-fi
-
-FILE_NAME=$(basename "${FILE_PATH}")
-echo "File to patch: ${FILE_PATH}"
-
-TEMP_DIR=$(mktemp -d)
-trap 'rm -rf "${TEMP_DIR}"' EXIT
-echo "Temporary directory created: ${TEMP_DIR}"
-
-cp "${FILE_PATH}" "${TEMP_DIR}"
-echo "Original file copied to temporary directory."
-
-echo "Please make the necessary changes to the file: ${FILE_PATH}"
-echo "Press any key when you are done with the changes..."
-
-ORIGINAL_MTIME=$(stat -c %Y "${FILE_PATH}")
-read -n 1 -s
-CURRENT_MTIME=$(stat -c %Y "${FILE_PATH}")
-
-if [[ "${ORIGINAL_MTIME}" -eq "${CURRENT_MTIME}" ]]; then
-  echo "Warning: No changes were made to the file. Patch file will not be generated."
-  exit 0
-fi
-
-echo "Generating patch file..."
-diff -Naur "${TEMP_DIR}/${FILE_NAME}" "${FILE_PATH}" > "${GIT_ROOT}/patches/${FILE_NAME}.patch"
-
-echo "Patch file created at ${GIT_ROOT}/patches/${FILE_NAME}.patch"
-echo "Info: Please execute 'make run-clojure' to test if the patch file works as expected."
@@ -6,7 +6,6 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 XCRUN_INSTALL_LOG_FILE="${GIT_ROOT}/logs/xcrun_install.log"
 XCRUN_LAUNCH_LOG_FILE="${GIT_ROOT}/logs/xcrun_launch.log"
 XCRUN_SIMULATOR_JSON_FILE="${GIT_ROOT}/logs/ios_simulators_list.log"
-XCODEBUILD_LOG_FILE="${GIT_ROOT}/logs/react-native-xcode.log"

 # Install on the simulator
 installAndLaunchApp() {
@@ -61,7 +60,7 @@ open -a Simulator --args -CurrentDeviceUDID "${UDID}"
 BUILD_DIR="${GIT_ROOT}/build"

 #iOS build of debug scheme
-xcodebuild -workspace "ios/StatusIm.xcworkspace" -configuration Debug -scheme StatusIm -destination id="${UDID}" -derivedDataPath "${BUILD_DIR}" -verbose | xcbeautify | tee -a "${XCODEBUILD_LOG_FILE}" 2>&1
+xcodebuild -workspace "ios/StatusIm.xcworkspace" -configuration Debug -scheme StatusIm -destination id="${UDID}" -derivedDataPath "${BUILD_DIR}" -verbose | xcbeautify

 APP_PATH="${BUILD_DIR}/Build/Products/Debug-iphonesimulator/StatusIm.app"

@@ -1,8 +1,5 @@
 #!/usr/bin/env bash

-if pgrep -f 'react-native start' > /dev/null; then
-    echo "Info: metro is already running in another terminal"
-else
-    echo "Info: starting a new metro terminal"
-    react-native start --reset-cache
-fi
+pkill -f 'react-native start'
+
+react-native start --reset-cache
@@ -1,4 +1,4 @@
-import { useDerivedValue, withTiming, withDelay } from 'react-native-reanimated';
+import { useDerivedValue, withTiming } from 'react-native-reanimated';

 export function scrollDownButtonOpacity(chatListScrollY, isComposerFocused, windowHeight) {
  return useDerivedValue(function () {
@@ -24,26 +24,3 @@ export function jumpToButtonPosition(scrollDownButtonOpacity, isComposerFocused)
    return withTiming(scrollDownButtonOpacity.value == 1 || isComposerFocused.value ? 35 : 0);
  });
 }
-
-export function composerContainerOpacity(isComposerFocused, isEmptyInput, emptyOpacity) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isEmptyInput.value && !isComposerFocused.value
-      ? withDelay(300, withTiming(emptyOpacity, { duration: 0 }))
-      : 1;
-  });
-}
-
-export function blurContainerElevation(isComposerFocused, isEmptyInput) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isEmptyInput.value && !isComposerFocused.value ? 10 : 0;
-  });
-}
-
-export function composerElevation(isComposerFocused, isEmptyInput) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isEmptyInput.value && !isComposerFocused.value ? 0 : 10;
-  });
-}
@@ -1,14 +0,0 @@
-import { useAnimatedStyle, withTiming } from 'react-native-reanimated';
-
-export function profileHeaderAnimation(scrollY, threshold, topBarHeight) {
-  return useAnimatedStyle(() => {
-    'worklet';
-    const opacity = scrollY.value < threshold ? withTiming(0) : withTiming(1);
-    const translateY = scrollY.value < threshold ? withTiming(topBarHeight) : withTiming(0);
-
-    return {
-      opacity: opacity,
-      transform: [{ translateY: translateY }],
-    };
-  });
-}
@@ -187,9 +187,9 @@
                                       (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
+                                      ;; 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
@@ -197,9 +197,9 @@
                                       (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
+                                      ;; 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)
@@ -120,13 +120,12 @@
                       {:keys [message-id from]
                        :as   message}]
                    (let [message
-                          ;; For example, when a user receives a list of 4 image messages while
-                          ;; inside the chat screen we shouldn't group the images into albums. When
-                          ;; the user exists the chat screen then enters the chat screen again, we
-                          ;; now need to group the images into albums (like WhatsApp). The albumize?
-                          ;; boolean is used to know whether we need to group these images into
-                          ;; albums now or not. The album-id can't be used for this because it will
-                          ;; always be there.
+                          ;; For example, when a user receives a list of 4 image messages while inside
+                          ;; the chat screen we shouldn't group the images into albums. When the user
+                          ;; exists the chat screen then enters the chat screen again, we now need to
+                          ;; group the images into albums (like WhatsApp). The albumize? boolean is used
+                          ;; to know whether we need to group these images into albums now or not. The
+                          ;; album-id can't be used for this because it will always be there.
                          (if (and (:album-id message) (nil? (get all-messages message-id)))
                            (assoc message :albumize? true)
                            message)]
@@ -22,7 +22,9 @@
                               :alias       "alias"
                               :name        "name"
                               :from        "from"}]
-      ;; <- cursor <- message <- top of the chat
+      ;; <- cursor
+      ;; <- message
+      ;; <- top of the chat
      (testing "there's no hidden item"
        (with-redefs [list.state/first-not-visible-item (atom nil)]
          (is
@@ -39,7 +41,10 @@
                     cofx
                     #js {:messages (to-array [message])})
             :utils/dispatch-later)))))
-      ;; <- cursor <- first-hidden-item <- message <- top of the chat
+      ;; <- cursor
+      ;; <- first-hidden-item
+      ;; <- message
+      ;; <- top of the chat
      (testing "the hidden item has a clock value less than the current"
        (with-redefs [list.state/first-not-visible-item (atom {:clock-value (dec clock-value)})]
          (is
@@ -56,7 +61,10 @@
                     cofx
                     #js {:messages (to-array [message])})
             :utils/dispatch-later)))))
-      ;; <- cursor <- message <- first-hidden-item <- top of the chat
+      ;; <- cursor
+      ;; <- message
+      ;; <- first-hidden-item
+      ;; <- top of the chat
      (testing "the message falls between the first-hidden-item and cursor"
        (with-redefs [list.state/first-not-visible-item (atom {:clock-value (inc clock-value)})]
          (let [result (dissoc (message/receive-many
@@ -69,7 +77,9 @@
              (is (= clock-value (get-in result [:db :pagination-info chat-id :cursor-clock-value])))
              (is (= (loading/clock-value->cursor clock-value)
                     (get-in result [:db :pagination-info chat-id :cursor])))))))
-      ;; <- message <- first-hidden-item <- top of the chat
+      ;; <- message
+      ;; <- first-hidden-item
+      ;; <- top of the chat
      (testing "the message falls between the first-hidden-item and cursor is nil"
        (with-redefs [list.state/first-not-visible-item (atom {:clock-value (inc clock-value)})]
          (let [result (dissoc (message/receive-many
@@ -86,7 +96,10 @@
              (is (= clock-value (get-in result [:db :pagination-info chat-id :cursor-clock-value])))
              (is (= (loading/clock-value->cursor clock-value)
                     (get-in result [:db :pagination-info chat-id :cursor])))))))
-      ;; <- message <- cursor <- first-hidden-item <- top of the chat
+      ;; <- message
+      ;; <- cursor
+      ;; <- first-hidden-item
+      ;; <- top of the chat
      (testing "the message falls before both the first-hidden-item and cursor"
        (with-redefs [list.state/first-not-visible-item (atom {:clock-value (inc clock-value)})]
          (let [message #js
@@ -53,22 +53,21 @@
                      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]}]]]}
+           [:dispatch [:shell/close-switcher-card public-key]]]}
     fxs)))

 (rf/defn block-contact
  {:events [:contact.ui/block-contact-confirmed]}
-  [{:keys [db] :as cofx} public-key]
+  [{:keys [db] :as cofx} public-key
+   {:keys [handle-navigation?]
+    :or   {handle-navigation? true}}]
  (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]))]
+        from-one-to-one-chat? (not (get-in db [:chats (:current-chat-id db) :group-chat]))]
    (rf/merge cofx
              {:db (assoc-in db [:contacts/contacts public-key] contact)}
              (contacts-store/block
@@ -78,7 +77,7 @@
                 (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
+              (when handle-navigation?
                (if from-one-to-one-chat?
                  (navigation/pop-to-root :shell-stack)
                  (navigation/navigate-back))))))
@@ -56,7 +56,8 @@
 (rf/defn redirect-to-ens-summary
  {:events [::redirect-to-ens-summary]}
  [cofx]
-  ;; we reset navigation so that navigate back doesn't return into the registration flow
+  ;; we reset navigation so that navigate back doesn't return
+  ;; into the registration flow
  (rf/merge cofx
            (navigation/navigate-back-to :my-profile)
            (navigation/navigate-to :ens-confirmation {})))
@@ -160,8 +161,8 @@
      (and (= response utils.ens/default-address) (not custom-domain?))
      (re-frame/dispatch [::name-resolved username :available])

-      ;; if we get an address back, we try to get the public key associated with the username as
-      ;; well
+      ;; if we get an address back, we try to get the public key associated
+      ;; with the username as well
      (get addresses (eip55/address->checksum response))
      (ens/pubkey
       chain-id
@@ -270,7 +271,8 @@
  (rf/merge cofx
            ;; clear registration data
            {:db (dissoc db :ens/registration)}
-            ;; we reset navigation so that navigate back doesn't return into the registration flow
+            ;; we reset navigation so that navigate back doesn't return
+            ;; into the registration flow
            (navigation/navigate-back-to :my-profile)
            (navigation/navigate-to :ens-main {})))

@@ -184,8 +184,8 @@
 ;; TODO: Should act differently on different views
 (re-frame/reg-fx
 :keycard/listen-to-hardware-back-button
- ;;NOTE: not done in view because effect should happen under different conditions and is not
- ;;dependent on particular screen to be loaded. An fx is easier to re-use and test.
+ ;;NOTE: not done in view because effect should happen under different conditions and is not dependent on
+ ;;particular screen to be loaded. An fx is easier to re-use and test.
 (fn []
   (re-frame/dispatch [:keycard/add-listener-to-hardware-back-button
                       (.addEventListener BackHandler
@@ -10,7 +10,7 @@
  [{:keys [db]}]
  (let [{:keys [name preferred-name display-name address]} (:profile/profile db)]
    {:json-rpc/call [{:method     "wakuext_sendContactUpdates"
-                      :params     [(or preferred-name display-name name) "" ""]
+                      :params     [(or preferred-name display-name name) ""]
                      :on-success #(log/debug "sent contact update")}]}))

 (rf/defn update-multiaccount-account-name
@@ -8,8 +8,8 @@
  (let [delay-ms (or (:delay-ms value) 250)
        value    (dissoc value :delay-ms)]
    {:show-popover     nil
-     ;; We should probably refactor to start the animation on mount, so that the delay can be
-     ;; removed. See comment for more details:
+     ;; We should probably refactor to start the animation on mount, so that the
+     ;; delay can be removed. See comment for more details:
     ;; https://github.com/status-im/status-mobile/pull/15222#issuecomment-1450162137
     :dispatch-later   [{:ms delay-ms :dispatch [:show-popover-db value]}]
     :dismiss-keyboard nil}))
@@ -15,8 +15,8 @@

 (defn- prepare-options
  [title message options]
-  (let [destructive-opt-index (utils/first-index :destructive? options)] ;; TODO Can only be a
-                                                                         ;; single destructive?
+  (let [destructive-opt-index (utils/first-index :destructive? options)] ;; TODO Can only be a single
+                                                                         ;; destructive?
    (clj->js (merge {:options           (conj (mapv :label options) (i18n/label :t/cancel))
                     :cancelButtonIndex (count options)}
                    (when destructive-opt-index
@@ -22,15 +22,13 @@
  {:positive-01    "rgba(68,208,88,1)"     ; Primary Positive, text, icons color
   :positive-02    "rgba(78,188,96,0.1)"   ; Secondary Positive, Supporting color for success
   ; illustrations
-   :positive-03    "rgba(78,188,96,1)"     ; Lighter Positive, Supporting color for success
-                                           ; illustrations
+   :positive-03    "rgba(78,188,96,1)"     ; Lighter Positive, Supporting color for success illustrations
   :negative-01    "rgba(255,45,85,1)"     ; Primary Negative, text, icons color
   :negative-02    "rgba(255,45,85,0.1))"  ; Secondary Negative, Supporting color for errors
   ; illustrations
   :warning-01     "rgba(255, 202, 15, 1)"
   :warning-02     "rgba(255, 202, 15, 0.1)"
-   :interactive-01 "rgba(67,96,223,1)"     ; Accent color, buttons, own message, actions,active
-                                           ; state
+   :interactive-01 "rgba(67,96,223,1)"     ; Accent color, buttons, own message, actions,active state
   :interactive-02 "rgba(236,239,252,1)"   ; Light Accent, buttons background, actions background,
   ; messages
   :interactive-03 "rgba(255,255,255,0.1)" ; Background for interactive above accent
@@ -132,14 +130,12 @@
 (def mentioned-background (:mentioned-background old-colors-mapping-light))
 (def mentioned-border (:mentioned-border old-colors-mapping-light))

-(def red-light "#ffe5ea")                                   ;; error tooltip TODO (andrey) should be white, but shadow
-                                   ;; needed
+(def red-light "#ffe5ea")                                   ;; error tooltip TODO (andrey) should be white, but shadow needed

 ;; BLACK
 (def black (:text-01 light-theme))                                  ;; Used as the default text color
 (def black-persist (:ui-background dark-theme))                           ;; this doesn't with theme
-(def black-transparent (:ui-02 light-theme))                   ;; Used as background color for rounded button on dark background and as
-                   ;; background
+(def black-transparent (:ui-02 light-theme))                   ;; Used as background color for rounded button on dark background and as background
 ;; color for containers like "Backup recovery phrase"
 (def black-transparent-20 (:backdrop light-theme))                ; accounts divider
 (def black-transparent-40 (:backdrop light-theme))
@@ -149,8 +145,7 @@
 (def black-transparent-86 (:ui-03 light-theme))

 ;; DARK GREY
-(def gray (:text-02 light-theme))                                    ;; Dark grey, used as a background for a light foreground and
-                                    ;; as
+(def gray (:text-02 light-theme))                                    ;; Dark grey, used as a background for a light foreground and as
 ;; section header and secondary text color
 (def gray-transparent-10 (alpha gray 0.1))
 (def gray-transparent-40 (alpha gray 0.4))
@@ -158,8 +153,7 @@
 (def gray-lighter (:ui-01 light-theme))                    ;; Light Grey, used as a background or shadow

 ;; ACCENT BLUE
-(def blue (:interactive-01 light-theme))                                    ;; Accent blue, used as main wallet color, and ios home add
-                                    ;; button
+(def blue (:interactive-01 light-theme))                                    ;; Accent blue, used as main wallet color, and ios home add button
 (def blue-persist (:interactive-01 light-theme))
 ;; LIGHT BLUE
 (def blue-light (:interactive-02 light-theme))                        ;; Light Blue
@@ -100,8 +100,8 @@

     (and title subtitle)
     [:<>
-      ;; FIXME(Ferossgp): ReactNative 63 will support view inside text on andrid, remove thess if
-      ;; when migrating
+      ;; FIXME(Ferossgp): ReactNative 63 will support view inside text on andrid, remove thess if when
+      ;; migrating
      (if (string? title)
        [text/text
         {:weight              (or title-text-weight :medium)
@@ -179,13 +179,13 @@
     {:style (merge {:align-items     :center
                     :justify-content :flex-end
                     :flex-direction  :row
-                     ;; Grow to occupy full space, shrink when need be, but always maitaining 16px
-                     ;; left gutter
+                     ;; Grow to occupy full space, shrink when need be, but always maitaining 16px left
+                     ;; gutter
                     :flex-grow       1
                     :flex-shrink     0
                     :margin-left     16
-                     ;; When the left-side leaves no room for right-side, the rendered element is
-                     ;; pushed out. A flex-basis ensures that there is some room reserved.
+                     ;; When the left-side leaves no room for right-side, the rendered element is pushed
+                     ;; out. A flex-basis ensures that there is some room reserved.
                     ;; The number 80px was determined by trial and error.
                     :flex-basis      80}
                    accessory-style)}
@@ -188,8 +188,8 @@
                             :on-press #(reset! visible true)}

                            :else after)
-            secure        (boolean (and secure-text-entry (not @visible))) ; must be a boolean to
-                                                                           ; work on iOS
+            secure        (boolean (and secure-text-entry (not @visible))) ; must be a boolean to work on
+                                                                           ; iOS
            auto-complete (cond
                            (= keyboard-type :visible-password)
                            :off
@@ -211,7 +211,8 @@
                            :default

                            ; the correct approach on Android would be keep secure-text-entry on set
-                            ; keyboard type to visible-password. But until
+                            ; keyboard type
+                            ; to visible-password. But until
                            ; https://github.com/facebook/react-native/issues/27946
                            ; is solved that's the second best way.
                            (and platform/android? secure-text-entry)
@@ -26,9 +26,8 @@

 (defn topbar
  [{:keys [navigation use-insets right-accessories modal? content border-bottom? new-ui?] ;; remove
-                                                                                          ;; new-ui?
-                                                                                          ;; key, temp
-                                                                                          ;; fix
+                                                                                          ;; new-ui? key,
+                                                                                          ;; temp fix
    :or   {border-bottom? true
           new-ui?        false}
    :as   props}]
@@ -50,17 +50,18 @@
    {:UNSAFE_componentWillUpdate (fn [_ [_ _ {:keys [requested-permission]}]]
                                   (cond
                                     @update?
-                                     ;; the component has been updated with a new permission, we
-                                     ;; show the panel
+                                     ;; the component has been updated with a new permission, we show the
+                                     ;; panel
                                     (do (reset! update? false)
                                         (show-panel-anim bottom-anim-value alpha-value))

                                     (and @current-permission requested-permission)
-                                     ;; a permission has been accepted/denied by the user, and there
-                                     ;; is another permission that needs to be processed by the user
-                                     ;; we hide the processed permission with an animation and
-                                     ;; update `current-permission` with a delay so that the
-                                     ;; information is still available during the animation
+                                     ;; a permission has been accepted/denied by the user, and there is
+                                     ;; another permission that needs to be processed by the user
+                                     ;; we hide the processed permission with an animation and update
+                                     ;; `current-permission` with a delay so that the information is
+                                     ;; still
+                                     ;; available during the animation
                                     (do (reset! update? true)
                                         (js/setTimeout #(reset! current-permission
                                                           (permission-details requested-permission))
@@ -69,18 +70,20 @@

                                     requested-permission
                                     ;; the dapp is asking for a permission, we put it in
-                                     ;; current-permission and start the show-animation
+                                     ;; current-permission
+                                     ;; and start the show-animation
                                     (do (reset! current-permission
                                           (get browser.permissions/supported-permissions
                                                requested-permission))
                                         (show-panel-anim bottom-anim-value alpha-value))

                                     :else
-                                     ;; a permission has been accepted/denied by the user, and there
-                                     ;; is no other permission that needs to be processed by the
-                                     ;; user we hide the processed permission with an animation and
-                                     ;; update `current-permission` with a delay so that the
-                                     ;; information is still available during the animation
+                                     ;; a permission has been accepted/denied by the user, and there is
+                                     ;; no other permission that needs to be processed by the user
+                                     ;; we hide the processed permission with an animation and update
+                                     ;; `current-permission` with a delay so that the information is
+                                     ;; still
+                                     ;; available during the animation
                                     (do (js/setTimeout #(reset! current-permission nil) 500)
                                         (hide-panel-anim bottom-anim-value alpha-value))))}
    (when @current-permission
@@ -78,8 +78,8 @@
           {:on-press            on-submit
            :accessibility-label :next-button
            :disabled            (or (not next-enabled?)
-                                     ;; disable on resetting? so the user cannot press the next
-                                     ;; button recklessly
+                                     ;; disable on resetting? so the user cannot press the next button
+                                     ;; recklessly
                                     ;; https://github.com/status-im/status-mobile/pull/12245#issuecomment-874827573
                                     resetting?)
            :type                :secondary
@@ -49,8 +49,9 @@
    (is (empty? (filter #(< % 0) sample)))
    ;no result should be larger than n
    (is (empty? (filter #(>= % n) sample)))
-    ;and while there is a very small probability it is very unlikely and probably wrong if all 1000
-    ;calls got us the same number.
+    ;and while there is a very small probability
+    ;it is very unlikely and probably wrong if all 1000 calls
+    ;got us the same number.
    (is (> (count sample) 1))))

 (deftest test-seeded-rand-nth
@@ -170,6 +170,7 @@

 (def net-info #js {})
 (def react-native-biometrics #js {:default {}})
+(def react-native-image-viewing #js {:default {}})
 (def react-native-static-safe-area-insets #js {:default {}})

 (def back-handler
@@ -222,6 +223,8 @@
    :TransitionPresets    #js {:ModalPresentationIOS #js {}}})
 (def react-navigation-bottom-tabs #js {:createBottomTabNavigator identity})

+(def react-native-haptic-feedback #js {:default #js {:trigger nil}})
+
 (def react-native-reanimated
  #js
   {:default                #js
@@ -310,6 +313,10 @@
   {:clamp     nil
    :withPause (fn [])})

+(def react-native-languages
+  (clj->js {:default {:language            "en"
+                      :addEventListener    (fn [])
+                      :removeEventListener (fn [])}}))

 (def react-native-device-info
  #js {:getInstallReferrer identity})
@@ -336,6 +343,9 @@
              {:abandonPermissions              identity
               :removeAllDeliveredNotifications identity}})

+(def rn-emoji-keyboard
+  #js {:EmojiKeyboard #js {}})
+
 (def react-native-hole-view
  #js {:RNHoleView #js {}})

@@ -348,9 +358,6 @@
 (def react-native-blur
  (clj->js {:BlurView {}}))

-(def react-native-shadow-2
-  (clj->js {:Shadow {}}))
-
 (def react-native-camera-roll
  (clj->js {:default    #js {}
            :CameraRoll #js {}}))
@@ -375,6 +382,7 @@
 (defn mock
  [module]
  (case module
+    "react-native-languages"                           react-native-languages
    "react-native-background-timer"                    background-timer
    "react-native-image-crop-picker"                   image-crop-picker
    "react-native-gesture-handler"                     react-native-gesture-handler
@@ -395,6 +403,7 @@
    "react-native-fs"                                  fs
    "react-native-mail"                                react-native-mail
    "react-native-image-resizer"                       image-resizer
+    "react-native-haptic-feedback"                     react-native-haptic-feedback
    "react-native-device-info"                         react-native-device-info
    "react-native-push-notification"                   react-native-push-notification
    "react-native-linear-gradient"                     react-native-gradien
@@ -406,13 +415,14 @@
    "@react-native-camera-roll/camera-roll"            react-native-camera-roll
    "react-native-camera-kit"                          react-native-camera-kit
    "react-native-permissions"                         react-native-permissions
+    "rn-emoji-keyboard"                                rn-emoji-keyboard
    "react-native-hole-view"                           react-native-hole-view
    "react-native-draggable-flatlist"                  react-native-draggable-flatlist
    "react-native-webview"                             react-native-webview
    "@react-native-community/audio-toolkit"            react-native-audio-toolkit
    "@react-native-clipboard/clipboard"                react-native-clipboard
+    "react-native-image-viewing"                       react-native-image-viewing
    "react-native-share"                               react-native-share
-    "react-native-shadow-2"                            react-native-shadow-2
    "@react-native-async-storage/async-storage"        async-storage
    "react-native-svg"                                 react-native-svg
    "react-native-transparent-video"                   react-native-transparent-video
@@ -435,7 +445,6 @@
    "../src/js/worklets/chat/messenger/composer.js"    #js {}
    "../src/js/worklets/chat/messenger/placeholder.js" #js {}
    "../src/js/worklets/parallax.js"                   #js {}
-    "../src/js/worklets/profile_header.js"             #js {}
    "../src/js/worklets/identifiers_highlighting.js"   #js {}
    "./fleets.js"                                      default-fleets
    "../translations/ar.json"                          (js/JSON.parse (slurp "./translations/ar.json"))
@@ -57,8 +57,7 @@
  (let [theme                   (quo.theme/use-theme-value)
        window-height           (:height (rn/get-window))
        {:keys [top bottom]}    (safe-area/get-insets)
-        ;; view height calculation is different because window height is different on iOS and
-        ;; Android:
+        ;; view height calculation is different because window height is different on iOS and Android:
        view-height             (if platform/ios?
                                  (- window-height bottom)
                                  (+ window-height top))
@@ -19,11 +19,10 @@

 (defn emoji-size
  [size]
-  {:text-align :center
-   :font-size  (case size
-                 :size-64 24
-                 :size-32 15
-                 11)})
+  {:font-size (case size
+                :size-64 24
+                :size-32 15
+                11)})

 (defn lock-container
  [size theme]
@@ -65,9 +65,8 @@
     :align-items      :center
     :background-color (colors/resolve-color customization-color theme)}))

-(defn indicator-color
-  []
-  {:online  (colors/theme-colors colors/success-50 colors/success-60)
+(def indicator-color
+  {:online  colors/success-50
   :offline colors/neutral-40})

 (defn outer
@@ -11,8 +11,7 @@
    utils.string))

 (defn initials-avatar
-  [{:keys [full-name size customization-color theme]
-    :or   {customization-color :blue}}]
+  [{:keys [full-name size customization-color theme]}]
  (let [font-size       (get-in style/sizes [size :font-size])
        amount-initials (if (#{:xs :xxs :xxxs} size) 1 2)]
    [rn/view
@@ -31,12 +30,13 @@
   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?
+  [{:keys [full-name size profile-picture customization-color static?
           status-indicator? online? ring? theme]
-    :or   {size              :big
-           status-indicator? true
-           online?           true
-           ring?             true}
+    :or   {size                :big
+           status-indicator?   true
+           online?             true
+           ring?               true
+           customization-color :blue}
    :as   props}]
  (let [full-name          (or full-name "Your Name")
        ;; image generated with `profile-picture-fn` is round cropped
@@ -49,13 +49,14 @@
        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 (if online? :online :offline))
        profile-picture-fn (:fn profile-picture)]

    [rn/view {:style outer-styles :accessibility-label :user-avatar}
     (if (and full-name (not (or profile-picture-fn profile-picture)))
-       ;; this is for things that's not user-avatar but are currently using user-avatar to render
-       ;; the initials e.g. community avatar
+       ;; this is for things that's not user-avatar
+       ;; but are currently using user-avatar to render the initials
+       ;; e.g. community avatar
       [initials-avatar props]
       [image-view
        {:accessibility-label :profile-picture
@@ -75,6 +76,7 @@
                                                   (:status-indicator-center-to-edge sizes))
                       :indicator-color          indicator-color
                       :override-theme           theme
+                       :background-color         (style/customization-color customization-color theme)
                       :color                    (:color style/initials-avatar-text)
                       :size                     (:width outer-styles)
                       :ring?                    ring?
@@ -1,5 +1,4 @@
-(ns quo.components.buttons.button.style
-  (:require [quo.foundations.colors :as colors]))
+(ns quo.components.buttons.button.style)

 (def blur-view
  {:position :absolute
@@ -10,12 +9,11 @@

 (defn icon-style
  [{:keys [icon-container-size icon-container-rounded?
-           icon-size margin-left margin-right disabled?]}]
+           icon-size margin-left margin-right]}]
  (cond-> (merge {:margin-left     margin-left
                  :margin-right    margin-right
                  :align-items     :center
-                  :justify-content :center
-                  :opacity         (when disabled? 0.3)})
+                  :justify-content :center})
    icon-container-size
    (assoc :width icon-container-size :height icon-container-size)
    icon-container-rounded?
@@ -23,26 +21,24 @@

 (defn icon-left-icon-style
  [{:keys [override-margins size icon-container-size icon-container-rounded?
-           icon-size disabled?]}]
+           icon-size]}]
  (icon-style
   {:margin-left             (or (get override-margins :left)
                                 (if (= size 40) 12 8))
    :margin-right            (or (get override-margins :right) 4)
    :icon-container-size     icon-container-size
    :icon-container-rounded? icon-container-rounded?
-    :icon-size               icon-size
-    :disabled?               disabled?}))
+    :icon-size               icon-size}))

 (defn icon-right-icon-style
  [{:keys [override-margins size icon-container-size icon-container-rounded?
-           icon-size disabled?]}]
+           icon-size]}]
  (icon-style {:margin-left             (or (get override-margins :left) 4)
               :margin-right            (or (get override-margins :right)
                                            (if (= size 40) 12 8))
               :icon-container-size     icon-container-size
               :icon-container-rounded? icon-container-rounded?
-               :icon-size               icon-size
-               :disabled?               disabled?}))
+               :icon-size               icon-size}))

 (defn shape-style-container
  [size border-radius]
@@ -99,7 +95,7 @@
                                  24 0
                                  9))
          :overflow           :hidden
-          :background-color   (if disabled? (colors/alpha background-color 0.3) background-color)
+          :background-color   background-color
          :border-radius      (if border-radius
                                border-radius
                                (case size
@@ -114,4 +110,6 @@
           {:width size})
         (when border-color
           {:border-color border-color
-            :border-width 1})))
+            :border-width 1})
+         (when disabled?
+           {:opacity 0.3})))
@@ -92,16 +92,14 @@
       (when icon-top
         [rn/view
          [quo.icons/icon icon-top
-           {:container-style {:margin-bottom 2
-                              :opacity       (when disabled? 0.3)}
+           {:container-style {:margin-bottom 2}
            :color           icon-color
            :size            icon-size}]])
       (when icon-left
         [rn/view
          {:style (style/icon-left-icon-style
                   {:size      size
-                    :icon-size icon-size
-                    :disabled? disabled?})}
+                    :icon-size icon-size})}
          [quo.icons/icon icon-left
           {:color icon-color
            :size  icon-size}]])
@@ -117,8 +115,7 @@
           {:size            (when (#{56 24} size) :paragraph-2)
            :weight          :medium
            :number-of-lines 1
-            :style           {:color   label-color
-                              :opacity (when disabled? 0.3)}}
+            :style           {:color label-color}}
           children]

          (vector? children)
@@ -127,8 +124,7 @@
         [rn/view
          {:style (style/icon-right-icon-style
                   {:size      size
-                    :icon-size icon-size
-                    :disabled? disabled?})}
+                    :icon-size icon-size})}
          [quo.icons/icon icon-right
           {:color icon-color
            :size  icon-size}]])]]]))
@@ -6,7 +6,7 @@
  [{:keys [big? disabled?]}]
  (cond-> {}
    disabled?  (assoc :opacity 0.3)
-    big?       (assoc :flex 1)
+    big?       (assoc :flex-grow 1)
    (not big?) (assoc :width 104)))

 (defn channel-action
@@ -14,10 +14,9 @@
        on-press-in            (rn/use-callback #(set-pressed true))
        on-press-out           (rn/use-callback #(set-pressed false))]
    [rn/view
-     {:accessibility-label :channel-action
-      :style               (style/channel-action-container
-                            {:big?      big?
-                             :disabled? disabled?})}
+     {:style (style/channel-action-container
+              {:big?      big?
+               :disabled? disabled?})}
     [rn/pressable
      (cond-> {:style               (style/channel-action
                                     {:big?      big?
@@ -12,9 +12,8 @@
   :padding-horizontal 20})

 (def content
-  {:align-items   :flex-start
-   :margin-top    8
-   :margin-bottom (+ (safe-area/get-bottom) 12)})
+  {:margin-top    8
+   :margin-bottom (+ (safe-area/get-bottom) 8)})

 (defn title
  [theme]
@@ -30,16 +30,15 @@
      :weight              :semi-bold}
     title]
    [rn/view {:style style/content :accessibility-label :documentation-drawer-content}
-     content
-     (when show-button?
-       [button/button
-        {:size                24
-         :type                :outline
-         :container-style     {:margin-top 16}
-         :background          (when shell? :blur)
-         :on-press            on-press-button
-         :accessibility-label :documentation-drawer-button
-         :icon-right          button-icon}
-        button-label])]]])
+     content]
+    (when show-button?
+      [button/button
+       {:size                24
+        :type                :outline
+        :background          (when shell? :blur)
+        :on-press            on-press-button
+        :accessibility-label :documentation-drawer-button
+        :icon-right          button-icon}
+       button-label])]])

 (def view (quo.theme/with-theme view-internal))
@@ -22,13 +22,6 @@
    (h/is-truthy (h/get-by-text "Title"))
    (h/is-truthy (h/get-by-text "Description")))

-  (h/test "component renders in address type"
-    (h/render-with-theme-provider [quo/drawer-top
-                                   {:title "0x1"
-                                    :type  :address}]
-                                  theme)
-    (h/is-truthy (h/get-by-text "0x1")))
-
  (h/test "component renders in info type"
    (h/render-with-theme-provider [quo/drawer-top
                                   {:title "Title"
@@ -168,16 +168,11 @@
 (defn- left-title
  [{:keys [type label title title-icon theme blur?]}]
  (case type
-    :label   [text/text
-              {:weight :medium
-               :size   :paragraph-2
-               :style  (style/description theme blur?)}
-              label]
-    :address [address-text/view
-              {:address       title
-               :full-address? true
-               :weight        :semi-bold
-               :size          :heading-2}]
+    :label [text/text
+            {:weight :medium
+             :size   :paragraph-2
+             :style  (style/description theme blur?)}
+            label]
    [rn/view {:style style/title-container}
     [text/text
      {:size   :heading-2
@@ -198,9 +193,8 @@
           on-button-press
           on-button-long-press
           button-disabled? account-avatar-emoji account-avatar-type customization-color icon-avatar
-           profile-picture keycard? networks label full-name
-           container-style]}]
-  [rn/view {:style (merge style/container container-style)}
+           profile-picture keycard? networks label full-name]}]
+  [rn/view {:style style/container}
   (when (left-image-supported-types type)
     [rn/view {:style style/left-container}
      [left-image
@@ -1,68 +1,14 @@
 (ns quo.components.drawers.permission-context.component-spec
  (:require
    [quo.components.drawers.permission-context.view :as permission-context]
+    [react-native.core :as rn]
    [test-helpers.component :as h]))

 (h/describe "permission context"
-  (js/beforeEach (fn []
-                   (-> (js/jest.spyOn js/console "error")
-                       (.mockImplementation js/jest.fn))))
-
-  (h/describe "action type"
-    (h/test "shows the label"
-      (h/render [permission-context/view
-                 {:type         :action
-                  :action-label "test"
-                  :action-icon  :i/communities}])
-      (-> (js/expect (h/get-by-text "test"))
-          (.toBeTruthy)))
-
-    (h/test "fails due to missing props"
-      (-> (js/expect
-           (fn []
-             (h/render [permission-context/view
-                        {:type :action}])))
-          (.toThrow))))
-
-  (h/describe "single-token-gating type"
-    (h/test "shows the token-tag container"
-      (h/render [permission-context/view
-                 {:type         :single-token-gating
-                  :token-value  "23"
-                  :token-symbol :eth}])
-      (-> (js/expect (h/get-by-label-text :permission-context-single-token))
-          (.toBeTruthy)))
-
-    (h/test "fails due to wrong props"
-      (-> (js/expect
-           (fn []
-             (h/render [permission-context/view
-                        {:type         :single-token-gating
-                         :action-label "test"
-                         :action-icon  :i/communities}])))
-          (.toThrow))))
-
-  (h/describe "multiple-token-gating"
-    (h/test "shows the token-tag container"
-      (h/render [permission-context/view
-                 {:type         :multiple-token-gating
-                  :token-groups [[:eth :snt] [:snt :eth :snt]]}])
-      (-> (js/expect (h/get-by-label-text :permission-context-multiple-token))
-          (.toBeTruthy)))
-
-    (h/test "fails if token-groups is empty"
-      (-> (js/expect
-           (fn []
-             (h/render [permission-context/view
-                        {:type         :multiple-token-gating
-                         :token-groups []}])))
-          (.toThrow)))
-
-    (h/test "fails due to wrong props"
-      (-> (js/expect
-           (fn []
-             (h/render [permission-context/view
-                        {:type         :multiple-token-gating
-                         :token-value  "23"
-                         :token-symbol :eth}])))
-          (.toThrow)))))
+  (h/test "it tests the default render"
+    (h/render [permission-context/view
+               [rn/text
+                {:accessibility-label :accessibility-id}
+                "a sample label"]])
+    (-> (js/expect (h/get-by-label-text :accessibility-id))
+        (.toBeTruthy))))
@@ -1,34 +0,0 @@
-(ns quo.components.drawers.permission-context.schema)
-
-(def ^:private ?base
-  [:map {:closed true}
-   [:type [:enum :action :single-token-gating :multiple-token-gating]]
-   [:blur? {:optional true} [:maybe :boolean]]
-   [:container-style {:optional true} [:maybe :map]]
-   [:on-press {:optional true} [:maybe fn?]]])
-
-(def ^:private ?action
-  [:map {:closed true}
-   [:action-label :string]
-   [:action-icon [:qualified-keyword {:namespace :i}]]])
-
-(def ^:private ?token-symbol [:or :keyword :string])
-
-(def ^:private ?single-token-gating
-  [:map {:closed true}
-   [:token-value :string]
-   [:token-symbol ?token-symbol]])
-
-(def ^:private ?multiple-token-gating
-  [:map {:closed true}
-   [:token-groups
-    [:sequential {:min 1} [:sequential {:min 1} ?token-symbol]]]])
-
-(def ?schema
-  [:=>
-   [:cat
-    [:multi {:dispatch :type}
-     [:action [:merge ?base ?action]]
-     [:single-token-gating [:merge ?base ?single-token-gating]]
-     [:multiple-token-gating [:merge ?base ?multiple-token-gating]]]]
-   :any])
@@ -3,31 +3,21 @@
    [quo.foundations.colors :as colors]
    [react-native.safe-area :as safe-area]))

-(def ^:private radius 20)
-
-(def blur-container
-  {:background-color :transparent
-   :position         :absolute
-   :top              0
-   :left             0
-   :right            0
-   :bottom           0})
+(def radius 20)

 (defn container
-  [blur? theme]
+  []
  {:flex-direction          :row
-   :overflow                :hidden
-   :background-color        (when-not blur?
-                              (colors/theme-colors colors/white
-                                                   colors/neutral-95
-                                                   theme))
+   :background-color        (colors/theme-colors colors/white colors/neutral-90)
   :padding-top             12
   :padding-bottom          (+ 12 (safe-area/get-bottom))
   :justify-content         :center
   :padding-horizontal      20
+   :shadow-offset           {:width  0
+                             :height 2}
+   :shadow-radius           radius
   :border-top-left-radius  radius
-   :border-top-right-radius radius})
-
-(def token-group
-  {:flex-direction :row
-   :margin-left    3})
+   :border-top-right-radius radius
+   :elevation               2
+   :shadow-opacity          1
+   :shadow-color            colors/shadow})
@@ -1,102 +1,13 @@
 (ns quo.components.drawers.permission-context.view
  (:require
-    [clojure.string :as string]
-    [quo.components.buttons.button.view :as button]
-    [quo.components.drawers.permission-context.schema :as component-schema]
    [quo.components.drawers.permission-context.style :as style]
-    [quo.components.list-items.preview-list.view :as preview-list]
-    [quo.components.markdown.text :as text]
-    [quo.components.tags.number-tag.view :as number-tag]
-    [quo.components.tags.token-tag.view :as token-tag]
    [quo.foundations.colors :as colors]
-    [quo.theme]
-    [react-native.blur :as blur]
-    [react-native.core :as rn]
-    [react-native.platform :as platform]
-    [react-native.shadow :as shadow]
-    [schema.core :as schema]
-    [utils.i18n :as i18n]))
-
-(defn- single-token-gating
-  [{:keys [blur? token-value token-symbol]}]
-  [rn/view
-   {:style               {:flex-direction :row}
-    :accessibility-label :permission-context-single-token}
-   [text/text {:style {:margin-right 3}}
-    (i18n/label :t/hold-to-post-1)]
-   [token-tag/view
-    {:size         :size-24
-     :option       false
-     :blur?        blur?
-     :token-value  token-value
-     :token-symbol token-symbol}]
-   [text/text {:style {:margin-left 3}}
-    (i18n/label :t/hold-to-post-2)]])
-
-(defn- token-group
-  [blur? idx group]
-  ^{:key idx}
-  [rn/view {:style style/token-group}
-   (when-not (zero? idx)
-     [text/text {:style {:margin-right 3}}
-      (string/lower-case (i18n/label :t/or))])
-   [preview-list/view
-    {:type  :tokens
-     :blur? blur?
-     :size  :size-24} group]])
-
-(defn- multiple-token-gating
-  [{:keys [token-groups blur?]}]
-  (let [visible-token-groups (take 2 token-groups)
-        extra-groups?        (-> token-groups count (> 2))]
-    [rn/view
-     {:style               {:flex-direction :row}
-      :accessibility-label :permission-context-multiple-token}
-     [text/text (i18n/label :t/hold-to-post-1)]
-     [rn/view {:style {:flex-direction :row}}
-      (map-indexed (partial token-group blur?) visible-token-groups)]
-     (when extra-groups?
-       [:<>
-        [text/text {:style {:margin-horizontal 3}}
-         (string/lower-case (i18n/label :t/or))]
-        [number-tag/view
-         {:size   :size-24
-          :number "9999" ;; show the options tag
-          :blur?  blur?
-          :type   :rounded}]])
-     [text/text {:style {:margin-left 3}}
-      (i18n/label :t/hold-to-post-2)]]))
-
-(defn- view-internal
-  [{:keys [on-press blur? container-style] :as props}]
-  (let [theme        (quo.theme/use-theme-value)
-        context-type (:type props)]
-    [shadow/view
-     {:offset       [0 4]
-      :paint-inside false
-      :start-color  (colors/theme-colors colors/neutral-100-opa-8 colors/neutral-100-opa-60)
-      :distance     25
-      :style        {:align-self :stretch}}
-     [rn/view {:style (merge (style/container blur? theme) container-style)}
-      (when blur?
-        [blur/view
-         {:style         style/blur-container
-          :blur-amount   20
-          :blur-radius   (if platform/ios? 20 10)
-          :overlay-color (colors/theme-colors colors/white-70-blur colors/neutral-95-opa-70-blur)
-          :blur-type     :transparent}])
-      [button/button
-       {:type      :ghost
-        :size      24
-        :on-press  on-press
-        :icon-left (when (= context-type :action)
-                     (:action-icon props))}
-       (condp = context-type
-         :action                (:action-label props)
-         :single-token-gating   [single-token-gating
-                                 (select-keys props [:token-value :token-symbol :blur?])]
-         :multiple-token-gating [multiple-token-gating
-                                 (select-keys props [:token-groups :blur?])])]]]))
-
-(def view (schema/instrument #'view-internal component-schema/?schema))
+    [react-native.core :as rn]))

+(defn view
+  [children on-press]
+  [rn/touchable-highlight
+   {:on-press       on-press
+    :style          (style/container)
+    :underlay-color (colors/theme-colors :transparent colors/neutral-95-opa-70)}
+   children])
@@ -8,9 +8,10 @@
 (defn- view-internal
  [{:keys [customization-color opacity container-style height]
    :or   {customization-color :blue}}]
-  ;; `when` added for safety, `linear-gradient` will break if `nil` is passed, the `:or`
-  ;; destructuring won't work because it's only applied when the `:customization-color` key is
-  ;; non-existent. While deleting an account the key exists and has a `nil` value.
+  ;; `when` added for safety, `linear-gradient` will break if `nil` is passed,
+  ;; the `:or` destructuring won't work because it's only applied when the
+  ;; `:customization-color` key is non-existent. While deleting an account the key exists
+  ;; and has a `nil` value.
  (let [color-top    (colors/resolve-color customization-color 50 20)
        color-bottom (colors/resolve-color customization-color 50 0)]
    (when (and color-top color-bottom)
@@ -73,8 +73,7 @@
  (testing "Downsampling works with large input data and max-array-size (randomized test)"
    (let [large-data      (range 1000)
          max-array-size  500
-          expected-output (range 0 1000 2)] ; expected-output contains every 2nd element from 0 to
-                                            ; 1000
+          expected-output (range 0 1000 2)] ; expected-output contains every 2nd element from 0 to 1000
      (is (= (utils/downsample-data large-data max-array-size) expected-output)))))

 (deftest format-compact-number
@@ -23,8 +23,7 @@
   :text-color     colors/white  ;; text color override
   :icon-color     colors/white  ;; icon color override
   :no-icon-color? false         ;; disable tint color for icon"
-  [{:keys [type size theme icon text-color icon-color no-icon-color? style accessibility-label
-           container-style]} message]
+  [{:keys [type size theme icon text-color icon-color no-icon-color? style accessibility-label]} message]
  (let [weight     (if (= size :default) :regular :medium)
        icon-size  (if (= size :default) 16 12)
        size       (if (= size :default) :paragraph-2 :label)
@@ -33,8 +32,7 @@
    [rn/view
     {:style (merge {:flex-direction :row
                     :align-items    :center}
-                    style
-                    container-style)}
+                    style)}
     [quo.icons/icon icon
      {:color    icon-color
       :no-color no-icon-color?
@@ -134,9 +134,9 @@
   :align-items :flex-end})

 (defn counter-color
-  [{:keys [current-chars char-limit variant-colors theme]}]
+  [current-chars char-limit variant-colors]
  {:color (if (> current-chars char-limit)
-            (colors/resolve-color :danger theme)
+            colors/danger-60
            (:label variant-colors))})

 (defn button
@@ -8,7 +8,7 @@
            [react-native.platform :as platform]))

 (defn- label-&-counter
-  [{:keys [label current-chars char-limit variant-colors theme]}]
+  [{:keys [label current-chars char-limit variant-colors]}]
  [rn/view
   {:accessibility-label :input-labels
    :style               style/texts-container}
@@ -22,10 +22,7 @@
                                  (str current-chars "/"))]
     [rn/view {:style style/counter-container}
      [text/text
-       {:style  (style/counter-color {:current-chars  current-chars
-                                      :char-limit     char-limit
-                                      :variant-colors variant-colors
-                                      :theme          theme})
+       {:style  (style/counter-color current-chars char-limit variant-colors)
        :weight :regular
        :size   :paragraph-2}
       count-text]])])
@@ -60,12 +57,12 @@
  "Custom properties that must be removed from properties map passed to InputText."
  [:type :blur? :error? :right-icon :left-icon :disabled? :small? :button
   :label :char-limit :on-char-limit-reach :icon-name :multiline? :on-focus :on-blur
-   :container-style :input-container-style :ref :placeholder])
+   :container-style :ref])

 (defn- base-input
  [{:keys [blur? error? right-icon left-icon disabled? small? button
-           label char-limit multiline? clearable? on-focus on-blur container-style input-container-style
-           on-change-text on-char-limit-reach weight default-value on-clear placeholder]
+           label char-limit multiline? clearable? on-focus on-blur container-style
+           on-change-text on-char-limit-reach weight default-value on-clear]
    :as   props}]
  (let [theme                  (quo.theme/use-theme-value)
        ref                    (rn/use-ref-atom nil)
@@ -110,20 +107,15 @@
                                     {:style-fn  style/clear-icon
                                      :icon-name :i/clear
                                      :on-press  clear-on-press}))
-        clean-props            (apply dissoc props custom-props)
-        ;; Workaround for android cursor overlapping placeholder
-        ;; https://github.com/facebook/react-native/issues/27687
-        modified-placeholder   (if platform/android? (str "\u2009" placeholder) placeholder)]
+        clean-props            (apply dissoc props custom-props)]
    [rn/view {:style container-style}
     (when (or label char-limit)
       [label-&-counter
        {:variant-colors variant-colors
         :label          label
         :current-chars  char-count
-         :char-limit     char-limit
-         :theme          theme}])
-     [rn/view
-      {:style (merge (style/input-container colors-by-status small? disabled?) input-container-style)}
+         :char-limit     char-limit}])
+     [rn/view {:style (style/input-container colors-by-status small? disabled?)}
      (when-let [{:keys [icon-name]} left-icon]
        [left-accessory
         {:variant-colors variant-colors
@@ -137,7 +129,6 @@
                :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
                :cursor-color           (:cursor variant-colors)
                :editable               (not disabled?)
-                :placeholder            modified-placeholder
                :on-focus               (fn []
                                          (when on-focus (on-focus))
                                          (internal-on-focus))
@@ -4,12 +4,12 @@
  [:=>
   [:cat
    [:map
-     [:token [:or :string :keyword]]
+     [:token :keyword]
     [:label :string]
     [:token-value :string]
     [:fiat-value :string]
     [:networks [:* [:map [:source :schema.common/image-source]]]]
     [:on-press {:optional true} [:maybe fn?]]
     [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-     [:state {:optional true} [:maybe [:enum :default :active :selected]]]]]
+     [:state {:optional true} [:enum :default :active :selected]]]]
   :any])
@@ -1,41 +1,17 @@
 (ns quo.components.messages.author.style
  (:require
-    [quo.foundations.colors :as colors]
-    [react-native.platform :as platform]))
+    [quo.foundations.colors :as colors]))

-(defn- primary-name-top-offset
-  [size]
-  (when (= size 15)
-    (cond platform/ios?     1
-          platform/android? -0.5
-          :else             0)))
-
-(defn- primary-name-margin-bottom-offset
-  [size]
-  (when (and (= size 15)
-             (or platform/ios? platform/android?))
-    -0.25))
-
-(defn- primary-name-layout-offsets
-  [size]
-  ;; NOTE(seanstrom): We need to sometimes offset the primary-name to align the baseline of the text
-  ;; while avoiding shifting elements downward.
-  {:top           (primary-name-top-offset size)
-   :margin-bottom (primary-name-margin-bottom-offset size)})
-
-(defn container
-  [size]
-  {:flex-shrink    1
-   :flex-wrap      :nowrap
+(def container
+  {:flex-wrap      :nowrap
   :flex-direction :row
-   :align-items    :baseline
-   ;; NOTE(seanstrom): Because we're offseting the primary-name we need to inverse the offset on the
-   ;; container to avoid shifting elements downward
-   :top            (* -1 (primary-name-top-offset size))})
+   :align-items    :flex-end})

-(def details-container
-  {:flex-direction :row
-   :margin-left    8})
+(def name-container
+  {:margin-right   8
+   :flex-direction :row
+   :align-items    :flex-end
+  })

 (defn middle-dot
  [theme]
@@ -47,26 +23,22 @@
  {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)})

 (defn primary-name
-  [muted? theme size]
-  (merge (primary-name-layout-offsets size)
-         {:color       (if muted?
-                         colors/neutral-50
-                         (colors/theme-colors colors/neutral-100 colors/white theme))
-          :flex-shrink 1}))
+  [muted? theme]
+  {:color       (if muted?
+                  colors/neutral-50
+                  (colors/theme-colors colors/neutral-100 colors/white theme))
+   :flex-shrink 1})

 (defn secondary-name
  [theme]
-  {:flex-shrink 999999
+  {:padding-top 1
+   :flex-shrink 999999
   :color       (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})

 (defn icon-container
  [is-first?]
-  {:margin-left (if is-first? 4 2)
-   ;; NOTE(seanstrom): Because we're using flex baseline to align elements
-   ;; we need to offset the icon container to match the designs.
-   :top         (cond platform/ios?     1
-                      platform/android? 2
-                      :else             0)})
+  {:margin-left   (if is-first? 4 2)
+   :margin-bottom 4})

 (defn time-text
  [theme]
@@ -13,67 +13,66 @@
  [{:keys [primary-name secondary-name style short-chat-key time-str contact? verified? untrustworthy?
           muted? size theme]
    :or   {size 13}}]
-  [rn/view
-   {:style (merge (style/container size) style)}
-   [text/text
-    {:weight              :semi-bold
-     :size                (if (= size 15) :paragraph-1 :paragraph-2)
-     :number-of-lines     1
-     :accessibility-label :author-primary-name
-     :style               (style/primary-name muted? theme size)}
-    primary-name]
-   (when (not (string/blank? secondary-name))
-     [:<>
-      [text/text
-       {:size            :label
-        :number-of-lines 1
-        :style           (style/middle-dot theme)}
-       middle-dot]
-      [text/text
-       {:weight              :medium
-        :size                :label
-        :number-of-lines     1
-        :accessibility-label :author-secondary-name
-        :style               (style/secondary-name theme)}
-       secondary-name]])
-   (when contact?
-     [icons/icon :main-icons2/contact
-      {:size            12
-       :no-color        true
-       :container-style (style/icon-container true)}])
-   (cond
-     verified?
-     [icons/icon :main-icons2/verified
-      {:size            12
-       :no-color        true
-       :container-style (style/icon-container contact?)}]
-     untrustworthy?
-     [icons/icon :main-icons2/untrustworthy
-      {:size            12
-       :no-color        true
-       :container-style (style/icon-container contact?)}])
-   [rn/view {:style style/details-container}
-    (when (and (not verified?) short-chat-key)
-      [text/text
-       {:weight          :monospace
-        :size            :label
-        :number-of-lines 1
-        :style           (style/chat-key-text theme)}
-       short-chat-key])
-    (when (and (not verified?) time-str short-chat-key)
-      [text/text
-       {:monospace       true
-        :size            :label
-        :number-of-lines 1
-        :style           (style/middle-dot theme)}
-       middle-dot])
-    (when time-str
-      [text/text
-       {:monospace           true
-        :size                :label
-        :accessibility-label :message-timestamp
-        :number-of-lines     1
-        :style               (style/time-text theme)}
-       time-str])]])
+  [rn/view {:style (merge style/container style {:height (if (= size 15) 21.75 18.2)})}
+   [rn/view {:style style/name-container}
+    [text/text
+     {:weight              :semi-bold
+      :size                (if (= size 15) :paragraph-1 :paragraph-2)
+      :number-of-lines     1
+      :accessibility-label :author-primary-name
+      :style               (style/primary-name muted? theme)}
+     primary-name]
+    (when (not (string/blank? secondary-name))
+      [:<>
+       [text/text
+        {:size            :label
+         :number-of-lines 1
+         :style           (style/middle-dot theme)}
+        middle-dot]
+       [text/text
+        {:weight              :medium
+         :size                :label
+         :number-of-lines     1
+         :accessibility-label :author-secondary-name
+         :style               (style/secondary-name theme)}
+        secondary-name]])
+    (when contact?
+      [icons/icon :main-icons2/contact
+       {:size            12
+        :no-color        true
+        :container-style (style/icon-container true)}])
+    (cond
+      verified?
+      [icons/icon :main-icons2/verified
+       {:size            12
+        :no-color        true
+        :container-style (style/icon-container contact?)}]
+      untrustworthy?
+      [icons/icon :main-icons2/untrustworthy
+       {:size            12
+        :no-color        true
+        :container-style (style/icon-container contact?)}])]
+   (when (and (not verified?) short-chat-key)
+     [text/text
+      {:weight          :monospace
+       :size            :label
+       :number-of-lines 1
+       :style           (style/chat-key-text theme)}
+      short-chat-key])
+   (when (and (not verified?) time-str short-chat-key)
+     [text/text
+      {:monospace       true
+       :size            :label
+       :number-of-lines 1
+       :style           (style/middle-dot theme)}
+      middle-dot])
+   (when time-str
+     [text/text
+      {:monospace           true
+       :size                :label
+       :accessibility-label :message-timestamp
+       :number-of-lines     1
+       :style               (style/time-text theme)}
+      time-str])])

 (def view (quo.theme/with-theme internal-view))
@@ -55,10 +55,12 @@
      :accessibility-label     accessibility-label}
     [reanimated/view {:style background-animated-style}
      ;; In android animations are not working for the animated components which are nested by
-      ;; hole-view,. Interestingly this only happens when hole view and blur view are used together
+      ;; hole-view,
+      ;; Interestingly this only happens when hole view and blur view are used together
      ;; Similar behavior is also seen while removing holes, and to fix that we used key and
-      ;; force-rendered view. But we need animations faster for tab clicks, so we can't rely on
-      ;; reagent atoms, so for now only using hole view for the ios tab icon notification boundary
+      ;; force-rendered view
+      ;; But we need animations faster for tab clicks, so we can't rely on reagent atoms,
+      ;; so for now only using hole view for the ios tab icon notification boundary
      (if platform/ios?
        [hole-view/hole-view
         {:key   new-notifications? ;; Key is required to force removal of holes
@@ -11,9 +11,7 @@
    [quo.components.markdown.text :as text]
    [quo.components.navigation.page-nav.style :as style]
    [quo.theme :as theme]
-    [react-native.core :as rn]
-    [react-native.reanimated :as reanimated]
-    [utils.worklets.profile-header :as header-worklet]))
+    [react-native.core :as rn]))

 (def ^:private button-type
  {:white       :grey
@@ -87,24 +85,14 @@
     :else
     nil)])

-(def header-height 155)
-(def page-nav-height 25)
-(def threshold (- header-height page-nav-height))
-
 (defn- title-center
-  [{:keys [centered? title center-opacity scroll-y]}]
-  (let [animated-style (when scroll-y
-                         (header-worklet/profile-header-animation scroll-y
-                                                                  threshold
-                                                                  page-nav-height))]
-    [reanimated/view
-     {:style [(style/center-content-container centered? center-opacity)
-              animated-style]}
-     [text/text
-      {:weight          :medium
-       :size            :paragraph-1
-       :number-of-lines 1}
-      title]]))
+  [{:keys [centered? title center-opacity]}]
+  [rn/view {:style (style/center-content-container centered? center-opacity)}
+   [text/text
+    {:weight          :medium
+     :size            :paragraph-1
+     :number-of-lines 1}
+    title]])

 (defn- dropdown-center
  [{:keys [theme background dropdown-on-press dropdown-selected? dropdown-text center-opacity]}]
@@ -113,7 +101,7 @@
                         (and (= theme :dark) (= background :blur)) :grey
                         :else                                      :ghost)
        dropdown-state (if dropdown-selected? :active :default)]
-    [reanimated/view {:style (style/center-content-container true center-opacity)}
+    [rn/view {:style (style/center-content-container true center-opacity)}
     [dropdown/view
      {:type       dropdown-type
       :state      dropdown-state
@@ -124,7 +112,7 @@

 (defn- token-center
  [{:keys [theme background token-logo token-name token-abbreviation center-opacity]}]
-  [reanimated/view {:style (style/center-content-container false center-opacity)}
+  [rn/view {:style (style/center-content-container false center-opacity)}
   [rn/image {:style style/token-logo :source token-logo}]
   [text/text
    {:style           style/token-name
@@ -141,7 +129,7 @@

 (defn- channel-center
  [{:keys [theme background channel-emoji channel-name channel-icon center-opacity]}]
-  [reanimated/view {:style (style/center-content-container false center-opacity)}
+  [rn/view {:style (style/center-content-container false center-opacity)}
   [rn/text {:style style/channel-emoji}
    channel-emoji]
   [text/text
@@ -154,7 +142,7 @@

 (defn- title-description-center
  [{:keys [background theme picture title description center-opacity]}]
-  [reanimated/view {:style (style/center-content-container false center-opacity)}
+  [rn/view {:style (style/center-content-container false center-opacity)}
   (when picture
     [rn/view {:style style/group-avatar-picture}
      [group-avatar/view {:picture picture :size :size-28}]])
@@ -177,7 +165,7 @@
  (let [community? (= type :community)
        shown-logo (if community? community-logo network-logo)
        shown-name (if community? community-name network-name)]
-    [reanimated/view {:style (style/center-content-container false center-opacity)}
+    [rn/view {:style (style/center-content-container false center-opacity)}
     [rn/image
      {:style  style/community-network-logo
       :source shown-logo}]
@@ -189,7 +177,7 @@

 (defn- wallet-networks-center
  [{:keys [networks networks-on-press background center-opacity]}]
-  [reanimated/view {:style (style/center-content-container true center-opacity)}
+  [rn/view {:style (style/center-content-container true center-opacity)}
   [network-dropdown/view
    {:state    :default
     :on-press networks-on-press
@@ -307,7 +295,6 @@
  `:title`
    - title
    - text-align: `:center` or `:left`
-    - scroll-y: a shared value (optional)
   `:dropdown`
    - dropdown-on-press:  a callback
    - dropdown-selected?: a boolean
@@ -5,7 +5,8 @@
  (let [right-offset (cond
                       (> unread-count max-value)
                       -14
-                       ;; Greater than 9 means we'll need 2 digits to represent the text.
+                       ;; Greater than 9 means we'll need 2 digits to represent
+                       ;; the text.
                       (> unread-count 9)
                       -10
                       :else -6)]
@@ -39,7 +39,6 @@
   {:size                :paragraph-2
    :weight              :medium
    :style               (style/text theme)
-    :number-of-lines     2
    :accessibility-label :notification-content}
   text])

@@ -54,11 +54,12 @@
       [rn/view
        {:style style/card-header}
        [user-avatar/user-avatar
-         {:full-name         name
-          :profile-picture   profile-picture
-          :size              :medium
-          :status-indicator? false
-          :static?           true}]
+         {:full-name           name
+          :profile-picture     profile-picture
+          :size                :medium
+          :status-indicator?   false
+          :customization-color customization-color
+          :static?             true}]
        [rn/view {:flex-direction :row}
         (when show-logged-in?
           [tag/tag
@@ -98,8 +98,9 @@
                         (fn []
                           (helpers/set-value opacity 1)
                           (helpers/animate-linear scale 2.6 signal-anim-duration)
-                           ;; TODO: Research if we can implement this with withSequence method from
-                           ;; Reanimated 2. GitHub issue [#14561]:
+                           ;; TODO: Research if we can implement this with withSequence method
+                           ;; from Reanimated 2
+                           ;; GitHub issue [#14561]:
                           ;; https://github.com/status-im/status-mobile/issues/14561
                           (reset! clear-timeout
                             (js/setTimeout
@@ -76,7 +76,7 @@
    nil))

 (defn label-component
-  [{:keys [label label-props blur? theme preview-size]}]
+  [{:keys [label label-props blur? theme]}]
  [rn/view {:accessibility-label :label-component}
   (case label
     :text    [text/text
@@ -84,7 +84,7 @@
               label-props]
     :color   [rn/view
               {:style (style/label-dot label-props)}]
-     :preview [preview-list/view {:type (:type label-props) :size (or preview-size :size-24)}
+     :preview [preview-list/view {:type (:type label-props) :size :size-24}
               (:data label-props)]
     nil)])

@@ -16,6 +16,12 @@
   :padding-top        12
   :padding-bottom     8})

+(def gradient-bg
+  {:position :absolute
+   :top      0
+   :left     0
+   :right    0})
+
 ;;; Header
 (def header-container
  {:flex-direction :row
@@ -65,5 +71,41 @@
   :justify-content :space-between
   :flex            1})

+;;; Dashed line
+(def ^:private padding-for-divider (+ padding-horizontal 4))
+(def ^:private dashed-line-width 2)
+(def ^:private dashed-line-space 4)
+
+(def dashed-line
+  {:flex-direction :row
+   :margin-left    -1})
+
+(def line
+  {:background-color colors/white-opa-20
+   :width            dashed-line-width
+   :height           1})
+
+(def line-space
+  {:width  dashed-line-space
+   :height 1})
+
+(defn number-lines-and-spaces-to-fill
+  [component-width]
+  (let [line-and-space-width (+ dashed-line-width dashed-line-space)
+        width-to-fill        (- component-width (* 2 padding-for-divider))
+        number-of-lines      (* (/ width-to-fill line-and-space-width) 2)]
+    (inc (int number-of-lines))))
+
+(def ^:private get-network-full-name
+  {"eth"  :ethereum
+   "opt"  :optimism
+   "arb1" :arbitrum})
+
+(defn network-short-name-text
+  [network-short-name]
+  {:color (-> network-short-name
+              (get-network-full-name :unknown)
+              (colors/resolve-color nil))})
+
 (def watched-account-icon
  {:margin-left 4})
@@ -1,5 +1,6 @@
 (ns quo.components.share.share-qr-code.view
  (:require [clojure.set]
+            [clojure.string :as string]
            [oops.core :as oops]
            [quo.components.avatars.account-avatar.view :as account-avatar]
            [quo.components.avatars.user-avatar.view :as user-avatar]
@@ -12,7 +13,6 @@
            [quo.components.share.share-qr-code.schema :as component-schema]
            [quo.components.share.share-qr-code.style :as style]
            [quo.components.tabs.tab.view :as tab]
-            [quo.components.wallet.address-text.view :as address-text]
            [quo.foundations.colors :as colors]
            [quo.theme]
            [react-native.core :as rn]
@@ -74,6 +74,21 @@
     :on-press            on-press}
    :i/share]])

+(defn- network-colored-text
+  [network-short-name]
+  [text/text {:style (style/network-short-name-text network-short-name)}
+   (str network-short-name ":")])
+
+(defn- wallet-multichain-colored-address
+  [full-address]
+  (let [[networks address]  (as-> full-address $
+                              (string/split $ ":")
+                              [(butlast $) (last $)])
+        ->network-hiccup-xf (map #(vector network-colored-text %))]
+    (as-> networks $
+      (into [:<>] ->network-hiccup-xf $)
+      (conj $ address))))
+
 (defn- profile-bottom
  [{:keys [component-width qr-data on-text-press on-text-long-press share-qr-type]}]
  [rn/view
@@ -101,11 +116,7 @@
    {:width         component-width
     :on-press      on-text-press
     :on-long-press on-text-long-press}
-    [address-text/view
-     {:address       qr-data
-      :full-address? true
-      :weight        :regular
-      :size          :paragraph-1}]]
+    [wallet-multichain-colored-address qr-data]]
   [button/button
    {:icon-only?          true
     :type                :grey
@@ -177,21 +188,21 @@
         nil))]]])

 (defn- view-internal
-  [{provided-width :width :as props}]
-  (let [[calculated-width
+  [props]
+  (let [[component-width
         set-component-width] (rn/use-state nil)
        on-layout             (rn/use-callback #(set-component-width
                                                 (oops/oget % "nativeEvent.layout.width")))
        props                 (-> props
-                                  (assoc :component-width (or provided-width calculated-width))
+                                  (assoc :component-width component-width)
                                  (clojure.set/rename-keys {:type :share-qr-type}))]
    [quo.theme/provider {:theme :dark}
     [rn/view
      {:accessibility-label :share-qr-code
       :style               style/outer-container
-       :on-layout           (when-not provided-width on-layout)}
+       :on-layout           on-layout}
      [rn/view {:style {:background-color style/overlay-color}}
-       (when (:component-width props)
+       (when component-width
         [share-qr-code props])]]]))

 (def view (schema/instrument #'view-internal component-schema/?schema))
@@ -16,8 +16,7 @@
   [preview-list/view
    {:type   :network
     :number (count networks)
-     :size   :size-16}
-    networks]
+     :size   :size-16} networks]
   [text/text
    {:weight :medium
     :size   :paragraph-2
@@ -1,5 +1,4 @@
-(ns quo.components.text-combinations.style
-  (:require [quo.foundations.colors :as colors]))
+(ns quo.components.text-combinations.style)

 (def title-container
  {:flex-direction :row
@@ -7,8 +6,7 @@
   :align-items    :center})

 (def avatar-container
-  {:margin-right 9
-   :text-align   :center})
+  {:margin-right 9})

 (def description-description-text
  {:margin-top 8})
@@ -18,15 +16,3 @@
   :letter-spacing 2
   :font-size      13
   :line-height    20.5})
-
-(defn textual-emoji
-  [size customization-color theme]
-  {:border-radius    size
-   :margin-top       -5
-   :border-width     0
-   :border-color     :transparent
-   :width            size
-   :height           size
-   :justify-content  :center
-   :align-items      :center
-   :background-color (colors/resolve-color customization-color theme 10)})
@@ -2,27 +2,22 @@
  (:require [quo.foundations.colors :as colors]))

 (def container
-  {:flex-direction  :row
-   :justify-content :flex-start
-   :height          32})
+  {:flex-direction :row
+   :height         32})

 (def username-text-container
  {:flex-direction :row
-   :align-items    :flex-end
-   :flex-shrink    1})
+   :align-items    :flex-end})

 (defn real-name-text
  [theme blur?]
-  {:color       (if blur?
-                  (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
-                  (colors/theme-colors colors/neutral-60 colors/neutral-40 theme))
-   :flex-shrink 1})
+  {:color (if blur?
+            (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40 theme)
+            (colors/theme-colors colors/neutral-60 colors/neutral-40 theme))})

 (defn real-name-dot
  [theme blur?]
-  (merge (real-name-text theme blur?)
-         {:margin-horizontal 6
-          :flex-shrink       0}))
+  (assoc (real-name-text theme blur?) :margin-horizontal 6))

 (defn status-icon-container
  [name-type status]
--- a/Show More
+++ b/Show More