Initial commit

Network dropdown component (#16982 )
[16866] Action Drawer design review (#17033 )
2023-08-23 17:58:41 +03:00 · 2023-08-23 14:12:15 +01:00 · 2023-08-23 15:58:23 +03:00 · 2023-08-23 12:15:05 +03:00 · 2023-08-23 12:53:45 +04:00 · 2023-08-22 20:39:44 +02:00
1123 changed files with 39605 additions and 19549 deletions
@@ -95,11 +95,11 @@ status-im.hardwallet.simulated-keycard/sign-typed-data
 status-im.utils.core/safe-read-message-content
 status-im.ui.components.react/native-modules
 status-im.ui.components.react/progress-bar
-status-im.utils.fs/move-file
-status-im.utils.fs/read-dir
-status-im.utils.fs/mkdir
-status-im.utils.fs/unlink
-status-im.utils.fs/file-exists?
+react-native.fs/move-file
+react-native.fs/read-dir
+react-native.fs/mkdir
+react-native.fs/unlink
+react-native.fs/file-exists?
 quo.animated/code
 quo.animated/eq
 quo.animated/neq
@@ -14,6 +14,21 @@
                                              clojure.set     set
                                              clojure.walk    walk
                                              taoensso.timbre log}}
+                :shadowed-var      {:level   :error
+                                    ;; We temporarily use :include to define an
+                                    ;; allowlist of core Clojure vars. In the
+                                    ;; future, as we progressively fix shadowed
+                                    ;; vars, we should be able to delete this
+                                    ;; option and lint all vars.
+                                    :include [comparator
+                                              count
+                                              identity
+                                              iter
+                                              key
+                                              str
+                                              symbol
+                                              time
+                                              val]}
                :invalid-arity     {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
                ;; TODO remove number when this is fixed
                ;; https://github.com/borkdude/clj-kondo/issues/867
@@ -1,37 +0,0 @@
-module.exports = {
-  "testRunner": "jest",
-  "testRegex": "\\.visual\\.js$",
-  "runner-config": "visual-test/config.json",
-  "devices": {
-    "simulator": {
-      "type": "ios.simulator",
-      "device": {
-        "type": "iPhone 11 Pro"
-      }
-    }
-  },
-  "apps": {
-    "ios.release": {
-      "name": "StatusIm",
-      "type": "ios.app",
-      "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/StatusIm.app",
-      "build": "make release-ios"
-    },
-    "ios.debug": {
-      "name": "StatusIm",
-      "type": "ios.app",
-      "binaryPath": process.env.TEST_BINARY_PATH,
-      "build": "make run-ios SIMULATOR='iPhone 11 Pro'"
-    }
-  },
-  "configurations": {
-    "ios.sim.release": {
-      "device": "simulator",
-      "app": "ios.release"
-    },
-    "ios.sim.debug": {
-      "device": "simulator",
-      "app": "ios.debug"
-    }
-  }
-}
@@ -22,7 +22,6 @@ KEYCARD_TEST_MENU=0
 QR_READ_TEST_MENU=1
 ENABLE_ROOT_ALERT=1
 ENABLE_QUO_PREVIEW=1
-MAX_IMAGES_BATCH=5
 APN_TOPIC=im.status.ethereum.pr
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
@@ -21,7 +21,6 @@ COMMANDS_ENABLED=1
 KEYCARD_TEST_MENU=1
 QR_READ_TEST_MENU=1
 ENABLE_ROOT_ALERT=0
-MAX_IMAGES_BATCH=5
 APN_TOPIC=im.status.ethereum.pr
 VERIFY_TRANSACTION_CHAIN_ID=5
 VERIFY_ENS_CHAIN_ID=5
@@ -33,3 +32,4 @@ DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
+FAST_CREATE_COMMUNITY_ENABLED=1
@@ -26,7 +26,6 @@ VERIFY_TRANSACTION_CHAIN_ID=5
 VERIFY_ENS_CHAIN_ID=5
 TEST_STATEOFUS=1
 BLANK_PREVIEW=0
-MAX_IMAGES_BATCH=5
 DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
@@ -35,3 +34,4 @@ TWO_MINUTES_SYNCING=1
 ENABLE_QUO_PREVIEW=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
+FAST_CREATE_COMMUNITY_ENABLED=1
@@ -17,8 +17,8 @@ RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
 ENABLE_ROOT_ALERT=1
-MAX_IMAGES_BATCH=5
 BLANK_PREVIEW=0
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
+FAST_CREATE_COMMUNITY_ENABLED=0
@@ -1,4 +1,4 @@
 module.exports = {
-    root: true,
-    extends: '@react-native-community',
-  };
+  root: true,
+  extends: '@react-native-community',
+};
@@ -43,4 +43,4 @@ As a <user|developer|...>, I want to <task> so that <goal>.
 [comment]: # (if on Android please replicate bug whilst running adb logcat)
 ```
 ...
-```
+```
@@ -1,8 +1,8 @@
 ---
-name: Bug Report
-about: Bug Report
+name: MVPBug Report
+about: MVPBug Report
 title: ''
-labels: bug
+labels: 'E:Mobile Bug MVP'
 assignees: ''

 ---
@@ -22,8 +22,7 @@ assignees: ''

 ### Reproduction

-1) Open Status
-2) 
+1. 

 ### Additional Information

@@ -0,0 +1,30 @@
+---
+name: Wont fix Report 
+about: to facilitate future handling, identify and address non-urgent issues that won't be prioritized in the near future
+title: ''
+labels: likely_wont_fix
+assignees: ''
+
+---
+
+## Problem
+
+
+#### Expected behavior
+
+
+#### Actual behavior
+
+
+### Reproduction
+
+1. 
+
+### Additional Information
+
+- Status version: release 
+- Operating System: Android, iOS
+
+
+[comment]: # (Please, add logs/notes if necessary)
+
@@ -184,3 +184,9 @@ test/appium/tests/users.py

 ## component-tests
 *.log
+
+## local xcode env introduced in react-native 0.69
+.xcode.env.local
+
+## git hooks
+lefthook.yml
@@ -0,0 +1,9 @@
+*
+!*.js
+!*/
+*.clj-kondo
+*.shadow-cljs
+modules
+result
+target
+component-spec
@@ -1,7 +1,9 @@
 module.exports = {
-    bracketSpacing: false,
-    bracketSameLine: true,
-    singleQuote: true,
-    trailingComma: 'all',
-    tabWidth: 4,
+  arrowParens: 'always',
+  printWidth: 120,
+  semi: true,
+  singleQuote: true,
+  tabWidth: 2,
+  trailingComma: 'all',
+  useTabs: false,
 };
@@ -14,17 +14,17 @@ WHITE  := $(shell tput -Txterm setaf 7)
 YELLOW := $(shell tput -Txterm setaf 3)
 RESET  := $(shell tput -Txterm sgr0)
 HELP_FUN = \
-		   %help; \
-		   while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
-		   print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
-		   for (sort keys %help) { \
-			   print "${WHITE}$$_:${RESET}\n"; \
-			   for (@{$$help{$$_}}) { \
-				   $$sep = " " x (32 - length $$_->[0]); \
-				   print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
-			   }; \
-			   print "\n"; \
-		   }
+			 %help; \
+			 while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
+			 print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
+			 for (sort keys %help) { \
+				 print "${WHITE}$$_:${RESET}\n"; \
+				 for (@{$$help{$$_}}) { \
+					 $$sep = " " x (32 - length $$_->[0]); \
+					 print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
+				 }; \
+				 print "\n"; \
+			 }
 HOST_OS := $(shell uname | tr '[:upper:]' '[:lower:]')

 # This can come from Jenkins
@@ -42,11 +42,14 @@ export NODE_OPTIONS += --openssl-legacy-provider
 export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore

 # Our custom config is located in nix/nix.conf
-export NIX_CONF_DIR = $(PWD)/nix
+export NIX_USER_CONF_FILES = $(PWD)/nix/nix.conf
 # Location of symlinks to derivations that should not be garbage collected
 export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-mobile
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
-export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE
+export _NIX_KEEP ?= TMPDIR,BUILD_ENV,\
+	BUILD_TYPE,BUILD_NUMBER,COMMIT_HASH,\
+	ANDROID_GRADLE_OPTS,ANDROID_ABI_SPLIT,ANDROID_ABI_INCLUDE,\
+	STATUS_GO_SRC_OVERRIDE,STATUS_GO_IPFS_GATEWAY_URL

 # Useful for Android release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
@@ -81,6 +84,10 @@ nix-gc-protected:
 	@echo -e "$(YELLOW)The following paths are protected:$(RESET)" && \
 	ls -1 $(_NIX_GCROOTS) | sed 's/^/ - /'

+nix-upgrade: SHELL := /bin/sh
+nix-upgrade: ##@nix Upgrade Nix interpreter to current version.
+	nix/scripts/upgrade.sh
+
 nix-gc: export TARGET := nix
 nix-gc: nix-gc-protected ##@nix Garbage collect all packages older than 20 days from /nix/store
 	nix-store --gc
@@ -268,7 +275,7 @@ run-android: export TARGET := android
 run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug

-SIMULATOR=iPhone 13
+SIMULATOR=iPhone 11 Pro
 run-ios: export TARGET := ios
 run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
@@ -297,20 +304,23 @@ define find_all_clojure_files
 $$(comm -23 <(sort <(git ls-files --cached --others --exclude-standard)) <(sort <(git ls-files --deleted)) | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn)
 endef

-lint: export TARGET := default
+lint: export TARGET := clojure
 lint: ##@test Run code style checks
 	@sh scripts/lint-re-frame-in-quo-components.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES
+	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
+	sh scripts/lint-trailing-newline.sh && \
+	yarn prettier

 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
-lint-fix: export TARGET := default
+lint-fix: export TARGET := clojure
 lint-fix: ##@test Run code style checks and fix issues
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES
-
+	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
+	sh scripts/lint-trailing-newline.sh --fix && \
+	yarn prettier

 shadow-server: export TARGET := clojure
 shadow-server:##@ Start shadow-cljs in server mode for watching
@@ -337,14 +347,6 @@ test: ##@test Run tests once in NodeJS
 	yarn shadow-cljs compile test && \
 	node --require ./test-resources/override.js target/test/test.js

-
-run-visual-test-ios: export TARGET := clojure
-run-visual-test-ios: XCODE_DERIVED_DATA := $(HOME)/Library/Developer/Xcode/DerivedData
-run-visual-test-ios: APPLICATION_NAME := StatusIm-brfnruzfrkkycpbndmdoeyrigthc
-run-visual-test-ios: export TEST_BINARY_PATH := $(XCODE_DERIVED_DATA)/$(APPLICATION_NAME)/Build/Products/Debug-iphonesimulator/StatusIm.app
-run-visual-test-ios: ##@test Run tests once in NodeJS
-	detox test --configuration ios.sim.debug
-
 component-test-watch: export TARGET := clojure
 component-test-watch: export COMPONENT_TEST := true
 component-test-watch: export BABEL_ENV := test
@@ -2,7 +2,9 @@

 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="80"/>](https://play.google.com/store/apps/details?id=im.status.ethereum)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80"/>](https://f-droid.org/packages/im.status.ethereum/)
-[<img src="doc/github_badge.png" alt="Get it on Github" height="80"/>](https://github.com/status-im/status-mobile/releases)
+
+
+[Get it on Github](https://github.com/status-im/status-mobile/releases)

 Join us in creating a browser, messenger, and gateway to a decentralized world. Status is a free (libre) open source mobile client targeting Android & iOS built entirely on [Ethereum](https://ethereum.org/) technologies. That's right, no middle men and `go-ethereum` running directly on your device.

@@ -20,31 +22,31 @@ If this interests you, **help us make Status a reality** - anyone can contribute

 ## How to Contribute?

-Go straight to the [docs](https://status.im/docs) or [join our chat](https://join.status.im/chat/public/status) and choose what interests you:
+Go straight to the [docs](doc/) and choose what interests you:

 - **Developer** Developers are the heart of software and to keep Status beating
 we need all the help we can get! If you're looking to code in ClojureScript or
 Golang then Status is the project for you! We use React Native and there is even
 some Java/Objective-C too! Want to learn more about it? Start by reading our
-[Developer Introduction](https://status.im/developer_tools/) which guides you
+[Developer Introduction](doc/starting-guide.md) which guides you
 through the technology stack and start browsing [beginner
 issues](https://github.com/status-im/status-mobile/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20).
 Then you can read how to [Build
-Status](https://status.im/technical/build_status/), which talks about managing
-project dependencies, coding guidelines and testing procedures. The [doc/](doc/)
-directory also has valuable information for contributors.
+Status](doc/starting-guide.md), which talks about managing
+project dependencies, coding guidelines and testing procedures.
+Check out our [coding guidelines](doc/new-guidelines.md).

 - **Community Management**
 Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)

 - **Specification / Documentation**
-John Dewey once said "Education is not preparation for life; education is life *itself* ". Developers & Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, head over to our [docs](https://status.im/docs) and see how you can improve what we have.
+John Dewey once said "Education is not preparation for life; education is life *itself* ". Developers & Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, check out our [docs](doc/) and see how you can improve what we have.

 - **Blog Writing**
-Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page. [Jump into our chat](https://join.status.im/chat/public/status) and discuss with the team how you can contribute!
+Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page.

 - **Testers**
-It's bug hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](https://status.im/technical/build_status/) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
+It's bug hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](doc/starting-guide.md) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!

 - **Security**
 Status is a visual interface to make permanent changes on the Blockchain, it handles crypto-tokens that have real value and allows 3rd party code execution. Security is paramount to its success. You are given permission to break Status as hard as you can, as long as you share your findings with the community!
@@ -52,9 +54,6 @@ Status is a visual interface to make permanent changes on the Blockchain, it han
 - **Evangelism**
 Help us spread the word! Tell a friend *right now*, in fact tell **everyone** - yell from a mountain if you have to, every person counts! If you've got a great story to tell or have some interesting way you've spread the word about Status let us know about it in our [chat](https://join.status.im/chat/public/status)

-## Status API
-View our [API Docs](https://status.im/developer_tools/status_web_api.html) and learn how to integrate your DApp into Status. You can read more about how to add your DApp to Status [here](https://status.im/developer_tools/add_your_dapp.html).
-
 ## Give me Binaries!

 You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/) or by [building it yourself](https://status.im/technical/build_status/).
@@ -68,12 +67,8 @@ Without the dedication of these outstanding individuals, Status would not exist.

 ## Contact us

-Feel free to email us at [support@status.im](mailto:support@status.im) or better yet, [join our chat](https://join.status.im/chat/public/status).
+Feel free to email us at [support@status.im](mailto:support@status.im).

 ## License

 Licensed under the [Mozilla Public License v2.0](https://github.com/status-im/status-mobile/blob/develop/LICENSE.md)
-
-## Testing Supported by
-
-[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)](https://www.browserstack.com/automate/public-build/SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)
@@ -92,12 +92,12 @@ project.ext.react = [
     *       to guard against a hang in the UI thread after invoking status-go.
     * Also a clean and rebuild is required when changing this. */
    enableHermes: !disableHermes,
+    /* Disable 'The first definition was here.' warnings */
+    hermesFlagsRelease: ["-w"],
    /* FIXME: Workaround for crash caused by missing libhermes-executor-release.so.
     * https://github.com/facebook/react-native/issues/32928 */
    deleteDebugFilesForVariant: { false },
    enableVmCleanup: false,
-    /* Disable 'The first definition was here.' warnings */
-    hermesFlagsRelease: ["-w"],
    bundleInPr: true,
    inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
 ]
@@ -137,10 +137,12 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);

 /**
- * Architectures to build native code for in debug.
+ * Architectures to build native code for.
 */
-def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
-
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}

 def getCommitHash = { ->
    if (project.hasProperty("commitHash")) {
@@ -166,12 +168,13 @@ def getVersionCode = { ->

 def getVersionName = { ->
    new ByteArrayOutputStream().withStream { stdOut ->
+        // TODO: probably not used, cleanup
        if (project.hasProperty("releaseVersion")) {
            return project.releaseVersion
        }
        /* Necessary because Android Studio uses wrong PWD.
         * Is actually absolute directory path of this file. */
-        def configDir = project.projectDir.toString() 
+        def configDir = project.projectDir.toString()
        version = new File(configDir + '/../../VERSION').text
        return version.replaceAll("\\s","")
    }
@@ -194,12 +197,12 @@ def getEnvOrConfig = { varName ->

 android {
    ndkVersion rootProject.ext.ndkVersion
-    
+
    compileSdkVersion rootProject.ext.compileSdkVersion

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
    }

    defaultConfig {
@@ -217,7 +220,70 @@ android {
                abiFilters getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
            }
        }
+	buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
+        if (isNewArchitectureEnabled()) {
+            // We configure the NDK build only if you decide to opt-in for the New Architecture.
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "APP_PLATFORM=android-21",
+                        "APP_STL=c++_shared",
+                        "NDK_TOOLCHAIN_VERSION=clang",
+                        "GENERATED_SRC_DIR=$buildDir/generated/source",
+                        "PROJECT_BUILD_DIR=$buildDir",
+                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+                        "NODE_MODULES_DIR=$rootDir/../node_modules"
+                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+                    cppFlags "-std=c++17"
+                    // Make sure this target name is the same you specify inside the
+                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
+                    targets "rndiffapp_appmodules"
+                }
+            }
+        }
    }
+
+       if (isNewArchitectureEnabled()) {
+           // We configure the NDK build only if you decide to opt-in for the New Architecture.
+           externalNativeBuild {
+               ndkBuild {
+                   path "$projectDir/src/main/jni/Android.mk"
+               }
+           }
+           def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+           def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
+               dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
+               from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+               into("$buildDir/react-ndk/exported")
+           }
+           def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
+               dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
+               from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+               into("$buildDir/react-ndk/exported")
+           }
+           afterEvaluate {
+               // If you wish to add a custom TurboModule or component locally,
+               // you should uncomment this line.
+               // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
+               preDebugBuild.dependsOn(packageReactNdkDebugLibs)
+               preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
+
+               // Due to a bug inside AGP, we have to explicitly set a dependency
+               // between configureNdkBuild* tasks and the preBuild tasks.
+               // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
+               configureNdkBuildRelease.dependsOn(preReleaseBuild)
+               configureNdkBuildDebug.dependsOn(preDebugBuild)
+               reactNativeArchitectures().each { architecture ->
+                   tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+                       dependsOn("preDebugBuild")
+                   }
+                   tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+                       dependsOn("preReleaseBuild")
+                   }
+               }
+           }
+       }
    /**
     * Arbitrary project metadata
     * https://docs.gradle.org/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html
@@ -276,11 +342,6 @@ android {
            versionNameSuffix   "-SNAPSHOT"
            resValue "string", "build_config_package", "im.status.ethereum"
            signingConfig signingConfigs.debug
-            if (nativeArchitectures) {
-                ndk {
-                    abiFilters nativeArchitectures.split(',')
-                }
-            }
        }
        release {
            minifyEnabled enableProguardInReleaseBuilds
@@ -324,29 +385,16 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.facebook.soloader:soloader:0.10.1+"
    implementation "com.facebook.react:react-native:+"  // From node_modules
-
+    implementation 'com.facebook.soloader:soloader:0.10.3+'
    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
    implementation "androidx.core:core-splashscreen:1.0.0"

-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.fbjni'
-    }
-    // TODO Uncomment once Flipper does not cause webview crashes in Debug mode
-    // debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-    //      exclude group:'com.facebook.flipper'
-    // }
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
-
    if (enableHermes) {
-      def hermesPath = "../../node_modules/hermes-engine/android/";
-      debugImplementation files(hermesPath + "hermes-debug.aar")
-      releaseImplementation files(hermesPath + "hermes-release.aar")
-      prImplementation files(hermesPath + "hermes-release.aar")
-    } else {
+      //noinspection GradleDynamicVersion
+      implementation("com.facebook.react:hermes-engine:+") { // From node_modules
+          exclude group: 'com.facebook.fbjni' }
+      } else {
      implementation jscFlavor
    }

@@ -364,9 +412,25 @@ dependencies {
    implementation project(':react-native-status')
    implementation project(':react-native-status-keycard')
    implementation 'com.github.status-im:function:0.0.1'
-    implementation 'com.facebook.fresco:fresco:2.2.0'
-    implementation 'com.facebook.fresco:animated-gif:2.2.0'
-    implementation "com.squareup.okhttp3:okhttp-tls:4.9.1"
+    implementation 'com.facebook.fresco:fresco:2.5.0'
+    implementation 'com.facebook.fresco:animated-gif:2.5.0'
+    implementation "com.squareup.okhttp3:okhttp-tls:4.9.2"
+}
+
+if (isNewArchitectureEnabled()) {
+    // If new architecture is enabled, we let you build RN from source
+    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
+    // This will be applied to all the imported transtitive dependency.
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("com.facebook.react:react-native"))
+                     .using(project(":ReactAndroid"))
+                        .because("On New Architecture we're building React Native from source")
+                            substitute(module("com.facebook.react:hermes-engine"))
+                                .using(project(":ReactAndroid:hermes-engine"))
+                                    .because("On New Architecture we're building Hermes from source")
+        }
+    }
 }

 def getLocalNDKDir = { ->
@@ -402,3 +466,11 @@ task hemroidBuild(type: Exec) {
 preBuild.dependsOn hemroidBuild

 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
@@ -8,6 +8,6 @@
    <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>

   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" >
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
    </application>
-</manifest>
+</manifest>
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- */
-package im.status.ethereum;
-
-import android.content.Context;
-import com.facebook.flipper.android.AndroidFlipperClient;
-import com.facebook.flipper.android.utils.FlipperUtils;
-import com.facebook.flipper.core.FlipperClient;
-import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
-import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
-import com.facebook.flipper.plugins.inspector.DescriptorMapping;
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
-// import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
-// import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.network.NetworkingModule;
-import okhttp3.OkHttpClient;
-
-public class ReactNativeFlipper {
-  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
-    if (FlipperUtils.shouldEnableFlipper(context)) {
-      final FlipperClient client = AndroidFlipperClient.getInstance(context);
-
-      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
-      client.addPlugin(new ReactFlipperPlugin());
-      client.addPlugin(new DatabasesFlipperPlugin(context));
-      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
-      client.addPlugin(CrashReporterPlugin.getInstance());
-
-      // TODO Uncomment once Flipper does not cause webview crashes in Debug mode
-      // NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
-      // NetworkingModule.setCustomClientBuilder(
-      //     new NetworkingModule.CustomClientBuilder() {
-      //       @Override
-      //       public void apply(OkHttpClient.Builder builder) {
-      //         builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
-      //       }
-      //     });
-      // client.addPlugin(networkFlipperPlugin);
-      client.start();
-
-      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
-      // Hence we run if after all native modules have been initialized
-      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-      if (reactContext == null) {
-        reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceManager.ReactInstanceEventListener() {
-              @Override
-              public void onReactContextInitialized(ReactContext reactContext) {
-                reactInstanceManager.removeReactInstanceEventListener(this);
-                reactContext.runOnNativeModulesQueueThread(
-                    new Runnable() {
-                      @Override
-                      public void run() {
-                        client.addPlugin(new FrescoFlipperPlugin());
-                      }
-                    });
-              }
-            });
-      } else {
-        client.addPlugin(new FrescoFlipperPlugin());
-      }
-    }
-  }
-}
@@ -44,7 +44,7 @@
                android:theme="@style/Theme.AppSplash"
                android:screenOrientation="portrait"
                android:windowSoftInputMode="adjustResize"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
                android:resizeableActivity="false"
                android:launchMode="singleTask">
            <intent-filter>
@@ -32,6 +32,7 @@ import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 import com.reactnativenavigation.NavigationActivity;
 import com.facebook.react.modules.core.PermissionListener;
 import androidx.core.splashscreen.SplashScreen;
+import com.facebook.react.ReactActivity;

 import java.util.Properties;
 import im.status.ethereum.module.StatusThreadPoolExecutor;
@@ -1,9 +1,9 @@
 package im.status.ethereum;

 import androidx.multidex.MultiDexApplication;
-import android.util.Log;
 import android.content.Context;
 import android.webkit.WebView;
+import im.status.ethereum.newarchitecture.MainApplicationReactNativeHost;
 import java.lang.reflect.InvocationTargetException;
 import com.facebook.react.PackageList;

@@ -14,6 +14,7 @@ import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.modules.network.OkHttpClientProvider;
 import com.reactnativecommunity.blurview.BlurViewPackage;
@@ -38,6 +39,7 @@ public class MainApplication extends NavigationApplication {

        @Override
        protected List<ReactPackage> getPackages() {
+
            StatusPackage statusPackage = new StatusPackage(RootUtil.isDeviceRooted());

            List<ReactPackage> packages = new PackageList(this).getPackages();
@@ -60,48 +62,26 @@ public class MainApplication extends NavigationApplication {
 	}
    };

+    private final ReactNativeHost mNewArchitectureNativeHost = new MainApplicationReactNativeHost(this);
+
    @Override
    public ReactNativeHost getReactNativeHost() {
-        return mReactNativeHost;
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+          return mNewArchitectureNativeHost;
+        } else {
+          return mReactNativeHost;
+        }
    }

    @Override
    public void onCreate() {
        super.onCreate();
+        // If you opted-in for the New Architecture, we enable the TurboModule system
+        ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;

        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());

        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
-        //initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-    }
-    /**
-     * Loads Flipper in React Native templates. Call this in the onCreate method with something like
-     * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-     *
-     * @param context
-     * @param reactInstanceManager
-     */
-    private static void initializeFlipper(
-          Context context, ReactInstanceManager reactInstanceManager) {
-        if (BuildConfig.DEBUG) {
-            try {
-                /*
-                  We use reflection here to pick up the class that initializes Flipper,
-                  since Flipper library is not available in release mode
-                */
-                Class<?> aClass = Class.forName("im.status.ethereum.ReactNativeFlipper");
-                aClass
-                    .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
-                    .invoke(null, context, reactInstanceManager);
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            } catch (NoSuchMethodException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
-            }
-        }
    }
+
 }
@@ -20,25 +20,58 @@ import java.security.cert.X509Certificate;
 import im.status.ethereum.module.StatusPackage;

 class StatusOkHttpClientFactory implements OkHttpClientFactory {
-  public OkHttpClient createNewNetworkModuleClient() {
-    String certPem = StatusPackage.getImageTLSCert();
-    X509Certificate cert;

+  private static final String TAG = "StatusOkHttpClientFactory";
+
+  public OkHttpClient createNewNetworkModuleClient() {
+      X509Certificate cert = null;
+      HandshakeCertificates clientCertificates;
+      String certPem = "";
+
+    // Get TLS PEM certificate from status-go
    try {
+        // induce half second sleep because sometimes a cert is not immediately available
+        // TODO : remove sleep if App no longer crashes on Android 10 devices with
+        // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
+        Thread.sleep(500);
+        certPem = StatusPackage.getImageTLSCert();
+    } catch(Exception e) {
+        Log.e(TAG, "Could not getImageTLSCert",e);
+    }
+    // Convert PEM certificate string to X509Certificate object
+    try {
+      // induce half second sleep because sometimes a cert is not immediately available
+      // TODO : remove sleep if App no longer crashes on Android 10 devices
+      // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
+      Thread.sleep(500);
      CertificateFactory cf = CertificateFactory.getInstance("X.509");
      cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(certPem.getBytes()));
    } catch(Exception e) {
-      Log.e("StatusOkHttpClientFactory", "Could not parse certificate");
-      cert = null;
+      Log.e(TAG, "Could not parse certificate",e);
+    }
+    // Create HandshakeCertificates object with our certificate
+    try {
+      // induce half second sleep because sometimes a cert is not immediately available
+      // TODO : remove sleep if App no longer crashes on Android 10 devices
+      // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
+      Thread.sleep(500);
+      clientCertificates = new HandshakeCertificates.Builder()
+        .addPlatformTrustedCertificates()
+        .addTrustedCertificate(cert)
+        .build();
+    } catch(Exception e) {
+      Log.e(TAG, "Could not build HandshakeCertificates", e);
+      return null;
    }

-    HandshakeCertificates clientCertificates = new HandshakeCertificates.Builder()
-      .addPlatformTrustedCertificates()
-      .addTrustedCertificate(cert)
-      .build();
-
-    return OkHttpClientProvider.createClientBuilder()
-      .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
-      .build();
+    // Create OkHttpClient with custom SSL socket factory and trust manager
+    try {
+       return OkHttpClientProvider.createClientBuilder()
+        .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
+        .build();
+    } catch(Exception e) {
+      Log.e(TAG, "Could not create OkHttpClient", e);
+      return null;
+    }
  }
 }
@@ -0,0 +1,103 @@
+package im.status.ethereum.newarchitecture;
+import android.app.Application;
+import androidx.annotation.NonNull;
+import com.facebook.react.PackageList;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.JSIModulePackage;
+import com.facebook.react.bridge.JSIModuleProvider;
+import com.facebook.react.bridge.JSIModuleSpec;
+import com.facebook.react.bridge.JSIModuleType;
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.react.fabric.CoreComponentsRegistry;
+import com.facebook.react.fabric.FabricJSIModuleProvider;
+import com.facebook.react.fabric.ReactNativeConfig;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import im.status.ethereum.BuildConfig;
+import im.status.ethereum.newarchitecture.components.MainComponentsRegistry;
+import im.status.ethereum.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
+ * TurboModule delegates and the Fabric Renderer.
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationReactNativeHost extends ReactNativeHost {
+  public MainApplicationReactNativeHost(Application application) {
+    super(application);
+  }
+  @Override
+  public boolean getUseDeveloperSupport() {
+    return BuildConfig.DEBUG;
+  }
+  @Override
+  protected List<ReactPackage> getPackages() {
+    List<ReactPackage> packages = new PackageList(this).getPackages();
+    // Packages that cannot be autolinked yet can be added manually here, for example:
+    //     packages.add(new MyReactNativePackage());
+    // TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
+    //     packages.add(new TurboReactPackage() { ... });
+    // If you have custom Fabric Components, their ViewManagers should also be loaded here
+    // inside a ReactPackage.
+    return packages;
+  }
+  @Override
+  protected String getJSMainModuleName() {
+    return "index";
+  }
+  @NonNull
+  @Override
+  protected ReactPackageTurboModuleManagerDelegate.Builder
+      getReactPackageTurboModuleManagerDelegateBuilder() {
+    // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
+    // for the new architecture and to use TurboModules correctly.
+    return new MainApplicationTurboModuleManagerDelegate.Builder();
+  }
+  @Override
+  protected JSIModulePackage getJSIModulePackage() {
+    return new JSIModulePackage() {
+      @Override
+      public List<JSIModuleSpec> getJSIModules(
+          final ReactApplicationContext reactApplicationContext,
+          final JavaScriptContextHolder jsContext) {
+        final List<JSIModuleSpec> specs = new ArrayList<>();
+        // Here we provide a new JSIModuleSpec that will be responsible of providing the
+        // custom Fabric Components.
+        specs.add(
+            new JSIModuleSpec() {
+              @Override
+              public JSIModuleType getJSIModuleType() {
+                return JSIModuleType.UIManager;
+              }
+              @Override
+              public JSIModuleProvider<UIManager> getJSIModuleProvider() {
+                final ComponentFactory componentFactory = new ComponentFactory();
+                CoreComponentsRegistry.register(componentFactory);
+                // Here we register a Components Registry.
+                // The one that is generated with the template contains no components
+                // and just provides you the one from React Native core.
+                MainComponentsRegistry.register(componentFactory);
+                final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
+                ViewManagerRegistry viewManagerRegistry =
+                    new ViewManagerRegistry(
+                        reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
+                return new FabricJSIModuleProvider(
+                    reactApplicationContext,
+                    componentFactory,
+                    ReactNativeConfig.DEFAULT_CONFIG,
+                    viewManagerRegistry);
+              }
+            });
+        return specs;
+      }
+    };
+  }
+}
@@ -0,0 +1,30 @@
+package im.status.ethereum.newarchitecture.components;
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.soloader.SoLoader;
+/**
+ * Class responsible to load the custom Fabric Components. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+@DoNotStrip
+public class MainComponentsRegistry {
+  static {
+    SoLoader.loadLibrary("fabricjni");
+  }
+  @DoNotStrip private final HybridData mHybridData;
+  @DoNotStrip
+  private native HybridData initHybrid(ComponentFactory componentFactory);
+  @DoNotStrip
+  private MainComponentsRegistry(ComponentFactory componentFactory) {
+    mHybridData = initHybrid(componentFactory);
+  }
+  @DoNotStrip
+  public static MainComponentsRegistry register(ComponentFactory componentFactory) {
+    return new MainComponentsRegistry(componentFactory);
+  }
+}
@@ -0,0 +1,40 @@
+package im.status.ethereum.newarchitecture.modules;
+import com.facebook.jni.HybridData;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.soloader.SoLoader;
+import java.util.List;
+/**
+ * Class responsible to load the TurboModules. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationTurboModuleManagerDelegate
+    extends ReactPackageTurboModuleManagerDelegate {
+  private static volatile boolean sIsSoLibraryLoaded;
+  protected MainApplicationTurboModuleManagerDelegate(
+      ReactApplicationContext reactApplicationContext, List<ReactPackage> packages) {
+    super(reactApplicationContext, packages);
+  }
+  protected native HybridData initHybrid();
+  native boolean canCreateTurboModule(String moduleName);
+  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
+    protected MainApplicationTurboModuleManagerDelegate build(
+        ReactApplicationContext context, List<ReactPackage> packages) {
+      return new MainApplicationTurboModuleManagerDelegate(context, packages);
+    }
+  }
+  @Override
+  protected synchronized void maybeLoadOtherSoLibraries() {
+    if (!sIsSoLibraryLoaded) {
+      // If you change the name of your application .so file in the Android.mk file,
+      // make sure you update the name here as well.
+      SoLoader.loadLibrary("status-im_appmodules");
+      sIsSoLibraryLoaded = true;
+    }
+  }
+}
@@ -0,0 +1,39 @@
+THIS_DIR := $(call my-dir)
+include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to include the following autogenerated makefile.
+# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
+include $(CLEAR_VARS)
+LOCAL_PATH := $(THIS_DIR)
+# You can customize the name of your application .so file here.
+LOCAL_MODULE := rndiffapp_appmodules
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to uncomment those lines to include the generated source
+# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
+#
+# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
+# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# Here you should add any native library you wish to depend on.
+LOCAL_SHARED_LIBRARIES := \
+  libfabricjni \
+  libfbjni \
+  libfolly_runtime \
+  libglog \
+  libjsi \
+  libreact_codegen_rncore \
+  libreact_debug \
+  libreact_nativemodule_core \
+  libreact_render_componentregistry \
+  libreact_render_core \
+  libreact_render_debug \
+  libreact_render_graphics \
+  librrc_view \
+  libruntimeexecutor \
+  libturbomodulejsijni \
+  libyoga
+LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
+include $(BUILD_SHARED_LIBRARY)
@@ -0,0 +1,20 @@
+#include "MainApplicationModuleProvider.h"
+#include <rncore.h>
+namespace facebook {
+namespace react {
+std::shared_ptr<TurboModule> MainApplicationModuleProvider(
+    const std::string moduleName,
+    const JavaTurboModule::InitParams &params) {
+  // Here you can provide your own module provider for TurboModules coming from
+  // either your application or from external libraries. The approach to follow
+  // is similar to the following (for a library called `samplelibrary`:
+  //
+  // auto module = samplelibrary_ModuleProvider(moduleName, params);
+  // if (module != nullptr) {
+  //    return module;
+  // }
+  // return rncore_ModuleProvider(moduleName, params);
+  return rncore_ModuleProvider(moduleName, params);
+}
+} // namespace react
+} // namespace facebook
@@ -0,0 +1,11 @@
+#pragma once
+#include <memory>
+#include <string>
+#include <ReactCommon/JavaTurboModule.h>
+namespace facebook {
+namespace react {
+std::shared_ptr<TurboModule> MainApplicationModuleProvider(
+    const std::string moduleName,
+    const JavaTurboModule::InitParams &params);
+} // namespace react
+} // namespace facebook
@@ -0,0 +1,38 @@
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainApplicationModuleProvider.h"
+namespace facebook {
+namespace react {
+jni::local_ref<MainApplicationTurboModuleManagerDelegate::jhybriddata>
+MainApplicationTurboModuleManagerDelegate::initHybrid(
+    jni::alias_ref<jhybridobject>) {
+  return makeCxxInstance();
+}
+void MainApplicationTurboModuleManagerDelegate::registerNatives() {
+  registerHybrid({
+      makeNativeMethod(
+          "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
+      makeNativeMethod(
+          "canCreateTurboModule",
+          MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
+  });
+}
+std::shared_ptr<TurboModule>
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+    const std::string name,
+    const std::shared_ptr<CallInvoker> jsInvoker) {
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
+}
+std::shared_ptr<TurboModule>
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+    const std::string name,
+    const JavaTurboModule::InitParams &params) {
+  return MainApplicationModuleProvider(name, params);
+}
+bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
+    std::string name) {
+  return getTurboModule(name, nullptr) != nullptr ||
+      getTurboModule(name, {.moduleName = name}) != nullptr;
+}
+} // namespace react
+} // namespace facebook
@@ -0,0 +1,30 @@
+#include <memory>
+#include <string>
+#include <ReactCommon/TurboModuleManagerDelegate.h>
+#include <fbjni/fbjni.h>
+namespace facebook {
+namespace react {
+class MainApplicationTurboModuleManagerDelegate
+    : public jni::HybridClass<
+          MainApplicationTurboModuleManagerDelegate,
+          TurboModuleManagerDelegate> {
+ public:
+  // Adapt it to the package you used for your Java class.
+  static constexpr auto kJavaDescriptor =
+      "Lcom/rndiffapp/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
+  static void registerNatives();
+  std::shared_ptr<TurboModule> getTurboModule(
+      const std::string name,
+      const std::shared_ptr<CallInvoker> jsInvoker) override;
+  std::shared_ptr<TurboModule> getTurboModule(
+      const std::string name,
+      const JavaTurboModule::InitParams &params) override;
+  /**
+   * Test-only method. Allows user to verify whether a TurboModule can be
+   * created by instances of this class.
+   */
+  bool canCreateTurboModule(std::string name);
+};
+} // namespace react
+} // namespace facebook
@@ -0,0 +1,48 @@
+#include "MainComponentsRegistry.h"
+#include <CoreComponentsRegistry.h>
+#include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/components/rncore/ComponentDescriptors.h>
+namespace facebook {
+namespace react {
+MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
+std::shared_ptr<ComponentDescriptorProviderRegistry const>
+MainComponentsRegistry::sharedProviderRegistry() {
+  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
+  // Custom Fabric Components go here. You can register custom
+  // components coming from your App or from 3rd party libraries here.
+  //
+  // providerRegistry->add(concreteComponentDescriptorProvider<
+  //        AocViewerComponentDescriptor>());
+  return providerRegistry;
+}
+jni::local_ref<MainComponentsRegistry::jhybriddata>
+MainComponentsRegistry::initHybrid(
+    jni::alias_ref<jclass>,
+    ComponentFactory *delegate) {
+  auto instance = makeCxxInstance(delegate);
+  auto buildRegistryFunction =
+      [](EventDispatcher::Weak const &eventDispatcher,
+         ContextContainer::Shared const &contextContainer)
+      -> ComponentDescriptorRegistry::Shared {
+    auto registry = MainComponentsRegistry::sharedProviderRegistry()
+                        ->createComponentDescriptorRegistry(
+                            {eventDispatcher, contextContainer});
+    auto mutableRegistry =
+        std::const_pointer_cast<ComponentDescriptorRegistry>(registry);
+    mutableRegistry->setFallbackComponentDescriptor(
+        std::make_shared<UnimplementedNativeViewComponentDescriptor>(
+            ComponentDescriptorParameters{
+                eventDispatcher, contextContainer, nullptr}));
+    return registry;
+  };
+  delegate->buildRegistryFunction = buildRegistryFunction;
+  return instance;
+}
+void MainComponentsRegistry::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
+  });
+}
+} // namespace react
+} // namespace facebook
@@ -0,0 +1,24 @@
+#pragma once
+#include <ComponentFactory.h>
+#include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+namespace facebook {
+namespace react {
+class MainComponentsRegistry
+    : public facebook::jni::HybridClass<MainComponentsRegistry> {
+ public:
+  // Adapt it to the package you used for your Java class.
+  constexpr static auto kJavaDescriptor =
+      "Lcom/rndiffapp/newarchitecture/components/MainComponentsRegistry;";
+  static void registerNatives();
+  MainComponentsRegistry(ComponentFactory *delegate);
+ private:
+  static std::shared_ptr<ComponentDescriptorProviderRegistry const>
+  sharedProviderRegistry();
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass>,
+      ComponentFactory *delegate);
+};
+} // namespace react
+} // namespace facebook
@@ -0,0 +1,10 @@
+#include <fbjni/fbjni.h>
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainComponentsRegistry.h"
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    facebook::react::MainApplicationTurboModuleManagerDelegate::
+        registerNatives();
+    facebook::react::MainComponentsRegistry::registerNatives();
+  });
+}
@@ -1,16 +1,21 @@
+import org.apache.tools.ant.taskdefs.condition.Os
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 /**
 * Project-wide gradle configuration properties for use by all modules
 */
 ext {
-    RNNKotlinVersion    = "1.4.31"
+    // kotlin_version is needed for react-native-camera-kit library
+    kotlin_version      = project.kotlinVersion
+    RNNKotlinVersion    = "1.6.20"
+    RNGH_kotlinVersion  = "1.6.20"
    buildToolsVersion   = project.buildToolsVersion
    minSdkVersion       = Integer.valueOf(project.minSdkVersion)
    compileSdkVersion   = Integer.valueOf(project.compileSdkVersion)
    targetSdkVersion    = Integer.valueOf(project.targetSdkVersion)
    supportLibVersion   = project.supportLibVersion
    gradlePluginVersion = project.gradlePluginVersion
+    kotlinPluginVersion = project.kotlinPluginVersion

    if (System.properties['os.arch'] == "aarch64") {
        // For M1 Users we need to use the NDK 24 which added support for aarch64
@@ -29,8 +34,10 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinPluginVersion}"
        classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}"
+        classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("de.undercouch:gradle-download-task:5.0.1")
        // WARNING: Do not place your application dependencies here!
        //          They belong in the individual module build.gradle files.
    }
@@ -59,6 +66,20 @@ allprojects {
    }

    repositories {
+        exclusiveContent {
+           // We get React Native's Android binaries exclusively through npm,
+           // from a local Maven repo inside node_modules/react-native/.
+           // (The use of exclusiveContent prevents looking elsewhere like Maven Central
+           // and potentially getting a wrong version.)
+           filter {
+               includeGroup "com.facebook.react"
+           }
+           forRepository {
+               maven {
+                   url "$rootDir/../node_modules/react-native/android"
+               }
+           }
+        }
        mavenLocal()
        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
        maven { url("$rootDir/../node_modules/react-native/android") }
@@ -70,6 +91,7 @@ allprojects {
        google()
        jcenter() // Required for @react-native-community/blur:3.6.1, can be removed after updating to 3.6.1+
        mavenCentral()
-        maven { url "https://www.jitpack.io" }
+        //         maven { url "https://www.jitpack.io" }
+        maven { url 'https://mvnrepository.com/artifact/com.github.gundy/semver4j'}
    }
 }
@@ -21,14 +21,15 @@
 # $keytool -genkey -v -keystore ./status-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias status

 # Version requirements used throughout the Gradle scripts
-kotlinVersion=1.3.50
+kotlinVersion=1.6.20
 minSdkVersion=23
 compileSdkVersion=31
 targetSdkVersion=31
-buildToolsVersion=30.0.0
+buildToolsVersion=31.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
-gradlePluginVersion=4.1.0
+gradlePluginVersion=7.2.2
+kotlinPluginVersion=1.6.20

 android.useAndroidX=true
 android.enableJetifier=true
@@ -48,5 +49,9 @@ org.gradle.jvmargs=-Xmx8704M
 versionCode=9999
 commitHash=unknown

-# Flipper
-FLIPPER_VERSION=0.54.0
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=false
@@ -20,3 +20,10 @@ include ':react-native-status-keycard'
 project(':react-native-status-keycard').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-status-keycard/android')
 include ':react-native-blur'
 project(':react-native-blur').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/blur/android')
+includeBuild('../node_modules/react-native-gradle-plugin')
+if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
+    include(":ReactAndroid")
+    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
+    include(":ReactAndroid:hermes-engine")
+    project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
+}
@@ -1,4 +1,4 @@
 {
  "name": "StatusIm",
  "displayName": "StatusIm"
-}
+}
@@ -1,24 +1,19 @@
 module.exports = {
-
-    "presets": [
-        "module:metro-react-native-babel-preset"
-    ],
-    "plugins": [
-        "react-native-reanimated/plugin"
-    ],
-    "env": {
-        "test": {
-            "presets": [
-                '@babel/preset-react',
-                [
-                    '@babel/preset-env',
-                    {
-                        targets: {
-                            node: '14',
-                        },
-                    },
-                ],
-            ],
-        }
-    }
-}
+  presets: ['module:metro-react-native-babel-preset'],
+  plugins: ['react-native-reanimated/plugin'],
+  env: {
+    test: {
+      presets: [
+        '@babel/preset-react',
+        [
+          '@babel/preset-env',
+          {
+            targets: {
+              node: '14',
+            },
+          },
+        ],
+      ],
+    },
+  },
+};
@@ -1,10 +1,11 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

 pipeline {
-  agent { label 'linux && x86_64 && nix-2.11' }
+  agent { label 'linux && x86_64 && nix-2.14' }

  options {
    timestamps()
@@ -1,4 +1,5 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 pipeline {
  agent { label 'linux' }
@@ -8,8 +9,6 @@ pipeline {
    disableConcurrentBuilds()
    /* Prevent Jenkins jobs from running forever */
    timeout(time: 40, unit: 'MINUTES')
-    /* Allow copying of artifacts from this job. */
-    copyArtifactPermission('/status-mobile/e2e/*')
    /* Limit builds retained */
    buildDiscarder(logRotator(
      numToKeepStr: '10',
@@ -48,9 +47,6 @@ pipeline {
        stage('Android') { steps { script {
          apk = jenkins.Build('status-mobile/platforms/android')
        } } }
-        stage('Android e2e') { steps { script {
-          apke2e = jenkins.Build('status-mobile/platforms/android-e2e')
-        } } }
        stage('Tests') { steps { script {
          jenkins.Build('status-mobile/platforms/tests')
        } } }
@@ -60,9 +56,7 @@ pipeline {
      steps { script {
        sh('rm -f pkg/*')
        jenkins.copyArts(ios)
-        //jenkins.copyArts(iose2e)
        jenkins.copyArts(apk)
-        jenkins.copyArts(apke2e)
        sha = "pkg/${utils.pkgFilename(ext: 'sha256')}"
        dir('pkg') {
          /* generate sha256 checksums for upload */
@@ -76,8 +70,8 @@ pipeline {
        /* object for easier URLs handling */
        urls = [
          /* mobile */
-          Apk: utils.pkgUrl(apk), Apke2e: utils.pkgUrl(apke2e),
-          iOS: utils.pkgUrl(ios), /*iOSe2e: utils.pkgUrl(iose2e),*/
+          Apk: utils.pkgUrl(apk),
+          iOS: utils.pkgUrl(ios),
          Diawi: utils.getEnv(ios, 'DIAWI_URL'),
          /* upload the sha256 checksums file too */
          SHA: s3.uploadArtifact(sha),
@@ -101,17 +95,6 @@ pipeline {
        }
      } }
    }
-    stage('Run e2e') {
-      when { expression { btype == 'nightly' && params.PUBLISH } }
-      steps { script {
-        e2eApk = utils.getEnv(apke2e, 'SAUCE_URL')
-        build(
-          job: 'status-mobile/e2e/status-app-nightly',
-          parameters: [string(name: 'APK_URL', value: e2eApk)],
-          wait: false
-        )
-      } }
-    }
  }
 }

@@ -0,0 +1,51 @@
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'
+
+pipeline {
+  agent { label 'linux' }
+
+  triggers {
+    // Nightly at 2am
+    cron 'H 2 * * *'
+  }
+
+  parameters {
+    string(
+      name: 'BRANCH',
+      description: 'Name of the branch to checkout and build.',
+      defaultValue: 'develop',
+    )
+  }
+
+  options {
+    timestamps()
+    disableConcurrentBuilds()
+    buildDiscarder(logRotator(
+      numToKeepStr: '10',
+      daysToKeepStr: '30',
+    ))
+  }
+
+  stages {
+    stage('Build') {
+      steps {
+        script {
+          apk_build = jenkins.Build('status-mobile/platforms/android-e2e')
+          apk_build_number = apk_build.getNumber().toString()
+        }
+      }
+    }
+    stage('Run e2e') {
+      steps {
+        build(
+          job: 'status-mobile/e2e/status-app-nightly',
+          parameters: [
+            string(name: 'APK_BUILD_NUMBER', value: apk_build_number),
+            string(name: 'BRANCH', value: env.BRANCH),
+          ]
+        )
+      }
+    }
+  }
+}
+
@@ -1,10 +1,11 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

 pipeline {
-  agent { label 'macos && arm64 && nix-2.11 && xcode-14.3' }
+  agent { label 'macos && arm64 && nix-2.14 && xcode-14.3' }

  parameters {
    string(
@@ -63,7 +64,9 @@ pipeline {
        script { api = ios.bundle() }
      }
      post {
-        failure { archiveArtifacts 'ios/logs/*' }
+        failure {
+          archiveArtifacts 'ios/logs/*'
+        }
      }
    }
    stage('Parallel Upload') {
@@ -1,10 +1,11 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

 pipeline {
-  agent { label 'linux && x86_64 && nix-2.11' }
+  agent { label 'linux && x86_64 && nix-2.14' }

  options {
    timestamps()
@@ -1,4 +1,5 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 pipeline {

@@ -6,14 +7,24 @@ pipeline {

  parameters {
    string(
-      name: 'APK_URL',
-      description: 'URL of APK uploaded to SauceLabs.',
+      name: 'APK_BUILD_NUMBER',
+      description: 'platform/e2e build number for apk artifact',
    )
    string(
      name: 'KEYWORD_EXPRESSION',
      description: 'This will run tests which contain names that match the given string expression  (Optional)',
      defaultValue: '',
    )
+    string(
+      name: 'BRANCH',
+      description: 'Name of the branch to checkout and build.',
+      defaultValue: 'develop',
+    )
+    string(
+      name: 'TR_CASE_IDS',
+      description: 'IDs of the TestRail case, separated by a comma (Optional)',
+      defaultValue: '',
+    )
  }

  options {
@@ -22,15 +33,14 @@ pipeline {

  stages {
    stage('Fetch') {
-      when { expression { !params.APK_URL } }
      steps { script {
        copyArtifacts(
-          projectName: "status-mobile/nightly",
-          filter: '*-x86.apk',
-          /* WARNING: This copies the latest available artifact. */
-          selector: lastWithArtifacts(),
+          projectName: "status-mobile/platforms/android-e2e",
+          filter: 'result/*-x86.apk',
+          selector: specific(env.APK_BUILD_NUMBER),
        )
-        apk_path = "${env.WORKSPACE}/${utils.findFile('*-x86.apk')}"
+        apk_path = "${env.WORKSPACE}/${utils.findFile('result/*-x86.apk')}"
+
      } }
    }

@@ -73,7 +83,7 @@ pipeline {
            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
            sh """
              python3 -m pytest \
-                --numprocesses 4 \
+                --numprocesses 6 \
                --rerun_count=2 \
                --testrail_report=True \
                -m testrail_id \
@@ -1,4 +1,5 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 pipeline {

@@ -122,7 +123,7 @@ pipeline {
            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
            sh """
              python3 -m pytest \
-                --numprocesses 4 \
+                --numprocesses 6 \
                --rerun_count=2 \
                --testrail_report=True \
                -k \"${params.KEYWORD_EXPRESSION}\" \
@@ -1,4 +1,5 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 pipeline {

@@ -1,4 +1,5 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

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

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -28,7 +29,7 @@ pipeline {
    timestamps()
    disableConcurrentBuilds()
    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 300, unit: 'MINUTES')
+    timeout(time: 120, unit: 'MINUTES')
    /* Limit builds retained */
    buildDiscarder(logRotator(
      numToKeepStr: '20',
@@ -41,18 +42,19 @@ pipeline {
      steps { script {
        nix.shell('nix-env -i openssh', sandbox: false, pure: false)
        /* some build targets don't build on MacOS */
-        uname = sh(script: 'uname', returnStdout: true)
+        os = sh(script: 'uname', returnStdout: true)
+        arch = sh(script: 'arch', returnStdout: true)
      } }
    }
    stage('Build status-go') {
      steps { script {
-        def platforms = ['mobile.android', 'mobile.ios']
-        if (uname != "Darwin") {
-          platforms.removeAll { it == "ios" }
-        }
+        def platforms = ['mobile.android', 'mobile.ios', 'library']
+        if (os != 'Darwin')  { platforms.removeAll { it == 'mobile.ios' } }
+        /* FIXME: Remove this when #16237 is merged. */
+        if (arch == 'arm64') { platforms.removeAll { it == 'mobile.android' } }
        platforms.each { os ->
          nix.build(
-            attr: "targets.status-go.${os}.buildInputs",
+            attr: "targets.status-go.${os}",
            sandbox: false,
            link: false
          )
@@ -83,12 +85,16 @@ pipeline {
    }
    stage('Build nix shell deps') {
      steps { script {
+        def shells = ['android', 'ios', 'fastlane', 'keytool', 'clojure', 'gradle']
+        if (os != "Darwin") { shells.removeAll { it == 'ios' } }
        /* Build/fetch deps required to start default Nix shell. */
-        nix.build(
-          attr: 'shells.default.buildInputs',
-          sandbox: false,
-          link: false
-        )
+        shells.each { shell ->
+          nix.build(
+            attr: "shells.${shell}.buildInputs",
+            sandbox: false,
+            link: false
+          )
+        }
      } }
    }
    stage('Upload') {
@@ -1,4 +1,5 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 pipeline {
  agent { label 'linux' }
@@ -1,3 +1,4 @@
+#!/usr/bin/env groovy
 /**
 * This job runs daily and executes `pod repo update` on MacOS
 * This is done to avoid issues with out of date repo causing errors like:
@@ -1,4 +1,5 @@
-library 'status-jenkins-lib@v1.7.9'
+#!/usr/bin/env groovy
+library 'status-jenkins-lib@v1.7.12'

 pipeline {
  agent {
@@ -16,10 +16,15 @@

 [Merging PR process](merging-pr-process.md)

+[PR Review Policy](pr-review-policy.md)
+
 [Working on PR together with QA team](pipeline_process.md)

 [Debugging](debugging.md)

+[Patching](patching.md)
+
+[Creating a pixel perfect UI](pixel-perfection.md)

 ## Testing

@@ -45,4 +45,4 @@ The `State` field in the Pivotal story is used to track the progress of a Pivota
  | 5 points | 2 - 3 days       |
  | 8 points | ~1 week          |

-  We should avoid 8 point stories by breaking them down into smaller stories as much as possible.
+  We should avoid 8 point stories by breaking them down into smaller stories as much as possible.
@@ -0,0 +1,29 @@
+# 0014. Team-structure
+
+| Date | Tags |
+|---|---|
+| 2023-06-16 | wallet team |
+
+## Status
+
+Proposed
+
+## Context:
+
+In order to try out vertical team, which is a structure that is wanted by the company, we will be creating a wallet team within the mobile team.
+Some member of the mobile team will join the current wallet team, which is composed by developers from desktop and lead by @alaibe, on a voluntary basis.
+The responsibilities of the team are to implement the new wallet UI, with the support of the current wallet team, which will be assisting with the status-go work.
+
+## Decision
+
+The team members for the initial wallet team are:
+
+- @rasom
+- @OmarBasem
+- @vkjr
+- @J-Son89
+- @briansztamfater
+- @smohamedjavid
+- @ulisesmac
+- @erikseppanen
+- @mmilad75
@@ -0,0 +1,46 @@
+# 0015. Team-structure
+
+| Date | Tags |
+|---|---|
+| 2023-06-16 | changes in team structure |
+
+## Status
+
+Proposed/partially implemented
+
+## Context:
+
+Currently, there is only a single team lead in the mobile development team, and after a meeting with the design team, it has been identified that the mobile app lacks polishness. One of the main issues identified is a lack of oversight in certain areas. To address this problem, it has been decided to create an additional role within the team. For each section of the mobile app (communities, syncing & onboarding, activity center & shell, wallet, messaging), a person will be selected to fulfill the responsibilities outlined below.
+
+## Decision
+
+The decision is to create an additional role within the mobile development team for each section. The individuals selected for these roles will have the following responsibilities:
+
+- Ensure GitHub issues are created for new features/designs of the section.
+- Ensure issues are adequately described and linked as best as possible.
+- Ensure issues have a grooming session where other developers can provide their feedback before working on the set of issues.
+- Ensure all relevant parties are invited, such as designers, QA, Product Owner, leads, etc., as needed (including the designer who created the feature).
+- Ensure there is consensus among the developers working on the section about the decided strategy approach. Ideally, this consensus should be documented.
+- Ensure UI quality by organizing designer reviews and guaranteeing pixel perfection.
+- Ensure overall implementation is satisfactory based on the predefined requirements.
+- Ensure alignment between desktop, web, and mobile versions for the respective section in collaboration with the mobile developers and design team.
+- Act as a point of contact for the design team with respect to the section.
+- Ensure that someone goes through the designs once they are created with the respective designer.
+- Assist the design team with technical feasibility analysis and address any product concerns.
+- Facilitate the growth of the next team member into the role.
+
+The people identified for each sections are as follow:
+
+- Messaging @flexsurfer, followed by @alwx
+- Syncing & Onboarding @siddarthkay
+- Communities @ilmotta, followed by @ajayesivan
+- Activity Center & Shell @J-Son89, followed by @Parveshdhull
+- Wallet (once the vertical team is created) @J-Son89, followed by @briansztamfater
+
+This will be a rotating post, every 4 months it will go to the next in line.
+
+The wallet team might have longer times for rotation, as stability might be more important. That's still to be decided.
+
+# Follow-up Actions
+
+- Find suitable next in line for Messaging, Onboarding, Communities
@@ -169,7 +169,7 @@ For VS Code users.
 ### Start and connect the REPL

 1. Open the `status-mobile` folder.
-1. Start [Status development](STARTING_GUIDE.md#development) (Starting the `run-clojure` and `run-metro` jobs in split view in the VS Code integrated terminal works great.)
+1. Start [Status development](starting-guide.md#development) (Starting the `run-clojure` and `run-metro` jobs in split view in the VS Code integrated terminal works great.)
 1. Run the VS Code command: **Calva: Connect to a running REPL Server in the project**
   1. Select the project type `shadow-cljs`
   1. Accept the suggested connection `host:port`
@@ -5,6 +5,7 @@
 3) Address feedback
 4) Make sure builds and tests are green (run `make test` locally, `make lint-fix` to fix any indentation issue and `make lint`)
 5) Once the PR has been reviewed by the dev team you can run e2e tests on it by going to https://github.com/status-im/status-mobile/projects/7 and move the pr under the column E2E tests. This will trigger tests.
+   1) Read our [PR Review Policy](pr-review-policy.md) for more details on our approach to PR reviews.
 6) Once e2e tests have run, they will report the result on the PR, if it's less than 100%, ask QA to take a look to make sure everything is in order (some might fail for legitimate reasons)
 7) Ask QA for manual testing if the PR requires it
 8) Once it has been tested successfully, squash everything into one commit. rebase and merge. The commands we use:
@@ -39,7 +40,9 @@ In practice, this means that sometimes they need to be merged in lockstep.
  git push origin vx.y.z
 ```
 5) Update status-mobile with the new status-go version, using the new tag `scripts/update-status-go.sh "vx.y.z"`
