stage experiments with bun

speed up android debug builds (#19335 )
fixes #19081 ## Summary This PR aims to improve android build step for debug variants by ensuring we do not rebuild the android derivation for any change made to `clojurescript` code. We also do the following things : - enable `JVM` parallel garbage collector. - get rid of `dexOptions` which was deprecated in `gradle 8`. - add additional `parallel` flag to `gradle` to speed up builds. ## Review notes - `make run-clojure` - `make run-android` - ctrl + C on android terminal and edit any `cljs` file - `make run-android` ( should build almost instantly )
2024-03-26 14:38:37 +05:30 · 2024-03-23 15:12:05 +05:30 · 2024-03-22 22:45:22 +02:00 · 2024-03-22 21:00:35 +03:30 · 2024-03-22 19:51:44 +05:30 · 2024-03-22 14:10:51 +01:00
143 changed files with 11708 additions and 10156 deletions
@@ -259,7 +259,7 @@ status-go-library: ##@status-go Compile status-go for node-js

 run-clojure: export TARGET := clojure
 run-clojure: ##@run Watch for and build Clojure changes for mobile
-	yarn shadow-cljs watch mobile
+	bun shadow-cljs watch mobile

 run-metro: export TARGET := clojure
 run-metro: ##@run Start Metro to build React Native changes
@@ -267,7 +267,7 @@ run-metro: ##@run Start Metro to build React Native changes

 run-re-frisk: export TARGET := clojure
 run-re-frisk: ##@run Start re-frisk server
-	yarn shadow-cljs run re-frisk-remote.core/start
+	bun shadow-cljs run re-frisk-remote.core/start

 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
@@ -327,20 +327,20 @@ lint-fix: ##@test Run code style checks and fix issues

 shadow-server: export TARGET := clojure
 shadow-server:##@ Start shadow-cljs in server mode for watching
-	yarn shadow-cljs server
+	bun shadow-cljs server

 _test-clojure: export TARGET := clojure
 _test-clojure: export WATCH ?= false
 _test-clojure: status-go-library
 _test-clojure:
 ifeq ($(WATCH), true)
-	yarn node-pre-gyp rebuild && \
-	yarn shadow-cljs compile mocks && \
-	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
+	bun node-pre-gyp rebuild && \
+	bun shadow-cljs compile mocks && \
+	nodemon --exec "bun shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
 else
-	yarn node-pre-gyp rebuild && \
-	yarn shadow-cljs compile mocks && \
-	yarn shadow-cljs compile test && \
+	bun node-pre-gyp rebuild && \
+	bun shadow-cljs compile mocks && \
+	bun shadow-cljs compile test && \
 	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
 endif

@@ -353,11 +353,11 @@ test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
 test-watch-for-repl: status-go-library
 test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	yarn node-pre-gyp rebuild
+	bun node-pre-gyp rebuild
 	rm -f target/test/test.js
-	yarn shadow-cljs compile mocks && \
+	bun shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
-		'yarn shadow-cljs watch test --verbose' \
+		'bun shadow-cljs watch test --verbose' \
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"

 test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js
@@ -375,28 +375,28 @@ test-contract: export SHADOW_NS_REGEXP := ^tests\.contract-test.*$$
 test-contract: ##@test Run contract tests
 test-contract: _test-clojure

-test-android: jsbundle
-test-android: export TARGET := android
-test-android: ##@test Android Gradle test
+android-test: jsbundle
+android-test: export TARGET := android
+android-test:
 	cd android && ./gradlew test

-test-component-watch: export TARGET := clojure
-test-component-watch: export COMPONENT_TEST := true
-test-component-watch: export BABEL_ENV := test
-test-component-watch: export JEST_USE_SILENT_REPORTER := false
-test-component-watch: ##@ Watch tests and re-run no changes to cljs files
+component-test-watch: export TARGET := clojure
+component-test-watch: export COMPONENT_TEST := true
+component-test-watch: export BABEL_ENV := test
+component-test-watch: export JEST_USE_SILENT_REPORTER := false
+component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
-	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
+	nodemon --exec 'bun shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs

-test-component: export TARGET := clojure
-test-component: export COMPONENT_TEST := true
-test-component: export BABEL_ENV := test
-test-component: export JEST_USE_SILENT_REPORTER := false
-test-component: ##@test Run component tests once in NodeJS
+component-test: export TARGET := clojure
+component-test: export COMPONENT_TEST := true
+component-test: export BABEL_ENV := test
+component-test: export JEST_USE_SILENT_REPORTER := false
+component-test: ##@test Run component tests once in NodeJS
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
-	yarn shadow-cljs compile component-test && \
+	bun shadow-cljs compile component-test && \
 	jest --clearCache && jest --config=test/jest/jest.config.js --testEnvironment node

 #--------------
@@ -447,7 +447,7 @@ _list:

 repl-clojure: export TARGET := clojure
 repl-clojure: ##@repl Start Clojure repl for mobile App
-	yarn shadow-cljs cljs-repl mobile
+	bun shadow-cljs cljs-repl mobile

 repl-nix: nix-repl ##@repl Start an interactive Nix REPL

@@ -1 +1 @@
-2.28.0
+2.27.0
@@ -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")
 }


