stage experiments with bun

fixes #19081

## Summary
This PR aims to improve android build step for debug variants by ensuring we do not rebuild the android derivation for any change made to `clojurescript` code. 

We also do the following things : 
-  enable `JVM` parallel garbage collector.
-  get rid of `dexOptions` which was deprecated in `gradle 8`.
-  add additional `parallel` flag to `gradle` to speed up builds.

## Review notes
- `make run-clojure`
- `make run-android`
- ctrl + C on android terminal and edit any `cljs` file
- `make run-android`  ( should build almost instantly )

.env

@@ -34,4 +34,3 @@ STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
-FLAG_NEW_CONTACT_UI_ENABLED=0

Makefile

@@ -259,7 +259,7 @@ status-go-library: ##@status-go Compile status-go for node-js
 
 run-clojure: export TARGET := clojure
 run-clojure: ##@run Watch for and build Clojure changes for mobile
-	yarn shadow-cljs watch mobile
+	bun shadow-cljs watch mobile
 
 run-metro: export TARGET := clojure
 run-metro: ##@run Start Metro to build React Native changes
@@ -267,7 +267,7 @@ run-metro: ##@run Start Metro to build React Native changes
 
 run-re-frisk: export TARGET := clojure
 run-re-frisk: ##@run Start re-frisk server
-	yarn shadow-cljs run re-frisk-remote.core/start
+	bun shadow-cljs run re-frisk-remote.core/start
 
 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
@@ -327,20 +327,20 @@ lint-fix: ##@test Run code style checks and fix issues
 
 shadow-server: export TARGET := clojure
 shadow-server:##@ Start shadow-cljs in server mode for watching
-	yarn shadow-cljs server
+	bun shadow-cljs server
 
 _test-clojure: export TARGET := clojure
 _test-clojure: export WATCH ?= false
 _test-clojure: status-go-library
 _test-clojure:
 ifeq ($(WATCH), true)
-	yarn node-pre-gyp rebuild && \
-	yarn shadow-cljs compile mocks && \
-	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
+	bun node-pre-gyp rebuild && \
+	bun shadow-cljs compile mocks && \
+	nodemon --exec "bun shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
 else
-	yarn node-pre-gyp rebuild && \
-	yarn shadow-cljs compile mocks && \
-	yarn shadow-cljs compile test && \
+	bun node-pre-gyp rebuild && \
+	bun shadow-cljs compile mocks && \
+	bun shadow-cljs compile test && \
 	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
 endif
 
@@ -353,11 +353,11 @@ test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
 test-watch-for-repl: status-go-library
 test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	yarn node-pre-gyp rebuild
+	bun node-pre-gyp rebuild
 	rm -f target/test/test.js
-	yarn shadow-cljs compile mocks && \
+	bun shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
-		'yarn shadow-cljs watch test --verbose' \
+		'bun shadow-cljs watch test --verbose' \
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"
 
 test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js
@@ -387,7 +387,7 @@ component-test-watch: export JEST_USE_SILENT_REPORTER := false
 component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
-	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
+	nodemon --exec 'bun shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
 
 component-test: export TARGET := clojure
 component-test: export COMPONENT_TEST := true
@@ -396,7 +396,7 @@ component-test: export JEST_USE_SILENT_REPORTER := false
 component-test: ##@test Run component tests once in NodeJS
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
-	yarn shadow-cljs compile component-test && \
+	bun shadow-cljs compile component-test && \
 	jest --clearCache && jest --config=test/jest/jest.config.js --testEnvironment node
 
 #--------------
@@ -447,7 +447,7 @@ _list:
 
 repl-clojure: export TARGET := clojure
 repl-clojure: ##@repl Start Clojure repl for mobile App
-	yarn shadow-cljs cljs-repl mobile
+	bun shadow-cljs cljs-repl mobile
 
 repl-nix: nix-repl ##@repl Start an interactive Nix REPL
 

VERSION

@@ -1 +1 @@
-1.25.0
+2.27.0

android/app/build.gradle

@@ -138,11 +138,16 @@ def getEnvOrConfig = { varName ->
 android {
     ndkVersion rootProject.ext.ndkVersion
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17
+    }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     namespace "im.status.ethereum"
@@ -194,10 +199,6 @@ android {
         doNotStrip '*/mips/*.so'
         doNotStrip '*/mips64/*.so'
     }
-    dexOptions {
-        jumboMode true
-        javaMaxHeapSize "8g"
-    }
     splits {
         abi {
             reset()
@@ -286,6 +287,7 @@ dependencies {
     implementation("com.facebook.fresco:animated-gif:2.5.0")
     implementation("com.squareup.okhttp3:okhttp-tls:4.9.2")
     implementation("com.google.prefab:cli:2.0.0")
+    implementation("com.android.tools.build:aapt2:8.1.1-10154469")
 }
 
 

android/app/src/debug/AndroidManifest.xml

@@ -7,7 +7,5 @@
     <!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
     <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" android:exported="false" />
-    </application>
+   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"  android:usesCleartextTraffic="true" />
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <!-- non-dangerous permissions -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -74,7 +75,13 @@
             </intent-filter>
         </activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-        <service android:name="im.status.ethereum.pushnotifications.ForegroundService"></service>
+        <service
+            android:name="im.status.ethereum.pushnotifications.ForegroundService"
+            android:foregroundServiceType="specialUse">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="local notifications"/>
+        </service>
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

android/app/src/main/java/im/status/ethereum/MainActivity.kt

@@ -99,7 +99,7 @@ class MainActivity : NavigationActivity(), ActivityCompat.OnRequestPermissionsRe
 
     private fun tryToEmit(eventName: String, event: WritableMap) {
         try {
-                (getApplication() as MainApplication).getReactNativeHost()
+                (getApplication() as MainApplication).reactNativeHost
                 .getReactInstanceManager()
                 .getCurrentReactContext()
                 ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)

android/app/src/main/java/im/status/ethereum/MainApplication.kt

@@ -25,14 +25,13 @@ class MainApplication : NavigationApplication() {
             return BuildConfig.DEBUG
         }
 
-        override fun getPackages(): List<ReactPackage> {
-            val statusPackage = StatusPackage(RootUtil.isDeviceRooted())
-            val packages = PackageList(this).getPackages()
-            packages.add(statusPackage)
-            packages.add(RNStatusKeycardPackage())
-            packages.add(PushNotificationPackage())
-            packages.add(BlurViewPackage())
-            return packages
+        override fun getPackages(): List<ReactPackage> =
+            PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here
+          add(StatusPackage(RootUtil.isDeviceRooted()))
+          add(RNStatusKeycardPackage())
+          add(PushNotificationPackage())
+          add(BlurViewPackage())
         }
 
         override fun getJSMainModuleName(): String = "index"
@@ -42,9 +41,8 @@ class MainApplication : NavigationApplication() {
         override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
     }
 
-    override fun getReactNativeHost(): ReactNativeHost {
-        return mReactNativeHost
-    }
+    override val reactNativeHost: ReactNativeHost
+        get() = mReactNativeHost
 
     override fun onCreate() {
         super.onCreate()

android/build.gradle

@@ -15,6 +15,8 @@ ext {
     supportLibVersion   = project.supportLibVersion
     gradlePluginVersion = project.gradlePluginVersion
     kotlinVersion       = project.kotlinPluginVersion
+    kotlinPluginVersion = project.kotlinPluginVersion
+    kotlinToolsVersion  = project.kotlinPluginVersion
     ndkVersion = "25.2.9519653"
 }
 
@@ -28,6 +30,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinPluginVersion}"
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
 }
 
@@ -41,11 +44,30 @@ subprojects {
                 defaultConfig {
                     targetSdkVersion rootProject.ext.targetSdkVersion
                 }
+
+                // Speed up Tests Stage
+                tasks.withType(Test).configureEach {
+                    // https://docs.gradle.org/current/userguide/performance.html#execute_tests_in_parallel
+                    maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+                    // https://docs.gradle.org/current/userguide/performance.html#fork_tests_into_multiple_processes
+                    forkEvery = 100
+                    // https://docs.gradle.org/current/userguide/performance.html#disable_reports
+                    reports.html.required = false
+                    reports.junitXml.required = false
+                }
+                // Speed up Java Compile Stage
+                // https://docs.gradle.org/current/userguide/performance.html#run_the_compiler_as_a_separate_process
+                tasks.withType(JavaCompile).configureEach {
+                    options.fork = true
+                }
+
             }
         }
     }
 }
 
+apply plugin: "com.facebook.react.rootproject"
+
 allprojects {
     beforeEvaluate {
         if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {

android/gradle.properties

@@ -22,9 +22,9 @@
 
 # Version requirements used throughout the Gradle scripts
 minSdkVersion=24
-compileSdkVersion=33
-targetSdkVersion=33
-buildToolsVersion=33.0.0
+compileSdkVersion=34
+targetSdkVersion=34
+buildToolsVersion=34.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/pkgs/aapt2/default.nix
 gradlePluginVersion=7.4.2
@@ -43,7 +43,7 @@ ANDROID_ABI_SPLIT=false
 # Some platforms are excluded though
 ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64
 
-org.gradle.jvmargs=-Xmx8704M
+org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC
 
 versionCode=9999
 commitHash=unknown

babel.config.js

@@ -1,19 +1,4 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
   plugins: ['react-native-reanimated/plugin', '@babel/plugin-transform-named-capturing-groups-regex'],
-  env: {
-    test: {
-      presets: [
-        '@babel/preset-react',
-        [
-          '@babel/preset-env',
-          {
-            targets: {
-              node: 'current',
-            },
-          },
-        ],
-      ],
-    },
-  },
 };

ci/Jenkinsfile.e2e-nightly

@@ -5,8 +5,8 @@ pipeline {
   agent { label 'linux' }
 
   triggers {
-    // Nightly at 2am
-    cron 'H 2 * * *'
+    // Nightly at 0am
+    cron 'H 0 * * *'
   }
 
   parameters {

fastlane/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
 gem 'fastlane', '>= 2.131.0'

fastlane/Gemfile.lock

@@ -3,25 +3,30 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.4)
+    activesupport (7.0.8)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.768.0)
-    aws-sdk-core (3.173.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.872.0)
+    aws-sdk-core (3.190.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.75.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.141.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -29,14 +34,14 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    concurrent-ruby (1.2.2)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.99.0)
+    excon (0.108.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -66,7 +71,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.212.2)
+    fastlane (2.217.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -87,10 +92,11 @@ GEM
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
       optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
@@ -98,7 +104,7 @@ GEM
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -106,9 +112,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.42.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -121,26 +127,26 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
+    google-cloud-env (2.1.0)
+      faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.29.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.9.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -148,32 +154,34 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.0)
-    memoist (0.16.2)
+    json (2.7.1)
+    jwt (2.7.1)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
+    minitest (5.20.0)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
     optparse (0.1.1)
     os (1.1.4)
     plist (3.7.0)
-    public_suffix (5.0.1)
-    rake (13.0.6)
+    public_suffix (5.0.4)
+    rake (13.1.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -182,21 +190,20 @@ GEM
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.23.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -209,10 +216,11 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
 
 DEPENDENCIES
+  activesupport (>= 6.1.7.3, < 7.1.0)
   fastlane (>= 2.131.0)
 
 BUNDLED WITH
-   2.3.9
+   2.4.13

fastlane/gemset.nix

@@ -1,14 +1,25 @@
 {
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5";
+      type = "gem";
+    };
+    version = "7.0.8";
+  };
   addressable = {
     dependencies = ["public_suffix"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
+      sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
       type = "gem";
     };
-    version = "2.8.4";
+    version = "2.8.6";
   };
   artifactory = {
     groups = ["default"];
@@ -35,20 +46,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
+      sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   aws-partitions = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1256rf6zjh3canwr636w7yczbvhh72cpz2fw5ixljbh4fcfkrvlm";
+      sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm";
       type = "gem";
     };
-    version = "1.768.0";
+    version = "1.872.0";
   };
   aws-sdk-core = {
     dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -56,10 +67,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10djgbz4k9w3axka8xrhf97h9yh9svi5g5xvncfwnkg6h22w2177";
+      sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh";
       type = "gem";
     };
-    version = "3.173.0";
+    version = "3.190.1";
   };
   aws-sdk-kms = {
     dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +78,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
+      sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1";
       type = "gem";
     };
-    version = "1.64.0";
+    version = "1.75.0";
   };
   aws-sdk-s3 = {
     dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -78,10 +89,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
+      sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya";
       type = "gem";
     };
-    version = "1.122.0";
+    version = "1.141.0";
   };
   aws-sigv4 = {
     dependencies = ["aws-eventstream"];
@@ -89,10 +100,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
+      sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.8.0";
   };
   babosa = {
     groups = ["default"];
@@ -156,6 +167,16 @@
     };
     version = "4.6.0";
   };
+  concurrent-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
   declarative = {
     groups = ["default"];
     platforms = [];
@@ -172,21 +193,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2";
+      sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w";
       type = "gem";
     };
-    version = "0.6.4";
+    version = "0.6.5";
   };
   domain_name = {
-    dependencies = ["unf"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+      sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si";
       type = "gem";
     };
-    version = "0.5.20190701";
+    version = "0.6.20231109";
   };
   dotenv = {
     groups = ["default"];
@@ -213,10 +233,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
+      sha256 = "1q9yz7x36mpzpz04bg6hdyrzzk4bri9jg3h2ygw26bf6v3axq53q";
       type = "gem";
     };
-    version = "0.99.0";
+    version = "0.108.0";
   };
   faraday = {
     dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@@ -363,15 +383,15 @@
     version = "2.2.7";
   };
   fastlane = {
-    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "http-cookie" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15sa3v3aaslympg9nmadmpxpbzykdiybzxn3navc7mf0iscb3q7s";
+      sha256 = "0p2b92csayzlj60v15fz3mq4h23kvvr7swhaavi6fpaqzf70iafi";
       type = "gem";
     };
-    version = "2.212.2";
+    version = "2.217.0";
   };
   gh_inspector = {
     groups = ["default"];
@@ -389,10 +409,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ks2ak4fcvlflhyinykvd88g2ybxwsbc347aww349zhn1mqprbvg";
+      sha256 = "046j100lrh5dhb8p3gr38fyqrw8vcif97pqb55ysipy874lafw49";
       type = "gem";
     };
-    version = "0.42.0";
+    version = "0.54.0";
   };
   google-apis-core = {
     dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@@ -400,10 +420,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "184zkm5agi7r5fl79hgahjpydsc4d23nd2ynh2sr9z8gs2w4h82f";
+      sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.11.2";
   };
   google-apis-iamcredentials_v1 = {
     dependencies = ["google-apis-core"];
@@ -433,10 +453,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17qamcjnf22zvw1g169g8a2gkzdsxx4ij3a4ganihyrcf9r62asj";
+      sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx";
       type = "gem";
     };
-    version = "0.19.0";
+    version = "0.29.0";
   };
   google-cloud-core = {
     dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -444,10 +464,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za";
+      sha256 = "00wfvdvdv9m4l5ydn6xp65n68mgmpqr3n09hzvxs7gp8fly3j17v";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.6.1";
   };
   google-cloud-env = {
     dependencies = ["faraday"];
@@ -455,10 +475,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
+      sha256 = "056r1p8vhjswnx2cy3mzhwc5gj03whmpz8m4p2ph37gag5bpnxmf";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "2.1.0";
   };
   google-cloud-errors = {
     groups = ["default"];
@@ -476,21 +496,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1skhlpcykxxzw3050cwngdyc3n746wfx443w1w9chxwjbh2ix6i9";
+      sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j";
       type = "gem";
     };
-    version = "1.44.0";
+    version = "1.45.0";
   };
   googleauth = {
-    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
+    dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
+      sha256 = "0spv89di017rg25psiv4w3pn6f67y2w6vv8w910i83b5yii84rl1";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.9.1";
   };
   highline = {
     groups = ["default"];
@@ -523,6 +543,17 @@
     };
     version = "2.8.3";
   };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+      type = "gem";
+    };
+    version = "1.14.1";
+  };
   jmespath = {
     groups = ["default"];
     platforms = [];
@@ -538,30 +569,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
+      sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
       type = "gem";
     };
-    version = "2.6.3";
+    version = "2.7.1";
   };
   jwt = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
+      sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87";
       type = "gem";
     };
-    version = "2.7.0";
-  };
-  memoist = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
-      type = "gem";
-    };
-    version = "0.16.2";
+    version = "2.7.1";
   };
   mini_magick = {
     groups = ["default"];
@@ -578,10 +599,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
+      sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.1.5";
+  };
+  minitest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
+      type = "gem";
+    };
+    version = "5.20.0";
   };
   multi_json = {
     groups = ["default"];
@@ -598,10 +629,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.3.0";
   };
   nanaimo = {
     groups = ["default"];
@@ -658,20 +689,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
+      sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
       type = "gem";
     };
-    version = "5.0.1";
+    version = "5.0.4";
   };
   rake = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
+      sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
       type = "gem";
     };
-    version = "13.0.6";
+    version = "13.1.0";
   };
   representable = {
     dependencies = ["declarative" "trailblazer-option" "uber"];
@@ -699,10 +730,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
       type = "gem";
     };
-    version = "3.2.5";
+    version = "3.2.6";
   };
   rouge = {
     groups = ["default"];
@@ -750,10 +781,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x";
+      sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6";
       type = "gem";
     };
-    version = "0.17.0";
+    version = "0.18.0";
   };
   simctl = {
     dependencies = ["CFPropertyList" "naturally"];
@@ -782,10 +813,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+      sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "3.0.2";
   };
   trailblazer-option = {
     groups = ["default"];
@@ -812,10 +843,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
+      sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.8.2";
   };
   tty-spinner = {
     dependencies = ["tty-cursor"];
@@ -828,6 +859,17 @@
     };
     version = "0.9.3";
   };