-6) In status-mobile, push, rebase against `develop` and merge it 🚀
+6) If you had to rebase status-go to include new changes, e2e test MUST be re-run. If there's any issue you will
+   have to fix in status-go with another PR and follow the same process.
+7) In status-mobile, push, rebase against `develop` and merge it 🚀


 important note : make sure your status-go PRs get a tested-ok by QA before merging them in. 
@@ -1,8 +1,9 @@
 # Code Style Guidelines

->The goal of this document is to help all contributors (core and external) to
->write code in _unison_ and help establish good practices that serve the Status
->Mobile contributors well.
+> [!IMPORTANT]
+> The goal of this document is to help all contributors (core and external) to
+> write code in _unison_ and help establish good practices that serve the Status
+> Mobile contributors well.

 We don't want to turn this document into an exhaustive list of rules to be
 followed that nobody will read. As much as possible, we'll try to document only
@@ -10,35 +11,28 @@ what we consider important for Status Mobile. In other words, we don't want to
 maintain a general Clojure convention/style guide, nor do we want to turn this
 document into a long tutorial.

-This is a **work in progress**, and not all conventions are properly implemented
-in the codebase yet. The project structure is also going over major changes (as
-of Nov/2022), and it'll take a considerable amount of time until we migrate the
-existing code to the new structure.
+> [!WARNING]
+> This is a **work in progress**, and not all conventions are properly
+> implemented in the codebase yet. The project structure is also undergoing
+> major changes, and it will take a considerable amount of time until we migrate
+> the existing code to the new structure.

 If you find out anything is outdated or missing, please, share with us or even
 better, create a pull-request! 🤸

 ## Style guide