@@ -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>
@@ -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"
@@ -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)
@@ -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()
@@ -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 == "") {
@@ -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
@@ -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',
-            },
-          },
-        ],
-      ],
-    },
-  },
 };
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -34,10 +34,10 @@ pipeline {
  }

  environment {
-    LANG     = 'en_US.UTF-8'
-    LC_ALL   = 'en_US.UTF-8'
-    LANGUAGE = 'en_US.UTF-8'
-    PLATFORM = "android${utils.isE2EBuild() ? "-e2e" : ""}"
+    LANG     = "en_US.UTF-8"
+    LC_ALL   = "en_US.UTF-8"
+    LANGUAGE = "en_US.UTF-8"
+    TARGET   = "android${utils.isE2EBuild() ? "-e2e" : ""}"
    BUILD_ENV = 'prod'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    FASTLANE_DISABLE_COLORS = 1
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 pipeline {
  agent { label 'linux' }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 pipeline {
  agent { label 'linux' }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -34,10 +34,10 @@ pipeline {
  }

  environment {
-    LANG     = 'en_US.UTF-8'
-    LC_ALL   = 'en_US.UTF-8'
-    LANGUAGE = 'en_US.UTF-8'
-    PLATFORM = 'ios'
+    LANG     = "en_US.UTF-8"
+    LC_ALL   = "en_US.UTF-8"
+    LANGUAGE = "en_US.UTF-8"
+    TARGET   = 'ios'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    FASTLANE_DISABLE_COLORS = 1
    BUNDLE_PATH = "${HOME}/.bundle"
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -29,47 +29,61 @@ pipeline {
      description: 'Specify build type. Values: pr / e2e / nightly / release',
      defaultValue: 'pr',
    )
-    booleanParam(
-      name: 'RUN_CONTRACT_TESTS',
-      description: 'Whether to run optional and slow contract tests.',
-      defaultValue: false,
-    )
  }

  environment {
-    LANG     = 'en_US.UTF-8'
-    LC_ALL   = 'en_US.UTF-8'
-    LANGUAGE = 'en_US.UTF-8'
-    PLATFORM = 'tests'
+    LANG     = "en_US.UTF-8"
+    LC_ALL   = "en_US.UTF-8"
+    LANGUAGE = "en_US.UTF-8"
+    TARGET   = 'tests'
    BUILD_ENV = 'prod'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    LOG_FILE = utils.pkgFilename(ext: 'log', arch: 'tests')
-    CLJ_LINTER_PRINT_WARNINGS = 'true'
  }

  stages {
-    stage('Test') {
+    stage('Checks') {
      parallel {
        stage('Lint') {
-          steps { make('lint') }
+          steps {
+            sh """#!/bin/bash
+              set -eo pipefail
+              make lint CLJ_LINTER_PRINT_WARNINGS=true 2>&1 | tee ${LOG_FILE}
+            """
+          }
        }
-        stage('Unit') {
-          steps { make('test-unit') }
-        }
-        stage('Component') {
-          steps { make('test-component') }
+        stage('Unit Tests') {
+          steps {
+            sh """#!/bin/bash
+              set -eo pipefail
+              make test-unit 2>&1 | tee -a ${LOG_FILE}
+            """
+          }
        }
      }
    }
-    stage('Heavy Test') {
-      parallel {
-        stage('Contract') {
-          when { expression { params.RUN_CONTRACT_TESTS } }
-          steps { make('test-contract') }
-        }
-        stage('Integration') {
-          steps { make('test-integration') }
-        }
+    stage('Contract Tests') {
+      steps {
+        sh """#!/bin/bash
+          set -eo pipefail
+          make test-contract 2>&1 | tee -a ${LOG_FILE}
+        """
+      }
+    }
+    stage('Integration Tests') {
+      steps {
+        sh """#!/bin/bash
+          set -eo pipefail
+          make test-integration 2>&1 | tee -a ${LOG_FILE}
+        """
+      }
+    }
+    stage('Component Tests') {
+      steps {
+        sh """#!/bin/bash
+          set -eo pipefail
+          make component-test 2>&1 | tee -a ${LOG_FILE}
+        """
      }
    }
    stage('Upload') {
@@ -86,10 +100,3 @@ pipeline {
    always  { sh 'make purge' }
  }
 }
-
-def make(target) {
-  sh """#!/bin/bash
-    set -eo pipefail
-    make ${target} 2>&1 | tee -a ${LOG_FILE}
-  """
-}
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 pipeline {

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

 pipeline {

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

 pipeline {

@@ -1,14 +1,14 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 pipeline {
  agent { label 'macos' }

  environment {
-    LANG     = 'en_US.UTF-8'
-    LANGUAGE = 'en_US.UTF-8'
-    LC_ALL   = 'en_US.UTF-8'
-    PLATFORM = 'ios'
+    LANG      = 'en_US.UTF-8'
+    LANGUAGE  = 'en_US.UTF-8'
+    LC_ALL    = 'en_US.UTF-8'
+    TARGET    = 'ios'
    FASTLANE_DISABLE_COLORS = 1
    /* avoid writing to r/o /nix */
    GEM_HOME  = '~/.rubygems'
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -1,14 +1,14 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 pipeline {
  agent { label 'linux' }

  environment {
-    LANG     = 'en_US.UTF-8'
-    LANGUAGE = 'en_US.UTF-8'
-    LC_ALL   = 'en_US.UTF-8'
-    PLATFORM = 'ios'
+    LANG      = 'en_US.UTF-8'
+    LANGUAGE  = 'en_US.UTF-8'
+    LC_ALL    = 'en_US.UTF-8'
+    TARGET    = 'ios'
    FASTLANE_DISABLE_COLORS = 1
    /* avoid writing to r/o /nix */
    GEM_HOME  = '~/.rubygems'
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.12'
+library 'status-jenkins-lib@v1.8.7'

 pipeline {
  agent {
@@ -16,10 +16,10 @@ Both of these links are showing it for React-Testing-Library (not Native) howeve
 ## Running the tests
 To run these tests there are two methods.

-`make test-component`
+`make component-test` 
 setups and runs the test suite once.

-`make test-component-watch`
+`make component-test-watch` 
 setups and runs the test suite and watches for code changes will then retrigger the test suite.

 ## Writing Tests
@@ -38,7 +38,7 @@ There is a file of utility functions defined in "src/test_helpers/component.cljs
 ## Configuration
 Status Mobile has a bespoke tech stack, as such there is more complexities to configuring the tests.

-### Shadow-CLJS
+### Shadow-CLJS 
 the configuration for compiling our tests are defined in the "shadow-cljs.edn" file.
 The three main parts of this are
 `:target :npm-module`
@@ -47,9 +47,9 @@ Needed for the configuration we are using
 a vector of entry points for the test files.
 and the `ns-regexp` to specify what tests to find. Since we have multiple forms of tests we decided that "component-spec" is the least likely to detect the wrong file type.

-It's worth knowing that our tests are compiled to JS and then run in the temporary folder `component-tests`.
+It's worth knowing that our tests are compiled to JS and then run in the temporary folder `component-tests`. 

 ### Jest
 There is also further configuration for Jest in "test/jest". There is a jest config file which has some mostly standard configuration pieces, where the tests live, what environment variables are set etc. This is documented by Jest here: https://jestjs.io/docs/configuration

-There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies.
+There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies 
@@ -54,13 +54,13 @@ Here I'm showing a terminal-only experience using Tmux (left pane Emacs, right p
 To run tests:

 ```
-make test-component
+make component-test
 ```

 Also test watcher can be launched. It will re-run the entire test suite when any file is modified

 ```
-make test-component-watch
+make component-test-watch
 ```

 Check [component tests doc](./component-tests-overview.md) for more.
@@ -1,3 +1,4 @@
 source 'https://rubygems.org'

+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
 gem 'fastlane', '>= 2.131.0'
@@ -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
@@ -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"];
@@ -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
@@ -8,8 +8,10 @@

 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
+		061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
 		3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; };
@@ -35,6 +37,7 @@
 		3AAD2AD324A3A60E0075D594 /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
 		3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; };
+		536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; };
 		65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
@@ -44,8 +47,6 @@
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */; };
-		9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
@@ -60,7 +61,6 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
-		E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -108,14 +108,14 @@
 		00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
-		28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
+		1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -123,24 +123,22 @@
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
-		5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
-		668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
+		7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
+		79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
+		7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
-		9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
-		A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
-		ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
+		AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
@@ -150,10 +148,12 @@
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
+		C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
+		CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
+		D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +174,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */,
+				17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +188,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */,
+				061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */,
-				9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */,
-				5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */,
+				7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */,
+				1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */,
+				C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */,
-				668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */,
-				59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */,
-				A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */,
+				AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */,
+				1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */,
+				D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */,
+				8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */,
+				1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */,
+				FD7194DC9A3E5A5277869CFC /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				28606042DA81A750949525E4 /* [CP] Copy Pods Resources */,
+				88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */,
+				4EE2E0EC4F119397E1A6B768 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */,
+				1B5C687FDBFFB60FD1043432 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,26 +544,48 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ../logs/react-native-xcode.log 2>&1";
 		};
-		28606042DA81A750949525E4 /* [CP] Copy Pods Resources */ = {
+		1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		1B5C687FDBFFB60FD1043432 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
@@ -594,51 +616,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
 		};
-		523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */ = {
+		4EE2E0EC4F119397E1A6B768 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -660,7 +638,29 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */ = {
+		88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -682,28 +682,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -718,6 +696,28 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
 		};
+		FD7194DC9A3E5A5277869CFC /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -765,7 +765,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -782,13 +782,13 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -802,7 +802,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -816,13 +816,13 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -835,11 +835,11 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -879,13 +879,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -894,6 +895,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -915,11 +917,11 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -953,13 +955,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -968,6 +971,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -988,11 +992,11 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
@@ -1031,13 +1035,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -1046,6 +1051,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1065,11 +1071,11 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -1102,13 +1108,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -1117,6 +1124,7 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1139,7 +1147,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1172,7 +1180,7 @@
 				ENABLE_TESTABILITY = YES;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1203,21 +1211,27 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = false;
 				VALID_ARCHS = arm64;
 				"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
 			};
@@ -1229,7 +1243,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1261,7 +1275,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -1284,21 +1298,27 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
+				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = false;
 				VALIDATE_PRODUCT = YES;
 				VALID_ARCHS = arm64;
 			};
@@ -104,6 +104,11 @@ extern "C" NSString* StatusgoImageServerTLSCert();


 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  return [self getBundleURL];
+}
+
+- (NSURL *)getBundleURL
 {
 #if DEBUG
  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
@@ -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>
@@ -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;
    }
 }
@@ -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");

@@ -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
@@ -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}"
 }

@@ -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
@@ -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
@@ -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}
    '';
@@ -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
@@ -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; };
@@ -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
@@ -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=";
    };
  };

@@ -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;
@@ -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;
  };
@@ -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
 }

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

 # Increment a version string using Semantic Versioning (SemVer) terminology.

@@ -62,29 +62,25 @@

 (defn <-color
  [value]
-  (if (and (some? value)
-           (string/starts-with? value "#"))
-    value
-    (keyword value)))
+  (if (string/starts-with? value "#") value (keyword value)))

 (defn <-rpc
  [chat]
  (-> chat
-      (set/rename-keys {:id                      :chat-id
-                        :communityId             :community-id
-                        :syncedFrom              :synced-from
-                        :syncedTo                :synced-to
-                        :membershipUpdateEvents  :membership-update-events
-                        :deletedAtClockValue     :deleted-at-clock-value
-                        :chatType                :chat-type
-                        :unviewedMessagesCount   :unviewed-messages-count
-                        :unviewedMentionsCount   :unviewed-mentions-count
-                        :lastMessage             :last-message
-                        :lastClockValue          :last-clock-value
-                        :invitationAdmin         :invitation-admin
-                        :profile                 :profile-public-key
-                        :muteTill                :muted-till
-                        :hideIfPermissionsNotMet :hide-if-permissions-not-met?})
+      (set/rename-keys {:id                     :chat-id
+                        :communityId            :community-id
+                        :syncedFrom             :synced-from
+                        :syncedTo               :synced-to
+                        :membershipUpdateEvents :membership-update-events
+                        :deletedAtClockValue    :deleted-at-clock-value
+                        :chatType               :chat-type
+                        :unviewedMessagesCount  :unviewed-messages-count
+                        :unviewedMentionsCount  :unviewed-mentions-count
+                        :lastMessage            :last-message
+                        :lastClockValue         :last-clock-value
+                        :invitationAdmin        :invitation-admin
+                        :profile                :profile-public-key
+                        :muteTill               :muted-till})
      rpc->type
      unmarshal-members
      (update :last-message #(when % (messages/<-rpc %)))
@@ -93,40 +89,38 @@

 (defn <-rpc-js
  [^js chat]
-  (-> {:name                        (.-name chat)
-       :description                 (.-description chat)
-       :color                       (<-color (.-color chat))
-       :emoji                       (.-emoji chat)
-       :timestamp                   (.-timestamp chat)
-       :alias                       (.-alias chat)
-       :muted                       (.-muted chat)
-       :joined                      (.-joined chat)
-       :muted-till                  (.-muteTill chat)
-       :chat-id                     (.-id chat)
-       :community-id                (.-communityId chat)
-       :synced-from                 (.-syncedFrom chat)
-       :synced-to                   (.-syncedTo chat)
-       :deleted-at-clock-value      (.-deletedAtClockValue chat)
-       :chat-type                   (.-chatType chat)
-       :unviewed-messages-count     (.-unviewedMessagesCount chat)
-       :unviewed-mentions-count     (.-unviewedMentionsCount chat)
-       :last-message                {:content            {:text        (.-text chat)
-                                                          :parsed-text (types/js->clj (.-parsedText
-                                                                                       chat))
-                                                          :response-to (.-responseTo chat)}
-                                     :content-type       (.-contentType chat)
-                                     :community-id       (.-contentCommunityId chat)
-                                     :outgoing           (boolean (.-outgoingStatus chat))
-                                     :album-images-count (.-albumImagesCount chat)
-                                     :from               (.-from chat)
-                                     :deleted?           (.-deleted chat)
-                                     :deleted-for-me?    (.-deletedForMe chat)}
-       :last-clock-value            (.-lastClockValue chat)
-       :profile-public-key          (.-profile chat)
-       :highlight                   (.-highlight chat)
-       :active                      (.-active chat)
-       :members                     (types/js->clj (.-members chat))
-       :hide-if-permissions-not-met (.-hideIfPermissionsNotMet chat)}
+  (-> {:name                    (.-name chat)
+       :description             (.-description chat)
+       :color                   (<-color (.-color chat))
+       :emoji                   (.-emoji chat)
+       :timestamp               (.-timestamp chat)
+       :alias                   (.-alias chat)
+       :muted                   (.-muted chat)
+       :joined                  (.-joined chat)
+       :muted-till              (.-muteTill chat)
+       :chat-id                 (.-id chat)
+       :community-id            (.-communityId chat)
+       :synced-from             (.-syncedFrom chat)
+       :synced-to               (.-syncedTo chat)
+       :deleted-at-clock-value  (.-deletedAtClockValue chat)
+       :chat-type               (.-chatType chat)
+       :unviewed-messages-count (.-unviewedMessagesCount chat)
+       :unviewed-mentions-count (.-unviewedMentionsCount chat)
+       :last-message            {:content            {:text        (.-text chat)
+                                                      :parsed-text (types/js->clj (.-parsedText chat))
+                                                      :response-to (.-responseTo chat)}
+                                 :content-type       (.-contentType chat)
+                                 :community-id       (.-contentCommunityId chat)
+                                 :outgoing           (boolean (.-outgoingStatus chat))
+                                 :album-images-count (.-albumImagesCount chat)
+                                 :from               (.-from chat)
+                                 :deleted?           (.-deleted chat)
+                                 :deleted-for-me?    (.-deletedForMe chat)}
+       :last-clock-value        (.-lastClockValue chat)
+       :profile-public-key      (.-profile chat)
+       :highlight               (.-highlight chat)
+       :active                  (.-active chat)
+       :members                 (types/js->clj (.-members chat))}
      rpc->type
      unmarshal-members))

@@ -27,11 +27,10 @@
               (assoc acc
                      (name k)
                      (-> v
-                          (assoc :token-gated?                 (:tokenGated v)
-                                 :can-post?                    (:canPost v)
-                                 :can-view?                    (:canView v)
-                                 :hide-if-permissions-not-met? (:hideIfPermissionsNotMet v))
-                          (dissoc :canPost :tokenGated :canView :hideIfPermissionsNotMet)
+                          (assoc :token-gated? (:tokenGated v)
+                                 :can-post?    (:canPost v)
+                                 :can-view?    (:canView v))
+                          (dissoc :canPost :tokenGated :canView)
                          (update :members walk/stringify-keys))))
             {}
             chats))
@@ -64,7 +63,6 @@
        :canJoin                     :can-join?
        :requestedToJoinAt           :requested-to-join-at
        :isMember                    :is-member?
-        :outroMessage                :outro-message
        :adminSettings               :admin-settings
        :tokenPermissions            :token-permissions
        :communityTokensMetadata     :tokens-metadata
@@ -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)]
@@ -2,6 +2,7 @@
  (:require
    [legacy.status-im.react-native.resources :as resources]
    [legacy.status-im.ui.components.colors :as quo.colors]
+    [legacy.status-im.ui.components.fast-image :as fast-image]
    [legacy.status-im.ui.screens.chat.message.legacy-style :as style]
    [quo.core :as quo]
    [quo.foundations.colors :as colors]
@@ -144,6 +145,23 @@
     [rn/text {:style (style/status-text)}]
     (-> content :parsed-text peek :children))]])

