add more tests

fix address input scan
try to fix tests
2024-03-05 11:43:19 -03:00 · 2024-03-05 11:43:18 -03:00 · 2024-03-05 11:43:18 -03:00 · 2024-03-05 11:43:18 -03:00 · 2024-03-05 11:43:17 -03:00 · 2024-03-05 11:43:17 -03:00
437 changed files with 13892 additions and 18825 deletions
@@ -34,3 +34,4 @@ STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+FLAG_NEW_CONTACT_UI_ENABLED=0
@@ -22,37 +22,37 @@
  :multi-lhs-hang]

 :fn-map
- {"reg-sub"           :arg1-pair
-  "h/describe"        :arg1-body
-  "h/describe-skip"   :arg1-body
-  "h/describe-only"   :arg1-body
-  "h/test"            :arg1-body
-  "h/test-skip"       :arg1-body
-  "h/test-only"       :arg1-body
-  "test/async"        :arg1-body
-  "test/use-fixtures" :arg1-body
-  "global.describe"   :arg1-body
-  "global.test"       :arg1-body
-  "list-comp"         :binding
-  "defview"           :arg1-body
-  "letsubs"           :binding
-  "with-let"          "let"
-  "reg-event-fx"      :arg1-pair
-  "reg-fx"            :arg1-pair
-  "testing"           :arg1-body
-  "deftest-sub"       :arg1-body
-  "test-async"        :arg1-body
-  "wait-for"          :arg1-body
-  "with-deps-check"   :arg1-body
-  "schema/=>"         :arg1-body
-  "->"                [:noarg1-body
-                       {:list               {:constant-pair? false :force-nl? false}
-                        :next-inner-restore [[:list :constant-pair?]]}]
-  "set!"              "reset!"
-  "assoc-when"        "assoc"
-  "assoc-some"        "assoc"
-  "conj-when"         "conj"
-  "conj-some"         "conj"}
+ {"reg-sub"            :arg1-pair
+  "h/describe"         :arg1-body
+  "h/describe-skip"    :arg1-body
+  "h/describe-only"    :arg1-body
+  "h/test"             :arg1-body
+  "h/test-skip"        :arg1-body
+  "h/test-only"        :arg1-body
+  "test/async"         :arg1-body
+  "test/use-fixtures"  :arg1-body
+  "global.describe"    :arg1-body
+  "global.test"        :arg1-body
+  "list-comp"          :binding
+  "defview"            :arg1-body
+  "letsubs"            :binding
+  "with-let"           "let"
+  "reg-event-fx"       :arg1-pair
+  "reg-fx"             :arg1-pair
+  "testing"            :arg1-body
+  "deftest-sub"        :arg1-body
+  "h/integration-test" :arg1-body
+  "wait-for"           :arg1-body
+  "with-deps-check"    :arg1-body
+  "schema/=>"          :arg1-body
+  "->"                 [:noarg1-body
+                        {:list               {:constant-pair? false :force-nl? false}
+                         :next-inner-restore [[:list :constant-pair?]]}]
+  "set!"               "reset!"
+  "assoc-when"         "assoc"
+  "assoc-some"         "assoc"
+  "conj-when"          "conj"
+  "conj-some"          "conj"}

 :style-map
 {:no-comma {:map {:comma? false}}
@@ -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
-	bun shadow-cljs watch mobile
+	yarn 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
-	bun shadow-cljs run re-frisk-remote.core/start
+	yarn 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,19 @@ 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
-	bun shadow-cljs server
+	yarn shadow-cljs server

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

@@ -351,13 +350,12 @@ test: _test-clojure

 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
-	bun node-pre-gyp rebuild
+	yarn install
 	rm -f target/test/test.js
-	bun shadow-cljs compile mocks && \
+	yarn shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
-		'bun shadow-cljs watch test --verbose' \
+		'yarn shadow-cljs watch test --verbose' \
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"

 test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js
@@ -387,7 +385,7 @@ component-test-watch: export JEST_USE_SILENT_REPORTER := false
 component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
-	nodemon --exec 'bun shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
+	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs

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

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

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

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

@@ -1 +1 @@
-2.27.0
+1.25.0
@@ -138,16 +138,11 @@ def getEnvOrConfig = { varName ->
 android {
    ndkVersion rootProject.ext.ndkVersion

-    buildToolsVersion rootProject.ext.buildToolsVersion
-    compileSdk rootProject.ext.compileSdkVersion
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
+    compileSdkVersion rootProject.ext.compileSdkVersion

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

    namespace "im.status.ethereum"
@@ -199,6 +194,10 @@ android {
        doNotStrip '*/mips/*.so'
        doNotStrip '*/mips64/*.so'
    }
+    dexOptions {
+        jumboMode true
+        javaMaxHeapSize "8g"
+    }
    splits {
        abi {
            reset()
@@ -287,7 +286,6 @@ 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,5 +7,7 @@
    <!-- 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" />
+   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" >
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
+    </application>
 </manifest>
@@ -4,7 +4,6 @@

    <!-- 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" />
@@ -75,13 +74,7 @@
            </intent-filter>
        </activity>
        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-        <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>
+        <service android:name="im.status.ethereum.pushnotifications.ForegroundService"></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).reactNativeHost
+                (getApplication() as MainApplication).getReactNativeHost()
                .getReactInstanceManager()
                .getCurrentReactContext()
                ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
@@ -25,13 +25,14 @@ class MainApplication : NavigationApplication() {
            return BuildConfig.DEBUG
        }

-        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 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 getJSMainModuleName(): String = "index"
@@ -41,8 +42,9 @@ class MainApplication : NavigationApplication() {
        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
    }

-    override val reactNativeHost: ReactNativeHost
-        get() = mReactNativeHost
+    override fun getReactNativeHost(): ReactNativeHost {
+        return mReactNativeHost
+    }

    override fun onCreate() {
        super.onCreate()
@@ -15,8 +15,6 @@ ext {
    supportLibVersion   = project.supportLibVersion
    gradlePluginVersion = project.gradlePluginVersion
    kotlinVersion       = project.kotlinPluginVersion
-    kotlinPluginVersion = project.kotlinPluginVersion
-    kotlinToolsVersion  = project.kotlinPluginVersion
    ndkVersion = "25.2.9519653"
 }

@@ -30,7 +28,6 @@ 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")
    }
 }

@@ -44,30 +41,11 @@ 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=34
-targetSdkVersion=34
-buildToolsVersion=34.0.0
+compileSdkVersion=33
+targetSdkVersion=33
+buildToolsVersion=33.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 -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx8704M

 versionCode=9999
 commitHash=unknown
@@ -1,4 +1,19 @@
 module.exports = {
-  presets: ['module:@react-native/babel-preset'],
+  presets: ['module:metro-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',
+            },
+          },
+        ],
+      ],
+    },
+  },
 };
@@ -5,8 +5,8 @@ pipeline {
  agent { label 'linux' }

  triggers {
-    // Nightly at 0am
-    cron 'H 0 * * *'
+    // Nightly at 2am
+    cron 'H 2 * * *'
  }

  parameters {
@@ -1,4 +1,3 @@
 source 'https://rubygems.org'

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

 PLATFORMS
-  arm64-darwin-22
+  ruby

 DEPENDENCIES
-  activesupport (>= 6.1.7.3, < 7.1.0)
  fastlane (>= 2.131.0)

 BUNDLED WITH
-   2.4.13
+   2.3.9
@@ -1,25 +1,14 @@
 {
-  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 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+      sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
      type = "gem";
    };
-    version = "2.8.6";
+    version = "2.8.4";
  };
  artifactory = {
    groups = ["default"];
@@ -46,20 +35,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
+      sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
      type = "gem";
    };
-    version = "1.3.0";
+    version = "1.2.0";
  };
  aws-partitions = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm";
+      sha256 = "1256rf6zjh3canwr636w7yczbvhh72cpz2fw5ixljbh4fcfkrvlm";
      type = "gem";
    };
-    version = "1.872.0";
+    version = "1.768.0";
  };
  aws-sdk-core = {
    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -67,10 +56,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh";
+      sha256 = "10djgbz4k9w3axka8xrhf97h9yh9svi5g5xvncfwnkg6h22w2177";
      type = "gem";
    };
-    version = "3.190.1";
+    version = "3.173.0";
  };
  aws-sdk-kms = {
    dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -78,10 +67,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1";
+      sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
      type = "gem";
    };
-    version = "1.75.0";
+    version = "1.64.0";
  };
  aws-sdk-s3 = {
    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -89,10 +78,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya";
+      sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
      type = "gem";
    };
-    version = "1.141.0";
+    version = "1.122.0";
  };
  aws-sigv4 = {
    dependencies = ["aws-eventstream"];
@@ -100,10 +89,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
+      sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
      type = "gem";
    };
-    version = "1.8.0";
+    version = "1.5.2";
  };
  babosa = {
    groups = ["default"];
@@ -167,16 +156,6 @@
    };
    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 = [];
@@ -193,20 +172,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w";
+      sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2";
      type = "gem";
    };
-    version = "0.6.5";
+    version = "0.6.4";
  };
  domain_name = {
+    dependencies = ["unf"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si";
+      sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
      type = "gem";
    };
-    version = "0.6.20231109";
+    version = "0.5.20190701";
  };
  dotenv = {
    groups = ["default"];
@@ -233,10 +213,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1q9yz7x36mpzpz04bg6hdyrzzk4bri9jg3h2ygw26bf6v3axq53q";
+      sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
      type = "gem";
    };
-    version = "0.108.0";
+    version = "0.99.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"];
@@ -383,15 +363,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" "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"];
+    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"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0p2b92csayzlj60v15fz3mq4h23kvvr7swhaavi6fpaqzf70iafi";
+      sha256 = "15sa3v3aaslympg9nmadmpxpbzykdiybzxn3navc7mf0iscb3q7s";
      type = "gem";
    };
-    version = "2.217.0";
+    version = "2.212.2";
  };
  gh_inspector = {
    groups = ["default"];
@@ -409,10 +389,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "046j100lrh5dhb8p3gr38fyqrw8vcif97pqb55ysipy874lafw49";
+      sha256 = "0ks2ak4fcvlflhyinykvd88g2ybxwsbc347aww349zhn1mqprbvg";
      type = "gem";
    };
-    version = "0.54.0";
+    version = "0.42.0";
  };
  google-apis-core = {
    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@@ -420,10 +400,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd";
+      sha256 = "184zkm5agi7r5fl79hgahjpydsc4d23nd2ynh2sr9z8gs2w4h82f";
      type = "gem";
    };
-    version = "0.11.2";
+    version = "0.11.0";
  };
  google-apis-iamcredentials_v1 = {
    dependencies = ["google-apis-core"];
@@ -453,10 +433,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx";
+      sha256 = "17qamcjnf22zvw1g169g8a2gkzdsxx4ij3a4ganihyrcf9r62asj";
      type = "gem";
    };
-    version = "0.29.0";
+    version = "0.19.0";
  };
  google-cloud-core = {
    dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -464,10 +444,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "00wfvdvdv9m4l5ydn6xp65n68mgmpqr3n09hzvxs7gp8fly3j17v";
+      sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za";
      type = "gem";
    };
-    version = "1.6.1";
+    version = "1.6.0";
  };
  google-cloud-env = {
    dependencies = ["faraday"];
@@ -475,10 +455,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "056r1p8vhjswnx2cy3mzhwc5gj03whmpz8m4p2ph37gag5bpnxmf";
+      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
      type = "gem";
    };
-    version = "2.1.0";
+    version = "1.6.0";
  };
  google-cloud-errors = {
    groups = ["default"];
@@ -496,21 +476,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j";
+      sha256 = "1skhlpcykxxzw3050cwngdyc3n746wfx443w1w9chxwjbh2ix6i9";
      type = "gem";
    };
-    version = "1.45.0";
+    version = "1.44.0";
  };
  googleauth = {
-    dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"];
+    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0spv89di017rg25psiv4w3pn6f67y2w6vv8w910i83b5yii84rl1";
+      sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
      type = "gem";
    };
-    version = "1.9.1";
+    version = "1.5.2";
  };
  highline = {
    groups = ["default"];
@@ -543,17 +523,6 @@
    };
    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 = [];
@@ -569,20 +538,30 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
+      sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
      type = "gem";
    };
-    version = "2.7.1";
+    version = "2.6.3";
  };
  jwt = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87";
+      sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
      type = "gem";
    };
-    version = "2.7.1";
+    version = "2.7.0";
+  };
+  memoist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
+      type = "gem";
+    };
+    version = "0.16.2";
  };
  mini_magick = {
    groups = ["default"];
@@ -599,20 +578,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
+      sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
      type = "gem";
    };
-    version = "1.1.5";
-  };
-  minitest = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
-      type = "gem";
-    };
-    version = "5.20.0";
+    version = "1.1.2";
  };
  multi_json = {
    groups = ["default"];
@@ -629,10 +598,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x";
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
      type = "gem";
    };
-    version = "2.3.0";
+    version = "2.0.0";
  };
  nanaimo = {
    groups = ["default"];
@@ -689,20 +658,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
+      sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
      type = "gem";
    };
-    version = "5.0.4";
+    version = "5.0.1";
  };
  rake = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
+      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
      type = "gem";
    };
-    version = "13.1.0";
+    version = "13.0.6";
  };
  representable = {
    dependencies = ["declarative" "trailblazer-option" "uber"];
@@ -730,10 +699,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
      type = "gem";
    };
-    version = "3.2.6";
+    version = "3.2.5";
  };
  rouge = {
    groups = ["default"];
@@ -781,10 +750,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6";
+      sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x";
      type = "gem";
    };
-    version = "0.18.0";
+    version = "0.17.0";
  };
  simctl = {
    dependencies = ["CFPropertyList" "naturally"];
@@ -813,10 +782,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr";
+      sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
      type = "gem";
    };
-    version = "3.0.2";
+    version = "1.8.0";
  };
  trailblazer-option = {
    groups = ["default"];
@@ -843,10 +812,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460";
+      sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
      type = "gem";
    };
-    version = "0.8.2";
+    version = "0.8.1";
  };
  tty-spinner = {
    dependencies = ["tty-cursor"];
@@ -859,17 +828,6 @@
    };
    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 = [];
@@ -880,15 +838,36 @@
    };
    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 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+      sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
      type = "gem";
    };
-    version = "2.5.0";
+    version = "1.8.0";
  };
  webrick = {
    groups = ["default"];
@@ -916,10 +895,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn";
+      sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi";
      type = "gem";
    };
-    version = "1.23.0";
+    version = "1.22.0";
  };
  xcpretty = {
    dependencies = ["rouge"];
@@ -32,8 +32,8 @@ abstract_target 'Status' do

  use_react_native!(
    :path => config[:reactNativePath],
-    :fabric_enabled => flags[:fabric_enabled],
    :hermes_enabled => false,
+    :fabric_enabled => flags[:fabric_enabled],
    # An absolute path to your application root.
    :app_path => "#{Pod::Config.instance.installation_root}/.."
  )
@@ -63,18 +63,15 @@ 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,10 +8,8 @@

 /* 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 */; };
@@ -37,7 +35,6 @@
 		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 */; };
@@ -47,6 +44,8 @@
 		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 */; };
@@ -61,6 +60,7 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
+		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>"; };
-		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; };
+		28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.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,22 +123,24 @@
 		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>"; };
-		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>"; };
+		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>"; };
 		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; };
@@ -148,12 +150,10 @@
 		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>"; };
