commit : stage wip stuff

I have created separate API tokens for Mobile project and changed how
they are passed in Jenkins by using a single file.

Depends on:
https://github.com/status-im/status-jenkins-lib/pull/88

Signed-off-by: Jakub Sokołowski <jakub@status.im>

.clj-kondo/config.edn

@@ -26,7 +26,7 @@
                                                           malli.generator         malli.generator
                                                           malli.transform         malli.transform
                                                           malli.util              malli.util
-                                                          promesa.core            p
+                                                          promesa.core            promesa
                                                           schema.core             schema
                                                           status-im.feature-flags ff
                                                           taoensso.timbre         log}}

.env

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

.env.e2e

@@ -33,3 +33,4 @@ TWO_MINUTES_SYNCING=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1

.env.jenkins

@@ -35,3 +35,4 @@ ENABLE_QUO_PREVIEW=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1

.env.nightly

@@ -22,3 +22,4 @@ COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
+TEST_NETWORKS_ENABLED=0

.env.release

@@ -20,3 +20,4 @@ MAX_IMAGES_BATCH=1
 DELETE_MESSAGE_ENABLED=1
 COLLECTIBLES_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
+TEST_NETWORKS_ENABLED=0

VERSION

@@ -1 +1 @@
-2.28.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',
-            },
-          },
-        ],
-      ],
-    },
-  },
 };

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,8 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
-		E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */; };
+		E9AC7FD92BB8FDAB0024A0AF /* HelloWorldJSI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9AC7FD72BB8FDAB0024A0AF /* HelloWorldJSI.cpp */; };
+		E9AC7FDA2BB8FDAB0024A0AF /* HelloWorldJSI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9AC7FD72BB8FDAB0024A0AF /* HelloWorldJSI.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,14 +110,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 +125,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 +150,14 @@
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
+		C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
+		CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		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>"; };
+		E9AC7FD72BB8FDAB0024A0AF /* HelloWorldJSI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldJSI.cpp; path = "../modules/react-native-status/jsi/HelloWorldJSI.cpp"; sourceTree = "<group>"; };
+		E9AC7FD82BB8FDAB0024A0AF /* HelloWorldJSI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldJSI.h; path = "../modules/react-native-status/jsi/HelloWorldJSI.h"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +165,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +178,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */,
+				17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +192,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */,
+				061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -268,6 +272,8 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				E9AC7FD72BB8FDAB0024A0AF /* HelloWorldJSI.cpp */,
+				E9AC7FD82BB8FDAB0024A0AF /* HelloWorldJSI.h */,
 				65F6941825780A4F00A45E76 /* Bridge.swift */,
 				3AAD2AB624A3A5F10075D594 /* StatusImPR */,
 				13B07FAE1A68108700A75B9A /* StatusIm */,
@@ -314,9 +320,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				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 +330,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 +347,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 +367,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 +389,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 +550,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 +622,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 +644,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 +688,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 +702,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 */
@@ -737,6 +743,7 @@
 				65F6941925780A4F00A45E76 /* Bridge.swift in Sources */,
 				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
 				3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */,
+				E9AC7FD92BB8FDAB0024A0AF /* HelloWorldJSI.cpp in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -748,6 +755,7 @@
 				65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */,
 				3AAD2ABC24A3A60E0075D594 /* AppDelegate.mm in Sources */,
 				3AAD2ABD24A3A60E0075D594 /* Dummy.swift in Sources */,
+				E9AC7FDA2BB8FDAB0024A0AF /* HelloWorldJSI.cpp in Sources */,
 				3AAD2ABE24A3A60E0075D594 /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -765,7 +773,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 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 +790,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 +810,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 +824,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 +843,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 +887,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 +903,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -915,11 +925,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 +963,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 +979,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -988,11 +1000,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 +1043,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 +1059,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1065,11 +1079,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 +1116,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 +1132,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1139,7 +1155,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 +1188,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 +1219,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 +1251,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 +1283,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 +1306,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

@@ -73,6 +73,17 @@ extern "C" NSString* StatusgoImageServerTLSCert();
   [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults];
 
   [RNSplashScreen show];
+  
+  RCTCxxBridge *bridge = (RCTCxxBridge *)[[_bridge batchedBridge] valueForKey:@"_batchedBridge"];
+  facebook::react::RCTJSIExecutorFactory *executorFactory = [bridge jsExecutorFactoryForBridge:bridge];
+
+  if (executorFactory) {
+      bridge.jsiExecutorFactory = ^{
+          facebook::jsi::Runtime *runtime = executorFactory();
+          HelloWorldJSI::install(*runtime);
+          return runtime;
+      };
+  }
 
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
   center.delegate = self;
@@ -104,6 +115,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");
 

modules/react-native-status/jsi/HelloWorldJSI.cpp

@@ -0,0 +1,17 @@
+#include "HelloWorldJSI.h"
+#include <jsi/jsi.h>
+#include <iostream>
+
+using namespace facebook::jsi;
+
+void HelloWorldJSI::install(Runtime& runtime) {
+    auto helloWorldFunction = Function::createFromHostFunction(runtime,
+        PropNameID::forAscii(runtime, "helloWorld"),
+        0,
+        [](Runtime& runtime, Value thisValue, Value* arguments, size_t count) -> Value {
+            std::cout << "Hello, World! from C++" << std::endl;
+            return Value::undefined();
+        });
+
+    runtime.global().setProperty(runtime, "helloWorld", std::move(helloWorldFunction));
+}

modules/react-native-status/jsi/HelloWorldJSI.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+using namespace facebook::jsi;
+
+class HelloWorldJSI {
+public:
+    static void install(Runtime& runtime);
+
+private:
+    static void helloWorld(Runtime& runtime, Value thisValue, Value* arguments, size_t count);
+};

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
 }
 

package.json

@@ -11,15 +11,14 @@
     "@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/legacy/status_im/keycard/login.cljs

@@ -18,7 +18,7 @@
   [{:keys [db] :as cofx}]
   (rf/merge cofx
             {:db db}
-            (navigation/pop-to-root :profiles)))
+            (navigation/pop-to-root :screen/profile.profiles)))
 
 (rf/defn login-pin-more-icon-pressed
   {:events [:keycard.login.pin.ui/more-icon-pressed]}

src/legacy/status_im/keycard/recovery.cljs

@@ -74,7 +74,8 @@
                  (assoc :recovered-account? true))
              :keycard/check-nfc-enabled nil}
             (bottom-sheet/hide-bottom-sheet-old)
-            (navigation/navigate-to-within-stack [:keycard-recovery-intro :new-to-status])))
+            (navigation/navigate-to-within-stack [:keycard-recovery-intro
+                                                  :screen/onboarding.new-to-status])))
 
 (rf/defn access-key-pressed
   {:events [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]}
@@ -127,7 +128,7 @@
                          :multiaccount-whisper-public-key)}
             (navigation/navigate-to (if platform/android?
                                       :notifications-settings
-                                      :welcome)
+                                      :screen/onboarding.welcome)
                                     nil)))
 
 (rf/defn intro-wizard

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/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/community/channel_action/style.cljs

@@ -13,6 +13,7 @@
   [{:keys [color pressed? theme]}]
   {:height           102
    :padding          12
+   :padding-bottom   10
    :border-radius    16
    :background-color (colors/resolve-color color theme (if pressed? 20 10))
    :justify-content  :space-between})
@@ -20,4 +21,5 @@
 (def channel-action-row
   {:flex-direction  :row
    :justify-content :space-between
-   :align-items     :center})
+   :align-items     :center
+   :padding-right   2})

src/quo/components/dividers/date.cljs