+;; EMOJI
+(defn emoji
+  []
+  (fn [{:keys [content] :as message}]
+    [rn/view (style/message-view message)
+     [rn/view {:style (style/message-view-content)}
+      [rn/view {:style (style/style-message-text)}
+       [rn/text {:style (style/emoji-message message)}
+        (:text content)]]]]))
+
+;; STICKER
+(defn sticker
+  [{:keys [content]}]
+  [fast-image/fast-image
+   {:style  {:margin 10 :width 140 :height 140}
+    :source {:uri (str (-> content :sticker :url) "&download=true")}}])
+
 (defn contact-request-status-pending
  []
  [rn/view {:style {:flex-direction :row}}
@@ -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
@@ -12,9 +12,9 @@
  ;; the `:or` destructuring won't work because it's only applied when the
  ;; `:customization-color` key is non-existent. While deleting an account the key exists
  ;; and has a `nil` value.
-  (let [color-top    (colors/resolve-color customization-color 50 20)
-        color-bottom (colors/resolve-color customization-color 50 0)]
-    (when (and color-top color-bottom)
+  (when customization-color
+    (let [color-top    (colors/resolve-color customization-color 50 20)
+          color-bottom (colors/resolve-color customization-color 50 0)]
      [linear-gradient/linear-gradient
       {:accessibility-label :gradient-cover
        :colors              [color-top color-bottom]
@@ -61,7 +61,7 @@
                   (h/fire-event :on-blur (h/get-by-label-text :address-text-input))
                   (h/has-prop (h/get-by-label-text :address-text-input)
                               :placeholder-text-color
-                               colors/neutral-40))))))
+                               colors/neutral-30))))))

  (h/test "on blur with text blur? true"
    (with-redefs [clipboard/get-string #(% "")]
@@ -75,7 +75,7 @@
                   (h/fire-event :on-blur (h/get-by-label-text :address-text-input))
                   (h/has-prop (h/get-by-label-text :address-text-input)
                               :placeholder-text-color
-                               colors/neutral-80-opa-40))))))
+                               colors/neutral-80-opa-20))))))

  (h/test "on blur with no text and blur? false"
    (with-redefs [clipboard/get-string #(% "")]
@@ -58,64 +58,78 @@
  [{:keys [default-value blur? on-change-text on-blur on-focus on-clear on-scan
           on-detect-ens on-detect-address on-detect-unclassified address-regex ens-regex
           valid-ens-or-address? container-style]}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [status set-status]    (rn/use-state :default)
-        [value set-value]      (rn/use-state nil)
-        [focused? set-focused] (rn/use-state false)
-        on-change              (rn/use-callback
-                                (fn [text]
-                                  (let [address? (when address-regex
-                                                   (boolean (re-matches address-regex text)))
-                                        ens?     (when ens-regex
-                                                   (boolean (re-matches ens-regex text)))]
-                                    (set-value text)
-                                    (if (> (count text) 0)
-                                      (set-status :typing)
-                                      (set-status :active))
+  (let [theme                    (quo.theme/use-theme-value)
+        [status set-status]      (rn/use-state :default)
+        value                    (rn/use-ref-atom nil)
+        [_ trigger-render-value] (rn/use-state @value)
+        [focused? set-focused]   (rn/use-state false)
+        on-change                (rn/use-callback
+                                  (fn [text]
+                                    (let [address? (when address-regex
+                                                     (boolean (re-matches address-regex text)))
+                                          ens?     (when ens-regex
+                                                     (boolean (re-matches ens-regex text)))]
+                                      (reset! value text)
+                                      (if (> (count text) 0)
+                                        (set-status :typing)
+                                        (set-status :active))
+                                      (when on-change-text
+                                        (on-change-text text))
+                                      (when (and on-detect-ens ens?)
+                                        (set-status :loading)
+                                        (on-detect-ens text #(set-status :typing)))
+                                      (when (and address? on-detect-address)
+                                        (set-status :loading)
+                                        (on-detect-address text))
+                                      (when (and (not address?)
+                                                 (not ens?)
+                                                 on-detect-unclassified)
+                                        (on-detect-unclassified text)))))
+        set-value                (rn/use-callback
+                                  (fn [new-value]
+                                    (reset! value new-value)
+                                    (on-change new-value)
+                                    (trigger-render-value new-value)))
+        on-paste                 (rn/use-callback
+                                  (fn []
+                                    (clipboard/get-string
+                                     (fn [clipboard]
+                                       (when-not (empty? clipboard)
+                                         (set-value clipboard))))))
+        on-clear                 (rn/use-callback
+                                  (fn []
+                                    (set-value "")
+                                    (set-status (if focused? :active :default))
                                    (when on-change-text
-                                      (on-change-text text))
-                                    (when (and on-detect-ens ens?)
-                                      (set-status :loading)
-                                      (on-detect-ens text #(set-status :typing)))
-                                    (when (and address? on-detect-address)
-                                      (set-status :loading)
-                                      (on-detect-address text))
-                                    (when (and (not address?)
-                                               (not ens?)
-                                               on-detect-unclassified)
-                                      (on-detect-unclassified text)))))
-        on-paste               (rn/use-callback
-                                (fn []
-                                  (clipboard/get-string
-                                   (fn [clipboard]
-                                     (when-not (empty? clipboard)
-                                       (on-change clipboard))))))
-        on-clear               (rn/use-callback
-                                (fn []
-                                  (on-change "")
-                                  (set-status (if focused? :active :default))
-                                  (when on-change-text
-                                    (on-change-text ""))
-                                  (when on-clear
-                                    (on-clear)))
-                                [focused?])
-        on-scan                (rn/use-callback #(when on-scan (on-scan on-change))
-                                                [on-scan])
-        on-focus               (rn/use-callback
-                                (fn []
-                                  (when (= (count value) 0)
-                                    (set-status :active))
-                                  (set-focused true)
-                                  (when on-focus (on-focus))))
-        on-blur                (rn/use-callback
-                                (fn []
-                                  (when (= status :active)
-                                    (set-status :default))
-                                  (set-focused false)
-                                  (when on-blur (on-blur)))
-                                [status])
-        placeholder-text-color (rn/use-memo #(get-placeholder-text-color status theme blur?)
-                                            [status theme blur?])]
+                                      (on-change-text ""))
+                                    (when on-clear
+                                      (on-clear)))
+                                  [focused?])
+        on-clear                 (rn/use-callback
+                                  (fn []
+                                    (set-value "")
+                                    (set-status (if focused? :active :default))
+                                    (when on-change-text
+                                      (on-change-text ""))
+                                    (when on-clear
+                                      (on-clear)))
+                                  [focused?])
+        on-scan                  (when on-scan (rn/use-callback #(on-scan set-value)))
+        on-focus                 (rn/use-callback
+                                  (fn []
+                                    (when (= (count @value) 0)
+                                      (set-status :active))
+                                    (set-focused true)
+                                    (when on-focus (on-focus))))
+        on-blur                  (rn/use-callback
+                                  (fn []
+                                    (when (= status :active)
+                                      (set-status :default))
+                                    (set-focused false)
+                                    (when on-blur (on-blur)))
+                                  [status])
+        placeholder-text-color   (rn/use-memo #(get-placeholder-text-color status theme blur?)
+                                              [status theme blur?])]
    (rn/use-mount #(on-change (or default-value "")))
    [rn/view {:style (style/container container-style)}
     [rn/text-input
@@ -123,7 +137,7 @@
       :style                  (style/input-text theme)
       :placeholder            (i18n/label :t/name-ens-or-address)
       :placeholder-text-color placeholder-text-color
-       :value                  value
+       :value                  @value
       :auto-complete          (when platform/ios? :off)
       :auto-capitalize        :none
       :auto-correct           false
@@ -57,19 +57,14 @@
  "Custom properties that must be removed from properties map passed to InputText."
  [:type :blur? :error? :right-icon :left-icon :disabled? :small? :button
   :label :char-limit :on-char-limit-reach :icon-name :multiline? :on-focus :on-blur
-   :container-style :ref])
+   :container-style])

 (defn- base-input
  [{:keys [blur? error? right-icon left-icon disabled? small? button
           label char-limit multiline? clearable? on-focus on-blur container-style
-           on-change-text on-char-limit-reach weight default-value on-clear]
+           on-change-text on-char-limit-reach weight default-value]
    :as   props}]
  (let [theme                  (quo.theme/use-theme-value)
-        ref                    (rn/use-ref-atom nil)
-        on-ref                 (rn/use-callback (fn [value]
-                                                  (when (:ref props)
-                                                    ((:ref props) value))
-                                                  (reset! ref value)))
        [status set-status]    (rn/use-state :default)
        internal-on-focus      (rn/use-callback #(set-status :focus))
        internal-on-blur       (rn/use-callback #(set-status :default))
@@ -98,15 +93,6 @@
                                 :else     status)
        colors-by-status       (style/status-colors status-kw blur? theme)
        variant-colors         (style/variants-colors blur? theme)
-        clear-on-press         (rn/use-callback (fn []
-                                                  (.clear ^js @ref)
-                                                  (when on-clear (on-clear)))
-                                                [on-clear])
-        right-icon             (or right-icon
-                                   (when clearable?
-                                     {:style-fn  style/clear-icon
-                                      :icon-name :i/clear
-                                      :on-press  clear-on-press}))
        clean-props            (apply dissoc props custom-props)]
    [rn/view {:style container-style}
     (when (or label char-limit)
@@ -122,8 +108,7 @@
          :small?         small?
          :icon-name      icon-name}])
      [rn/text-input
-       (cond-> {:ref                    on-ref
-                :style                  (style/input colors-by-status small? multiple-lines? weight)
+       (cond-> {:style                  (style/input colors-by-status small? multiple-lines? weight)
                :accessibility-label    :input
                :placeholder-text-color (:placeholder colors-by-status)
                :keyboard-appearance    (quo.theme/theme-value :light :dark theme)
@@ -162,10 +147,7 @@
  [{:keys [default-shown?]
    :or   {default-shown? false}
    :as   props}]
-  (let [[password-shown?
-         set-password-shown] (rn/use-state default-shown?)
-        on-press             (rn/use-callback #(set-password-shown (not password-shown?))
-                                              [password-shown?])]
+  (let [[password-shown? set-password-shown] (rn/use-state default-shown?)]
    [base-input
     (assoc props
            :accessibility-label :password-input
@@ -174,7 +156,7 @@
            :secure-text-entry   (not password-shown?)
            :right-icon          {:style-fn  style/password-icon
                                  :icon-name (if password-shown? :i/hide-password :i/reveal)
-                                  :on-press  on-press})]))
+                                  :on-press  #(set-password-shown (not password-shown?))})]))

 (defn input
  "This input supports the following properties:
@@ -200,11 +182,15 @@
  - :on-change-text
  ...
  "
-  [{:keys [type icon-name]
+  [{:keys [type clearable? on-clear icon-name]
    :or   {type :text}
    :as   props}]
  (let [base-props (cond-> props
-                     icon-name (assoc-in [:left-icon :icon-name] icon-name))]
+                     icon-name  (assoc-in [:left-icon :icon-name] icon-name)
+                     clearable? (assoc :right-icon
+                                       {:style-fn  style/clear-icon
+                                        :icon-name :i/clear
+                                        :on-press  #(when on-clear (on-clear))}))]
    (if (= type :password)
      [password-input base-props]
      [base-input base-props])))
@@ -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)
@@ -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}}
@@ -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)))))
@@ -0,0 +1,33 @@
+(ns quo.components.profile.expanded-collectible.style
+  (:require [quo.foundations.colors :as colors]
+            [quo.foundations.shadows :as shadows]))
+
+(def container
+  (merge (shadows/get 2)
+         {:flex            1
+          :align-items     :center
+          :justify-content :center
+          :border-radius   16}))
+
+(defn image
+  [square? aspect-ratio]
+  {:width         "100%"
+   :aspect-ratio  (if square? 1 aspect-ratio)
+   :border-radius 16})
+
+(defn fallback
+  [{:keys [theme]}]
+  {:background-color (colors/theme-colors colors/neutral-2_5 colors/neutral-90 theme)
+   :border-style     :dashed
+   :border-color     (colors/theme-colors colors/neutral-20 colors/neutral-80 theme)
+   :border-width     1
+   :border-radius    16
+   :width            "100%"
+   :aspect-ratio     1
+   :align-items      :center
+   :justify-content  :center})
+
+(def counter
+  {:position :absolute
+   :top      12
+   :right    12})
@@ -0,0 +1,77 @@
+(ns quo.components.profile.expanded-collectible.view
+  (:require
+    [promesa.core :as p]
+    [quo.components.counter.collectible-counter.view :as collectible-counter]
+    [quo.components.icon :as icon]
+    [quo.components.markdown.text :as text]
+    [quo.components.profile.expanded-collectible.style :as style]
+    [quo.foundations.colors :as colors]
+    [quo.theme]
+    [react-native.core :as rn]
+    [schema.core :as schema]
+    [utils.i18n :as i18n]))
+
+(defn- counter-view
+  [counter]
+  (when counter
+    [collectible-counter/view
+     {:container-style style/counter
+      :value           counter}]))
+
+(defn- fallback-view
+  [{:keys [label theme counter]}]
+  [rn/view
+   {:style (style/fallback {:theme theme})}
+   [counter-view counter]
+   [rn/view
+    [icon/icon :i/sad {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)}]]
+   [rn/view {:style {:height 4}}]
+   [text/text
+    {:size  :paragraph-2
+     :style {:color (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)}}
+    label]])
+
+(defn view-internal
+  [{:keys [container-style square? status on-press counter image-src] :or {status :default}}]
+  (let [theme                       (quo.theme/use-theme-value)
+        [image-size set-image-size] (rn/use-state {})]
+    (rn/use-effect
+     (fn []
+       (p/let [[image-width image-height] (rn/image-get-size image-src)]
+         (set-image-size {:width        image-width
+                          :height       image-height
+                          :aspect-ratio (/ image-width image-height)})))
+     [image-src])
+    [rn/pressable
+     {:on-press            on-press
+      :accessibility-label :expanded-collectible
+      :style               (merge container-style style/container)}
+     (case status
+       :unsupported [fallback-view
+                     {:label   (i18n/label :t/unsupported-file)
+                      :counter counter
+                      :theme   theme}]
+       :cant-fetch  [fallback-view
+                     {:label   (i18n/label :t/cant-fetch-info)
+                      :counter counter
+                      :theme   theme}]
+       [rn/view {:style {:flex 1}}
+        [rn/image
+         {:style  (style/image square? (:aspect-ratio image-size))
+          :source image-src}]
+        [counter-view counter]])]))
+
+(def ?schema
+  [:=>
+   [:catn
+    [:props
+     [:map {:closed true}
+      [:image-src {:optional true} string?]
+      [:container-style {:optional true} [:maybe :map]]
+      [:square? {:optional true} [:maybe boolean?]]
+      [:counter {:optional true} [:maybe string?]]
+      [:status {:optional true} [:maybe [:enum :default :loading :cant-fetch :unsupported]]]
+      [:on-press {:optional true} [:maybe fn?]]]]]
+   :any])
+
+(def view (schema/instrument #'view-internal ?schema))
@@ -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
@@ -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))
@@ -100,7 +100,8 @@
    :or   {customization-color :blue}}]
  (let [time-frame-string (time-string time-frame time-frame-string)
        up?               (= metrics :positive)]
-    [rn/view {:style style/account-overview-wrapper}
+    [rn/view
+     {:style style/account-overview-wrapper}
     (if (= :loading state)
       [loading-state (colors/theme-colors colors/neutral-5 colors/neutral-90 theme)]
       [rn/view
@@ -112,17 +113,19 @@
          :size   :heading-1
          :style  style/current-value}
         current-value]
-        [rn/view {:style style/row-centered}
-         (when (seq time-frame-string)
-           [text/text
-            {:weight :medium
-             :size   :paragraph-2
-             :style  (style/bottom-time-text (and (not= :custom time-frame)
-                                                  (seq time-frame-to-string)))}
-            time-frame-string])
-         (when (and (= :custom time-frame)
-                    (seq time-frame-to-string))
-           [custom-time-frame time-frame-to-string])
+        [rn/view
+         {:style style/row-centered}
+         [:<>
+          (when (seq time-frame-string)
+            [text/text
+             {:weight :medium
+              :size   :paragraph-2
+              :style  (style/bottom-time-text (and (not= :custom time-frame)
+                                                   (seq time-frame-to-string)))}
+             time-frame-string])
+          (when (and (= :custom time-frame)
+                     (seq time-frame-to-string))
+            [custom-time-frame time-frame-to-string])]
         (when (and (seq percentage-change)
                    (seq currency-change))
           [numeric-changes percentage-change currency-change customization-color theme up?])]])]))
@@ -112,6 +112,7 @@
    quo.components.password.tips.view
    quo.components.profile.collectible-list-item.view
    quo.components.profile.collectible.view
+    quo.components.profile.expanded-collectible.view
    quo.components.profile.link-card.view
    quo.components.profile.profile-card.view
    quo.components.profile.select-profile.view
@@ -354,6 +355,7 @@
 ;;;; Profile
 (def collectible quo.components.profile.collectible.view/collectible)
 (def collectible-list-item quo.components.profile.collectible-list-item.view/view)
+(def expanded-collectible quo.components.profile.expanded-collectible.view/view)
 (def link-card quo.components.profile.link-card.view/view)
 (def profile-card quo.components.profile.profile-card.view/profile-card)
 (def select-profile quo.components.profile.select-profile.view/view)
@@ -64,6 +64,7 @@
    quo.components.onboarding.small-option-card.component-spec
    quo.components.password.tips.component-spec
    quo.components.profile.collectible-list-item.component-spec
+    quo.components.profile.expanded-collectible.component-spec
    quo.components.profile.link-card.component-spec
    quo.components.profile.select-profile.component-spec
    quo.components.profile.showcase-nav.component-spec
@@ -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]
@@ -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)
@@ -148,26 +148,28 @@
  (reset! search-text ""))

 (defn f-view
-  [{:keys [search-active? on-change-text clear-states active-category scroll-ref theme]
+  [{:keys [search-text on-change-text clear-states active-category scroll-ref theme]
    :as   sheet-opts}]
-  [rn/keyboard-avoiding-view
-   {:style                    style/flex-spacer
-    :keyboard-vertical-offset 8}
-   [rn/view {:style style/flex-spacer}
-    [rn/view {:style style/search-input-container}
-     [quo/input
-      {:small?         true
-       :placeholder    (i18n/label :t/emoji-search-placeholder)
-       :icon-name      :i/search
-       :on-change-text on-change-text
-       :clearable?     search-active?
-       :on-clear       clear-states}]]
-    [render-list sheet-opts]
-    (when-not search-active?
-      [footer
-       {:theme           theme
-        :active-category active-category
-        :scroll-ref      scroll-ref}])]])
+  (let [search-active? (pos? (count @search-text))]
+    [rn/keyboard-avoiding-view
+     {:style                    style/flex-spacer
+      :keyboard-vertical-offset 8}
+     [rn/view {:style style/flex-spacer}
+      [rn/view {:style style/search-input-container}
+       [quo/input
+        {:small?         true
+         :placeholder    (i18n/label :t/emoji-search-placeholder)
+         :icon-name      :i/search
+         :value          @search-text
+         :on-change-text on-change-text
+         :clearable?     search-active?
+         :on-clear       clear-states}]]
+      [render-list sheet-opts]
+      (when-not search-active?
+        [footer
+         {:theme           theme
+          :active-category active-category
+          :scroll-ref      scroll-ref}])]]))

 (defn- view-internal
  [_]
@@ -200,7 +202,7 @@
    (fn [sheet-opts]
      [:f> f-view
       (assoc sheet-opts
-              :search-active?            (pos? (count @search-text))
+              :search-text               search-text
              :on-change-text            on-change-text
              :clear-states              clear-states
              :filtered-data             @filtered-data
@@ -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})
@@ -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]}]
@@ -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
@@ -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]}
@@ -3,6 +3,7 @@
            [quo.core :as quo]
            [react-native.clipboard :as clipboard]
            [react-native.core :as rn]
+            [reagent.core :as reagent]
            [status-im.contexts.chat.home.add-new-contact.style :as style]
            [utils.address :as address]
            [utils.debounce :as debounce]
@@ -50,66 +51,57 @@

 (defn- search-input
  []
-  (let [[input-value set-input-value] (rn/use-state nil)
-        input-ref                     (rn/use-ref-atom nil)
-        on-ref                        (rn/use-callback #(reset! input-ref %))
-        {:keys              [scanned]
-         contact-public-key :id}      (rf/sub [:contacts/new-identity])
-        contact-public-key-or-scanned (or contact-public-key scanned)
-        empty-input?                  (and (string/blank? input-value)
-                                           (string/blank? contact-public-key-or-scanned))
-        clear-input                   (rn/use-callback
-                                       (fn []
-                                         (set-input-value nil)
-                                         (rf/dispatch [:contacts/clear-new-identity])))
-        paste-on-input                (rn/use-callback
-                                       (fn []
-                                         (clipboard/get-string
-                                          (fn [clipboard-text]
-                                            (set-input-value clipboard-text)
-                                            (rf/dispatch [:contacts/set-new-identity
-                                                          {:input clipboard-text}])))))
-        on-change-text                (rn/use-callback
-                                       (fn [new-text]
-                                         (set-input-value new-text)
-                                         (if (string/blank? contact-public-key-or-scanned)
-                                           (debounce/debounce-and-dispatch [:contacts/set-new-identity
-                                                                            {:input new-text}]
-                                                                           600)
-                                           (rf/dispatch-sync [:contacts/set-new-identity
-                                                              {:input new-text}])))
-                                       [contact-public-key-or-scanned])]
-    (rn/use-unmount #(rf/dispatch [:contacts/clear-new-identity]))
-    [rn/view {:style style/input-and-scan-container}
-     [quo/input
-      {:accessibility-label :enter-contact-code-input
-       :ref                 on-ref
-       :container-style     {:flex 1}
-       :auto-capitalize     :none
-       :multiline?          true
-       :blur-on-submit      true
-       :return-key-type     :done
-       :label               (i18n/label :t/ens-or-chat-key)
-       :placeholder         (i18n/label :t/type-some-chat-key)
-       :clearable?          (not empty-input?)
-       :on-clear            clear-input
-       :button              (when empty-input?
-                              {:on-press paste-on-input
-                               :text     (i18n/label :t/paste)})
-       ;; NOTE: `contact-public-key-or-scanned` has priority over `input-value`,
-       ;; we clean it when the input is updated so that it's `nil` and
-       ;; `input-value`is shown. To fastly clean it, we use `dispatch-sync`.
-       ;; This call could be avoided if `::qr-scanner/scan-code` were able to
-       ;; receive a callback function, not only a re-frame event as callback.
-       :value               (or contact-public-key-or-scanned input-value)
-       :on-change-text      on-change-text}]
-     [rn/view {:style style/scan-button-container}
-      [quo/button
-       {:type       :outline
-        :icon-only? true
-        :size       40
-        :on-press   #(rf/dispatch [:open-modal :scan-profile-qr-code])}
-       :i/scan]]]))
+  (reagent/with-let [input-value    (reagent/atom nil)
+                     input-ref      (atom nil)
+                     clear-input    (fn []
+                                      (reset! input-value nil)
+                                      (rf/dispatch [:contacts/clear-new-identity]))
+                     paste-on-input #(clipboard/get-string
+                                      (fn [clipboard-text]
+                                        (reset! input-value clipboard-text)
+                                        (rf/dispatch [:contacts/set-new-identity
+                                                      {:input clipboard-text}])))]
+    (let [{:keys [scanned] contact-public-key :id} (rf/sub [:contacts/new-identity])
+          contact-public-key-or-scanned            (or contact-public-key scanned)
+          empty-input?                             (and (string/blank? @input-value)
+                                                        (string/blank? contact-public-key-or-scanned))]
+      [rn/view {:style style/input-and-scan-container}
+       [quo/input
+        {:accessibility-label :enter-contact-code-input
+         :ref                 #(reset! input-ref %)
+         :container-style     {:flex 1}
+         :auto-capitalize     :none
+         :multiline?          true
+         :blur-on-submit      true
+         :return-key-type     :done
+         :label               (i18n/label :t/ens-or-chat-key)
+         :placeholder         (i18n/label :t/type-some-chat-key)
+         :clearable?          (not empty-input?)
+         :on-clear            clear-input
+         :button              (when empty-input?
+                                {:on-press paste-on-input
+                                 :text     (i18n/label :t/paste)})
+         ;; NOTE: `contact-public-key-or-scanned` has priority over `@input-value`,
+         ;; we clean it when the input is updated so that it's `nil` and
+         ;; `@input-value`is shown. To fastly clean it, we use `dispatch-sync`.
+         ;; This call could be avoided if `::qr-scanner/scan-code` were able to
+         ;; receive a callback function, not only a re-frame event as callback.
+         :value               (or contact-public-key-or-scanned @input-value)
+         :on-change-text      (fn [new-text]
+                                (reset! input-value new-text)
+                                (as-> [:contacts/set-new-identity {:input new-text}] $
+                                  (if (string/blank? contact-public-key-or-scanned)
+                                    (debounce/debounce-and-dispatch $ 600)
+                                    (rf/dispatch-sync $))))}]
+       [rn/view {:style style/scan-button-container}
+        [quo/button
+         {:type       :outline
+          :icon-only? true
+          :size       40
+          :on-press   #(rf/dispatch [:open-modal :scan-profile-qr-code])}
+         :i/scan]]])
+    (finally
+     (rf/dispatch [:contacts/clear-new-identity]))))

 (defn- invalid-text
  [message]
@@ -38,8 +38,7 @@
      (let [cache      (get-in db [:chat/link-previews :cache])
            previews   (urls->previews cache urls)
            new-urls   (->> previews
-                            (filter (fn [{:keys [loading? status-link-preview?]}]
-                                      (or loading? status-link-preview?)))
+                            (filter :loading?)
                            (map :url))
            ;; `request-id` is a must because we need to process only the last
            ;; unfurling event, as well as avoid needlessly updating the app db
@@ -140,18 +139,14 @@
  sent."
  {:events [:link-preview/reset-unfurled]}
  [{:keys [db]}]
-  {:db (-> db
-           (update :chat/link-previews dissoc :unfurled :request-id :cleared)
-           (update :chat/status-link-previews dissoc :unfurled :request-id :cleared))})
+  {:db (update db :chat/link-previews dissoc :unfurled :request-id :cleared)})

 (rf/defn reset-all
  "Reset all preview state. It is especially important to delete any cached
  URLs, as failing to do so results in its unbounded growth."
  {:events [:link-preview/reset-all]}
  [{:keys [db]}]
-  {:db (-> db
-           (dissoc :chat/link-previews)
-           (dissoc :chat/status-link-previews))})
+  {:db (dissoc db :chat/link-previews)})

 (rf/defn clear-link-previews
  "Mark current unfurled URLs as `cleared`, meaning the user won't see previews
@@ -161,5 +156,4 @@
  (let [unfurled-urls (set (map :url (get-in db [:chat/link-previews :unfurled])))]
    {:db (-> db
             (update :chat/link-previews dissoc :unfurled :request-id)
-             (update :chat/status-link-previews dissoc :unfurled :request-id)
             (assoc-in [:chat/link-previews :cleared] unfurled-urls))}))
@@ -1,10 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.emoji-message.style)
-
-(defn emoji-container
-  [margin-top]
-  {:flex-direction :row
-   :margin-top     margin-top})
-
-(def emoji-text
-  {:font-size   36
-   :line-height 42})
@@ -1,10 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.emoji-message.view
-  (:require [react-native.core :as rn]
-            [status-im.contexts.chat.messenger.messages.content.emoji-message.style :as style]))
-
-(defn view
-  [{:keys [content last-in-group? pinned in-pinned-view?]}]
-  (let [margin-top (if (or last-in-group? in-pinned-view? pinned) 8 0)]
-    [rn/view {:style (style/emoji-container margin-top)}
-     [rn/text {:style style/emoji-text}
-      (:text content)]]))
@@ -1,10 +0,0 @@
-(ns status-im.contexts.chat.messenger.messages.content.sticker-message.view
-  (:require [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]))
-
-(defn view
-  [{:keys [url]}]
-  [rn/view {:style {:margin-top 6 :margin-bottom 4}}
-   [fast-image/fast-image
-    {:style  {:width 120 :height 120}
-     :source {:uri (str url "&download=true")}}]])
@@ -17,12 +17,10 @@
    [status-im.contexts.chat.messenger.messages.content.album.view :as album]
    [status-im.contexts.chat.messenger.messages.content.audio.view :as audio]
    [status-im.contexts.chat.messenger.messages.content.deleted.view :as content.deleted]
-    [status-im.contexts.chat.messenger.messages.content.emoji-message.view :as emoji-message]
    [status-im.contexts.chat.messenger.messages.content.image.view :as image]
    [status-im.contexts.chat.messenger.messages.content.pin.view :as pin]
    [status-im.contexts.chat.messenger.messages.content.reactions.view :as reactions]
    [status-im.contexts.chat.messenger.messages.content.status.view :as status]
-    [status-im.contexts.chat.messenger.messages.content.sticker-message.view :as sticker-message]
    [status-im.contexts.chat.messenger.messages.content.style :as style]
    [status-im.contexts.chat.messenger.messages.content.system.text.view :as system.text]
    [status-im.contexts.chat.messenger.messages.content.text.view :as content.text]
@@ -152,37 +150,38 @@
  (let [show-delivery-state? (reagent/atom false)]
    (fn [{:keys [message-data context keyboard-shown? show-reactions? in-reaction-and-action-menu?
                 show-user-info? preview? theme]}]
-      (let [{:keys [content-type quoted-message content outgoing outgoing-status pinned-by pinned
-                    last-in-group? message-id chat-id]} message-data
-            {:keys [disable-message-long-press?]}       context
-            first-image                                 (first (:album message-data))
-            outgoing-status                             (if (= content-type
-                                                               constants/content-type-album)
-                                                          (:outgoing-status first-image)
-                                                          outgoing-status)
-            outgoing                                    (if (= content-type
-                                                               constants/content-type-album)
-                                                          (:outgoing first-image)
-                                                          outgoing)
-            context                                     (assoc context
-                                                               :on-long-press
-                                                               #(on-long-press message-data
-                                                                               context
-                                                                               keyboard-shown?))
-            response-to                                 (:response-to content)
-            height                                      (rf/sub [:dimensions/window-height])
+      (let [{:keys [content-type quoted-message content
+                    outgoing outgoing-status pinned-by
+                    message-id chat-id]}          message-data
+            {:keys [disable-message-long-press?]} context
+            first-image                           (first (:album message-data))
+            outgoing-status                       (if (= content-type
+                                                         constants/content-type-album)
+                                                    (:outgoing-status first-image)
+                                                    outgoing-status)
+            outgoing                              (if (= content-type
+                                                         constants/content-type-album)
+                                                    (:outgoing first-image)
+                                                    outgoing)
+            context                               (assoc context
+                                                         :on-long-press
+                                                         #(on-long-press message-data
+                                                                         context
+                                                                         keyboard-shown?))
+            response-to                           (:response-to content)
+            height                                (rf/sub [:dimensions/window-height])
            {window-width :width
-             window-scale :scale}                       (rn/get-window)
-            message-container-data                      {:window-width           window-width
-                                                         :padding-right          20
-                                                         :padding-left           20
-                                                         :avatar-container-width 32
-                                                         :message-margin-left    8}
-            reactions                                   (rf/sub [:chats/message-reactions message-id
-                                                                 chat-id])
-            six-reactions?                              (-> reactions
-                                                            count
-                                                            (= 6))]
+             window-scale :scale}                 (rn/get-window)
+            message-container-data                {:window-width           window-width
+                                                   :padding-right          20
+                                                   :padding-left           20
+                                                   :avatar-container-width 32
+                                                   :message-margin-left    8}
+            reactions                             (rf/sub [:chats/message-reactions message-id
+                                                           chat-id])
+            six-reactions?                        (-> reactions
+                                                      count
+                                                      (= 6))]
        [rn/touchable-highlight
         {:accessibility-label (if (and outgoing (= outgoing-status :sending))
                                 :message-sending
@@ -232,14 +231,10 @@
               [content.text/text-content message-data context]

               constants/content-type-emoji
-               [emoji-message/view
-                {:content         content
-                 :last-in-group?  last-in-group?
-                 :pinned          pinned
-                 :in-pinned-view? (:in-pinned-view? context)}]
+               [not-implemented/not-implemented [old-message/emoji message-data]]

               constants/content-type-sticker
-               [sticker-message/view {:url (-> message-data :content :sticker :url)}]
+               [not-implemented/not-implemented [old-message/sticker message-data]]

               constants/content-type-audio
               [audio/audio-message message-data context]
@@ -20,13 +20,6 @@
        has-permissions? (rf/sub [:communities/has-permissions? id])
        airdrop-account (rf/sub [:communities/airdrop-account id])
        revealed-accounts (rf/sub [:communities/accounts-to-reveal id])
-        revealed-accounts-count (count revealed-accounts)
-        wallet-accounts-count (count (rf/sub [:wallet/accounts-without-watched-accounts]))
-        addresses-shared-text (if (= revealed-accounts-count wallet-accounts-count)
-                                (i18n/label :t/all-addresses)
-                                (i18n/label-pluralize
-                                 revealed-accounts-count
-                                 :t/address-count))
        {:keys [highest-permission-role]} (rf/sub [:community/token-gated-overview id])
        highest-role-text (i18n/label (communities.utils/role->translation-key
                                       highest-permission-role
@@ -115,7 +108,7 @@
                      :label             :preview
                      :label-props       {:type :accounts
                                          :data revealed-accounts}
-                      :description-props {:text addresses-shared-text}}
+                      :description-props {:text (i18n/label :t/all-addresses)}}
                     {:title             (i18n/label :t/for-airdrops)
                      :on-press          show-airdrop-addresses
                      :description       :text
@@ -79,6 +79,7 @@
    ;; 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])]
+      (when-not checking?
        {:db (assoc-in db [:communities/permissions-checks-for-selection community-id :checking?] true)
         :fx [[:json-rpc/call
               [{:method     :wakuext_checkPermissionsToJoinCommunity
@@ -86,7 +87,7 @@
                 :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]}]]]})))
+                              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
@@ -103,4 +103,11 @@
                                 community-id]
                    :on-error   [:communities/check-permissions-to-join-during-selection-failure
                                 community-id addresses]}]]]}