-		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>"; };
+		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>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				536FC260A89500EC9FDB1585 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				E6794203DEE6BE3C85F205F8 /* 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 */,
-				17F5C611511E64ACE76B00A3 /* libPods-Status-StatusIm.a in Frameworks */,
+				8BE7C1BD90A0AB68254988BD /* 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 */,
-				061AC5E3D44813C6D987FC70 /* libPods-Status-StatusImPR.a in Frameworks */,
+				9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				7AFB8653840373E5B625E16E /* libPods-Status-StatusIm.a */,
-				1F311917BE57976CED3B9842 /* libPods-Status-StatusIm-StatusImTests.a */,
-				C5D722CC6309CA4C8BC48244 /* libPods-Status-StatusImPR.a */,
+				28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */,
+				9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */,
+				5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				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 */,
+				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 */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */,
+				CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */,
+				D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				FD7194DC9A3E5A5277869CFC /* [CP] Check Pods Manifest.lock */,
+				523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */,
+				28606042DA81A750949525E4 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				4EE2E0EC4F119397E1A6B768 /* [CP] Check Pods Manifest.lock */,
+				BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				1B5C687FDBFFB60FD1043432 /* [CP] Copy Pods Resources */,
+				BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,48 +544,26 @@
 			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";
 		};