@@ -8,9 +8,10 @@
 (defn date
   [value]
   [rn/view
-   {:margin-vertical 12
-    :padding-right   20
-    :padding-left    60}
+   {:padding-top    8
+    :padding-bottom 12
+    :padding-right  20
+    :padding-left   60}
    [text/text
     {:weight              :medium
      :accessibility-label :divider-date-text

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

@@ -0,0 +1,54 @@
+(ns quo.components.drawers.drawer-action.component-spec
+  (:require
+    [quo.components.drawers.drawer-action.view :as drawer-action]
+    [quo.foundations.colors :as colors]
+    [test-helpers.component :as h]))
+
+(h/describe "Drawers: drawer-action"
+  (h/test "default render"
+    (h/render-with-theme-provider [drawer-action/view {}])
+    (h/is-truthy (h/query-by-label-text :container)))
+
+  (h/test "on-press-in changes internal state to :pressed"
+    (h/render-with-theme-provider [drawer-action/view {}])
+    (h/fire-event :on-press-in (h/get-by-label-text :container))
+    (h/wait-for #(h/has-style (h/query-by-label-text :container)
+                              {:backgroundColor (colors/resolve-color :blue :light 5)})))
+
+  (h/test "render default action with state :selected"
+    (h/render-with-theme-provider [drawer-action/view {:state :selected}])
+    (h/has-style (h/query-by-label-text :container)
+                 {:backgroundColor (colors/resolve-color :blue :light 5)})
+    (h/is-truthy (h/query-by-label-text :check-icon)))
+
+  (h/test "call on-press"
+    (let [on-press (h/mock-fn)]
+      (h/render-with-theme-provider [drawer-action/view {:on-press on-press}])
+      (h/fire-event :on-press (h/get-by-label-text :container))
+      (h/was-called on-press)))
+
+
+  (h/test "render :arrow action"
+    (h/render-with-theme-provider [drawer-action/view {:action :arrow}])
+    (h/is-truthy (h/query-by-label-text :arrow-icon)))
+
+  (h/test "render :toggle action"
+    (h/render-with-theme-provider [drawer-action/view {:action :toggle}])
+    (h/is-truthy (h/query-by-label-text "toggle-off")))
+
+  (h/test "render :toggle action with state :selected"
+    (h/render-with-theme-provider [drawer-action/view
+                                   {:action :toggle
+                                    :state  :selected}])
+    (h/is-truthy (h/query-by-label-text "toggle-on"))
+    (h/has-style (h/query-by-label-text :container)
+                 {:backgroundColor :transparent}))
+
+  (h/test "render default action with icon, title, description"
+    (h/render-with-theme-provider [drawer-action/view
+                                   {:icon        :i/contact
+                                    :title       "Check contact"
+                                    :description "Just a small desc"}])
+    (h/is-truthy (h/query-by-label-text :left-icon))
+    (h/is-truthy (h/query-by-text "Check contact"))
+    (h/is-truthy (h/query-by-text "Just a small desc"))))

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

@@ -0,0 +1,16 @@
+(ns quo.components.drawers.drawer-action.schema)
+
+(def ?schema
+  [:=>
+   [:cat
+    [:map {:closed true}
+     [:action {:optional true} [:maybe [:enum :arrow :toggle]]]
+     [:icon {:optional true} [:maybe :keyword]]
+     [:description {:optional true} [:maybe :string]]
+     [:state {:optional true} [:maybe [:enum :selected]]]
+     [:title {:optional true} :string]
+     [:on-press {:optional true} [:maybe fn?]]
+     [:customization-color {:optional true}
+      [:maybe :schema.common/customization-color]]
+     [:blur? {:optional true} [:maybe :boolean]]]]
+   :any])

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

@@ -0,0 +1,55 @@
+(ns quo.components.drawers.drawer-action.style
+  (:require
+    [quo.foundations.colors :as colors]))
+
+(defn- background-color
+  [{:keys [state action customization-color theme pressed? blur?]}]
+  (let [checked? (and (= :selected state) (nil? action))]
+    (cond
+      (and (or checked? pressed?) blur?)
+      colors/white-opa-5
+
+      (or pressed? checked?)
+      (colors/resolve-color customization-color theme 5)
+
+      :else :transparent)))
+
+(defn container
+  [{:keys [description?] :as props}]
+  {:flex-direction     :row
+   :align-items        :center
+   :padding-vertical   (if description? 8 13)
+   :padding-horizontal 13
+   :border-radius      12
+   :background-color   (background-color props)})
+
+(defn text-container
+  []
+  {:flex         1
+   :margin-right 12})
+
+(defn- neutral-color
+  [theme blur?]
+  (if blur?
+    colors/white-70-blur
+    (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)))
+
+(defn left-icon
+  []
+  {:align-self   :flex-start
+   :margin-right 13
+   :margin-top   1})
+
+(defn icon-color
+  [{:keys [theme blur?]}]
+  (neutral-color theme blur?))
+
+(defn desc
+  [{:keys [theme blur?]}]
+  {:color (neutral-color theme blur?)})
+
+(defn check-color
+  [{:keys [theme blur? customization-color]}]
+  (if blur?
+    colors/white-70-blur
+    (colors/resolve-color customization-color theme)))

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

@@ -0,0 +1,73 @@
+(ns quo.components.drawers.drawer-action.view
+  (:require
+    [quo.components.drawers.drawer-action.schema :as component-schema]
+    [quo.components.drawers.drawer-action.style :as style]
+    [quo.components.icon :as icon]
+    [quo.components.markdown.text :as text]
+    [quo.components.selectors.selectors.view :as selectors]
+    [quo.theme :as theme]
+    [react-native.core :as rn]
+    [schema.core :as schema]))
+
+(defn view-internal
+  [{:keys [action icon description state title on-press
+           customization-color blur?]
+    :or   {customization-color :blue
+           blur?               false}}]
+  (let [theme                  (theme/use-theme-value)
+        [pressed? set-pressed] (rn/use-state false)
+        on-press-in            (rn/use-callback #(set-pressed true))
+        on-press-out           (rn/use-callback #(set-pressed false))]
+    [rn/pressable
+     {:on-press            on-press
+      :on-press-in         on-press-in
+      :on-press-out        on-press-out
+      :style               (style/container {:state               state
+                                             :action              action
+                                             :customization-color customization-color
+                                             :theme               theme
+                                             :pressed?            pressed?
+                                             :description?        (not-empty description)
+                                             :blur?               blur?})
+      :accessibility-label :container}
+     (when icon
+       [icon/icon icon
+        {:accessibility-label :left-icon
+         :container-style     (style/left-icon)
+         :color               (style/icon-color {:theme theme
+                                                 :blur? blur?})}])
+
+     [rn/view {:style (style/text-container)}
+      [text/text {:weight :medium}
+       title]
+
+      (when (seq description)
+        [text/text
+         {:size  :paragraph-2
+          :style (style/desc {:theme theme
+                              :blur? blur?})}
+         description])]
+
+     (cond
+       (= action :toggle)
+       [selectors/view
+        {:theme               theme
+         :label-prefix        "toggle"
+         :customization-color customization-color
+         :type                :toggle
+         :checked?            (= state :selected)}]
+
+       (= action :arrow)
+       [icon/icon :i/chevron-right
+        {:accessibility-label :arrow-icon
+         :color               (style/icon-color {:theme theme
+                                                 :blur? blur?})}]
+
+       (= state :selected)
+       [icon/icon :i/check
+        {:accessibility-label :check-icon
+         :color               (style/check-color {:theme               theme
+                                                  :blur?               blur?
+                                                  :customization-color customization-color})}])]))
+
+(def view (schema/instrument #'view-internal component-schema/?schema))

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

@@ -81,7 +81,8 @@
   (let [tag-type (or context-tag-type :account)]
     [rn/view
      {:accessibility-label :context-tag-wrapper
-      :style               {:flex-wrap :wrap}}
+      :style               {:flex-wrap  :wrap
+                            :margin-top 4}}
      [context-tag/view
       {:type                tag-type
        :account-name        account-name

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/notifications/notification/style.cljs

@@ -26,14 +26,20 @@
     :padding-vertical   8
     :padding-horizontal 12}))
 
-(def right-side-container {:flex 1})
+(def right-side-container
+  {:flex            1
+   :justify-content :center})
 
 (defn title
-  [override-theme]
-  {:color (colors/theme-colors colors/white colors/neutral-100 override-theme)})
+  [theme]
+  {:color (colors/theme-colors colors/white colors/neutral-100 theme)})
 
 (defn text
-  [override-theme]
-  {:color (colors/theme-colors colors/white colors/neutral-100 override-theme)})
+  [theme]
+  {:color (colors/theme-colors colors/white colors/neutral-100 theme)})
 
-(def avatar-container {:margin-right 8 :margin-top 4})
+(defn avatar-container
+  [{:keys [multiline?]}]
+  {:margin-right 8
+   :align-self   (when-not multiline? :center)
+   :margin-top   (if multiline? 4 0)})

src/quo/components/notifications/notification/view.cljs

@@ -1,7 +1,9 @@
 (ns quo.components.notifications.notification.view
   (:require
+    [quo.components.avatars.user-avatar.view :as user-avatar]
     [quo.components.markdown.text :as text]
     [quo.components.notifications.notification.style :as style]
+    [quo.theme]
     [react-native.blur :as blur]
     [react-native.core :as rn]))
 
@@ -15,33 +17,33 @@
   [into [rn/view {:accessibility-label :notification-body}] children])
 
 (defn avatar-container
-  [& children]
+  [{:keys [multiline?]} & children]
   [into
    [rn/view
-    {:style               style/avatar-container
+    {:style               (style/avatar-container {:multiline? multiline?})
      :accessibility-label :notification-avatar}]
    children])
 
 (defn title
-  ([text weight] (title text weight nil))
-  ([text weight override-theme]
+  ([{:keys [text weight theme multiline?]}]
    [text/text
     {:size                :paragraph-1
-     :weight              (or weight :semi-bold)
-     :style               (style/title override-theme)
+     :weight              (or weight (if multiline? :semi-bold :medium))
+     :style               (style/title theme)
      :accessibility-label :notification-title}
     text]))
 
 (defn message
-  [text override-theme]
+  [text theme]
   [text/text
    {:size                :paragraph-2
-    :style               (style/text override-theme)
+    :weight              :medium
+    :style               (style/text theme)
     :accessibility-label :notification-content}
    text])
 
 (defn- notification-container
-  [{:keys [avatar header body container-style override-theme]}]
+  [{:keys [avatar header body container-style theme]}]
   [rn/view
    {:style (merge style/box-container container-style)}
    [blur/view
@@ -51,7 +53,7 @@
      :blur-type     :transparent
      :overlay-color :transparent}]
    [rn/view
-    {:style (style/content-container override-theme)}
+    {:style (style/content-container theme)}
     avatar
     [rn/view
      {:style style/right-side-container}
@@ -59,17 +61,27 @@
      body]]])
 
 (defn notification
-  [{title-text :title :keys [avatar header title-weight text body container-style override-theme]}]
-  (let [header (or header
-                   (when title-text
-                     [title title-text title-weight override-theme]))
-        header (when header [header-container header])
-        body   (or body (when text [message text override-theme]))
-        body   (when body [body-container body])
-        avatar (when avatar [avatar-container avatar])]
-    [notification-container
-     {:avatar          avatar
-      :header          header
-      :body            body
-      :container-style container-style
-      :override-theme  override-theme}]))
+  [{title-text :title :keys [avatar user header title-weight text body container-style theme]}]
+  (let [theme       (or theme (quo.theme/get-theme))
+        body        (or body (when text [message text theme]))
+        header      (or header
+                        (when title-text
+                          [title
+                           {:text       title-text
+                            :weight     title-weight
+                            :theme      theme
+                            :multiline? (some? body)}]))
+        header      (when header [header-container header])
+        body        (when body [body-container body])
+        user-avatar (or avatar (when user (user-avatar/user-avatar user)))
+        avatar      (when user-avatar
+                      [avatar-container
+                       {:multiline? (and header body)}
+                       user-avatar])]
+    [quo.theme/provider {:theme theme}
+     [notification-container
+      {:avatar          avatar
+       :header          header
+       :body            body
+       :container-style container-style
+       :theme           theme}]]))

src/quo/components/numbered_keyboard/keyboard_key/view.cljs

@@ -15,9 +15,9 @@
   [{:keys [disabled? blur? on-press on-long-press type]} label]
   (let [theme                   (quo.theme/use-theme-value)
         [pressed? set-pressed?] (rn/use-state false)
-        on-press                (rn/use-callback #(when on-press (on-press label)) [label])
+        on-press                (rn/use-callback #(when on-press (on-press label)) [on-press label])
         on-long-press           (rn/use-callback #(when (fn? on-long-press) (on-long-press label))
-                                                 [label])
+                                                 [on-long-press label])
         on-press-in             (rn/use-callback #(set-pressed? true))
         on-press-out            (rn/use-callback #(set-pressed? false))
         label-color             (style/get-label-color disabled? theme blur?)

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,32 @@
+(ns quo.components.profile.expanded-collectible.style
+  (:require [quo.foundations.colors :as colors]
+            [quo.foundations.shadows :as shadows]))
+
+(def container
+  (merge (shadows/get 2)
+         {: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 promesa]
+    [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 []
+       (promesa/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
+        [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} [:maybe 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/settings/page_setting/component_spec.cljs

@@ -0,0 +1,11 @@
+(ns quo.components.settings.page-setting.component-spec
+  (:require
+    [quo.core :as quo]
+    [test-helpers.component :as h]))
+
+(h/describe
+  "renders basic text"
+  (h/test "title is visible"
+    (h/render [quo/page-setting
+               {:setting-text "sample text"}])
+    (h/is-truthy (h/get-by-text "sample text"))))

src/quo/components/settings/page_setting/style.cljs

@@ -0,0 +1,14 @@
+(ns quo.components.settings.page-setting.style
+  (:require
+    [quo.foundations.colors :as colors]))
+
+(defn container
+  [theme]
+  {:flex-direction     :row
+   :justify-content    :space-between
+   :background-color   (colors/theme-colors colors/neutral-2_5 colors/neutral-90 theme)
+   :padding-vertical   13
+   :padding-horizontal 12
+   :border-width       1
+   :border-color       (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)
+   :border-radius      16})

src/quo/components/settings/page_setting/view.cljs

@@ -0,0 +1,24 @@
+(ns quo.components.settings.page-setting.view
+  (:require
+    [quo.components.markdown.text :as text]
+    [quo.components.selectors.selectors.view :as selectors]
+    [quo.components.settings.page-setting.style :as style]
+    [quo.theme]
+    [react-native.core :as rn]))
+
+(defn page-setting
+  [{:keys [setting-text customization-color checked? container-style on-change disabled?]}]
+  (let [theme (quo.theme/use-theme-value)]
+    [rn/view
+     {:style (merge (style/container theme)
+                    container-style)}
+     [text/text
+      {:weight          :medium
+       :number-of-lines 1} setting-text]
+     [selectors/view
+      {:type                :toggle
+       :checked?            checked?
+       :customization-color customization-color
+       :accessibility-label :user-list-toggle-check
+       :disabled?           disabled?
+       :on-change           (when on-change on-change)}]]))

src/quo/components/share/share_qr_code/view.cljs

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

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

@@ -7,11 +7,12 @@
     [react-native.core :as rn]))
 
 (defn- view-internal
-  [{:keys [title networks status theme blur?] :or {status :default}}]
+  [{:keys [title networks status theme blur? container-style] :or {status :default}}]
   [rn/view
-   {:style (style/container {:status status
-                             :theme  theme
-                             :blur?  blur?})}
+   {:style (merge (style/container {:status status
+                                    :theme  theme
+                                    :blur?  blur?})
+                  container-style)}
    [preview-list/view
     {:type   :network
      :number (count networks)

src/quo/components/wallet/amount_input/component_spec.cljs

@@ -12,32 +12,24 @@
 (h/describe "Amount input component"
   (h/test "Renders with default value"
     (let [text-expected 0]
-      (render [amount-input/view {:init-value text-expected}])
-      (h/is-truthy (h/query-by-label-text :amount-input))
-      (h/is-equal (oops/oget (h/get-by-label-text :amount-input) "props" "value")
-                  (str text-expected))))
+      (render [amount-input/view {:value text-expected}])
+      (h/is-truthy (h/query-by-label-text :amount-input))))
 
   (h/test "When the value = minimum dec button is disabled"
     (render [amount-input/view
-             {:init-value 0
-              :min-value  0}])
+             {:value     0
+              :min-value 0}])
     (h/is-truthy
      (oops/oget (h/get-by-label-text :amount-input-dec-button) "props" "accessibilityState" "disabled")))
 
   (h/test "When the value = maximum inc button is disabled"
     (render [amount-input/view
-             {:init-value 100
-              :max-value  100}])
+             {:value     100
+              :max-value 100}])
     (h/is-truthy
      (oops/oget (h/get-by-label-text :amount-input-inc-button) "props" "accessibilityState" "disabled")))
 
   (h/test "Renders the error state"
-    (render [amount-input/view {:status :error}])
+    (render [amount-input/view {:status :error :value 10}])
     (h/is-equal (colors/resolve-color :danger :light)
-                (oops/oget (h/get-by-label-text :amount-input) "props" "style" "color")))
-
-  (h/test "on-change-text function is fired"
-    (let [on-change-text (h/mock-fn)]
-      (render [amount-input/view {:on-change-text on-change-text}])
-      (h/fire-event :change-text (h/get-by-label-text :amount-input) "100")
-      (h/was-called on-change-text))))
+                (oops/oget (h/get-by-label-text :amount-input) "props" "style" "color"))))

src/quo/components/wallet/amount_input/schema.cljs

@@ -1,9 +1,5 @@
 (ns quo.components.wallet.amount-input.schema)
 
-(def return-key-types
-  [:enum :done :go :next :search :send :none :previous :default
-   :emergency-call :google :join :route :yahoo])
-
 (def ?schema
   [:=>
    [:catn
@@ -11,11 +7,10 @@
      [:map {:closed true}
       [:status {:optional true} [:maybe [:enum :default :error]]]
       [:theme :schema.common/theme]
-      [:on-change-text {:optional true} [:maybe fn?]]
+      [:on-inc-press {:optional true} [:maybe fn?]]
+      [:on-dec-press {:optional true} [:maybe fn?]]
       [:container-style {:optional true} [:maybe :map]]
-      [:auto-focus? {:optional true} [:maybe :boolean]]
       [:min-value {:optional true} [:maybe :int]]
       [:max-value {:optional true} [:maybe :int]]
-      [:return-key-type {:optional true} [:maybe return-key-types]]
-      [:init-value {:optional true} [:maybe :int]]]]]
+      [:value [:maybe :int]]]]]
    :any])

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

@@ -12,6 +12,7 @@
 (defn input-text
   [theme type]
   {:padding 0
+   :align   :center
    :color   (if (= type :error)
               (colors/resolve-color :danger theme)
               (colors/theme-colors colors/neutral-100 colors/white theme))})

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

@@ -6,7 +6,6 @@
     [quo.components.wallet.amount-input.style :as style]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [reagent.core :as reagent]
     [schema.core :as schema]))
 
 (defn- amount-button
@@ -21,60 +20,35 @@
     :on-press            on-press}
    icon])
 