+  tzinfo = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
+      type = "gem";
+    };
+    version = "2.0.6";
+  };
   uber = {
     groups = ["default"];
     platforms = [];
@@ -838,36 +880,15 @@
     };
     version = "0.1.0";
   };
-  unf = {
-    dependencies = ["unf_ext"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
-      type = "gem";
-    };
-    version = "0.1.4";
-  };
-  unf_ext = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch";
-      type = "gem";
-    };
-    version = "0.0.8.2";
-  };
   unicode-display_width = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
+      sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "2.5.0";
   };
   webrick = {
     groups = ["default"];
@@ -895,10 +916,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi";
+      sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn";
       type = "gem";
     };
-    version = "1.22.0";
+    version = "1.23.0";
   };
   xcpretty = {
     dependencies = ["rouge"];

ios/Podfile

@@ -32,8 +32,8 @@ abstract_target 'Status' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    :hermes_enabled => false,
     :fabric_enabled => flags[:fabric_enabled],
+    :hermes_enabled => false,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
@@ -63,15 +63,18 @@ abstract_target 'Status' do
   end
 
   post_install do |installer|
+    # as per react-native 0.73.2 template
+    # https://github.com/facebook/react-native/blob/c5c0563f209ead8f884204763e02115bd66d1960/packages/react-native/template/ios/Podfile#L49-L52
+    react_native_post_install(
+      installer,
+      config[:reactNativePath],
+      :mac_catalyst_enabled => false,
+    )
     # some of libs wouldn't be build for x86_64 otherwise and that is
     # necessary for ios simulators
     installer.pods_project.targets.each do |target|
       target.build_configurations.each do |config|
         config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
-        # fix for no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'?
-        # ref : https://github.com/facebook/react-native/issues/37748
-        # TODO : remove after upgrading to react-native 0.72.x
-        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']
       end
       # We need to remove the predefinition of IPHONEOS_DEPLOYMENT_TARGET from RNCK lib to use our own.
       case target.name

ios/StatusIm.xcodeproj/project.pbxproj

@@ -8,8 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
+		061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
 		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 */; };
@@ -35,6 +37,7 @@
 		3AAD2AD324A3A60E0075D594 /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
 		3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; };
+		536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; };
 		65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
@@ -44,8 +47,6 @@
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */; };
-		9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B792BBAE71EAA1C3F2C9C47 /* 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 */; };
@@ -60,7 +61,6 @@
 		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 */; };
-		E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,14 +108,14 @@
 		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>"; };
-		1130DCD9CBDCA3CA461F55B4 /* 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>"; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
-		28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
+		1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -123,24 +123,22 @@
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		59C9C002A09CA7F40E69C6CB /* 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>"; };
-		5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
-		668C1A2ADF1899973DAA1AB7 /* 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>"; };
 		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>"; };
+		7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
+		79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
+		7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
-		9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.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>"; };
-		A18E846035BD6544591E45B9 /* 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>"; };
 		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>"; };
-		ACFD5EEA905CF67FD6F8C2CC /* 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>"; };
+		AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
@@ -150,10 +148,12 @@
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
+		C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
+		CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		D0D6FCD821497D4A6D28C82E /* 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>"; };
+		D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				536FC260A89500EC9FDB1585 /* 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 */,
-				8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */,
+				17F5C611511E64ACE76B00A3 /* 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 */,
-				9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */,
+				061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */,
-				9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */,
-				5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */,
+				7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */,
+				1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */,
+				C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */,
-				668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */,
-				59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */,
-				A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */,
+				AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */,
+				1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */,
+				D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */,
+				8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */,
+				1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */,
+				FD7194DC9A3E5A5277869CFC /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				28606042DA81A750949525E4 /* [CP] Copy Pods Resources */,
+				88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */,
+				4EE2E0EC4F119397E1A6B768 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */,
+				1B5C687FDBFFB60FD1043432 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,26 +544,48 @@
 			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";
 		};
-		28606042DA81A750949525E4 /* [CP] Copy Pods Resources */ = {
+		1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		1B5C687FDBFFB60FD1043432 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
@@ -594,51 +616,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
 		};
-		523CD6BCB20FD78FBF3564AD /* [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;
-		};
-		BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */ = {
+		4EE2E0EC4F119397E1A6B768 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -660,7 +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;
 		};
-		CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */ = {
+		88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -682,28 +682,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -718,6 +696,28 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
 		};
+		FD7194DC9A3E5A5277869CFC /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -765,7 +765,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -782,13 +782,13 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -802,7 +802,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -816,13 +816,13 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -835,11 +835,11 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -879,13 +879,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -894,6 +895,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -915,11 +917,11 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -953,13 +955,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -968,6 +971,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -988,11 +992,11 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
@@ -1031,13 +1035,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -1046,6 +1051,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1065,11 +1071,11 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -1102,13 +1108,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -1117,6 +1124,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1139,7 +1147,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1172,7 +1180,7 @@
 				ENABLE_TESTABILITY = YES;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1203,21 +1211,27 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = false;
 				VALID_ARCHS = arm64;
 				"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
 			};
@@ -1229,7 +1243,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1261,7 +1275,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -1284,21 +1298,27 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
+				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = false;
 				VALIDATE_PRODUCT = YES;
 				VALID_ARCHS = arm64;
 			};

ios/StatusIm/AppDelegate.mm