-		1A83906735641F17B807EB39 /* [CP] Copy Pods Resources */ = {
+		28606042DA81A750949525E4 /* [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_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}/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}/RCTI18nStrings.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;
-		};
-		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";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
@@ -616,7 +594,51 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
 		};
-		4EE2E0EC4F119397E1A6B768 /* [CP] Check Pods Manifest.lock */ = {
+		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 */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -638,29 +660,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		88DEE6D9CF4D6BA6F6D8DCB5 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		8F717D50D3D590696A6046EB /* [CP] Check Pods Manifest.lock */ = {
+		CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -682,6 +682,28 @@
 			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;
@@ -696,28 +718,6 @@
 			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 = D1CE733E3486B3A8B9185945 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 59C9C002A09CA7F40E69C6CB /* 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 = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -802,7 +802,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7625793B15B3B2A8E58F6277 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = ACFD5EEA905CF67FD6F8C2CC /* 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 = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -835,11 +835,11 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AE3313A464E280B64599C3BA /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -879,14 +879,13 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
-					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -895,7 +894,6 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
-					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -917,11 +915,11 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1E0A54C37353D912620563B4 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -955,14 +953,13 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
-					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -971,7 +968,6 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
-					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -992,11 +988,11 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CA58075FD8E5F9A0CA74E512 /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
@@ -1035,14 +1031,13 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
-					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -1051,7 +1046,6 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
-					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1071,11 +1065,11 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 79B38E3D4B033A711A7852FF /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -1108,14 +1102,13 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
-					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -1124,7 +1117,6 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
-					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1147,7 +1139,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1180,7 +1172,7 @@
 				ENABLE_TESTABILITY = YES;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1211,27 +1203,21 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.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;
 			};
@@ -1243,7 +1229,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1275,7 +1261,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -1298,27 +1284,21 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.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,11 +104,6 @@ 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,29 +59,31 @@
 	</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>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>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>UIAppFonts</key>
 	<array>
 		<string>Inter-Bold.otf</string>
@@ -138,5 +140,8 @@
 		<string>A00000080400010301</string>
 		<string>A000000151000000</string>
 	</array>
+	<key>NFCReaderUsageDescription</key>
+	<string>Enable Keycard</string>
+	<key>CADisableMinimumFrameDurationOnPhone</key><true/>
 </dict>
 </plist>
@@ -3,7 +3,6 @@ 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;
@@ -79,10 +78,10 @@ public class ForegroundService extends Service {
        

      
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE);
        Intent stopIntent = new Intent(PushNotificationHelper.ACTION_TAP_STOP);
        PendingIntent stopPendingIntent = PendingIntent.getBroadcast(context, 0, stopIntent,
-                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);

        Notification notification = new NotificationCompat.Builder(context, CHANNEL_ID)
            .setSmallIcon(R.drawable.ic_stat_notify_status)
@@ -96,14 +95,8 @@ public class ForegroundService extends Service {
                       context.getResources().getString(R.string.stop),
                       stopPendingIntent)
            .build();
-
        // the id of the foreground notification MUST NOT be 0
-        if (Build.VERSION.SDK_INT >= 33) {
-            startForeground(1, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
-        } else {
-            startForeground(1, notification);
-        }
-
+        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_IMMUTABLE : PendingIntent.FLAG_CANCEL_CURRENT;
+    final int flag =  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE : 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.RECEIVER_EXPORTED);
+        context.registerReceiver(notificationActionReceiver, this.intentFilter);
        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_IMMUTABLE);
+                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);

                    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");

@@ -1888,36 +1888,6 @@ void _InitLogging(const FunctionCallbackInfo<Value>& args) {
    delete c;
 }

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

 void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountGenerateAndDeriveAddresses", _MultiAccountGenerateAndDeriveAddresses);
@@ -1975,7 +1945,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "connectionChange", _ConnectionChange);
 	NODE_SET_METHOD(exports, "pollSignal", _PollSignal);
 	NODE_SET_METHOD(exports, "initLogging", _InitLogging);
-	NODE_SET_METHOD(exports, "restoreAccountAndLogin", _RestoreAccountAndLogin);
 }

 NODE_MODULE(NODE_GYP_MODULE_NAME, init)
@@ -1,24 +1,22 @@
 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.6.1
+androidx.appcompat:appcompat-resources:1.4.1
+androidx.appcompat:appcompat-resources:1.4.2
 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.6.1
+androidx.appcompat:appcompat:1.4.1
+androidx.appcompat:appcompat:1.4.2
 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
@@ -40,16 +38,14 @@ 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.9.0
+androidx.core:core:1.7.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
@@ -58,18 +54,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:8.1.1
+androidx.databinding:databinding-common:7.4.2
 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:8.1.1
+androidx.databinding:databinding-compiler-common:7.4.2
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
-androidx.emoji2:emoji2-views-helper:1.2.0
-androidx.emoji2:emoji2:1.2.0
+androidx.emoji2:emoji2-views-helper:1.0.0
+androidx.emoji2:emoji2:1.0.0
 androidx.exifinterface:exifinterface:1.0.0
 androidx.exifinterface:exifinterface:1.1.0-beta01
 androidx.exifinterface:exifinterface:1.1.0-rc01
@@ -87,26 +83,23 @@ 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.5.1
+androidx.lifecycle:lifecycle-common:2.4.0
 androidx.lifecycle:lifecycle-livedata-core:2.0.0
 androidx.lifecycle:lifecycle-livedata-core:2.1.0
 androidx.lifecycle:lifecycle-livedata-core:2.3.1
-androidx.lifecycle:lifecycle-livedata-core:2.5.1
 androidx.lifecycle:lifecycle-livedata:2.0.0
 androidx.lifecycle:lifecycle-livedata:2.1.0
-androidx.lifecycle:lifecycle-process:2.4.1
+androidx.lifecycle:lifecycle-process:2.4.0
 androidx.lifecycle:lifecycle-runtime:2.0.0
 androidx.lifecycle:lifecycle-runtime:2.1.0
 androidx.lifecycle:lifecycle-runtime:2.1.0-rc01
 androidx.lifecycle:lifecycle-runtime:2.3.1
-androidx.lifecycle:lifecycle-runtime:2.5.1
+androidx.lifecycle:lifecycle-runtime:2.4.0
 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
@@ -114,13 +107,12 @@ 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.1
+androidx.resourceinspection:resourceinspection-annotation:1.0.0
 androidx.savedstate:savedstate:1.0.0
 androidx.savedstate:savedstate:1.0.0-rc01
 androidx.savedstate:savedstate:1.1.0
-androidx.savedstate:savedstate:1.2.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
-androidx.startup:startup-runtime:1.1.1
+androidx.startup:startup-runtime:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02
@@ -170,7 +162,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:8.1.1
+com.android.databinding:baseLibrary:7.4.2
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
@@ -180,7 +172,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:31.1.1
+com.android.tools.analytics-library:crash:30.4.2
 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
@@ -189,7 +181,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:31.1.1
+com.android.tools.analytics-library:protos:30.4.2
 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
@@ -198,7 +190,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:31.1.1
+com.android.tools.analytics-library:shared:30.4.2
 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
@@ -207,7 +199,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:31.1.1
+com.android.tools.analytics-library:tracker:30.4.2
 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
@@ -222,13 +214,12 @@ 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:8.1.1-10154469
-com.android.tools.build:aapt2:8.1.1-10154469
+com.android.tools.build:aapt2-proto:7.4.2-8841542
 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:8.1.1
+com.android.tools.build:aaptcompiler:7.4.2
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
@@ -237,14 +228,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:8.1.1
+com.android.tools.build:apksig:7.4.2
 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:8.1.1
+com.android.tools.build:apkzlib:7.4.2
 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
@@ -255,7 +246,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:8.1.1
+com.android.tools.build:builder-model:7.4.2
 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
@@ -266,7 +257,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:8.1.1
+com.android.tools.build:builder-test-api:7.4.2
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.0
@@ -277,14 +268,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:8.1.1
+com.android.tools.build:builder:7.4.2
 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.14.0
+com.android.tools.build:bundletool:1.11.4
 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
@@ -293,12 +284,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:8.1.1
+com.android.tools.build:gradle-api:7.4.2
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
 com.android.tools.build:gradle-core:3.0.0
 com.android.tools.build:gradle-core:3.0.1
-com.android.tools.build:gradle-settings-api:8.1.1
+com.android.tools.build:gradle-settings-api:7.4.2
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.0
@@ -319,7 +310,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:31.1.1
+com.android.tools.build:manifest-merger:30.4.2
 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
@@ -332,7 +323,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:31.1.1
+com.android.tools.ddms:ddmlib:30.4.2
 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
@@ -350,7 +341,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:31.1.1
+com.android.tools.layoutlib:layoutlib-api:30.4.2
 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
@@ -366,38 +357,35 @@ 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:31.1.1
+com.android.tools.lint:lint-model:30.4.2
 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:31.1.1
+com.android.tools.lint:lint-typedef-remover:30.4.2
 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:31.1.1
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2
 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:31.1.1
+com.android.tools.utp:android-device-provider-gradle-proto:30.4.2
 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: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-additional-test-output-proto:30.4.2
 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: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-coverage-proto:30.4.2
 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:31.1.1
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2
 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:31.1.1
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.0
@@ -408,7 +396,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:31.1.1
+com.android.tools:annotations:30.4.2
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.0
@@ -419,7 +407,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:31.1.1
+com.android.tools:common:30.4.2
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.0
@@ -430,7 +418,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:31.1.1
+com.android.tools:dvlib:30.4.2
 com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
@@ -439,7 +427,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:31.1.1
+com.android.tools:repository:30.4.2
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.0
@@ -450,7 +438,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:31.1.1
+com.android.tools:sdklib:30.4.2
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.0
@@ -461,61 +449,47 @@ 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:31.1.1
+com.android.tools:sdk-common:30.4.2
 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:8.1.1
+com.android:signflinger:7.4.2
 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:8.1.1
+com.android:zipflinger:7.4.2
 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.5.1
+com.facebook.fbjni:fbjni:0.3.0
 com.facebook.fresco:animated-base:2.5.0
 com.facebook.fresco:animated-drawable:2.5.0
 com.facebook.fresco:animated-gif:2.5.0
 com.facebook.fresco:drawee:2.5.0
-com.facebook.fresco: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-native:3.1.3
-com.facebook.fresco:imagepipeline-okhttp3:3.1.3
+com.facebook.fresco:imagepipeline-okhttp3:2.5.0
 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:memory-type-native:3.1.3
-com.facebook.fresco:middleware:3.1.3
+com.facebook.fresco:middleware:2.5.0
 com.facebook.fresco:nativeimagefilters:2.5.0
-com.facebook.fresco:nativeimagefilters:3.1.3
 com.facebook.fresco:nativeimagetranscoder: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.fresco:soloader:2.5.0
+com.facebook.fresco:ui-common:2.5.0
 com.facebook.infer.annotation:infer-annotation:0.18.0
-com.facebook.react:hermes-android:0.73.5
-com.facebook.react:react-android:0.73.5
+com.facebook.react:hermes-android:0.72.5
+com.facebook.react:react-android:0.72.5
 com.facebook.soloader:annotation:0.10.5
 com.facebook.soloader:nativeloader:0.10.5
 com.facebook.soloader:soloader:0.10.5
@@ -543,7 +517,6 @@ 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
@@ -572,7 +545,6 @@ 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
@@ -580,8 +552,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
@@ -595,7 +567,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.1-jre
+com.google.guava:guava:31.0.1-jre
 com.google.guava:listenablefuture:1.0
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
@@ -610,12 +582,10 @@ 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
@@ -647,56 +617,38 @@ 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
@@ -734,7 +686,6 @@ 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
@@ -749,7 +700,6 @@ 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
@@ -767,18 +717,16 @@ 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
@@ -790,22 +738,23 @@ 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.6.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
 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
@@ -845,7 +794,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.8.20-RC2
+org.jetbrains.kotlin:kotlin-reflect:1.7.10
 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
@@ -861,8 +810,7 @@ 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.8.20-RC2
-org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22
 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
@@ -870,16 +818,14 @@ 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.8.20-RC2
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22
 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.8.20-RC2
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22
 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
@@ -888,8 +834,7 @@ 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.8.20-RC2
-org.jetbrains.kotlin:kotlin-stdlib:1.8.21
+org.jetbrains.kotlin:kotlin-stdlib:1.7.22
 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
@@ -961,11 +906,8 @@ 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.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
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
@@ -47,14 +47,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.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' \
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.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,8 +12,7 @@ stdenv.mkDerivation {
    "patchBuildIdPhase"
    "patchKeyChainPhase"
    "patchGlogPhase"
-    "patchNativeNavigationPhase"
-    "patchRNScriptPhase"
+    "patchBoostPodSpec"
    "installPhase"
  ];

@@ -79,20 +78,12 @@ stdenv.mkDerivation {
    --replace 'export CXX="' '#export CXX="'
  '';

-  # https://github.com/wix/react-native-navigation/issues/7819
-  patchNativeNavigationPhase = ''
-    substituteInPlace ./node_modules/react-native-navigation/lib/android/app/build.gradle \
-      --replace 'JavaVersion.VERSION_1_8' 'JavaVersion.VERSION_17'
-
-    substituteInPlace ./node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt \
-      --replace 'host: View?,' 'host: View,' \
-      --replace 'info: AccessibilityNodeInfoCompat?' 'info: AccessibilityNodeInfoCompat'
-  '';
-  
-  # to fix https://github.com/status-im/status-mobile/issues/18548
-  patchRNScriptPhase = ''
-    substituteInPlace ./node_modules/react-native/scripts/react_native_pods_utils/script_phases.sh \
-      --replace 'cp -R -X' 'cp -R'
+  # 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' \
  '';

  # The ELF types are incompatible with the host platform, so let's not even try
@@ -26,10 +26,9 @@

 let
  inherit (lib) toLower optionalString stringLength makeLibraryPath elem;
-  notDebug = (buildType != "debug");

  # Pass secretsFile for POKT_TOKEN to jsbundle build
-  builtJsBundle = lib.optionals notDebug jsbundle { inherit secretsFile; };
+  builtJsBundle = jsbundle { inherit secretsFile; };

  # Map ANDROID_ABI_INCLUDE to status-go targets
  androidAbiIncludeSplit = lib.splitString ";" androidAbiInclude;
@@ -120,10 +119,8 @@ 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
@@ -156,7 +153,6 @@ 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, clang }:
+  bundlerEnv, cocoapods, bundler, ruby, curl }:

 let
  inherit (lib) optionals optionalString unique;
@@ -14,7 +14,7 @@ let

  inherit (fastlane) shellHook;

-  buildInputs = [ ruby bundler fastlane curl clang ]
+  buildInputs = [ ruby bundler fastlane curl ]
    ++ optionals stdenv.isDarwin [ cocoapods ];
 in {
  # HELPERS
@@ -51,7 +51,7 @@ in {
  };

  # Package version adjustments
-  gradle = super.gradle_8_3;
+  gradle = super.gradle_8;
  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 a fork of nixpkgs where we bump gradle to 8.3 and update build tools
+  # We follow the master branch of official nixpkgs.
  nixpkgsSrc = builtins.fetchTarball {
-    url = "https://github.com/status-im/nixpkgs/archive/44d8b23ebbe40ed16ef1aecef6c5354657c48b19.tar.gz";
-    sha256 = "sha256:0s7kjnc8drchzp268yzbv5snc4702hswcns9hrncjq4im8cv6mf9";
+    url = "https://github.com/NixOS/nixpkgs/archive/e7603eba51f2c7820c0a182c6bbb351181caa8e7.tar.gz";
+    sha256 = "sha256:0mwck8jyr74wh1b7g6nac1mxy6a0rkppz8n12andsffybsipz5jw";
  };

  # Status specific configuration defaults
@@ -10,7 +10,7 @@ let

  pname = "aapt2";
  # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  version = "8.1.1-10154469";
+  version = "7.4.2-8841542";

  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-p54GGvEfAo0yk8euVO7QTu/c3zuityZhyGdhFSV6w+E=";
-        osx = "sha256-bO4ljdUEfbuns7EyT1FKGLqNGz+0bms5XsplXvzD2T0=";
+        linux = "sha256-bHKE8i7QbE0UFgn1TW4gzPj7MBV7t/PVo+Txd6jW0wE=";
+        osx = "sha256-Gmm9dnu2+OccqfqsUiKeanc4FNNkk7lCO0YAoxACjl0=";
      };
    };
    sha = fetchurl {
      url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}.sha1";
      sha256 = getAttr platform {
-        linux = "sha256-oUJOQ9j/sJ7Yt0V9WOrRmuqYI+2UWZxeefJ/WyNoWgw=";
-        osx = "sha256-w+q2j4MKtIOihPMaJxuIP9IwXvRIyBxgRIJLox4E7ac=";
+        linux = "sha256-mSbHKU3snj5NTg3MN37pmVnVnYRKI9yoMVNJGuUXTso=";
+        osx = "sha256-V/t81ELdzRFoMPSD8wSgbtdQgmUkkOdqRu2iqKIeNVg=";
      };
    };
    pom = fetchurl {
      url = "${repoUrl}/${pkgPath}/${version}/${filenames.pom}";
-      sha256 = "sha256-UdUGCoMmEfJxBS2demYKGdG4lzd2DqQbDUCHt/h7Ohg=";
+      sha256 = "sha256-9gY2kGJqgVcd1T3UOzYM+xoPug/eGBRUF+cA6Fu9ZRw=";
    };
  };

@@ -14,8 +14,8 @@ androidenv.composeAndroidPackages {
  cmdLineToolsVersion = "9.0";
  toolsVersion = "26.1.1";
  platformToolsVersion = "33.0.3";
-  buildToolsVersions = [ "34.0.0" ];
-  platformVersions = [ "34" ];
+  buildToolsVersions = [ "33.0.0" ];
+  platformVersions = [ "33" ];
  cmakeVersions = [ "3.22.1" ];
  ndkVersion = "25.2.9519653";
  includeNDK = true;
@@ -5,15 +5,14 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "xcbeautify";
-  version = "1.4.0";
+  version = "1.1.1";
  arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";

-
  src = fetchurl {
-    url = "https://github.com/cpisciotta/xcbeautify/releases/download/${version}/xcbeautify-${version}-${arch}-apple-macosx.zip";
+    url = "https://github.com/tuist/xcbeautify/releases/download/${version}/xcbeautify-${version}-${arch}-apple-macosx.zip";
    sha256 = getAttr arch {
-            arm64 = "sha256-4b4mXT5IfNOS8iOrZASDhTrmOehG4mePcoiKxR+IdZk=";
-            x86_64 = "sha256-adEfAK7n3Q/Yd1deyJx7htX7hZaGDztEeBv4z2A0wzg=";
+            arm64 = "sha256-VaZBWZNx5iZxjpsVbKQA4wVsigjlhArDCsQXY/RBDx4=";
+            x86_64 = "sha256-Q1t4nHQu05mPqNRmL0KQukGRAHdkQHM7H24ar0isQTo=";
        };
    };

@@ -29,7 +28,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "A little beautifier tool for xcodebuild";
-    homepage = "https://github.com/cpisciotta/xcbeautify";
+    homepage = "https://github.com/tuist/xcbeautify";
    license = licenses.mit;
    platforms = platforms.darwin;
  };
@@ -61,14 +61,6 @@ 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
-      bun yarn nodejs python310 maestro
+      yarn nodejs python310 maestro
    ] # and some special cases
      ++ lib.optionals   stdenv.isDarwin ([ cocoapods clang tcl idb-companion ] ++ appleSDKFrameworks)
      ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ]
@@ -5,20 +5,21 @@
  "private": true,
  "scripts": {
    "_comment": "This also prevents 'yarn install' from running outside of nix.",
-    "preinstall": "make status-go-library"
+    "preinstall": "scripts/check-nix-shell.sh && make status-go-library"
  },
  "dependencies": {
    "@babel/preset-typescript": "^7.17.12",
    "@react-native-async-storage/async-storage": "1.19.3",
    "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
-    "@react-native-clipboard/clipboard": "1.13.2",
    "@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",
@@ -32,20 +33,20 @@
    "node-libs-react-native": "^1.2.1",
    "react": "18.2.0",
    "react-dom": "18.0.0",
-    "react-native": "0.73.5",
+    "react-native": "0.72.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.1.2",
+    "react-native-dialogs": "^1.0.4",
    "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.14.1",
+    "react-native-gesture-handler": "2.6.1",
    "react-native-gifted-charts": "^1.3.2",
    "react-native-haptic-feedback": "^1.9.0",
-    "react-native-hole-view": "^3.0.0-alpha4",
+    "react-native-hole-view": "3.0.0-alpha3",
    "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",
@@ -54,14 +55,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.38.3",
+    "react-native-navigation": "7.37.0",
    "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": "10.0.2",
+    "react-native-share": "^8.2.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",
@@ -81,21 +82,18 @@
    "@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.2.6",
+    "@types/react": "^18.0.24",
    "@types/react-test-renderer": "^18.0.0",
-    "babel-jest": "^29.6.3",
+    "babel-jest": "^29.7.0",
    "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",
@@ -104,6 +102,12 @@
    "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/",
@@ -111,6 +115,6 @@
    "remote_path": "{version}"
  },
  "engines": {
-    "node": ">=18"
+    "node": ">=16"
  }
 }
@@ -1,5 +1,4 @@
-import { useAnimatedReaction, withTiming, runOnJS } from 'react-native-reanimated';
-import { useState } from 'react';
+import { withTiming, runOnJS } from 'react-native-reanimated';

 export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callback) {
  return function (event) {
@@ -13,21 +12,3 @@ export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callb
    runOnJS(callback)(layoutHeight, newDistance);
  };
 }
-
-export function useMessagesScrolledToThreshold(distanceFromListTop, threshold) {
-  const [scrolledToThreshold, setScrolledToThreshold] = useState(false);
-
-  useAnimatedReaction(
-    function () {
-      return distanceFromListTop.value <= threshold;
-    },
-    function (current) {
-      if (current !== scrolledToThreshold) {
-        runOnJS(setScrolledToThreshold)(current);
-      }
-    },
-    [scrolledToThreshold],
-  );
-
-  return scrolledToThreshold;
-}
@@ -19,13 +19,6 @@ export function navigationHeaderPosition(distanceFromListTop, isAllLoaded, topBa
  });
 }

-export function navigationButtonsCompleteOpacity(isCalculationComplete) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isCalculationComplete.value ? withTiming(1) : 0;
-  });
-}
-
 export function interpolateNavigationViewOpacity(props) {
  return useDerivedValue(function () {
    'worklet';
@@ -3,6 +3,7 @@
    ["eth-phishing-detect" :as eth-phishing-detect]
    [clojure.string :as string]
    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
+    [legacy.status-im.browser.eip3085 :as eip3085]
    [legacy.status-im.browser.eip3326 :as eip3326]
    [legacy.status-im.browser.permissions :as browser.permissions]
    [legacy.status-im.browser.webview-ref :as webview-ref]
@@ -15,7 +16,6 @@
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
    [react-native.platform :as platform]
-    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.common.universal-links :as links]
    [status-im.constants :as constants]
    [status-im.contexts.chat.events :as chat.events]
@@ -443,6 +443,9 @@
        (= method "wallet_switchEthereumChain")
        (eip3326/handle-switch-ethereum-chain cofx dapp-name id message-id (first params))

+        (= method "wallet_addEthereumChain")
+        (eip3085/handle-add-ethereum-chain cofx dapp-name id message-id (first params))
+
        :else
        {:browser/call-rpc [payload
                            #(re-frame/dispatch [:browser.callback/call-rpc
@@ -655,11 +658,12 @@
                          stored-bookmarks)]
    {:db (assoc db :bookmarks/bookmarks bookmarks)}))

-(re-frame/reg-fx :browser/initialize-browser
- (fn []
-   (json-rpc/call {:method     "wakuext_getBrowsers"
-                   :on-success [::initialize-browsers]})
-   (json-rpc/call {:method     "browsers_getBookmarks"
-                   :on-success [::initialize-bookmarks]})
-   (json-rpc/call {:method     "permissions_getDappPermissions"
-                   :on-success [::initialize-dapp-permissions]})))
+(rf/defn initialize-browser
+  [_]
+  {:json-rpc/call
+   [{:method     "wakuext_getBrowsers"
+     :on-success #(re-frame/dispatch [::initialize-browsers %])}
+    {:method     "browsers_getBookmarks"
+     :on-success #(re-frame/dispatch [::initialize-bookmarks %])}
+    {:method     "permissions_getDappPermissions"
+     :on-success #(re-frame/dispatch [::initialize-dapp-permissions %])}]})
@@ -2,6 +2,10 @@
 ;(`wallet_addEthereumChain`)
 (ns legacy.status-im.browser.eip3085
  (:require
+    [clojure.string :as string]
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.screens.browser.eip3085.sheet :as sheet]
+    [legacy.status-im.utils.random :as random]
    [re-frame.core :as re-frame]
    [status-im.constants :as constants]
    [taoensso.timbre :as log]
@@ -36,3 +40,37 @@
                                        :message "User rejected the request."}}
   :dispatch               [:bottom-sheet/hide-old]})

+(rf/defn handle-add-ethereum-chain
+  {:events [:eip3085/handle-add-ethereum-chain]}
+  [{{:networks/keys [networks] :as db} :db :as cofx}
+   dapp-name id message-id
+   {:keys [chainId blockExplorerUrls chainName iconUrls nativeCurrency rpcUrls] :as params}]
+  (let [manage {:name       {:value chainName}
+                :symbol     {:value (:symbol nativeCurrency)}
+                :url        {:value (first rpcUrls)}
+                :network-id {:value chainId}
+                :chain      {:value :custom}}]
+    (if (network/valid-manage? manage)
+      (let [{:keys [name url chain network-id symbol]} manage
+            random-id                                  (string/replace (random/id) "-" "")
+            network                                    (network/new-network random-id
+                                                                            (:value name)
+                                                                            (:value symbol)
+                                                                            (:value url)
+                                                                            (:value chain)
+                                                                            (:value network-id))
+            new-networks                               (assoc networks random-id network)
+            params                                     (assoc params
+                                                              :new-networks new-networks
+                                                              :id           id
+                                                              :new-network  network)]
+        (if (network/chain-id-available? networks network)
+          {:dispatch [:bottom-sheet/show-sheet-old
+                      {:content (fn []
+                                  [sheet/permissions-panel dapp-name message-id params])}]}
+          (send-success-call-to-bridge cofx id message-id)))
+      {:browser/send-to-bridge {:type      constants/web3-send-async-callback
+                                :messageId message-id
+                                :error     {:code    -32602
+                                            :message "invalid network parameters"}}})))
+
@@ -4,6 +4,7 @@
    [legacy.status-im.chat.models.loading :as chat.loading]
    [legacy.status-im.data-store.messages :as data-store.messages]
    [legacy.status-im.utils.deprecated-types :as types]
+    [re-frame.core :as re-frame]
    [react-native.platform :as platform]
    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
@@ -134,7 +135,9 @@
                                    message-id (:messageId removed-message)]
                                (data-store.messages/mark-messages-seen chat-id
                                                                        [message-id]
-                                                                        nil)))
+                                                                        #(re-frame/dispatch
+                                                                          [:chat/decrease-unviewed-count
+                                                                           chat-id %3]))))
                            removed-messages)
        remove-messages-fx (fn [{:keys [db]}]
                             {:dispatch [:activity-center.notifications/fetch-unread-count]})]
@@ -4,6 +4,7 @@
    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
    legacy.status-im.communities.e2e
    [re-frame.core :as re-frame]
+    [status-im.contexts.shell.activity-center.events :as activity-center]
    [status-im.navigation.events :as navigation]
    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))
@@ -83,12 +84,13 @@
            (navigation/navigate-back)
            (handle-response response-js)))

-(re-frame/reg-event-fx ::member-banned
- (fn [{:keys [db]} [response-js]]
-   {:db (assoc db :bottom-sheet/show? false)
-    :fx [[:dismiss-bottom-sheet-overlay-old]
-         [:sanitize-messages-and-process-response response-js]
-         [:activity-center.notifications/fetch-unread-count]]}))
+(rf/defn member-banned
+  {:events [::member-banned]}
+  [cofx response-js]
+  (rf/merge cofx
+            (bottom-sheet/hide-bottom-sheet-old)
+            (handle-response response-js)
+            (activity-center/notifications-fetch-unread-count)))

 (rf/defn member-ban
  {:events [::member-ban]}
@@ -6,6 +6,7 @@
    [re-frame.core :as re-frame]
    [status-im.contexts.chat.contacts.events :as contacts-store]
    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
+    [status-im.contexts.shell.activity-center.events :as activity-center]
    [status-im.navigation.events :as navigation]
    [utils.re-frame :as rf]))

@@ -44,23 +45,21 @@
    (apply
     rf/merge
     cofx
-     {:db (->
-            db
-            (update :chats dissoc public-key)
-            (update :chats-home-list disj public-key)
-            (assoc-in [:contacts/contacts public-key
-                       :added?]
-                      false))
-      :fx [[:activity-center.notifications/fetch-unread-count]
-           [:effects/push-notifications-clear-message-notifications [public-key]]
-           [:dispatch [:shell/close-switcher-card public-key]]]}
+     {:db                                                     (->
+                                                                db
+                                                                (update :chats dissoc public-key)
+                                                                (update :chats-home-list disj public-key)
+                                                                (assoc-in [:contacts/contacts public-key
+                                                                           :added?]
+                                                                          false))
+      :dispatch                                               [:shell/close-switcher-card public-key]
+      :effects/push-notifications-clear-message-notifications [public-key]}
+     (activity-center/notifications-fetch-unread-count)
     fxs)))

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

 (rf/defn contact-unblocked
  {:events [:contacts/unblocked]}
@@ -45,12 +45,12 @@
    (query-fn (comp participant-set :public-key) (vals all-contacts))))

 (defn get-all-contacts-in-group-chat
-  [members admins contacts {:keys [public-key preferred-name name display-name] :as current-account}]
+  [members admins contacts {:keys [public-key preferred-name name] :as current-account}]
  (let [current-contact (some->
                          current-account
-                          (select-keys [:name :preferred-name :public-key :images :compressed-key])
+                          (select-keys [:name :preferred-name :public-key :images])
                          (set/rename-keys {:name :alias :preferred-name :name})
-                          (assoc :primary-name (or display-name preferred-name name)))
+                          (assoc :primary-name (or preferred-name name)))
        all-contacts    (cond-> contacts
                          current-contact
                          (assoc public-key current-contact))]
@@ -29,41 +29,37 @@

  (testing "transforms messages from RPC response"
    (is
-     (= {:last-message  {:quoted-message       nil
-                         :outgoing-status      nil
-                         :command-parameters   nil
-                         :link-previews        []
-                         :status-link-previews []
-                         :content              {:sticker     nil
-                                                :rtl?        nil
-                                                :ens-name    nil
-                                                :parsed-text nil
-                                                :response-to nil
-                                                :chat-id     nil
-                                                :image       nil
-                                                :line-count  nil
-                                                :links       nil
-                                                :text        nil}
-                         :bridge-message       nil
-                         :outgoing             false}
+     (= {:last-message  {:quoted-message     nil
+                         :outgoing-status    nil
+                         :command-parameters nil
+                         :link-previews      []
+                         :content            {:sticker     nil
+                                              :rtl?        nil
+                                              :ens-name    nil
+                                              :parsed-text nil
+                                              :response-to nil
+                                              :chat-id     nil
+                                              :image       nil
+                                              :line-count  nil
+                                              :links       nil
+                                              :text        nil}
+                         :outgoing           false}
         :message       nil
-         :reply-message {:quoted-message       nil
-                         :outgoing-status      nil
-                         :command-parameters   nil
-                         :link-previews        []
-                         :status-link-previews []
-                         :content              {:sticker     nil
-                                                :rtl?        nil
-                                                :ens-name    nil
-                                                :parsed-text nil
-                                                :response-to nil
-                                                :chat-id     nil
-                                                :image       nil
-                                                :line-count  nil
-                                                :links       nil
-                                                :text        nil}
-                         :bridge-message       nil
-                         :outgoing             false}}
+         :reply-message {:quoted-message     nil
+                         :outgoing-status    nil
+                         :command-parameters nil
+                         :link-previews      []
+                         :content            {:sticker     nil
+                                              :rtl?        nil
+                                              :ens-name    nil
+                                              :parsed-text nil
+                                              :response-to nil
+                                              :chat-id     nil
+                                              :image       nil
+                                              :line-count  nil
+                                              :links       nil
+                                              :text        nil}
+                         :outgoing           false}}
        (-> raw-notification
            store/<-rpc
            (select-keys [:last-message :message :reply-message])))))
@@ -1,13 +1,11 @@
 (ns legacy.status-im.data-store.chats
  (:require
    [clojure.set :as set]
-    [clojure.string :as string]
    [legacy.status-im.data-store.messages :as messages]
    [legacy.status-im.utils.deprecated-types :as types]
-    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.constants :as constants]
-    [taoensso.timbre :as log]))
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))

 (defn rpc->type
  [{:keys [chat-type name] :as chat}]
@@ -60,10 +58,6 @@
           :admins         #{}
           :members-joined #{})))

-(defn <-color
-  [value]
-  (if (string/starts-with? value "#") value (keyword value)))
-
 (defn <-rpc
  [chat]
  (-> chat
@@ -84,14 +78,13 @@
      rpc->type
      unmarshal-members
      (update :last-message #(when % (messages/<-rpc %)))
-      (update :color <-color)
      (dissoc :members)))

 (defn <-rpc-js
  [^js chat]
  (-> {:name                    (.-name chat)
       :description             (.-description chat)
-       :color                   (<-color (.-color chat))
+       :color                   (.-color chat)
       :emoji                   (.-emoji chat)
       :timestamp               (.-timestamp chat)
       :alias                   (.-alias chat)
@@ -124,10 +117,10 @@
      rpc->type
      unmarshal-members))

-(re-frame/reg-fx :fetch-chats-preview
- (fn [{:keys [on-success]}]
-   (json-rpc/call {:method      "wakuext_chatsPreview"
-                   :params      []
-                   :js-response true
-                   :on-success  #(on-success ^js %)
-                   :on-error    #(log/error "failed to fetch chats" 0 -1 %)})))
+(rf/defn fetch-chats-preview
+  [_ {:keys [on-success]}]
+  {:json-rpc/call [{:method      "wakuext_chatsPreview"
+                    :params      []
+                    :js-response true
+                    :on-success  #(on-success ^js %)
+                    :on-error    #(log/error "failed to fetch chats" 0 -1 %)}]})
@@ -5,7 +5,7 @@

 (deftest normalize-chat-test
  (let [chat          {:id                     "chat-id"
-                       :color                  "yellow"
+                       :color                  "color"
                       :name                   "name"
                       :chatType               3
                       :members                [{:id     "a"
@@ -26,7 +26,7 @@
                       :timestamp              2}
        expected-chat {:public?                  false
                       :group-chat               true
-                       :color                    :yellow
+                       :color                    "color"
                       :chat-name                "name"
                       :contacts                 #{"a" "b" "c" "d"}
                       :chat-type                3
@@ -4,6 +4,13 @@
    [clojure.walk :as walk]
    [status-im.constants :as constants]))

+(defn rpc->channel-permissions
+  [rpc-channels-permissions]
+  (update-vals rpc-channels-permissions
+               (fn [{:keys [viewAndPostPermissions viewOnlyPermissions]}]
+                 {:view-only     (set/rename-keys viewOnlyPermissions {:satisfied :satisfied?})
+                  :view-and-post (set/rename-keys viewAndPostPermissions {:satisfied :satisfied?})})))
+
 (defn <-revealed-accounts-rpc
  [accounts]
  (mapv
@@ -27,10 +34,8 @@
               (assoc acc
                      (name k)
                      (-> v
-                          (assoc :token-gated? (:tokenGated v)
-                                 :can-post?    (:canPost v)
-                                 :can-view?    (:canView v))
-                          (dissoc :canPost :tokenGated :canView)
+                          (assoc :can-post? (:canPost v))
+                          (dissoc :canPost)
                          (update :members walk/stringify-keys))))
             {}
             chats))
@@ -0,0 +1,23 @@
+(ns legacy.status-im.data-store.communities-test
+  (:require
+    [cljs.test :refer [deftest is]]
+    [legacy.status-im.data-store.communities :as sut]))
+
+(def permissions
+  {"community-id-chat-1"
+   {:viewOnlyPermissions    {:satisfied   false
+                             :permissions {:token-permission-id-01 {:criteria [false]}}}
+    :viewAndPostPermissions {:satisfied true :permissions {}}}
+   "community-id-chat-2"
+   {:viewOnlyPermissions    {:satisfied true :permissions {}}
+    :viewAndPostPermissions {:satisfied true :permissions {}}}})
+
+(deftest rpc->channel-permissions-test
+  (is (= {"community-id-chat-1"
+          {:view-only     {:satisfied?  false
+                           :permissions {:token-permission-id-01 {:criteria [false]}}}
+           :view-and-post {:satisfied? true :permissions {}}}
+          "community-id-chat-2"
+          {:view-only     {:satisfied? true :permissions {}}
+           :view-and-post {:satisfied? true :permissions {}}}}
+         (sut/rpc->channel-permissions permissions))))
@@ -16,41 +16,13 @@
                      :community-id      :communityId
                      :clock-value       :clock})))

-(defn- <-status-link-previews-rpc
-  [preview]
-  (-> preview
-      (update :community
-              set/rename-keys
-              {:communityId        :community-id
-               :displayName        :display-name
-               :membersCount       :members-count
-               :activeMembersCount :active-members-count})
-      (update-in [:community :banner] set/rename-keys {:dataUri :data-uri})
-      (update-in [:community :icon] set/rename-keys {:dataUri :data-uri})))
-
-(defn ->status-link-previews-rpc
-  [preview]
-  (-> preview
-      (update :community
-              set/rename-keys
-              {:community-id         :communityId
-               :display-name         :displayName
-               :members-count        :membersCount
-               :active-members-count :activeMembersCount})
-      (update-in [:community :banner] set/rename-keys {:data-uri :dataUri})
-      (update-in [:community :icon] set/rename-keys {:data-uri :dataUri})))
-
 (defn- <-link-preview-rpc
  [preview]
-  (-> preview
-      (update :thumbnail set/rename-keys {:dataUri :data-uri})
-      (update :favicon set/rename-keys {:dataUri :data-uri})))
+  (update preview :thumbnail set/rename-keys {:dataUri :data-uri}))

 (defn ->link-preview-rpc
  [preview]
-  (-> preview
-      (update :thumbnail set/rename-keys {:data-uri :dataUri})
-      (update :favicon set/rename-keys {:data-uri :dataUri})))
+  (update preview :thumbnail set/rename-keys {:data-uri :dataUri}))

 (defn <-rpc
  [message]
@@ -81,16 +53,8 @@
        :new                      :new?
        :albumImagesCount         :album-images-count
        :displayName              :display-name
-        :linkPreviews             :link-previews
-        :statusLinkPreviews       :status-link-previews
-        :bridgeMessage            :bridge-message})
-      (update :bridge-message
-              set/rename-keys
-              {:bridgeName :bridge-name
-               :userName   :user-name
-               :userAvatar :user-avatar})
+        :linkPreviews             :link-previews})
      (update :link-previews #(map <-link-preview-rpc %))
-      (update :status-link-previews #(map <-status-link-previews-rpc %))
      (update :quoted-message
              set/rename-keys
              {:parsedText       :parsed-text
@@ -21,7 +21,6 @@
                                                 :image       nil
                                                 :response-to "a"
                                                 :links       nil}
-                    :bridge-message             nil
                    :whisper-timestamp          1
                    :contact-verification-state 1
                    :contact-request-state      2
@@ -38,19 +37,7 @@
                    :compressed-key             "c"
                    :timestamp                  3
                    :link-previews              [{:thumbnail {:url      "http://localhost"
-                                                              :data-uri "data:image/png"}
-                                                  :favicon   nil}]
-                    :status-link-previews       [{:url       "http://localhost"
-                                                  :community {:community-id "0x01"
-                                                              :display-name "Test Comm"
-                                                              :members-count 12
-                                                              :active-members-count 12
-                                                              :banner
-                                                              {:data-uri
-                                                               "data:image/png"}
-                                                              :icon
-                                                              {:data-uri
-                                                               "data:image/png"}}}]}
+                                                              :data-uri "data:image/png"}}]}
          message  {:id                       message-id
                    :whisperTimestamp         1
                    :parsedText               "parsed-text"
@@ -74,17 +61,5 @@
                    :timestamp                3
                    :outgoingStatus           "sending"
                    :linkPreviews             [{:thumbnail {:url     "http://localhost"
-                                                            :dataUri "data:image/png"}
-                                                :favicon   nil}]
-                    :statusLinkPreviews       [{:url       "http://localhost"
-                                                :community {:communityId "0x01"
-                                                            :displayName "Test Comm"
-                                                            :membersCount 12
-                                                            :activeMembersCount 12
-                                                            :banner
-                                                            {:dataUri
-                                                             "data:image/png"}
-                                                            :icon
-                                                            {:dataUri
-                                                             "data:image/png"}}}]}]
+                                                            :dataUri "data:image/png"}}]}]
      (is (= expected (m/<-rpc message))))))
@@ -2,8 +2,6 @@
  (:require
    [clojure.set :as set]
    [clojure.walk :as walk]
-    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))

@@ -34,11 +32,11 @@
                    :on-success #()
                    :on-error   #()}]})

-(re-frame/reg-fx :switcher-cards/fetch
- (fn []
-   (json-rpc/call {:method     "wakuext_switcherCards"
-                   :params     []
-                   :on-success #(rf/dispatch
-                                 [:shell/switcher-cards-loaded
-                                  (:switcherCards ^js %)])
-                   :on-error   #(log/error "Failed to fetch switcher cards" %)})))
+(rf/defn fetch-switcher-cards-rpc
+  [_]
+  {:json-rpc/call [{:method     "wakuext_switcherCards"
+                    :params     []
+                    :on-success #(rf/dispatch
+                                  [:shell/switcher-cards-loaded
+                                   (:switcherCards ^js %)])
+                    :on-error   #(log/error "Failed to fetch switcher cards" %)}]})
@@ -2,8 +2,8 @@
  (:require
    [clojure.set :as set]
    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
-    [taoensso.timbre :as log]))
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))

 (defn <-rpc
  [visibility-status-update]
@@ -18,13 +18,13 @@
       {:current-user-status :current-user-visibility-status})
      (update :current-user-visibility-status <-rpc)))

-(re-frame/reg-fx :visibility-status-updates/fetch
- (fn []
-   (json-rpc/call {:method     "wakuext_statusUpdates"
-                   :params     []
-                   :on-success #(re-frame/dispatch
-                                 [:visibility-status-updates/visibility-status-updates-loaded
-                                  (:statusUpdates ^js %)])
-                   :on-error   #(log/error
-                                 "failed to fetch visibility-status-updates"
-                                 %)})))
+(rf/defn fetch-visibility-status-updates-rpc
+  [_]
+  {:json-rpc/call [{:method     "wakuext_statusUpdates"
+                    :params     []
+                    :on-success #(re-frame/dispatch
+                                  [:visibility-status-updates/visibility-status-updates-loaded
+                                   (:statusUpdates ^js %)])
+                    :on-error   #(log/error
+                                  "failed to fetch visibility-status-updates"
+                                  %)}]})
@@ -239,7 +239,7 @@

 (rf/defn tx-history-end-reached
  [{:keys [db] :as cofx} address]
-  (let [syncing-allowed? (utils.mobile-sync/syncing-allowed? db)]
+  (let [syncing-allowed? (utils.mobile-sync/syncing-allowed? cofx)]
    {:db (assoc-in db
          [:wallet-legacy :fetching address :all-fetched?]
          (if syncing-allowed?
@@ -327,7 +327,7 @@
      {:chain-tokens      (:wallet-legacy/all-tokens db)
       :addresses         [address]
       :before-block      min-known-block
-       :fetch-more?       (utils.mobile-sync/syncing-allowed? db)
+       :fetch-more?       (utils.mobile-sync/syncing-allowed? cofx)
       ;; Transfers are requested before and including `min-known-block` because there is no
       ;; guarantee that all transfers from that block are shown already. To make sure that we fetch
       ;; the whole `default-transfers-limit` of transfers the number of transfers already received
@@ -8,16 +8,11 @@
    legacy.status-im.chat.models.loading
    legacy.status-im.contact.block
    legacy.status-im.currency.core
-    legacy.status-im.data-store.chats
-    legacy.status-im.data-store.switcher-cards
-    legacy.status-im.data-store.visibility-status-updates
    legacy.status-im.fleet.core
-    legacy.status-im.group-chats.core
    [legacy.status-im.keycard.core :as keycard]
    legacy.status-im.log-level.core
    legacy.status-im.mailserver.constants
    [legacy.status-im.mailserver.core :as mailserver]
-    legacy.status-im.mobile-sync-settings.core
    legacy.status-im.multiaccounts.login.core
    legacy.status-im.multiaccounts.logout.core
    [legacy.status-im.multiaccounts.model :as multiaccounts.model]
@@ -42,6 +37,7 @@
    [react-native.core :as rn]
    [react-native.permissions :as permissions]
    [react-native.platform :as platform]
+    [status-im.common.biometric.events :as biometric]
    status-im.common.serialization
    status-im.common.standard-authentication.events
    [status-im.common.theme.core :as theme]
@@ -124,7 +120,7 @@
      :content             (i18n/label :t/biometric-auth-confirm-message)
      :confirm-button-text (i18n/label :t/biometric-auth-confirm-try-again)
      :cancel-button-text  (i18n/label :t/biometric-auth-confirm-logout)
-      :on-accept           #(rf/dispatch [:biometric/authenticate {:on-fail on-biometric-auth-fail}])
+      :on-accept           #(biometric/authenticate nil {:on-fail on-biometric-auth-fail})
      :on-cancel           #(re-frame/dispatch [:multiaccounts.logout.ui/logout-confirmed])})))

 (rf/defn on-return-from-background
@@ -146,7 +142,7 @@
              #(when-let [chat-id (:current-chat-id db)]
                 {:dispatch [:chat/mark-all-as-read chat-id]})
              #(when requires-bio-auth
-                 {:dispatch [:biometric/authenticate {:on-fail on-biometric-auth-fail}]}))))
+                 (biometric/authenticate % {:on-fail on-biometric-auth-fail})))))

 (rf/defn on-going-in-background
  [{:keys [db now]}]
@@ -6,9 +6,9 @@
    [legacy.status-im.data-store.invitations :as data-store.invitations]
    [oops.core :as oops]
    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.constants :as constants]
    [status-im.contexts.chat.events :as chat.events]
+    [status-im.contexts.shell.activity-center.events :as activity-center]
    [status-im.navigation.events :as navigation]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -19,13 +19,15 @@
  (when (get-in cofx [:db :chats chat-id])
    (chat.events/pop-to-root-and-navigate-to-chat cofx chat-id nil)))

-(re-frame/reg-event-fx :chat-removed
- (fn [{:keys [db]} [response chat-id]]
-   {:db (dissoc db :current-chat-id)
-    :fx [[:dispatch [:shell/close-switcher-card chat-id]]
-         [:dispatch [:sanitize-messages-and-process-response response]]
-         [:dispatch [:pop-to-root :shell-stack]]
-         [:activity-center.notifications/fetch-unread-count]]}))
+(rf/defn handle-chat-removed
+  {:events [:chat-removed]}
+  [cofx response chat-id]
+  (rf/merge cofx
+            {:db         (dissoc (:db cofx) :current-chat-id)
+             :dispatch-n [[:shell/close-switcher-card chat-id]
+                          [:sanitize-messages-and-process-response response]
+                          [:pop-to-root :shell-stack]]}
+            (activity-center/notifications-fetch-unread-count)))

 (rf/defn handle-chat-update
  {:events [:chat-updated]}
@@ -64,6 +66,16 @@
                    :js-response true
                    :on-success  #(re-frame/dispatch [:chat-updated %])}]})

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

-(re-frame/reg-fx :group-chats/get-group-chat-invitations
- (fn []
-   (json-rpc/call {:method     "wakuext_getGroupChatInvitations"
-                   :on-success [::initialize-invitations]})))
+(rf/defn get-group-chat-invitations
+  [_]
+  {:json-rpc/call
+   [{:method     "wakuext_getGroupChatInvitations"
+     :on-success #(re-frame/dispatch [::initialize-invitations %])}]})
@@ -5,7 +5,6 @@
    [legacy.status-im.node.core :as node]
    [legacy.status-im.utils.mobile-sync :as mobile-network-utils]
    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.navigation.events :as navigation]
    [taoensso.timbre :as log]
    [utils.i18n :as i18n]
@@ -62,7 +61,7 @@
           (dissoc :mailserver/current-request :mailserver/fetching-gaps-in-progress))})

 (defn fetch-use-mailservers?
-  [db]
+  [{:keys [db]}]
  (get-in db [:profile/profile :use-mailservers?]))

 (defonce showing-connection-error-popup? (atom false))
@@ -118,32 +117,24 @@
  [{:keys [db] :as cofx}]
  {:db (dissoc db :mailserver/current-request)})

-(defn needs-to-fetch-historic-messages?
-  [db]
-  (and
-   (:messenger/started? db)
-   (mobile-network-utils/syncing-allowed? db)
-   (fetch-use-mailservers? db)
-   (not (:mailserver/current-request db))))
-
 (rf/defn process-next-messages-request
  {:events [::request-messages]}
-  [{:keys [db]}]
-  (when (needs-to-fetch-historic-messages? db)
-    {:db                                       (assoc db :mailserver/current-request true)
-     :mailserver/request-all-historic-messages nil}))
-
-(re-frame/reg-fx :mailserver/request-all-historic-messages
- (fn []
-   (json-rpc/call {:method      "wakuext_requestAllHistoricMessagesWithRetries"
-                   :params      [false]
-                   :js-response true
-                   :on-success  #(do
-                                   (log/info "fetched historical messages")
-                                   (re-frame/dispatch [::request-success %]))
-                   :on-error    #(do
-                                   (log/error "failed retrieve historical messages" %)
-                                   (re-frame/dispatch [::request-error]))})))
+  [{:keys [db now] :as cofx}]
+  (when (and
+         (:messenger/started? db)
+         (mobile-network-utils/syncing-allowed? cofx)
+         (fetch-use-mailservers? cofx)
+         (not (:mailserver/current-request db)))
+    {:db            (assoc db :mailserver/current-request true)
+     :json-rpc/call [{:method      "wakuext_requestAllHistoricMessagesWithRetries"
+                      :params      [false]
+                      :js-response true
+                      :on-success  #(do
+                                      (log/info "fetched historical messages")
+                                      (re-frame/dispatch [::request-success %]))
+                      :on-error    #(do
+                                      (log/error "failed retrieve historical messages" %)
+                                      (re-frame/dispatch [::request-error]))}]}))

 (rf/defn handle-mailserver-changed
  [{:keys [db] :as cofx} ms]
@@ -5,7 +5,7 @@
    [legacy.status-im.multiaccounts.model :as multiaccounts.model]
    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
    [legacy.status-im.utils.mobile-sync :as utils]
-    [re-frame.core :as re-frame]
+    [status-im.contexts.chat.home.add-new-contact.events :as add-new-contact]
    [status-im.navigation.events :as navigation]
    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))
@@ -18,24 +18,27 @@
                (or (nil? remember-choice?)
                    remember-choice?))}))

-(re-frame/reg-event-fx :mobile-network/on-network-status-change
- (fn [{:keys [db]}]
-   (let [previously-initialized?  (get db :network-status/initialized?)
-         logged-in?               (multiaccounts.model/logged-in? db)
-         fetch-historic-messages? (mailserver/needs-to-fetch-historic-messages? db)]
-     (if logged-in?
-       {:db (cond-> (-> db
-                        (assoc :network-status/initialized? true)
-                        (assoc :bottom-sheet/show? false))
-              fetch-historic-messages?
-              (assoc :mailserver/current-request true))
-        :fx [(when fetch-historic-messages?
-               [:mailserver/request-all-historic-messages])
-             [:dismiss-bottom-sheet-overlay-old]
-             (when previously-initialized?
-               (let [new-identity-input (get-in db [:contacts/new-identity :input])]
-                 [:dispatch [:contacts/set-new-identity {:input new-identity-input}]]))]}
-       {:db (assoc db :network-status/initialized? true)}))))
+(rf/defn on-network-status-change
+  [{:keys [db] :as cofx}]
+  (let [initialized?                       (get db :network-status/initialized?)
+        logged-in?                         (multiaccounts.model/logged-in? db)
+        {:keys [remember-syncing-choice?]} (:profile/profile db)]
+    (apply
+     rf/merge
+     cofx
+     {:db (assoc db :network-status/initialized? true)}
+     (cond
+       ;; NOTE(rasom): When we log into account on-network-status-change is
+       ;; dispatched, but that doesn't mean there was a status change, thus
+       ;; no reason to restart wallet.
+       (and logged-in? initialized?)
+       [(mailserver/process-next-messages-request)
+        (bottom-sheet/hide-bottom-sheet-old)
+        #(add-new-contact/set-new-identity-reconnected %)]
+
+       logged-in?
+       [(mailserver/process-next-messages-request)
+        (bottom-sheet/hide-bottom-sheet-old)]))))

 (defn apply-settings
  ([sync?] (apply-settings sync? :default))
@@ -13,14 +13,15 @@
   (native-module/logout)))

 (rf/defn initialize-app-db
-  [{{:keys         [keycard initials-avatar-font-file biometrics]
-     :network/keys [type]}
+  [{{:keys           [keycard initials-avatar-font-file]
+     :biometric/keys [supported-type]
+     :network/keys   [type]}
    :db}]
  {:db (assoc db/app-db
              :network/type              type
              :initials-avatar-font-file initials-avatar-font-file
              :keycard                   (dissoc keycard :secrets :pin :application-info)
-              :biometrics                biometrics
+              :biometric/supported-type  supported-type
              :syncing                   nil)})

 (rf/defn logout-method
@@ -45,7 +46,6 @@
  [_]
  ;; we need to disable notifications before starting the logout process
  {:effects/push-notifications-disable nil
-   :dispatch                           [:alert-banners/remove-all]
   :dispatch-later                     [{:ms       100
                                         :dispatch [::logout-method
                                                    {:auth-method keychain/auth-method-none
@@ -1,6 +1,11 @@
 (ns legacy.status-im.network.core
  (:require
-    [clojure.string :as string]))
+    [clojure.string :as string]
+    [re-frame.core :as re-frame]
+    [status-im.navigation.events :as navigation]
+    [utils.ethereum.chain :as chain]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))

 (def url-regex
  #"https?://(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)")
@@ -9,6 +14,12 @@
  [url]
  (boolean (re-matches url-regex (str url))))

+(def default-manage
+  {:name   {:value ""}
+   :url    {:value ""}
+   :symbol {:value ""}
+   :chain  {:value :mainnet}})
+
 (defn validate-string
  [{:keys [value]}]
  {:value value
@@ -45,3 +56,123 @@
  [current-networks network]
  (let [chain-id (get-in network [:config :NetworkId])]
    (every? #(not= chain-id (get-in % [1 :config :NetworkId])) current-networks)))
+
+(defn get-network
+  [{:keys [db]} network-id]
+  (get-in db [:networks/networks network-id]))
+
+(rf/defn set-input
+  {:events [::input-changed]}
+  [{:keys [db]} input-key value]
+  {:db (-> db
+           (update-in [:networks/manage input-key] assoc :value value)
+           (update-in [:networks/manage] validate-manage))})
+
+;; No edit functionality actually implemented
+(rf/defn edit
+  {:events [::add-network-pressed]}
+  [{db :db}]
+  {:db       (assoc db :networks/manage (validate-manage default-manage))
+   :dispatch [:navigate-to :edit-network]})
+
+(rf/defn connect-success
+  {:events [::connect-success]}
+  [_ network-id]
+  {:ui/show-confirmation
+   {:title               (i18n/label :t/close-app-title)
+    :content             (i18n/label :t/logout-app-content)
+    :confirm-button-text (i18n/label :t/close-app-button)
+    :on-accept           #(re-frame/dispatch [::save-network-settings-pressed network-id])
+    :on-cancel           nil}})
+
+(rf/defn connect-failure
+  {:events [::connect-failure]}
+  [_ reason]
+  {:effects.utils/show-popup
+   {:title   (i18n/label :t/error)
+    :content (str reason)}})
+
+(rf/defn connect
+  {:events [::connect-network-pressed]}
+  [{:keys [db] :as cofx} network-id]
+  (if (get-in db [:networks/networks network-id :config])
+    (connect-success cofx network-id)
+    (connect-failure cofx "A network with the specified id doesn't exist")))
+
+(rf/defn delete
+  {:events [::delete-network-pressed]}
+  [{:keys [db]} network]
+  (let [current-network? (= (:networks/current-network db) network)]
+    (if (or current-network?
+            (not (get-in db [:networks/networks network])))
+      {:ui/show-error (i18n/label :t/delete-network-error)}
+      {:ui/show-confirmation {:title               (i18n/label :t/delete-network-title)
+                              :content             (i18n/label :t/delete-network-confirmation)
+                              :confirm-button-text (i18n/label :t/delete)
+                              :on-accept           #(re-frame/dispatch [::remove-network-confirmed
+                                                                        network])
+                              :on-cancel           nil}})))
+
+(rf/defn save-network-settings
+  {:events [::save-network-settings-pressed]}
+  [{:keys [db] :as cofx} network]
+  {:db            (assoc db :networks/current-network network)
+   :json-rpc/call [{:method     "settings_saveSetting"
+                    :params     [:networks/current-network network]
+                    :on-success #(re-frame/dispatch [:logout])}]})
+
+(rf/defn remove-network
+  {:events [::remove-network-confirmed]}
+  [{:keys [db] :as cofx} network]
+  (let [networks (dissoc (:networks/networks db) network)]
+    {:db            (assoc db :networks/networks networks)
+     :json-rpc/call [{:method     "settings_saveSetting"
+                      :params     [:networks/networks (vals networks)]
+                      :on-success #(re-frame/dispatch [:navigate-back])}]}))
+
+(defn new-network
+  [random-id network-name sym upstream-url chain-type chain-id]
+  (let [data-dir (str "/ethereum/" (name chain-type) "_rpc")
+        config   {:NetworkId      (or (when chain-id (int chain-id))
+                                      (chain/chain-keyword->chain-id chain-type))
+                  :DataDir        data-dir
+                  :UpstreamConfig {:Enabled true
+                                   :URL     upstream-url}}]
+    {:id     random-id
+     :name   network-name
+     :symbol sym
+     :config config}))
+
+(rf/defn save
+  {:events       [::save-network-pressed]
+   :interceptors [(re-frame/inject-cofx :random-id-generator)]}
+  [{{:networks/keys [manage networks] :as db} :db
+    random-id-generator                       :random-id-generator
+    :as                                       cofx}]
+  (if (valid-manage? manage)
+    ;; rename network-id from UI to chain-id
+    (let [{:keys [name url chain network-id symbol]} manage
+          random-id                                  (string/replace (random-id-generator) "-" "")
+          network                                    (new-network random-id
+                                                                  (:value name)
+                                                                  (:value symbol)
+                                                                  (:value url)
+                                                                  (:value chain)
+                                                                  (:value network-id))
+          custom-chain-type?                         (= :custom (:value chain))
+          new-networks                               (assoc networks random-id network)]
+      (if (or (not custom-chain-type?)
+              (chain-id-available? networks network))
+        {:db            (-> db
+                            (dissoc :networks/manage)
+                            (assoc :networks/networks new-networks))
+         :json-rpc/call [{:method     "settings_saveSetting"
+                          :params     [:networks/networks (vals new-networks)]
+                          :on-success #(re-frame/dispatch [:navigate-back])}]}
+        {:ui/show-error "chain-id already defined"}))
+    {:ui/show-error "invalid network parameters"}))
+
+(rf/defn open-network-details
+  {:events [::network-entry-pressed]}
+  [cofx network]
+  (navigation/navigate-to cofx :network-details {:networks/selected-network network}))
@@ -31,6 +31,38 @@
  (testing "an https url not on the default port"
    (is (network.core/valid-rpc-url? "https://valid.something.else:65323"))))

+(deftest new-network-test
+  (let [actual (network.core/new-network "randomid"
+                                         "network-name"
+                                         "network-symbol"
+                                         "upstream-url"
+                                         :mainnet
+                                         nil)]
+    (is (= {:id     "randomid"
+            :name   "network-name"
+            :symbol "network-symbol"
+            :config {:NetworkId      1
+                     :DataDir        "/ethereum/mainnet_rpc"
+                     :UpstreamConfig {:Enabled true
+                                      :URL     "upstream-url"}}}
+           actual))))
+
+(deftest new-network-id-test
+  (let [actual (network.core/new-network "randomid"
+                                         "network-name"
+                                         "network-symbol"
+                                         "upstream-url"
+                                         :mainnet
+                                         "5777")]
+    (is (= {:id     "randomid"
+            :name   "network-name"
+            :symbol "network-symbol"
+            :config {:NetworkId      5777
+                     :DataDir        "/ethereum/mainnet_rpc"
+                     :UpstreamConfig {:Enabled true
+                                      :URL     "upstream-url"}}}
+           actual))))
+
 (deftest valid-manage-test
  (testing "a valid manage"
    (is (network.core/valid-manage? {:url    {:value "http://valid.com"}
@@ -60,3 +92,101 @@
                                          :name   {:value "valid"}
                                          :symbol {:value ""}
                                          :chain  {:value "valid"}})))))
+
+(deftest set-input-test
+  (testing "it updates and validate a field"
+    (is
+     (= {:db {:networks/manage {:url        {:value "http://valid.com"
+                                             :error false}
+                                :name       {:value ""
+                                             :error true}
+                                :symbol     {:value "symbol"
+                                             :error false}
+                                :chain      {:value "mainnet"
+                                             :error false}
+                                :network-id {:value nil
+                                             :error false}}}}
+        (network.core/set-input {:db {:networks/manage {:url    {:value "something"
+                                                                 :error true}
+                                                        :name   {:value ""
+                                                                 :error false}
+                                                        :symbol {:value "symbol"
+                                                                 :error false}
+                                                        :chain  {:value "mainnet"
+                                                                 :error false}}}}
+                                :url
+                                "http://valid.com")))))
+
+(deftest not-save-invalid-url
+  (testing "it does not save a network with an invalid url"
+    (is
+     (:ui/show-error (network.core/save {:random-id-generator (constantly "random")
+                                         :db                  {:networks/manage {:url   {:value "wrong"}
+                                                                                 :chain {:value "1"}
+                                                                                 :name  {:value "empty"}}
+                                                               :profile/profile {}}})))))
+
+(deftest save-valid-network
+  (testing "save a valid network"
+    (let [fx (network.core/save
+              {:random-id-generator (constantly "random-id")
+               :db                  {:networks/manage   {:url    {:value "http://valid.com"}
+                                                         :chain  {:value :mainnet}
+                                                         :symbol {:value "symbol"}
+                                                         :name   {:value "valid"}}
+                                     :profile/profile   {}
+                                     :networks/networks {"random2"
+                                                         {:id     "random2"
+                                                          :name   "network-name"
+                                                          :symbol "symbol"
+                                                          :config {:NetworkId 1
+                                                                   :DataDir "/ethereum/mainnet_rpc"
+                                                                   :UpstreamConfig
+                                                                   {:Enabled true
+                                                                    :URL     "upstream-url"}}}}}})]
+      (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
+      (is (nil? (:networks/manage (:db fx))))
+      (testing "and check that it has an id with `-` and the correct mainnet NetworkId"
+        (is (= 1 (get-in fx [:db :networks/networks "randomid" :config :NetworkId])))))))
+
+(deftest not-save-custom-chain-with-non-unique-id
+  (testing "it does not save a custom chain with network-id already defined"
+    (let [result (network.core/save
+                  {:random-id-generator (constantly "already-defined")
+                   :db                  {:networks/manage   {:url        {:value "http://valid.com"}
+                                                             :chain      {:value :custom}
+                                                             :name       {:value "valid"}
+                                                             :network-id {:value 1}}
+                                         :profile/profile   {}
+                                         :networks/networks {"random"
+                                                             {:id     "random"
+                                                              :name   "network-name"
+                                                              :config {:NetworkId 1
+                                                                       :DataDir "/ethereum/mainnet_rpc"
+                                                                       :UpstreamConfig
+                                                                       {:Enabled true
+                                                                        :URL     "upstream-url"}}}}}})]
+      (is (:ui/show-error result)))))
+
+(deftest save-valid-network-with-unique-chain-id-check
+  (testing "save a valid network with chain-id not already defined"
+    (let [fx (network.core/save
+              {:random-id-generator (constantly "random")
+               :db                  {:networks/manage   {:url        {:value "http://valid.com"}
+                                                         :chain      {:value :mainnet}
+                                                         :name       {:value "valid"}
+                                                         :symbol     {:value "symbol"}
+                                                         :network-id {:value 5}}
+                                     :profile/profile   {}
+                                     :networks/networks {"randomid"
+                                                         {:id     "randomid"
+                                                          :name   "network-name"
+                                                          :symbol "symbol"
+                                                          :config {:NetworkId 3
+                                                                   :DataDir "/ethereum/mainnet_rpc"
+                                                                   :UpstreamConfig
+                                                                   {:Enabled true
+                                                                    :URL     "upstream-url"}}}}}})]
+      (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
+      (is (nil? (:networks/manage (:db fx))))
+      (is (get-in fx [:db :networks/networks "random"])))))
@@ -1,6 +1,7 @@
 (ns legacy.status-im.network.net-info
  (:require
    ["@react-native-community/netinfo" :default net-info]
+    [legacy.status-im.mobile-sync-settings.core :as mobile-network]
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
    [taoensso.timbre :as log]
@@ -12,11 +13,11 @@
            {:db (assoc db :network-status (if is-connected? :online :offline))}))

 (rf/defn change-network-type
-  [{:keys [db] :as cofx} network-type expensive?]
+  [{:keys [db] :as cofx} old-network-type network-type expensive?]
  (rf/merge cofx
            {:db                       (assoc db :network/type network-type)
-             :network/notify-status-go [network-type expensive?]
-             :dispatch                 [:mobile-network/on-network-status-change]}))
+             :network/notify-status-go [network-type expensive?]}
+            (mobile-network/on-network-status-change)))

 (rf/defn handle-network-info-change
  {:events [::network-info-changed]}
@@ -36,7 +37,7 @@
              (when-not status-changed?
                (change-network-status isConnected))
              (when-not type-changed?
-                (change-network-type type (:is-connection-expensive details))))))
+                (change-network-type old-network-type type (:is-connection-expensive details))))))

 (defn add-net-info-listener
  []
@@ -2,7 +2,6 @@
  (:require
    [legacy.status-im.utils.utils :as utils]
    [re-frame.core :as re-frame]
-    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.constants :as constants]
    [utils.ethereum.chain :as chain]
    [utils.re-frame :as rf]))
@@ -23,21 +22,6 @@
                     :params     [(chain/chain-id db) id]
                     :on-success #()}]}))

-(re-frame/reg-fx :stickers/load-packs
- (fn [chain-id]
-   (json-rpc/call {:method     "stickers_market"
-                   :params     [chain-id]
-                   :on-success [:stickers/stickers-market-success]})
-   (json-rpc/call {:method     "stickers_installed"
-                   :params     []
-                   :on-success [:stickers/stickers-installed-success]})
-   (json-rpc/call {:method     "stickers_pending"
-                   :params     []
-                   :on-success [:stickers/stickers-pending-success]})
-   (json-rpc/call {:method     "stickers_recent"
-                   :params     []
-                   :on-success [:stickers/stickers-recent-success]})))
-
 (rf/defn load-packs
  {:events [:stickers/load-packs]}
  [{:keys [db]}]
@@ -61,7 +61,7 @@
 (re-frame/reg-sub
 :mailserver/use-status-nodes?
 (fn [db _]
-   (boolean (mailserver/fetch-use-mailservers? db))))
+   (boolean (mailserver/fetch-use-mailservers? {:db db}))))

 (re-frame/reg-sub
 :mailserver.edit/validation-errors
@@ -0,0 +1,39 @@
+(ns legacy.status-im.subs.networks
+  (:require
+    [re-frame.core :as re-frame]
+    [status-im.config :as config]
+    [utils.ethereum.chain :as chain]))
+
+(defn- filter-networks
+  [network-type]
+  (fn [network]
+    (let [chain-id (chain/network->chain-id network)
+          testnet? (chain/testnet? chain-id)
+          custom?  (:custom? network)]
+      (case network-type
+        :custom  custom?
+        :mainnet (and (not custom?) (not testnet?))
+        :testnet (and (not custom?) testnet?)))))
+
+(defn- label-networks
+  [default-networks]
+  (fn [network]
+    (let [custom? (not (default-networks (:id network)))]
+      (assoc network :custom? custom?))))
+
+(re-frame/reg-sub
+ :get-networks
+ :<- [:networks/networks]
+ (fn [networks]
+   (let [networks (map (label-networks (into #{} (map :id config/default-networks)))
+                       (sort-by :name (vals networks)))
+         types    [:mainnet :testnet :custom]]
+     (zipmap
+      types
+      (map #(filter (filter-networks %) networks) types)))))
+
+(re-frame/reg-sub
+ :manage-network-valid?
+ :<- [:networks/manage]
+ (fn [manage]
+   (not-any? :error (vals manage))))
@@ -5,6 +5,7 @@
    legacy.status-im.subs.ens
    legacy.status-im.subs.keycard
    legacy.status-im.subs.mailservers
+    legacy.status-im.subs.networks
    legacy.status-im.subs.stickers
    [re-frame.core :as re-frame]))

@@ -99,7 +100,6 @@
 ;;; Link previews
 (reg-root-key-sub :link-previews-whitelist :link-previews-whitelist)
 (reg-root-key-sub :chat/link-previews :chat/link-previews)
-(reg-root-key-sub :chat/status-link-previews :chat/status-link-previews)

 ;;commands
 (reg-root-key-sub :commands/select-account :commands/select-account)
@@ -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)]
@@ -13,7 +13,8 @@
  (re-frame/dispatch event))

 (defn- normal-mode-settings-data
-  [{:keys [current-log-level
+  [{:keys [network-name
+           current-log-level
           light-client-enabled?
           transactions-management-enabled?
           current-fleet
@@ -24,6 +25,22 @@
  (keep
   identity
   [{:size :small
+     :title (i18n/label :t/network)
+     :accessibility-label :network-button
+     :container-margin-top 8
+     :on-press
+     #(re-frame/dispatch [:open-modal :network-settings])
+     :accessory :text
+     :accessory-text network-name
+     :chevron true}
+    {:size :small
+     :title (i18n/label :t/network-info)
+     :accessibility-label :network-button
+     :container-margin-top 8
+     :on-press
+     #(re-frame/dispatch [:open-modal :network-info])
+     :chevron true}
+    {:size :small
     :title (i18n/label :t/log-level)
     :accessibility-label :log-level-settings-button
     :on-press
@@ -134,13 +151,15 @@
                  is-goerli-enabled?               [:profile/is-goerli-enabled?]
                  light-client-enabled?            [:profile/light-client-enabled?]
                  webview-debug                    [:profile/webview-debug]
+                  network-name                     [:network-name]
                  transactions-management-enabled? [:wallet-legacy/transactions-management-enabled?]
                  current-log-level                [:log-level/current-log-level]
                  current-fleet                    [:fleets/current-fleet]
                  peer-syncing-enabled?            [:profile/peer-syncing-enabled?]]
    [list/flat-list
     {:data      (flat-list-data
-                  {:current-log-level                current-log-level
+                  {:network-name                     network-name
+                   :current-log-level                current-log-level
                   :transactions-management-enabled? transactions-management-enabled?
                   :light-client-enabled?            light-client-enabled?
                   :current-fleet                    current-fleet
@@ -85,7 +85,9 @@
             :accessibility-label :share-community-link
             :type                :secondary
             :on-press            #(debounce/throttle-and-dispatch
-                                    [::communities/share-community-confirmation-pressed @user-pk
+                                    [(if can-invite?
+                                       ::communities/invite-people-confirmation-pressed
+                                       ::communities/share-community-confirmation-pressed) @user-pk
                                     selected]
                                    3000)}
            (i18n/label (if can-invite? :t/invite :t/share))]}]]))))
@@ -21,7 +21,7 @@
   {:active    (= value id)
    :accessory :radio
    :title     (get titles id)
-    :on-press  #(re-frame/dispatch [:profile.settings/profile-update :default-sync-period id])}])
+    :on-press  #(re-frame/dispatch [:profile.settings/update-value :default-sync-period id])}])

 (views/defview default-sync-period-settings
  []
@@ -0,0 +1,12 @@
+(ns legacy.status-im.ui.screens.network.edit-network.styles)
+
+(def edit-network-view
+  {:flex              1
+   :margin-horizontal 16
+   :margin-vertical   15})
+
+(def bottom-container
+  {:flex-direction   :row
+   :padding-vertical 4})
+
+(def container {:flex 1})
@@ -0,0 +1,72 @@
+(ns legacy.status-im.ui.screens.network.edit-network.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.core :as quo]
+    [legacy.status-im.ui.components.list.item :as list.item]
+    [legacy.status-im.ui.components.list.views :as list]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.screens.network.edit-network.styles :as styles]
+    [re-frame.core :as re-frame]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(defn- render-network-type
+  [type _ _ manage-network]
+  (let [name (case type
+               :mainnet (i18n/label :t/mainnet-network)
+               :goerli  (i18n/label :t/goerli-network)
+               :custom  (i18n/label :t/custom))]
+    [list.item/list-item
+     {:title     name
+      :accessory :radio
+      :active    (= (get-in manage-network [:chain :value]) type)
+      :on-press  #(re-frame/dispatch [::network/input-changed :chain type])}]))
+
+(views/defview edit-network
+  []
+  (views/letsubs [manage-network [:networks/manage]
+                  is-valid?      [:manage-network-valid?]]
+    (let [custom? (= (get-in manage-network [:chain :value]) :custom)]
+      [react/keyboard-avoiding-view {:flex 1}
+       [react/scroll-view
+        [react/view styles/edit-network-view
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/name)
+            :placeholder    (i18n/label :t/specify-name)
+            :default-value  (get-in manage-network [:name :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :name %])
+            :auto-focus     true}]]
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/symbol)
+            :placeholder    (i18n/label :t/specify-symbol)
+            :default-value  (get-in manage-network [:symbol :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :symbol %])
+            :auto-focus     true}]]
+         [react/view {:padding-vertical 8}
+          [quo/text-input
+           {:label          (i18n/label :t/rpc-url)
+            :placeholder    (i18n/label :t/specify-rpc-url)
+            :default-value  (get-in manage-network [:url :value])
+            :on-change-text #(re-frame/dispatch [::network/input-changed :url %])}]]]
+        [quo/list-header (i18n/label :t/network-chain)]
+        [list/flat-list
+         {:data        [:mainnet :goerli :custom]
+          :key-fn      (fn [_ i] (str i))
+          :render-data manage-network
+          :render-fn   render-network-type}]
+        (when custom?
+          [react/view styles/edit-network-view
+           [quo/text-input
+            {:label          (i18n/label :t/network-id)
+             :placeholder    (i18n/label :t/specify-network-id)
+             :on-change-text #(re-frame/dispatch [::network/input-changed :network-id %])}]])]
+       [react/view styles/bottom-container
+        [react/view {:flex 1}]
+        [quo/button
+         {:after    :main-icons/next
+          :type     :secondary
+          :disabled (not is-valid?)
+          :on-press #(re-frame/dispatch [::network/save-network-pressed])}
+         (i18n/label :t/save)]]])))
@@ -0,0 +1,47 @@
+(ns legacy.status-im.ui.screens.network.network-details.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.core :as quo]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.screens.network.styles :as st]
+    [legacy.status-im.ui.screens.network.views :as network-settings]
+    [re-frame.core :as re-frame]
+    [utils.debounce :refer [throttle-and-dispatch]]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(views/defview network-details
+  []
+  (views/letsubs [{:keys [networks/selected-network]} [:get-screen-params]
+                  current-network                     [:networks/current-network]
+                  networks                            [:get-networks]]
+    (let [{:keys [id name config]} selected-network
+          connected?               (= id current-network)
+          custom?                  (seq (filter #(= (:id %) id) (:custom networks)))]
+      [:<>
+       [react/view {:flex 1}
+        [network-settings/network-badge
+         {:name       name
+          :connected? connected?}]
+        (when-not connected?
+          [react/touchable-highlight
+           {:on-press #(throttle-and-dispatch [::network/connect-network-pressed id] 1000)}
+           [react/view st/connect-button-container
+            [react/view
+             {:style               st/connect-button
+              :accessibility-label :network-connect-button}
+             [react/text {:style st/connect-button-label}
+              (i18n/label :t/connect)]]
+            [react/i18n-text
+             {:style st/connect-button-description
+              :key   :connecting-requires-login}]]])
+        [react/view (st/network-config-container)
+         [react/text
+          {:style               st/network-config-text
+           :accessibility-label :network-details-text}
+          config]]]
+       (when custom?
+         [react/view st/bottom-container
+          [react/view {:flex 1}
+           [quo/button {:on-press #(re-frame/dispatch [::network/delete-network-pressed id])}
+            (i18n/label :t/delete)]]])])))
@@ -0,0 +1,90 @@
+(ns legacy.status-im.ui.screens.network.styles
+  (:require
+    [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.utils.styles :as styles]))
+
+(def wrapper
+  {:flex 1})
+
+(def badge-name-text
+  {:font-size 17})
+
+(styles/def badge-connected-text
+  {:color colors/gray
+   :ios   {:margin-top 5}})
+
+(def connect-button-container
+  {:margin-top        8
+   :margin-bottom     16
+   :margin-horizontal 16})
+
+(def connect-button
+  {:height           52
+   :align-items      :center
+   :justify-content  :center
+   :background-color colors/blue
+   :border-radius    8
+   :ios              {:opacity 0.9}})
+
+(def connect-button-label
+  {:color     colors/white-persist
+   :font-size 17})
+
+(def connect-button-description
+  {:color      colors/gray
+   :margin-top 8
+   :height     20})
+
+(styles/defn network-config-container
+  []
+  {:height            160
+   :margin-top        8
+   :padding-top       16
+   :padding-left      16
+   :margin-horizontal 16
+   :background-color  colors/gray-lighter
+   :ios               {:border-radius 9
+                       :opacity       0.9}
+   :android           {:border-radius 4}})
+
+(styles/def network-config-text
+  {:font-size 17
+   :ios       {:opacity 0.8}
+   :android   {:opacity 0.4}})
+
+(defn network-icon
+  [connected? size]
+  {:width            size
+   :height           size
+   :border-radius    (/ size 2)
+   :background-color (if connected? colors/blue colors/gray-lighter)
+   :align-items      :center
+   :justify-content  :center})
+
+(def network-badge
+  {:height         88
+   :padding-left   16
+   :flex-direction :row
+   :align-items    :center})
+
+(styles/def network-item
+  {:flex-direction     :row
+   :align-items        :center
+   :padding-horizontal 16
+   :ios                {:height 64}
+   :android            {:height 56}})
+
+(def network-item-name-text
+  {:font-size 17})
+
+(def network-item-connected-text
+  {:color      colors/gray
+   :font-size  14
+   :margin-top 6})
+
+(def bottom-container
+  {:flex-direction    :row
+   :margin-horizontal 12
+   :margin-vertical   15})
+
+(def container {:flex 1})
@@ -0,0 +1,71 @@
+(ns legacy.status-im.ui.screens.network.views
+  (:require
+    [legacy.status-im.network.core :as network]
+    [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.ui.components.icons.icons :as icons]
+    [legacy.status-im.ui.components.list.item :as list.item]
+    [legacy.status-im.ui.components.list.views :as list]
+    [legacy.status-im.ui.components.react :as react]
+    [legacy.status-im.ui.components.topbar :as topbar]
+    [legacy.status-im.ui.screens.network.styles :as styles]
+    [re-frame.core :as re-frame]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views]))
+
+(defn- network-icon
+  [connected? size]
+  [react/view (styles/network-icon connected? size)
+   [icons/icon :main-icons/network {:color (if connected? colors/white-persist colors/gray)}]])
+
+(defn network-badge
+  [& [{:keys [name connected?]}]]
+  [react/view styles/network-badge
+   [network-icon connected? 56]
+   [react/view {:padding-left 16}
+    [react/text {:style styles/badge-name-text}
+     (or name (i18n/label :t/new-network))]
+    (when connected?
+      [react/i18n-text
+       {:style styles/badge-connected-text
+        :key   :connected}])]])
+
+(def mainnet?
+  #{"mainnet" "mainnet_rpc"})
+
+(defn render-network
+  [{:keys [id name] :as network} _ _ current-network]
+  (let [connected? (= id current-network)]
+    [list.item/list-item
+     {:on-press      #(re-frame/dispatch [::network/network-entry-pressed network])
+      :icon          :main-icons/network
+      :icon-bg-color (if connected? colors/blue colors/gray-lighter)
+      :icon-color    (if connected? colors/white-persist colors/gray)
+      :title         name
+      :subtitle      (when connected? (i18n/label :t/connected))
+      :chevron       true}]))
+
+(views/defview network-settings
+  []
+  (views/letsubs [current-network [:networks/current-network]
+                  networks        [:get-networks]]
+    [:<>
+     [topbar/topbar
+      {:title (i18n/label :t/network-settings)
+       :right-accessories
+       [{:icon     :main-icons/add
+         :on-press #(re-frame/dispatch [::network/add-network-pressed])}]}]
+     [react/view styles/wrapper
+      [list/section-list
+       {:sections           [{:title (i18n/label :t/main-networks)
+                              :key   :mainnet
+                              :data  (:mainnet networks)}
+                             {:title (i18n/label :t/test-networks)
+                              :key   :testnet
+                              :data  (:testnet networks)}
+                             {:title (i18n/label :t/custom-networks)
+                              :key   :custom
+                              :data  (:custom networks)}]
+        :key-fn             :id
+        :default-separator? true
+        :render-data        current-network
+        :render-fn          render-network}]]]))
@@ -0,0 +1,84 @@
+(ns legacy.status-im.ui.screens.network-info.views
+  (:require
+    [legacy.status-im.ethereum.decode :as decode]
+    [legacy.status-im.ui.components.react :as react]
+    [native-module.core :as native-module]
+    [re-frame.core :as re-frame]
+    [reagent.core :as reagent]
+    [status-im.common.json-rpc.events :as json-rpc]
+    [utils.datetime :as datetime]))
+
+(defn get-block
+  [block callback]
+  (json-rpc/call
+   {:method     "eth_getBlockByNumber"
+    :params     [block false]
+    :on-success callback
+    :on-error   #(js/alert (str "can't fetch latest block" %))}))
+
+(defn to-date
+  [timestamp]
+  (datetime/timestamp->long-date
+   (* 1000 timestamp)))
+
+(defn check-lag
+  []
+  (let [latest-block (reagent/atom nil)
+        last-loaded-block (reagent/atom nil)
+        on-press
+        (fn []
+          (get-block
+           "latest"
+           (fn [res]
+             (reset! latest-block res)
+             (get-block
+              (str "0x"
+                   (native-module/number-to-hex
+                    @(re-frame/subscribe [:ethereum/current-block])))
+              (fn [res]
+                (reset! last-loaded-block res))))))]
+    (fn []
+      [react/view
+       {:style {:flex              1
+                :margin-horizontal 16}}
+       (if-not @latest-block
+         [react/text
+          {:on-press on-press}
+          "PRESS TO REFRESH"]
+         [react/text
+          {:on-press on-press}
+          (let [latest-block-number
+                (decode/uint (:number @latest-block))
+
+                latest-block-timestamp
+                (decode/uint (:timestamp @latest-block))
+
+                last-loaded-block-number
+                (decode/uint (:number @last-loaded-block))
+
+                last-loaded-block-timestamp
+                (decode/uint (:timestamp @last-loaded-block))]
+            (str "Latest block number: "
+                 latest-block-number
+                 "\n"
+                 "Latest block time: "
+                 (to-date latest-block-timestamp)
+                 "\n"
+                 "Last loaded block: "
+                 last-loaded-block-number
+                 "\n"
+                 "Last loaded block time: "
+                 (to-date last-loaded-block-timestamp)
+                 "\n"
+                 "Seconds diff: "
+                 (- latest-block-timestamp
+                    last-loaded-block-timestamp)
+                 "\n"
+                 "Blocks diff: " (- latest-block-number
+                                    last-loaded-block-number)
+                 "\n"
+                 "PRESS TO REFRESH"))])])))
+
+(defn network-info
+  []
+  [check-lag])
@@ -111,7 +111,7 @@
         :subtitle           (i18n/label :t/webview-camera-permission-requests-subtitle)
         :subtitle-max-lines 2
         :on-press           #(re-frame/dispatch
-                               [:profile.settings/profile-update
+                               [:profile.settings/update-value
                                :webview-allow-permission-requests?
                                ((complement boolean) webview-allow-permission-requests?)])}])
     [separator]
@@ -169,7 +169,8 @@
   {:active    (= value id)
    :accessory :radio
    :title     (get titles id)
-    :on-press  #(re-frame/dispatch [:profile.settings/profile-update :profile-pictures-visibility id])}])
+    :on-press  #(re-frame/dispatch [:profile.settings/update-value :profile-pictures-visibility
+                                    id])}])

 (views/defview profile-pic
  []
@@ -51,4 +51,4 @@
         :icon                :main-icons/delete
         :theme               :accent
         :title               (i18n/label :t/profile-pic-remove)
-         :on-press            #(re-frame/dispatch [:profile.settings/delete-profile-picture])}])]))
+         :on-press            #(re-frame/dispatch [:profile.settings/delete-profile-picture nil])}])]))
@@ -1,6 +1,7 @@
 (ns legacy.status-im.ui.screens.screens
  (:require
    [legacy.status-im.ui.components.colors :as colors]
+    [legacy.status-im.ui.components.icons.icons :as icons]
    [legacy.status-im.ui.screens.about-app.views :as about-app]
    [legacy.status-im.ui.screens.advanced-settings.views :as advanced-settings]
    [legacy.status-im.ui.screens.appearance.views :as appearance]
@@ -23,6 +24,10 @@
    [legacy.status-im.ui.screens.link-previews-settings.views :as link-previews-settings]
    [legacy.status-im.ui.screens.log-level-settings.views :as log-level-settings]
    [legacy.status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
+    [legacy.status-im.ui.screens.network-info.views :as network-info]
+    [legacy.status-im.ui.screens.network.edit-network.views :as edit-network]
+    [legacy.status-im.ui.screens.network.network-details.views :as network-details]
+    [legacy.status-im.ui.screens.network.views :as network]
    [legacy.status-im.ui.screens.notifications-settings.views :as notifications-settings]
    [legacy.status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver]
    [legacy.status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings]
@@ -47,18 +52,10 @@
    [status-im.contexts.chat.group-details.view :as group-details]
    [utils.i18n :as i18n]))

-(defn topbar-options
-  [title]
-  {:elevation        0
-   :title            {:color (if (colors/dark?) colors/white colors/black)
-                      :text  (i18n/label title)}
-   :rightButtonColor (if (colors/dark?) colors/white colors/black)
-   :background       {:color (if (colors/dark?) colors/black colors/white)}
-   :backButton       {:color           (if (colors/dark?) colors/white colors/black)
-                      :id              :legacy-back-button
-                      :testID          :back-button
-                      :visible         true
-                      :popStackOnPress false}})
+(defn right-button-options
+  [id icon]
+  {:id   id
+   :icon (icons/icon-source icon)})

 (defn screens
  []
@@ -84,15 +81,20 @@

   {:name      :stickers
    :options   {:insets {:top? true}
-                :topBar (topbar-options :t/sticker-market)}
+                :topBar {:title {:text (i18n/label :t/sticker-market)}}}
    :component stickers/packs}

   {:name      :stickers-pack
    :options   {:insets {:top? true}}
    :component stickers/pack}

+   {:name      :new-group
+    :options   {:insets {:top? true}}
+    ;;TODO custom subtitle
+    :component group-chat/new-group}
+
   {:name      :currency-settings
-    :options   {:topBar (topbar-options :t/main-currency)
+    :options   {:topBar {:title {:text (i18n/label :t/main-currency)}}
                :insets {:top? true}}
    :component currency-settings/currency-settings}

@@ -102,27 +104,27 @@
    :options   {:topBar {:visible false}}
    :component profile.user/my-profile}
   {:name      :contacts-list
-    :options   {:topBar (topbar-options :t/contacts)
+    :options   {:topBar {:title {:text (i18n/label :t/contacts)}}
                :insets {:top? true}}
    :component contacts-list/contacts-list}
   {:name      :ens-main
-    :options   {:topBar (topbar-options :t/ens-usernames)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-usernames)}}
                :insets {:top? true}}
    :component ens/main}
   {:name      :ens-search
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                :insets {:top? true}}
    :component ens/search}
   {:name      :ens-checkout
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                :insets {:top? true}}
    :component ens/checkout}
   {:name      :ens-confirmation
-    :options   {:topBar (topbar-options :t/ens-your-username)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
                :insets {:top? true}}
    :component ens/confirmation}
   {:name      :ens-terms
-    :options   {:topBar (topbar-options :t/ens-terms-registration)
+    :options   {:topBar {:title {:text (i18n/label :t/ens-terms-registration)}}
                :insets {:top? true}}
    :component ens/terms}
   {:name      :ens-name-details
@@ -130,7 +132,7 @@
    :options   {:insets {:top? true}}
    :component ens/name-details}
   {:name      :blocked-users-list
-    :options   {:topBar (topbar-options :t/blocked-users)
+    :options   {:topBar {:title {:text (i18n/label :t/blocked-users)}}
                :insets {:top? true}}
    :component contacts-list/blocked-users-list}
   {:name      :wakuv2-settings
@@ -146,7 +148,7 @@
    :options   {:insets {:top? true}}
    :component bootnodes-settings/bootnodes-settings}
   {:name      :installations
-    :options   {:topBar (topbar-options (i18n/label :t/devices))
+    :options   {:topBar {:title {:text (i18n/label :t/devices)}}
                :insets {:top? true}}
    :component pairing/installations}
   {:name      :edit-bootnode
@@ -162,91 +164,107 @@
    :options   {:insets {:top? true}}
    :component edit-mailserver/edit-mailserver}
   {:name      :dapps-permissions
-    :options   {:topBar (topbar-options :t/dapps-permissions)
+    :options   {:topBar {:title {:text (i18n/label :t/dapps-permissions)}}
                :insets {:top? true}}
    :component dapps-permissions/dapps-permissions}
   {:name      :privacy-and-security
-    :options   {:topBar (topbar-options :t/privacy-and-security)
+    :options   {:topBar {:title {:text (i18n/label :t/privacy-and-security)}}
                :insets {:top? true}}
    :component privacy-and-security/privacy-and-security}
   {:name      :messages-from-contacts-only
-    :options   {:topBar (topbar-options :t/accept-new-chats-from)
+    :options   {:topBar {:title {:text (i18n/label :t/accept-new-chats-from)}}
                :insets {:top? true}}
    :component messages-from-contacts-only/messages-from-contacts-only-view}
   {:name      :appearance
-    :options   {:topBar (topbar-options :t/appearance)
+    :options   {:topBar {:title {:text (i18n/label :t/appearance)}}
                :insets {:top? true}}
    :component appearance/appearance-view}
   {:name      :privacy-and-security-profile-pic-show-to
-    :options   {:topbar (topbar-options :t/show-profile-pictures-to)
+    :options   {:topbar {:title {:text (i18n/label :t/show-profile-pictures-to)}}
                :insets {:top? true}}
    :component privacy-and-security/profile-pic-show-to}
   {:name      :privacy-and-security-profile-pic
-    :options   {:topBar (topbar-options :t/show-profile-pictures)
+    :options   {:topBar {:title {:text (i18n/label :t/show-profile-pictures)}}
                :insets {:top? true}}
    :component privacy-and-security/profile-pic}
   {:name      :notifications
-    :options   {:topBar (topbar-options :t/notification-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/notification-settings)}}
                :insets {:top? true}}
    :component notifications-settings/notifications-settings}
   {:name      :sync-settings
-    :options   {:topBar (topbar-options :t/sync-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/sync-settings)}}
                :insets {:top? true}}
    :component sync-settings/sync-settings}
   {:name      :advanced-settings
-    :options   {:topBar (topbar-options :t/advanced)
+    :options   {:topBar {:title {:text (i18n/label :t/advanced)}}
                :insets {:top? true}}
    :component advanced-settings/advanced-settings}
   {:name      :help-center
-    :options   {:topBar (topbar-options :t/need-help)
+    :options   {:topBar {:title {:text (i18n/label :t/need-help)}}
                :insets {:top? true}}
    :component help-center/help-center}
   {:name      :glossary
-    :options   {:topBar (topbar-options :t/glossary)
+    :options   {:topBar {:title {:text (i18n/label :t/glossary)}}
                :insets {:top? true}}
    :component glossary/glossary}
   {:name      :about-app
-    :options   {:topBar (topbar-options :t/about-app)
+    :options   {:topBar {:title {:text (i18n/label :t/about-app)}}
                :insets {:top? true}}
    :component about-app/about-app}
   {:name      :privacy-policy
-    :options   {:topBar (topbar-options :t/privacy-policy)
+    :options   {:topBar {:title {:text (i18n/label :t/privacy-policy)}}
                :insets {:top? true}}
    :component about-app/privacy-policy}
   {:name      :terms-of-service
-    :options   {:topBar (topbar-options :t/terms-of-service)
+    :options   {:topBar {:title {:text (i18n/label :t/terms-of-service)}}
                :insets {:top? true}}
    :component about-app/tos}
   {:name      :principles
-    :options   {:topBar (topbar-options :t/principles)
+    :options   {:topBar {:title {:text (i18n/label :t/principles)}}
                :insets {:top? true}}
    :component about-app/principles}
   {:name      :manage-dapps-permissions
    ;;TODO dynamic title
    :options   {:insets {:top? true}}
    :component dapps-permissions/manage}
+   {:name      :network-settings
+    ;;TODO accessories
+    :options   {:insets {:top? true}}
+    :component network/network-settings}
+   {:name      :network-details
+    :options   {:topBar {:title {:text (i18n/label :t/network-details)}}
+                :insets {:top? true}}
+    :component network-details/network-details}
+   {:name      :network-info
+    :options   {:topBar {:title {:text (i18n/label :t/network-info)}}
+                :insets {:top? true}}
+    :component network-info/network-info}
   {:name      :rpc-usage-info
-    :options   {:topBar (topbar-options :t/rpc-usage-info)
+    :options   {:topBar {:title {:text (i18n/label :t/rpc-usage-info)}}
                :insets {:top? true}}
    :component rpc-usage-info/usage-info}
   {:name      :peers-stats
-    :options   {:topBar (topbar-options :t/peers-stats)
+    :options   {:topBar {:title {:text (i18n/label :t/peers-stats)}}
                :insets {:top? true}}
    :component peers-stats/peers-stats}
+   {:name      :edit-network
+    :options   {:topBar {:title {:text (i18n/label :t/add-network)}}
+                :insets {:top? true}}
+    :component edit-network/edit-network}
   {:name      :log-level-settings
-    :options   {:topBar (topbar-options :t/log-level-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/log-level-settings)}}
                :insets {:top? true}}
    :component log-level-settings/log-level-settings}
   {:name      :fleet-settings
-    :options   {:topBar (topbar-options :t/fleet-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/fleet-settings)}}
                :insets {:top? true}}
    :component fleet-settings/fleet-settings}
   {:name      :mobile-network-settings
-    :options   {:topBar (topbar-options :t/mobile-network-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/mobile-network-settings)}}
                :insets {:top? true}}
    :component mobile-network-settings/mobile-network-settings}
   {:name      :backup-settings
-    :options   {:topBar (topbar-options :t/backup-settings)
+    :options   {:topBar {:title {:text (i18n/label :t/backup-settings)}}
                :insets {:top? true}}
    :component backup-settings/backup-settings}
   {:name      :backup-seed
@@ -254,14 +272,14 @@
    :options   {:insets {:top? true}}
    :component profile.seed/backup-seed}
   {:name      :reset-password
-    :options   {:topBar (topbar-options :t/reset-password)
+    :options   {:topBar {:title {:text (i18n/label :t/reset-password)}}
                :insets {:top? true}}
    :component reset-password/reset-password}
   {:name      :delete-profile
    :insets    {:bottom? true}
    :component delete-profile/delete-profile}
   {:name      :default-sync-period-settings
-    :options   {:topBar (topbar-options :t/default-sync-period)
+    :options   {:topBar {:title {:text (i18n/label :t/default-sync-period)}}
                :insets {:top? true}}
    :component default-sync-period-settings/default-sync-period-settings}

@@ -270,7 +288,7 @@
   ;[Chat] Link preview settings

   {:name      :link-previews-settings
-    :options   {:topBar (topbar-options :t/chat-link-previews)
+    :options   {:topBar {:title {:text (i18n/label :t/chat-link-previews)}}
                :insets {:top? true}}
    :component link-previews-settings/link-previews-settings}

@@ -310,7 +328,7 @@
   ;;TODO WHY MODAL?
   ;[Profile] Notifications settings
   {:name      :notifications-settings
-    :options   {:topBar             (topbar-options :t/notification-settings)
+    :options   {:topBar             {:title {:text (i18n/label :t/notification-settings)}}
                :popGesture         false
                :hardwareBackButton {:dismissModalOnPress false
                                     :popStackOnPress     false}
@@ -10,7 +10,6 @@
    [re-frame.core :as re-frame]
    [react-native.mail :as react-native-mail]
    [react-native.platform :as platform]
-    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.common.log :as log]
    [status-im.config :as config]
    [utils.datetime :as datetime]
@@ -32,10 +31,11 @@
  [{:keys [db]} node-version]
  {:db (assoc db :web3-node-version node-version)})

-(re-frame/reg-fx :logging/initialize-web3-client-version
- (fn []
-   (json-rpc/call {:method     "web3_clientVersion"
-                   :on-success [:logging/store-web3-client-version]})))
+(rf/defn initialize-web3-client-version
+  {:events [:logging/initialize-web3-client-version]}
+  [_]
+  {:json-rpc/call [{:method     "web3_clientVersion"
+                    :on-success #(re-frame/dispatch [:logging/store-web3-client-version %])}]})

 (defn extract-url-components
  [address]
@@ -5,7 +5,7 @@
  (= network-type "cellular"))

 (defn syncing-allowed?
-  [db]
+  [{:keys [db]}]
  (let [network                              (:network/type db)
        {:keys [syncing-on-mobile-network?]} (:profile/profile db)]
    (or (= network "wifi")
@@ -2,7 +2,7 @@
  (:require-macros [legacy.status-im.utils.slurp :refer [slurp]])
  (:require
    [legacy.status-im.fleet.default-fleet :refer (default-fleets)])
-  (:require [tests.test-utils :as utils.test]))
+  (:require [legacy.status-im.utils.test :as utils.test]))

 ;; to generate a js Proxy at js/__STATUS_MOBILE_JS_IDENTITY_PROXY__ that accept any (.xxx) call and
 ;; return itself
@@ -163,11 +163,6 @@
  #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 {}})
@@ -420,7 +415,6 @@
    "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
@@ -2,17 +2,10 @@
  (:require
    [quo.foundations.colors :as colors]))

-(defn- get-dimensions
-  [size]
-  (case size
-    :size-24 24
-    :size-20 20
-    nil))
-
 (defn collection-avatar
-  [theme size]
-  {:width         (get-dimensions size)
-   :height        (get-dimensions size)
+  [theme]
+  {:width         24
+   :height        24
   :border-width  1
   :border-color  (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10 theme)
   :border-radius 6})
@@ -9,10 +9,10 @@
   
    :image - collection image
    :theme - keyword -> :light/:dark"
-  [{:keys [image theme size] :or {size :size-24}}]
+  [{:keys [image theme]}]
  [fast-image/fast-image
   {:accessibility-label :collection-avatar
    :source              image
-    :style               (style/collection-avatar theme size)}])
+    :style               (style/collection-avatar theme)}])

 (def view (quo.theme/with-theme view-internal))
@@ -25,7 +25,7 @@
        :or   {size                :size-20
               customization-color :blue
               picture             nil
-               icon-name           :i/members}}]
+               icon-name           :i/group}}]
    (let [container-size (get-in sizes [size :container])
          icon-size      (get-in sizes [size :icon])]
      [rn/view
@@ -1,6 +1,7 @@
 (ns quo.components.colors.color-picker.component-spec
  (:require
    [quo.components.colors.color-picker.view :as color-picker]
+    [reagent.core :as reagent]
    [test-helpers.component :as h]))

 (h/describe "color-picker"
@@ -11,7 +12,7 @@
      (-> (h/expect event)
          (.toHaveBeenCalled))))
  (h/test "color picker color changed"
-    (let [selected (atom nil)]
+    (let [selected (reagent/atom nil)]
      (h/render [color-picker/view {:on-change #(reset! selected %)}])
      (h/fire-event :press (get (h/get-all-by-label-text :color-picker-item) 0))
      (-> (h/expect @selected)
@@ -3,8 +3,7 @@
    [quo.components.colors.color.constants :as constants]
    [quo.components.colors.color.view :as color]
    [quo.foundations.colors :as colors]
-    [react-native.core :as rn]
-    [react-native.gesture :as gesture]))
+    [react-native.core :as rn]))

 (defn get-item-layout
  [_ index]
@@ -53,7 +52,7 @@
                                        :index        index
                                        :viewPosition 0.5})))))
        50)))
-    [gesture/flat-list
+    [rn/flat-list
     {:ref                               on-ref
      ;; TODO: using :feng-shui? temporarily while b & w is being developed.
      ;; https://github.com/status-im/status-mobile/discussions/16676
@@ -1,23 +0,0 @@
-(ns quo.components.community.channel-action.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn channel-action-container
-  [{:keys [big? disabled?]}]
-  (cond-> {}
-    disabled?  (assoc :opacity 0.3)
-    big?       (assoc :flex-grow 1)
-    (not big?) (assoc :width 104)))
-
-(defn channel-action
-  [{:keys [color pressed? theme]}]
-  {:height           102
-   :padding          12
-   :border-radius    16
-   :background-color (colors/resolve-color color theme (if pressed? 20 10))
-   :justify-content  :space-between})
-
-(def channel-action-row
-  {:flex-direction  :row
-   :justify-content :space-between
-   :align-items     :center})
@@ -1,39 +0,0 @@
-(ns quo.components.community.channel-action.view
-  (:require
-    [quo.components.community.channel-action.style :as style]
-    [quo.components.counter.counter.view :as counter]
-    [quo.components.icon :as icons]
-    [quo.components.markdown.text :as text]
-    [quo.theme]
-    [react-native.core :as rn]))
-
-(defn view
-  [{:keys [big? customization-color label counter-value icon on-press accessibility-label disabled?]}]
-  (let [theme                  (quo.theme/use-theme-value)
-        [pressed? set-pressed] (rn/use-state false)
-        on-press-in            (rn/use-callback #(set-pressed true))
-        on-press-out           (rn/use-callback #(set-pressed false))]
-    [rn/view
-     {:style (style/channel-action-container
-              {:big?      big?
-               :disabled? disabled?})}
-     [rn/pressable
-      (cond-> {:style               (style/channel-action
-                                     {:big?      big?
-                                      :color     customization-color
-                                      :pressed?  pressed?
-                                      :theme     theme
-                                      :disabled? disabled?})
-               :accessibility-label accessibility-label}
-        (not disabled?) (assoc :on-press     on-press
-                               :on-press-in  on-press-in
-                               :on-press-out on-press-out))
-      [rn/view {:style style/channel-action-row}
-       [icons/icon icon]
-       (when counter-value
-         [counter/view {:type :secondary} counter-value])]
-      [text/text
-       {:size            :paragraph-1
-        :weight          :medium
-        :number-of-lines 2}
-       label]]]))
@@ -0,0 +1,32 @@
+(ns quo.components.community.channel-actions
+  (:require
+    [quo.components.community.style :as style]
+    [quo.components.counter.counter.view :as counter]
+    [quo.components.icon :as icons]
+    [quo.components.markdown.text :as text]
+    [react-native.core :as rn]))
+
+(defn channel-action
+  [{:keys [big? color label counter-value icon on-press accessibility-label]}]
+  [rn/touchable-opacity
+   {:on-press            on-press
+    :style               (style/channel-action-touch big?)
+    :accessibility-label accessibility-label}
+   [rn/view {:style (style/channel-action color)}
+    [rn/view {:style style/channel-action-row}
+     [icons/icon icon]
+     (when counter-value
+       [counter/view {:type :secondary} counter-value])]
+    [text/text {:size :paragraph-1 :weight :medium :number-of-lines 2} label]]])
+
+(defn channel-actions
+  [{:keys [style actions]}]
+  [rn/view {:style (merge {:flex-direction :row :flex 1} style)}
+   (map-indexed
+    (fn [index action]
+      ^{:key index}
+      [:<>
+       [channel-action action]
+       (when (not= action (last actions))
+         [rn/view {:width 16}])])
+    actions)])
@@ -1,16 +0,0 @@
-(ns quo.components.community.channel-actions.view
-  (:require
-    [quo.components.community.channel-action.view :as channel-action]
-    [react-native.core :as rn]))
-
-(defn view
-  [{:keys [container-style actions]}]
-  [rn/view {:style (assoc container-style :flex-direction :row)}
-   (map-indexed
-    (fn [index action]
-      ^{:key index}
-      [:<>
-       [channel-action/view action]
-       (when (not= action (last actions))
-         [rn/view {:width 16}])])
-    actions)])
@@ -133,6 +133,25 @@
                      colors/neutral-80
                      theme)})

+(defn channel-action-touch
+  [big?]
+  {:flex      1
+   :max-width (if big? 216 104)})
+
+(defn channel-action
+  [color]
+  {:padding          12
+   :height           102
+   :flex             1
+   :border-radius    16
+   :background-color (colors/custom-color color 50 10)
+   :justify-content  :space-between})
+
+(def channel-action-row
+  {:flex-direction  :row
+   :justify-content :space-between
+   :align-items     :center})
+
 (defn loading-card
  [width theme]
  (merge
@@ -11,7 +11,6 @@
   [:catn
    [:props
     [:map {:closed true}
-      [:container-style {:optional true} [:maybe :map]]
      [:value {:optional true} [:maybe [:or :string :int]]]
      [:status {:optional true} [:maybe :keyword]]
      [:size {:optional true} [:maybe [:enum :size-32 :size-24]]]
@@ -20,7 +19,7 @@
   :any])

 (defn- view-internal
-  [{:keys [value accessibility-label container-style]
+  [{:keys [value accessibility-label]
    :as   props}]
  (let [default-props {:status :default
                       :size   :size-32}
@@ -28,7 +27,7 @@
    [rn/view
     {:accessible          true
      :accessibility-label (or accessibility-label :collectible-counter)
-      :style               (merge (style/container props) container-style)}
+      :style               (style/container props)}
     [text/text
      {:weight :medium
       :size   (style/get-text-size props)
@@ -58,15 +58,14 @@
     :on-press            on-press}
    [rn/view
     {:style (style/row-container sub-label)}
-     (when icon
-       [rn/view
-        {:accessibility-label :left-icon-for-action
-         :accessible          true
-         :style               (style/left-icon sub-label)}
-        [icon/icon icon
-         {:color    (or icon-color (get-icon-color danger? theme))
-          :no-color no-icon-color?
-          :size     20}]])
+     [rn/view
+      {:accessibility-label :left-icon-for-action
+       :accessible          true
+       :style               (style/left-icon sub-label)}
+      [icon/icon icon
+       {:color    (or icon-color (get-icon-color danger? theme))
+        :no-color no-icon-color?
+        :size     20}]]
     [rn/view
      {:style style/text-container}
      [text/text
@@ -59,15 +59,4 @@
              :button-one-label "Request to join"}])
    (h/is-truthy (h/get-by-text "Eligible to join as"))
    (h/is-truthy (h/get-by-text "Admin"))
-    (h/is-truthy (h/get-by-text "Request to join")))
-
-  (h/test "render with top description with custom text & 1 action"
-    (render [bottom-actions/view
-             {:description          :top
-              :role                 :admin
-              :actions              :one-action
-              :description-top-text "You'll be an"
-              :button-one-label     "Request to join"}])
-    (h/is-truthy (h/get-by-text "You'll be an"))
-    (h/is-truthy (h/get-by-text "Admin"))
    (h/is-truthy (h/get-by-text "Request to join"))))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brian Sztamfater	4d381bd866	add more tests	2024-03-05 11:43:19 -03:00
Brian Sztamfater	ba68ccdbac	fix address input scan	2024-03-05 11:43:18 -03:00
Brian Sztamfater	178dd93a3b	try to fix tests	2024-03-05 11:43:18 -03:00
Brian Sztamfater	f7d4645946	fix navigate-back	2024-03-05 11:43:18 -03:00
Brian Sztamfater	1285d3f874	add unit tests	2024-03-05 11:43:17 -03:00
Brian Sztamfater	80fd9e00b0	naming refactor	2024-03-05 11:43:17 -03:00
Brian Sztamfater	d667e826b2	fix: add support for multiple modals when tracking modal-view-ids in app-db	2024-03-05 11:43:15 -03:00
@@ -1 +1 @@
 .27.0
 .25.0