-(defn- process-amount
-  [input-value min-value max-value]
-  (let [parsed-input-value (parse-double input-value)]
-    (cond
-      (nil? parsed-input-value)  min-value
-      (>= input-value max-value) max-value
-      (<= input-value min-value) min-value
-      :else                      parsed-input-value)))
-
 (defn- view-internal
-  [{:keys [init-value]}]
-  (let [init-value   (or init-value 0)
-        value        (reagent/atom init-value)
-        on-dec-press #(swap! value dec)
-        on-inc-press #(swap! value inc)]
-    (fn [{:keys [theme status min-value max-value auto-focus?
-                 return-key-type container-style on-change-text]}]
-      (let [min-value (or min-value 0)
-            max-value (or max-value 999999999)]
-        [rn/view
-         {:style (merge style/container container-style)}
-         [amount-button
-          {:theme               theme
-           :accessibility-label :amount-input-dec-button
-           :icon                :i/remove
-           :on-press            on-dec-press
-           :disabled?           (>= min-value @value)}]
-         [rn/view {:style style/input-container}
-          [rn/text-input
-           {:style
-            (text/text-style
-             {:size   :heading-1
-              :weight :semi-bold
-              :align  :center
-              :style  (style/input-text theme (or status :default))})
-            :accessibility-label :amount-input
-            :editable true
-            :auto-focus (or auto-focus? false)
-            :value (str @value)
-            :keyboard-appearance (quo.theme/theme-value :light :dark theme)
-            :return-key-type (or return-key-type :done)
-            :input-mode :numeric
-            :on-change-text (fn [input-value]
-                              (let [processed-amount (process-amount input-value min-value max-value)]
-                                (reset! value processed-amount)
-                                (when on-change-text
-                                  (on-change-text processed-amount))
-                                (reagent/flush)))}]] ; Fixes the input flickering issue when typing.
-         [amount-button
-          {:theme               theme
-           :icon                :i/add
-           :accessibility-label :amount-input-inc-button
-           :on-press            on-inc-press
-           :disabled?           (>= @value max-value)}]]))))
+  [{:keys [on-inc-press on-dec-press theme status value min-value max-value
+           container-style]
+    :or   {value     0
+           min-value 0
+           max-value 999999999}}]
+  [rn/view
+   {:style (merge style/container container-style)}
+   [amount-button
+    {:theme               theme
+     :accessibility-label :amount-input-dec-button
+     :icon                :i/remove
+     :on-press            on-dec-press
+     :disabled?           (>= min-value value)}]
+   [rn/view {:style style/input-container}
+    [text/text
+     {:number-of-lines     1
+      :accessibility-label :amount-input
+      :weight              :semi-bold
+      :size                :heading-1
+      :align-self          :center
+      :style               (style/input-text theme (or status :default))}
+     value]]
+   [amount-button
+    {:theme               theme
+     :icon                :i/add
+     :accessibility-label :amount-input-inc-button
+     :on-press            on-inc-press
+     :disabled?           (>= value max-value)}]])
 
 (def view
   (quo.theme/with-theme

src/quo/core.cljs

@@ -48,6 +48,7 @@
     quo.components.drawers.action-drawers.view
     quo.components.drawers.bottom-actions.view
     quo.components.drawers.documentation-drawers.view
+    quo.components.drawers.drawer-action.view
     quo.components.drawers.drawer-buttons.view
     quo.components.drawers.drawer-top.view
     quo.components.drawers.permission-context.view
@@ -112,6 +113,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
@@ -127,6 +129,7 @@
     quo.components.settings.accounts.view
     quo.components.settings.category.view
     quo.components.settings.data-item.view
+    quo.components.settings.page-setting.view
     quo.components.settings.privacy-option.view
     quo.components.settings.reorder-item.view
     quo.components.settings.section-label.view
@@ -248,6 +251,7 @@
 
 ;;;; Drawers
 (def action-drawer quo.components.drawers.action-drawers.view/action-drawer)
+(def drawer-action quo.components.drawers.drawer-action.view/view)
 (def documentation-drawers quo.components.drawers.documentation-drawers.view/view)
 (def drawer-buttons quo.components.drawers.drawer-buttons.view/view)
 (def drawer-top quo.components.drawers.drawer-top.view/view)
@@ -354,6 +358,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)
@@ -375,6 +380,7 @@
 (def account quo.components.settings.accounts.view/account)
 (def category quo.components.settings.category.view/category)
 (def data-item quo.components.settings.data-item.view/view)
+(def page-setting quo.components.settings.page-setting.view/page-setting)
 (def privacy-option quo.components.settings.privacy-option.view/view)
 (def reorder-item quo.components.settings.reorder-item.view/reorder-item)
 (def section-label quo.components.settings.section-label.view/view)

src/quo/core_spec.cljs

@@ -25,6 +25,7 @@
     quo.components.drawers.action-drawers.component-spec
     quo.components.drawers.bottom-actions.component-spec
     quo.components.drawers.documentation-drawers.component-spec
+    quo.components.drawers.drawer-action.component-spec
     quo.components.drawers.drawer-buttons.component-spec
     quo.components.drawers.drawer-top.component-spec
     quo.components.drawers.permission-context.component-spec
@@ -64,6 +65,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

@@ -3,7 +3,7 @@
     ["react" :as react]
     ["react-native" :as react-native]
     [oops.core :as oops]
-    [promesa.core :as p]
+    [promesa.core :as promesa]
     [react-native.flat-list :as flat-list]
     [react-native.platform :as platform]
     [react-native.section-list :as section-list]
@@ -37,11 +37,11 @@
 
 (defn image-get-size
   [uri]
-  (p/create (fn [res rej]
-              (.getSize ^js (.-Image ^js react-native)
-                        uri
-                        (fn [width height] (res [width height]))
-                        rej))))
+  (promesa/create (fn [res rej]
+                    (.getSize ^js (.-Image ^js react-native)
+                              uri
+                              (fn [width height] (res [width height]))
+                              rej))))
 (def text (reagent/adapt-react-class (.-Text ^js react-native)))
 (def text-input (reagent/adapt-react-class (.-TextInput ^js react-native)))
 