-We mostly follow the [Clojure Style
-Guide](https://github.com/bbatsov/clojure-style-guide), so it's recommended to
-get familiar with it.
-
-As of Nov/2022, running `make lint` should fix the most basic formatting issues,
-and we are in the process of integrating a tool to format non-trivial code
-according to the Clojure Style Guide. This should greatly reduce noise in
-pull-request reviews and it'll simplify the life of all contributors.
-
-Pay special attention to:
-
- Align let bindings https://github.com/bbatsov/clojure-style-guide#bindings-alignment
- Align map keys https://github.com/bbatsov/clojure-style-guide#map-keys-alignment
+We follow the [Clojure Style
+Guide](https://github.com/bbatsov/clojure-style-guide) and we use
+[zprint](https://github.com/kkinnear/zprint) to format Clojure code. Running
+`make lint-fix` should fix most formatting issues, but not all of them.

 ## Dos and don'ts

 ### Hiccup

-Never use anonymous inline function in hiccup, this will lead to reinitialization of component on each render of parent component
+Never use anonymous inline function in hiccup, this will lead to
+reinitialization of component on each render of parent component.

 ```clojure
 ;; bad
@@ -57,7 +51,7 @@ Never use anonymous inline function in hiccup, this will lead to reinitializatio
   [comp]])
 ```

-This mistake mostly happens with functional components
+This mistake mostly happens with functional components.

 ```clojure
 ;; bad
@@ -71,14 +65,70 @@ This mistake mostly happens with functional components
 ;; good
 (defn f-comp [atom]
 [rn/text atom])
-         
+
 (fn []
 (let [atom (rf/sub [:sub])]
   (fn []
-     [:f> f-comp atom]))) 
+     [:f> f-comp atom])))
 ```

-it's important to name functional components with `f-` prefix
+It's important to name functional components with `f-` prefix.
+
+### Component props and API scheme to match Figma as closely as possible
+
+Ideally, the prop names for components (particularly in quo2 Design System)
+should match the Figma properties as best as possible. This makes it easier for
+the developer using that component to configure it correctly for the screen it
+is being used on and avoids unnecessary overwrites and adjustments being made.
+
+#### Avoid unnecessarily grouping categories to reduce the number of props
+
+For example in Figma if there is a component and it has the following variants:
+
+|theme: "light" blur: "False"|theme: "dark" blur: "False"|theme: "light" blur: "True"|theme: "dark"  blur: "True"|
+|----------------------------|---------------------------|---------------------------|---------------------------|
+| type :neutral label "ABC"  | type :neutral label "ABC" |                           |                           |
+| type :active  label "ABC"  | type :active  label "ABC" |                           |                           |
+| type :danger  label "ABC"  | type :danger  label "ABC" | type :danger label "ABC"  | type :danger label "ABC"  |
+
+```clojure
+;; bad
+"theme - :light or :dark
+type - can be :neutral :active :danger :danger-blur"
+(defn my-component [{:keys [theme type]} label])
+
+;; good
+"theme - :light or :dark
+ type - can be :neutral :active :danger
+ blur? - boolean
+"
+(defn my-component [{:keys [theme blur? type]} label])
+```
+
+Please note this is only for the external API of the component and there should
+be no restriction of how the component manages its internal API as that will not
+affect the developer using the component with the issues described above.
+
+In some cases this is not always possible or does not make sense. However the
+thought process should be how easy will it be for another developer to use this
+component with the correct configuration given the screen designs for Figma.
+
+#### Avoid unnecessarily renaming props
+
+In general it can be helpful to avoid renaming props from their counterpart in
+Figma.
+
+For example if Figma has sizes `:small`, `:medium` and `:large`
+
+```clojure
+;; bad
+":size - :little, :default or :big"
+(defn my-component [{:keys [size]}])
+
+;; good
+":size - :small, :medium or :large"
+(defn my-component [{:keys [size]}])
+```

 ### Component styles

@@ -107,7 +157,7 @@ the source file. For a real example, see

 ### Always add styles inside the `:style` key

-Although when compiling ReactNative for mobile some components are able work with 
+Although when compiling ReactNative for mobile some components are able work with
 their styles in the top-level of the properties map, prefer to add them inside the
 `:style` key in order to separate styles from properties:

@@ -126,12 +176,11 @@ their styles in the top-level of the properties map, prefer to add them inside t
            :on-press #(js/alert "Hi!")
            :title    "Button"}]

-;; better 
+;; better
 ;; (define them in a style ns & place them inside `:style` key)
 [rn/button {:style    (style/button)
            :on-press #(js/alert "Hi!")
-            :title    "Button"}
- ]
+            :title    "Button"}]
 ```

 Also its fine to keep one liner styles in view
@@ -143,7 +192,7 @@ Also its fine to keep one liner styles in view

 ### Don't define properties in styles ns

-Properties must be set on view level 
+Properties must be set on view level

 ```clojure
 ;; bad
@@ -163,10 +212,8 @@ Properties must be set on view level
 :bottom           0}
 ```

-
 ### Apply animated styles in the style file

-
 ```clojure
 ;; bad
 (defn circle
@@ -199,24 +246,37 @@ Joshua Comeau.
 [rn/view {:style {:padding-horizontal 20}}]
 ```

-### Don't prepend booleans with is-
+### Use a question mark to convey the value is a boolean

-It is a common practice in JavaScript and other languages to prepend boolean variable names with `is-*`. 
-In ClojureScript it is common practice to suffix boolean variable names with a `?`. 
-There is no need for both of these and so it is preferable to stick with the latter.
+The Clojure Style Guide suggests using a question mark only in [predicate
+functions](https://guide.clojure.style/#naming-predicates), but nothing is
+mentioned about other symbols and keywords. We prefer to extend the convention
+to all boolean references.

 ```clojure
 ;; bad
 (let [is-open? true] ...)
+(def flag-is-enabled false)

 ;; good
 (let [open? true] ...)
+(def flag-enabled? false)
+```
+
+And for keywords too:
+
+```clojure
+;; bad
+[some-component {:logged-in true}]
+
+;; good
+[some-component {:logged-in? true}]
 ```

 ### Styles def vs defn

-Always use `def` over `defn`, unless the style relies on dynamic values, such as
-deref'ed atoms.
+Always use `def` over `defn` if there are no dynamic values. This helps cut the
+cost of function calls.

 ```clojure
 ;; bad
@@ -240,15 +300,18 @@ deref'ed atoms.

 ### Custom Colors

-The Status designs have a lot of customization of user and group colors with components and pages. For consistency it is best to use `customization-color` as the prop key on pages and components. This will help easily identify what pages and components in the application are using customized colors.
+The Status designs have a lot of customization of user and group colors. For
+consistency it is best to use `customization-color` as the prop key on pages and
+components. This will help easily identify what pages and components in the
+application are using customized colors.

 ```clojure
 ;; bad
-(defn community-card [{keys [custom-color]}] 
+(defn community-card [{keys [custom-color]}]
  ...)

 ;; good
-(defn community-card [{keys [customization-color]}] 
+(defn community-card [{keys [customization-color]}]
  ...)
 ```

@@ -472,9 +535,9 @@ the `quo2/` directory.

 ;; good
 (ns my-namespace
-  (:require [quo2.core :as quo2]))
+  (:require [quo2.core :as quo]))

-(quo2/icon :i/verified)
+(quo/icon :i/verified)

 ;; also good because both namespaces are inside quo2/
 (ns quo2.components.tabs.account-selector
@@ -541,8 +604,7 @@ indices.

 ### Icons

-Use the appropriate keyword qualification/namespace and don't directly require
-namespaces inside `quo2/components/`.
+Use the appropriate keyword qualification/namespace.

 ```clojure
 ;; bad
@@ -736,9 +798,9 @@ Clojure (JVM) codebases which mirror the sources in a top-level test directory.
 └── models_test.cljs
 ```

-Component tests should be created in a separate directory `__tests__`, colocated
-with the source. When the entire component implementation is isolated under a
-single directory, create a test file named `component_spec.cljs` instead.
+Component tests should be created in the same directory as the source component,
+and named as `component_spec.cljs`.
+

 ```
 └── filter
@@ -0,0 +1,13 @@
+# Patching
+
+## Libraries
+If 3rd party library has an issue and fix is not yet released (or we can't switch to a new release), we use forks. Fix should be commited to the fork, tagged and referenced from package.json.
+
+Example: [`react-native-hole-view`](https://github.com/status-im/react-native-hole-view#refs/tags/v2.1.1-status)
+
+## React Native
+When patch need to be applied to React Native itself Status does patching with Nix instead of doing it nodejs-way.
+
+Patches should be added to [this file](https://github.com/status-im/status-mobile/blob/develop/nix/deps/nodejs-patched/default.nix).
+
+Example: [patching `react-native/Yoga` to build app with XCode 14.3](https://github.com/status-im/status-mobile/pull/15589)
@@ -30,7 +30,7 @@ Ready for testing PR should meet the following criteria:
 3. Wait for the review.
 4. Make sure that after review and before requesting manual QA your PR is rebased to current develop.
 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. That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
+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. 

 After that - PR will be taken into manual testing by the QA team.

@@ -41,27 +41,37 @@ After that - PR will be taken into manual testing by the QA team.
 - 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, tester can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional.
- When manual testing of PR is fully completed and all issues are fixed, QA adds the ```Tested - OK``` label and drags the card to the ```MERGE``` column, after which developer merges PR into develop.
-  If manual testing was not carried out, developer drags PR to the ```MERGE``` column themselves.
+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.
+After that the developer merges PR into develop.
+- If manual testing/design review was not carried out, the developer drags PR to the ```MERGE``` column themselves.
+
+### Design review
+_**How do I know if a design review is needed?**_
+
+There are three cases here depending on the changes in the PR:
+1. **Functional PRs with UI changes:** after the ```Tested - OK``` label is added, the QA moves the PR to the ```Design review``` column + mentions ```@Francesca-G``` in comments. 
+2. **Component PRs:** can be moved directly to the ```Design review``` column by the developer when get a review from devs (manual testing step can be skipped) + the developer mentions ```@Francesca-G``` in comments.
+3. **Functional PRs changes in which are not related to UI (e.g. a crash fix):** skip the ```Design review``` step (the PR should only be manually tested by QA).
+
+There are three possible scenarios when the design review is completed:
+1. **Approved by design**  > the PR is moved to the ```MERGE``` column by Francesca
+2. **Some changes requested, but can be fixed as followups** > need to be negotiated with Francesca  > Francesca moves PR to the ```MERGE``` column and adds the ```Follow-up required``` label >  follow-ups should be added **by the dev** right after the PR is merged
+3. **Some changes requested, they should be fixed before merge** > Francesca reviews the PR again after the fixes and moves PR to the ```MERGE``` column from ```Design review```
+
+---
+**Notes:**
+- If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
+- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality.
+---        

-    **Notes:** 
-        - If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
-        - if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality.
-        
 #### 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`.
 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.

-
-#### Why is my PR in `To Rebase` column?
-PR is moved to the "To Rebase" column in two cases:
- automatically by github bot if PR branch has conflicts that should be resolved
- manually (by QAs) if PR branch is out-of-date with the base branch and requires rebasing to the latest develop
-
-If PR appeared in the "To Rebase" column dev who is working on the PR should resolve conflicts/rebase branch to the latest develop. After resolving conflicts/rebasing PR should be moved by developer to the right column depending on PR work progress.
-
 ## Merging a PR
 **Merge conditions:**
 1. Required number of reviews received
@@ -73,6 +83,7 @@ If PR appeared in the "To Rebase" column dev who is working on the PR should res


 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) 