@@ -104,6 +104,11 @@ extern "C" NSString* StatusgoImageServerTLSCert();
 
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  return [self getBundleURL];
+}
+
+- (NSURL *)getBundleURL
 {
 #if DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];

ios/StatusIm/Info.plist

@@ -2,12 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleBuildUrl</key>
 	<string>????</string>
 	<key>CFBundleCommitHash</key>
 	<string>unknown</string>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Enabling Face ID allows you quick and secure access to your account.</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -59,31 +59,29 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NFCReaderUsageDescription</key>
+	<string>Enable Keycard</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
+		<false/>
+		<key>NSAllowsLocalNetworking</key>
 		<true/>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>Status uses camera to take pictures and scan QR codes.</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Enabling Face ID allows you quick and secure access to your account.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Location access is required for some DApps to function properly.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Location access is required for some DApps to function properly.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Photos access is required to give you the ability to send images.</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Photos access is required to give you the ability to save images.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Need microphone access for sending audio messages.</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>Photos access is required to give you the ability to save images.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Photos access is required to give you the ability to send images.</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Inter-Bold.otf</string>
@@ -140,8 +138,5 @@
 		<string>A00000080400010301</string>
 		<string>A000000151000000</string>
 	</array>
-	<key>NFCReaderUsageDescription</key>
-	<string>Enable Keycard</string>
-	<key>CADisableMinimumFrameDurationOnPhone</key><true/>
 </dict>
 </plist>

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/ForegroundService.java

@@ -3,6 +3,7 @@ package im.status.ethereum.pushnotifications;
 import android.content.Context;
 import android.content.Intent;
 import android.app.Service;
+import android.content.pm.ServiceInfo;
 import android.os.IBinder;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -78,10 +79,10 @@ public class ForegroundService extends Service {
         
 
       
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
         Intent stopIntent = new Intent(PushNotificationHelper.ACTION_TAP_STOP);
         PendingIntent stopPendingIntent = PendingIntent.getBroadcast(context, 0, stopIntent,
-                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
         Notification notification = new NotificationCompat.Builder(context, CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_stat_notify_status)
@@ -95,8 +96,14 @@ public class ForegroundService extends Service {
                        context.getResources().getString(R.string.stop),
                        stopPendingIntent)
             .build();
+
         // the id of the foreground notification MUST NOT be 0
-        startForeground(1, notification);
+        if (Build.VERSION.SDK_INT >= 33) {
+            startForeground(1, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+        } else {
+            startForeground(1, notification);
+        }
+
         return START_STICKY;
     }
 }

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotificationHelper.java

@@ -68,7 +68,7 @@ public class PushNotificationHelper {
     private static final String CHANNEL_ID = "status-im-notifications";
     public static final String ACTION_DELETE_NOTIFICATION = "im.status.ethereum.module.DELETE_NOTIFICATION";
     public static final String ACTION_TAP_STOP = "im.status.ethereum.module.TAP_STOP";
-    final int flag =  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE : PendingIntent.FLAG_CANCEL_CURRENT;
+    final int flag =  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE : PendingIntent.FLAG_CANCEL_CURRENT;
 
     private NotificationManager notificationManager;
 
@@ -139,7 +139,7 @@ public class PushNotificationHelper {
     public void registerBroadcastReceiver() {
         this.intentFilter.addAction(ACTION_DELETE_NOTIFICATION);
         this.intentFilter.addAction(ACTION_TAP_STOP);
-        context.registerReceiver(notificationActionReceiver, this.intentFilter);
+        context.registerReceiver(notificationActionReceiver, this.intentFilter, Context.RECEIVER_EXPORTED);
         Log.e(LOG_TAG, "Broadcast Receiver registered");
     }
 
@@ -518,7 +518,7 @@ public class PushNotificationHelper {
                     actionIntent.setPackage(packageName);
 
                     PendingIntent pendingActionIntent = PendingIntent.getBroadcast(context, notificationID, actionIntent,
-                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
+                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                       notification.addAction(new NotificationCompat.Action.Builder(icon, action, pendingActionIntent).build());
@@ -684,7 +684,7 @@ public class PushNotificationHelper {
 
         return output;
     }
-    
+
     private Person getPerson(Bundle bundle) {
      String name = bundle.getString("name");
 

nix/deps/gradle/deps.list

@@ -1,22 +1,24 @@
 androidx.activity:activity:1.0.0
 androidx.activity:activity:1.0.0-rc01
 androidx.activity:activity:1.2.4
+androidx.activity:activity:1.6.0
 androidx.annotation:annotation-experimental:1.1.0
+androidx.annotation:annotation-experimental:1.3.0
+androidx.annotation:annotation-jvm:1.6.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
+androidx.annotation:annotation:1.6.0
 androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
-androidx.appcompat:appcompat-resources:1.4.1
-androidx.appcompat:appcompat-resources:1.4.2
+androidx.appcompat:appcompat-resources:1.6.1
 androidx.appcompat:appcompat:1.0.0
 androidx.appcompat:appcompat:1.1.0-rc01
 androidx.appcompat:appcompat:1.2.0
 androidx.appcompat:appcompat:1.3.1
-androidx.appcompat:appcompat:1.4.1
-androidx.appcompat:appcompat:1.4.2
+androidx.appcompat:appcompat:1.6.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
@@ -38,14 +40,16 @@ 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.2.0
 androidx.core:core-ktx:1.6.0
+androidx.core:core-ktx:1.9.0
 androidx.core:core-splashscreen:1.0.0
 androidx.core:core:1.0.0
 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.core:core:1.9.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
@@ -54,18 +58,18 @@ androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
 androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
-androidx.databinding:databinding-common:7.4.2
+androidx.databinding:databinding-common:8.1.1
 androidx.databinding:databinding-compiler-common:3.2.1
 androidx.databinding:databinding-compiler-common:3.5.4
 androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
 androidx.databinding:databinding-compiler-common:7.3.1
-androidx.databinding:databinding-compiler-common:7.4.2
+androidx.databinding:databinding-compiler-common:8.1.1
 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.emoji2:emoji2-views-helper:1.2.0
+androidx.emoji2:emoji2:1.2.0
 androidx.exifinterface:exifinterface:1.0.0
 androidx.exifinterface:exifinterface:1.1.0-beta01
 androidx.exifinterface:exifinterface:1.1.0-rc01
@@ -83,23 +87,26 @@ 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-common:2.5.1
 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-core:2.5.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-process:2.4.1
 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-runtime:2.5.1
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.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.lifecycle:lifecycle-viewmodel:2.5.1
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.media:media:1.0.0
@@ -107,12 +114,13 @@ 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.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.savedstate:savedstate:1.0.0
 androidx.savedstate:savedstate:1.0.0-rc01
 androidx.savedstate:savedstate:1.1.0
+androidx.savedstate:savedstate:1.2.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
-androidx.startup:startup-runtime:1.0.0
+androidx.startup:startup-runtime:1.1.1
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02
@@ -162,7 +170,7 @@ com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
 com.android.databinding:baseLibrary:7.3.1
-com.android.databinding:baseLibrary:7.4.2
+com.android.databinding:baseLibrary:8.1.1
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
@@ -172,7 +180,7 @@ com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
 com.android.tools.analytics-library:crash:30.3.1
-com.android.tools.analytics-library:crash:30.4.2
+com.android.tools.analytics-library:crash:31.1.1
 com.android.tools.analytics-library:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
@@ -181,7 +189,7 @@ com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
 com.android.tools.analytics-library:protos:30.3.1
-com.android.tools.analytics-library:protos:30.4.2
+com.android.tools.analytics-library:protos:31.1.1
 com.android.tools.analytics-library:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
@@ -190,7 +198,7 @@ com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
 com.android.tools.analytics-library:shared:30.3.1
-com.android.tools.analytics-library:shared:30.4.2
+com.android.tools.analytics-library:shared:31.1.1
 com.android.tools.analytics-library:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
@@ -199,7 +207,7 @@ com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
 com.android.tools.analytics-library:tracker:30.3.1
-com.android.tools.analytics-library:tracker:30.4.2
+com.android.tools.analytics-library:tracker:31.1.1
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09
@@ -214,12 +222,13 @@ com.android.tools.build:aapt2-proto:4.1.0-6503028
 com.android.tools.build:aapt2-proto:7.0.4-7396180
 com.android.tools.build:aapt2-proto:7.2.1-7984345
 com.android.tools.build:aapt2-proto:7.3.1-8691043
-com.android.tools.build:aapt2-proto:7.4.2-8841542
+com.android.tools.build:aapt2-proto:8.1.1-10154469
+com.android.tools.build:aapt2:8.1.1-10154469
 com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:aaptcompiler:7.0.4
 com.android.tools.build:aaptcompiler:7.2.1
 com.android.tools.build:aaptcompiler:7.3.1
-com.android.tools.build:aaptcompiler:7.4.2
+com.android.tools.build:aaptcompiler:8.1.1
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
@@ -228,14 +237,14 @@ com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
 com.android.tools.build:apksig:7.2.1
 com.android.tools.build:apksig:7.3.1
-com.android.tools.build:apksig:7.4.2
+com.android.tools.build:apksig:8.1.1
 com.android.tools.build:apkzlib:3.2.1
 com.android.tools.build:apkzlib:3.5.4
 com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
 com.android.tools.build:apkzlib:7.3.1
-com.android.tools.build:apkzlib:7.4.2
+com.android.tools.build:apkzlib:8.1.1
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.0
@@ -246,7 +255,7 @@ com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
 com.android.tools.build:builder-model:7.3.1
-com.android.tools.build:builder-model:7.4.2
+com.android.tools.build:builder-model:8.1.1
 com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.0
@@ -257,7 +266,7 @@ com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
 com.android.tools.build:builder-test-api:7.3.1
-com.android.tools.build:builder-test-api:7.4.2
+com.android.tools.build:builder-test-api:8.1.1
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.0
@@ -268,14 +277,14 @@ com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
 com.android.tools.build:builder:7.3.1
-com.android.tools.build:builder:7.4.2
+com.android.tools.build:builder:8.1.1
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
 com.android.tools.build:bundletool:1.6.0
 com.android.tools.build:bundletool:1.8.2
 com.android.tools.build:bundletool:1.9.0
-com.android.tools.build:bundletool:1.11.4
+com.android.tools.build:bundletool:1.14.0
 com.android.tools.build:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
@@ -284,12 +293,12 @@ com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
 com.android.tools.build:gradle-api:7.3.1
-com.android.tools.build:gradle-api:7.4.2
+com.android.tools.build:gradle-api:8.1.1
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
 com.android.tools.build:gradle-core:3.0.0
 com.android.tools.build:gradle-core:3.0.1
-com.android.tools.build:gradle-settings-api:7.4.2
+com.android.tools.build:gradle-settings-api:8.1.1
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.0
@@ -310,7 +319,7 @@ com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
 com.android.tools.build:manifest-merger:30.3.1
-com.android.tools.build:manifest-merger:30.4.2
+com.android.tools.build:manifest-merger:31.1.1
 com.android.tools.build:transform-api:1.5.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
 com.android.tools.ddms:ddmlib:24.3.1
@@ -323,7 +332,7 @@ com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
 com.android.tools.ddms:ddmlib:30.3.1
-com.android.tools.ddms:ddmlib:30.4.2
+com.android.tools.ddms:ddmlib:31.1.1
 com.android.tools.external.com-intellij:intellij-core:26.0.0
 com.android.tools.external.com-intellij:intellij-core:26.0.1
 com.android.tools.external.lombok:lombok-ast:0.2.3
@@ -341,7 +350,7 @@ com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
 com.android.tools.layoutlib:layoutlib-api:30.3.1
-com.android.tools.layoutlib:layoutlib-api:30.4.2
+com.android.tools.layoutlib:layoutlib-api:31.1.1
 com.android.tools.lint:lint-api:24.3.1
 com.android.tools.lint:lint-api:24.5.0
 com.android.tools.lint:lint-api:26.0.0
@@ -357,35 +366,38 @@ com.android.tools.lint:lint-model:27.1.0
 com.android.tools.lint:lint-model:30.0.4
 com.android.tools.lint:lint-model:30.2.1
 com.android.tools.lint:lint-model:30.3.1
-com.android.tools.lint:lint-model:30.4.2
+com.android.tools.lint:lint-model:31.1.1
 com.android.tools.lint:lint-typedef-remover:30.2.1
 com.android.tools.lint:lint-typedef-remover:30.3.1
-com.android.tools.lint:lint-typedef-remover:30.4.2
+com.android.tools.lint:lint-typedef-remover:31.1.1
 com.android.tools.lint:lint:24.3.1
 com.android.tools.lint:lint:24.5.0
 com.android.tools.lint:lint:26.0.0
 com.android.tools.lint:lint:26.0.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.1
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.0.4
 com.android.tools.utp:android-device-provider-gradle-proto:30.2.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.3.1
-com.android.tools.utp:android-device-provider-gradle-proto:30.4.2
+com.android.tools.utp:android-device-provider-gradle-proto:31.1.1
 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.3.1
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.4
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.4
 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.3.1
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.1
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.0
@@ -396,7 +408,7 @@ com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
 com.android.tools:annotations:30.3.1
-com.android.tools:annotations:30.4.2
+com.android.tools:annotations:31.1.1
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.0
@@ -407,7 +419,7 @@ com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
 com.android.tools:common:30.3.1
-com.android.tools:common:30.4.2
+com.android.tools:common:31.1.1
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.0
@@ -418,7 +430,7 @@ com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
 com.android.tools:dvlib:30.3.1
-com.android.tools:dvlib:30.4.2
+com.android.tools:dvlib:31.1.1
 com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
@@ -427,7 +439,7 @@ com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
 com.android.tools:repository:30.3.1
-com.android.tools:repository:30.4.2
+com.android.tools:repository:31.1.1
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.0
@@ -438,7 +450,7 @@ com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
 com.android.tools:sdklib:30.3.1
-com.android.tools:sdklib:30.4.2
+com.android.tools:sdklib:31.1.1
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.0
@@ -449,47 +461,61 @@ com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
 com.android.tools:sdk-common:30.3.1
-com.android.tools:sdk-common:30.4.2
+com.android.tools:sdk-common:31.1.1
 com.android:signflinger:4.1.0
 com.android:signflinger:7.0.4
 com.android:signflinger:7.2.1
 com.android:signflinger:7.3.1
-com.android:signflinger:7.4.2
+com.android:signflinger:8.1.1
 com.android:zipflinger:4.1.0
 com.android:zipflinger:7.0.4
 com.android:zipflinger:7.2.1
 com.android:zipflinger:7.3.1
-com.android:zipflinger:7.4.2
+com.android:zipflinger:8.1.1
 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.26.2
 com.diffplug.spotless:spotless-lib-extra:2.30.0
+com.diffplug.spotless:spotless-lib:2.26.2
 com.diffplug.spotless:spotless-lib:2.30.0
+com.diffplug.spotless:spotless-plugin-gradle:6.7.2
 com.diffplug.spotless:spotless-plugin-gradle:6.11.0
 com.drewnoakes:metadata-extractor:2.18.0
 com.facebook.conceal:conceal:1.1.3
-com.facebook.fbjni:fbjni:0.3.0
+com.facebook.fbjni:fbjni:0.5.1
 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:drawee:3.1.3
 com.facebook.fresco:fbcore:2.5.0
+com.facebook.fresco:fbcore:3.1.3
 com.facebook.fresco:fresco:2.5.0
+com.facebook.fresco:fresco:3.1.3
 com.facebook.fresco:imagepipeline-base:2.5.0
+com.facebook.fresco:imagepipeline-base:3.1.3
 com.facebook.fresco:imagepipeline-native:2.5.0
-com.facebook.fresco:imagepipeline-okhttp3:2.5.0
+com.facebook.fresco:imagepipeline-native:3.1.3
+com.facebook.fresco:imagepipeline-okhttp3:3.1.3
 com.facebook.fresco:imagepipeline:2.5.0
+com.facebook.fresco:imagepipeline:3.1.3
 com.facebook.fresco:memory-type-ashmem:2.5.0
+com.facebook.fresco:memory-type-ashmem:3.1.3
 com.facebook.fresco:memory-type-java:2.5.0
+com.facebook.fresco:memory-type-java:3.1.3
 com.facebook.fresco:memory-type-native:2.5.0
-com.facebook.fresco:middleware:2.5.0
+com.facebook.fresco:memory-type-native:3.1.3
+com.facebook.fresco:middleware:3.1.3
 com.facebook.fresco:nativeimagefilters:2.5.0
+com.facebook.fresco:nativeimagefilters:3.1.3
 com.facebook.fresco:nativeimagetranscoder:2.5.0
-com.facebook.fresco:soloader:2.5.0
-com.facebook.fresco:ui-common:2.5.0
+com.facebook.fresco:nativeimagetranscoder:3.1.3
+com.facebook.fresco:soloader:3.1.3
+com.facebook.fresco:ui-common:3.1.3
 com.facebook.infer.annotation:infer-annotation:0.18.0
-com.facebook.react:hermes-android:0.72.5
-com.facebook.react:react-android:0.72.5
+com.facebook.react:hermes-android:0.73.5
+com.facebook.react:react-android:0.73.5
 com.facebook.soloader:annotation:0.10.5
 com.facebook.soloader:nativeloader:0.10.5
 com.facebook.soloader:soloader:0.10.5
@@ -517,6 +543,7 @@ 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.12
 com.googlecode.javaewah:JavaEWAH:1.1.13
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
@@ -545,6 +572,7 @@ 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.crypto.tink:tink:1.7.0
 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
@@ -552,8 +580,8 @@ 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.errorprone:error_prone_annotations:2.9.0
+com.google.errorprone:error_prone_annotations:2.11.0
 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
@@ -567,7 +595,7 @@ 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:guava:31.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
@@ -582,10 +610,12 @@ com.google.prefab:cli:2.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-util:3.19.3
 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.protobuf:protobuf-java:3.19.3
 com.google.testing.platform:core-proto:0.0.8-alpha04
 com.google.testing.platform:core-proto:0.0.8-alpha07
 com.google.testing.platform:core-proto:0.0.8-alpha08
@@ -617,38 +647,56 @@ 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-api:1.45.1
 io.grpc:grpc-context:1.21.1
 io.grpc:grpc-context:1.39.0
+io.grpc:grpc-context:1.45.1
 io.grpc:grpc-core:1.21.1
 io.grpc:grpc-core:1.39.0
+io.grpc:grpc-core:1.45.1
 io.grpc:grpc-netty:1.21.1
 io.grpc:grpc-netty:1.39.0
+io.grpc:grpc-netty:1.45.1
 io.grpc:grpc-protobuf-lite:1.21.1
 io.grpc:grpc-protobuf-lite:1.39.0
+io.grpc:grpc-protobuf-lite:1.45.1
 io.grpc:grpc-protobuf:1.21.1
 io.grpc:grpc-protobuf:1.39.0
+io.grpc:grpc-protobuf:1.45.1
 io.grpc:grpc-stub:1.21.1
 io.grpc:grpc-stub:1.39.0
+io.grpc:grpc-stub:1.45.1
 io.netty:netty-buffer:4.1.34.Final
 io.netty:netty-buffer:4.1.52.Final
+io.netty:netty-buffer:4.1.72.Final
 io.netty:netty-codec-http2:4.1.34.Final
 io.netty:netty-codec-http2:4.1.52.Final
+io.netty:netty-codec-http2:4.1.72.Final
 io.netty:netty-codec-http:4.1.34.Final
 io.netty:netty-codec-http:4.1.52.Final
+io.netty:netty-codec-http:4.1.72.Final
 io.netty:netty-codec-socks:4.1.34.Final
 io.netty:netty-codec-socks:4.1.52.Final
+io.netty:netty-codec-socks:4.1.72.Final
 io.netty:netty-codec:4.1.34.Final
 io.netty:netty-codec:4.1.52.Final
+io.netty:netty-codec:4.1.72.Final
 io.netty:netty-common:4.1.34.Final
 io.netty:netty-common:4.1.52.Final
+io.netty:netty-common:4.1.72.Final
 io.netty:netty-handler-proxy:4.1.34.Final
 io.netty:netty-handler-proxy:4.1.52.Final
+io.netty:netty-handler-proxy:4.1.72.Final
 io.netty:netty-handler:4.1.34.Final
 io.netty:netty-handler:4.1.52.Final
+io.netty:netty-handler:4.1.72.Final
 io.netty:netty-resolver:4.1.34.Final
 io.netty:netty-resolver:4.1.52.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
 io.netty:netty-transport:4.1.34.Final
 io.netty:netty-transport:4.1.52.Final
+io.netty:netty-transport:4.1.72.Final
 io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.21.0
 io.perfmark:perfmark-api:0.23.0
@@ -686,6 +734,7 @@ 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-compress:1.21
 org.apache.commons:commons-lang3:3.3.2
 org.apache.commons:commons-lang3:3.9
 org.apache.httpcomponents:httpclient:4.1.1
@@ -700,6 +749,7 @@ org.apache.httpcomponents:httpcore:4.4.5
 org.apache.httpcomponents:httpcore:4.4.10
 org.apache.httpcomponents:httpcore:4.4.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.httpcomponents:httpcore:4.4.15
 org.apache.httpcomponents:httpmime:4.1
 org.apache.httpcomponents:httpmime:4.5.2
 org.apache.httpcomponents:httpmime:4.5.6
@@ -717,16 +767,18 @@ org.checkerframework:checker-qual:2.8.1
 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.9
 org.codehaus.groovy:groovy-xml:3.0.10
+org.codehaus.groovy:groovy:3.0.9
 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.2
 org.eclipse.jdt.core.compiler:ecj:4.6.1
+org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r
 org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r
 org.fusesource.jansi:jansi:1.18
 org.glassfish.jaxb:jaxb-core:2.2.11
@@ -738,23 +790,22 @@ org.glassfish.jaxb:txw2:2.3.1
 org.glassfish.jaxb:txw2:2.3.2
 org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.2
-org.jacoco:org.jacoco.agent:0.8.8
-org.jacoco:org.jacoco.ant:0.8.8
 org.jacoco:org.jacoco.core:0.7.4.201502262128
-org.jacoco:org.jacoco.core:0.8.8
 org.jacoco:org.jacoco.report:0.7.4.201502262128
-org.jacoco:org.jacoco.report:0.8.8
 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:atomicfu:0.16.3
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1
 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-jvm:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
 org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
@@ -794,7 +845,7 @@ org.jetbrains.kotlin:kotlin-reflect:1.3.72
 org.jetbrains.kotlin:kotlin-reflect:1.4.32
 org.jetbrains.kotlin:kotlin-reflect:1.5.31
 org.jetbrains.kotlin:kotlin-reflect:1.6.10
-org.jetbrains.kotlin:kotlin-reflect:1.7.10
+org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
 org.jetbrains.kotlin:kotlin-scripting-common:1.9.0
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
@@ -810,7 +861,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
@@ -818,14 +870,16 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 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.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
@@ -834,7 +888,8 @@ org.jetbrains.kotlin:kotlin-stdlib:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib:1.9.0
 org.jetbrains.kotlin:kotlin-tooling-core:1.9.0
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
@@ -906,8 +961,11 @@ com.squareup.okio:okio:1.13.0
 com.squareup.okio:okio:1.15.0
 com.squareup.okhttp3:okhttp:3.12.1
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
-com.android.tools.lint:lint-gradle:30.4.2
-com.android.tools.build:gradle:7.4.2
-com.android.tools.build:aapt2:7.4.2-8841542
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
+org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
+com.android.tools.build:gradle:8.1.1
+com.google.errorprone:error_prone_annotations:2.7.1
+com.android.tools.lint:lint-gradle:31.1.1
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0

nix/deps/gradle/generate.sh

@@ -47,11 +47,14 @@ com.squareup.okio:okio:1.13.0
 com.squareup.okio:okio:1.15.0
 com.squareup.okhttp3:okhttp:3.12.1
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
-com.android.tools.lint:lint-gradle:30.4.2
-com.android.tools.build:gradle:7.4.2
-com.android.tools.build:aapt2:7.4.2-8841542
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0' \
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
+org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
+com.android.tools.build:gradle:8.1.1
+com.google.errorprone:error_prone_annotations:2.7.1
+com.android.tools.lint:lint-gradle:31.1.1
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0' \
         >> "${DEPS_LIST}"
 }
 

nix/deps/gradle/proj.list

@@ -6,8 +6,8 @@ react-native-blob-util
 react-native-blur
 react-native-camera-kit
 react-native-camera-roll_camera-roll
+react-native-clipboard_clipboard
 react-native-community_audio-toolkit
-react-native-community_clipboard
 react-native-community_masked-view
 react-native-community_netinfo
 react-native-community_slider

nix/deps/nodejs-patched/default.nix

@@ -12,7 +12,8 @@ stdenv.mkDerivation {
     "patchBuildIdPhase"
     "patchKeyChainPhase"
     "patchGlogPhase"
-    "patchBoostPodSpec"
+    "patchNativeNavigationPhase"
+    "patchRNScriptPhase"
     "installPhase"
   ];
 
@@ -78,12 +79,20 @@ stdenv.mkDerivation {
     --replace 'export CXX="' '#export CXX="'
   '';
 
-  # to fix pod checksum issue : https://github.com/facebook/react-native/issues/42180
-  # TODO remove this patch after upgrading to react-native 0.73.2
-  patchBoostPodSpec = ''
-   substituteInPlace ./node_modules/react-native/third-party-podspecs/boost.podspec \
-      --replace 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2' \
-      'https://sourceforge.net/projects/boost/files/boost/1.76.0/boost_1_76_0.tar.bz2' \
+  # https://github.com/wix/react-native-navigation/issues/7819
+  patchNativeNavigationPhase = ''
+    substituteInPlace ./node_modules/react-native-navigation/lib/android/app/build.gradle \
+      --replace 'JavaVersion.VERSION_1_8' 'JavaVersion.VERSION_17'
+
+    substituteInPlace ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt \
+      --replace 'host: View?,' 'host: View,' \
+      --replace 'info: AccessibilityNodeInfoCompat?' 'info: AccessibilityNodeInfoCompat'
+  '';
+  
+  # to fix https://github.com/status-im/status-mobile/issues/18548
+  patchRNScriptPhase = ''
+    substituteInPlace ./node_modules/react-native/scripts/react_native_pods_utils/script_phases.sh \
+      --replace 'cp -R -X' 'cp -R'
   '';
 
   # The ELF types are incompatible with the host platform, so let's not even try

nix/mobile/android/build.nix

@@ -26,9 +26,10 @@
 
 let
   inherit (lib) toLower optionalString stringLength makeLibraryPath elem;
+  notDebug = (buildType != "debug");
 
   # Pass secretsFile for POKT_TOKEN to jsbundle build
-  builtJsBundle = jsbundle { inherit secretsFile; };
+  builtJsBundle = lib.optionals notDebug jsbundle { inherit secretsFile; };
 
   # Map ANDROID_ABI_INCLUDE to status-go targets
   androidAbiIncludeSplit = lib.splitString ";" androidAbiInclude;
@@ -119,8 +120,10 @@ in stdenv.mkDerivation rec {
     # Export all vars from .env file
     export $(cut -d= -f1 .env)
 
+    ${lib.optionalString notDebug ''
     # Symlink React Native entrypoint.
     cp -Lr ${builtJsBundle} ./result
+    ''}
 
     # Copy android/ directory
     mkdir -p ./android/build
@@ -153,6 +156,7 @@ in stdenv.mkDerivation rec {
       --no-scan \
       --no-watch-fs \
       --no-build-cache \
+      --parallel \
       -Dmaven.repo.local='${deps.gradle}' \
       assemble${gradleBuildType}
     '';

nix/mobile/fastlane/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, callPackage, mkShell,
-  bundlerEnv, cocoapods, bundler, ruby, curl }:
+  bundlerEnv, cocoapods, bundler, ruby, curl, clang }:
 
 let
   inherit (lib) optionals optionalString unique;
@@ -14,7 +14,7 @@ let
 
   inherit (fastlane) shellHook;
 
-  buildInputs = [ ruby bundler fastlane curl ]
+  buildInputs = [ ruby bundler fastlane curl clang ]
     ++ optionals stdenv.isDarwin [ cocoapods ];
 in {
   # HELPERS

nix/overlay.nix

@@ -51,7 +51,7 @@ in {
   };
 
   # Package version adjustments
-  gradle = super.gradle_8;
+  gradle = super.gradle_8_3;
   nodejs = super.nodejs-18_x;
   ruby = super.ruby_3_1;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };

nix/pkgs.nix

@@ -6,10 +6,10 @@ let
   # For testing local version of nixpkgs
   #nixpkgsSrc = (import <nixpkgs> { }).lib.cleanSource "/home/jakubgs/work/nixpkgs";
 
-  # We follow the master branch of official nixpkgs.
+  # We follow a fork of nixpkgs where we bump gradle to 8.3 and update build tools
   nixpkgsSrc = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/e7603eba51f2c7820c0a182c6bbb351181caa8e7.tar.gz";
-    sha256 = "sha256:0mwck8jyr74wh1b7g6nac1mxy6a0rkppz8n12andsffybsipz5jw";
+    url = "https://github.com/status-im/nixpkgs/archive/44d8b23ebbe40ed16ef1aecef6c5354657c48b19.tar.gz";
+    sha256 = "sha256:0s7kjnc8drchzp268yzbv5snc4702hswcns9hrncjq4im8cv6mf9";
   };
 
   # Status specific configuration defaults

nix/pkgs/aapt2/default.nix

@@ -10,7 +10,7 @@ let
 
   pname = "aapt2";
   # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  version = "7.4.2-8841542";
+  version = "8.1.1-10154469";
 
   pkgPath = "com/android/tools/build/aapt2";
   repoUrl = "https://dl.google.com/dl/android/maven2";
@@ -29,20 +29,20 @@ let
     jar = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}";
       sha256 = getAttr platform {
-        linux = "sha256-bHKE8i7QbE0UFgn1TW4gzPj7MBV7t/PVo+Txd6jW0wE=";
-        osx = "sha256-Gmm9dnu2+OccqfqsUiKeanc4FNNkk7lCO0YAoxACjl0=";
+        linux = "sha256-p54GGvEfAo0yk8euVO7QTu/c3zuityZhyGdhFSV6w+E=";
+        osx = "sha256-bO4ljdUEfbuns7EyT1FKGLqNGz+0bms5XsplXvzD2T0=";
       };
     };
     sha = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}.sha1";
       sha256 = getAttr platform {
-        linux = "sha256-mSbHKU3snj5NTg3MN37pmVnVnYRKI9yoMVNJGuUXTso=";
-        osx = "sha256-V/t81ELdzRFoMPSD8wSgbtdQgmUkkOdqRu2iqKIeNVg=";
+        linux = "sha256-oUJOQ9j/sJ7Yt0V9WOrRmuqYI+2UWZxeefJ/WyNoWgw=";
+        osx = "sha256-w+q2j4MKtIOihPMaJxuIP9IwXvRIyBxgRIJLox4E7ac=";
       };
     };
     pom = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.pom}";
-      sha256 = "sha256-9gY2kGJqgVcd1T3UOzYM+xoPug/eGBRUF+cA6Fu9ZRw=";
+      sha256 = "sha256-UdUGCoMmEfJxBS2demYKGdG4lzd2DqQbDUCHt/h7Ohg=";
     };
   };
 