src/react_native/keychain.cljs

@@ -62,23 +62,26 @@
   ([server username password]
    (save-credentials server username password identity))
   ([server username password callback]
-   (-> (.setInternetCredentials ^js react-native-keychain
-                                (string/lower-case server)
-                                username
-                                password
-                                keychain-secure-hardware
-                                keychain-restricted-availability)
-       (.then callback))))
+   (when-not (empty? server)
+     (-> (.setInternetCredentials ^js react-native-keychain
+                                  (string/lower-case server)
+                                  username
+                                  password
+                                  keychain-secure-hardware
+                                  keychain-restricted-availability)
+         (.then callback)))))
 
 (defn get-credentials
   "Gets the credentials for a specified server from the Keychain"
   ([server]
    (get-credentials server identity))
   ([server callback]
-   (-> (.getInternetCredentials ^js react-native-keychain (string/lower-case server))
-       (.then callback))))
+   (when-not (empty? server)
+     (-> (.getInternetCredentials ^js react-native-keychain (string/lower-case server))
+         (.then callback)))))
 
 (defn reset-credentials
   [server]
-  (-> (.resetInternetCredentials ^js react-native-keychain (string/lower-case server))
-      (.then #(when-not % (log/error (str "Error while clearing saved password."))))))
+  (when-not (empty? server)
+    (-> (.resetInternetCredentials ^js react-native-keychain (string/lower-case server))
+        (.then #(when-not % (log/error (str "Error while clearing saved password.")))))))

src/status_im/common/alert_banner/events.cljs

@@ -7,7 +7,7 @@
         db                    (assoc-in db [:alert-banners (:type banner)] banner)]
     (cond-> {:db db}
       (zero? current-banners-count)
-      (assoc :show-alert-banner (:view-id db)))))
+      (assoc :show-alert-banner nil))))
 
 (defn remove-alert-banner
   [{:keys [db]} [banner-type]]
@@ -15,12 +15,12 @@
         new-count (count (get db :alert-banners))]
     (cond-> {:db db}
       (zero? new-count)
-      (assoc :hide-alert-banner (:view-id db)))))
+      (assoc :hide-alert-banner nil))))
 
 (defn remove-all-alert-banners
   [{:keys [db]}]
   {:db                (dissoc db :alert-banners)
-   :hide-alert-banner (:view-id db)})
+   :hide-alert-banner nil})
 
 (re-frame/reg-event-fx :alert-banners/add add-alert-banner)
 (re-frame/reg-event-fx :alert-banners/remove remove-alert-banner)

src/status_im/common/floating_button_page/view.cljs