-           (sut/check-permissions-to-join-for-selection cofx [community-id addresses]))))))
+           (sut/check-permissions-to-join-for-selection cofx [community-id addresses])))))
+
+  (testing "when there are addresses to check permissions, but currently checking, then skip the check"
+    (let [addresses ["0xA"]
+          cofx      {:db {:communities/permissions-checks-for-selection
+                          {"other-comm-id" {}
+                           community-id    {:checking? true}}}}]
+      (is (nil? (sut/check-permissions-to-join-for-selection cofx [community-id addresses]))))))
@@ -195,23 +195,41 @@
                 :button-type     :grey
                 :on-button-press open-permission-sheet))])]))

-(defn selection-bottom-actions
-  [id
-   {:keys [flag-share-all-addresses
-           addresses-to-reveal
-           cancel-selection
-           can-edit-addresses?
-           identical-choices?]}]
-  (let [color (rf/sub [:communities/community-color id])
-        outro-message (rf/sub [:communities/community-outro-message id])
-        joined (rf/sub [:communities/community-joined id])
-        checking? (rf/sub [:communities/permissions-check-for-selection-checking? id])
+(defn view
+  []
+  (let [{id :community-id} (rf/sub [:get-screen-params])
+        {:keys [color joined] outro-message :outroMessage} (rf/sub [:communities/community id])
+
+        highest-role (rf/sub [:communities/highest-role-for-selection id])
+        [unmodified-role _] (rn/use-state highest-role)
+
+        can-edit-addresses? (rf/sub [:communities/can-edit-shared-addresses? id])
+        pending? (boolean (rf/sub [:communities/my-pending-request-to-join id]))
+
+        wallet-accounts (rf/sub [:wallet/accounts-without-watched-accounts])
+        unmodified-addresses-to-reveal (rf/sub [:communities/addresses-to-reveal id])
+        [addresses-to-reveal set-addresses-to-reveal] (rn/use-state unmodified-addresses-to-reveal)
+
+        unmodified-flag-share-all-addresses (rf/sub [:communities/share-all-addresses? id])
+        [flag-share-all-addresses
+         set-flag-share-all-addresses] (rn/use-state unmodified-flag-share-all-addresses)
+
+        identical-choices? (and (= unmodified-addresses-to-reveal addresses-to-reveal)
+                                (= unmodified-flag-share-all-addresses flag-share-all-addresses))
+
+        toggle-flag-share-all-addresses
+        (fn []
+          (let [new-value (not flag-share-all-addresses)]
+            (set-flag-share-all-addresses new-value)
+            (when new-value
+              (set-addresses-to-reveal (set (map :address wallet-accounts))))))

        cancel-join-request
        (rn/use-callback
         (fn []
           (rf/dispatch [:show-bottom-sheet
                         {:content (fn [] [cancel-join-request-drawer id])}])))
+
        leave-community
        (rn/use-callback
         (fn []
@@ -219,6 +237,14 @@
                         {:content (fn [] [leave-community-drawer id outro-message])}]))
         [outro-message])

+        cancel-selection
+        (fn []
+          (rf/dispatch [:communities/check-permissions-to-join-community
+                        id
+                        unmodified-addresses-to-reveal
+                        :based-on-client-selection])
+          (rf/dispatch [:hide-bottom-sheet]))
+
        confirm-changes
        (fn []
          (if can-edit-addresses?
@@ -237,107 +263,7 @@
                                              (rf/dispatch [:hide-bottom-sheet]))}]))}])
            (do
              (rf/dispatch [:communities/set-share-all-addresses id flag-share-all-addresses])
-              (rf/dispatch [:communities/set-addresses-to-reveal id addresses-to-reveal]))))
-        pending? (rf/sub [:communities/has-pending-request-to-join? id])
-        highest-role (rf/sub [:communities/highest-role-for-selection id])
-        [unmodified-role _] (rn/use-state highest-role)]
-
-    [quo/bottom-actions
-     (cond-> {:role             (role-keyword highest-role)
-              :description      (if highest-role
-                                  :top
-                                  :top-error)
-              :button-one-props {:customization-color color
-                                 :on-press            confirm-changes
-                                 :disabled?           (or checking?
-                                                          (empty? addresses-to-reveal)
-                                                          (not highest-role)
-                                                          identical-choices?)}}
-       can-edit-addresses?
-       (->
-         (assoc :actions              :one-action
-                :button-one-label     (cond
-                                        (and pending? (not highest-role))
-                                        (i18n/label :t/cancel-request)
-
-                                        (and joined (not highest-role))
-                                        (i18n/label :t/leave-community)
-
-                                        :else
-                                        (i18n/label :t/confirm-changes))
-                :description-top-text (cond
-                                        (and pending? highest-role)
-                                        (i18n/label :t/eligible-to-join-as)
-
-                                        (and joined (= highest-role unmodified-role))
-                                        (i18n/label :t/you-are-a)
-
-                                        (and joined (not= highest-role unmodified-role))
-                                        (i18n/label :t/you-will-be-a))
-                :error-message        (cond
-                                        (and pending? (not highest-role))
-                                        (i18n/label :t/community-join-requirements-not-met)
-
-                                        (and joined (not highest-role))
-                                        (i18n/label :t/membership-requirements-not-met)))
-         (update :button-one-props
-                 merge
-                 (cond (and pending? (not highest-role))
-                       {:type      :danger
-                        :disabled? false
-                        :on-press  cancel-join-request}
-
-                       (and joined (not highest-role))
-                       {:type      :danger
-                        :disabled? false
-                        :on-press  leave-community})))
-
-       (not can-edit-addresses?)
-       (assoc :actions          :two-actions
-              :button-one-label (i18n/label :t/confirm-changes)
-              :button-two-label (i18n/label :t/cancel)
-              :button-two-props {:type     :grey
-                                 :on-press cancel-selection}
-              :error-message    (cond
-                                  (empty? addresses-to-reveal)
-                                  (i18n/label :t/no-addresses-selected)
-
-                                  (not highest-role)
-                                  (i18n/label :t/addresses-dont-contain-tokens-needed))))]))
-
-(defn view
-  []
-  (let [{id :community-id} (rf/sub [:get-screen-params])
-
-        color (rf/sub [:communities/community-color id])
-
-        can-edit-addresses? (rf/sub [:communities/can-edit-shared-addresses? id])
-
-        wallet-accounts (rf/sub [:wallet/accounts-without-watched-accounts])
-        unmodified-addresses-to-reveal (rf/sub [:communities/addresses-to-reveal id])
-        [addresses-to-reveal set-addresses-to-reveal] (rn/use-state unmodified-addresses-to-reveal)
-
-        unmodified-flag-share-all-addresses (rf/sub [:communities/share-all-addresses? id])
-        [flag-share-all-addresses
-         set-flag-share-all-addresses] (rn/use-state unmodified-flag-share-all-addresses)
-
-        identical-choices? (and (= unmodified-addresses-to-reveal addresses-to-reveal)
-                                (= unmodified-flag-share-all-addresses flag-share-all-addresses))
-
-        cancel-selection
-        (fn []
-          (rf/dispatch [:communities/check-permissions-to-join-community
-                        id
-                        unmodified-addresses-to-reveal
-                        :based-on-client-selection])
-          (rf/dispatch [:hide-bottom-sheet]))
-
-        toggle-flag-share-all-addresses
-        (fn []
-          (let [new-value (not flag-share-all-addresses)]
-            (set-flag-share-all-addresses new-value)
-            (when new-value
-              (set-addresses-to-reveal (set (map :address wallet-accounts))))))]
+              (rf/dispatch [:communities/set-addresses-to-reveal id addresses-to-reveal]))))]

    (rn/use-mount
     (fn []
@@ -348,6 +274,7 @@
     (fn []
       (rf/dispatch [:communities/check-permissions-to-join-during-selection id addresses-to-reveal]))
     [id addresses-to-reveal])
+
    [:<>
     [page-top
      {:community-id        id
@@ -376,14 +303,64 @@
       :key-fn                  :address
       :data                    wallet-accounts}]

-     [selection-bottom-actions id
-      {:flag-share-all-addresses
-       flag-share-all-addresses
-       :addresses-to-reveal
-       addresses-to-reveal
-       :cancel-selection
-       cancel-selection
-       :can-edit-addresses?
-       can-edit-addresses?
-       :identical-choices?
-       identical-choices?}]]))
+     [quo/bottom-actions
+      (cond-> {:role             (role-keyword highest-role)
+               :description      (if highest-role
+                                   :top
+                                   :top-error)
+               :button-one-props {:customization-color color
+                                  :on-press            confirm-changes
+                                  :disabled?           (or (empty? addresses-to-reveal)
+                                                           (not highest-role)
+                                                           identical-choices?)}}
+        can-edit-addresses?
+        (->
+          (assoc :actions              :one-action
+                 :button-one-label     (cond
+                                         (and pending? (not highest-role))
+                                         (i18n/label :t/cancel-request)
+
+                                         (and joined (not highest-role))
+                                         (i18n/label :t/leave-community)
+
+                                         :else
+                                         (i18n/label :t/confirm-changes))
+                 :description-top-text (cond
+                                         (and pending? highest-role)
+                                         (i18n/label :t/eligible-to-join-as)
+
+                                         (and joined (= highest-role unmodified-role))
+                                         (i18n/label :t/you-are-a)
+
+                                         (and joined (not= highest-role unmodified-role))
+                                         (i18n/label :t/you-will-be-a))
+                 :error-message        (cond
+                                         (and pending? (not highest-role))
+                                         (i18n/label :t/community-join-requirements-not-met)
+
+                                         (and joined (not highest-role))
+                                         (i18n/label :t/membership-requirements-not-met)))
+          (update :button-one-props
+                  merge
+                  (cond (and pending? (not highest-role))
+                        {:type      :danger
+                         :disabled? false
+                         :on-press  cancel-join-request}
+
+                        (and joined (not highest-role))
+                        {:type      :danger
+                         :disabled? false
+                         :on-press  leave-community})))
+
+        (not can-edit-addresses?)
+        (assoc :actions          :two-actions
+               :button-one-label (i18n/label :t/confirm-changes)
+               :button-two-label (i18n/label :t/cancel)
+               :button-two-props {:type     :grey
+                                  :on-press cancel-selection}
+               :error-message    (cond
+                                   (empty? addresses-to-reveal)
+                                   (i18n/label :t/no-addresses-selected)
+
+                                   (not highest-role)
+                                   (i18n/label :t/addresses-dont-contain-tokens-needed))))]]))
@@ -3,7 +3,7 @@
    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))