nix/pkgs/android-sdk/compose.nix

@@ -14,8 +14,8 @@ androidenv.composeAndroidPackages {
   cmdLineToolsVersion = "9.0";
   toolsVersion = "26.1.1";
   platformToolsVersion = "33.0.3";
-  buildToolsVersions = [ "33.0.0" ];
-  platformVersions = [ "33" ];
+  buildToolsVersions = [ "34.0.0" ];
+  platformVersions = [ "34" ];
   cmakeVersions = [ "3.22.1" ];
   ndkVersion = "25.2.9519653";
   includeNDK = true;

nix/pkgs/xcbeautify/default.nix

@@ -5,14 +5,15 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "xcbeautify";
-  version = "1.1.1";
+  version = "1.4.0";
   arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
 
+
   src = fetchurl {
-    url = "https://github.com/tuist/xcbeautify/releases/download/${version}/xcbeautify-${version}-${arch}-apple-macosx.zip";
+    url = "https://github.com/cpisciotta/xcbeautify/releases/download/${version}/xcbeautify-${version}-${arch}-apple-macosx.zip";
     sha256 = getAttr arch {
-            arm64 = "sha256-VaZBWZNx5iZxjpsVbKQA4wVsigjlhArDCsQXY/RBDx4=";
-            x86_64 = "sha256-Q1t4nHQu05mPqNRmL0KQukGRAHdkQHM7H24ar0isQTo=";
+            arm64 = "sha256-4b4mXT5IfNOS8iOrZASDhTrmOehG4mePcoiKxR+IdZk=";
+            x86_64 = "sha256-adEfAK7n3Q/Yd1deyJx7htX7hZaGDztEeBv4z2A0wzg=";
         };
     };
 
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A little beautifier tool for xcodebuild";
-    homepage = "https://github.com/tuist/xcbeautify";
+    homepage = "https://github.com/cpisciotta/xcbeautify";
     license = licenses.mit;
     platforms = platforms.darwin;
   };

nix/scripts/node_modules.sh

@@ -53,14 +53,6 @@ copyNodeModules() {
 
 # Find files that were modified and should cause a re-copying of node modules.
 # Some files are generated/modified by build processes and should be ignored.
-#
-# react-native/ReactCommon/react/renderer/components/rncore/*
-# generated at runtime by react-native
-# related code https://github.com/facebook/react-native/blob/v0.72.5/packages/react-native/ReactCommon/React-rncore.podspec#L19
-#
-# react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m
-# generated at runtime by react-native-config
-# related code https://github.com/lugg/react-native-config/blob/v1.5.0/react-native-config.podspec#L52
 findFilesNewerThan() {
   local sentinel="${1}"
   local dir="${2}"
@@ -69,8 +61,14 @@ findFilesNewerThan() {
       -not -ipath "*/*android/build/*" -prune \
       -not -ipath "*/xcuserdata/*" -prune \
       -not -ipath "*/scripts/.packager.env" \
+      \ # generated at runtime by react-native \
+      \ # related code https://github.com/facebook/react-native/blob/v0.72.5/packages/react-native/ReactCommon/React-rncore.podspec#L19 \
       -not -path "*/node_modules/react-native/ReactCommon/react/renderer/components/rncore/*" \
+      \ # generated at runtime by react-native-config \
+      \ # related code https://github.com/lugg/react-native-config/blob/v1.5.0/react-native-config.podspec#L52 \
       -not -path "*/node_modules/react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m" \
+      \ # generated at runtime by react-native from v0.73.x onwards \
+      -not -path "*/node_modules/react-native/React/Fabric/*" \
       -print
 }
 

nix/shell.nix

@@ -23,7 +23,7 @@ in mkShell {
       # build specific utilities
       clojure maven watchman
       # other nice to have stuff
-      yarn nodejs python310 maestro
+      bun yarn nodejs python310 maestro
     ] # and some special cases
       ++ lib.optionals   stdenv.isDarwin ([ cocoapods clang tcl idb-companion ] ++ appleSDKFrameworks)
       ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ]

package.json

@@ -5,21 +5,20 @@
   "private": true,
   "scripts": {
     "_comment": "This also prevents 'yarn install' from running outside of nix.",
-    "preinstall": "scripts/check-nix-shell.sh && make status-go-library"
+    "preinstall": "make status-go-library"
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.17.12",
     "@react-native-async-storage/async-storage": "1.19.3",
     "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
+    "@react-native-clipboard/clipboard": "1.13.2",
     "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
     "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status",
-    "@react-native-community/clipboard": "^1.2.2",
     "@react-native-community/hooks": "^3.0.0",
     "@react-native-community/masked-view": "^0.1.6",
     "@react-native-community/netinfo": "^4.4.0",
     "@react-native-community/push-notification-ios": "^1.4.1",
     "@react-native-community/slider": "^3.0.0",
-    "@react-native/metro-config": "^0.72.9",
     "base-64": "^1.0.0",
     "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/v4.0.2-status",
     "chance": "^1.1.0",
@@ -33,20 +32,20 @@
     "node-libs-react-native": "^1.2.1",
     "react": "18.2.0",
     "react-dom": "18.0.0",
-    "react-native": "0.72.5",
+    "react-native": "0.73.5",
     "react-native-background-timer": "^2.1.1",
     "react-native-biometrics": "^3.0.1",
     "react-native-blob-util": "^0.13.18",
     "react-native-camera-kit": "14.0.0-beta13",
     "react-native-config": "^1.5.0",
-    "react-native-dialogs": "^1.0.4",
+    "react-native-dialogs": "1.1.2",
     "react-native-draggable-flatlist": "4.0.1",
     "react-native-fast-image": "^8.5.11",
     "react-native-fs": "^2.14.1",
-    "react-native-gesture-handler": "2.6.1",
+    "react-native-gesture-handler": "2.14.1",
     "react-native-gifted-charts": "^1.3.2",
     "react-native-haptic-feedback": "^1.9.0",
-    "react-native-hole-view": "3.0.0-alpha3",
+    "react-native-hole-view": "^3.0.0-alpha4",
     "react-native-image-crop-picker": "0.40.0",
     "react-native-image-resizer": "^1.2.3",
     "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#refs/tags/v0.2.1.status",
@@ -55,14 +54,14 @@
     "react-native-linear-gradient": "^2.8.0",
     "react-native-lottie-splash-screen": "^1.0.1",
     "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#refs/tags/v6.1.2-status",
-    "react-native-navigation": "7.37.0",
+    "react-native-navigation": "7.38.3",
     "react-native-orientation-locker": "^1.5.0",
     "react-native-permissions": "3.8.0",
     "react-native-randombytes": "^3.6.1",
     "react-native-reanimated": "3.6.1",
     "react-native-redash": "18.1.0",
     "react-native-shake": "^3.3.1",
-    "react-native-share": "^8.2.2",
+    "react-native-share": "10.0.2",
     "react-native-static-safe-area-insets": "^2.2.0",
     "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39",
     "react-native-svg": "13.10.0",
@@ -82,18 +81,21 @@
     "@babel/register": "7.0.0",
     "@jest/globals": "^25.1.0",
     "@mapbox/node-pre-gyp": "^1.0.9",
+    "@react-native/babel-preset": "0.73.21",
+    "@react-native/codegen": "0.73.2",
+    "@react-native/gradle-plugin": "0.73.4",
+    "@react-native/metro-config": "0.73.5",
     "@testing-library/jest-native": "^5.4.3",
     "@testing-library/react-native": "^12.4.2",
     "@tsconfig/react-native": "^3.0.0",
     "@types/jest": "^28.1.6",
-    "@types/react": "^18.0.24",
+    "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",
-    "babel-jest": "^29.7.0",
+    "babel-jest": "^29.6.3",
     "concurrently": "^7.6.0",
     "jest": "^29.7.0",
     "jest-image-snapshot": "^5.1.0",
     "jest-silent-reporter": "^0.5.0",
-    "metro-react-native-babel-preset": "0.76.8",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
     "prettier": "^2.8.8",
@@ -102,12 +104,6 @@
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "2.26.2"
   },
-  "resolutions": {
-    "_comment": "This prevents random metro crashes till we upgrade to react-native 0.73.x",
-    "metro": "^0.79.1",
-    "metro-config": "^0.79.1",
-    "metro-core": "^0.79.1"
-  },
   "binary": {
     "module_name": "status_nodejs_addon",
     "module_path": "./lib/binding/",
@@ -115,6 +111,6 @@
     "remote_path": "{version}"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   }
 }

src/js/worklets/chat/messenger/messages.js

@@ -1,4 +1,5 @@
-import { withTiming, runOnJS } from 'react-native-reanimated';
+import { useAnimatedReaction, withTiming, runOnJS } from 'react-native-reanimated';
+import { useState } from 'react';
 
 export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callback) {
   return function (event) {
@@ -12,3 +13,21 @@ export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callb
     runOnJS(callback)(layoutHeight, newDistance);
   };
 }
+
+export function useMessagesScrolledToThreshold(distanceFromListTop, threshold) {
+  const [scrolledToThreshold, setScrolledToThreshold] = useState(false);
+
+  useAnimatedReaction(
+    function () {
+      return distanceFromListTop.value <= threshold;
+    },
+    function (current) {
+      if (current !== scrolledToThreshold) {
+        runOnJS(setScrolledToThreshold)(current);
+      }
+    },
+    [scrolledToThreshold],
+  );
+
+  return scrolledToThreshold;
+}

src/js/worklets/chat/messenger/navigation.js

@@ -19,6 +19,13 @@ export function navigationHeaderPosition(distanceFromListTop, isAllLoaded, topBa
   });
 }
 
+export function navigationButtonsCompleteOpacity(isCalculationComplete) {
+  return useDerivedValue(function () {
+    'worklet';
+    return isCalculationComplete.value ? withTiming(1) : 0;
+  });
+}
+
 export function interpolateNavigationViewOpacity(props) {
   return useDerivedValue(function () {
     'worklet';

src/legacy/status_im/chat/models/message.cljs

@@ -4,7 +4,6 @@
     [legacy.status-im.chat.models.loading :as chat.loading]
     [legacy.status-im.data-store.messages :as data-store.messages]
     [legacy.status-im.utils.deprecated-types :as types]
-    [re-frame.core :as re-frame]
     [react-native.platform :as platform]
     [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
     [status-im.contexts.chat.messenger.messages.list.events :as message-list]
@@ -135,9 +134,7 @@
                                     message-id (:messageId removed-message)]
                                 (data-store.messages/mark-messages-seen chat-id
                                                                         [message-id]
-                                                                        #(re-frame/dispatch
-                                                                          [:chat/decrease-unviewed-count
-                                                                           chat-id %3]))))
+                                                                        nil)))
                             removed-messages)
         remove-messages-fx (fn [{:keys [db]}]
                              {:dispatch [:activity-center.notifications/fetch-unread-count]})]

src/legacy/status_im/contact/block.cljs