@@ -29,7 +29,7 @@
       (reset! ratom height))))
 
 (defn- init-keyboard-listeners
-  [{:keys [on-did-show]}]
+  [{:keys [on-did-show scroll-view-ref]}]
   (let [keyboard-will-show? (reagent/atom false)
         keyboard-did-show?  (reagent/atom false)
         add-listener        (fn [listener callback]
@@ -41,7 +41,10 @@
                                             (reset! keyboard-did-show? true)
                                             (when on-did-show (on-did-show e))))
         will-hide-listener  (add-listener "keyboardWillHide"
-                                          #(reset! keyboard-will-show? false))
+                                          (fn []
+                                            (reset! keyboard-will-show? false)
+                                            (reagent/flush)
+                                            (.scrollTo @scroll-view-ref #js {:x 0 :y 0 :animated true})))
         did-hide-listener   (add-listener "keyboardDidHide"
                                           #(reset! keyboard-did-show? false))
         remove-listeners    (fn []
@@ -55,9 +58,11 @@
 (defn view
   [{:keys [header footer customization-color footer-container-padding header-container-style
            gradient-cover?]
-    :or   {footer-container-padding (safe-area/get-top)}} &
-   children]
-  (reagent/with-let [window-height                (:height (rn/get-window))
+    :or   {footer-container-padding (safe-area/get-top)}}
+   & children]
+  (reagent/with-let [scroll-view-ref              (atom nil)
+                     set-scroll-ref               #(reset! scroll-view-ref %)
+                     window-height                (:height (rn/get-window))
                      footer-container-height      (reagent/atom 0)
                      header-height                (reagent/atom 0)
                      content-container-height     (reagent/atom 0)
@@ -66,7 +71,8 @@
                      {:keys [keyboard-will-show?
                              keyboard-did-show?
                              remove-listeners]}   (init-keyboard-listeners
-                                                   {:on-did-show
+                                                   {:scroll-view-ref scroll-view-ref
+                                                    :on-did-show
                                                     (fn [e]
                                                       (reset! keyboard-height
                                                         (oops/oget e "endCoordinates.height")))})
@@ -85,16 +91,22 @@
                                              :header-height            @header-height
                                              :keyboard-shown?          keyboard-shown?})]
       [:<>
-       (when gradient-cover? [quo/gradient-cover {:customization-color customization-color}])
+       (when gradient-cover?
+         [quo/gradient-cover {:customization-color customization-color}])
        [rn/view {:style style/page-container}
         [rn/view
          {:on-layout set-header-height
           :style     header-container-style}
          header]
         [gesture/scroll-view
-         {:on-scroll               set-content-y-scroll
-          :scroll-event-throttle   64
-          :content-container-style {:flex-grow 1}}
+         {:ref                             set-scroll-ref
+          :on-scroll                       set-content-y-scroll
+          :scroll-event-throttle           64
+          :content-container-style         {:flex-grow      1
+                                            :padding-bottom (when @keyboard-did-show?
+                                                              @footer-container-height)}
+          :always-bounce-vertical          @keyboard-did-show?
+          :shows-vertical-scroll-indicator false}
          (into [rn/view {:on-layout set-content-container-height}]
                children)]
         [rn/keyboard-avoiding-view

src/status_im/common/home/banner/style.cljs

@@ -1,6 +1,5 @@
 (ns status-im.common.home.banner.style
   (:require
-    [quo.foundations.colors :as colors]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [react-native.safe-area :as safe-area]))
@@ -24,29 +23,27 @@
   (reanimated/interpolate scroll-shared-value [0 max-scroll] [0 (+ max-scroll)] :clamp))
 
 (defn banner-card-blur-layer
-  [scroll-shared-value theme]
+  [scroll-shared-value]
   (reanimated/apply-animations-to-style
    {:transform [{:translate-y (animated-card-translation-y scroll-shared-value)}]}
-   {:overflow         (if platform/ios? :visible :hidden)
-    :z-index          1
-    :position         :absolute
-    :top              0
-    :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
-    :right            0
-    :left             0
-    :height           (+ (safe-area/get-top) 244)}))
+   {:overflow (if platform/ios? :visible :hidden)
+    :z-index  1
+    :position :absolute
+    :top      0
+    :right    0
+    :left     0
+    :height   (+ (safe-area/get-top) 244)}))
 
 (defn banner-card-hiding-layer
-  [scroll-shared-value theme]
+  [scroll-shared-value]
   (reanimated/apply-animations-to-style
    {:transform [{:translate-y (animated-card-translation-y-reverse scroll-shared-value)}]}
-   {:z-index          2
-    :position         :absolute
-    :top              0
-    :right            0
-    :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
-    :left             0
-    :padding-top      (+ (safe-area/get-top) 8)}))
+   {:z-index     2
+    :position    :absolute
+    :top         0
+    :right       0
+    :left        0
+    :padding-top (safe-area/get-top)}))
 
 (defn animated-banner-card
   [scroll-shared-value]
@@ -56,17 +53,16 @@
    {}))
 
 (defn banner-card-tabs-layer
-  [scroll-shared-value theme]
+  [scroll-shared-value]
   (reanimated/apply-animations-to-style
    {:transform [{:translate-y (animated-card-translation-y scroll-shared-value)}]}
-   {:z-index          3
-    :position         :absolute
-    :top              (+ (safe-area/get-top) 192)
-    :right            0
-    :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
-    :left             0}))
+   {:z-index  3
+    :position :absolute
+    :top      (+ (safe-area/get-top) 192)
+    :right    0
+    :left     0}))
 
 (def banner-card-tabs
   {:padding-horizontal 20
-   :padding-top        12
-   :padding-bottom     16})
+   :padding-top        8
+   :padding-bottom     12})

src/status_im/common/home/banner/view.cljs

@@ -3,7 +3,7 @@
     [oops.core :as oops]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
-    [quo.theme]
+    [quo.theme :as theme]
     [react-native.blur :as blur]
     [react-native.core :as rn]
     [react-native.platform :as platform]
@@ -31,22 +31,21 @@
 
 (defn- banner-card-blur-layer
   [scroll-shared-value child]
-  (let [open-sheet? (-> (rf/sub [:bottom-sheet]) :sheets seq)
-        theme       (quo.theme/use-theme-value)]
-    [reanimated/view {:style (style/banner-card-blur-layer scroll-shared-value theme)}
+  (let [open-sheet? (-> (rf/sub [:bottom-sheet]) :sheets seq)]
+    [reanimated/view {:style (style/banner-card-blur-layer scroll-shared-value)}
      [blur/view
       {:style         style/fill-space
        :blur-amount   (if platform/ios? 20 10)
-       :blur-type     (quo.theme/theme-value (if platform/ios? :light :xlight) :dark)
+       :blur-type     (theme/theme-value (if platform/ios? :light :xlight) :dark)
        :overlay-color (if open-sheet?
                         (colors/theme-colors colors/white colors/neutral-95-opa-70)
-                        (quo.theme/theme-value nil colors/neutral-95-opa-70))}
+                        (theme/theme-value nil colors/neutral-95-opa-70))}
       child]]))
 
 (defn- banner-card-hiding-layer
-  [{:keys [title-props card-props scroll-shared-value theme]}]
+  [{:keys [title-props card-props scroll-shared-value]}]
   (let [customization-color (rf/sub [:profile/customization-color])]
-    [reanimated/view {:style (style/banner-card-hiding-layer scroll-shared-value theme)}
+    [reanimated/view {:style (style/banner-card-hiding-layer scroll-shared-value)}
      [top-nav/view]
      [title-column/view (assoc title-props :customization-color customization-color)]
      [rn/view {:style {:overflow @card-banner-overflow}}
@@ -54,8 +53,8 @@
        [quo/discover-card card-props]]]]))
 
 (defn- banner-card-tabs-layer
-  [{:keys [selected-tab tabs on-tab-change scroll-ref scroll-shared-value customization-color theme]}]
-  [reanimated/view {:style (style/banner-card-tabs-layer scroll-shared-value theme)}
+  [{:keys [selected-tab tabs on-tab-change scroll-ref scroll-shared-value customization-color]}]
+  [reanimated/view {:style (style/banner-card-tabs-layer scroll-shared-value)}
    ^{:key (str "tabs-" selected-tab)}
    [quo/tabs
     {:style               style/banner-card-tabs
@@ -72,19 +71,16 @@
 
 (defn animated-banner
   [{:keys [scroll-ref tabs selected-tab on-tab-change scroll-shared-value content customization-color]}]
-  (let [theme (quo.theme/use-theme-value)]
-    [:<>
-     [:f> banner-card-blur-layer scroll-shared-value
-      [:f> banner-card-hiding-layer
-       (assoc content :scroll-shared-value scroll-shared-value :theme theme)]]
-     [:f> banner-card-tabs-layer
-      {:scroll-shared-value scroll-shared-value
-       :selected-tab        selected-tab
-       :tabs                tabs
-       :on-tab-change       on-tab-change
-       :scroll-ref          scroll-ref
-       :customization-color customization-color
-       :theme               theme}]]))
+  [:<>
+   [:f> banner-card-blur-layer scroll-shared-value
+    [:f> banner-card-hiding-layer (assoc content :scroll-shared-value scroll-shared-value)]]
+   [:f> banner-card-tabs-layer
+    {:scroll-shared-value scroll-shared-value
+     :selected-tab        selected-tab
+     :tabs                tabs
+     :on-tab-change       on-tab-change
+     :scroll-ref          scroll-ref
+     :customization-color customization-color}]])
 
 (defn set-scroll-shared-value
   [{:keys [shared-value scroll-input]}]

src/status_im/common/log.cljs

@@ -1,6 +1,6 @@
 (ns status-im.common.log
   (:require
-    [clojure.pprint :as p]
+    [clojure.pprint :as promesa]
     [clojure.string :as string]
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
@@ -43,7 +43,8 @@
           :middleware [(fn [data]
                          (update data
                                  :vargs
-                                 (partial mapv #(if (string? %) % (with-out-str (p/pprint %))))))]})
+                                 (partial mapv
+                                          #(if (string? %) % (with-out-str (promesa/pprint %))))))]})
         (native-module/init-status-go-logging logging-params)))))
 
 (re-frame/reg-fx

src/status_im/common/pairing/events.cljs

@@ -32,10 +32,10 @@
         multiaccount-data               (when received-account?
                                           (merge account {:password password}))
         navigate-to-syncing-devices?    (and (or connection-success? connection-error?) receiver?)
-        user-in-syncing-devices-screen? (or (= (:view-id db) :syncing-progress)
-                                            (= (:view-id db) :profiles)
-                                            (= (:view-id db) :syncing-progress-intro))
-        user-in-sign-in-intro-screen?   (= (:view-id db) :sign-in-intro)]
+        user-in-syncing-devices-screen? (or (= (:view-id db) :screen/onboarding.syncing-progress)
+                                            (= (:view-id db) :screen/profile.profiles)
+                                            (= (:view-id db) :screen/onboarding.syncing-progress-intro))
+        user-in-sign-in-intro-screen?   (= (:view-id db) :screen/onboarding.sign-in-intro)]
     (merge {:db (cond-> db
                   connection-success?
                   (assoc-in [:syncing :pairing-status] :connected)
@@ -51,8 +51,9 @@
            (cond
              (and navigate-to-syncing-devices? (not user-in-syncing-devices-screen?))
              {:dispatch (if user-in-sign-in-intro-screen?
-                          [:navigate-to-within-stack [:syncing-progress-intro :sign-in-intro]]
-                          [:navigate-to :syncing-progress])}
+                          [:navigate-to-within-stack
+                           [:screen/onboarding.syncing-progress-intro :screen/onboarding.sign-in-intro]]
+                          [:navigate-to :screen/onboarding.syncing-progress])}
 
              (and completed-pairing? sender?)
              {:dispatch [:syncing/clear-states]}

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/toasts/events.cljs

@@ -19,7 +19,7 @@
                      (update :toasts dissoc :hide-toasts-timer-set))}
 
       (and (not update?) (= (count ordered) 1))
-      (assoc :show-toasts (:view-id db))
+      (assoc :show-toasts [])
 
       (not (:id opts))
       (update-in [:db :toasts :next-toast-number] inc))))
@@ -28,9 +28,8 @@
   {:events [:toasts/hide-with-check]}
   [{:keys [db]}]
   (when (get-in db [:toasts :hide-toasts-timer-set])
-    {:db                         (update db :toasts dissoc :hide-toasts-timer-set)
-     :hide-toasts                nil
-     :reload-status-nav-color-fx (:view-id db)}))
+    {:db          (update db :toasts dissoc :hide-toasts-timer-set)
+     :hide-toasts nil}))
 
 (rf/defn close
   {:events [:toasts/close]}

src/status_im/common/universal_links.cljs

@@ -75,7 +75,7 @@
     (and public-key (own-public-key? db public-key))
     (rf/merge cofx
               {:pop-to-root-fx :shell-stack}
-              (navigation/navigate-to :my-profile nil))
+              (navigation/navigate-to :settings nil))
 
     public-key
     {:dispatch [:chat.ui/show-profile public-key ens-name]}))