-(def community-keys-renamed
+(def commmunity-keys-renamed
  {:requestedAccessAt           :requested-access-at
   :fileSize                    :file-size
   :communityTokensMetadata     :community-tokens-metadata
@@ -35,7 +35,7 @@
  [k]
  (let [s                  (name k)
        starts-with-digit? (re-matches #"^\d.*" s)
-        existing-rename    (k community-keys-renamed)]
+        existing-rename    (k commmunity-keys-renamed)]
    (cond starts-with-digit? s
          existing-rename    existing-rename
          :else              (keyword s))))
@@ -178,16 +178,23 @@
         :container-style     {:margin-horizontal 12 :margin-top 12 :margin-bottom 12}
         :disabled?           (not can-request-access?)
         :icon-left           (if can-request-access? :i/unlocked :i/locked)}
-        (i18n/label :t/request-to-join)]])))
+        (i18n/label :t/join-open-community)]])))

 (defn- join-community
-  [{:keys [id joined permissions] :as community}]
+  [{:keys [id joined permissions can-request-access?] :as community}]
  (let [pending?        (rf/sub [:communities/my-pending-request-to-join id])
        access-type     (get-access-type (:access permissions))
        unknown-access? (= access-type :unknown-access)
        invite-only?    (= access-type :invite-only)]
-    (when-not (or joined pending? invite-only? unknown-access?)
-      [token-requirements community])))
+    [:<>
+     (when-not (or joined pending? invite-only? unknown-access?)
+       [token-requirements community])
+     (when (and can-request-access? (not joined))
+       [quo/text
+        {:size   :paragraph-2
+         :weight :regular
+         :style  style/review-notice}
+        (i18n/label :t/community-admins-will-review-your-request)])]))

 (defn- status-tag
  [community-id joined]
@@ -153,7 +153,7 @@
                                                           @full-name
                                                           (i18n/label :t/your-name))
                                    :customization-color @custom-color}