@@ -58,7 +58,9 @@
 
 (rf/defn block-contact
   {:events [:contact.ui/block-contact-confirmed]}
-  [{:keys [db] :as cofx} public-key]
+  [{:keys [db] :as cofx} public-key
+   {:keys [handle-navigation?]
+    :or   {handle-navigation? true}}]
   (let [contact               (-> (contact.db/public-key->contact
                                    (:contacts/contacts db)
                                    public-key)
@@ -75,9 +77,10 @@
                  (re-frame/dispatch [:sanitize-messages-and-process-response block-contact])
                  (re-frame/dispatch [:hide-popover])))
               ;; reset navigation to avoid going back to non existing one to one chat
-              (if from-one-to-one-chat?
-                (navigation/pop-to-root :shell-stack)
-                (navigation/navigate-back)))))
+              (when handle-navigation?
+                (if from-one-to-one-chat?
+                  (navigation/pop-to-root :shell-stack)
+                  (navigation/navigate-back))))))
 
 (rf/defn contact-unblocked
   {:events [:contacts/unblocked]}

src/legacy/status_im/data_store/chats.cljs

@@ -1,6 +1,7 @@
 (ns legacy.status-im.data-store.chats
   (:require
     [clojure.set :as set]
+    [clojure.string :as string]
     [legacy.status-im.data-store.messages :as messages]
     [legacy.status-im.utils.deprecated-types :as types]
     [re-frame.core :as re-frame]
@@ -59,6 +60,10 @@
            :admins         #{}
            :members-joined #{})))
 
+(defn <-color
+  [value]
+  (if (string/starts-with? value "#") value (keyword value)))
+
 (defn <-rpc
   [chat]
   (-> chat
@@ -79,13 +84,14 @@
       rpc->type
       unmarshal-members
       (update :last-message #(when % (messages/<-rpc %)))
+      (update :color <-color)
       (dissoc :members)))
 
 (defn <-rpc-js
   [^js chat]
   (-> {:name                    (.-name chat)
        :description             (.-description chat)
-       :color                   (.-color chat)
+       :color                   (<-color (.-color chat))
        :emoji                   (.-emoji chat)
        :timestamp               (.-timestamp chat)
        :alias                   (.-alias chat)

src/legacy/status_im/data_store/chats_test.cljs

@@ -5,7 +5,7 @@
 
 (deftest normalize-chat-test
   (let [chat          {:id                     "chat-id"
-                       :color                  "color"
+                       :color                  "yellow"
                        :name                   "name"
                        :chatType               3
                        :members                [{:id     "a"
@@ -26,7 +26,7 @@
                        :timestamp              2}
         expected-chat {:public?                  false
                        :group-chat               true
-                       :color                    "color"
+                       :color                    :yellow
                        :chat-name                "name"
                        :contacts                 #{"a" "b" "c" "d"}
                        :chat-type                3

src/legacy/status_im/data_store/communities.cljs

@@ -28,8 +28,9 @@
                       (name k)
                       (-> v
                           (assoc :token-gated? (:tokenGated v)
-                                 :can-post?    (:canPost v))
-                          (dissoc :canPost :tokenGated)
+                                 :can-post?    (:canPost v)
+                                 :can-view?    (:canView v))
+                          (dissoc :canPost :tokenGated :canView)
                           (update :members walk/stringify-keys))))
              {}
              chats))

src/legacy/status_im/group_chats/core.cljs

@@ -64,16 +64,6 @@
                     :js-response true
                     :on-success  #(re-frame/dispatch [:chat-updated %])}]})
 
-(rf/defn create
-  {:events       [:group-chats.ui/create-pressed]
-   :interceptors [(re-frame/inject-cofx :random-guid-generator)]}
-  [{:keys [db] :as cofx} group-name]
-  (let [selected-contacts (:group/selected-contacts db)]
-    {:json-rpc/call [{:method      "wakuext_createGroupChatWithMembers"
-                      :params      [nil group-name (into [] selected-contacts)]
-                      :js-response true
-                      :on-success  #(re-frame/dispatch [:chat-updated %])}]}))
-
 (rf/defn create-from-link
   {:events [:group-chats/create-from-link]}
   [cofx {:keys [chat-id invitation-admin chat-name]}]

src/legacy/status_im/subs/root.cljs

@@ -22,7 +22,6 @@
 (reg-root-key-sub :peers-count :peers-count)
 (reg-root-key-sub :peers-summary :peers-summary)
 (reg-root-key-sub :web3-node-version :web3-node-version)
-(reg-root-key-sub :alert-banners :alert-banners)
 
 ;;keycard
 (reg-root-key-sub :keycard :keycard)

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

@@ -1,7 +1,7 @@
 (ns legacy.status-im.ui.components.react
   (:require
+    ["@react-native-clipboard/clipboard" :default Clipboard]
     ["@react-native-community/blur" :as blur]
-    ["@react-native-community/clipboard" :default Clipboard]
     ["@react-native-community/masked-view" :default MaskedView]
     ["react" :as reactjs]
     ["react-native" :as react-native :refer (Keyboard BackHandler)]

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

@@ -91,11 +91,6 @@
     :options   {:insets {:top? true}}
     :component stickers/pack}
 
-   {:name      :new-group
-    :options   {:insets {:top? true}}
-    ;;TODO custom subtitle
-    :component group-chat/new-group}
-
    {:name      :currency-settings
     :options   {:topBar (topbar-options :t/main-currency)
                 :insets {:top? true}}

src/mocks/js_dependencies.cljs

@@ -163,6 +163,11 @@
   #js
    {:MediaStates        {}
     :PlaybackCategories {}})
+
+(def react-native-clipboard
+  #js
+   {:getEnforcing {}})
+
 (def net-info #js {})
 (def react-native-biometrics #js {:default {}})
 (def react-native-image-viewing #js {:default {}})
@@ -415,6 +420,7 @@
     "react-native-draggable-flatlist"                  react-native-draggable-flatlist
     "react-native-webview"                             react-native-webview
     "@react-native-community/audio-toolkit"            react-native-audio-toolkit
+    "@react-native-clipboard/clipboard"                react-native-clipboard
     "react-native-image-viewing"                       react-native-image-viewing
     "react-native-share"                               react-native-share
     "@react-native-async-storage/async-storage"        async-storage

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

@@ -25,7 +25,7 @@
         :or   {size                :size-20
                customization-color :blue
                picture             nil
-               icon-name           :i/group}}]
+               icon-name           :i/members}}]
     (let [container-size (get-in sizes [size :container])
           icon-size      (get-in sizes [size :icon])]
       [rn/view

src/quo/components/colors/color_picker/view.cljs

@@ -3,7 +3,8 @@
     [quo.components.colors.color.constants :as constants]
     [quo.components.colors.color.view :as color]
     [quo.foundations.colors :as colors]
-    [react-native.core :as rn]))
+    [react-native.core :as rn]
+    [react-native.gesture :as gesture]))
 
 (defn get-item-layout
   [_ index]
@@ -52,7 +53,7 @@
                                         :index        index
                                         :viewPosition 0.5})))))
         50)))
-    [rn/flat-list
+    [gesture/flat-list
      {:ref                               on-ref
       ;; TODO: using :feng-shui? temporarily while b & w is being developed.
       ;; https://github.com/status-im/status-mobile/discussions/16676

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

@@ -58,14 +58,15 @@
      :on-press            on-press}
     [rn/view
      {:style (style/row-container sub-label)}
-     [rn/view
-      {:accessibility-label :left-icon-for-action
-       :accessible          true
-       :style               (style/left-icon sub-label)}
-      [icon/icon icon
-       {:color    (or icon-color (get-icon-color danger? theme))
-        :no-color no-icon-color?
-        :size     20}]]
+     (when icon
+       [rn/view
+        {:accessibility-label :left-icon-for-action
+         :accessible          true
+         :style               (style/left-icon sub-label)}
+        [icon/icon icon
+         {:color    (or icon-color (get-icon-color danger? theme))
+          :no-color no-icon-color?
+          :size     20}]])
      [rn/view
       {:style style/text-container}
       [text/text

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

@@ -59,4 +59,15 @@
               :button-one-label "Request to join"}])
     (h/is-truthy (h/get-by-text "Eligible to join as"))
     (h/is-truthy (h/get-by-text "Admin"))
+    (h/is-truthy (h/get-by-text "Request to join")))
+
+  (h/test "render with top description with custom text & 1 action"
+    (render [bottom-actions/view
+             {:description          :top
+              :role                 :admin
+              :actions              :one-action
+              :description-top-text "You'll be an"
+              :button-one-label     "Request to join"}])
+    (h/is-truthy (h/get-by-text "You'll be an"))
+    (h/is-truthy (h/get-by-text "Admin"))
     (h/is-truthy (h/get-by-text "Request to join"))))

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

@@ -19,6 +19,7 @@
       [:actions [:maybe [:enum :one-action :two-actions]]]
       [:description {:optional true} [:maybe [:enum :top :bottom :top-error]]]
       [:description-text {:optional true} [:maybe :string]]
+      [:description-top-text {:optional true} [:maybe :string]]
       [:error-message {:optional true} [:maybe :string]]
       [:role {:optional true} [:maybe [:enum :admin :member :token-master :owner]]]
       [:button-one-label {:optional true} [:maybe :string]]
@@ -38,8 +39,8 @@
    :owner        :i/crown})
 
 (defn- view-internal
-  [{:keys [actions description description-text error-message role button-one-label button-two-label
-           blur? button-one-props button-two-props theme scroll? container-style]}]
+  [{:keys [actions description description-text description-top-text error-message role button-one-label
+           button-two-label blur? button-one-props button-two-props theme scroll? container-style]}]
   [rn/view
    {:style (merge (style/container scroll? blur? theme) container-style)}
    (when (= description :top-error)
@@ -54,12 +55,11 @@
        error-message]])
 
    (when (and (= description :top) role)
-     [rn/view
-      {:style style/description-top}
+     [rn/view {:style style/description-top}
       [text/text
        {:size  :paragraph-2
         :style (style/description-top-text scroll? blur? theme)}
-       (i18n/label :t/eligible-to-join-as)]
+       (or description-top-text (i18n/label :t/eligible-to-join-as))]
       [context-tag/view
        {:type    :icon
         :size    24

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

@@ -7,7 +7,7 @@
    :flex-direction   :row
    :justify-content  :space-between
    :align-items      :center
-   :max-height       56
+   :height           56
    :padding          12
    :border-radius    12
    :opacity          (if (= state :disabled) 0.3 1)

src/quo/components/profile/collectible_list_item/view.cljs

@@ -4,7 +4,7 @@
     [quo.components.counter.collectible-counter.view :as collectible-counter]
     [quo.components.icon :as icon]
     [quo.components.list-items.preview-list.view :as preview-list]
-    [quo.components.markdown.text :as quo]
+    [quo.components.markdown.text :as text]
     [quo.components.profile.collectible-list-item.style :as style]
     [quo.foundations.colors :as colors]
     [quo.foundations.gradients :as gradients]
@@ -14,14 +14,13 @@
     [utils.i18n :as i18n]))
 
 (defn- fallback-view
-  [{:keys [label theme type]}]
+  [{:keys [label theme]}]
   [rn/view
-   {:style (style/fallback {:type  type
-                            :theme theme})}
+   {:style (style/fallback {:theme theme})}
    [rn/view
     [icon/icon :i/sad {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)}]]
    [rn/view {:style {:height 4}}]
-   [quo/text
+   [text/text
     {:size  :paragraph-2
      :style {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)}}
     label]])
@@ -46,7 +45,7 @@
   [rn/view {:style style/card-details-container}
 
    (cond (= :cant-fetch status)
-         [quo/text
+         [text/text
           {:size   :paragraph-1
            :weight :medium
            :style  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
@@ -64,7 +63,7 @@
             :size :size-20}
            [avatar-image-src]]
           [rn/view {:style {:width 8}}]
-          [quo/text
+          [text/text
            {:size   :paragraph-1
             :weight :semi-bold
             :style  style/card-detail-text}
@@ -76,7 +75,7 @@
            {:size  :size-20
             :image avatar-image-src}]
           [rn/view {:style {:width 8}}]
-          [quo/text
+          [text/text
            {:size            :paragraph-1
             :weight          :semi-bold
             :ellipsize-mode  :tail
@@ -86,7 +85,7 @@
 
 (defn- card-view
   [{:keys [avatar-image-src collectible-name community? counter
-           gradient-color-index image-src status type]}]
+           gradient-color-index image-src status]}]
   (let [theme (quo.theme/use-theme-value)]
     [rn/view {:style (style/card-view-container theme)}
      [rn/view {:style {:aspect-ratio 1}}
@@ -99,13 +98,11 @@
         (= status :unsupported)
         [fallback-view
          {:theme theme
-          :type  type
           :label (i18n/label :t/unsupported-file)}]
 
         (= status :cant-fetch)
         [fallback-view
          {:theme theme
-          :type  type
           :label (i18n/label :t/cant-fetch-info)}]
 
         :else
@@ -139,13 +136,11 @@
        (= status :unsupported)
        [fallback-view
         {:theme theme
-         :type  type
          :label (i18n/label :t/unsupported-file)}]
 
        (= status :cant-fetch)
        [fallback-view
         {:theme theme
-         :type  type
          :label (i18n/label :t/cant-fetch-info)}]
 
        :else [rn/view {:style {:aspect-ratio 1}}

src/quo/components/profile/expanded_collectible/component_spec.cljs

@@ -0,0 +1,40 @@
+(ns quo.components.profile.expanded-collectible.component-spec
+  (:require
+    [quo.components.profile.expanded-collectible.view :as expanded-collectible]
+    [test-helpers.component :as h]))
+
+(h/describe "Profile/ expanded collectible "
+  (h/test "renders with counter and has on-press event"
+    (let [on-press (h/mock-fn)]
+      (h/render-with-theme-provider
+       [expanded-collectible/view
+        {:image-src
+         "https://media.istockphoto.com/id/603164912/photo/suburb-asphalt-road-and-sun-flowers.jpg?s=612x612&w=0&k=20&c=qLoQ5QONJduHrQ0kJF3fvoofmGAFcrq6cL84HbzdLQM="
+         :counter "1200"
+         :on-press on-press}])
+      (h/fire-event :press (h/get-by-label-text :expanded-collectible))
+      (h/was-called on-press)
+      (h/is-truthy (h/get-by-text "1200"))))
+
+  (h/test "renders with status :cant-fetch and has on-press event"
+    (let [on-press (h/mock-fn)]
+      (h/render-with-theme-provider
+       [expanded-collectible/view
+        {:counter  "1200"
+         :status   :cant-fetch
+         :on-press on-press}])
+      (h/fire-event :press (h/get-by-label-text :expanded-collectible))
+      (h/was-called on-press)
+      (h/is-truthy (h/get-by-translation-text :t/cant-fetch-info))))
+
+
+  (h/test "renders with status :unsupported and has on-press event"
+    (let [on-press (h/mock-fn)]
+      (h/render-with-theme-provider
+       [expanded-collectible/view
+        {:counter  "1200"
+         :status   :unsupported
+         :on-press on-press}])
+      (h/fire-event :press (h/get-by-label-text :expanded-collectible))
+      (h/was-called on-press)
+      (h/is-truthy (h/get-by-translation-text :t/unsupported-file)))))

src/quo/components/profile/expanded_collectible/style.cljs

@@ -0,0 +1,33 @@
+(ns quo.components.profile.expanded-collectible.style
+  (:require [quo.foundations.colors :as colors]
+            [quo.foundations.shadows :as shadows]))
+
+(def container
+  (merge (shadows/get 2)
+         {:flex            1
+          :align-items     :center
+          :justify-content :center
+          :border-radius   16}))
+
+(defn image
+  [square? aspect-ratio]
+  {:width         "100%"
+   :aspect-ratio  (if square? 1 aspect-ratio)
+   :border-radius 16})
+
+(defn fallback
+  [{:keys [theme]}]
+  {:background-color (colors/theme-colors colors/neutral-2_5 colors/neutral-90 theme)
+   :border-style     :dashed
+   :border-color     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
+   :border-width     1
+   :border-radius    16
+   :width            "100%"
+   :aspect-ratio     1
+   :align-items      :center
+   :justify-content  :center})
+
+(def counter
+  {:position :absolute
+   :top      12
+   :right    12})

src/quo/components/profile/expanded_collectible/view.cljs

@@ -0,0 +1,77 @@
+(ns quo.components.profile.expanded-collectible.view
+  (:require
+    [promesa.core :as p]
+    [quo.components.counter.collectible-counter.view :as collectible-counter]
+    [quo.components.icon :as icon]
+    [quo.components.markdown.text :as text]
+    [quo.components.profile.expanded-collectible.style :as style]
+    [quo.foundations.colors :as colors]
+    [quo.theme]
+    [react-native.core :as rn]
+    [schema.core :as schema]
+    [utils.i18n :as i18n]))
+
+(defn- counter-view
+  [counter]
+  (when counter
+    [collectible-counter/view
+     {:container-style style/counter
+      :value           counter}]))
+
+(defn- fallback-view
+  [{:keys [label theme counter]}]
+  [rn/view
+   {:style (style/fallback {:theme theme})}
+   [counter-view counter]
+   [rn/view
+    [icon/icon :i/sad {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)}]]
+   [rn/view {:style {:height 4}}]
+   [text/text
+    {:size  :paragraph-2
+     :style {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)}}
+    label]])
+
+(defn view-internal
+  [{:keys [container-style square? status on-press counter image-src] :or {status :default}}]
+  (let [theme                       (quo.theme/use-theme-value)
+        [image-size set-image-size] (rn/use-state {})]
+    (rn/use-effect
+     (fn []
+       (p/let [[image-width image-height] (rn/image-get-size image-src)]
+         (set-image-size {:width        image-width
+                          :height       image-height
+                          :aspect-ratio (/ image-width image-height)})))
+     [image-src])
+    [rn/pressable
+     {:on-press            on-press
+      :accessibility-label :expanded-collectible
+      :style               (merge container-style style/container)}
+     (case status
+       :unsupported [fallback-view
+                     {:label   (i18n/label :t/unsupported-file)
+                      :counter counter
+                      :theme   theme}]
+       :cant-fetch  [fallback-view
+                     {:label   (i18n/label :t/cant-fetch-info)
+                      :counter counter
+                      :theme   theme}]
+       [rn/view {:style {:flex 1}}
+        [rn/image
+         {:style  (style/image square? (:aspect-ratio image-size))
+          :source image-src}]
+        [counter-view counter]])]))
+
+(def ?schema
+  [:=>
+   [:catn
+    [:props
+     [:map {:closed true}
+      [:image-src {:optional true} string?]
+      [:container-style {:optional true} [:maybe :map]]
+      [:square? {:optional true} [:maybe boolean?]]
+      [:counter {:optional true} [:maybe string?]]
+      [:status {:optional true} [:maybe [:enum :default :loading :cant-fetch :unsupported]]]
+      [:on-press {:optional true} [:maybe fn?]]]]]
+   :any])
+
+(def view (schema/instrument #'view-internal ?schema))

src/quo/components/profile/profile_card/view.cljs

@@ -33,7 +33,7 @@
                                show-emoji-hash? 12
                                :else            10)
         border-bottom-radius (if (or (not login-card?) last-item?) 16 0)]
-    [rn/touchable-without-feedback
+    [rn/pressable
      {:on-press            on-card-press
       :accessibility-label :profile-card}
      [hole-view/hole-view

src/quo/components/tabs/tabs/view.cljs

@@ -53,7 +53,7 @@
                            :max-fade-percentage fade-end-percentage})]
       ;; Avoid unnecessary re-rendering.
       (when (not= new-percentage (get fading :fade-end-percentage))
-        (set-fading (assoc fading :fade-end-percentage new-percentage)))))
+        (set-fading new-percentage))))
   (when on-scroll
     (on-scroll e)))
 
@@ -61,13 +61,10 @@
   [{:keys [id label notification-dot? accessibility-label]}
    index _
    {:keys [active-tab-id
-           set-active-tab-id
            blur?
            customization-color
-           flat-list-ref
            number-of-items
-           on-change
-           scroll-on-press?
+           on-press
            size
            style]}]
   [rn/view
@@ -84,16 +81,7 @@
      :size                size
      :blur?               blur?
      :active              (= id active-tab-id)
-     :on-press            (fn [id]
-                            (set-active-tab-id id)
-                            (when (and scroll-on-press? @flat-list-ref)
-                              (.scrollToIndex ^js @flat-list-ref
-                                              #js
-                                               {:animated     true
-                                                :index        index
-                                                :viewPosition 0.5}))
-                            (when on-change
-                              (on-change id)))}
+     :on-press            #(on-press % index)}
     label]])
 
 (defn view
@@ -125,42 +113,63 @@
            size                default-tab-size}
     :as   props}]
   (let [[active-tab-id
-         set-active-tab-id] (rn/use-state default-active)
-        [fading set-fading] (rn/use-state {:fade-end-percentage fade-end-percentage})
-        flat-list-ref       (rn/use-ref-atom nil)
-        clean-props         (dissoc props
-                             :default-active
-                             :fade-end-percentage
-                             :fade-end?
-                             :on-change
-                             :scroll-on-press?
-                             :size)
-        on-scroll           (rn/use-callback
-                             (partial on-scroll-handler
-                                      {:fade-end-percentage fade-end-percentage
-                                       :fade-end?           fade-end?
-                                       :fading              fading
-                                       :set-fading          set-fading
-                                       :on-scroll           on-scroll})
-                             [fade-end? fading])]
+         set-active-tab-id]          (rn/use-state default-active)
+        [fading set-fading]          (rn/use-state fade-end-percentage)
+        flat-list-ref                (rn/use-ref-atom nil)
+        clean-props                  (dissoc props
+                                      :default-active
+                                      :fade-end-percentage
+                                      :fade-end?
+                                      :on-change
+                                      :scroll-on-press?
+                                      :size)
+        on-scroll                    (rn/use-callback
+                                      (partial on-scroll-handler
+                                               {:fade-end-percentage fade-end-percentage
+                                                :fade-end?           fade-end?
+                                                :fading              fading
+                                                :set-fading          set-fading
+                                                :on-scroll           on-scroll})
+                                      [fade-end? fading])
+        set-initial-scroll-poisition (rn/use-callback
+                                      (fn []
+                                        (reagent/next-tick
+                                         (fn []
+                                           (.scrollToIndex
+                                            @flat-list-ref
+                                            #js
+                                             {:animated false
+                                              :index
+                                              (utils.collection/first-index
+                                               #(= active-tab-id (:id %))
+                                               data)}))))
+                                      [active-tab-id data])
+        on-tab-press                 (rn/use-callback (fn [id index]
+                                                        (set-active-tab-id id)
+                                                        (when (and scroll-on-press? @flat-list-ref)
+                                                          (.scrollToIndex ^js @flat-list-ref
+                                                                          #js
+                                                                           {:animated     true
+                                                                            :index        index
+                                                                            :viewPosition 0.5}))
+                                                        (when on-change
+                                                          (on-change id)))
+                                                      [set-active-tab-id scroll-on-press? on-change])]
     (if scrollable?
       [rn/view {:style {:margin-top (- (dec unread-count-offset))}}
        [masked-view-wrapper
-        {:fade-end-percentage (get fading :fade-end-percentage) :fade-end? fade-end?}
+        {:fade-end-percentage fading :fade-end? fade-end?}
         [(if in-scroll-view?
            gesture/flat-list
            rn/flat-list)
          (merge
           clean-props
-          (when scroll-on-press?
-            {:initial-scroll-index (utils.collection/first-index #(= active-tab-id (:id %)) data)})
           {:ref #(reset! flat-list-ref %)
            :style style
            ;; The padding-top workaround is needed because on Android
            ;; {:overflow :visible} doesn't work on components inheriting
-           ;; from ScrollView (e.g. FlatList). There are open issues, here's
-           ;; just one about this topic:
-           ;; https://github.com/facebook/react-native/issues/31218
+           ;; from ScrollView (e.g. FlatList). There are open issues, here's just one about this
+           ;; topic: Https://github.com/facebook/react-native/issues/31218
            :content-container-style
            (assoc container-style :padding-top (dec unread-count-offset))
            :horizontal true
@@ -170,27 +179,24 @@
            :key-fn (comp str :id)
            :on-scroll-to-index-failed identity
            :on-scroll on-scroll
+           :on-layout set-initial-scroll-poisition
            :render-fn tab-view
            :render-data {:active-tab-id       active-tab-id
-                         :set-active-tab-id   set-active-tab-id
                          :blur?               blur?
                          :customization-color customization-color
-                         :flat-list-ref       flat-list-ref
                          :number-of-items     (count data)
-                         :on-change           on-change
-                         :scroll-on-press?    scroll-on-press?
                          :size                size
+                         :on-press            on-tab-press
                          :style               style}})]]]
       [rn/view (merge style {:flex-direction :row})
        (map-indexed (fn [index item]
                       ^{:key (:id item)}
                       [tab-view item index nil
                        {:active-tab-id       active-tab-id
-                        :set-active-tab-id   set-active-tab-id
                         :blur?               blur?
                         :customization-color customization-color
                         :number-of-items     (count data)
-                        :on-change           on-change
                         :size                size
+                        :on-press            on-tab-press
                         :style               style}])
                     data)])))

src/quo/components/tags/context_tag/schema.cljs

@@ -8,6 +8,7 @@
      [:enum :default :multiuser :group :channel :community :token :network :multinetwork :account
       :collectible :address :icon :audio]]]
    [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
+   [:container-style {:optional true} [:maybe :map]]
    [:theme :schema.common/theme]
    [:blur? {:optional true} [:maybe :boolean]]
    [:state {:optional true} [:maybe [:enum :selected :default]]]])