src/status_im/config.cljs

@@ -169,3 +169,4 @@
 
 (def community-accounts-selection-enabled? true)
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
+(def test-networks-enabled? (enabled? (get-config :TEST_NETWORKS_ENABLED "0")))

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

@@ -5,17 +5,15 @@
 (def ^:private message-padding-scaling-ratio 4.5)
 
 (defn message-container
-  ([]
-   (message-container false nil nil false))
-  ([in-pinned-view? pinned-by mentioned last-in-group?]
-   (cond-> {:border-radius     16
-            :margin-horizontal 8}
+  [{:keys [in-pinned-view? pinned-by mentioned last-in-group? system-message?]}]
+  (cond-> {:border-radius     16
+           :margin-horizontal 8}
 
-     (and (not in-pinned-view?) (or mentioned pinned-by))
-     (assoc :background-color colors/primary-50-opa-5 :margin-bottom 4)
+    (and (not in-pinned-view?) (or mentioned pinned-by))
+    (assoc :background-color colors/primary-50-opa-5 :margin-bottom 4)
 
-     (and (not in-pinned-view?) (or mentioned pinned-by last-in-group?))
-     (assoc :margin-top 4))))
+    (and (not in-pinned-view?) (not system-message?) (or mentioned pinned-by last-in-group?))
+    (assoc :margin-top 4)))
 
 (defn user-message-content
   [{:keys [outgoing outgoing-status six-reactions? window-scale small-screen?]}]

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

@@ -292,7 +292,7 @@
             :show-user-info?              false
             :show-reactions?              true}]]))}]))
 
-(defn system-message?
+(defn check-if-system-message?
   [content-type]
   (#{constants/content-type-system-text
      constants/content-type-community
@@ -305,28 +305,35 @@
 (defn message
   [{:keys [pinned-by mentioned content-type last-in-group? deleted? deleted-for-me?]
     :as   message-data} {:keys [in-pinned-view?] :as context} keyboard-shown?]
-  [rn/view
-   {:style               (style/message-container in-pinned-view? pinned-by mentioned last-in-group?)
-    :accessibility-label :chat-item}
-   (cond
-     (system-message? content-type)
-     [system-message-content message-data]
+  (let [system-message? (check-if-system-message? content-type)]
+    [rn/view
+     {:style               (style/message-container
+                            {:in-pinned-view? in-pinned-view?
+                             :pinned-by       pinned-by
+                             :mentioned       mentioned
+                             :last-in-group?  last-in-group?
+                             :system-message? system-message?})
+      :accessibility-label :chat-item}
+     (cond
+       system-message?
+       [system-message-content message-data]
 
-     (or deleted? deleted-for-me?)
-     [content.deleted/deleted-message
-      (assoc message-data
-             :on-long-press
-             #(on-long-press message-data
-                             context
-                             keyboard-shown?))
-      context]
+       (or deleted? deleted-for-me?)
+       [content.deleted/deleted-message
+        (assoc message-data
+               :on-long-press
+               #(on-long-press message-data
+                               context
+                               keyboard-shown?))
+        context]
 
-     (= content-type constants/content-type-bridge-message)
-     [bridge-message-content message-data]
 
-     :else
-     [user-message-content
-      {:message-data    message-data
-       :context         context
-       :keyboard-shown? keyboard-shown?
-       :show-reactions? true}])])
+       (= content-type constants/content-type-bridge-message)
+       [bridge-message-content message-data]
+
+       :else
+       [user-message-content
+        {:message-data    message-data
+         :context         context
+         :keyboard-shown? keyboard-shown?
+         :show-reactions? true}])]))

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

@@ -8,9 +8,6 @@
   {:flex    1
    :z-index 2})
 
-(def list-container
-  {:padding-vertical 16})
-
 (defn background-container
   [background-color background-opacity top-margin]
   (reanimated/apply-animations-to-style
@@ -23,12 +20,12 @@
     :height           (+ top-margin messages.constants/header-container-radius)}))
 
 (defn header-bottom-part
-  [border-radius theme top-margin]
+  [bottom theme top-margin]
   (reanimated/apply-animations-to-style
-   {:border-top-left-radius  border-radius
-    :border-top-right-radius border-radius}
+   {:bottom bottom}
    {:background-color   (colors/theme-colors colors/white colors/neutral-95 theme)
     :padding-horizontal 20
+    :border-radius      20
     :margin-top         top-margin}))
 
 (defn header-image
@@ -42,5 +39,20 @@
     :border-radius 50
     :border-color  (colors/theme-colors colors/white colors/neutral-95 theme)}))
 
-(def bio
-  {:margin-top 8})
+(defn user-name-container
+  [top left]
+  (reanimated/apply-animations-to-style
+   {:top  top
+    :left left}
+   {:z-index -1}))
+
+(def user-name
+  {:align-items    :center
+   :flex-direction :row
+   :margin-top     52})
+
+(defn bio-and-actions
+  [top]
+  (reanimated/apply-animations-to-style
+   {:top top}
+   {:row-gap 16}))

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

@@ -23,6 +23,7 @@
     [utils.re-frame :as rf]
     [utils.worklets.chat.messenger.messages :as worklets]))
 
+(defonce ^:const distance-from-last-message 4)
 (defonce ^:const loading-indicator-extra-spacing 250)
 (defonce ^:const loading-indicator-page-loading-height 100)
 (defonce ^:const min-message-height 32)
@@ -63,8 +64,7 @@
   [{:keys [ens-verified added?]} theme]
   (when (or ens-verified added?)
     [rn/view
-     {:style {:margin-left 4
-              :margin-top  8}}
+     {:style {:margin-left 4}}
      (if ens-verified
        [quo/icon :i/verified
         {:no-color true
@@ -111,27 +111,55 @@
                  (- 70 (:bottom insets)))]
     [rn/view {:style {:height height}}]))
 
-(defn f-list-footer-avatar
-  [{:keys [distance-from-list-top display-name online? profile-picture theme]}]
+(defn list-footer-avatar
+  [{:keys [distance-from-list-top display-name online? profile-picture theme group-chat color]}]
   (let [scale (reanimated/interpolate distance-from-list-top
                                       [0 messages.constants/header-container-top-margin]
                                       [1 0.4]
                                       messages.constants/default-extrapolation-option)
         top   (reanimated/interpolate distance-from-list-top
                                       [0 messages.constants/header-container-top-margin]
-                                      [-40 -8]
+                                      [-44 -12]
                                       messages.constants/default-extrapolation-option)
         left  (reanimated/interpolate distance-from-list-top
                                       [0 messages.constants/header-container-top-margin]
-                                      [20 -4]
+                                      [16 -8]
                                       messages.constants/default-extrapolation-option)]
     [reanimated/view
      {:style (style/header-image scale top left theme)}
-     [quo/user-avatar
-      {:full-name       display-name
-       :online?         online?
-       :profile-picture profile-picture
-       :size            :big}]]))
+     (if group-chat
+       [quo/group-avatar
+        {:customization-color color
+         :size                :size-80
+         :picture             profile-picture
+         :override-theme      :dark}]
+       [quo/user-avatar
+        {:full-name       display-name
+         :online?         online?
+         :profile-picture profile-picture
+         :size            :big}])]))
+
+(defn chat-display-name
+  [{:keys [distance-from-list-top display-name contact theme]}]
+  (let [top  (reanimated/interpolate distance-from-list-top
+                                     [0 messages.constants/header-container-top-margin]
+                                     [0 -35]
+                                     messages.constants/default-extrapolation-option)
+        left (reanimated/interpolate distance-from-list-top
+                                     [0 messages.constants/header-container-top-margin]
+                                     [0 40]
+                                     messages.constants/default-extrapolation-option)]
+    [reanimated/view
+     {:style (style/user-name-container top left)}
+     [rn/view
+      {:style style/user-name}
+      [quo/text
+       {:weight          :semi-bold
+        :size            :heading-1
+        :style           {:flex-shrink 1}
+        :number-of-lines 1}
+       display-name]
+      [contact-icon contact theme]]]))
 
 (defn actions
   [chat-id cover-bg-color]
@@ -142,89 +170,102 @@
         muted?                               (and muted (some? muted-till))
         mute-chat-label                      (if community-channel? :t/mute-channel :t/mute-chat)
         unmute-chat-label                    (if community-channel? :t/unmute-channel :t/unmute-chat)]
-    [quo/channel-actions
-     {:container-style {:margin-top 16}
-      :actions         [{:accessibility-label :action-button-pinned
-                         :big?                true
-                         :label               (or latest-pin-text (i18n/label :t/no-pinned-messages))
-                         :customization-color cover-bg-color
-                         :icon                :i/pin
-                         :counter-value       pins-count
-                         :on-press            (fn []
-                                                (rf/dispatch [:pin-message/show-pins-bottom-sheet
-                                                              chat-id]))}
-                        {:accessibility-label :action-button-mute
-                         :label               (i18n/label (if muted
-                                                            unmute-chat-label
-                                                            mute-chat-label))
-                         :customization-color cover-bg-color
-                         :icon                (if muted? :i/activity-center :i/muted)
-                         :on-press            (fn []
-                                                (if muted?
-                                                  (home.actions/unmute-chat-action chat-id)
-                                                  (home.actions/mute-chat-action chat-id
-                                                                                 chat-type
-                                                                                 muted?)))}]}]))
 