-              :title-input-props   {:default-value  display-name
+              :title-input-props   {:default-value  @full-name
                                    :auto-focus     true
                                    :max-length     c/profile-name-max-length
                                    :on-change-text on-change-text}}]]
@@ -135,6 +135,7 @@
    [status-im.contexts.preview.quo.password.tips :as tips]
    [status-im.contexts.preview.quo.profile.collectible :as collectible]
    [status-im.contexts.preview.quo.profile.collectible-list-item :as collectible-list-item]
+    [status-im.contexts.preview.quo.profile.expanded-collectible :as expanded-collectible]
    [status-im.contexts.preview.quo.profile.link-card :as link-card]
    [status-im.contexts.preview.quo.profile.profile-card :as profile-card]
    [status-im.contexts.preview.quo.profile.select-profile :as select-profile]
@@ -420,6 +421,8 @@
                        :component collectible/view}
                       {:name      :collectible-list-item
                        :component collectible-list-item/view}
+                       {:name      :expanded-collectible
+                        :component expanded-collectible/view}
                       {:name      :link-card
                        :component link-card/view}
                       {:name      :profile-card
@@ -0,0 +1,46 @@
+(ns status-im.contexts.preview.quo.profile.expanded-collectible
+  (:require
+    [quo.core :as quo]
+    [reagent.core :as reagent]
+    [status-im.contexts.preview.quo.preview :as preview]))
+
+(defonce vertical-image
+  "https://images.unsplash.com/photo-1526512340740-9217d0159da9?q=80&w=1000&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxzZWFyY2h8Mnx8dmVydGljYWx8ZW58MHx8MHx8fDA%3D")
+(defonce horizontal-image
+  "https://media.istockphoto.com/id/603164912/photo/suburb-asphalt-road-and-sun-flowers.jpg?s=612x612&w=0&k=20&c=qLoQ5QONJduHrQ0kJF3fvoofmGAFcrq6cL84HbzdLQM=")
+
+(def descriptor
+  [{:key  :square?
+    :type :boolean}
+   {:key  :counter
+    :type :text}
+   {:key     :status
+    :type    :select
+    :options [{:key :loading}
+              {:key :default}
+              {:key :unsupported}
+              {:key :cant-fetch}]}
+   {:type    :select
+    :key     :image-type
+    :options [{:key :vertical}
+              {:key :horizontal}]}])
+
+(defn view
+  []
+  (let [state (reagent/atom {:square?    false
+                             :counter    ""
+                             :status     :default
+                             :image-type :horizontal})]
+    (fn []
+      [preview/preview-container
+       {:state                     state
+        :descriptor                descriptor
+        :component-container-style {:padding-vertical  20
+                                    :margin-horizontal 35}}
+       [quo/expanded-collectible
+        (assoc (dissoc @state :image-type)
+               :image-src (if (= :vertical (:image-type @state))
+                            vertical-image
+                            horizontal-image)
+               :counter   (when (seq (:counter @state)) (:counter @state))
+               :on-press  #(js/alert "Pressed"))]])))
@@ -78,7 +78,7 @@

                  :else
                  [[:profile.settings/switch-theme-fx
-                    [(or (:appearance settings)
+                    [(or (get-in db [:profile/profile :appearance])
                         constants/theme-type-dark)
                     :shell-stack
                     false]]
@@ -1,11 +1,12 @@
 (ns status-im.contexts.profile.settings.effects
  (:require [native-module.core :as native-module]
+            [quo.foundations.colors :as colors]
            [re-frame.core :as re-frame]
            [react-native.platform :as platform]
            [status-im.common.theme.core :as theme]
            [status-im.constants :as constants]
-            [status-im.setup.hot-reload :as hot-reload]
-            [utils.re-frame :as rf]))
+            [status-im.contexts.shell.jump-to.utils :as shell.utils]
+            [status-im.setup.hot-reload :as hot-reload]))

 (re-frame/reg-fx
 :profile.settings/blank-preview-flag-changed
@@ -21,14 +22,19 @@
 (re-frame/reg-fx
 :profile.settings/switch-theme-fx
 (fn [[theme-type view-id reload-ui?]]
-   (let [theme (if (or (= theme-type constants/theme-type-dark)
-                       (and (= theme-type constants/theme-type-system)
-                            (theme/device-theme-dark?)))
-                 :dark
-                 :light)]
+   (let [[theme status-bar-theme nav-bar-color]
+         ;; Status bar theme represents status bar icons colors, so opposite to app theme
+         (if (or (= theme-type constants/theme-type-dark)
+                 (and (= theme-type constants/theme-type-system)
+                      (theme/device-theme-dark?)))
+           [:dark :light colors/neutral-100]
+           [:light :dark colors/white])]
     (theme/set-theme theme)
-     (rf/dispatch [:reload-status-nav-color view-id])
+     (re-frame/dispatch [:change-shell-status-bar-style
+                         (if (shell.utils/home-stack-open?) status-bar-theme :light)])
     (when reload-ui?
       (re-frame/dispatch [:dismiss-all-overlays])
       (when js/goog.DEBUG
-         (hot-reload/reload))))))
+         (hot-reload/reload))
+       (when-not (= view-id :shell-stack)
+         (re-frame/dispatch [:change-shell-nav-bar-color nav-bar-color]))))))
@@ -1,11 +1,11 @@
 (ns status-im.contexts.shell.activity-center.notification.reply.view
  (:require
    [clojure.string :as string]
+    [legacy.status-im.ui.screens.chat.message.legacy-view :as old-message]
    [quo.core :as quo]
    [react-native.gesture :as gesture]
    [status-im.common.not-implemented :as not-implemented]
    [status-im.constants :as constants]
-    [status-im.contexts.chat.messenger.messages.content.sticker-message.view :as sticker-message]
    [status-im.contexts.shell.activity-center.notification.common.view :as common]
    [status-im.contexts.shell.activity-center.notification.reply.style :as style]
    [utils.datetime :as datetime]
@@ -34,7 +34,7 @@
        :message-text (get-in message [:content :text])}])

    constants/content-type-sticker
-    [sticker-message/view {:url (-> message :content :sticker :url)}]
+    [old-message/sticker message]

    constants/content-type-system-pinned-message
    [not-implemented/not-implemented
@@ -14,7 +14,9 @@
    (reanimated/set-shared-value (:home-stack-state @state/shared-values-atom) home-stack-state-value)
    (utils/change-selected-stack-id stack-id true home-stack-state-value)
    (js/setTimeout
-     #(utils/load-stack stack-id)
+     (fn []
+       (utils/load-stack stack-id)
+       (utils/change-shell-status-bar-style))
     (if animate? shell.constants/shell-animation-time 0))))

 (defn change-tab
@@ -39,6 +41,7 @@
    (reanimated/set-shared-value (:animate-home-stack-left @state/shared-values-atom) true)
    (reanimated/set-shared-value (:home-stack-state @state/shared-values-atom) home-stack-state-value)
    (utils/change-selected-stack-id stack-id true home-stack-state-value)
+    (utils/change-shell-status-bar-style)
    (when animate? (utils/update-view-id (or stack-id :shell)))))

 ;;;; Floating Screen
@@ -108,6 +108,16 @@
     :dispatch [:set-view-id :shell]
     :effects.shell/navigate-to-jump-to nil}))