@@ -38,6 +39,7 @@
 (def ^:private ?channel
   [:map
    [:community-name {:optional true} [:maybe :string]]
+   [:community-logo {:optional true} [:maybe :schema.common/image-source]]
    [:channel-name {:optional true} [:maybe :string]]])
 
 (def ^:private ?community

src/quo/components/tags/context_tag/style.cljs

@@ -36,6 +36,7 @@
                           (colors/custom-color customization-color 60)
                           theme)]
     (cond-> {:padding          2
+             :padding-right    8
              :flex-direction   :row
              :align-items      :center
              :height           size

src/quo/components/tags/context_tag/view.cljs

@@ -12,6 +12,7 @@
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
+    [react-native.fast-image :as fast-image]
     [schema.core :as schema]))
 
 (defn- tag-skeleton
@@ -30,7 +31,7 @@
   (let [text-size (if (= size 24) :paragraph-2 :paragraph-1)
         icon-size (if (= size 24) 16 20)]
     [rn/view {:style (style/tag-container size)}
-     [rn/image {:style (style/circle-logo size) :source community-logo}]
+     [fast-image/fast-image {:style (style/circle-logo size) :source community-logo}]
      [rn/view {:style (style/tag-spacing size)}
       [text/text
        {:style  (style/text theme)
@@ -82,81 +83,81 @@
            type                :default
            state               :default}
     :as   props}]
-  [rn/view
-   {:style               (merge (style/container {:theme               theme
-                                                  :type                type
-                                                  :size                size
-                                                  :state               state
-                                                  :blur?               blur?
-                                                  :customization-color customization-color})
-                                container-style)
-    :accessibility-label :context-tag}
-   (case type
-     :default
-     [tag-skeleton {:theme theme :size size :text full-name}
-      [user-avatar/user-avatar
-       {:full-name           full-name
-        :profile-picture     profile-picture
-        :size                (if (= size 24) :xxs 28)
-        :status-indicator?   false
-        :ring?               false
-        :customization-color customization-color}]]
+  [rn/view {:style (merge {:align-items :flex-start} container-style)}
+   [rn/view
+    {:style               (style/container {:theme               theme
+                                            :type                type
+                                            :size                size
+                                            :state               state
+                                            :blur?               blur?
+                                            :customization-color customization-color})
+     :accessibility-label :context-tag}
+    (case type
+      :default
+      [tag-skeleton {:theme theme :size size :text full-name}
+       [user-avatar/user-avatar
+        {:full-name           full-name
+         :profile-picture     profile-picture
+         :size                (if (= size 24) :xxs 28)
+         :status-indicator?   false
+         :ring?               false
+         :customization-color customization-color}]]
 
-     :multiuser
-     [preview-list/view {:type :user :size :size-20}
-      users]
+      :multiuser
+      [preview-list/view {:type :user :size :size-20}
+       users]
 
-     :multinetwork
-     [preview-list/view {:type :network :size :size-20}
-      networks]
+      :multinetwork
+      [preview-list/view {:type :network :size :size-20}
+       networks]
 
-     :audio
-     [tag-skeleton {:theme theme :text (str duration)}
-      [rn/view {:style (style/audio-tag-icon-container customization-color theme)}
-       [icons/icon :i/play {:color style/audio-tag-icon-color :size 12}]]]
+      :audio
+      [tag-skeleton {:theme theme :text (str duration)}
+       [rn/view {:style (style/audio-tag-icon-container customization-color theme)}
+        [icons/icon :i/play {:color style/audio-tag-icon-color :size 12}]]]
 
-     :group
-     [tag-skeleton {:theme theme :size size :text group-name}
-      [group-avatar/view
-       {:icon-name           :i/members
-        :size                (if (= size 24) :size-20 :size-28)
-        :customization-color (colors/custom-color customization-color 50)}]]
+      :group
+      [tag-skeleton {:theme theme :size size :text group-name}
+       [group-avatar/view
+        {:icon-name           :i/members
+         :size                (if (= size 24) :size-20 :size-28)
+         :customization-color (colors/custom-color customization-color 50)}]]
 
-     (:channel :community)
-     [communities-tag (assoc props :channel? (= type :channel))]
+      (:channel :community)
+      [communities-tag (assoc props :channel? (= type :channel))]
 
-     :token
-     [tag-skeleton {:theme theme :size size :text (str amount " " token)}
-      [token/view
-       {:style (style/token-logo size)
-        :token token
-        :size  (if (= size 24) :size-20 :size-28)}]]
+      :token
+      [tag-skeleton {:theme theme :size size :text (str amount " " token)}
+       [token/view
+        {:style (style/token-logo size)
+         :token token
+         :size  (if (= size 24) :size-20 :size-28)}]]
 
-     :network
-     [tag-skeleton {:theme theme :size size :text network-name}
-      [rn/image {:style (style/circle-logo size) :source network-logo}]]
+      :network
+      [tag-skeleton {:theme theme :size size :text network-name}
+       [rn/image {:style (style/circle-logo size) :source network-logo}]]
 
-     :collectible
-     [tag-skeleton
-      {:theme theme
-       :size  size
-       :text  (str collectible-name " #" collectible-number)}
-      [rn/image {:style (style/rounded-logo size) :source collectible}]]
+      :collectible
+      [tag-skeleton
+       {:theme theme
+        :size  size
+        :text  (str collectible-name " #" collectible-number)}
+       [rn/image {:style (style/rounded-logo size) :source collectible}]]
 
-     :account
-     [tag-skeleton {:theme theme :size size :text account-name}
-      [account-avatar/view
-       {:customization-color customization-color
-        :emoji               emoji
-        :size                (if (= size 24) 20 28)}]]
+      :account
+      [tag-skeleton {:theme theme :size size :text account-name}
+       [account-avatar/view
+        {:customization-color customization-color
+         :emoji               emoji
+         :size                (if (= size 24) 20 28)}]]
 
-     :address
-     [address-tag props]
+      :address
+      [address-tag props]
 
-     :icon
-     [icon-tag props]
+      :icon
+      [icon-tag props]
 
-     nil)])
+      nil)]])
 
 (def view
   (quo.theme/with-theme

src/quo/components/text_combinations/page_top/view.cljs

@@ -115,12 +115,13 @@
         emojis))
 
 (defn- view-internal
-  [{:keys  [theme description input blur? input-props container-style]
+  [{:keys  [theme description title input blur? input-props container-style]
     emojis :emoji-dash
     :as    props}]
   [rn/view {:style container-style}
    [rn/view {:style style/top-container}
-    [header props]
+    (when (or title input)
+      [header props])
     (when description
       [description-container props])
     (when emojis

src/quo/components/text_combinations/style.cljs

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

src/quo/components/text_combinations/username/view.cljs

@@ -7,12 +7,13 @@
             [react-native.core :as rn]))
 
 (defn- username-text
-  [{:keys     [theme name-type username blur?]
+  [{:keys     [theme name-type username accessibility-label blur?]
     real-name :name}]
   [rn/view {:style style/username-text-container}
    [text/text
-    {:size   :heading-1
-     :weight :semi-bold}
+    {:size                :heading-1
+     :accessibility-label accessibility-label
+     :weight              :semi-bold}
     username]
    (when (= name-type :nickname)
      [:<>
@@ -22,9 +23,10 @@
         :weight :medium}
        "∙"]
       [text/text
-       {:style  (style/real-name-text theme blur?)
-        :size   :paragraph-1
-        :weight :medium}
+       {:style               (style/real-name-text theme blur?)
+        :size                :paragraph-1
+        :accessibility-label :real-name
+        :weight              :medium}
        real-name]])])
 
 (defn- icon-20

src/quo/components/text_combinations/view.cljs

@@ -43,6 +43,7 @@
       {:accessibility-label title-accessibility-label
        :weight              :semi-bold
        :ellipsize-mode      :tail
+       :style               {:flex 1}
        :number-of-lines     title-number-of-lines
        :size                :heading-1}
       title]]

src/quo/components/wallet/keypair/style.cljs

@@ -4,19 +4,18 @@
     [react-native.platform :as platform]))
 
 (defn container
-  [{:keys [blur? customization-color theme selected?]}]
-  {:border-radius  16
-   :border-width   1
-   :border-color   (if selected?
-                     (if blur?
-                       colors/white
-                       (colors/theme-colors (colors/custom-color customization-color 50)
-                                            (colors/custom-color customization-color 60)
-                                            theme))
-                     (if blur?
-                       colors/white-opa-5
-                       (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)))
-   :padding-bottom 8})
+  [{:keys [blur? customization-color theme selected? container-style]}]
+  (merge {:border-radius  16
+          :border-width   1
+          :border-color   (if selected?
+                            (if blur?
+                              colors/white
+                              (colors/resolve-color customization-color theme))
+                            (if blur?
+                              colors/white-opa-5
+                              (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)))
+          :padding-bottom 8}
+         container-style))
 
 (def header-container
   {:padding-horizontal 12

src/quo/components/wallet/keypair/view.cljs

@@ -11,7 +11,6 @@
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [reagent.core :as reagent]
     [utils.i18n :as i18n]))
 
 (defn keypair-string
@@ -34,7 +33,7 @@
       :profile-picture     profile-picture}]
     [icon-avatar/icon-avatar
      {:size    :size-32
-      :icon    :i/placeholder
+      :icon    :i/seed
       :border? true}]))
 
 (defn title-view
@@ -91,23 +90,23 @@
   [account-list-card/view item])
 
 (defn- view-internal
-  [{:keys [default-selected?]}]
-  (let [selected? (reagent/atom default-selected?)]
-    (fn [{:keys [accounts action container-style] :as props}]
-      [rn/pressable
-       {:style    (merge (style/container (merge props {:selected? @selected?})) container-style)
-        :on-press #(when (= action :selector) (reset! selected? (not @selected?)))}
-       [rn/view {:style style/header-container}
-        [avatar props]
-        [rn/view
-         {:style {:margin-left 8
-                  :flex        1}}
-         [title-view (assoc props :selected? @selected?)]
-         [details-view props]]]
-       [rn/flat-list
-        {:data      accounts
-         :render-fn acc-list-card
-         :separator [rn/view {:style {:height 8}}]
-         :style     {:padding-horizontal 8}}]])))
+  [{:keys [accounts action container-style selected? on-press] :as props}]
+  [rn/pressable
+   {:style    (style/container (merge props
+                                      {:selected?       selected?
+                                       :container-style container-style}))
+    :on-press #(when (= action :selector) (on-press))}
+   [rn/view {:style style/header-container}
+    [avatar props]
+    [rn/view
+     {:style {:margin-left 8
+              :flex        1}}
+     [title-view (assoc props :selected? selected?)]
+     [details-view props]]]
+   [rn/flat-list
+    {:data      accounts
+     :render-fn acc-list-card
+     :separator [rn/view {:style {:height 8}}]
+     :style     {:padding-horizontal 8}}]])
 
 (def view (quo.theme/with-theme view-internal))

src/quo/components/wallet/summary_info/view.cljs

@@ -30,8 +30,12 @@
 (defn networks
   [values theme]
   (let [{:keys [ethereum optimism arbitrum]} values
-        show-optimism?                       (and optimism (pos? (:amount optimism)))
-        show-arbitrum?                       (and arbitrum (pos? (:amount arbitrum)))]
+        show-optimism?                       (and optimism
+                                                  (or (pos? (:amount optimism))
+                                                      (= (:amount optimism) "<0.01")))
+        show-arbitrum?                       (and arbitrum
+                                                  (or (pos? (:amount arbitrum))
+                                                      (= (:amount arbitrum) "<0.01")))]
     [rn/view
      {:style               style/networks-container
       :accessibility-label :networks}

src/quo/core.cljs

@@ -112,6 +112,7 @@
     quo.components.password.tips.view
     quo.components.profile.collectible-list-item.view
     quo.components.profile.collectible.view
+    quo.components.profile.expanded-collectible.view
     quo.components.profile.link-card.view
     quo.components.profile.profile-card.view
     quo.components.profile.select-profile.view
@@ -354,6 +355,7 @@
 ;;;; Profile
 (def collectible quo.components.profile.collectible.view/collectible)
 (def collectible-list-item quo.components.profile.collectible-list-item.view/view)
+(def expanded-collectible quo.components.profile.expanded-collectible.view/view)
 (def link-card quo.components.profile.link-card.view/view)
 (def profile-card quo.components.profile.profile-card.view/profile-card)
 (def select-profile quo.components.profile.select-profile.view/view)

src/quo/core_spec.cljs

@@ -64,6 +64,7 @@
     quo.components.onboarding.small-option-card.component-spec
     quo.components.password.tips.component-spec
     quo.components.profile.collectible-list-item.component-spec
+    quo.components.profile.expanded-collectible.component-spec
     quo.components.profile.link-card.component-spec
     quo.components.profile.select-profile.component-spec
     quo.components.profile.showcase-nav.component-spec

src/react_native/clipboard.cljs

@@ -1,6 +1,6 @@
 (ns react-native.clipboard
   (:require
-    ["@react-native-community/clipboard" :default Clipboard]))
+    ["@react-native-clipboard/clipboard" :default Clipboard]))
 
 (defn set-string
   [text]

src/react_native/core.cljs

@@ -156,17 +156,19 @@
 (defn get-js-deps
   [deps]
   (if deps
-    (let [prev-state (use-ref-atom {:value false :deps nil})
-          prev-deps  (:deps @prev-state)
-          prev-value (:value @prev-state)]
-      (if (and (not (nil? prev-deps)) (not= (count deps) (count prev-deps)))
-        (throw (js/Error. "Hooks can't have a different number of dependencies across re-renders"))
-        (if (not= deps prev-deps)
-          (let [new-value (not prev-value)]
-            (reset! prev-state {:value new-value
-                                :deps  deps})
-            #js [new-value])
-          #js [prev-value])))
+    (if (empty? deps)
+      #js [true]
+      (let [prev-state (use-ref-atom {:value false :deps nil})
+            prev-deps  (:deps @prev-state)
+            prev-value (:value @prev-state)]
+        (if (and (not (nil? prev-deps)) (not= (count deps) (count prev-deps)))
+          (throw (js/Error. "Hooks can't have a different number of dependencies across re-renders"))
+          (if (not= deps prev-deps)
+            (let [new-value (not prev-value)]
+              (reset! prev-state {:value new-value
+                                  :deps  deps})
+              #js [new-value])
+            #js [prev-value]))))
     js/undefined))
 
 (defn use-effect

src/schema/re_frame.cljs

@@ -5,6 +5,14 @@
 (def ^:private ?cofx
   [:map])
 
+(def ^:private ?event
+  [:and
+   [:vector {:min 1} :any]
+   [:catn
+    [:event-id keyword?]
+    [:event-args [:* :any]]]])
+
 (defn register-schemas
   []
-  (registry/register ::cofx ?cofx))
+  (registry/register ::cofx ?cofx)
+  (registry/register ::event ?event))

src/status_im/common/bottom_sheet/view.cljs

@@ -66,26 +66,35 @@
            gradient-cover? customization-color hide-handle? blur-radius]
     :or   {border-radius 12}}]
   (let [theme                             (quo.theme/use-theme-value)
-        sheet-height                      (rn/use-ref-atom 0)
-        item-height                       (rn/use-ref-atom 0)
-        set-sheet-height                  (rn/use-callback #(reset! sheet-height (get-layout-height %)))
-        set-item-height                   (rn/use-callback #(reset! item-height (get-layout-height %)))
+        [sheet-height set-sheet-height]   (rn/use-state 0)
+        handle-sheet-height               (rn/use-callback (fn [e]
+                                                             (when (= sheet-height 0)
+                                                               (set-sheet-height
+                                                                (get-layout-height e))))
+                                                           [sheet-height])
+        [item-height set-item-height]     (rn/use-state 0)
+        handle-item-height                (rn/use-callback (fn [e]
+                                                             (when (= item-height 0)
+                                                               (set-item-height
+                                                                (get-layout-height e))))
+                                                           [item-height])
         {window-height :height}           (rn/get-window)
         bg-opacity                        (reanimated/use-shared-value 0)
         translate-y                       (reanimated/use-shared-value window-height)
-        sheet-gesture                     (get-sheet-gesture translate-y
-                                                             bg-opacity
-                                                             window-height
-                                                             on-close)
-        selected-item-smaller-than-sheet? (< @item-height
+        sheet-gesture                     (rn/use-memo #(get-sheet-gesture translate-y
+                                                                           bg-opacity
+                                                                           window-height
+                                                                           on-close)
+                                                       [window-height on-close])
+        selected-item-smaller-than-sheet? (< item-height
                                              (- window-height
-                                                @sheet-height
+                                                sheet-height
                                                 (:top insets)
                                                 (:bottom insets)
                                                 bottom-margin))
-        top                               (- window-height (:top insets) @sheet-height)
+        top                               (- window-height (:top insets) sheet-height)
         bottom                            (if selected-item-smaller-than-sheet?
-                                            (+ @sheet-height bottom-margin)
+                                            (+ sheet-height bottom-margin)
                                             (:bottom insets))
         sheet-max-height                  (- window-height (:top insets))
         content-padding-bottom            (or padding-bottom-override
@@ -123,11 +132,12 @@
            :overlay-color :transparent}])
        (when selected-item
          [rn/view
-          {:on-layout set-item-height
-           :style (style/selected-item theme top bottom selected-item-smaller-than-sheet? border-radius)}
+          {:on-layout handle-item-height
+           :style
+           (style/selected-item theme top bottom selected-item-smaller-than-sheet? border-radius)}
           [selected-item]])
        [rn/view
-        {:on-layout set-sheet-height
+        {:on-layout handle-sheet-height
          :style     (style/sheet-content {:theme          theme
                                           :shell?         shell?
                                           :padding-bottom content-padding-bottom})}

src/status_im/common/floating_button_page/view.cljs

@@ -3,6 +3,7 @@
     [oops.core :as oops]
     [quo.core :as quo]
     [react-native.core :as rn]
+    [react-native.gesture :as gesture]
     [react-native.platform :as platform]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
@@ -90,7 +91,7 @@
          {:on-layout set-header-height
           :style     header-container-style}
          header]
-        [rn/scroll-view
+        [gesture/scroll-view
          {:on-scroll               set-content-y-scroll
           :scroll-event-throttle   64
           :content-container-style {:flex-grow 1}}

src/status_im/common/scroll_page/view.cljs

@@ -68,8 +68,9 @@
                   :right-side     page-nav-right-section-buttons
                   :center-opacity (reanimated/get-shared-value opacity-animation)
                   :overlay-shown? overlay-shown?}
-           navigate-back? (assoc :icon-name :i/close
-                                 :on-press  #(rf/dispatch [:navigate-back]))
+           navigate-back? (assoc :icon-name           :i/close
+                                 :accessibility-label :back-button
+                                 :on-press            #(rf/dispatch [:navigate-back]))
            page-nav-props (merge page-nav-props))])
       (when title-colum
         title-colum)

src/status_im/common/standard_authentication/password_input/view.cljs

@@ -89,4 +89,3 @@
          :i/face-id])]
      (when error?
        [error-info error-message processing shell?])]))
-

src/status_im/common/standard_authentication/standard_auth/slide_button/view.cljs

@@ -8,7 +8,7 @@
 
 (defn view
   [{:keys [track-text customization-color auth-button-label on-auth-success on-auth-fail
-           auth-button-icon-left size blur? container-style disabled?]
+           auth-button-icon-left size blur? container-style disabled? dependencies]
     :or   {container-style {:flex 1}}}]
   (let [theme           (quo.theme/use-theme-value)
         auth-method     (rf/sub [:auth-method])
@@ -24,7 +24,7 @@
                                           :on-auth-success       on-auth-success
                                           :on-auth-fail          on-auth-fail
                                           :auth-button-label     auth-button-label}]))
-                         [theme])]
+                         (into [] (concat [theme] dependencies)))]
     [quo/slide-button
      {:container-style     container-style
       :size                size

src/status_im/common/validation/profile.cljs

@@ -1,20 +1,18 @@
 (ns status-im.common.validation.profile
   (:require [clojure.string :as string]
             [status-im.constants :as constants]
+            utils.emojilib
             [utils.i18n :as i18n]))
 
 ;; NOTE - validation should match with Desktop
 ;; https://github.com/status-im/status-desktop/blob/2ba96803168461088346bf5030df750cb226df4c/ui/imports/utils/Constants.qml#L468
 (def min-length 5)
 
-(def emoji-regex
-  #"(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])")
-
 (def status-regex #"^[a-zA-Z0-9\-_ ]+$")
 
 (def common-names ["Ethereum" "Bitcoin"])
 
-(defn has-emojis? [s] (boolean (re-find emoji-regex s)))
+(defn has-emojis? [s] (boolean (re-find utils.emojilib/emoji-regex s)))
 
 (defn has-common-names? [s] (pos? (count (filter #(string/includes? s %) common-names))))
 

src/status_im/constants.cljs

@@ -73,6 +73,7 @@
 (def ^:const contact-request-message-state-pending 1)
 (def ^:const contact-request-message-state-accepted 2)
 (def ^:const contact-request-message-state-declined 3)
+(def ^:const contact-request-message-max-length 280)
 
 (def request-to-join-pending-state 1)
 
@@ -121,6 +122,7 @@
 
 (def ^:const min-password-length 6)
 (def ^:const max-group-chat-participants 20)
+(def ^:const max-group-chat-name-length 24)
 (def ^:const default-number-of-messages 20)
 (def ^:const default-number-of-pin-messages 3)
 
@@ -187,6 +189,11 @@
 ; EIP1581 Chat Key 0, the default whisper key
 (def ^:const path-whisper (str path-eip1581 "/0'/0"))
 
+(def ^:const path-ropsten-testnet "m/44'/1'/0")
+(def ^:const path-ledger "m/44'/60'/0'")
+(def ^:const path-ledger-live "m/44'/60'")
+(def ^:const path-keepkey "m/44'/60'")
+
 (def ^:const path-default-wallet-keyword (keyword path-default-wallet))
 (def ^:const path-whisper-keyword (keyword path-whisper))
 (def ^:const path-wallet-root-keyword (keyword path-wallet-root))
@@ -472,6 +479,7 @@
 
 (def ^:const bridge-name-transfer "Transfer")
 (def ^:const bridge-name-erc-721-transfer "ERC721Transfer")
+(def ^:const bridge-name-hop "Hop")
 
 (def ^:const alert-banner-height 40)
 

src/status_im/contexts/chat/events.cljs

@@ -9,12 +9,12 @@
     [status-im.constants :as constants]
     [status-im.contexts.chat.contacts.events :as contacts-store]
     status-im.contexts.chat.effects
+    status-im.contexts.chat.group-create.events
     [status-im.contexts.chat.messenger.composer.link-preview.events :as link-preview]
     status-im.contexts.chat.messenger.messages.content.reactions.events
     [status-im.contexts.chat.messenger.messages.delete-message-for-me.events :as delete-for-me]
     [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
     [status-im.contexts.chat.messenger.messages.list.state :as chat.state]
-    [status-im.feature-flags :as ff]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.datetime :as datetime]
@@ -79,17 +79,10 @@
              :invitation-admin
              (:invitation-admin chat)))))
 
-(rf/defn leave-removed-chat
-  {:events [:chat/leave-removed-chat]}
-  [{{:keys [view-id current-chat-id chats]} :db
-    :as                                     cofx}]
-  (when (and (= view-id :chat)
-             (not (contains? chats current-chat-id)))
-    (navigation/navigate-back cofx)))
-
 (defn ensure-chats
   [{:keys [db] :as cofx} [chats]]
-  (let [{:keys [all-chats chats-home-list removed-chats]}
+  (let [{:keys [view-id current-chat-id]} db
+        {:keys [all-chats chats-home-list removed-chats]}
         (reduce
          (fn [acc {:keys [chat-id profile-public-key timeline? community-id active muted] :as chat}]
            (if (not (or active muted))
@@ -110,7 +103,8 @@
              (update :chats-home-list set/difference removed-chats))
      :fx [(when (not-empty removed-chats)
             [:effects/push-notifications-clear-message-notifications removed-chats])
-          [:dispatch [:chat/leave-removed-chat]]]}))
+          (when (and (= view-id :chat) (removed-chats current-chat-id))
+            [:dispatch [:navigate-back]])]}))
 
 (re-frame/reg-event-fx :chat/ensure-chats ensure-chats)
 
@@ -244,18 +238,6 @@
                  (update :chats-home-list conj chat-id))
      :dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]}))
 