-(defn f-list-footer
+    [quo/channel-actions
+     {:actions [{:accessibility-label :action-button-pinned
+                 :big?                true
+                 :label               (or latest-pin-text (i18n/label :t/no-pinned-messages))
+                 :customization-color cover-bg-color
+                 :icon                :i/pin
+                 :counter-value       pins-count
+                 :on-press            (fn []
+                                        (rf/dispatch [:pin-message/show-pins-bottom-sheet
+                                                      chat-id]))}
+                {:accessibility-label :action-button-mute
+                 :label               (i18n/label (if muted
+                                                    unmute-chat-label
+                                                    mute-chat-label))
+                 :customization-color cover-bg-color
+                 :icon                (if muted? :i/activity-center :i/muted)
+                 :on-press            (fn []
+                                        (if muted?
+                                          (home.actions/unmute-chat-action chat-id)
+                                          (home.actions/mute-chat-action chat-id
+                                                                         chat-type
+                                                                         muted?)))}]}]))
+
+(defn bio-and-actions
+  [{:keys [distance-from-list-top bio chat-id customization-color]}]
+  (let [has-bio (seq bio)
+        top     (reanimated/interpolate
+                 distance-from-list-top
+                 [0 messages.constants/header-container-top-margin]
+                 [(if has-bio 8 16) (if has-bio -28 -20)]
+                 messages.constants/default-extrapolation-option)]
+    [reanimated/view
+     {:style (style/bio-and-actions top)}
+     (when has-bio
+       [quo/text bio])
+     [actions chat-id customization-color]]))
+
+(defn footer-component
   [{:keys [chat distance-from-list-top theme customization-color]}]
   (let [{:keys [chat-id chat-name emoji chat-type
-                group-chat]} chat
-        display-name         (cond
-                               (= chat-type constants/one-to-one-chat-type)
-                               (first (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
-                               (= chat-type constants/community-chat-type)
-                               (str (when emoji (str emoji " ")) "# " chat-name)
-                               :else (str emoji chat-name))
-        {:keys [bio]}        (rf/sub [:contacts/contact-by-identity chat-id])
-        online?              (rf/sub [:visibility-status-updates/online? chat-id])
-        contact              (when-not group-chat
-                               (rf/sub [:contacts/contact-by-address chat-id]))
-        photo-path           (rf/sub [:chats/photo-path chat-id])
-        top-margin           (+ (safe-area/get-top)
-                                messages.constants/top-bar-height
-                                messages.constants/header-container-top-margin)
-        background-color     (colors/theme-colors
-                              (colors/resolve-color customization-color theme 20)
-                              (colors/resolve-color customization-color theme 40)
-                              theme)
-        border-radius        (reanimated/interpolate
-                              distance-from-list-top
-                              [0 messages.constants/header-container-top-margin]
-                              [20 0]
-                              messages.constants/default-extrapolation-option)
-        background-opacity   (reanimated/interpolate
-                              distance-from-list-top
-                              [messages.constants/header-container-top-margin
-                               (+ messages.constants/header-animation-distance
-                                  messages.constants/header-container-top-margin)]
-                              [1 0]
-                              messages.constants/default-extrapolation-option)]
+                group-chat color]} chat
+        display-name               (cond
+                                     (= chat-type constants/one-to-one-chat-type)
+                                     (first (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
+                                     (= chat-type constants/community-chat-type)
+                                     (str (when emoji (str emoji " ")) "# " chat-name)
+                                     :else (str emoji chat-name))
+        {:keys [bio]}              (rf/sub [:contacts/contact-by-identity chat-id])
+        online?                    (rf/sub [:visibility-status-updates/online? chat-id])
+        contact                    (when-not group-chat
+                                     (rf/sub [:contacts/contact-by-address chat-id]))
+        photo-path                 (rf/sub [:chats/photo-path chat-id])
+        top-margin                 (+ (safe-area/get-top)
+                                      messages.constants/top-bar-height
+                                      messages.constants/header-container-top-margin
+                                      32)
+        background-color           (colors/theme-colors
+                                    (colors/resolve-color customization-color theme 20)
+                                    (colors/resolve-color customization-color theme 40)
+                                    theme)
+        bottom                     (reanimated/interpolate
+                                    distance-from-list-top
+                                    [0 messages.constants/header-container-top-margin]
+                                    [32 -4]
+                                    messages.constants/default-extrapolation-option)
+        background-opacity         (reanimated/interpolate
+                                    distance-from-list-top
+                                    [messages.constants/header-container-top-margin
+                                     (+ messages.constants/header-animation-distance
+                                        messages.constants/header-container-top-margin)]
+                                    [1 0]
+                                    messages.constants/default-extrapolation-option)]
     [:<>
      [reanimated/view
       {:style (style/background-container background-color background-opacity top-margin)}]
-     [reanimated/view {:style (style/header-bottom-part border-radius theme top-margin)}
-      (when-not group-chat
-        [:f> f-list-footer-avatar
-         {:distance-from-list-top distance-from-list-top
-          :display-name           display-name
-          :online?                online?
-          :theme                  theme
-          :profile-picture        photo-path}])
-      [rn/view
-       {:style {:flex-direction :row
-                :margin-top     (if group-chat 94 52)}}
-       [quo/text
-        {:weight          :semi-bold
-         :size            :heading-1
-         :style           {:flex-shrink 1}
-         :number-of-lines 1}
-        display-name]
-       [contact-icon contact theme]]
-      (when bio
-        [quo/text {:style style/bio}
-         bio])
-      [actions chat-id customization-color]]]))
+     [reanimated/view {:style (style/header-bottom-part bottom theme top-margin)}
+      [list-footer-avatar
+       {:distance-from-list-top distance-from-list-top
+        :display-name           display-name
+        :online?                online?
+        :theme                  theme
+        :profile-picture        photo-path
+        :group-chat             group-chat
+        :color                  color}]
+      [chat-display-name
+       {:distance-from-list-top distance-from-list-top
+        :display-name           display-name
+        :theme                  theme
+        :contact                contact
+        :group-chat             group-chat}]
+      [bio-and-actions
+       {:distance-from-list-top distance-from-list-top
+        :bio                    bio
+        :chat-id                chat-id
+        :customization-color    customization-color}]]]))
 
 (defn list-footer
   [props]
@@ -234,7 +275,7 @@
     [:<>
      (if (or loading-messages? (not all-loaded?))
        [loading-view chat-id props]
-       [:f> f-list-footer props])]))
+       [footer-component props])]))
 
 (defn list-group-chat-header
   [{:keys [chat-id invitation-admin]}]
@@ -284,7 +325,7 @@
       (reset! layout-height-atom layout-height))
     (reset! distance-atom new-distance)))
 