+(rf/defn change-shell-status-bar-style
+  {:events [:change-shell-status-bar-style]}
+  [_ style]
+  {:merge-options {:id "shell-stack" :options {:statusBar {:style style}}}})
+
+(rf/defn change-shell-nav-bar-color
+  {:events [:change-shell-nav-bar-color]}
+  [_ color]
+  {:merge-options {:id "shell-stack" :options {:navigationBar {:backgroundColor color}}}})
+
 (rf/defn shell-navigate-to
  {:events [:shell/navigate-to]}
  [{:keys [db now]} go-to-view-id screen-params animation hidden-screen?]
@@ -1,5 +1,6 @@
 (ns status-im.contexts.shell.jump-to.utils
  (:require
+    [quo.theme :as quo.theme]
    [react-native.async-storage :as async-storage]
    [react-native.core :as rn]
    [react-native.platform :as platform]
@@ -135,3 +136,12 @@
 (defn update-view-id
  [view-id]
  (rf/dispatch [:set-view-id view-id]))
+
+;;; Misc
+(defn change-shell-status-bar-style
+  []
+  (rf/dispatch [:change-shell-status-bar-style
+                (if (or (= :dark (quo.theme/get-theme))
+                        (not (home-stack-open?)))
+                  :light
+                  :dark)]))
@@ -88,7 +88,7 @@
    (load-and-show-profile scanned-text)

    (eth-address? scanned-text)
-    (debounce/debounce-and-dispatch [:navigate-to :screen/wallet.accounts scanned-text] 300)
+    (debounce/debounce-and-dispatch [:navigate-to :wallet-accounts scanned-text] 300)

    (eip681-address? scanned-text)
    (do
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Siddarth Kumar	9cdeaf6152	stage experiments with bun	2024-03-26 14:38:37 +05:30
Siddarth Kumar	399da799a6	speed up android debug builds (#19335 ) fixes #19081 ## Summary This PR aims to improve android build step for debug variants by ensuring we do not rebuild the android derivation for any change made to `clojurescript` code. We also do the following things : - enable `JVM` parallel garbage collector. - get rid of `dexOptions` which was deprecated in `gradle 8`. - add additional `parallel` flag to `gradle` to speed up builds. ## Review notes - `make run-clojure` - `make run-android` - ctrl + C on android terminal and edit any `cljs` file - `make run-android` ( should build almost instantly )	2024-03-23 15:12:05 +05:30
Yevheniia Berdnyk	ebc12c36e4	e2e: temp fix for jump to	2024-03-22 22:45:22 +02:00
mmilad75	c003db42ae	Create Navigation mechanism for wizard type flows #19059 (#19123 )	2024-03-22 21:00:35 +03:30
Siddarth Kumar	a716f4e435	upgrade `react-native` to 0.73.5 (#18563 ) fixes #18291 ## Summary Changes worth mentioning are : - More hacks/patches - Force app to use `Java 17` everywhere to compile `kotlin,java` - `gems` were upgraded after a long time - `aapt2` was bumped to `8.1.1` - `metro` is now at `0.80.4` - `xcbeautify` was bumped to `1.4.0` - `@react-native-community/clipboard` lib was replaced with `@react-native-clipboard/clipboard` - `react-native-dialogs` lib was upgraded to `1.1.2` - `react-native-gesture-handler` lib was upgraded to `2.14.1` - `react-native-navigation` was upgraded to `7.37.2` ## Platforms - Android - iOS	2024-03-22 19:51:44 +05:30
flexsurfer	6f07e8022e	Allow user to select a color for the group chat #18982 (#19088 )	2024-03-22 14:10:51 +01:00
Omar Basem	38fcb0c1a0	Wallet: Keypair feature flag (#19333 ) * Wallet: Keypair feature flag (#19333)	2024-03-22 16:41:36 +04:00
Flavio Fraschetti	0cc414d717	fraschetti/add wallet-get-address-details-contract-test (#19340 ) Introduces comprehensive tests for the wallet_getAddressDetails endpoint	2024-03-22 06:51:36 -03:00
Ulises Manuel	ad42882c5b	Increase debounce timing for fetching routes (#19100 )	2024-03-21 11:15:36 -06:00
Jamie Caprani	ee35fd52f6	chore(quo): add profile/extended collectible component (#19297 )	2024-03-21 08:54:14 -07:00
@@ -1 +1 @@
 .28.0
 .27.0