-(rf/defn decrease-unviewed-count
-  {:events [:chat/decrease-unviewed-count]}
-  [{:keys [db]} chat-id {:keys [count countWithMentions]}]
-  {:db (-> db
-           ;; There might be some other requests being fired, so we need to make sure the count has
-           ;; not been set to
-           ;; 0 in the meantime
-           (update-in [:chats chat-id :unviewed-messages-count]
-                      #(max (- % count) 0))
-           (update-in [:chats chat-id :unviewed-mentions-count]
-                      #(max (- % countWithMentions) 0)))})
-
 (rf/defn start-chat
   "Start a chat, making sure it exists"
   {:events [:chat.ui/start-chat]}
@@ -444,8 +426,5 @@
                    {:pubkey     public-key
                     :ens        ens-name
                     :success-fn (fn [_]
-                                  {:dispatch [:open-modal
-                                              (if (ff/enabled? ::ff/profile.new-contact-ui)
-                                                :contact-profile
-                                                :profile)]})}]}
-       {:dispatch [:navigate-to :my-profile]}))))
+                                  {:dispatch [:open-modal :contact-profile]})}]}
+       {:dispatch [:open-modal :settings]}))))

src/status_im/contexts/chat/group_create/events.cljs

@@ -0,0 +1,34 @@
+(ns status-im.contexts.chat.group-create.events
+  (:require [legacy.status-im.data-store.chats :as data-store.chats]
+            [oops.core :as oops]
+            [re-frame.core :as rf]))
+
+(rf/reg-event-fx :group-chat/create
+ (fn [{:keys [db]} [group-name color image]]
+   (let [selected-contacts (:group/selected-contacts db)]
+     {:json-rpc/call [{:method      "wakuext_createGroupChatWithMembers"
+                       :params      [nil group-name (into [] selected-contacts)]
+                       :js-response true
+                       :on-success  (fn [response]
+                                      (let [chat-id (-> (oops/oget response :chats)
+                                                        first
+                                                        (oops/oget :id))]
+                                        (rf/dispatch [:chat-updated response])
+                                        (rf/dispatch [:group-chat/edit
+                                                      {:chat-id    chat-id
+                                                       :group-name group-name
+                                                       :color      color
+                                                       :image      image}])))}]})))
+
+(rf/reg-event-fx :group-chat/edit-success
+ (fn [{:keys [db]} [{:keys [chat-id name color image]}]]
+   (let [new-chat {:name name :color color :image image}]
+     {:db (update-in db [:chats chat-id] #(merge % new-chat))})))
+
+(rf/reg-event-fx :group-chat/edit
+ (fn [_ [{:keys [chat-id group-name color image]}]]
+   {:json-rpc/call [{:method      "chat_editChat"
+                     :params      ["" chat-id group-name (name color) image]
+                     :js-response true
+                     :on-success  #(rf/dispatch [:group-chat/edit-success
+                                                 (data-store.chats/<-rpc-js %)])}]}))

src/status_im/contexts/chat/group_create/style.cljs

@@ -0,0 +1,22 @@
+(ns status-im.contexts.chat.group-create.style
+  (:require [quo.foundations.colors :as colors]))
+
+(def avatar {:width 88 :margin-top 12 :margin-left 20})
+
+(def hole
+  {:y            (- 80 32)
+   :x            (+ (- 80 32) 8)
+   :width        32
+   :height       32
+   :borderRadius 10})
+
+(def camera {:position :absolute :right 0 :bottom 0})
+
+(defn color-label
+  [theme]
+  {:color              (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
+   :padding-horizontal 20})
+
+(def tags {:flex-direction :row :flex-wrap :wrap :padding-horizontal 20 :padding-top 12})
+
+(def tag {:margin-right 8 :margin-bottom 8})

src/status_im/contexts/chat/group_create/view.cljs

@@ -0,0 +1,132 @@
+(ns status-im.contexts.chat.group-create.view
+  (:require [clojure.string :as string]
+            [quo.core :as quo]
+            [quo.foundations.colors :as colors]
+            [quo.theme]
+            [react-native.core :as rn]
+            [status-im.common.floating-button-page.view :as floating-button-page]
+            [status-im.constants :as constants]
+            [status-im.contexts.chat.group-create.style :as style]
+            [status-im.contexts.profile.utils :as profile.utils]
+            [utils.debounce :as debounce]
+            utils.emojilib
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]
+            [utils.responsiveness :as responsiveness]))
+
+(defn avatar
+  [{:keys [customization-color]}]
+  [rn/pressable {:style style/avatar}
+   ;;NOTE with hole-view group-avatar doesn't change it's background color
+   #_[hole-view/hole-view
+      {:holes [style/hole]}]
+   [quo/group-avatar
+    {:customization-color customization-color
+     :size                :size-80}]
+   [quo/button
+    {:on-press        (fn []
+                        #_(rf/dispatch
+                           [:show-bottom-sheet
+                            {:content (fn []
+                                        [profile-picture-picker/view
+                                         {:update-profile-pic-callback on-change-profile-pic
+                                          :has-picture?                has-picture?}])
+                             :theme   :dark
+                             :shell?  true}]))
+     :container-style style/camera
+     :icon-only?      true
+     :type            :grey
+     :background      :photo
+     :size            32}
+    :i/camera]])
+
+(defn view
+  []
+  (let [theme                         (quo.theme/use-theme-value)
+        {window-width :width}         (rn/get-window)
+        profile                       (rf/sub [:profile/profile-with-image])
+        contacts                      (rf/sub [:selected-group-contacts])
+        contacts-count                (count contacts)
+        default-value                 (rn/use-memo
+                                       (fn []
+                                         (let [contact-string (string/join ", "
+                                                                           (map
+                                                                            profile.utils/displayed-name
+                                                                            contacts))]
+                                           (subs contact-string
+                                                 0
+                                                 (min (count contact-string)
+                                                      constants/max-group-chat-name-length))))
+                                       [])
+        [group-name set-group-name]   (rn/use-state default-value)
+        [error-message
+         set-error-message]           (rn/use-state nil)
+        group-name-empty?             (not (and (string? group-name) (not-empty group-name)))
+        [group-color set-group-color] (rn/use-state (rand-nth colors/account-colors))
+        create-group-on-press         (rn/use-callback #(debounce/throttle-and-dispatch
+                                                         [:group-chat/create group-name group-color]
+                                                         300)
+                                                       [group-name group-color])
+        back-on-press                 (rn/use-callback #(rf/dispatch [:navigate-back]))
+        on-change-text                (rn/use-callback
+                                       (fn [text]
+                                         (if (boolean (re-find utils.emojilib/emoji-regex text))
+                                           (set-error-message (i18n/label :t/are-not-allowed
+                                                                          {:check (i18n/label
+                                                                                   :t/emojis)}))
+                                           (set-error-message nil))
+                                         (set-group-name text)))]
+    [floating-button-page/view
+     {:customization-color    group-color
+      :gradient-cover?        true
+      :header-container-style {:margin-top 8}
+      :header                 [quo/page-nav
+                               {:background :photo
+                                :type       :no-title
+                                :icon-name  :i/arrow-left
+                                :on-press   back-on-press}]
+      :footer                 [quo/button
+                               {:customization-color group-color
+                                :disabled?           (boolean (or group-name-empty? error-message))
+                                :on-press            create-group-on-press}
+                               (i18n/label :t/create-group-chat)]}
+     [:<>
+      [avatar {:customization-color group-color}]
+      [quo/title-input
+       {:on-change-text  on-change-text
+        :default-value   default-value
+        :container-style {:padding-horizontal 20 :padding-top 12 :padding-bottom (if error-message 0 16)}
+        :placeholder     (i18n/label :t/name-your-group)
+        :max-length      constants/max-group-chat-name-length}]
+      (when error-message
+        [quo/info-message
+         {:type  :error
+          :icon  :i/info
+          :size  :default
+          :style {:margin-top 8 :margin-left 20 :margin-bottom 16}}
+         error-message])
+      [quo/divider-line]
+      [rn/view
+       {:style {:padding-vertical 7}}
+       [quo/text
+        {:size   :paragraph-2
+         :weight :medium
+         :style  (style/color-label theme)}
+        (i18n/label :t/accent-colour)]
+       [quo/color-picker
+        {:default-selected group-color
+         :on-change        set-group-color
+         :container-style  {:padding-top    15
+                            :padding-bottom 9
+                            :padding-left   (responsiveness/iphone-11-Pro-20-pixel-from-width
+                                             window-width)}}]]
+      [quo/divider-label
+       (i18n/label :t/n-m-people {:n (inc contacts-count) :m constants/max-group-chat-participants})]
+      [rn/view {:style style/tags}
+       (for [contact (conj contacts profile)]
+         ^{:key contact}
+         [quo/context-tag
+          {:container-style style/tag
+           :size            24
+           :profile-picture (profile.utils/photo contact)
+           :full-name       (profile.utils/displayed-name contact)}])]]]))

src/status_im/contexts/chat/group_details/style.cljs

@@ -40,3 +40,6 @@
    :background-color   (colors/theme-colors colors/white colors/neutral-95-opa-70)
    :flex-direction     :row})
 