-(defn f-messages-list-content
+(defn messages-list-content
   [{:keys [insets distance-from-list-top content-height layout-height distance-atom
            chat-screen-layout-calculations-complete? chat-list-scroll-y]}]
   (let [theme                    (quo.theme/use-theme-value)
@@ -348,6 +389,7 @@
         :style                             {:background-color (colors/theme-colors colors/white
                                                                                    colors/neutral-95
                                                                                    theme)}
+        :content-container-style           {:padding-top distance-from-last-message}
         :inverted                          true
         :on-layout                         #(on-layout
                                              {:event %

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

@@ -18,37 +18,42 @@
     [utils.worklets.chat.messenger.messages :as messages.worklets]
     [utils.worklets.chat.messenger.navigation :as worklets]))
 
-(defn f-header-content-container
+(defn header-content-container
   [{:keys [chat distance-from-list-top all-loaded? chat-screen-layout-calculations-complete?]}]
   (let [{:keys [chat-id group-chat chat-type chat-name
-                emoji]} chat
-        display-name    (cond
-                          (= chat-type constants/one-to-one-chat-type)
-                          (first (rf/sub
-                                  [:contacts/contact-two-names-by-identity
-                                   chat-id]))
-                          (= chat-type constants/community-chat-type)
-                          (str (when emoji (str emoji " ")) "# " chat-name)
-                          :else (str emoji chat-name))
-        online?         (when-not group-chat (rf/sub [:visibility-status-updates/online? chat-id]))
-        photo-path      (when-not group-chat (rf/sub [:chats/photo-path chat-id]))
-        header-opacity  (worklets/navigation-header-opacity
-                         distance-from-list-top
-                         all-loaded?
-                         chat-screen-layout-calculations-complete?
-                         (if platform/ios?
-                           messages.constants/content-animation-start-position-ios
-                           messages.constants/content-animation-start-position-android))
-        header-position (worklets/navigation-header-position
-                         distance-from-list-top
-                         all-loaded?
-                         messages.constants/top-bar-height
-                         (if platform/ios?
-                           messages.constants/content-animation-start-position-ios
-                           messages.constants/content-animation-start-position-android))]
+                emoji color]} chat
+        display-name          (cond
+                                (= chat-type constants/one-to-one-chat-type)
+                                (first (rf/sub
+                                        [:contacts/contact-two-names-by-identity
+                                         chat-id]))
+                                (= chat-type constants/community-chat-type)
+                                (str (when emoji (str emoji " ")) "# " chat-name)
+                                :else (str emoji chat-name))
+        online?               (when-not group-chat (rf/sub [:visibility-status-updates/online? chat-id]))
+        photo-path            (when-not group-chat (rf/sub [:chats/photo-path chat-id]))
+        header-opacity        (worklets/navigation-header-opacity
+                               distance-from-list-top
+                               all-loaded?
+                               chat-screen-layout-calculations-complete?
+                               (if platform/ios?
+                                 messages.constants/content-animation-start-position-ios
+                                 messages.constants/content-animation-start-position-android))
+        header-position       (worklets/navigation-header-position
+                               distance-from-list-top
+                               all-loaded?
+                               messages.constants/top-bar-height
+                               (if platform/ios?
+                                 messages.constants/content-animation-start-position-ios
+                                 messages.constants/content-animation-start-position-android))]
     [reanimated/view
      {:style (style/header-content-container header-opacity header-position)}
-     (when-not group-chat
+     (if group-chat
+       [quo/group-avatar
+        {:customization-color color
+         :size                :size-32
+         :picture             photo-path
+         :override-theme      :dark}]
        [quo/user-avatar
         {:full-name       display-name
          :online?         online?
@@ -70,7 +75,7 @@
          (i18n/label
           (if online? :t/online :t/offline))])]]))
 
-(defn f-animated-background-and-pinned-banner
+(defn animated-background-and-pinned-banner
   [{:keys [chat-id navigation-view-height distance-from-list-top all-loaded?]}]
   (let [animation-distance messages.constants/header-animation-distance
         props              {:distance-from-list-top distance-from-list-top
@@ -122,7 +127,7 @@
                    [all-loaded-sub])
     [rn/view
      {:style (style/navigation-view navigation-view-height messages.constants/pinned-banner-height)}
-     [:f> f-animated-background-and-pinned-banner
+     [animated-background-and-pinned-banner
       {:chat-id                chat-id
        :navigation-view-height navigation-view-height
        :distance-from-list-top distance-from-list-top
@@ -137,7 +142,7 @@
          :accessibility-label :back-button
          :on-press            #(rf/dispatch [:navigate-back])}
         (if (= chat-type constants/community-chat-type) :i/arrow-left :i/close)]]
-      [:f> f-header-content-container
+      [header-content-container
        {:chat                                      chat
         :distance-from-list-top                    distance-from-list-top
         :all-loaded?                               all-loaded?

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

@@ -13,7 +13,7 @@
 ;; NOTE(parvesh) - I am working on refactoring/optimization of the chat screen for performance
 ;; improvement. Please avoid refactoring these files. Also if you are not already working on bug
 ;; fixes related to the composer, please skip them. And ping me, so I can address them while refactoring
-(defn- f-chat-screen
+(defn- chat-screen
   [chat-screen-layout-calculations-complete?]
   (let [insets                 (safe-area/get-insets)
         content-height         (atom 0)
@@ -27,7 +27,7 @@
      [messages.navigation/view
       {:distance-from-list-top                    distance-from-list-top
        :chat-screen-layout-calculations-complete? chat-screen-layout-calculations-complete?}]
-     [:f> list.view/f-messages-list-content
+     [list.view/messages-list-content
       {:insets                                    insets
        :layout-height                             layout-height
        :content-height                            content-height
@@ -46,15 +46,11 @@
     (when-not screen-loaded?
       (reanimated/set-shared-value chat-screen-layout-calculations-complete? false))
     (when screen-loaded?
-      [:f> f-chat-screen chat-screen-layout-calculations-complete?])))
+      [chat-screen chat-screen-layout-calculations-complete?])))
 
-(defn- f-chat
+(defn chat
   []
   (let [chat-screen-layout-calculations-complete? (reanimated/use-shared-value false)]
     [:<>
      [lazy-chat-screen chat-screen-layout-calculations-complete?]
-     [:f> placeholder.view/f-view chat-screen-layout-calculations-complete?]]))
-
-(defn chat
-  []
-  [:f> f-chat])
+     [placeholder.view/view chat-screen-layout-calculations-complete?]]))

src/status_im/contexts/chat/messenger/photo_selector/effects.cljs

@@ -1,7 +1,7 @@
 (ns status-im.contexts.chat.messenger.photo-selector.effects
   (:require
     [clojure.string :as string]
-    [promesa.core :as p]
+    [promesa.core :as promesa]
     [react-native.cameraroll :as cameraroll]
     [react-native.core :as rn]
     [react-native.image-resizer :as image-resizer]
@@ -31,19 +31,19 @@
 
 (defn- resize-photo
   [uri]
-  (p/let [[width height] (rn/image-get-size uri)
-          resize?        (> (max width height)
-                            maximum-image-size-px)
-          resized-uri    (-> (image-resizer/resize
-                              {:max-width  (if resize? maximum-image-size-px width)
-                               :max-height (if resize? maximum-image-size-px height)
-                               :path       uri
-                               :quality    60})
-                             (p/then (fn [^js resized-image]
-                                       (let [path (.-path resized-image)]
-                                         (if (string/starts-with? path "file")
-                                           path
-                                           (str "file://" path))))))]
+  (promesa/let [[width height] (rn/image-get-size uri)
+                resize?        (> (max width height)
+                                  maximum-image-size-px)
+                resized-uri    (-> (image-resizer/resize
+                                    {:max-width  (if resize? maximum-image-size-px width)
+                                     :max-height (if resize? maximum-image-size-px height)
+                                     :path       uri
+                                     :quality    60})
+                                   (promesa/then (fn [^js resized-image]
+                                                   (let [path (.-path resized-image)]
+                                                     (if (string/starts-with? path "file")
+                                                       path
+                                                       (str "file://" path))))))]
     {:resized-uri resized-uri
      :width       width
      :height      height}))
@@ -51,9 +51,9 @@
 (rf/reg-fx :effects.camera-roll/image-selected
  (fn [[image chat-id]]
    (-> (resize-photo (:uri image))
-       (p/then #(rf/dispatch
-                 [:photo-selector/image-selected chat-id image %]))
-       (p/catch #(log/error "could not resize image" %)))))
+       (promesa/then #(rf/dispatch
+                       [:photo-selector/image-selected chat-id image %]))
+       (promesa/catch #(log/error "could not resize image" %)))))
 
 (defn- get-albums
   [callback]

src/status_im/contexts/chat/messenger/placeholder/view.cljs

@@ -14,7 +14,7 @@
     :parent-height (:height (rn/get-window))
     :animated?     false}])
 
-(defn f-view
+(defn view
   [chat-screen-layout-calculations-complete?]
   (let [top     (safe-area/get-top)
         opacity (worklets/placeholder-opacity chat-screen-layout-calculations-complete?)

src/status_im/contexts/communities/actions/accounts_selection/effects.cljs

@@ -1,13 +1,13 @@
 (ns status-im.contexts.communities.actions.accounts-selection.effects
   (:require
-    [promesa.core :as p]
+    [promesa.core :as promesa]
     [schema.core :as schema]
     [status-im.common.json-rpc.events :as rpc]
     [utils.re-frame :as rf]))
 
 (defn- generate-requests-for-signing
   [pub-key community-id addresses-to-reveal]
-  (p/create
+  (promesa/create
    (fn [p-resolve p-reject]
      (rpc/call
       {:method     :wakuext_generateJoiningCommunityRequestsForSigning
@@ -17,7 +17,7 @@
 
 (defn- sign-data
   [sign-params password]
-  (p/create
+  (promesa/create
    (fn [p-resolve p-reject]
      (rpc/call
       {:method     :wakuext_signData
@@ -27,7 +27,7 @@
 
 (defn- edit-shared-addresses-for-community
   [community-id signatures addresses-to-reveal airdrop-address]
-  (p/create
+  (promesa/create
    (fn [p-resolve p-reject]
      (rpc/call
       {:method      :wakuext_editSharedAddressesForCommunity
@@ -41,7 +41,7 @@
 
 (defn- request-to-join
   [community-id signatures addresses-to-reveal airdrop-address]
-  (p/create
+  (promesa/create
    (fn [p-resolve p-reject]
      (rpc/call
       {:method      :wakuext_requestToJoinCommunity
@@ -66,14 +66,14 @@
            addresses-to-reveal airdrop-address
            on-success on-error
            callback]}]
-  (-> (p/let [sign-params (generate-requests-for-signing pub-key community-id addresses-to-reveal)
-              signatures  (sign-data sign-params password)
-              result      (callback community-id
-                                    signatures
-                                    addresses-to-reveal
-                                    airdrop-address)]
+  (-> (promesa/let [sign-params (generate-requests-for-signing pub-key community-id addresses-to-reveal)
+                    signatures  (sign-data sign-params password)
+                    result      (callback community-id
+                                          signatures
+                                          addresses-to-reveal
+                                          airdrop-address)]
         (run-callback-or-event on-success result))
-      (p/catch #(run-callback-or-event on-error %))))
+      (promesa/catch #(run-callback-or-event on-error %))))
 
 (schema/=> sign-and-call-endpoint
   [:=>

src/status_im/contexts/communities/actions/addresses_for_permissions/events.cljs

@@ -78,15 +78,14 @@
     ;; status-go will consider all possible addresses and the user will see the
     ;; incorrect highest permission role.
     {:db (update db :communities/permissions-checks-for-selection dissoc community-id)}
-    (let [{:keys [checking?]} (get-in db [:communities/permissions-checks-for-selection community-id])]
-        {:db (assoc-in db [:communities/permissions-checks-for-selection community-id :checking?] true)
-         :fx [[:json-rpc/call
-               [{:method     :wakuext_checkPermissionsToJoinCommunity
-                 :params     [{:communityId community-id :addresses addresses}]
-                 :on-success [:communities/check-permissions-to-join-during-selection-success
-                              community-id]
-                 :on-error   [:communities/check-permissions-to-join-during-selection-failure
-                              community-id addresses]}]]]})))
+    {:db (assoc-in db [:communities/permissions-checks-for-selection community-id :checking?] true)
+     :fx [[:json-rpc/call
+           [{:method     :wakuext_checkPermissionsToJoinCommunity
+             :params     [{:communityId community-id :addresses addresses}]
+             :on-success [:communities/check-permissions-to-join-during-selection-success
+                          community-id]
+             :on-error   [:communities/check-permissions-to-join-during-selection-failure
+                          community-id addresses]}]]]}))
 
 ;; This event should be used to check permissions temporarily because it won't
 ;; mutate the state `:communities/permissions-check` (used by many other