@@ -0,0 +1,17 @@
+# Pixel Perfection
+The Status Mobile team aims to align the design implementation perfectly according to a given screens respective Figma design spec.
+
+Currently the Figma Designs match up with an "iPhone 11 Pro" screen size. 
+
+To test your implementation is correct you can take the following steps
+
+- Open a new Figma file so that you have write privileges. 
+- Copy in the component or screen from the Figma file.
+
+- Using the "iPhone 11 Pro" simulator (it is the default now) you take a screenshot of your component and paste it into your Figma file.
+
+- To get the right size, set your screenshot to width 375px
+
+![](images/pixel-perfection/layer-width.png)
+
+- Lower the opacity so you can see it sitting on top of the Figma mock ups. 
@@ -0,0 +1,96 @@
+## Pull Request Review Policy
+
+This document details the pull request policy of the Status Mobile repository / team.
+
+- [Terms](#terms)
+- [Policy](#policy)
+  - [Overview](#overview)
+  - [Full Policy](#fully-policy)
+- [Rationale](#rationale)
+  - [Front pressure and Demand control](#front-pressure-and-demand-control)
+  - [Back pressure and Supply control](#back-pressure-and-supply-control)
+  - [Honour System](#honour-system)
+- [Review Support](#review-support)
+- [Background](#background)
+
+### Terms:
+
+| Term                 | Definition                                                                                                    |
+|----------------------|---------------------------------------------------------------------------------------------------------------|
+| **Requester**        | The team member submitting a pull request.                                                                    |
+| **Reviewer**         | A team member asked by a requester to review the requester’s pull request.                                    |
+| **Review bandwidth** | The number of reviews a team member has self-limited themselves to giving within their defined review period. |
+| **Review period**    | The period of time over which a reviewer’s bandwidth is consumed                                              |
+
+### Policy:
+
+#### Overview
+
+- 🔀 - You are responsible for getting your PR reviewed and approved.
+- ✅ - You must give a review on a PR if you are asked to do so, unless your review limit has been reached.
+- ✨ - The honour system underpins this policy, without acting in good faith it will not work.
+
+#### Fully policy
+
+1) The requester has the responsibility for getting a PR reviewed and approved.
+   1) The requester has the right and responsibility to pursue code reviews.
+   2) The requester has the right and responsibility to make multiple requests of the same reviewer.
+   3) The requester will select a limited number of reviewers to review any of the requester’s PRs.
+2) Reviewers are obligated to give a review for all PRs they are requested to review, except when their review bandwidth has been exhausted:
+   1) Reviewers have the right to refuse a requester a review if the reviewer’s review bandwidth has been exhausted.
+   2) Reviewers are expected to manage and track their review bandwidth.
+   3) Reviewers can manage their review bandwidth via any means they feel works best for them. Examples include:
+      1) Using the GitHub busy feature
+      2) Declining a review on the PR
+      3) Declining a review when pursued by a code reviewer
+      4) Proactively declining to review a PR
+3) All team members will set a review bandwidth that is reasonable.
+4) All team members acknowledge that giving reviews is a requirement of membership of the team.
+5) All team members will manage their review bandwidth honestly.
+   1) The right to refuse a PR review is only eligible if a reviewer’s review bandwidth has actually been exhausted.
+   2) Breaching the team’s honour is very bad form. Do not do it (please).
+6) All team members acknowledge that without acting with honesty this review process will not work and jeopardises their own future ability to receive reviews.
+
+### Rationale
+
+#### Front pressure and Demand control
+
+Foremost in the rationale for the above policy is that giving a PR review is a requirement. If a requester requests
+ a PR review of a team member, the reviewer is now obligated to review the PR within a reasonable timeframe.
+
+This principle enforces that there is a pressure and demand that PR reviews must be given.
+
+#### Back pressure and Supply control
+
+Front pressure alone is not enough to balance the PR review load across the team. Because of this an exception is granted 
+to reviewers that have exhausted their review bandwidth, the exemption permits these reviewers to refuse a PR review.
+
+This principle gives the reviewer pool back-pressure, relieving the exhausted reviewer and increasing pressure / demand on 
+the other reviewers.
+
+#### Honour system
+
+The two principles of demand and supply control are underpinned by an honour system and are useless without honest action.
+If a team member does not honestly manage their review bandwidth this action seriously damages the collective balance of 
+PR review load. Because of this potential damage a breach of the honour system is considered a deeply shameful act.
+
+The honour system is the mechanism of control and enforcement, without it the policy would need to be controlled and enforced
+using less dynamic and forgiving mechanisms. An example is a GitHub review counting tools with quotas and metrics. So just
+be cool.
+
+### Review Support
+
+Sometimes reviewing is time-consuming or generally painful, to help make reviews as simple as possible consider the following suggestions: 
+- Paired reviews: Ask an experienced reviewer to review with you.
+- If a PR is the product of multiple developers only ask 1 or 2 other developers for their review.
+
+### Background
+
+The contents of this policy document is the product of 2 councils of the Status Mobile team, the below documents summarise the topics and outcomes of the councils:  
+
+- [2023-05-15 - Council of Deadwater](https://docs.google.com/document/d/1TtUZCke2OzumjdWGu6TIECHEOUPwvaLrvQ8Re2nEGCo)
+- [2023-06-13 - Mauve Council of Deadwater](https://docs.google.com/document/d/19hfr8xXrShLk9ROdQfOwb9_vwbTah9nOCqKSLIrgoSI)
+
+The aims of the council were to allow developers that are relied on heavily for reviews to better balance their time 
+between reviews and other responsibilities. Equally, the council aimed to give other team members better opportunity and 
+understanding that giving PR reviews is a requirement and will help the team generally if more review burden is shared.
@@ -28,11 +28,30 @@ You need to have an emulator like [AVD](https://developer.android.com/studio/run

 ### iOS

-You can specify the simulator type by adding the `SIMULATOR` flag:
+#### Running on a simulator
+
+We highly recommend using the `iPhone 11 Pro` simulator as its screen dimensions match with our design.
+
+If you have Xcode `v12.x` (and above) installed in your system, you need to follow the below steps to add `iPhone 11 Pro` simulator:
+
+1. Open Xcode
+2. Menu `>` Window `>` Devices and Simulators
+3. Tap `+` button on bottom left
+4. Select **Device Type** as `iPhone 11 Pro`
+5. Leave the **Simulator Name** empty and tap on **Create**
+
+##### NOTE ⚠️
+
+Running `make run-ios` will target `iPhone 11 Pro` by default.
+
+If you need to run on any other simulator, you can specify the simulator type by adding the `SIMULATOR` flag:
 ```sh
 make run-ios SIMULATOR="iPhone 11 Pro"
 ```
-Some manual steps are necesary for [developing on a physical iOS Device](#physical-ios-device).
+
+#### Running on a physical device
+
+Some manual steps are necessary for [developing on a physical iOS Device](#physical-ios-device).

 # Build release

@@ -1,2 +1,2 @@
-import "node-libs-react-native/globals";
-import "./result/index.js";
+import 'node-libs-react-native/globals';
+import './result/index.js';
@@ -0,0 +1,12 @@
+# This `.xcode.env` file is versioned and is used to source the environment
+# used when running script phases inside Xcode.
+# To customize your local environment, you can create an `.xcode.env.local`
+# file that is not versioned.
+
+# NODE_BINARY variable contains the PATH to the node executable.
+#
+# Customize the NODE_BINARY variable here.
+# For example, to use nvm with brew, add the following line
+# . "$(brew --prefix nvm)/nvm.sh" --no-use
+export NODE_BINARY="${NODE_BINARY:-node}"
+export NODE_ARGS="${NODE_ARGS:- --max-old-space-size=16384 }"
@@ -1,14 +1,34 @@
-platform :ios, '11.0'
-
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

+platform :ios, '12.4'
+
+production = ENV["PRODUCTION"] == "1"
+
+# We need to enable codegen discovery to fix the issue of these files not being generated properly:
+# ios/build/generated/ios/FBReactNativeSpec/FBReactNativeSpec-generated.mm
+# ios/build/generated/ios/FBReactNativeSpec/FBReactNativeSpec.h
+# more details here : https://github.com/status-im/status-mobile/issues/15911
+# TODO: remove this flag once you upgrade react-native above version 0.70
+ENV['USE_CODEGEN_DISCOVERY'] = "1"
+
 abstract_target 'Status' do
  # Pods for StatusQuo
  config = use_native_modules!

-  use_react_native!(:path => config[:reactNativePath],
-                    :hermes_enabled => false)
+  # Flags change depending on the env values.
+  flags = get_default_flags()
+
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :production => production,
+    :hermes_enabled => flags[:hermes_enabled],
+    :fabric_enabled => flags[:fabric_enabled],
+    :use_codegen_discovery => true,
+    # An absolute path to your application root.
+    :app_path => "#{Pod::Config.instance.installation_root}/.."
+  )

  pod 'react-native-image-resizer', :path => '../node_modules/react-native-image-resizer'
  pod 'react-native-config', :path => '../node_modules/react-native-config'
@@ -1,17 +1,17 @@
 PODS:
  - boost (1.76.0)
-  - BVLinearGradient (2.5.6):
-    - React
+  - BVLinearGradient (2.8.0):
+    - React-Core
  - CryptoSwift (1.5.1)
  - DoubleConversion (1.1.6)
-  - FBLazyVector (0.67.5)
-  - FBReactNativeSpec (0.67.5):
+  - FBLazyVector (0.69.10)
+  - FBReactNativeSpec (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.67.5)
-    - RCTTypeSafety (= 0.67.5)
-    - React-Core (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+    - RCTRequired (= 0.69.10)
+    - RCTTypeSafety (= 0.69.10)
+    - React-Core (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
  - fmt (6.2.1)
  - glog (0.3.5)
  - HMSegmentedControl (1.5.6)
@@ -43,192 +43,203 @@ PODS:
    - DoubleConversion
    - fmt (~> 6.2.1)
    - glog
-  - RCTRequired (0.67.5)
-  - RCTTypeSafety (0.67.5):
-    - FBLazyVector (= 0.67.5)
+  - RCTRequired (0.69.10)
+  - RCTTypeSafety (0.69.10):
+    - FBLazyVector (= 0.69.10)
+    - RCTRequired (= 0.69.10)
+    - React-Core (= 0.69.10)
+  - React (0.69.10):
+    - React-Core (= 0.69.10)
+    - React-Core/DevSupport (= 0.69.10)
+    - React-Core/RCTWebSocket (= 0.69.10)
+    - React-RCTActionSheet (= 0.69.10)
+    - React-RCTAnimation (= 0.69.10)
+    - React-RCTBlob (= 0.69.10)
+    - React-RCTImage (= 0.69.10)
+    - React-RCTLinking (= 0.69.10)
+    - React-RCTNetwork (= 0.69.10)
+    - React-RCTSettings (= 0.69.10)
+    - React-RCTText (= 0.69.10)
+    - React-RCTVibration (= 0.69.10)
+  - React-bridging (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.67.5)
-    - React-Core (= 0.67.5)
-  - React (0.67.5):
-    - React-Core (= 0.67.5)
-    - React-Core/DevSupport (= 0.67.5)
-    - React-Core/RCTWebSocket (= 0.67.5)
-    - React-RCTActionSheet (= 0.67.5)
-    - React-RCTAnimation (= 0.67.5)
-    - React-RCTBlob (= 0.67.5)
-    - React-RCTImage (= 0.67.5)
-    - React-RCTLinking (= 0.67.5)
-    - React-RCTNetwork (= 0.67.5)
-    - React-RCTSettings (= 0.67.5)
-    - React-RCTText (= 0.67.5)
-    - React-RCTVibration (= 0.67.5)
-  - React-callinvoker (0.67.5)
-  - React-Core (0.67.5):
+    - React-jsi (= 0.69.10)
+  - React-callinvoker (0.69.10)
+  - React-Codegen (0.69.10):
+    - FBReactNativeSpec (= 0.69.10)
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTRequired (= 0.69.10)
+    - RCTTypeSafety (= 0.69.10)
+    - React-Core (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-Core (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.67.5)
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-Core/Default (= 0.69.10)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.67.5):
+  - React-Core/CoreModulesHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/Default (0.67.5):
+  - React-Core/Default (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/DevSupport (0.67.5):
+  - React-Core/DevSupport (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.67.5)
-    - React-Core/RCTWebSocket (= 0.67.5)
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-jsinspector (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-Core/Default (= 0.69.10)
+    - React-Core/RCTWebSocket (= 0.69.10)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-jsinspector (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.67.5):
+  - React-Core/RCTActionSheetHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.67.5):
+  - React-Core/RCTAnimationHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.67.5):
+  - React-Core/RCTBlobHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTImageHeaders (0.67.5):
+  - React-Core/RCTImageHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.67.5):
+  - React-Core/RCTLinkingHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.67.5):
+  - React-Core/RCTNetworkHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.67.5):
+  - React-Core/RCTSettingsHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTTextHeaders (0.67.5):
+  - React-Core/RCTTextHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.67.5):
+  - React-Core/RCTVibrationHeaders (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-Core/RCTWebSocket (0.67.5):
+  - React-Core/RCTWebSocket (0.69.10):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.67.5)
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsiexecutor (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-Core/Default (= 0.69.10)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsiexecutor (= 0.69.10)
+    - React-perflogger (= 0.69.10)
    - Yoga
-  - React-CoreModules (0.67.5):
-    - FBReactNativeSpec (= 0.67.5)
+  - React-CoreModules (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.5)
-    - React-Core/CoreModulesHeaders (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-RCTImage (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
-  - React-cxxreact (0.67.5):
+    - RCTTypeSafety (= 0.69.10)
+    - React-Codegen (= 0.69.10)
+    - React-Core/CoreModulesHeaders (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-RCTImage (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-cxxreact (0.69.10):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-jsinspector (= 0.67.5)
-    - React-logger (= 0.67.5)
-    - React-perflogger (= 0.67.5)
-    - React-runtimeexecutor (= 0.67.5)
-  - React-jsi (0.67.5):
+    - React-callinvoker (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-jsinspector (= 0.69.10)
+    - React-logger (= 0.69.10)
+    - React-perflogger (= 0.69.10)
+    - React-runtimeexecutor (= 0.69.10)
+  - React-jsi (0.69.10):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.67.5)
-  - React-jsi/Default (0.67.5):
+    - React-jsi/Default (= 0.69.10)
+  - React-jsi/Default (0.69.10):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.67.5):
+  - React-jsiexecutor (0.69.10):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-perflogger (= 0.67.5)
-  - React-jsinspector (0.67.5)
-  - React-logger (0.67.5):
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-perflogger (= 0.69.10)
+  - React-jsinspector (0.69.10)
+  - React-logger (0.69.10):
    - glog
  - react-native-background-timer (2.2.0):
    - React
@@ -236,8 +247,6 @@ PODS:
    - React-Core
  - react-native-blur (4.3.3):
    - React-Core
-  - react-native-camera-kit (8.0.4):
-    - React
  - react-native-cameraroll (4.0.4):
    - React-Core
  - react-native-config (1.5.0):
@@ -265,75 +274,80 @@ PODS:
  - react-native-status-keycard (2.5.39):
    - Keycard
    - React
+  - react-native-transparent-video (0.1.0):
+    - React-Core
  - react-native-webview (11.16.0):
    - React-Core
-  - React-perflogger (0.67.5)
-  - React-RCTActionSheet (0.67.5):
-    - React-Core/RCTActionSheetHeaders (= 0.67.5)
-  - React-RCTAnimation (0.67.5):
-    - FBReactNativeSpec (= 0.67.5)
+  - React-perflogger (0.69.10)
+  - React-RCTActionSheet (0.69.10):
+    - React-Core/RCTActionSheetHeaders (= 0.69.10)
+  - React-RCTAnimation (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.5)
-    - React-Core/RCTAnimationHeaders (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
-  - React-RCTBlob (0.67.5):
-    - FBReactNativeSpec (= 0.67.5)
+    - RCTTypeSafety (= 0.69.10)
+    - React-Codegen (= 0.69.10)
+    - React-Core/RCTAnimationHeaders (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-RCTBlob (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/RCTBlobHeaders (= 0.67.5)
-    - React-Core/RCTWebSocket (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-RCTNetwork (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
-  - React-RCTImage (0.67.5):
-    - FBReactNativeSpec (= 0.67.5)
+    - React-Codegen (= 0.69.10)
+    - React-Core/RCTBlobHeaders (= 0.69.10)
+    - React-Core/RCTWebSocket (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-RCTNetwork (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-RCTImage (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.5)
-    - React-Core/RCTImageHeaders (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-RCTNetwork (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
-  - React-RCTLinking (0.67.5):
-    - FBReactNativeSpec (= 0.67.5)
-    - React-Core/RCTLinkingHeaders (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
-  - React-RCTNetwork (0.67.5):
-    - FBReactNativeSpec (= 0.67.5)
+    - RCTTypeSafety (= 0.69.10)
+    - React-Codegen (= 0.69.10)
+    - React-Core/RCTImageHeaders (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-RCTNetwork (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-RCTLinking (0.69.10):
+    - React-Codegen (= 0.69.10)
+    - React-Core/RCTLinkingHeaders (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-RCTNetwork (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.5)
-    - React-Core/RCTNetworkHeaders (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
-  - React-RCTSettings (0.67.5):
-    - FBReactNativeSpec (= 0.67.5)
+    - RCTTypeSafety (= 0.69.10)
+    - React-Codegen (= 0.69.10)
+    - React-Core/RCTNetworkHeaders (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-RCTSettings (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.5)
-    - React-Core/RCTSettingsHeaders (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
-  - React-RCTText (0.67.5):
-    - React-Core/RCTTextHeaders (= 0.67.5)
-  - React-RCTVibration (0.67.5):
-    - FBReactNativeSpec (= 0.67.5)
+    - RCTTypeSafety (= 0.69.10)
+    - React-Codegen (= 0.69.10)
+    - React-Core/RCTSettingsHeaders (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-RCTText (0.69.10):
+    - React-Core/RCTTextHeaders (= 0.69.10)
+  - React-RCTVibration (0.69.10):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/RCTVibrationHeaders (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
-  - React-runtimeexecutor (0.67.5):
-    - React-jsi (= 0.67.5)
-  - ReactCommon/turbomodule/core (0.67.5):
+    - React-Codegen (= 0.69.10)
+    - React-Core/RCTVibrationHeaders (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - ReactCommon/turbomodule/core (= 0.69.10)
+  - React-runtimeexecutor (0.69.10):
+    - React-jsi (= 0.69.10)
+  - ReactCommon/turbomodule/core (0.69.10):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.67.5)
-    - React-Core (= 0.67.5)
-    - React-cxxreact (= 0.67.5)
-    - React-jsi (= 0.67.5)
-    - React-logger (= 0.67.5)
-    - React-perflogger (= 0.67.5)
+    - React-bridging (= 0.69.10)
+    - React-callinvoker (= 0.69.10)
+    - React-Core (= 0.69.10)
+    - React-cxxreact (= 0.69.10)
+    - React-jsi (= 0.69.10)
+    - React-logger (= 0.69.10)
+    - React-perflogger (= 0.69.10)
  - ReactNativeAudioToolkit (2.0.3):
    - React
+  - ReactNativeCameraKit (13.0.0):
+    - React-Core
  - ReactNativeNavigation (7.27.1):
    - HMSegmentedControl
    - React-Core
@@ -359,7 +373,7 @@ PODS:
    - SDWebImageWebPCoder (~> 0.8.4)
  - RNFS (2.16.6):
    - React
-  - RNGestureHandler (2.5.0):
+  - RNGestureHandler (2.6.1):
    - React-Core
  - RNHoleView (2.1.1):
    - React-Core
@@ -380,7 +394,7 @@ PODS:
    - React
  - RNReactNativeHapticFeedback (1.9.0):
    - React
-  - RNReanimated (2.3.3):
+  - RNReanimated (2.11.0):
    - DoubleConversion
    - FBLazyVector
    - FBReactNativeSpec
@@ -388,7 +402,6 @@ PODS:
    - RCT-Folly
    - RCTRequired
    - RCTTypeSafety
-    - React
    - React-callinvoker
    - React-Core
    - React-Core/DevSupport
@@ -408,12 +421,12 @@ PODS:
    - React-RCTText
    - ReactCommon/turbomodule/core
    - Yoga
-  - RNShare (7.0.1):
+  - RNShare (8.2.2):
    - React-Core
  - RNStaticSafeAreaInsets (2.2.0):
    - React-Core
-  - RNSVG (9.13.6):
-    - React
+  - RNSVG (13.10.0):
+    - React-Core
  - SDWebImage (5.11.1):
    - SDWebImage/Core (= 5.11.1)
  - SDWebImage/Core (5.11.1)
@@ -446,9 +459,10 @@ DEPENDENCIES:
  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
  - React (from `../node_modules/react-native/`)
+  - React-bridging (from `../node_modules/react-native/ReactCommon`)
  - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
+  - React-Codegen (from `build/generated/ios`)
  - React-Core (from `../node_modules/react-native/`)
-  - React-Core/DevSupport (from `../node_modules/react-native/`)
  - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
  - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
  - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
@@ -459,7 +473,6 @@ DEPENDENCIES:
  - react-native-background-timer (from `../node_modules/react-native-background-timer`)
  - react-native-blob-util (from `../node_modules/react-native-blob-util`)
  - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
-  - react-native-camera-kit (from `../node_modules/react-native-camera-kit`)
  - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
  - react-native-config (from `../node_modules/react-native-config`)
  - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
@@ -472,6 +485,7 @@ DEPENDENCIES:
  - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
  - react-native-status (from `../modules/react-native-status`)
  - react-native-status-keycard (from `../node_modules/react-native-status-keycard`)
+  - react-native-transparent-video (from `../node_modules/react-native-transparent-video`)
  - react-native-webview (from `../node_modules/react-native-webview`)
  - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
  - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -486,6 +500,7 @@ DEPENDENCIES:
  - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
  - "ReactNativeAudioToolkit (from `../node_modules/@react-native-community/audio-toolkit`)"
+  - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
  - ReactNativeNavigation (from `../node_modules/react-native-navigation`)
  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
  - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
@@ -549,8 +564,12 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/Libraries/TypeSafety"
  React:
    :path: "../node_modules/react-native/"
+  React-bridging:
+    :path: "../node_modules/react-native/ReactCommon"
  React-callinvoker:
    :path: "../node_modules/react-native/ReactCommon/callinvoker"
+  React-Codegen:
+    :path: build/generated/ios
  React-Core:
    :path: "../node_modules/react-native/"
  React-CoreModules:
@@ -571,8 +590,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-blob-util"
  react-native-blur:
    :path: "../node_modules/@react-native-community/blur"
-  react-native-camera-kit:
-    :path: "../node_modules/react-native-camera-kit"
  react-native-cameraroll:
    :path: "../node_modules/@react-native-community/cameraroll"
  react-native-config:
@@ -597,6 +614,8 @@ EXTERNAL SOURCES:
    :path: "../modules/react-native-status"
  react-native-status-keycard:
    :path: "../node_modules/react-native-status-keycard"
+  react-native-transparent-video:
+    :path: "../node_modules/react-native-transparent-video"
  react-native-webview:
    :path: "../node_modules/react-native-webview"
  React-perflogger:
@@ -625,6 +644,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon"
  ReactNativeAudioToolkit:
    :path: "../node_modules/@react-native-community/audio-toolkit"
+  ReactNativeCameraKit:
+    :path: "../node_modules/react-native-camera-kit"
  ReactNativeNavigation:
    :path: "../node_modules/react-native-navigation"
  RNCAsyncStorage:
@@ -680,34 +701,35 @@ CHECKOUT OPTIONS:

 SPEC CHECKSUMS:
  boost: a7c83b31436843459a1961bfd74b96033dc77234
-  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
+  BVLinearGradient: 612a04ff38e8480291f3379ee5b5a2c571f03fe0
  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
-  FBLazyVector: d2db9d00883282819d03bbd401b2ad4360d47580
-  FBReactNativeSpec: 94da4d84ba3b1acf459103320882daa481a2b62d
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
+  FBLazyVector: a8af91c2b5a0029d12ff6b32e428863d63c48991
+  FBReactNativeSpec: 1b2309b096448a1dc9d0c43999216f8fda809ae8
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
+  glog: d93527a855523adb8c113837db4be68fb00e230d
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
  Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
  Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
-  RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
-  RCTRequired: 412e994c1e570cf35378a32c18fd46e50634938b
-  RCTTypeSafety: ef27340c728e6d673af345ed69e479a010c8a2d8
-  React: 36b9f5116572e5b80f01e562bb1f1451e8848e47
-  React-callinvoker: 91e62870884d3db3a0db33bbb1ba4e53fa5210ca
-  React-Core: 765ccc3861be1b93c7d5ca37f6b06e2efd6e7999
-  React-CoreModules: da2ddff50a92576b6d58fbfc80a62ba3f81d8a4e
-  React-cxxreact: b54cffd4feb550c3213cd38db4a2a4bdd896f715
-  React-jsi: 103674913e4159a07df20ef214c6b563e90e7b2e
-  React-jsiexecutor: e9895ccae253323ca70f693945fecbba091f0abd
-  React-jsinspector: ec4fe4f65ccf9d67c8429dda955d3412db8a25ef
-  React-logger: 85f4ef06b9723714b2dfa5b0e5502b673b271b58
+  RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
+  RCTRequired: 3581db0757e7ff9be10718a56b3d79b6a6bd3bdf
+  RCTTypeSafety: ce13e630c48340401ebfb28710959913f74b8b36
+  React: cca8f2b7cce018f79847ca79847fa367b206e8a1
+  React-bridging: b893643f09d3964afba6c347e00dd86cf10691e5
+  React-callinvoker: 9ac7cba30428eddf7a06d1253f8e7561b5c97334
+  React-Codegen: 6b4283af3720709c7ac4be18f4b32b07eb53f1d5
+  React-Core: 550b694774bc778b5c7bf7608fc12a484e01ec05
+  React-CoreModules: c332d5b416cb3ccf972e7af79d496498a700e073
+  React-cxxreact: c5c4106bfd2d0cee80b848e33b7ff4e35a721b16
+  React-jsi: 6ff3fb9b9764a499c959e0096c0d384fa2b4beef
+  React-jsiexecutor: 388f1c99404c848141d7ea162f61233d04829ede
+  React-jsinspector: a4463b3411b8b9b37153255ef694a84c77ba3c7f
+  React-logger: 2a0497622cbabc47fb769d97620952df14c1f814
  react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
  react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
  react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
-  react-native-camera-kit: 498a6d111a904834e0824e9073cfadef7303235f
  react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
  react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
@@ -720,20 +742,22 @@ SPEC CHECKSUMS:
  react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
  react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
  react-native-status-keycard: f1c1227b2d5984c10fb44db68e4bfd2937f31e98
+  react-native-transparent-video: e484ad11ace8e5f62516e2c5e15efd3cb4df24b0
  react-native-webview: 28a8636d97ee641f2ee8f20492d7a6c269c1d703
-  React-perflogger: d32ee13196f4ae2e4098fb7f8e7ed4f864c6fb0f
-  React-RCTActionSheet: 81779c09e34a6a3d6b15783407ba9016a774f535
-  React-RCTAnimation: b778eaaa42a884abcc5719035a7a0b2f54672658
-  React-RCTBlob: 8edfc04c117decb0e7d4e6ab32bec91707e63ecb
-  React-RCTImage: 2022097f1291bfebd0003e477318c72b07853578
-  React-RCTLinking: bd8d889c65695181342541ce4420e9419845084c
-  React-RCTNetwork: eae64b805d967bf3ece2cec3ad09218eeb32cb74
-  React-RCTSettings: 0645af8aec5f40726e98d434a07ff58e75a81aa9
-  React-RCTText: e55de507cda263ff58404c3e7d75bf76c2b80813
-  React-RCTVibration: c3b8a3245267a3849b0c7cb91a37606bf5f3aa65
-  React-runtimeexecutor: 434efc9e5b6d0f14f49867f130b39376c971c1aa
-  ReactCommon: a30c2448e5a88bae6fcb0e3da124c14ae493dac1
+  React-perflogger: bc57c4a953c1ec913b0d984cf4f2b9842a12bde0
+  React-RCTActionSheet: 3efa3546119a1050f6c34a461b386dd9e36eaf0b
+  React-RCTAnimation: e58fb9f1adf7b38af329881ea2740f43ffeea854
+  React-RCTBlob: d2238645553c3ec787324268c0676148d86e6cc4
+  React-RCTImage: e6d7c9ab978cae99364fcc96b9238fc7740a13da
+  React-RCTLinking: 329e88ce217dad464ef34b5d0c40b3ceaac6c9ec
+  React-RCTNetwork: c8967f2382aac31761ddb750fee53fa34cf7a4ee
+  React-RCTSettings: 8a825b4b5ea58f6713a7c97eea6cc82e9895188b
+  React-RCTText: ffcaac5c66bc065f2ccf79b6fe34585adb9e589b
+  React-RCTVibration: 0039c986626b78242401931bb23c803935fae9d1
+  React-runtimeexecutor: 5ebf1ddaa706bf2986123f22d2cad905443c2c5f
+  ReactCommon: 65754b8932ea80272714988268bbfb9f303264a5
  ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
+  ReactNativeCameraKit: 9d46a5d7dd544ca64aa9c03c150d2348faf437eb
  ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8
  RNCAsyncStorage: b2489b49e38c85e10ed45a888d13a2a4c7b32ea1
  RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543
@@ -741,17 +765,17 @@ SPEC CHECKSUMS:
  RNCPushNotificationIOS: c145c6253ea016e5efeff604f2720736b4a596f7
  RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
  RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
-  RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
+  RNGestureHandler: 28ad20bf02257791f7f137b31beef34b9549f54b
  RNHoleView: 07572d21c97fad71fdc47f7248a8513e15a38949
  RNImageCropPicker: 35a3ceb837446fa11547704709bb22b5fac6d584
  RNKeychain: 216f37338fcb9e5c3a2530f1e3295f737a690cb1
  RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
  RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
  RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
-  RNReanimated: 3ad6ec4e147462206be9d1c925df10b6ea850b0e
-  RNShare: 2dc2fcac3f7321cfd6b60a23ed4bf4d549f86f5f
+  RNReanimated: d0db0ee059c33381bca787a2193c27e52750ccaf
+  RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
  RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
-  RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
+  RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
  SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
  secp256k1: f61d67e6fdcb85fd727acf1bf35ace6036db540c
@@ -759,8 +783,8 @@ SPEC CHECKSUMS:
  SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
  TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
-  Yoga: 099a946cbf84c9b32ffdc4278d72db26710ecf92
+  Yoga: d24d6184b6b85f742536bd93bd07d69d7b9bb4c1

-PODFILE CHECKSUM: c29de3b14e3275299c51aa95520622f09d084bcb
+PODFILE CHECKSUM: 1b60eee24bff3a6287f8b33e57657289b2966342

-COCOAPODS: 1.12.1
+COCOAPODS: 1.12.0
@@ -8,15 +8,14 @@

 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
-		09B7B3FF4CFA16C028BA0B05 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EC21589D612F7787EA45C863 /* libPods-Status-StatusIm-StatusImTests.a */; };
-		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
+		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
 		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 */; };
 		3A8F8EAA24A4D31600BF206D /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A8F8EA924A4D31600BF206D /* GameKit.framework */; };
-		3AAD2ABC24A3A60E0075D594 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
+		3AAD2ABC24A3A60E0075D594 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		3AAD2ABD24A3A60E0075D594 /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2626CE245C3F2200D5F94B /* Dummy.swift */; };
 		3AAD2ABE24A3A60E0075D594 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		3AAD2AC024A3A60E0075D594 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
@@ -44,12 +43,12 @@
 		715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
-		7DC033789D9E0F726FD9C7AC /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		8FC9C79C1A8446E7C7C18C60 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */; };
+		B0E570AEBE2BEB426BF60259 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D059F2E62D7CD9FB1896703 /* libPods-Status-StatusImPR.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
+		B73930D752A70EAB45001773 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FBEDE2F94002488EF6B277DA /* libPods-Status-StatusIm.a */; };
 		BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; };
 		C14C5F8D29C0A149005C58A7 /* launch-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */; };
 		C14C5F9129C0AD9C005C58A7 /* launch-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */; };
@@ -61,6 +60,7 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
+		F5EC958C8908294B8536B835 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 06FA6B17CC0A7FAFA9DA5364 /* libPods-Status-StatusIm-StatusImTests.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -108,9 +108,12 @@
 		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>"; };
+		06FA6B17CC0A7FAFA9DA5364 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		08A713A336BFEE0924821EC9 /* 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>"; };
+		103861DFF36B6063BED2602B /* 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.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = StatusIm/AppDelegate.m; 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>"; };
@@ -119,22 +122,21 @@
 		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>"; };
-		3D03948FF807541657E64335 /* 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>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		4D059F2E62D7CD9FB1896703 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		4D7FC122A838AC3BFC46D82B /* 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>"; };
 		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; };
 		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>"; };
-		691D1B2EE134FCF74D07E435 /* 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>"; };
 		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>"; };
-		6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		6D32AC40F159AF0551D2D2BF /* 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>"; };
 		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>"; };
+		84C3C20891247EC6BFF93B51 /* 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>"; };
+		886398AFEF2B823AC8A4912C /* 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>"; };
 		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>"; };
-		983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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>"; };
@@ -144,16 +146,14 @@
 		B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = "<group>"; };
 		B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = "<group>"; };
 		B321D25F4493470980039457 /* Inter-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BoldItalic.otf"; path = "../resources/fonts/Inter-BoldItalic.otf"; sourceTree = "<group>"; };
-		BDC1942C3E1889184B8DFEA8 /* 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>"; };
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		E6B5FBF37AFD0AA1F05937C8 /* 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>"; };
-		EC21589D612F7787EA45C863 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		FBE095C8AC4C540F85C859D7 /* 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>"; };
+		EBFEABB7D6CC1144D83FBA82 /* 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>"; };
+		FBEDE2F94002488EF6B277DA /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				09B7B3FF4CFA16C028BA0B05 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				F5EC958C8908294B8536B835 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +174,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				8FC9C79C1A8446E7C7C18C60 /* libPods-Status-StatusIm.a in Frameworks */,
+				B73930D752A70EAB45001773 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +188,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				7DC033789D9E0F726FD9C7AC /* libPods-Status-StatusImPR.a in Frameworks */,
+				B0E570AEBE2BEB426BF60259 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -222,7 +222,7 @@
 				B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */,
 				008F07F21AC5B25A0029DE68 /* main.jsbundle */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
-				13B07FB01A68108700A75B9A /* AppDelegate.m */,
+				13B07FB01A68108700A75B9A /* AppDelegate.mm */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				13B07FB71A68108700A75B9A /* main.m */,
 				3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */,
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */,
-				EC21589D612F7787EA45C863 /* libPods-Status-StatusIm-StatusImTests.a */,
-				6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */,
+				FBEDE2F94002488EF6B277DA /* libPods-Status-StatusIm.a */,
+				06FA6B17CC0A7FAFA9DA5364 /* libPods-Status-StatusIm-StatusImTests.a */,
+				4D059F2E62D7CD9FB1896703 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */,
-				691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */,
-				6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */,
-				FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */,
+				886398AFEF2B823AC8A4912C /* Pods-Status-StatusIm.debug.xcconfig */,
+				08A713A336BFEE0924821EC9 /* Pods-Status-StatusIm.release.xcconfig */,
+				EBFEABB7D6CC1144D83FBA82 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				84C3C20891247EC6BFF93B51 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				4D7FC122A838AC3BFC46D82B /* Pods-Status-StatusImPR.debug.xcconfig */,
+				103861DFF36B6063BED2602B /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				BFA0BBBB8136DD48F804A077 /* [CP] Check Pods Manifest.lock */,
+				F083BDB009D93F14ABE9577A /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				DF5B6F4FD3B7809799833669 /* [CP] Copy Pods Resources */,
+				D2C750D3F094DB4514432955 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				B6E3CF1D675245267368C9A7 /* [CP] Check Pods Manifest.lock */,
+				29DFA8D4A1684BDC5257F30D /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				8D6472C92D0D90E9BAD8AD9A /* [CP] Copy Pods Resources */,
+				81ABD64BC3E76C9EEE7A6C62 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				8E74556C932D28F855241EA1 /* [CP] Check Pods Manifest.lock */,
+				B75C010670287761677282A4 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				FDBEE007965D2FB13D66278F /* [CP] Copy Pods Resources */,
+				C7E5420D406F9FB4ACC8ECE8 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,6 +544,28 @@
 			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";
 		};
+		29DFA8D4A1684BDC5257F30D /* [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;
@@ -572,7 +594,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		8D6472C92D0D90E9BAD8AD9A /* [CP] Copy Pods Resources */ = {
+		81ABD64BC3E76C9EEE7A6C62 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -594,7 +616,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8E74556C932D28F855241EA1 /* [CP] Check Pods Manifest.lock */ = {
+		B75C010670287761677282A4 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -616,51 +638,29 @@
 			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;
 		};
-		B6E3CF1D675245267368C9A7 /* [CP] Check Pods Manifest.lock */ = {
+		C7E5420D406F9FB4ACC8ECE8 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
+				"${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/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			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";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		BFA0BBBB8136DD48F804A077 /* [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-StatusImTests-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;
-		};
-		DF5B6F4FD3B7809799833669 /* [CP] Copy Pods Resources */ = {
+		D2C750D3F094DB4514432955 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -696,26 +696,26 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		FDBEE007965D2FB13D66278F /* [CP] Copy Pods Resources */ = {
+		F083BDB009D93F14ABE9577A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			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/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
+			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 */
@@ -735,7 +735,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				65F6941925780A4F00A45E76 /* Bridge.swift in Sources */,
-				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
+				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
 				3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
@@ -746,7 +746,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */,
-				3AAD2ABC24A3A60E0075D594 /* AppDelegate.m in Sources */,
+				3AAD2ABC24A3A60E0075D594 /* AppDelegate.mm in Sources */,
 				3AAD2ABD24A3A60E0075D594 /* Dummy.swift in Sources */,
 				3AAD2ABE24A3A60E0075D594 /* main.m in Sources */,
 			);
@@ -765,7 +765,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = EBFEABB7D6CC1144D83FBA82 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -782,7 +782,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -802,7 +802,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 84C3C20891247EC6BFF93B51 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -816,7 +816,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -835,10 +835,11 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 886398AFEF2B823AC8A4912C /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -848,7 +849,7 @@
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -878,7 +879,7 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -888,6 +889,12 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
@@ -908,10 +915,11 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 08A713A336BFEE0924821EC9 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -921,6 +929,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				EXCLUDED_ARCHS = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -944,7 +953,7 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -954,6 +963,12 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
@@ -973,10 +988,11 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 4D7FC122A838AC3BFC46D82B /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
@@ -985,6 +1001,7 @@
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -1014,7 +1031,7 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1024,6 +1041,12 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
@@ -1042,10 +1065,11 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 103861DFF36B6063BED2602B /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -1054,6 +1078,7 @@
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -1077,7 +1102,7 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1087,6 +1112,12 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
@@ -1108,7 +1139,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1141,7 +1172,7 @@
 				ENABLE_TESTABILITY = YES;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1172,13 +1203,19 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = NO;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = iphoneos;
 				VALID_ARCHS = arm64;
@@ -1192,7 +1229,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1224,7 +1261,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -1247,13 +1284,19 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -28,36 +28,37 @@
 #import <SDWebImage/SDWebImageDownloaderOperation.h>

 #import <Security/Security.h>
+// adding this for v0.68.x
+#import <React/RCTAppSetupUtils.h>
+#if RCT_NEW_ARCH_ENABLED
+#import <React/CoreModulesPlugins.h>
+#import <React/RCTCxxBridgeDelegate.h>
+#import <React/RCTFabricSurfaceHostingProxyRootView.h>
+#import <React/RCTSurfacePresenter.h>
+#import <React/RCTSurfacePresenterBridgeAdapter.h>
+#import <ReactCommon/RCTTurboModuleManager.h>
+#import <react/config/ReactNativeConfig.h>
+
+static NSString *const kRNConcurrentRoot = @"concurrentRoot";
+
+@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
+  RCTTurboModuleManager *_turboModuleManager;
+  RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
+  std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
+  facebook::react::ContextContainer::Shared _contextContainer;
+  }
+@end
+#endif
+
+

 //TODO: properly import the framework
-extern NSString* StatusgoImageServerTLSCert();
+extern "C" NSString* StatusgoImageServerTLSCert();

@interface StatusDownloaderOperation : SDWebImageDownloaderOperation
  + (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler;
@end

- /*
-#if DEBUG
-#import <FlipperKit/FlipperClient.h>
-#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
-#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
-#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
-#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
-#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
- */
- /*
-static void InitializeFlipper(UIApplication *application) {
-  FlipperClient *client = [FlipperClient sharedClient];
-  SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
-  [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
-  [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
-  [client addPlugin:[FlipperKitReactPlugin new]];
-  [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
-  [client start];
-       }
-#endif
-  */
-
@implementation AppDelegate
 {
    UIView *_blankView;
@@ -65,9 +66,19 @@ static void InitializeFlipper(UIApplication *application) {

 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-  #if DEBUG
-    //InitializeFlipper(application);
+  RCTAppSetupPrepareApp(application);
+
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  [ReactNativeNavigation bootstrapWithBridge:bridge];
+
+  #if RCT_NEW_ARCH_ENABLED
+      _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
+      _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
+      _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
+      _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
+      bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
  #endif
+
  signal(SIGPIPE, SIG_IGN);
  NSURL *jsCodeLocation;

@@ -90,8 +101,6 @@ static void InitializeFlipper(UIApplication *application) {
      dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:@"BLANK_PREVIEW"];
  [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults];

-  [ReactNativeNavigation bootstrapWithDelegate:self launchOptions:launchOptions];
-
  [RNSplashScreen show];

  UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
@@ -122,15 +131,66 @@ static void InitializeFlipper(UIApplication *application) {
  return [ReactNativeNavigation extraModulesForBridge:bridge];
 }

+
+/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`.
+- (BOOL)concurrentRootEnabled
+{
+  // Switch this bool to turn on and off the concurrent root
+  return true;
+}
+- (NSDictionary *)prepareInitialProps
+{
+  NSMutableDictionary *initProps = [NSMutableDictionary new];
+#ifdef RCT_NEW_ARCH_ENABLED
+  initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
+#endif
+  return initProps;
+}
+
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 #endif
 }

+#if RCT_NEW_ARCH_ENABLED
+#pragma mark - RCTCxxBridgeDelegate
+- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
+{
+  _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+                                                             delegate:self
+                                                            jsInvoker:bridge.jsCallInvoker];
+  return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
+}
+#pragma mark RCTTurboModuleManagerDelegate
+- (Class)getModuleClassFromName:(const char *)name
+{
+  return RCTCoreModulesClassProvider(name);
+}
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+{
+  return nullptr;
+}
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                     initParams:
+                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
+{
+  return RCTAppSetupDefaultModuleFromClass(moduleClass);
+}
+#endif
+
 - (void)applicationWillResignActive:(UIApplication *)application {
  if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BLANK_PREVIEW"]) {
    [self.window addSubview:_blankView];
@@ -207,7 +267,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
  pemCert = [pemCert stringByReplacingOccurrencesOfString:@"\n-----END CERTIFICATE-----" withString:@""];
  NSData *derCert = [[NSData alloc] initWithBase64EncodedString:pemCert options:NSDataBase64DecodingIgnoreUnknownCharacters];
  SecCertificateRef certRef = SecCertificateCreateWithData(NULL, (__bridge_retained CFDataRef) derCert);
-  CFArrayRef certArrayRef = CFArrayCreate(NULL, (void *)&certRef, 1, NULL);
+  CFArrayRef certArrayRef = CFArrayCreate(NULL, (const void **)&(certRef), 1, NULL);
  SecTrustSetAnchorCertificates(challenge.protectionSpace.serverTrust, certArrayRef);

  SecTrustResultType trustResult;
@@ -3,4 +3,4 @@
    "version" : 1,
    "author" : "xcode"
  }
-}
+}
@@ -5,15 +5,15 @@
 * @format
 */
 module.exports = {
-    transformer: {
-        getTransformOptions: async () => ({
-            transform: {
-                experimentalImportSupport: false,
-                inlineRequires: true,
-            },
-        }),
-    },
-    resolver: {
-        extraNodeModules: require('node-libs-react-native'),
-    },
+  transformer: {
+    getTransformOptions: async () => ({
+      transform: {
+        experimentalImportSupport: false,
+        inlineRequires: true,
+      },
+    }),
+  },
+  resolver: {
+    extraNodeModules: require('node-libs-react-native'),
+  },
 };
@@ -154,8 +154,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
        // 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);
-
    }
+
    private File getLogsFile() {
        final File pubDirectory = this.getPublicStorageDirectory();
        final File logFile = new File(pubDirectory, gethLogFileName);
@@ -414,6 +414,17 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
        }
    }

+    @ReactMethod
+    public void loginAccount(final String request) {
+        Log.d(TAG, "loginAccount");
+        String result = Statusgo.loginAccount(request);
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "loginAccount result: " + result);
+        } else {
+            Log.e(TAG, "loginAccount failed: " + result);
+        }
+    }
+
    @ReactMethod
    public void exportUnencryptedDatabase(final String accountData, final String password, final Callback callback) {
        Log.d(TAG, "login");
@@ -615,10 +626,10 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
    }

    @ReactMethod
-    public void loginWithKeycard(final String accountData, final String password, final String chatKey) {
+    public void loginWithKeycard(final String accountData, final String password, final String chatKey, final String nodeConfigJSON) {
        Log.d(TAG, "loginWithKeycard");
        this.migrateKeyStoreDir(accountData, password);
-        String result = Statusgo.loginWithKeycard(accountData, password, chatKey);
+        String result = Statusgo.loginWithKeycard(accountData, password, chatKey, nodeConfigJSON);
        if (result.startsWith("{\"error\":\"\"")) {
            Log.d(TAG, "LoginWithKeycard result: " + result);
        } else {
@@ -812,6 +823,11 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
        executeRunnableStatusGoMethod(() -> Statusgo.hashMessage(message), callback);
    }

+    @ReactMethod
+    public void startSearchForLocalPairingPeers(final Callback callback) throws JSONException {
+        executeRunnableStatusGoMethod(() -> Statusgo.startSearchForLocalPairingPeers(), callback);
+    }
+
    @ReactMethod
    public void getConnectionStringForBootstrappingAnotherDevice(final String configJSON, final Callback callback) throws JSONException {
         final JSONObject jsonConfig = new JSONObject(configJSON);
@@ -1161,19 +1177,19 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
        executeRunnableStatusGoMethod(() -> Statusgo.deleteImportedKey(address, password, keyStoreDir), callback);
    }

-    @ReactMethod(isBlockingSynchronousMethod = true) 
+    @ReactMethod(isBlockingSynchronousMethod = true)
    public String keystoreDir() {
        final String absRootDirPath = this.getNoBackupDirectory();
        return pathCombine(absRootDirPath, "keystore");
    }

-    @ReactMethod(isBlockingSynchronousMethod = true) 
+    @ReactMethod(isBlockingSynchronousMethod = true)
    public String backupDisabledDataDir() {
        return this.getNoBackupDirectory();
    }


-    @ReactMethod(isBlockingSynchronousMethod = true) 
+    @ReactMethod(isBlockingSynchronousMethod = true)
    public String logFileDirectory() {
        return getPublicStorageDirectory().getAbsolutePath();
    }
@@ -1363,5 +1379,16 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
            }, callback);
    }

+    @ReactMethod
+    public void initLogging(final boolean enabled, final boolean mobileSystem, final String logLevel, final Callback callback) throws JSONException {
+        final JSONObject jsonConfig = new JSONObject();
+        jsonConfig.put("Enabled", enabled);
+        jsonConfig.put("MobileSystem", mobileSystem);
+        jsonConfig.put("Level", logLevel);
+        jsonConfig.put("File", getLogsFile().getAbsolutePath());
+        final String config = jsonConfig.toString();
+        executeRunnableStatusGoMethod(() -> Statusgo.initLogging(config), callback);
+    }
+
 }

@@ -304,6 +304,19 @@ RCT_EXPORT_METHOD(hashMessage:(NSString *)message
    callback(@[result]);
 }

+RCT_EXPORT_METHOD(localPairingPreflightOutboundCheck:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"LocalPairingPreflightOutboundCheck() method called");
+#endif
+    NSString *result = StatusgoLocalPairingPreflightOutboundCheck();
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(startSearchForLocalPairingPeers:(RCTResponseSenderBlock)callback) {
+    NSString *result = StatusgoStartSearchForLocalPairingPeers();
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)configJSON
                  callback:(RCTResponseSenderBlock)callback) {

@@ -615,16 +628,25 @@ RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
    NSLog(@"%@", result);
 }

+RCT_EXPORT_METHOD(loginAccount:(NSString *)request) {
+#if DEBUG
+    NSLog(@"LoginAccount() method called");
+#endif
+    NSString *result = StatusgoLoginAccount(request);
+    NSLog(@"%@", result);
+}
+
 RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
                  password:(NSString *)password
-                  chatKey:(NSString *)chatKey) {
+                  chatKey:(NSString *)chatKey
+                  nodeConfigJSON:(NSString *)nodeConfigJSON) {
 #if DEBUG
    NSLog(@"LoginWithKeycard() method called");
 #endif
    [self getExportDbFilePath];
    [self migrateKeystore:accountData password:password];

-    NSString *result = StatusgoLoginWithKeycard(accountData, password, chatKey);
+    NSString *result = StatusgoLoginWithKeycard(accountData, password, chatKey, nodeConfigJSON);

    NSLog(@"%@", result);
 }
@@ -890,6 +912,37 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFileDirectory) {
    return rootUrl.path;
 }

+RCT_EXPORT_METHOD(initLogging:(BOOL)enabled
+                  mobileSystem:(BOOL)mobileSystem
+                  logLevel:(NSString *)logLevel
+                  callback:(RCTResponseSenderBlock)callback)
+{
+    NSString *logDirectory = [self logFileDirectory];
+    NSString *logFilePath = [logDirectory stringByAppendingPathComponent:@"geth.log"];
+
+    NSMutableDictionary *jsonConfig = [NSMutableDictionary dictionary];
+    jsonConfig[@"Enabled"] = @(enabled);
+    jsonConfig[@"MobileSystem"] = @(mobileSystem);
+    jsonConfig[@"Level"] = logLevel;
+    jsonConfig[@"File"] = logFilePath;
+
+    NSError *error = nil;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonConfig options:0 error:&error];
+
+    if (error) {
+        // Handle JSON serialization error
+        callback(@[error.localizedDescription]);
+        return;
+    }
+
+    NSString *config = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+
+    // Call your native logging initialization method here
+    NSString *initResult = StatusgoInitLogging(config);
+
+    callback(@[initResult]);
+}
+
 RCT_EXPORT_METHOD(generateAliasAsync:(NSString *)publicKey
                  callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG
@@ -1109,23 +1162,7 @@ RCT_EXPORT_METHOD(deactivateKeepAwake)

 - (NSString*) deviceName
 {
-
-    NSString* deviceName = nil;
-
-    if ([self.deviceId rangeOfString:@"iPod"].location != NSNotFound) {
-        deviceName = @"iPod Touch";
-    }
-    else if([self.deviceId rangeOfString:@"iPad"].location != NSNotFound) {
-        deviceName = @"iPad";
-    }
-    else if([self.deviceId rangeOfString:@"iPhone"].location != NSNotFound){
-        deviceName = @"iPhone";
-    }
-    else if([self.deviceId rangeOfString:@"AppleTV"].location != NSNotFound){
-        deviceName = @"Apple TV";
-    }
-
-    return deviceName;
+    return [[UIDevice currentDevice] name];;
 }

 - (NSDictionary *)constantsToExport
@@ -1,6 +1,5 @@
 var binary = require('@mapbox/node-pre-gyp');
 var path = require('path');
-var binding_path = binary.find(path.resolve(path.join(__dirname,'./../../../package.json')));
+var binding_path = binary.find(path.resolve(path.join(__dirname, './../../../package.json')));

 module.exports = require(binding_path);
-
@@ -833,6 +833,37 @@ void _SaveAccountAndLogin(const FunctionCallbackInfo<Value>& args) {

 }

+void _CreateAccountAndLogin(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 1) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for SaveAccountAndLogin")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'settingsJSON'")));
+		return;
+	}
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = CreateAccountAndLogin(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
 void _GenerateAlias(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -1010,7 +1041,7 @@ void _LoginWithKeycard(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();

-	if (args.Length() != 3) {
+	if (args.Length() != 4) {
 		// Throw an Error that is passed back to JavaScript
 		isolate->ThrowException(Exception::TypeError(
 			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for LoginWithKeycard")));
@@ -1034,6 +1065,11 @@ void _LoginWithKeycard(const FunctionCallbackInfo<Value>& args) {
 			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'keyHex'")));
 		return;
 	}
+	if (!args[3]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'nodeConfigJSON'")));
+		return;
+	}


 	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
@@ -1042,9 +1078,11 @@ void _LoginWithKeycard(const FunctionCallbackInfo<Value>& args) {
 	char *arg1 = *arg1Obj;
 	String::Utf8Value arg2Obj(isolate, args[2]->ToString(context).ToLocalChecked());
 	char *arg2 = *arg2Obj;
+	String::Utf8Value arg3Obj(isolate, args[3]->ToString(context).ToLocalChecked());
+    char *arg3 = *arg3Obj;

 	// Call exported Go function, which returns a C string
-	char *c = LoginWithKeycard(arg0, arg1, arg2);
+	char *c = LoginWithKeycard(arg0, arg1, arg2, arg3);

 	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
 	args.GetReturnValue().Set(ret);
@@ -1873,6 +1911,35 @@ void _ConnectionChange(const FunctionCallbackInfo<Value>& args) {
 	ConnectionChange(arg0, arg1);
 }

+void _InitLogging(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+    Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 1) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for InitLogging")));
+		return;
+	}
+
+	// Check the argument types
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'logSettingsJSON'")));
+		return;
+	}
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = InitLogging(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+    args.GetReturnValue().Set(ret);
+    delete c;
+}
+

 void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountGenerateAndDeriveAddresses", _MultiAccountGenerateAndDeriveAddresses);
@@ -1900,6 +1967,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "hashMessage", _HashMessage);
 	NODE_SET_METHOD(exports, "resetChainData", _ResetChainData);
 	NODE_SET_METHOD(exports, "saveAccountAndLogin", _SaveAccountAndLogin);
+	NODE_SET_METHOD(exports, "createAccountAndLogin", _CreateAccountAndLogin);
 	NODE_SET_METHOD(exports, "generateAlias", _GenerateAlias);
 	NODE_SET_METHOD(exports, "validateMnemonic", _ValidateMnemonic);
 	NODE_SET_METHOD(exports, "multiformatSerializePublicKey", _MultiformatSerializePublicKey);
@@ -1922,13 +1990,14 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "signTypedData", _SignTypedData);
 	NODE_SET_METHOD(exports, "sendTransaction", _SendTransaction);
 	NODE_SET_METHOD(exports, "appStateChange", _AppStateChange);
-        NODE_SET_METHOD(exports, "setSignalEventCallback", _SetSignalEventCallback);
+    NODE_SET_METHOD(exports, "setSignalEventCallback", _SetSignalEventCallback);
 	NODE_SET_METHOD(exports, "validateNodeConfig", _ValidateNodeConfig);
 	NODE_SET_METHOD(exports, "hashTypedData", _HashTypedData);
 	NODE_SET_METHOD(exports, "recover", _Recover);
 	NODE_SET_METHOD(exports, "hashTransaction", _HashTransaction);
 	NODE_SET_METHOD(exports, "connectionChange", _ConnectionChange);
 	NODE_SET_METHOD(exports, "pollSignal", _PollSignal);
+	NODE_SET_METHOD(exports, "initLogging", _InitLogging);
 }

 NODE_MODULE(NODE_GYP_MODULE_NAME, init)
@@ -18,4 +18,4 @@
    "url": "https://github.com/status-im/react-native-status/issues"
  },
  "homepage": "https://github.com/status-im/react-native-status#readme"
-}
+}
@@ -23,7 +23,6 @@ There are a few main files that define the whole build environment:
 * [`nix/shells.nix`](./shells.nix) - Definitions of other Nix shells used in builds
 * [`nix/targets.nix`](./targets.nix) - Hierarchy of main build targets
 * [`nix/pkgs.nix`](./pkgs.nix) - Definition of a custom `nixpkgs` repo
-* [`nix/config.nix`](./config.nix) - Default config values for instantiating `nixpkgs`
 * [`nix/overlay.nix`](./overlay.nix) - Overrides for `nixpkgs`, custom packages

 The [`default.nix`](../default.nix) and [`shell.nix`](../shell.nix) files at th repo root are just a gateway into the `nix` sub folder.
@@ -75,13 +74,6 @@ nix-build \
  --attr targets.mobile.android.release \
  --argstr secrets-file '/tmp/tmp-status-mobile-559a3a441/tmp.xAnrPuNtAP' \
  --option extra-sandbox-paths '/home/joe/.gradle/status-im.keystore /tmp/tmp-status-mobile-559a3a441/tmp.xAnrPuNtAP' \
-  --arg config '{ \
-    status-im.build-type="nightly";
-    status-im.build-number="2020022418";
-    status-im.android.keystore-path="/home/joe/.gradle/status-im.keystore";
-    status-im.android.abi-split="false";
-    status-im.android.abi-include="armeabi-v7a;arm64-v8a;x86";
-  }' \
  default.nix
 ```
 Some of those are required which is why just calling:
@@ -1,5 +1,18 @@
 # Known Issues

+## Ignoring Untrusted Substituter on NixOS
+
+When using our setup on NixOS users can see this warning:
+```
+warning: ignoring untrusted substituter 'https://nix-cache.status.im/', you are not a trusted user.
+```
+Which is due to incorrect `trusted-users` setting:
+```
+> grep trusted-users /etc/nix/nix.conf
+trusted-users = root
+```
+Which can be extended using the [`nix.settings.trusted-users`](https://search.nixos.org/options?channel=23.05&show=nix.settings.trusted-users) option.
+
 ## Too many open files

 ### Single-User Installation
@@ -8,27 +8,27 @@ The main config file is [`nix/nix.conf`](/nix/nix.conf) and its main purpose is

 ## Build arguments

-We leverage the `config` argument of standard `nixpkgs` for our own parameterization of the builds (e.g. to pass a build number or build type).
+We leverage the environment variables for parameterization of the builds (e.g. to pass a build number or build type).

-Here is a sample structure of the `config` attribute set:
-
-```nix
-{
-  status-im = {
-    build-type = "pr";     # Build type (influences which .env file gets used for feature flags)
-    build-number = 9999;   # Used for versionCode and CFBundleVersion in Android and iOS respectively
-    android = {
-      gradle-opts = "";    # Gradle options passed for Android builds
-      abi-split = false;   # If APKs should be split based on architectures
-      abi-include = "x86"; # Android architectures to build for
-    };
-    status-go = {
-      src-override = "$HOME/my/source/status-go"; # local source override
-    };
-  };
-}
+Here is the list of variables you can use to override defaults:
+```shell
+# Build type (influences which .env file gets used for feature flags)
+export BUILD_TYPE="pr"
+# Used for versionCode and CFBundleVersion in Android and iOS respectively
+export BUILD_NUMBER=9999
+# Gradle options passed for Android builds
+export ANDROID_GRADLE_OPTS=""
+# If APKs should be split based on architectures
+export ANDROID_ABI_SPLIT=false
+# Android architectures to build for
+export ANDROID_ABI_INCLUDE="x86"
+# Local source override, see below
+export STATUS_GO_SRC_OVERRIDE="$HOME/my/source/status-go"
+export STATUS_GO_IPFS_GATEWAY_URL="https://ipfs.status.im/"
 ```
-You can see the defaults in [`nix/config.nix`](./config.nix).
+You can see the defaults in code:
+- [`nix/status-go/default.nix`](./status-go/default.nix)
+- [`nix/mobile/android/release.nix`](./mobile/android/release.nix)

 ## Shell

@@ -1,24 +0,0 @@
-# Status defaults for config
-{
-  status-im = {
-    build-type = "pr";       # Build type (influences which .env file gets used for feature flags)
-    build-number = 9999;     # Used for versionCode and CFBundleVersion in Android and iOS respectively
-    commit-hash = "unknown"; # Included in APK Manifest for easier identification.
-
-    android = {
-      gradle-opts = null;    # Gradle options passed for Android builds
-      apk-signed = true;     # F-Droid builds aren't signed by us
-      abi-split = false;     # If APKs should be split based on architectures
-      abi-include = "armeabi-v7a;arm64-v8a;x86"; # Android architectures to build for
-    };
-
-    status-go = {
-      src-override = null;
-      ipfs-gateway-url = "https://ipfs.status.im/";
-    };
-  };
-
-  # Android SDK requires an accepted license
-  android_sdk.accept_license = true;
-  allowUnfree = true;
-}
@@ -1,17 +1,4 @@
 [
-  {
-    "path": "args4j/args4j/2.0.26/args4j-2.0.26",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "f0aada195340b361a1a45aa9c3d417c7cbb0a6b5",
-      "sha256": "0151vnbmbjnr5089ik8np91r3a4g2ylcahih22zr49a3ilri6f80"
-    },
-    "jar": {
-      "sha1": "01ebb18ebb3b379a74207d5af4ea7c8338ebd78b",
-      "sha256": "193i0xgn295bdz5gk4zrk4ncfa29x8vl97bfd01kl1za44ixm6wq"
-    }
-  },
-
  {
    "path": "bidi/bidi/2.1.6/bidi-2.1.6",
    "host": "https://repo.clojars.org",
@@ -39,15 +26,15 @@
  },

  {
-    "path": "binaryage/oops/0.7.0/oops-0.7.0",
+    "path": "binaryage/oops/0.7.2/oops-0.7.2",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "de223223c4272ce9ee75c81f8764e894029630b4",
-      "sha256": "0sz21344v8lxd6mjlrb8r8yyz934h4lnkwqlpg3csgsi11mppya3"
+      "sha1": "bdce8b7dc9f2b569f5c42a4d6108325899970eb9",
+      "sha256": "1rc4slg4836pnxds447sam9hsiwd4x2al1ykazp6iglc10ix9igd"
    },
    "jar": {
-      "sha1": "9729401b4c6551f6becf44cf0818d04255410099",
-      "sha256": "0jkdybj37q3a4vvay3asj47ms7l3qjpidhkk30293w0zc7jk18k8"
+      "sha1": "2f47298f9aa41ef6f2c4f2c49f472eb113e94ae7",
+      "sha256": "0c9f7wylwl0lxcn4vqncprlzmdddqhxzb3vdaawdm0da0xh010hb"
    }
  },

@@ -65,28 +52,28 @@
  },

  {
-    "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
+    "path": "cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "3a39a7a1690b4ee6b48a4f0c65d089eacf47e8a5",
-      "sha256": "1qhz6q1afg22j5d8zyxzqsbbinix3zh4lyy2acij8hrp02f274wj"
+      "sha1": "d2dd4e969cf44bfffd8609d0d4945a4a561b5a58",
+      "sha256": "0f4yxk0wx1i13inkq9zjd1450bbly5lf62216a88clmn4l5x8knn"
    },
    "jar": {
-      "sha1": "5ae0efd9377a5e60c084bdaf4a2ce094f759ce23",
-      "sha256": "0drxf9nm23i1pcgrkwbcr09msq37csilzww38709add0hz8spjhq"
+      "sha1": "45f6034b26a14138e74145b7a4059628c0fedcd1",
+      "sha256": "1dy1l6y8cb8xiqq97a4lf8giyiicq4wfl4s2lxn5fb6614cjxqx2"
    }
  },

  {
-    "path": "cider/piggieback/0.4.1/piggieback-0.4.1",
+    "path": "cider/piggieback/0.5.2/piggieback-0.5.2",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "c432ffbdd51b67bf82e4a63f1f4f102ba55f4ddf",
-      "sha256": "191wpjlq78s08d509hq2yrxsdzm3qfkqf2zdiwxxlmmh14dg65rx"
+      "sha1": "7e88493d18a4aaf13aff9d0319dcd82178d95f1d",
+      "sha256": "08w5y48bpvnlyqbdjs0h7nz9dp35rc7b46hsvh1a0vpdszisxh0p"
    },
    "jar": {
-      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
-      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
+      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
+      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
    }
  },

@@ -207,162 +194,6 @@
    }
  },

-  {
-    "path": "com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "d04690f71f3393e23f30998d9534365274fa5f9f",
-      "sha256": "1khlag991h7326xsjnpx6hnyip5cwawsmxz6m20kkzavvihsfw21"
-    },
-    "jar": {
-      "sha1": "f7be08ec23c21485b9b5a1cf1654c2ec8c58168d",
-      "sha256": "1k9zl76xi2nykixaynss2gk4h861zipdb9xl6q1br0ln4hscx1f8"
-    }
-  },
-
-  {
-    "path": "com/google/code/gson/gson/2.7/gson-2.7",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "09f9e39f9b791aeb73ba428ad30872f1a703edb3",
-      "sha256": "1phf2qksjf75ykwgp39189jdbqsn5zrmi07g8h522yxq0zn3cfbj"
-    },
-    "jar": {
-      "sha1": "751f548c85fa49f330cecbb1875893f971b33c4e",
-      "sha256": "0clda1xrjfja969xsbrhc61ip588xvsi9k054kpd4cz1m5gfnhrd"
-    }
-  },
-
-  {
-    "path": "com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "2ccdbc92bc4dfbc9159bf43cf794c240ec37621f",
-      "sha256": "04gmnxv7fpsn66wvmsip4s9hqcc1wphsy3bg13vx262kg9w35j19"
-    },
-    "jar": {
-      "sha1": "7e6e9ec8574d2ff6503f3f774c43695d0276f8f4",
-      "sha256": "1l6g27a361nyl90ln9k2xamjds9xm3kjrfb9xcqz1gqhjgmnml7i"
-    }
-  },
-
-  {
-    "path": "com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "19c878e6870c8382864dcc459de1c6bfe7f36e54",
-      "sha256": "16l1kbc7wbisjmjvkfac854ddyql0b5smdxr2vz8wdms26vydp1y"
-    },
-    "jar": {
-      "sha1": "a6a2b2df72fd13ec466216049b303f206bd66c5d",
-      "sha256": "0831h49f21znl7z8lkr2ikywwajdachgxva7zpj8sp7rl2d9998h"
-    }
-  },
-
-  {
-    "path": "com/google/guava/guava/25.1-jre/guava-25.1-jre",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "5dd13f6c0d56f05059c5eba88a20a8699ece583d",
-      "sha256": "1pya5f4vbh8z9zvprnl64i9qqp0rghjfsflx64q9md28w5pb9y35"
-    },
-    "jar": {
-      "sha1": "6c57e4b22b44e89e548b5c9f70f0c45fe10fb0b4",
-      "sha256": "1gqaqxdnxhr1gk9haldrifvda8ingj1s4bin5sf455y38jic7c3d"
-    }
-  },
-
-  {
-    "path": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "b964a9414771661bdf35a3f10692a2fb0dd2c866",
-      "sha256": "1gnn7b80krv19qjd9hhacahffqq9iwqgmw4ds56wp9wk3rbqrjgh"
-    },
-    "jar": {
-      "sha1": "ed28ded51a8b1c6b112568def5f4b455e6809019",
-      "sha256": "1xpcvmnw2y3fa56hhk8dmknrq8afr6r3kdmzsg9hnwgjg3msg519"
-    }
-  },
-
-  {
-    "path": "com/google/javascript/closure-compiler-externs/v20200830/closure-compiler-externs-v20200830",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "703aed7fd9e61298194db257c105b934c5e0cc12",
-      "sha256": "06wpqr4rpj9qz067dn6j54k37lpaqpljrqzamdfb1lrkpygksb29"
-    },
-    "jar": {
-      "sha1": "d5182c2e1bd226e39835c3b97875e27b54ee7401",
-      "sha256": "0f3zgq7k9n1cwm787k2kkyxc9r033h54wlmb60d4nfhd39dbsza3"
-    }
-  },
-
-  {
-    "path": "com/google/javascript/closure-compiler-unshaded/v20200830/closure-compiler-unshaded-v20200830",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "f1ac30ac5c39c2b6a8b9672373bebb1b5521cffa",
-      "sha256": "0nhxzkdyri03mccxf65lxjxn1fafvhdkqvphf8vkxzkjbgiqwjdm"
-    },
-    "jar": {
-      "sha1": "a017550b64e2690e3a4a5340d1eb699809b9f775",
-      "sha256": "1kpihfzp4x8vxykgd6lcf4nb1r4f5zp3hpivs2793ny019w73rbn"
-    }
-  },
-
-  {
-    "path": "com/google/jsinterop/base/1.0.0/base-1.0.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "9d68520e28ac9b035f86a520692196ea31aaf4f0",
-      "sha256": "0byl8ksnlpvs0nm3a2midrbp6zrgxl7jzqgcz7z1hb1iy3jzfdk1"
-    },
-    "jar": {
-      "sha1": "5d2a5cda3092004832cb67cfe7a100a2ef8411f8",
-      "sha256": "04j4r89vimffmfim0ipmgbd54bxx111c0ygs34dn0krqdb13adk0"
-    }
-  },
-
-  {
-    "path": "com/google/jsinterop/jsinterop-annotations/1.0.2/jsinterop-annotations-1.0.2",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "718fc66ea5e7ee1597960c5874d4603542814166",
-      "sha256": "0bslwg7rqjanczf3sz11pgdans4hcl4nbp1f5xyy7dzfnkhyhbhx"
-    },
-    "jar": {
-      "sha1": "abd7319f53d018e11108a88f599bd16492448dd2",
-      "sha256": "057hgcrix9ss4cfgkl7pqqlcc7g1xnlx39i8lipn0sjv3xrl9bzw"
-    }
-  },
-
-  {
-    "path": "com/google/protobuf/protobuf-java/3.11.1/protobuf-java-3.11.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "599529d980b7ca0b4145ae48d4323f3e85e5b1c5",
-      "sha256": "0a0w96psyxpss3y3va5b8hcqzfxxy2kisng9hc6b4im9f83gj56x"
-    },
-    "jar": {
-      "sha1": "1752390841a56e112b01990c9b523e6978abb24f",
-      "sha256": "1wbwasjsqb19xpjk66wyih67492di8sg64qh2n2az7mpfy1dn0aa"
-    }
-  },
-
-  {
-    "path": "com/google/re2j/re2j/1.3/re2j-1.3",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "565024724e6527255f0ae38e507c7f90c55b21ce",
-      "sha256": "0bzj30pnw9bm7jfcwl5ypaqrgvvp3yndf9vdw0qjfyzr9xx39z2d"
-    },
-    "jar": {
-      "sha1": "dc7de2b32fa8cc569ab44fb849abadbbc6983b91",
-      "sha256": "06fypacl4jsbiddgby40fxxz6bpck7jvc5ch344f472cqnhhy16q"
-    }
-  },
-
  {
    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
    "host": "https://repo1.maven.org/maven2",
@@ -376,6 +207,19 @@
    }
  },

+  {
+    "path": "com/google/javascript/closure-compiler-unshaded/v20210302/closure-compiler-unshaded-v20210302",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "1f790dd30fd0c2279cf73d79c4eba6a9f7516532",
+      "sha256": "17vb4r6bn97s4jjwja7xmpwfdnfzknhyigz2vdiqpqyh4a31hb3c"
+    },
+    "jar": {
+      "sha1": "14a87750b6bbe6e29932446b6db1f015851fd4e8",
+      "sha256": "11ydn317q2aqh1bkm7gry48r2bakw5ifpx1yrrq192vq5kg7zwhq"
+    }
+  },
+
  {
    "path": "com/ibm/icu/icu4j/66.1/icu4j-66.1",
    "host": "https://repo1.maven.org/maven2",
@@ -389,6 +233,58 @@
    }
  },

+  {
+    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "44b9477418d2942d45550f7e7c66c16262062d0e",
+      "sha256": "1yscxabk7i59vgfjg7c1y3prj39h1d8prnwgxbisc4ni29qdpf5x"
+    },
+    "jar": {
+      "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
+      "sha256": "0scm6321zz76dc3bs8sy2qyami755lz4lq5455gl67bi9slxyha2"
+    }
+  },
+
+  {
+    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "65112009d674333c1acfafb4e198ff250d710764",
+      "sha256": "007nyd66fqp3fbrmnsbfp1fpkhmr2lk33qmkp3salqld3xd7qlc8"
+    },
+    "jar": {
+      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
+      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
+    }
+  },
+
+  {
+    "path": "commons-io/commons-io/2.6/commons-io-2.6",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "5060835593e5b6ed18c82fc2e782f0a3c30a00b1",
+      "sha256": "0q4a6fp6xkyd86ikymkyv2plhf9vj8aqvggxg9d1yad2jcw8c8qc"
+    },
+    "jar": {
+      "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf",
+      "sha256": "04v5fg53jl9gbn6pyz3l7kbpxv0xjzyasnw6yd1a3hhacq2d6xzq"
+    }
+  },
+
+  {
+    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "9e8da477b6682094d56802cb155291a2acb829bd",
+      "sha256": "036z64iprypccz03iq7lqxvw99xjh4xlsfmfwbs37pmhfnfmbdnx"
+    },
+    "jar": {
+      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
+      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
+    }
+  },
+
  {
    "path": "com/taoensso/encore/2.105.0/encore-2.105.0",
    "host": "https://repo.clojars.org",
@@ -467,58 +363,6 @@
    }
  },

-  {
-    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "44b9477418d2942d45550f7e7c66c16262062d0e",
-      "sha256": "1yscxabk7i59vgfjg7c1y3prj39h1d8prnwgxbisc4ni29qdpf5x"
-    },
-    "jar": {
-      "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
-      "sha256": "0scm6321zz76dc3bs8sy2qyami755lz4lq5455gl67bi9slxyha2"
-    }
-  },
-
-  {
-    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "65112009d674333c1acfafb4e198ff250d710764",
-      "sha256": "007nyd66fqp3fbrmnsbfp1fpkhmr2lk33qmkp3salqld3xd7qlc8"
-    },
-    "jar": {
-      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
-      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
-    }
-  },
-
-  {
-    "path": "commons-io/commons-io/2.6/commons-io-2.6",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "5060835593e5b6ed18c82fc2e782f0a3c30a00b1",
-      "sha256": "0q4a6fp6xkyd86ikymkyv2plhf9vj8aqvggxg9d1yad2jcw8c8qc"
-    },
-    "jar": {
-      "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf",
-      "sha256": "04v5fg53jl9gbn6pyz3l7kbpxv0xjzyasnw6yd1a3hhacq2d6xzq"
-    }
-  },
-
-  {
-    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "9e8da477b6682094d56802cb155291a2acb829bd",
-      "sha256": "036z64iprypccz03iq7lqxvw99xjh4xlsfmfwbs37pmhfnfmbdnx"
-    },
-    "jar": {
-      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
-      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
-    }
-  },
-
  {
    "path": "crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0",
    "host": "https://repo.clojars.org",
@@ -663,15 +507,15 @@
  },

  {
-    "path": "io/undertow/undertow-core/2.1.3.Final/undertow-core-2.1.3.Final",
+    "path": "io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final",
    "host": "https://repo1.maven.org/maven2",
    "pom": {
-      "sha1": "28ef70062f9f9442f346d345fb7403d1181c2603",
-      "sha256": "0khc267iljd5b3wlb9rks3zr9blqiz55dky2y0lgx5slxvr5ww95"
+      "sha1": "0c0f3b7a6b2c2b4e73d719362b4595e77fbe98cd",
+      "sha256": "14z0577jgx3r510zgjrzd2vcz9md3d5qpb81ir14zis9vdn5pwxf"
    },
    "jar": {
-      "sha1": "ea86fcf86ad8d283c5b14a6820061a6bd203839e",
-      "sha256": "00z8d052wp0ba0f64ki08867d7hsx3w1zrhngpbm45qcqs2hphai"
+      "sha1": "78650b4029dd9280c4769d9425b5559f12cb83bf",
+      "sha256": "1brpkd2l98byf76jga6hj5drv5sj2d93lxlq2xz0rxpqyqas1xm4"
    }
  },

@@ -741,28 +585,15 @@
  },

  {
-    "path": "nrepl/nrepl/0.7.0/nrepl-0.7.0",
+    "path": "nrepl/nrepl/1.0.0/nrepl-1.0.0",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "913a846875363d8255bcede71d1186082f0f05d5",
-      "sha256": "1f1ii5k975fmlcqj6dydc28mzbpiyyq9hqzv9lnzm9n15fgggafa"
+      "sha1": "79b3e7030f2da9c4b8a20e4e5b44b401fbaccefc",
+      "sha256": "0wnsyd2vwikqljl8si3040s5b89fm8j9zfa4a1c8g3lzj4npjwvl"
    },
    "jar": {
-      "sha1": "55dabf4f271d30e7a8f0e198055c000398991e14",
-      "sha256": "1h9zin2z4ll3jfr0cqp7zfvy6d2axrjjnyv8qbir0krjsss13ikw"
-    }
-  },
-
-  {
-    "path": "org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "17ab37f0fb0338647a70ab40f15c2c685e4185e3",
-      "sha256": "0s0062lnqk8vq23dil7qma7rl5x1h16h2x4bah7fw6rbvm9h7cfy"
-    },
-    "jar": {
-      "sha1": "518929596ee3249127502a8573b2e008e2d51ed3",
-      "sha256": "15br88i0dk5l0hdh6ikgg6kvdbdir38jdw69j9s579az5xil317w"
+      "sha1": "f47774c43493efdc879d36b95ebd67ea0d9c890a",
+      "sha256": "1fx5ssmixgqmklliw0ng8fjz41kkhys56x8dbwv9yqrfzws9f2x3"
    }
  },

@@ -780,15 +611,15 @@
  },

  {
-    "path": "org/clojure/clojurescript/1.10.773/clojurescript-1.10.773",
+    "path": "org/clojure/clojurescript/1.10.844/clojurescript-1.10.844",
    "host": "https://repo1.maven.org/maven2",
    "pom": {
-      "sha1": "ae4301ccf5a38dad594760b1c08774fc471fd59c",
-      "sha256": "15vfzdq8vx9slppvkyvgvzndnrgqrc5m2vl0969lnprwizmrv570"
+      "sha1": "f4004d2de394c5f41317a38ae32f79e78826b45f",
+      "sha256": "0nq8mz45gl86aigrmjnkq2fd612caayxfzkyk03dmp5v4sr5zxf6"
    },
    "jar": {
-      "sha1": "9f9729dbbf9b814c83dc189977b447d2ae92b6cd",
-      "sha256": "1r0b6241ci1jwh6dk2yqb2ylh4aj4f2df5xxzwx3qp33xlday11z"
+      "sha1": "86bedf67c795c72bde3feb0415b41be8b95f2cbb",
+      "sha256": "03rs4dpwssa5ym9idip6vkxq27np3dwx7mzxms2s0yv4lipla58v"
    }
  },

@@ -884,28 +715,28 @@
  },

  {
-    "path": "org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f",
+    "path": "org/clojure/google-closure-library/0.0-20201211-3e6c510d/google-closure-library-0.0-20201211-3e6c510d",
    "host": "https://repo1.maven.org/maven2",
    "pom": {
-      "sha1": "1aa0b32fd70e6644dcb06b88b55630d6bbb6f188",
-      "sha256": "1wq6gvhlvy3mdhj1cb0w62kclqd7x42dqd0275l40rlla5q5h1z1"
+      "sha1": "9fbaa40e54d12d1d35afee260600b8e7325034cc",
+      "sha256": "046qdcbqclxz0p4lnahglqkazraw47gymx3cin5jrw2wd7dpmr0l"
    },
    "jar": {
-      "sha1": "4fc15daa4fd1b150e8c6d32755796634446dd86a",
-      "sha256": "1ykw162gng0lcbxn2f387vv1l4d7hfwyayhxgzqqgi9jx211fzw5"
+      "sha1": "b8c673dd84d8ed85c6d857e28afee5524a0ef82c",
+      "sha256": "0q84zw1nl0sg69cx9i7g2bkw7996ig2j3m9pw4yfysjsn5aycm1q"
    }
  },

  {
-    "path": "org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f",
+    "path": "org/clojure/google-closure-library-third-party/0.0-20201211-3e6c510d/google-closure-library-third-party-0.0-20201211-3e6c510d",
    "host": "https://repo1.maven.org/maven2",
    "pom": {
-      "sha1": "dea94d117aa88d75e281f877914454f79df06bf2",
-      "sha256": "1nysls9ywj3b3zvlfwy68kayx47r4bacidmq1vx8w4h043l9kxrr"
+      "sha1": "93650c3e00cf1dc0811d2e347068828cf6700fca",
+      "sha256": "1y6a10n8w98gr02ys8zxkddq2qrz7l5y3462d4hg8jpaq3r2pdm8"
    },
    "jar": {
-      "sha1": "6025affb7181cd40418600864f58eed1ea80055d",
-      "sha256": "0w6waii2qps7vp3nzbj5nai809xdq26ss0cabl4wz1s8fc6js6qw"
+      "sha1": "edcb415db3c88ada448cfbf65b021f12c7b131e9",
+      "sha256": "1f5hjr2r323il0g9maamwdbgqxrvm3hg87jsgc13wa7naw4pm9pi"
    }
  },

@@ -935,19 +766,6 @@
    }
  },

-  {
-    "path": "org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "3f21bdbd549557232eb0bf0965b2beea34004d52",
-      "sha256": "0cyyhf82pn4mjw4whr4sx3cnxrgsk862dq92gn79yawxr6842i51"
-    },
-    "jar": {
-      "sha1": "027d2ebe594eb5f46d6bcea62593e184937b3011",
-      "sha256": "0kcfcn12dmyrm7sk1jkrlcb7ws8kazfqziv62mfid62xc095gayz"
-    }
-  },
-
  {
    "path": "org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0",
    "host": "https://repo1.maven.org/maven2",
@@ -961,6 +779,19 @@
    }
  },

+  {
+    "path": "org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "3f21bdbd549557232eb0bf0965b2beea34004d52",
+      "sha256": "0cyyhf82pn4mjw4whr4sx3cnxrgsk862dq92gn79yawxr6842i51"
+    },
+    "jar": {
+      "sha1": "027d2ebe594eb5f46d6bcea62593e184937b3011",
+      "sha256": "0kcfcn12dmyrm7sk1jkrlcb7ws8kazfqziv62mfid62xc095gayz"
+    }
+  },
+
  {
    "path": "org/clojure/tools.cli/1.0.194/tools.cli-1.0.194",
    "host": "https://repo1.maven.org/maven2",
@@ -1014,15 +845,15 @@
  },

  {
-    "path": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14",
+    "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
    "host": "https://repo1.maven.org/maven2",
    "pom": {
-      "sha1": "99a56e3312f8ece1d457c8ca0a3c4b69d173d000",
-      "sha256": "09ianw2880ch3x6xq5d2cz2b15ik6f4ndf8hb7ckw7lr0ndg2y8q"
+      "sha1": "95452a7fdac1d358f1dd66b33e49f4440e986922",
+      "sha256": "0gkazzg8771g3pc90fb99wmlk99rjimcryrmzz6zab742m4dbina"
    },
    "jar": {
-      "sha1": "775b7e22fb10026eed3f86e8dc556dfafe35f2d5",
-      "sha256": "0pchd4360mim0f0a6vwr33szigihgvv4ic1scz1l9mxssq5k4s10"
+      "sha1": "0abe5e8068014ccb34cf075637a00b7ce37e4a8c",
+      "sha256": "0v5pxjl9p7wwfrrzkkqh6qbvnn0p8n342smxzcqk3qxl4ah3aqnk"
    }
  },

@@ -1039,19 +870,6 @@
    }
  },

-  {
-    "path": "org/graalvm/js/js/20.1.0/js-20.1.0",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "95452a7fdac1d358f1dd66b33e49f4440e986922",
-      "sha256": "0gkazzg8771g3pc90fb99wmlk99rjimcryrmzz6zab742m4dbina"
-    },
-    "jar": {
-      "sha1": "0abe5e8068014ccb34cf075637a00b7ce37e4a8c",
-      "sha256": "0v5pxjl9p7wwfrrzkkqh6qbvnn0p8n342smxzcqk3qxl4ah3aqnk"
-    }
-  },
-
  {
    "path": "org/graalvm/regex/regex/20.1.0/regex-20.1.0",
    "host": "https://repo1.maven.org/maven2",
@@ -1182,6 +1000,19 @@
    }
  },

+  {
+    "path": "org/ow2/asm/asm/7.1/asm-7.1",
+    "host": "https://repo1.maven.org/maven2",
+    "pom": {
+      "sha1": "7e40eb6619fd20bd7d98bf775bfdd810aec87ac7",
+      "sha256": "101i3pyrq082kjyz413hfqwkjjsyfnk9kx3rqr38ln56mlp78a8g"
+    },
+    "jar": {
+      "sha1": "fa29aa438674ff19d5e1386d2c3527a0267f291e",
+      "sha256": "1pnlb1ick32bihpzc599xl9ppd07qhls6pm0xaqwrj9cdlmzmcja"
+    }
+  },
+
  {
    "path": "org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1",
    "host": "https://repo1.maven.org/maven2",
@@ -1234,19 +1065,6 @@
    }
  },

-  {
-    "path": "org/ow2/asm/asm/7.1/asm-7.1",
-    "host": "https://repo1.maven.org/maven2",
-    "pom": {
-      "sha1": "7e40eb6619fd20bd7d98bf775bfdd810aec87ac7",
-      "sha256": "101i3pyrq082kjyz413hfqwkjjsyfnk9kx3rqr38ln56mlp78a8g"
-    },
-    "jar": {
-      "sha1": "fa29aa438674ff19d5e1386d2c3527a0267f291e",
-      "sha256": "1pnlb1ick32bihpzc599xl9ppd07qhls6pm0xaqwrj9cdlmzmcja"
-    }
-  },
-
  {
    "path": "org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final",
    "host": "https://repo1.maven.org/maven2",
@@ -1299,6 +1117,19 @@
    }
  },

+  {
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
+      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
+    },
+    "jar": {
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+    }
+  },
+
  {
    "path": "re-com/re-com/2.8.0/re-com-2.8.0",
    "host": "https://repo.clojars.org",
@@ -1312,6 +1143,19 @@
    }
  },

+  {
+    "path": "refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "699468e940eace1064d6fa7a7553bf87d4ed4026",
+      "sha256": "12djd3mxi22b23c9vrv6amq1r9x9iq9b00s3ywl301rjmq5lqh4l"
+    },
+    "jar": {
+      "sha1": "2b3bb82da53b5db9c2b2aa298417816b81d0ed97",
+      "sha256": "1ysqabmlnghki6x0636zngxza2d83c85276wp9ma9wk183mkv52a"
+    }
+  },
+
  {
    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
    "host": "https://repo.clojars.org",
@@ -1351,32 +1195,6 @@
    }
  },

-  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
-      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
-    },
-    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
-    }
-  },
-
-  {
-    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "0bce30b420249ba7e4b90cbb3e046b4bb5416389",
-      "sha256": "0zmg5qc8d55pry7832isiwd2q237znfjqjpxchd2hvlpalh5qnva"
-    },
-    "jar": {
-      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
-      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
-    }
-  },
-
  {
    "path": "ring-cors/ring-cors/0.1.8/ring-cors-0.1.8",
    "host": "https://repo.clojars.org",
@@ -1456,15 +1274,15 @@
  },

  {
-    "path": "thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot",
+    "path": "thheller/shadow-cljs/2.12.0/shadow-cljs-2.12.0-aot",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "c06750fa2103c3ade8e9580034401d7379558768",
-      "sha256": "09m0yl56b2ld1a9031x6x3wlzys608hfzdf87hrnmpihg8khq5ph"
+      "sha1": "e89cabf1b6c7d268ee38343c839bc17c62160eaf",
+      "sha256": "0l9yv2c6acp3n2x5z1g9nqwqx58hl619srls5flnlf2x41f5gn7f"
    },
    "jar": {
-      "sha1": "6da05fd411b96fa939fa4df19aa28c0a37b0a87d",
-      "sha256": "1w6xm7bfg216cygmc4skns2laip3b7vp8nvgqmylpgna1k21mps2"
+      "sha1": "4748679d4953be302acf7e791b284a8dc49523d7",
+      "sha256": "1gcbna7wam7fnhrxxfb4v3agq0655la2fmwd7r9a6ip9xxc86z3a"
    }
  },

@@ -1481,6 +1299,19 @@
    }
  },

+  {
+    "path": "thheller/shadow-undertow/0.1.0/shadow-undertow-0.1.0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "456dc9b20bccd14b6012540547d1a8e7c47f7c66",
+      "sha256": "0gwxvbpkfvy84h01gjasd0fnfgqmsaybiilbz0461vaazvcd3v8b"
+    },
+    "jar": {
+      "sha1": "e072ad66285641c59df19f5352872a51da106156",
+      "sha256": "1ywcyfsrr3g42kxwchj6jvb2x43md3sdpnnk87h9m5g786ilay3r"
+    }
+  },
+
  {
    "path": "thheller/shadow-util/0.7.0/shadow-util-0.7.0",
    "host": "https://repo.clojars.org",
@@ -1,10 +1,9 @@
-args4j/args4j/2.0.26/args4j-2.0.26.jar
 bidi/bidi/2.1.6/bidi-2.1.6.jar
 binaryage/env-config/0.2.2/env-config-0.2.2.jar
-binaryage/oops/0.7.0/oops-0.7.0.jar
+binaryage/oops/0.7.2/oops-0.7.2.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
-cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
-cider/piggieback/0.4.1/piggieback-0.4.1.jar
+cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0.jar
+cider/piggieback/0.5.2/piggieback-0.5.2.jar
 cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
@@ -14,30 +13,19 @@ com/cognitect/transit-cljs/0.8.248/transit-cljs-0.8.248.jar
 com/cognitect/transit-java/1.0.343/transit-java-1.0.343.jar
 com/cognitect/transit-js/0.8.846/transit-js-0.8.846.jar
 com/fasterxml/jackson/core/jackson-core/2.8.7/jackson-core-2.8.7.jar
-com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar
-com/google/code/gson/gson/2.7/gson-2.7.jar
-com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1.jar
-com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.jar
-com/google/guava/guava/25.1-jre/guava-25.1-jre.jar
-com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar
-com/google/javascript/closure-compiler-externs/v20200830/closure-compiler-externs-v20200830.jar
-com/google/javascript/closure-compiler-unshaded/v20200830/closure-compiler-unshaded-v20200830.jar
-com/google/jsinterop/base/1.0.0/base-1.0.0.jar
-com/google/jsinterop/jsinterop-annotations/1.0.2/jsinterop-annotations-1.0.2.jar
-com/google/protobuf/protobuf-java/3.11.1/protobuf-java-3.11.1.jar
-com/google/re2j/re2j/1.3/re2j-1.3.jar
 com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
+com/google/javascript/closure-compiler-unshaded/v20210302/closure-compiler-unshaded-v20210302.jar
 com/ibm/icu/icu4j/66.1/icu4j-66.1.jar
+commons-codec/commons-codec/1.10/commons-codec-1.10.jar
+commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
+commons-io/commons-io/2.6/commons-io-2.6.jar
+compojure/compojure/1.5.2/compojure-1.5.2.jar
 com/taoensso/encore/2.105.0/encore-2.105.0.jar
 com/taoensso/timbre/4.10.0/timbre-4.10.0.jar
 com/taoensso/truss/1.5.0/truss-1.5.0.jar
 com/taoensso/tufte/2.1.0/tufte-2.1.0.jar
 com/wsscode/pathom/2.2.31/pathom-2.2.31.jar
 com/wsscode/spec-inspec/1.0.0-alpha2/spec-inspec-1.0.0-alpha2.jar
-commons-codec/commons-codec/1.10/commons-codec-1.10.jar
-commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
-commons-io/commons-io/2.6/commons-io-2.6.jar
-compojure/compojure/1.5.2/compojure-1.5.2.jar
 crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0.jar
 crypto-random/crypto-random/1.2.0/crypto-random-1.2.0.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
@@ -49,16 +37,15 @@ hickory/hickory/0.7.1/hickory-0.7.1.jar
 http-kit/http-kit/2.2.0/http-kit-2.2.0.jar
 instaparse/instaparse/1.4.0/instaparse-1.4.0.jar
 io/aviso/pretty/0.1.33/pretty-0.1.33.jar
-io/undertow/undertow-core/2.1.3.Final/undertow-core-2.1.3.Final.jar
+io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final.jar
 javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
 javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar
 medley/medley/0.8.2/medley-0.8.2.jar
 mvxcvi/alphabase/1.0.0/alphabase-1.0.0.jar
 net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
-nrepl/nrepl/0.7.0/nrepl-0.7.0.jar
-org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0.jar
+nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
 org/clojure/clojure/1.10.1/clojure-1.10.1.jar
-org/clojure/clojurescript/1.10.773/clojurescript-1.10.773.jar
+org/clojure/clojurescript/1.10.844/clojurescript-1.10.844.jar
 org/clojure/core.async/1.3.610/core.async-1.3.610.jar
 org/clojure/core.cache/1.0.207/core.cache-1.0.207.jar
 org/clojure/core.memoize/1.0.236/core.memoize-1.0.236.jar
@@ -66,19 +53,18 @@ org/clojure/core.rrb-vector/0.1.1/core.rrb-vector-0.1.1.jar
 org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44.jar
 org/clojure/data.json/1.0.0/data.json-1.0.0.jar
 org/clojure/data.priority-map/1.0.0/data.priority-map-1.0.0.jar
-org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f.jar
-org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f.jar
+org/clojure/google-closure-library/0.0-20201211-3e6c510d/google-closure-library-0.0-20201211-3e6c510d.jar
+org/clojure/google-closure-library-third-party/0.0-20201211-3e6c510d/google-closure-library-third-party-0.0-20201211-3e6c510d.jar
 org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176.jar
 org/clojure/test.check/1.1.0/test.check-1.1.0.jar
-org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar
 org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0.jar
+org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar
 org/clojure/tools.cli/1.0.194/tools.cli-1.0.194.jar
 org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
 org/clojure/tools.reader/1.3.3/tools.reader-1.3.3.jar
-org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
-org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0.jar
 org/graalvm/js/js/20.1.0/js-20.1.0.jar
+org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0.jar
 org/graalvm/regex/regex/20.1.0/regex-20.1.0.jar
 org/graalvm/sdk/graal-sdk/20.1.0/graal-sdk-20.1.0.jar
 org/graalvm/truffle/truffle-api/20.1.0/truffle-api-20.1.0.jar
@@ -89,28 +75,29 @@ org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final.jar
 org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final.jar
 org/jsoup/jsoup/1.9.2/jsoup-1.9.2.jar
 org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar
+org/ow2/asm/asm/7.1/asm-7.1.jar
 org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar
 org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar
 org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar
 org/ow2/asm/asm-util/7.1/asm-util-7.1.jar
-org/ow2/asm/asm/7.1/asm-7.1.jar
 org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar
 org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
 quoin/quoin/0.1.2/quoin-0.1.2.jar
+reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
+refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0.jar
 re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
-reagent/reagent/1.2.0/reagent-1.2.0.jar
-refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.1.2/ring-codec-1.1.2.jar
 ring/ring-core/1.8.1/ring-core-1.8.1.jar
 spec-coerce/spec-coerce/1.0.0-alpha6/spec-coerce-1.0.0-alpha6.jar
 status-im/timbre/4.10.0-2-status/timbre-4.10.0-2-status.jar
 thheller/shadow-client/1.3.3/shadow-client-1.3.3.jar
-thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot.jar
+thheller/shadow-cljs/2.12.0/shadow-cljs-2.12.0-aot.jar
 thheller/shadow-cljsjs/0.0.21/shadow-cljsjs-0.0.21.jar
+thheller/shadow-undertow/0.1.0/shadow-undertow-0.1.0.jar
 thheller/shadow-util/0.7.0/shadow-util-0.7.0.jar
 viebel/codox-klipse-theme/0.0.1/codox-klipse-theme-0.0.1.jar
@@ -1,58 +1,66 @@
 androidx.activity:activity:1.0.0
-androidx.activity:activity:1.0.0-rc01
 androidx.activity:activity:1.2.4
 androidx.annotation:annotation-experimental:1.1.0
-androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
-androidx.appcompat:appcompat-resources:1.1.0
-androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
-androidx.appcompat:appcompat:1.0.2
-androidx.appcompat:appcompat:1.1.0
-androidx.appcompat:appcompat:1.1.0-rc01
+androidx.appcompat:appcompat-resources:1.4.1
 androidx.appcompat:appcompat:1.2.0
 androidx.appcompat:appcompat:1.3.1
+androidx.appcompat:appcompat:1.4.1
 androidx.arch.core:core-common:2.0.0
 androidx.arch.core:core-common:2.1.0
-androidx.arch.core:core-common:2.1.0-rc01
 androidx.arch.core:core-runtime:2.0.0
 androidx.arch.core:core-runtime:2.1.0
 androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
 androidx.autofill:autofill:1.1.0
+androidx.camera:camera-camera2:1.1.0
+androidx.camera:camera-core:1.1.0
+androidx.camera:camera-lifecycle:1.1.0
+androidx.camera:camera-view:1.1.0
 androidx.cardview:cardview:1.0.0
 androidx.collection:collection:1.0.0
 androidx.collection:collection:1.1.0
+androidx.concurrent:concurrent-futures:1.0.0
 androidx.constraintlayout:constraintlayout-solver:2.0.4
 androidx.constraintlayout:constraintlayout:2.0.4
 androidx.coordinatorlayout:coordinatorlayout:1.0.0
 androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.6.0
 androidx.core:core-splashscreen:1.0.0
-androidx.core:core:1.0.1
 androidx.core:core:1.1.0
-androidx.core:core:1.1.0-rc01
+androidx.core:core:1.2.0
 androidx.core:core:1.6.0
+androidx.core:core:1.7.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
 androidx.databinding:databinding-common:3.3.1
 androidx.databinding:databinding-common:3.5.4
 androidx.databinding:databinding-common:4.1.0
+androidx.databinding:databinding-common:7.2.1
+androidx.databinding:databinding-common:7.2.2
+androidx.databinding:databinding-common:7.3.0
 androidx.databinding:databinding-compiler-common:3.2.1
 androidx.databinding:databinding-compiler-common:3.3.1
 androidx.databinding:databinding-compiler-common:3.5.4
 androidx.databinding:databinding-compiler-common:4.1.0
+androidx.databinding:databinding-compiler-common:7.2.1
+androidx.databinding:databinding-compiler-common:7.2.2
+androidx.databinding:databinding-compiler-common:7.3.0
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
+androidx.emoji2:emoji2-views-helper:1.0.0
+androidx.emoji2:emoji2:1.0.0
+androidx.exifinterface:exifinterface:1.0.0
 androidx.exifinterface:exifinterface:1.1.0-beta01
 androidx.exifinterface:exifinterface:1.1.0-rc01
 androidx.exifinterface:exifinterface:1.2.0
+androidx.exifinterface:exifinterface:1.3.2
 androidx.fragment:fragment:1.0.0
 androidx.fragment:fragment:1.1.0
-androidx.fragment:fragment:1.1.0-rc01
 androidx.fragment:fragment:1.3.6
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-ui:1.0.0
@@ -60,19 +68,21 @@ androidx.legacy:legacy-support-core-utils:1.0.0
 androidx.legacy:legacy-support-v4:1.0.0
 androidx.lifecycle:lifecycle-common:2.0.0
 androidx.lifecycle:lifecycle-common:2.1.0
-androidx.lifecycle:lifecycle-common:2.1.0-rc01
 androidx.lifecycle:lifecycle-common:2.3.1
+androidx.lifecycle:lifecycle-common:2.4.0
 androidx.lifecycle:lifecycle-livedata-core:2.0.0
+androidx.lifecycle:lifecycle-livedata-core:2.1.0
 androidx.lifecycle:lifecycle-livedata-core:2.3.1
 androidx.lifecycle:lifecycle-livedata:2.0.0
+androidx.lifecycle:lifecycle-livedata:2.1.0
+androidx.lifecycle:lifecycle-process:2.4.0
 androidx.lifecycle:lifecycle-runtime:2.0.0
 androidx.lifecycle:lifecycle-runtime:2.1.0
-androidx.lifecycle:lifecycle-runtime:2.1.0-rc01
 androidx.lifecycle:lifecycle-runtime:2.3.1
+androidx.lifecycle:lifecycle-runtime:2.4.0
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
 androidx.lifecycle:lifecycle-viewmodel:2.0.0
 androidx.lifecycle:lifecycle-viewmodel:2.1.0
-androidx.lifecycle:lifecycle-viewmodel:2.1.0-rc01
 androidx.lifecycle:lifecycle-viewmodel:2.3.1
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
@@ -81,25 +91,20 @@ androidx.multidex:multidex:2.0.1
 androidx.print:print:1.0.0
 androidx.recyclerview:recyclerview:1.0.0
 androidx.recyclerview:recyclerview:1.1.0
+androidx.resourceinspection:resourceinspection-annotation:1.0.0
 androidx.savedstate:savedstate:1.0.0
-androidx.savedstate:savedstate:1.0.0-rc01
 androidx.savedstate:savedstate:1.1.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
+androidx.startup:startup-runtime:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02
 androidx.tracing:tracing:1.0.0
 androidx.transition:transition:1.2.0
 androidx.transition:transition:1.2.0-rc01
-androidx.vectordrawable:vectordrawable-animated:1.0.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0
-androidx.vectordrawable:vectordrawable-animated:1.1.0-rc01
-androidx.vectordrawable:vectordrawable:1.0.1
 androidx.vectordrawable:vectordrawable:1.1.0
-androidx.vectordrawable:vectordrawable:1.1.0-rc01
-androidx.versionedparcelable:versionedparcelable:1.0.0
 androidx.versionedparcelable:versionedparcelable:1.1.0
-androidx.versionedparcelable:versionedparcelable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager2:viewpager2:1.0.0
 androidx.viewpager:viewpager:1.0.0
@@ -108,10 +113,11 @@ commons-codec:commons-codec:1.4
 commons-codec:commons-codec:1.6
 commons-codec:commons-codec:1.9
 commons-codec:commons-codec:1.10
+commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.1.1
 commons-logging:commons-logging:1.2
-com.adobe.xmp:xmpcore:5.1.2
+com.adobe.xmp:xmpcore:6.0.6
 com.afollestad.material-dialogs:commons:0.9.6.0
 com.afollestad.material-dialogs:core:0.9.6.0
 com.airbnb.android:lottie:3.4.4
@@ -122,6 +128,9 @@ com.android.databinding:baseLibrary:3.2.1
 com.android.databinding:baseLibrary:3.3.1
 com.android.databinding:baseLibrary:3.5.4
 com.android.databinding:baseLibrary:4.1.0
+com.android.databinding:baseLibrary:7.2.1
+com.android.databinding:baseLibrary:7.2.2
+com.android.databinding:baseLibrary:7.3.0
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
@@ -129,47 +138,72 @@ com.android.tools.analytics-library:crash:26.2.1
 com.android.tools.analytics-library:crash:26.3.1
 com.android.tools.analytics-library:crash:26.5.4
 com.android.tools.analytics-library:crash:27.1.0
+com.android.tools.analytics-library:crash:30.2.1
+com.android.tools.analytics-library:crash:30.2.2
+com.android.tools.analytics-library:crash:30.3.0
 com.android.tools.analytics-library:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
 com.android.tools.analytics-library:protos:26.3.1
 com.android.tools.analytics-library:protos:26.5.4
 com.android.tools.analytics-library:protos:27.1.0
+com.android.tools.analytics-library:protos:30.2.1
+com.android.tools.analytics-library:protos:30.2.2
+com.android.tools.analytics-library:protos:30.3.0
 com.android.tools.analytics-library:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
 com.android.tools.analytics-library:shared:26.3.1
 com.android.tools.analytics-library:shared:26.5.4
 com.android.tools.analytics-library:shared:27.1.0
+com.android.tools.analytics-library:shared:30.2.1
+com.android.tools.analytics-library:shared:30.2.2
+com.android.tools.analytics-library:shared:30.3.0
 com.android.tools.analytics-library:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
 com.android.tools.analytics-library:tracker:26.3.1
 com.android.tools.analytics-library:tracker:26.5.4
 com.android.tools.analytics-library:tracker:27.1.0
+com.android.tools.analytics-library:tracker:30.2.1
+com.android.tools.analytics-library:tracker:30.2.2
+com.android.tools.analytics-library:tracker:30.3.0
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09
+com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09
+com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
 com.android.tools.build:aapt2-proto:0.3.1
 com.android.tools.build:aapt2-proto:0.4.0
 com.android.tools.build:aapt2-proto:4.1.0-6503028
-com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524
+com.android.tools.build:aapt2-proto:7.2.1-7984345
+com.android.tools.build:aapt2-proto:7.2.2-7984345
+com.android.tools.build:aapt2-proto:7.3.0-8691043
 com.android.tools.build:aaptcompiler:4.1.0
+com.android.tools.build:aaptcompiler:7.2.1
+com.android.tools.build:aaptcompiler:7.2.2
+com.android.tools.build:aaptcompiler:7.3.0
 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.3.1
 com.android.tools.build:apksig:3.5.4
 com.android.tools.build:apksig:4.1.0
+com.android.tools.build:apksig:7.2.1
+com.android.tools.build:apksig:7.2.2
+com.android.tools.build:apksig:7.3.0
 com.android.tools.build:apkzlib:3.2.1
 com.android.tools.build:apkzlib:3.3.1
 com.android.tools.build:apkzlib:3.5.4
 com.android.tools.build:apkzlib:4.1.0
+com.android.tools.build:apkzlib:7.2.1
+com.android.tools.build:apkzlib:7.2.2
+com.android.tools.build:apkzlib:7.3.0
 com.android.tools.build:builder-model:1.1.3
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
@@ -179,6 +213,9 @@ com.android.tools.build:builder-model:3.2.1
 com.android.tools.build:builder-model:3.3.1
 com.android.tools.build:builder-model:3.5.4
 com.android.tools.build:builder-model:4.1.0
+com.android.tools.build:builder-model:7.2.1
+com.android.tools.build:builder-model:7.2.2
+com.android.tools.build:builder-model:7.3.0
 com.android.tools.build:builder-test-api:1.1.3
 com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
@@ -188,6 +225,9 @@ com.android.tools.build:builder-test-api:3.2.1
 com.android.tools.build:builder-test-api:3.3.1
 com.android.tools.build:builder-test-api:3.5.4
 com.android.tools.build:builder-test-api:4.1.0
+com.android.tools.build:builder-test-api:7.2.1
+com.android.tools.build:builder-test-api:7.2.2
+com.android.tools.build:builder-test-api:7.3.0
 com.android.tools.build:builder:1.1.3
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
@@ -197,16 +237,24 @@ com.android.tools.build:builder:3.2.1
 com.android.tools.build:builder:3.3.1
 com.android.tools.build:builder:3.5.4
 com.android.tools.build:builder:4.1.0
+com.android.tools.build:builder:7.2.1
+com.android.tools.build:builder:7.2.2
+com.android.tools.build:builder:7.3.0
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.6.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
+com.android.tools.build:bundletool:1.8.2
+com.android.tools.build:bundletool:1.9.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.3.1
 com.android.tools.build:gradle-api:3.5.4
 com.android.tools.build:gradle-api:4.1.0
+com.android.tools.build:gradle-api:7.2.1
+com.android.tools.build:gradle-api:7.2.2
+com.android.tools.build:gradle-api:7.3.0
 com.android.tools.build:gradle-core:1.1.3
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
@@ -221,6 +269,9 @@ com.android.tools.build:gradle:3.2.1
 com.android.tools.build:gradle:3.3.1
 com.android.tools.build:gradle:3.5.4
 com.android.tools.build:gradle:4.1.0
+com.android.tools.build:gradle:7.2.1
+com.android.tools.build:gradle:7.2.2
+com.android.tools.build:gradle:7.3.0
 com.android.tools.build:manifest-merger:24.1.3
 com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
@@ -230,6 +281,9 @@ com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:manifest-merger:26.3.1
 com.android.tools.build:manifest-merger:26.5.4
 com.android.tools.build:manifest-merger:27.1.0
+com.android.tools.build:manifest-merger:30.2.1
+com.android.tools.build:manifest-merger:30.2.2
+com.android.tools.build:manifest-merger:30.3.0
 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.1.3
@@ -241,14 +295,14 @@ com.android.tools.ddms:ddmlib:26.2.1
 com.android.tools.ddms:ddmlib:26.3.1
 com.android.tools.ddms:ddmlib:26.5.4
 com.android.tools.ddms:ddmlib:27.1.0
+com.android.tools.ddms:ddmlib:30.2.1
+com.android.tools.ddms:ddmlib:30.2.2
+com.android.tools.ddms:ddmlib:30.3.0
 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.com-intellij:intellij-core:27.1.0
-com.android.tools.external.com-intellij:kotlin-compiler:27.1.0
 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.external.org-jetbrains:uast:27.1.0
 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.1.3
@@ -260,30 +314,53 @@ com.android.tools.layoutlib:layoutlib-api:26.2.1
 com.android.tools.layoutlib:layoutlib-api:26.3.1
 com.android.tools.layoutlib:layoutlib-api:26.5.4
 com.android.tools.layoutlib:layoutlib-api:27.1.0
+com.android.tools.layoutlib:layoutlib-api:30.2.1
+com.android.tools.layoutlib:layoutlib-api:30.2.2
+com.android.tools.layoutlib:layoutlib-api:30.3.0
 com.android.tools.lint:lint-api:24.1.3
 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-api:27.1.0
 com.android.tools.lint:lint-checks:24.1.3
 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-checks:27.1.0
 com.android.tools.lint:lint-gradle-api:26.2.1
 com.android.tools.lint:lint-gradle-api:26.3.1
 com.android.tools.lint:lint-gradle-api:26.5.4
 com.android.tools.lint:lint-gradle-api:27.1.0
-com.android.tools.lint:lint-gradle:27.1.0
 com.android.tools.lint:lint-model:27.1.0
+com.android.tools.lint:lint-model:30.2.1
+com.android.tools.lint:lint-model:30.2.2
+com.android.tools.lint:lint-model:30.3.0
+com.android.tools.lint:lint-typedef-remover:30.2.1
+com.android.tools.lint:lint-typedef-remover:30.2.2
+com.android.tools.lint:lint-typedef-remover:30.3.0
 com.android.tools.lint:lint:24.1.3
 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.lint:lint:27.1.0
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.2
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0
+com.android.tools.utp:android-device-provider-gradle-proto:30.2.1
+com.android.tools.utp:android-device-provider-gradle-proto:30.2.2
+com.android.tools.utp:android-device-provider-gradle-proto:30.3.0
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.2
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0
+com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1
+com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.2
+com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.2
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.2
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0
 com.android.tools:annotations:24.1.3
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
@@ -293,6 +370,9 @@ com.android.tools:annotations:26.2.1
 com.android.tools:annotations:26.3.1
 com.android.tools:annotations:26.5.4
 com.android.tools:annotations:27.1.0
+com.android.tools:annotations:30.2.1
+com.android.tools:annotations:30.2.2
+com.android.tools:annotations:30.3.0
 com.android.tools:common:24.1.3
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
@@ -302,6 +382,9 @@ com.android.tools:common:26.2.1
 com.android.tools:common:26.3.1
 com.android.tools:common:26.5.4
 com.android.tools:common:27.1.0
+com.android.tools:common:30.2.1
+com.android.tools:common:30.2.2
+com.android.tools:common:30.3.0
 com.android.tools:dvlib:24.1.3
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
@@ -311,12 +394,18 @@ com.android.tools:dvlib:26.2.1
 com.android.tools:dvlib:26.3.1
 com.android.tools:dvlib:26.5.4
 com.android.tools:dvlib:27.1.0
+com.android.tools:dvlib:30.2.1
+com.android.tools:dvlib:30.2.2
+com.android.tools:dvlib:30.3.0
 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.3.1
 com.android.tools:repository:26.5.4
 com.android.tools:repository:27.1.0
+com.android.tools:repository:30.2.1
+com.android.tools:repository:30.2.2
+com.android.tools:repository:30.3.0
 com.android.tools:sdklib:24.1.3
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
@@ -326,6 +415,9 @@ com.android.tools:sdklib:26.2.1
 com.android.tools:sdklib:26.3.1
 com.android.tools:sdklib:26.5.4
 com.android.tools:sdklib:27.1.0
+com.android.tools:sdklib:30.2.1
+com.android.tools:sdklib:30.2.2
+com.android.tools:sdklib:30.3.0
 com.android.tools:sdk-common:24.1.3
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
@@ -335,19 +427,31 @@ com.android.tools:sdk-common:26.2.1
 com.android.tools:sdk-common:26.3.1
 com.android.tools:sdk-common:26.5.4
 com.android.tools:sdk-common:27.1.0
+com.android.tools:sdk-common:30.2.1
+com.android.tools:sdk-common:30.2.2
+com.android.tools:sdk-common:30.3.0
 com.android:signflinger:4.1.0
+com.android:signflinger:7.2.1
+com.android:signflinger:7.2.2
+com.android:signflinger:7.3.0
 com.android:zipflinger:4.1.0
-com.drewnoakes:metadata-extractor:2.9.1
+com.android:zipflinger:7.2.1
+com.android:zipflinger:7.2.2
+com.android:zipflinger:7.3.0
+com.diffplug.durian:durian-collect:1.2.0
+com.diffplug.durian:durian-core:1.2.0
+com.diffplug.durian:durian-io:1.2.0
+com.diffplug.spotless:spotless-lib-extra:2.30.0
+com.diffplug.spotless:spotless-lib:2.30.0
+com.diffplug.spotless:spotless-plugin-gradle:6.11.0
+com.drewnoakes:metadata-extractor:2.12.0
 com.facebook.conceal:conceal:1.1.3
 com.facebook.fbjni:fbjni-java-only:0.2.2
-com.facebook.flipper:flipper-fresco-plugin:0.54.0
-com.facebook.flipper:flipper:0.54.0
-com.facebook.fresco:animated-base:2.2.0
-com.facebook.fresco:animated-drawable:2.2.0
-com.facebook.fresco:animated-gif:2.2.0
+com.facebook.fresco:animated-base:2.5.0
+com.facebook.fresco:animated-drawable:2.5.0
+com.facebook.fresco:animated-gif:2.5.0
 com.facebook.fresco:drawee:2.5.0
 com.facebook.fresco:fbcore:2.5.0
-com.facebook.fresco:flipper:2.2.0
 com.facebook.fresco:fresco:2.5.0
 com.facebook.fresco:imagepipeline-base:2.5.0
 com.facebook.fresco:imagepipeline-native:2.5.0
@@ -360,13 +464,19 @@ com.facebook.fresco:middleware:2.5.0
 com.facebook.fresco:nativeimagefilters:2.5.0
 com.facebook.fresco:nativeimagetranscoder:2.5.0
 com.facebook.fresco:soloader:2.5.0
-com.facebook.fresco:stetho:2.2.0
 com.facebook.fresco:ui-common:2.5.0
 com.facebook.infer.annotation:infer-annotation:0.18.0
-com.facebook.soloader:annotation:0.10.1
-com.facebook.soloader:nativeloader:0.10.1
-com.facebook.soloader:soloader:0.10.1
+com.facebook.soloader:annotation:0.10.3
+com.facebook.soloader:nativeloader:0.10.3
+com.facebook.soloader:soloader:0.10.3
 com.facebook.yoga:proguard-annotations:1.19.0
+com.fasterxml.jackson.core:jackson-annotations:2.11.1
+com.fasterxml.jackson.core:jackson-core:2.11.1
+com.fasterxml.jackson.core:jackson-databind:2.11.1
+com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.1
+com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1
+com.fasterxml.woodstox:woodstox-core:6.2.1
 com.github.Dimezis:BlurView:version-2.0.3
 com.github.bumptech.glide:annotations:4.12.0
 com.github.bumptech.glide:compiler:4.12.0
@@ -382,10 +492,24 @@ com.github.status-im:function:0.0.1
 com.github.wix-playground:ahbottomnavigation:3.3.0
 com.github.wix-playground:reflow-animator:1.0.6
 com.github.yalantis:ucrop:2.2.6-native
+com.googlecode.concurrent-trees:concurrent-trees:2.6.1
+com.googlecode.javaewah:JavaEWAH:1.1.13
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
+com.google.android.datatransport:transport-api:2.2.1
+com.google.android.datatransport:transport-backend-cct:2.3.3
+com.google.android.datatransport:transport-runtime:2.2.6
+com.google.android.gms:play-services-basement:18.0.0
+com.google.android.gms:play-services-base:18.0.1
+com.google.android.gms:play-services-mlkit-barcode-scanning:18.0.0
+com.google.android.gms:play-services-tasks:18.0.1
 com.google.android.material:material:1.2.0-alpha03
+com.google.android.odml:image:1.0.0-beta1
+com.google.android:annotations:4.1.1.4
+com.google.api.grpc:proto-google-common-protos:1.12.0
+com.google.api.grpc:proto-google-common-protos:2.0.1
 com.google.auto.value:auto-value-annotations:1.6.2
+com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value:1.5.2
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
@@ -394,11 +518,20 @@ com.google.code.gson:gson:2.3
 com.google.code.gson:gson:2.8.0
 com.google.code.gson:gson:2.8.5
 com.google.code.gson:gson:2.8.6
+com.google.code.gson:gson:2.8.9
 com.google.crypto.tink:tink:1.3.0-rc2
+com.google.dagger:dagger:2.28.3
 com.google.errorprone:error_prone_annotations:2.0.18
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.errorprone:error_prone_annotations:2.3.1
 com.google.errorprone:error_prone_annotations:2.3.2
+com.google.errorprone:error_prone_annotations:2.3.4
+com.google.errorprone:error_prone_annotations:2.4.0
+com.google.errorprone:error_prone_annotations:2.7.1
+com.google.firebase:firebase-annotations:16.0.0
+com.google.firebase:firebase-components:16.1.0
+com.google.firebase:firebase-encoders-json:17.1.0
+com.google.firebase:firebase-encoders:16.1.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
@@ -407,44 +540,100 @@ com.google.guava:guava:23.0
 com.google.guava:guava:26.0-jre
 com.google.guava:guava:27.0.1-jre
 com.google.guava:guava:28.1-jre
+com.google.guava:guava:29.0-jre
+com.google.guava:guava:30.1-jre
+com.google.guava:guava:31.0.1-jre
+com.google.guava:listenablefuture:1.0
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jimfs:jimfs:1.1
+com.google.mlkit:barcode-scanning-common:17.0.0
+com.google.mlkit:barcode-scanning:17.0.2
+com.google.mlkit:common:18.0.0
+com.google.mlkit:vision-common:17.0.0
+com.google.mlkit:vision-interfaces:16.0.0
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java-util:3.10.0
+com.google.protobuf:protobuf-java-util:3.17.2
 com.google.protobuf:protobuf-java:3.0.0
 com.google.protobuf:protobuf-java:3.4.0
 com.google.protobuf:protobuf-java:3.10.0
+com.google.protobuf:protobuf-java:3.17.2
+com.google.testing.platform:core-proto:0.0.8-alpha07
 com.google.test.platform:core-proto:0.0.2-dev
-com.google.zxing:core:3.3.0
 com.intellij:annotations:12.0
-com.parse.bolts:bolts-applinks:1.4.0
 com.parse.bolts:bolts-tasks:1.4.0
-com.squareup.okhttp3:okhttp-tls:4.9.1
+com.squareup.okhttp3:okhttp-tls:4.9.2
 com.squareup.okhttp3:okhttp-urlconnection:4.9.2
 com.squareup.okhttp3:okhttp:4.9.2
 com.squareup.okio:okio:2.9.0
 com.squareup:javapoet:1.8.0
 com.squareup:javapoet:1.10.0
+com.squareup:javapoet:1.13.0
 com.squareup:javawriter:2.5.0
 com.sun.activation:javax.activation:1.2.0
 com.sun.istack:istack-commons-runtime:2.21
 com.sun.istack:istack-commons-runtime:3.0.7
+com.sun.istack:istack-commons-runtime:3.0.8
 com.sun.xml.fastinfoset:FastInfoset:1.2.13
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
+com.sun.xml.fastinfoset:FastInfoset:1.2.16
 com.tunnelvisionlabs:antlr4-annotations:4.5
 com.tunnelvisionlabs:antlr4-runtime:4.5
 com.tunnelvisionlabs:antlr4:4.5
-de.undercouch:gradle-download-task:3.4.3
-de.undercouch:gradle-download-task:4.0.2
+de.undercouch:gradle-download-task:4.1.1
+de.undercouch:gradle-download-task:5.0.1
+io.grpc:grpc-api:1.21.1
+io.grpc:grpc-api:1.39.0
+io.grpc:grpc-context:1.21.1
+io.grpc:grpc-context:1.39.0
+io.grpc:grpc-core:1.21.1
+io.grpc:grpc-core:1.39.0
+io.grpc:grpc-netty:1.21.1
+io.grpc:grpc-netty:1.39.0
+io.grpc:grpc-protobuf-lite:1.21.1
+io.grpc:grpc-protobuf-lite:1.39.0
+io.grpc:grpc-protobuf:1.21.1
+io.grpc:grpc-protobuf:1.39.0
+io.grpc:grpc-stub:1.21.1
+io.grpc:grpc-stub:1.39.0
+io.netty:netty-buffer:4.1.34.Final
+io.netty:netty-buffer:4.1.52.Final
+io.netty:netty-codec-http2:4.1.34.Final
+io.netty:netty-codec-http2:4.1.52.Final
+io.netty:netty-codec-http:4.1.34.Final
+io.netty:netty-codec-http:4.1.52.Final
+io.netty:netty-codec-socks:4.1.34.Final
+io.netty:netty-codec-socks:4.1.52.Final
+io.netty:netty-codec:4.1.34.Final
+io.netty:netty-codec:4.1.52.Final
+io.netty:netty-common:4.1.34.Final
+io.netty:netty-common:4.1.52.Final
+io.netty:netty-handler-proxy:4.1.34.Final
+io.netty:netty-handler-proxy:4.1.52.Final
+io.netty:netty-handler:4.1.34.Final
+io.netty:netty-handler:4.1.52.Final
+io.netty:netty-resolver:4.1.34.Final
+io.netty:netty-resolver:4.1.52.Final
+io.netty:netty-transport:4.1.34.Final
+io.netty:netty-transport:4.1.52.Final
+io.opencensus:opencensus-api:0.21.0
+io.opencensus:opencensus-contrib-grpc-metrics:0.21.0
+io.perfmark:perfmark-api:0.23.0
 it.unimi.dsi:fastutil:7.2.0
+it.unimi.dsi:fastutil:8.4.0
+jakarta.activation:jakarta.activation-api:1.2.1
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
 javax.activation:javax.activation-api:1.2.0
+javax.annotation:javax.annotation-api:1.3.2
 javax.inject:javax.inject:1
 javax.xml.bind:jaxb-api:2.2.12-b140109.1041
 javax.xml.bind:jaxb-api:2.3.1
 junit:junit:4.12
 me.zhanghai.android.materialprogressbar:library:1.4.2
+net.java.dev.jna:jna-platform:5.6.0
+net.java.dev.jna:jna:5.6.0
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
 net.sf.proguard:proguard-base:5.1
@@ -457,153 +646,177 @@ net.sf.proguard:proguard-gradle:5.3.3
 net.sf.proguard:proguard-gradle:6.0.3
 org.abego.treelayout:org.abego.treelayout.core:1.0.1
 org.antlr:ST4:4.0.8
-org.antlr:antlr4-runtime:4.5.2-1
 org.antlr:antlr4:4.5.3
 org.antlr:antlr-runtime:3.5.2
 org.antlr:antlr:3.5.2
 org.apache.commons:commons-compress:1.8.1
 org.apache.commons:commons-compress:1.12
+org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.3.2
 org.apache.commons:commons-lang3:3.9
 org.apache.httpcomponents:httpclient:4.1.1
 org.apache.httpcomponents:httpclient:4.2.6
 org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpclient:4.5.3
 org.apache.httpcomponents:httpclient:4.5.6
+org.apache.httpcomponents:httpclient:4.5.9
+org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.1
 org.apache.httpcomponents:httpcore:4.2.5
 org.apache.httpcomponents:httpcore:4.4.5
-org.apache.httpcomponents:httpcore:4.4.6
 org.apache.httpcomponents:httpcore:4.4.10
+org.apache.httpcomponents:httpcore:4.4.11
+org.apache.httpcomponents:httpcore:4.4.13
 org.apache.httpcomponents:httpmime:4.1
 org.apache.httpcomponents:httpmime:4.5.2
 org.apache.httpcomponents:httpmime:4.5.6
+org.bitbucket.b_c:jose4j:0.7.0
 org.bouncycastle:bcpkix-jdk15on:1.48
 org.bouncycastle:bcpkix-jdk15on:1.56
+org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.48
 org.bouncycastle:bcprov-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-qual:2.5.2
 org.checkerframework:checker-qual:2.8.1
-org.codehaus.groovy:groovy-all:2.4.15
+org.checkerframework:checker-qual:2.11.1
+org.checkerframework:checker-qual:3.5.0
+org.checkerframework:checker-qual:3.12.0
+org.codehaus.groovy:groovy-xml:3.0.10
+org.codehaus.groovy:groovy:3.0.10
 org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.codehaus.mojo:animal-sniffer-annotations:1.19
+org.codehaus.woodstox:stax2-api:4.2.1
 org.conscrypt:conscrypt-android:2.0.0
 org.eclipse.jdt.core.compiler:ecj:4.4
 org.eclipse.jdt.core.compiler:ecj:4.4.2
 org.eclipse.jdt.core.compiler:ecj:4.6.1
+org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r
 org.glassfish.jaxb:jaxb-core:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.3.1
+org.glassfish.jaxb:jaxb-runtime:2.3.2
 org.glassfish.jaxb:txw2:2.2.11
 org.glassfish.jaxb:txw2:2.3.1
+org.glassfish.jaxb:txw2:2.3.2
 org.hamcrest:hamcrest-core:1.3
+org.jacoco:org.jacoco.agent:0.8.7
+org.jacoco:org.jacoco.ant:0.8.7
 org.jacoco:org.jacoco.core:0.7.4.201502262128
+org.jacoco:org.jacoco.core:0.8.7
 org.jacoco:org.jacoco.report:0.7.4.201502262128
+org.jacoco:org.jacoco.report:0.8.7
 org.jdom:jdom2:2.0.6
+org.jetbrains.dokka:dokka-core:1.4.32
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
+org.jetbrains.intellij.deps:trove4j:1.0.20200330
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.4.31
-org.jetbrains.kotlin:kotlin-android-extensions:1.3.50
-org.jetbrains.kotlin:kotlin-android-extensions:1.4.31
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20
+org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.3.50
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.31
-org.jetbrains.kotlin:kotlin-build-common:1.3.50
-org.jetbrains.kotlin:kotlin-build-common:1.4.31
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.50
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.31
-org.jetbrains.kotlin:kotlin-compiler-runner:1.3.50
-org.jetbrains.kotlin:kotlin-compiler-runner:1.4.31
-org.jetbrains.kotlin:kotlin-daemon-client:1.3.50
-org.jetbrains.kotlin:kotlin-daemon-client:1.4.31
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.3.50
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.31
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.3.50
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.31
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.3.50
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.31
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.31
-org.jetbrains.kotlin:kotlin-native-utils:1.3.50
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20
+org.jetbrains.kotlin:kotlin-build-common:1.6.20
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20
+org.jetbrains.kotlin:kotlin-daemon-client:1.6.20
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-native-utils:1.6.20
+org.jetbrains.kotlin:kotlin-project-model:1.6.20
 org.jetbrains.kotlin:kotlin-reflect:1.1.3-2
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
 org.jetbrains.kotlin:kotlin-reflect:1.3.20
 org.jetbrains.kotlin:kotlin-reflect:1.3.50
 org.jetbrains.kotlin:kotlin-reflect:1.3.72
-org.jetbrains.kotlin:kotlin-reflect:1.4.31
-org.jetbrains.kotlin:kotlin-scripting-common:1.3.50
-org.jetbrains.kotlin:kotlin-scripting-common:1.4.31
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.3.50
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.31
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.3.50
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.31
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.50
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31
-org.jetbrains.kotlin:kotlin-script-runtime:1.3.50
-org.jetbrains.kotlin:kotlin-script-runtime:1.4.31
+org.jetbrains.kotlin:kotlin-reflect:1.5.31
+org.jetbrains.kotlin:kotlin-reflect:1.6.20
+org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20
+org.jetbrains.kotlin:kotlin-script-runtime:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib:1.4.10
-org.jetbrains.kotlin:kotlin-stdlib:1.4.31
-org.jetbrains.kotlin:kotlin-stdlib:1.5.10
-org.jetbrains.kotlin:kotlin-stdlib:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib:1.6.21
-org.jetbrains.kotlin:kotlin-util-io:1.3.50
-org.jetbrains.kotlin:kotlin-util-io:1.4.31
-org.jetbrains.kotlin:kotlin-util-klib:1.4.31
+org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
+org.jetbrains.kotlin:kotlin-util-io:1.6.20
+org.jetbrains.kotlin:kotlin-util-klib:1.6.20
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
+org.jetbrains:markdown-jvm:0.2.1
+org.jetbrains:markdown:0.2.1
 org.json:json:20180813
+org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.7.7
 org.jvnet.staxex:stax-ex:1.8
+org.jvnet.staxex:stax-ex:1.8.1
 org.ow2.asm:asm-analysis:5.0.3
 org.ow2.asm:asm-analysis:5.1
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-analysis:9.1
 org.ow2.asm:asm-commons:5.1
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-commons:9.1
 org.ow2.asm:asm-debug-all:5.0.1
 org.ow2.asm:asm-tree:5.0.3
 org.ow2.asm:asm-tree:5.1
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-tree:9.1
 org.ow2.asm:asm-util:5.1
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm-util:9.1
 org.ow2.asm:asm:5.0.3
 org.ow2.asm:asm:5.1
 org.ow2.asm:asm:6.0
 org.ow2.asm:asm:7.0
+org.ow2.asm:asm:9.1
+org.slf4j:slf4j-api:1.7.30
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1
+org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
+xerces:xercesImpl:2.12.0
+xml-apis:xml-apis:1.4.01
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10
+com.android.tools.lint:lint-gradle:30.2.2
+com.android.tools.build:gradle:7.0.4
@@ -29,12 +29,12 @@ function gen_proj_list() {
    echo -e "Found ${GRN}$(wc -l < "${PROJ_LIST}")${RST} sub-projects..."
 }

-# Check each sub-project in parallel, the ":" is for local deps.
+# Check each sub-project in parallel, the "" is for local deps.
 function gen_deps_list() {
    PROJECTS=$(cat "${PROJ_LIST}")
    # WARNING: The ${PROJECTS[@]} needs to remain unquoted to expand correctly.
    # shellcheck disable=SC2068
-    "${CUR_DIR}/get_deps.sh" ":" ${PROJECTS[@]} | sort -uV -o "${DEPS_LIST}"
+    "${CUR_DIR}/get_deps.sh" "" ${PROJECTS[@]} | sort -uV -o "${DEPS_LIST}"
    echo -e "${CLR}Found ${GRN}$(wc -l < "${DEPS_LIST}")${RST} direct dependencies..."
 }

@@ -52,9 +52,8 @@ function gen_deps_json() {
    # Format URLs into a Nix consumable file.
    URLS=$(cat "${DEPS_URLS}")
    # Avoid rate limiting by using 4 of the available threads.
-    parallel --will-cite --keep-order --jobs 4 \
+    echo "${URLS}" | parallel --will-cite --keep-order --jobs 4 \
        "${CUR_DIR}/url2json.sh" \
-        ::: "${URLS}" \
        >> "${DEPS_JSON}"

    # Drop tailing comma on last object, stupid JSON
@@ -83,6 +82,10 @@ fi
 # Run each stage in order
 gen_proj_list
 gen_deps_list
+# FIXME: Temporary fix for missing package.
+echo 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10' >> "${DEPS_LIST}"
+echo 'com.android.tools.lint:lint-gradle:30.2.2' >> "${DEPS_LIST}"
+echo 'com.android.tools.build:gradle:7.0.4' >> "${DEPS_LIST}"
 gen_deps_urls
 gen_deps_json

@@ -26,7 +26,7 @@ function findPackage(line, regex) {
    # Lines after configuration name list packages
    for (getline line; line != ""; getline line) {
        # React Native is provided by node_modules
-        if (line ~ "com.facebook.react:react-native") { continue }
+        if (line ~ "com.facebook.react:(react-native|hermes-engine)") { continue }

        # Example: +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50
        if (findPackage(line, "--- ([^ :]+):([^ :]+):([^ :]+)$")) {
@@ -37,4 +37,5 @@ react-native-status
 react-native-status-keycard
 react-native-svg
 react-native-touch-id
+react-native-transparent-video
 react-native-webview
@@ -12,10 +12,8 @@ stdenv.mkDerivation {
    "patchBuildIdPhase"
    "patchHermesPhase"
    "patchJavaPhase"
-    "patchYogaNodePackagePhase"
    "patchReactNativePhase"
    "patchPodPhase"
-    "patchReactNativeXcodeScriptPhase"
    "installPhase"
  ];

@@ -70,14 +68,7 @@ stdenv.mkDerivation {
  patchJavaPhase = ''
    ${nodejs}/bin/node ./node_modules/jetifier/bin/jetify
  '';
-  # Patch React Native Yoga.cpp file
-  # FIXME: Remove this once release newer than 1.19.0 is used which includes:
-  # https://github.com/facebook/yoga/commit/f174de70
-  patchYogaNodePackagePhase = ''
-    substituteInPlace ./node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp --replace \
-        'node->getLayout().hadOverflow() |' \
-        'node->getLayout().hadOverflow() ||'
-  '';
+
  installPhase = ''
    mkdir -p $out
    cp -R node_modules $out/
@@ -107,19 +98,6 @@ stdenv.mkDerivation {
          '[RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];'
  '';

-# Patch React Native Xcode Script that searches for nvm
-# FIXME: Remove this once we upgrade react-native to 0.69.x
-    patchReactNativeXcodeScriptPhase = ''
-      substituteInPlace ./node_modules/react-native/scripts/find-node.sh --replace \
-              '# Define NVM_DIR and source the nvm.sh setup script' \
-              '<<MULTI_LINE_COMMENT${"\n"}# Define NVM_DIR and source the nvm.sh setup script'
-
-      substituteInPlace ./node_modules/react-native/scripts/find-node.sh --replace \
-              '# Set up the nodenv node version manager if present' \
-              'MULTI_LINE_COMMENT${"\n"}# Set up the nodenv node version manager if present'
-    '';
-
-
  # The ELF types are incompatible with the host platform, so let's not even try
  # TODO: Use Android NDK to strip binaries manually
  dontPatchELF = true;
@@ -1,8 +1,9 @@
-{ lib, config }:
+{ lib }:

 {
-  getConfig = import ./getConfig.nix { inherit lib config; };
+  getEnvWithDefault = import ./getEnvWithDefault.nix;
  mkFilter = import ./mkFilter.nix { inherit lib; };
  mergeSh = import ./mergeSh.nix { inherit lib; };
  checkEnvVarSet = import ./checkEnvVarSet.nix;
+  sanitizeVersion = import ./sanitizeVersion.nix { inherit lib; };
 }
@@ -1,11 +0,0 @@
-# helper for getting status-im config values in a safe way
-#
-
-{ lib, config }:
-
-let inherit (lib) splitString attrByPath;
-in name: default:
-let
-  path = [ "status-im" ] ++ (splitString "." name);
-  value = attrByPath path default config;
-in if value != null then value else default
@@ -0,0 +1,8 @@
+name: default: let
+  envOverride = builtins.getEnv name;
+  logEnvOverride = value:
+    builtins.trace "getEnvWithDefault ${name} (default: ${toString default}): ${value}" value;
+in
+  if envOverride != ""
+  then logEnvOverride envOverride
+  else default
@@ -0,0 +1,14 @@
+{ lib }:
+
+version:
+let
+  # paths don't like slashes in them
+  dropSlashes = builtins.replaceStrings [ "/" ] [ "_" ];
+  # if version doesn't match this it's probably a commit, it's lax semver
+  versionRegex = "^v?[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+[[:alnum:]+_.-]*$";
+in
+  if (builtins.match versionRegex version) != null
+  # Geth forces a 'v' prefix for all versions
+  then lib.removePrefix "v" (dropSlashes version)
+  # reduce metrics cardinality in Prometheus
+  else lib.traceValFn (_: "WARNING: Marking build version as 'develop'!") "develop"
@@ -15,19 +15,11 @@ rec {
    ];

    inputsFrom = [
-      release
+      (release {})
      androidShell
    ];

    shellHook = ''
-      export ANDROID_SDK_ROOT="${androidPkgs.sdk}"
-      export ANDROID_NDK_ROOT="${androidPkgs.ndk}"
-
-      export STATUS_NIX_MAVEN_REPO="${deps.gradle}"
-
-      # required by some makefile targets
-      export STATUS_GO_ANDROID_LIBDIR=${status-go}
-
      # check if node modules changed and if so install them
      $STATUS_MOBILE_HOME/nix/scripts/node_modules.sh ${deps.nodejs-patched}
    '';
@@ -6,20 +6,33 @@
  buildEnv ? "prod",
  # Path to the file containing secret environment variables
  secretsFile ? "",
+  # Build type (influences which .env file gets used for feature flags)
+  # TODO: pr or relase for default?
+  buildType ? lib.getEnvWithDefault "BUILD_TYPE" "release",
+  # Used for versionCode
+  buildNumber ? lib.getEnvWithDefault "BUILD_NUMBER" 9999,
+  # Included in APK Manifest for easier identification.
+  # TODO: or GIT_COMMIT from Jenkins?
+  commitHash ? lib.getEnvWithDefault "COMMIT_HASH" "unknown",
+  # Gradle options passed for Android builds
+  androidGradleOpts ? lib.getEnvWithDefault "ANDROID_GRADLE_OPTS" null,
+  statusGoSrcOverride ? lib.getEnvWithDefault "STATUS_GO_SRC_OVERRIDE" null,
+  # If APKs should be split based on architectures
+  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "false",
+  # Android architectures to build for
+  # Used to detect end-to-end builds
+  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "armeabi-v7a;arm64-v8a;x86",
 }:

 let
-  inherit (lib) toLower optionalString stringLength getConfig makeLibraryPath elem;
+  inherit (lib) toLower optionalString stringLength makeLibraryPath elem;

  # Pass secretsFile for POKT_TOKEN to jsbundle build
  builtJsBundle = jsbundle { inherit secretsFile; };

-  buildType = getConfig "build-type" "release";
-  buildNumber = getConfig "build-number" 9999;
-  commitHash = getConfig "commit-hash" "unknown";
-  gradleOpts = getConfig "android.gradle-opts" null;
-  # Used to detect end-to-end builds
-  androidAbiInclude = getConfig "android.abi-include" "armeabi-v7a;arm64-v8a;x86";
+  # Map ANDROID_ABI_INCLUDE to status-go targets
+  androidAbiIncludeSplit = lib.splitString ";" androidAbiInclude;
+

  envFileName =
    if androidAbiInclude == "x86"                  then ".env.e2e"
@@ -63,25 +76,29 @@ in stdenv.mkDerivation rec {
  # Used by Clojure at compile time to include JS modules
  BUILD_ENV = buildEnv;

-  # custom env variables derived from config
-  STATUS_GO_SRC_OVERRIDE = getConfig "status-go.src-override" null;
-  ANDROID_ABI_SPLIT = getConfig "android.abi-split" "false";
+  STATUS_GO_SRC_OVERRIDE = statusGoSrcOverride;
+  ANDROID_ABI_SPLIT = androidAbiSplit;
  ANDROID_ABI_INCLUDE = androidAbiInclude;

-  # Android SDK/NDK for use by Gradle
-  ANDROID_SDK_ROOT = "${androidPkgs.sdk}";
-  ANDROID_NDK_ROOT = "${androidPkgs.ndk}";
-
  # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
  NODE_OPTIONS = "--openssl-legacy-provider";

-  # Used by the Android Gradle build script in android/build.gradle
-  STATUS_GO_ANDROID_LIBDIR = status-go;
-
  phases = [
-    "unpackPhase" "secretsPhase" "buildPhase" "checkPhase" "installPhase"
+    "shellHook" "unpackPhase" "secretsPhase" "buildPhase" "checkPhase" "installPhase"
  ];

+  # We use shellHook as a single place to setup env vars for both build derivation and shell
+  shellHook = ''
+    # Used by the Android Gradle build script in android/build.gradle
+    export STATUS_GO_ANDROID_LIBDIR=${ status-go { abis = androidAbiIncludeSplit; } }
+
+    # Android SDK/NDK for use by Gradle
+    export ANDROID_SDK_ROOT="${androidPkgs.sdk}"
+    export ANDROID_NDK_ROOT="${androidPkgs.ndk}"
+
+    export STATUS_NIX_MAVEN_REPO="${deps.gradle}"
+  '';
+
  unpackPhase = ''
    cp -ar $src/. ./
    chmod u+w -R ./
@@ -122,6 +139,20 @@ in stdenv.mkDerivation rec {
  buildPhase = let
    adhocEnvVars = optionalString stdenv.isLinux
      "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${makeLibraryPath [ pkgs.zlib ]}";
+    gradleCommand = ''
+      ${pkgs.gradle}/bin/gradle \
+      ${toString androidGradleOpts} \
+      --console=plain \
+      --offline \
+      --no-daemon \
+      --no-scan \
+      --no-watch-fs \
+      --no-build-cache \
+      -Dmaven.repo.local='${deps.gradle}' \
+      -PversionCode=${toString buildNumber} \
+      -PcommitHash=${commitHash} \
+      assemble${gradleBuildType}
+    '';
  in
    assert ANDROID_ABI_SPLIT != null && ANDROID_ABI_SPLIT != "";
    assert stringLength ANDROID_ABI_INCLUDE > 0;
@@ -130,24 +161,18 @@ in stdenv.mkDerivation rec {
    export GRADLE_USER_HOME=$(mktemp -d)
    export ANDROID_SDK_HOME=$(mktemp -d)

+    echo "Adhoc ENV: ${adhocEnvVars}"
+    echo "Running: ${gradleCommand}"
+
    pushd ./android
-    ${adhocEnvVars} ${pkgs.gradle}/bin/gradle \
-      ${toString gradleOpts} \
-      --console=plain \
-      --offline --stacktrace \
-      -Dorg.gradle.daemon=false \
-      -Dmaven.repo.local='${deps.gradle}' \
-      -PversionCode=${toString buildNumber} \
-      -PcommitHash=${commitHash} \
-      assemble${gradleBuildType} \
-      || exit 1
+    ${adhocEnvVars} ${gradleCommand}
    popd > /dev/null
  '';
  doCheck = true;
  checkPhase = ''
    ls ${apksPath}/*.apk \
      | xargs -n1 ${pkgs.unzip}/bin/unzip -qql \
-      | grep 'assets/index.android.bundle'
+      | grep 'index.android.bundle'
  '';
  installPhase = ''
    mkdir -p $out
@@ -1,11 +1,13 @@
-# NOTE: If you are in Asia you might want to add https://nix-cache-cn.status.im/ to extra-substituters
-extra-substituters = https://nix-cache.status.im/
-substituters = https://cache.nixos.org/
+# NOTE: If you are in Asia you might want to add https://nix-cache-cn.status.im/ to substituters.
+substituters = https://nix-cache.status.im/ https://cache.nixos.org/
+trusted-substituters = https://nix-cache.status.im/ https://cache.nixos.org/
 trusted-public-keys = nix-cache.status.im-1:x/93lOfLU+duPplwMSBR+OlY4+mo+dCN7n0mr4oPwgY= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
 # Some downloads are multiple GB, default is 5 minutes
 stalled-download-timeout = 3600
 connect-timeout = 10
 max-jobs = auto
+# Build packages if fetching from cache fails.
+fallback = true
 # Helps avoid removing currently used dependencies via garbage collection
 keep-derivations = true
 keep-outputs = true
--- a/Show More
+++ b/Show More