+(def floating-shell-button
+  {:position :absolute
+   :bottom   21})

src/status_im/contexts/chat/group_details/view.cljs

@@ -113,6 +113,7 @@
         members         (rf/sub [:contacts/group-members-sections chat-id])
         pinned-messages (rf/sub [:chats/pinned chat-id])
         current-pk      (rf/sub [:multiaccount/public-key])
+        profile-color   (rf/sub [:profile/customization-color])
         admin?          (get admins current-pk)]
     [:<>
      [quo/gradient-cover
@@ -127,7 +128,6 @@
                                                                  group])}])}]
        :icon-name  :i/arrow-left
        :on-press   #(rf/dispatch [:navigate-back])}]
-
      [quo/page-top
       {:title  chat-name
        :avatar {:customization-color color}}]
@@ -135,7 +135,7 @@
       {:container-style style/actions-view
        :actions         [{:accessibility-label :pinned-messages
                           :label               (i18n/label :t/pinned-messages)
-                          :color               color
+                          :customization-color color
                           :icon                :i/pin
                           :counter-value       (count pinned-messages)
                           :on-press            (fn []
@@ -143,14 +143,14 @@
                                                  (rf/dispatch [:pin-message/show-pins-bottom-sheet
                                                                chat-id]))}
                          {:accessibility-label :toggle-mute
-                          :color               color
+                          :customization-color color
                           :icon                (if muted :i/muted :i/activity-center)
                           :label               (i18n/label (if muted :unmute-group :mute-group))
                           :on-press            #(rf/dispatch [:chat.ui/mute chat-id (not muted)
                                                               (when-not muted
                                                                 constants/mute-till-unmuted)])}
                          {:accessibility-label :manage-members
-                          :color               color
+                          :customization-color color
                           :icon                :i/add-user
                           :label               (i18n/label (if admin? :t/manage-members :t/add-members))
                           :counter-value       (count contacts)
@@ -167,4 +167,12 @@
        :render-section-footer-fn       contacts-section-footer
        :render-data                    {:chat-id chat-id
                                         :admin?  admin?}
-       :render-fn                      contact-item-render}]]))
+       :render-fn                      contact-item-render}]
+     [quo/floating-shell-button
+      {:jump-to {:on-press            (fn []
+                                        (rf/dispatch [:navigate-back])
+                                        (rf/dispatch [:shell/navigate-to-jump-to])
+                                      )
+                 :customization-color profile-color
+                 :label               (i18n/label :t/jump-to)}}
+      style/floating-shell-button]]))

src/status_im/contexts/chat/home/add_new_contact/views.cljs

@@ -61,9 +61,10 @@
                                         (reset! input-value clipboard-text)
                                         (rf/dispatch [:contacts/set-new-identity
                                                       {:input clipboard-text}])))]
-    (let [{:keys [scanned]} (rf/sub [:contacts/new-identity])
-          empty-input?      (and (string/blank? @input-value)
-                                 (string/blank? scanned))]
+    (let [{:keys [scanned] contact-public-key :id} (rf/sub [:contacts/new-identity])
+          contact-public-key-or-scanned            (or contact-public-key scanned)
+          empty-input?                             (and (string/blank? @input-value)
+                                                        (string/blank? contact-public-key-or-scanned))]
       [rn/view {:style style/input-and-scan-container}
        [quo/input
         {:accessibility-label :enter-contact-code-input
@@ -80,15 +81,16 @@
          :button              (when empty-input?
                                 {:on-press paste-on-input
                                  :text     (i18n/label :t/paste)})
-         ;; NOTE: `scanned` has priority over `@input-value`, we clean it when the input is updated
-         ;; so that it's `nil` and `@input-value` is shown. To fastly clean it, we use
-         ;; `dispatch-sync`. This call could be avoided if `::qr-scanner/scan-code` were able to
+         ;; NOTE: `contact-public-key-or-scanned` has priority over `@input-value`,
+         ;; we clean it when the input is updated so that it's `nil` and
+         ;; `@input-value`is shown. To fastly clean it, we use `dispatch-sync`.
+         ;; This call could be avoided if `::qr-scanner/scan-code` were able to
          ;; receive a callback function, not only a re-frame event as callback.
-         :value               (or scanned @input-value)
+         :value               (or contact-public-key-or-scanned @input-value)
          :on-change-text      (fn [new-text]
                                 (reset! input-value new-text)
                                 (as-> [:contacts/set-new-identity {:input new-text}] $
-                                  (if (string/blank? scanned)
+                                  (if (string/blank? contact-public-key-or-scanned)
                                     (debounce/debounce-and-dispatch $ 600)
                                     (rf/dispatch-sync $))))}]
        [rn/view {:style style/scan-button-container}

src/status_im/contexts/chat/home/new_chat/view.cljs

@@ -148,7 +148,7 @@
           :on-press            (fn []
                                  (if one-contact-selected?
                                    (rf/dispatch [:chat.ui/start-chat public-key])
-                                   (rf/dispatch [:navigate-to :new-group])))}
+                                   (rf/dispatch [:open-modal :group-create])))}
          (if one-contact-selected?
            (i18n/label :t/chat-with {:selected-user primary-name})
            (i18n/label :t/setup-group-chat))]])]))

src/status_im/contexts/chat/messenger/composer/utils.cljs

@@ -200,7 +200,8 @@
   []
   (let [chat-input (rf/sub [:chats/current-chat-input])]
     {:images               (seq (rf/sub [:chats/sending-image]))
-     :link-previews?       (rf/sub [:chats/link-previews?])
+     :link-previews?       (or (rf/sub [:chats/link-previews?])
+                               (rf/sub [:chats/status-link-previews?]))
      :audio                (rf/sub [:chats/sending-audio])
      :reply                (rf/sub [:chats/reply-message])
      :edit                 (rf/sub [:chats/edit-message])

src/status_im/contexts/chat/messenger/menus/pinned_messages/style.cljs

@@ -1,6 +1,5 @@
 (ns status-im.contexts.chat.messenger.menus.pinned-messages.style
   (:require
-    [quo.foundations.colors :as colors]
     [react-native.platform :as platform]))
 
 (defn heading
@@ -8,29 +7,8 @@
   {:padding-horizontal 20
    :margin-bottom      (when-not community? 12)})
 
-(defn heading-container
-  []
-  {:flex-direction    :row
-   :background-color  (colors/theme-colors colors/neutral-10 colors/neutral-80)
-   :border-radius     20
-   :align-items       :center
-   :align-self        :flex-start
-   :margin-horizontal 20
-   :padding           4
-   :margin-top        8
-   :margin-bottom     16})
-
-(defn heading-text
-  []
-  {:margin-left  6
-   :margin-right 4
-   :color        (colors/theme-colors colors/neutral-60 colors/neutral-20)})
-
-(defn chat-name-text
-  []
-  {:margin-left  4
-   :margin-right 8
-   :color        (colors/theme-colors colors/neutral-60 colors/neutral-20)})
+(def community-tag-container
+  {:margin-horizontal 20 :margin-top 4 :margin-bottom 12})
 
 (def no-pinned-messages-container
   {:justify-content :center
@@ -38,22 +16,5 @@
    :margin          12
    :margin-bottom   (when platform/android? 12)})
 
-(def no-pinned-messages-icon
-  {:width           80
-   :height          80
-   :justify-content :center
-   :align-items     :center
-   :border-width    1})
-
-(def no-pinned-messages-content
-  {:margin-top 12})
-
-(def no-pinned-messages-title
-  {:text-align :center})
-
-(def no-pinned-messages-text
-  {:text-align :center
-   :margin-top 2})
-
 (def list-footer
   {:height (when platform/android? 12)})

src/status_im/contexts/chat/messenger/menus/pinned_messages/view.cljs

@@ -1,10 +1,8 @@
 (ns status-im.contexts.chat.messenger.menus.pinned-messages.view
   (:require
     [quo.core :as quo]
-    [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]
     [react-native.gesture :as gesture]
     [status-im.common.resources :as resources]
     [status-im.contexts.chat.messenger.menus.pinned-messages.style :as style]
@@ -35,7 +33,7 @@
      :description (i18n/label :t/no-pinned-messages-desc)}]])
 
 (defn f-pinned-messages
-  [{:keys [theme chat-id]}]
+  [{:keys [theme chat-id disable-message-long-press?]}]
   (let [pinned                 (rf/sub [:chats/pinned-sorted-list chat-id])
         render-data            (rf/sub [:chats/current-chat-message-list-view-context :in-pinned-view])
         current-chat           (rf/sub [:chats/chat-by-id chat-id])
@@ -52,24 +50,17 @@
         :style  (style/heading community)}
        (i18n/label :t/pinned-messages)]
       (when community
-        [rn/view {:style (style/heading-container)}
-         [fast-image/fast-image
-          {:source (community-avatar community-images)
-           :style  {:width         20
-                    :height        20
-                    :border-radius 20}}]
-         [rn/text {:style (style/heading-text)} (:name community)]
-         [quo/icon
-          :i/chevron-right
-          {:color (colors/theme-colors colors/neutral-60 colors/neutral-30)
-           :size  12}]
-         [rn/text
-          {:style (style/chat-name-text)}
-          (str "# " (:chat-name current-chat))]])]
+        [quo/context-tag
+         {:type            :channel
+          :size            24
+          :container-style style/community-tag-container
+          :community-logo  (community-avatar community-images)
+          :community-name  (:name community)
+          :channel-name    (:chat-name current-chat)}])]
      (if (pos? (count pinned))
        [rn/flat-list
         {:data        pinned
-         :render-data render-data
+         :render-data (assoc render-data :disable-message-long-press? disable-message-long-press?)
          :render-fn   message-render-fn
          :footer      [rn/view {:style style/list-footer}]
          :key-fn      list-key-fn

src/status_im/contexts/chat/messenger/messages/content/style.cljs

@@ -31,3 +31,7 @@
    :opacity            (if (and outgoing (= outgoing-status :sending))
                          0.5
                          1)})
+
+(def drawer-message-container
+  {:padding-top    4
+   :padding-bottom 8})

src/status_im/contexts/chat/messenger/messages/content/text/style.cljs

@@ -14,18 +14,18 @@
 
 (defn mention-tag-wrapper
   [first-child-mention]
-  {:flex-direction :row
-   :align-items    :center
-   :height         (if platform/ios? 22 21)
-   :border-radius  6
-   :transform      [{:translateY (if platform/ios? (if first-child-mention 4.5 3) 4.5)}]})
+  {:flex-direction     :row
+   :align-items        :center
+   :height             (if platform/ios? 22 21)
+   :background-color   colors/primary-50-opa-10
+   :padding-horizontal 3
+   :border-radius      6
+   :transform          [{:translateY (if platform/ios? (if first-child-mention 4.5 3) 4.5)}]})
 
 (def mention-tag-text
   {:color                 (colors/theme-colors colors/primary-50
                                                colors/primary-60)
    :selection-color       :transparent
-   :background-color      colors/primary-50-opa-10
-   :padding-horizontal    3
    :suppress-highlighting true})
 
 (defn code

src/status_im/contexts/chat/messenger/messages/content/text/view.cljs

@@ -57,16 +57,14 @@
       :mention
       (conj
        units
-       (let [resolved-mention (rf/sub [:messages/resolve-mention literal])]
-         [rn/pressable
-          {:on-press #(rf/dispatch [:chat.ui/show-profile literal])
-           :key      resolved-mention
-           :style    (style/mention-tag-wrapper first-child-mention)}
-          [quo/text
-           {:weight :medium
-            :style  style/mention-tag-text
-            :size   :paragraph-1}
-           resolved-mention]]))
+       [rn/pressable
+        {:on-press #(rf/dispatch [:chat.ui/show-profile literal])
+         :style    (style/mention-tag-wrapper first-child-mention)}
+        [quo/text
+         {:weight :medium
+          :style  style/mention-tag-text
+          :size   :paragraph-1}
+         (rf/sub [:messages/resolve-mention literal])]])
 
       :edited
       (conj units
@@ -108,6 +106,7 @@
                 (render-inline acc e chat-id style-override mention-first))
               [quo/text
                {:size  :paragraph-1
+                :key   (rand-int 1000000) ;; https://github.com/status-im/status-mobile/pull/19203
                 :style {:margin-bottom (if mention-first (if platform/ios? 4 0) 2)
                         :margin-top    (if mention-first (if platform/ios? -4 0) -1)
                         :color         (when (seq style-override) colors/white)

src/status_im/contexts/chat/messenger/messages/content/view.cljs

@@ -77,11 +77,11 @@
 
 (defn system-message-contact-request
   [{:keys [chat-id timestamp-str from]} type]
-  (let [[primary-name _]     (rf/sub [:contacts/contact-two-names-by-identity chat-id])
-        contact              (rf/sub [:contacts/contact-by-address chat-id])
-        photo-path           (when (seq (:images contact)) (rf/sub [:chats/photo-path chat-id]))
-        customization-color  (rf/sub [:profile/customization-color])
-        {:keys [public-key]} (rf/sub [:profile/profile])]
+  (let [[primary-name _]    (rf/sub [:contacts/contact-two-names-by-identity chat-id])
+        contact             (rf/sub [:contacts/contact-by-address chat-id])
+        photo-path          (when (seq (:images contact)) (rf/sub [:chats/photo-path chat-id]))
+        customization-color (rf/sub [:profile/customization-color])
+        public-key          (rf/sub [:profile/public-key])]
     [quo/system-message
      {:type                type
       :timestamp           timestamp-str
@@ -152,35 +152,36 @@
                  show-user-info? preview? theme]}]
       (let [{:keys [content-type quoted-message content
                     outgoing outgoing-status pinned-by
-                    message-id chat-id]} message-data
-            first-image                  (first (:album message-data))
-            outgoing-status              (if (= content-type
-                                                constants/content-type-album)
-                                           (:outgoing-status first-image)
-                                           outgoing-status)
-            outgoing                     (if (= content-type
-                                                constants/content-type-album)
-                                           (:outgoing first-image)
-                                           outgoing)
-            context                      (assoc context
-                                                :on-long-press
-                                                #(on-long-press message-data
-                                                                context
-                                                                keyboard-shown?))
-            response-to                  (:response-to content)
-            height                       (rf/sub [:dimensions/window-height])
+                    message-id chat-id]}          message-data
+            {:keys [disable-message-long-press?]} context
+            first-image                           (first (:album message-data))
+            outgoing-status                       (if (= content-type
+                                                         constants/content-type-album)
+                                                    (:outgoing-status first-image)
+                                                    outgoing-status)
+            outgoing                              (if (= content-type
+                                                         constants/content-type-album)
+                                                    (:outgoing first-image)
+                                                    outgoing)
+            context                               (assoc context
+                                                         :on-long-press
+                                                         #(on-long-press message-data
+                                                                         context
+                                                                         keyboard-shown?))
+            response-to                           (:response-to content)
+            height                                (rf/sub [:dimensions/window-height])
             {window-width :width
-             window-scale :scale}        (rn/get-window)
-            message-container-data       {:window-width           window-width
-                                          :padding-right          20
-                                          :padding-left           20
-                                          :avatar-container-width 32
-                                          :message-margin-left    8}
-            reactions                    (rf/sub [:chats/message-reactions message-id
-                                                  chat-id])
-            six-reactions?               (-> reactions
-                                             count
-                                             (= 6))]
+             window-scale :scale}                 (rn/get-window)
+            message-container-data                {:window-width           window-width
+                                                   :padding-right          20
+                                                   :padding-left           20
+                                                   :avatar-container-width 32
+                                                   :message-margin-left    8}
+            reactions                             (rf/sub [:chats/message-reactions message-id
+                                                           chat-id])
+            six-reactions?                        (-> reactions
+                                                      count
+                                                      (= 6))]
         [rn/touchable-highlight
          {:accessibility-label (if (and outgoing (= outgoing-status :sending))
                                  :message-sending
@@ -204,7 +205,8 @@
                                      (reset! show-delivery-state? true)
                                      (js/setTimeout #(reset! show-delivery-state? false)
                                                     delivery-state-showing-time-ms))))
-          :on-long-press       #(on-long-press message-data context keyboard-shown?)}
+          :on-long-press       (when-not disable-message-long-press?
+                                 #(on-long-press message-data context keyboard-shown?))}
          [:<>
           (when pinned-by
             [pin/pinned-by-view pinned-by])
@@ -276,14 +278,14 @@
        (fn []
          [rn/view
           {:pointer-events :none
-           :padding-top    4}
+           :style          style/drawer-message-container}
           [user-message-content
-           {:message-data    message-data
-            :context         context
-            :keyboard-shown? keyboard-shown?
-            :show-reactions? true
-            :show-user-info? true
-            :preview?        true}]]))}]))
+           {:message-data                 message-data
+            :context                      context
+            :keyboard-shown?              keyboard-shown?
+            :in-reaction-and-action-menu? true
+            :show-user-info?              false
+            :show-reactions?              true}]]))}]))
 
 (defn system-message?
   [content-type]