WIP: theme colors with jaime

.detoxrc.js

@@ -1,37 +1,37 @@
 module.exports = {
-  testRunner: 'jest',
-  testRegex: '\\.visual\\.js$',
-  'runner-config': 'visual-test/config.json',
-  devices: {
-    simulator: {
-      type: 'ios.simulator',
-      device: {
-        type: 'iPhone 11 Pro',
-      },
-    },
+  "testRunner": "jest",
+  "testRegex": "\\.visual\\.js$",
+  "runner-config": "visual-test/config.json",
+  "devices": {
+    "simulator": {
+      "type": "ios.simulator",
+      "device": {
+        "type": "iPhone 11 Pro"
+      }
+    }
   },
-  apps: {
-    'ios.release': {
-      name: 'StatusIm',
-      type: 'ios.app',
-      binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/StatusIm.app',
-      build: 'make release-ios',
-    },
-    'ios.debug': {
-      name: 'StatusIm',
-      type: 'ios.app',
-      binaryPath: process.env.TEST_BINARY_PATH,
-      build: "make run-ios SIMULATOR='iPhone 11 Pro'",
+  "apps": {
+    "ios.release": {
+      "name": "StatusIm",
+      "type": "ios.app",
+      "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/StatusIm.app",
+      "build": "make release-ios"
     },
+    "ios.debug": {
+      "name": "StatusIm",
+      "type": "ios.app",
+      "binaryPath": process.env.TEST_BINARY_PATH,
+      "build": "make run-ios SIMULATOR='iPhone 11 Pro'"
+    }
   },
-  configurations: {
-    'ios.sim.release': {
-      device: 'simulator',
-      app: 'ios.release',
+  "configurations": {
+    "ios.sim.release": {
+      "device": "simulator",
+      "app": "ios.release"
     },
-    'ios.sim.debug': {
-      device: 'simulator',
-      app: 'ios.debug',
-    },
-  },
-};
+    "ios.sim.debug": {
+      "device": "simulator",
+      "app": "ios.debug"
+    }
+  }
+}

.eslintrc.js

@@ -1,4 +1,4 @@
 module.exports = {
-  root: true,
-  extends: '@react-native-community',
-};
+    root: true,
+    extends: '@react-native-community',
+  };

.gitignore

@@ -184,9 +184,3 @@ test/appium/tests/users.py
 
 ## component-tests
 *.log
-
-## local xcode env introduced in react-native 0.69
-.xcode.env.local
-
-## git hooks
-lefthook.yml

.prettierignore

@@ -1,9 +0,0 @@
-*
-!*.js
-!*/
-*.clj-kondo
-*.shadow-cljs
-modules
-result
-target
-component-spec

.prettierrc.js

@@ -1,9 +1,7 @@
 module.exports = {
-  arrowParens: 'always',
-  printWidth: 120,
-  semi: true,
-  singleQuote: true,
-  tabWidth: 2,
-  trailingComma: 'all',
-  useTabs: false,
+    bracketSpacing: false,
+    bracketSameLine: true,
+    singleQuote: true,
+    trailingComma: 'all',
+    tabWidth: 4,
 };

Makefile

@@ -42,7 +42,7 @@ export NODE_OPTIONS += --openssl-legacy-provider
 export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
 
 # Our custom config is located in nix/nix.conf
-export NIX_USER_CONF_FILES = $(PWD)/nix/nix.conf
+export NIX_CONF_DIR = $(PWD)/nix
 # Location of symlinks to derivations that should not be garbage collected
 export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-mobile
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
@@ -81,10 +81,6 @@ nix-gc-protected:
 	@echo -e "$(YELLOW)The following paths are protected:$(RESET)" && \
 	ls -1 $(_NIX_GCROOTS) | sed 's/^/ - /'
 
-nix-upgrade: SHELL := /bin/sh
-nix-upgrade: ##@nix Upgrade Nix interpreter to current version.
-	nix/scripts/upgrade.sh
-
 nix-gc: export TARGET := nix
 nix-gc: nix-gc-protected ##@nix Garbage collect all packages older than 20 days from /nix/store
 	nix-store --gc
@@ -272,7 +268,7 @@ run-android: export TARGET := android
 run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug
 
-SIMULATOR=iPhone 11 Pro
+SIMULATOR=iPhone 13
 run-ios: export TARGET := ios
 run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
@@ -301,21 +297,19 @@ define find_all_clojure_files
 $$(comm -23 <(sort <(git ls-files --cached --others --exclude-standard)) <(sort <(git ls-files --deleted)) | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn)
 endef
 
-lint: export TARGET := clojure
+lint: export TARGET := default
 lint: ##@test Run code style checks
 	@sh scripts/lint-re-frame-in-quo-components.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
-	yarn prettier
+	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES
 
 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
-lint-fix: export TARGET := clojure
+lint-fix: export TARGET := default
 lint-fix: ##@test Run code style checks and fix issues
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	yarn prettier
+	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES
 
 
 shadow-server: export TARGET := clojure

android/app/build.gradle

@@ -92,12 +92,12 @@ project.ext.react = [
      *       to guard against a hang in the UI thread after invoking status-go.
      * Also a clean and rebuild is required when changing this. */
     enableHermes: !disableHermes,
-    /* Disable 'The first definition was here.' warnings */
-    hermesFlagsRelease: ["-w"],
     /* FIXME: Workaround for crash caused by missing libhermes-executor-release.so.
      * https://github.com/facebook/react-native/issues/32928 */
     deleteDebugFilesForVariant: { false },
     enableVmCleanup: false,
+    /* Disable 'The first definition was here.' warnings */
+    hermesFlagsRelease: ["-w"],
     bundleInPr: true,
     inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
 ]
@@ -137,12 +137,10 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 /**
- * Architectures to build native code for.
+ * Architectures to build native code for in debug.
  */
-def reactNativeArchitectures() {
-    def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
+def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+
 
 def getCommitHash = { ->
     if (project.hasProperty("commitHash")) {
@@ -173,7 +171,7 @@ def getVersionName = { ->
         }
         /* Necessary because Android Studio uses wrong PWD.
          * Is actually absolute directory path of this file. */
-        def configDir = project.projectDir.toString()
+        def configDir = project.projectDir.toString() 
         version = new File(configDir + '/../../VERSION').text
         return version.replaceAll("\\s","")
     }
@@ -196,12 +194,12 @@ def getEnvOrConfig = { varName ->
 
 android {
     ndkVersion rootProject.ext.ndkVersion
-
+    
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
@@ -219,70 +217,7 @@ android {
                 abiFilters getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
             }
         }
-	buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-
-        if (isNewArchitectureEnabled()) {
-            // We configure the NDK build only if you decide to opt-in for the New Architecture.
-            externalNativeBuild {
-                ndkBuild {
-                    arguments "APP_PLATFORM=android-21",
-                        "APP_STL=c++_shared",
-                        "NDK_TOOLCHAIN_VERSION=clang",
-                        "GENERATED_SRC_DIR=$buildDir/generated/source",
-                        "PROJECT_BUILD_DIR=$buildDir",
-                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
-                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
-                        "NODE_MODULES_DIR=$rootDir/../node_modules"
-                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-                    cppFlags "-std=c++17"
-                    // Make sure this target name is the same you specify inside the
-                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
-                    targets "rndiffapp_appmodules"
-                }
-            }
-        }
     }
-
-       if (isNewArchitectureEnabled()) {
-           // We configure the NDK build only if you decide to opt-in for the New Architecture.
-           externalNativeBuild {
-               ndkBuild {
-                   path "$projectDir/src/main/jni/Android.mk"
-               }
-           }
-           def reactAndroidProjectDir = project(':ReactAndroid').projectDir
-           def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
-               dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-               from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-               into("$buildDir/react-ndk/exported")
-           }
-           def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
-               dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-               from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-               into("$buildDir/react-ndk/exported")
-           }
-           afterEvaluate {
-               // If you wish to add a custom TurboModule or component locally,
-               // you should uncomment this line.
-               // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
-               preDebugBuild.dependsOn(packageReactNdkDebugLibs)
-               preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
-
-               // Due to a bug inside AGP, we have to explicitly set a dependency
-               // between configureNdkBuild* tasks and the preBuild tasks.
-               // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
-               configureNdkBuildRelease.dependsOn(preReleaseBuild)
-               configureNdkBuildDebug.dependsOn(preDebugBuild)
-               reactNativeArchitectures().each { architecture ->
-                   tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
-                       dependsOn("preDebugBuild")
-                   }
-                   tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
-                       dependsOn("preReleaseBuild")
-                   }
-               }
-           }
-       }
     /**
      * Arbitrary project metadata
      * https://docs.gradle.org/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html
@@ -341,6 +276,11 @@ android {
             versionNameSuffix   "-SNAPSHOT"
             resValue "string", "build_config_package", "im.status.ethereum"
             signingConfig signingConfigs.debug
+            if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }
         }
         release {
             minifyEnabled enableProguardInReleaseBuilds
@@ -384,16 +324,29 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.facebook.soloader:soloader:0.10.1+"
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.facebook.soloader:soloader:0.10.3+'
+
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.core:core-splashscreen:1.0.0"
 
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.fbjni'
+    }
+    // TODO Uncomment once Flipper does not cause webview crashes in Debug mode
+    // debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+    //      exclude group:'com.facebook.flipper'
+    // }
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
+
     if (enableHermes) {
-      //noinspection GradleDynamicVersion
-      implementation("com.facebook.react:hermes-engine:+") { // From node_modules
-          exclude group: 'com.facebook.fbjni' }
-      } else {
+      def hermesPath = "../../node_modules/hermes-engine/android/";
+      debugImplementation files(hermesPath + "hermes-debug.aar")
+      releaseImplementation files(hermesPath + "hermes-release.aar")
+      prImplementation files(hermesPath + "hermes-release.aar")
+    } else {
       implementation jscFlavor
     }
 
@@ -411,25 +364,9 @@ dependencies {
     implementation project(':react-native-status')
     implementation project(':react-native-status-keycard')
     implementation 'com.github.status-im:function:0.0.1'
-    implementation 'com.facebook.fresco:fresco:2.5.0'
-    implementation 'com.facebook.fresco:animated-gif:2.5.0'
-    implementation "com.squareup.okhttp3:okhttp-tls:4.9.2"
-}
-
-if (isNewArchitectureEnabled()) {
-    // If new architecture is enabled, we let you build RN from source
-    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
-    // This will be applied to all the imported transtitive dependency.
-    configurations.all {
-        resolutionStrategy.dependencySubstitution {
-            substitute(module("com.facebook.react:react-native"))
-                     .using(project(":ReactAndroid"))
-                        .because("On New Architecture we're building React Native from source")
-                            substitute(module("com.facebook.react:hermes-engine"))
-                                .using(project(":ReactAndroid:hermes-engine"))
-                                    .because("On New Architecture we're building Hermes from source")
-        }
-    }
+    implementation 'com.facebook.fresco:fresco:2.2.0'
+    implementation 'com.facebook.fresco:animated-gif:2.2.0'
+    implementation "com.squareup.okhttp3:okhttp-tls:4.9.1"
 }
 
 def getLocalNDKDir = { ->
@@ -465,11 +402,3 @@ task hemroidBuild(type: Exec) {
 preBuild.dependsOn hemroidBuild
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}

android/app/src/debug/AndroidManifest.xml

@@ -8,6 +8,6 @@
     <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
 
    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" >
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
     </application>
-</manifest>
+</manifest>

android/app/src/debug/java/im/status/ethereum/ReactNativeFlipper.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package im.status.ethereum;
+
+import android.content.Context;
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.android.utils.FlipperUtils;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+// import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
+// import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.network.NetworkingModule;
+import okhttp3.OkHttpClient;
+
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    if (FlipperUtils.shouldEnableFlipper(context)) {
+      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+
+      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new ReactFlipperPlugin());
+      client.addPlugin(new DatabasesFlipperPlugin(context));
+      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+      client.addPlugin(CrashReporterPlugin.getInstance());
+
+      // TODO Uncomment once Flipper does not cause webview crashes in Debug mode
+      // NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+      // NetworkingModule.setCustomClientBuilder(
+      //     new NetworkingModule.CustomClientBuilder() {
+      //       @Override
+      //       public void apply(OkHttpClient.Builder builder) {
+      //         builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+      //       }
+      //     });
+      // client.addPlugin(networkFlipperPlugin);
+      client.start();
+
+      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+      // Hence we run if after all native modules have been initialized
+      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+      if (reactContext == null) {
+        reactInstanceManager.addReactInstanceEventListener(
+            new ReactInstanceManager.ReactInstanceEventListener() {
+              @Override
+              public void onReactContextInitialized(ReactContext reactContext) {
+                reactInstanceManager.removeReactInstanceEventListener(this);
+                reactContext.runOnNativeModulesQueueThread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
+              }
+            });
+      } else {
+        client.addPlugin(new FrescoFlipperPlugin());
+      }
+    }
+  }
+}

android/app/src/main/AndroidManifest.xml

@@ -44,7 +44,7 @@
                 android:theme="@style/Theme.AppSplash"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
                 android:resizeableActivity="false"
                 android:launchMode="singleTask">
             <intent-filter>

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

@@ -32,7 +32,6 @@ import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 import com.reactnativenavigation.NavigationActivity;
 import com.facebook.react.modules.core.PermissionListener;
 import androidx.core.splashscreen.SplashScreen;
-import com.facebook.react.ReactActivity;
 
 import java.util.Properties;
 import im.status.ethereum.module.StatusThreadPoolExecutor;

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

@@ -1,9 +1,9 @@
 package im.status.ethereum;
 
 import androidx.multidex.MultiDexApplication;
+import android.util.Log;
 import android.content.Context;
 import android.webkit.WebView;
-import im.status.ethereum.newarchitecture.MainApplicationReactNativeHost;
 import java.lang.reflect.InvocationTargetException;
 import com.facebook.react.PackageList;
 
@@ -14,7 +14,6 @@ import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.modules.network.OkHttpClientProvider;
 import com.reactnativecommunity.blurview.BlurViewPackage;
@@ -39,7 +38,6 @@ public class MainApplication extends NavigationApplication {
 
         @Override
         protected List<ReactPackage> getPackages() {
-
             StatusPackage statusPackage = new StatusPackage(RootUtil.isDeviceRooted());
 
             List<ReactPackage> packages = new PackageList(this).getPackages();
@@ -62,26 +60,48 @@ public class MainApplication extends NavigationApplication {
 	}
     };
 
-    private final ReactNativeHost mNewArchitectureNativeHost = new MainApplicationReactNativeHost(this);
-
     @Override
     public ReactNativeHost getReactNativeHost() {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-          return mNewArchitectureNativeHost;
-        } else {
-          return mReactNativeHost;
-        }
+        return mReactNativeHost;
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        // If you opted-in for the New Architecture, we enable the TurboModule system
-        ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
 
         OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());
 
         WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
+        //initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    }
+    /**
+     * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+     * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+     *
+     * @param context
+     * @param reactInstanceManager
+     */
+    private static void initializeFlipper(
+          Context context, ReactInstanceManager reactInstanceManager) {
+        if (BuildConfig.DEBUG) {
+            try {
+                /*
+                  We use reflection here to pick up the class that initializes Flipper,
+                  since Flipper library is not available in release mode
+                */
+                Class<?> aClass = Class.forName("im.status.ethereum.ReactNativeFlipper");
+                aClass
+                    .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+                    .invoke(null, context, reactInstanceManager);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        }
     }
-
 }

android/app/src/main/java/im/status/ethereum/StatusOkHttpClientFactory.java

@@ -20,58 +20,25 @@ import java.security.cert.X509Certificate;
 import im.status.ethereum.module.StatusPackage;
 
 class StatusOkHttpClientFactory implements OkHttpClientFactory {
-
-  private static final String TAG = "StatusOkHttpClientFactory";
-
   public OkHttpClient createNewNetworkModuleClient() {
-      X509Certificate cert = null;
-      HandshakeCertificates clientCertificates;
-      String certPem = "";
+    String certPem = StatusPackage.getImageTLSCert();
+    X509Certificate cert;
 
-    // Get TLS PEM certificate from status-go
     try {
-        // induce half second sleep because sometimes a cert is not immediately available
-        // TODO : remove sleep if App no longer crashes on Android 10 devices with
-        // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-        Thread.sleep(500);
-        certPem = StatusPackage.getImageTLSCert();
-    } catch(Exception e) {
-        Log.e(TAG, "Could not getImageTLSCert",e);
-    }
-    // Convert PEM certificate string to X509Certificate object
-    try {
-      // induce half second sleep because sometimes a cert is not immediately available
-      // TODO : remove sleep if App no longer crashes on Android 10 devices
-      // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-      Thread.sleep(500);
       CertificateFactory cf = CertificateFactory.getInstance("X.509");
       cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(certPem.getBytes()));
     } catch(Exception e) {
-      Log.e(TAG, "Could not parse certificate",e);
-    }
-    // Create HandshakeCertificates object with our certificate
-    try {
-      // induce half second sleep because sometimes a cert is not immediately available
-      // TODO : remove sleep if App no longer crashes on Android 10 devices
-      // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-      Thread.sleep(500);
-      clientCertificates = new HandshakeCertificates.Builder()
-        .addPlatformTrustedCertificates()
-        .addTrustedCertificate(cert)
-        .build();
-    } catch(Exception e) {
-      Log.e(TAG, "Could not build HandshakeCertificates", e);
-      return null;
+      Log.e("StatusOkHttpClientFactory", "Could not parse certificate");
+      cert = null;
     }
 
-    // Create OkHttpClient with custom SSL socket factory and trust manager
-    try {
-       return OkHttpClientProvider.createClientBuilder()
-        .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
-        .build();
-    } catch(Exception e) {
-      Log.e(TAG, "Could not create OkHttpClient", e);
-      return null;
-    }
+    HandshakeCertificates clientCertificates = new HandshakeCertificates.Builder()
+      .addPlatformTrustedCertificates()
+      .addTrustedCertificate(cert)
+      .build();
+
+    return OkHttpClientProvider.createClientBuilder()
+      .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
+      .build();
   }
 }

android/app/src/main/java/im/status/ethereum/newarchitecture/MainApplicationReactNativeHost.java

@@ -1,103 +0,0 @@
-package im.status.ethereum.newarchitecture;
-import android.app.Application;
-import androidx.annotation.NonNull;
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleProvider;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JSIModuleType;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UIManager;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.react.fabric.CoreComponentsRegistry;
-import com.facebook.react.fabric.FabricJSIModuleProvider;
-import com.facebook.react.fabric.ReactNativeConfig;
-import com.facebook.react.uimanager.ViewManagerRegistry;
-import im.status.ethereum.BuildConfig;
-import im.status.ethereum.newarchitecture.components.MainComponentsRegistry;
-import im.status.ethereum.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
-import java.util.ArrayList;
-import java.util.List;
-/**
- * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
- * TurboModule delegates and the Fabric Renderer.
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-public class MainApplicationReactNativeHost extends ReactNativeHost {
-  public MainApplicationReactNativeHost(Application application) {
-    super(application);
-  }
-  @Override
-  public boolean getUseDeveloperSupport() {
-    return BuildConfig.DEBUG;
-  }
-  @Override
-  protected List<ReactPackage> getPackages() {
-    List<ReactPackage> packages = new PackageList(this).getPackages();
-    // Packages that cannot be autolinked yet can be added manually here, for example:
-    //     packages.add(new MyReactNativePackage());
-    // TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
-    //     packages.add(new TurboReactPackage() { ... });
-    // If you have custom Fabric Components, their ViewManagers should also be loaded here
-    // inside a ReactPackage.
-    return packages;
-  }
-  @Override
-  protected String getJSMainModuleName() {
-    return "index";
-  }
-  @NonNull
-  @Override
-  protected ReactPackageTurboModuleManagerDelegate.Builder
-      getReactPackageTurboModuleManagerDelegateBuilder() {
-    // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
-    // for the new architecture and to use TurboModules correctly.
-    return new MainApplicationTurboModuleManagerDelegate.Builder();
-  }
-  @Override
-  protected JSIModulePackage getJSIModulePackage() {
-    return new JSIModulePackage() {
-      @Override
-      public List<JSIModuleSpec> getJSIModules(
-          final ReactApplicationContext reactApplicationContext,
-          final JavaScriptContextHolder jsContext) {
-        final List<JSIModuleSpec> specs = new ArrayList<>();
-        // Here we provide a new JSIModuleSpec that will be responsible of providing the
-        // custom Fabric Components.
-        specs.add(
-            new JSIModuleSpec() {
-              @Override
-              public JSIModuleType getJSIModuleType() {
-                return JSIModuleType.UIManager;
-              }
-              @Override
-              public JSIModuleProvider<UIManager> getJSIModuleProvider() {
-                final ComponentFactory componentFactory = new ComponentFactory();
-                CoreComponentsRegistry.register(componentFactory);
-                // Here we register a Components Registry.
-                // The one that is generated with the template contains no components
-                // and just provides you the one from React Native core.
-                MainComponentsRegistry.register(componentFactory);
-                final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
-                ViewManagerRegistry viewManagerRegistry =
-                    new ViewManagerRegistry(
-                        reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
-                return new FabricJSIModuleProvider(
-                    reactApplicationContext,
-                    componentFactory,
-                    ReactNativeConfig.DEFAULT_CONFIG,
-                    viewManagerRegistry);
-              }
-            });
-        return specs;
-      }
-    };
-  }
-}

android/app/src/main/java/im/status/ethereum/newarchitecture/components/MainComponentsRegistry.java

@@ -1,30 +0,0 @@
-package im.status.ethereum.newarchitecture.components;
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.soloader.SoLoader;
-/**
- * Class responsible to load the custom Fabric Components. This class has native methods and needs a
- * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
- * folder for you).
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-@DoNotStrip
-public class MainComponentsRegistry {
-  static {
-    SoLoader.loadLibrary("fabricjni");
-  }
-  @DoNotStrip private final HybridData mHybridData;
-  @DoNotStrip
-  private native HybridData initHybrid(ComponentFactory componentFactory);
-  @DoNotStrip
-  private MainComponentsRegistry(ComponentFactory componentFactory) {
-    mHybridData = initHybrid(componentFactory);
-  }
-  @DoNotStrip
-  public static MainComponentsRegistry register(ComponentFactory componentFactory) {
-    return new MainComponentsRegistry(componentFactory);
-  }
-}

android/app/src/main/java/im/status/ethereum/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java

@@ -1,40 +0,0 @@
-package im.status.ethereum.newarchitecture.modules;
-import com.facebook.jni.HybridData;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.soloader.SoLoader;
-import java.util.List;
-/**
- * Class responsible to load the TurboModules. This class has native methods and needs a
- * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
- * folder for you).
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-public class MainApplicationTurboModuleManagerDelegate
-    extends ReactPackageTurboModuleManagerDelegate {
-  private static volatile boolean sIsSoLibraryLoaded;
-  protected MainApplicationTurboModuleManagerDelegate(
-      ReactApplicationContext reactApplicationContext, List<ReactPackage> packages) {
-    super(reactApplicationContext, packages);
-  }
-  protected native HybridData initHybrid();
-  native boolean canCreateTurboModule(String moduleName);
-  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
-    protected MainApplicationTurboModuleManagerDelegate build(
-        ReactApplicationContext context, List<ReactPackage> packages) {
-      return new MainApplicationTurboModuleManagerDelegate(context, packages);
-    }
-  }
-  @Override
-  protected synchronized void maybeLoadOtherSoLibraries() {
-    if (!sIsSoLibraryLoaded) {
-      // If you change the name of your application .so file in the Android.mk file,
-      // make sure you update the name here as well.
-      SoLoader.loadLibrary("status-im_appmodules");
-      sIsSoLibraryLoaded = true;
-    }
-  }
-}

android/app/src/main/jni/Android.mk

@@ -1,39 +0,0 @@
-THIS_DIR := $(call my-dir)
-include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to include the following autogenerated makefile.
-# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
-include $(CLEAR_VARS)
-LOCAL_PATH := $(THIS_DIR)
-# You can customize the name of your application .so file here.
-LOCAL_MODULE := rndiffapp_appmodules
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to uncomment those lines to include the generated source
-# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
-#
-# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
-# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
-# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
-# Here you should add any native library you wish to depend on.
-LOCAL_SHARED_LIBRARIES := \
-  libfabricjni \
-  libfbjni \
-  libfolly_runtime \
-  libglog \
-  libjsi \
-  libreact_codegen_rncore \
-  libreact_debug \
-  libreact_nativemodule_core \
-  libreact_render_componentregistry \
-  libreact_render_core \
-  libreact_render_debug \
-  libreact_render_graphics \
-  librrc_view \
-  libruntimeexecutor \
-  libturbomodulejsijni \
-  libyoga
-LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
-include $(BUILD_SHARED_LIBRARY)

android/app/src/main/jni/MainApplicationModuleProvider.cpp

@@ -1,20 +0,0 @@
-#include "MainApplicationModuleProvider.h"
-#include <rncore.h>
-namespace facebook {
-namespace react {
-std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string moduleName,
-    const JavaTurboModule::InitParams &params) {
-  // Here you can provide your own module provider for TurboModules coming from
-  // either your application or from external libraries. The approach to follow
-  // is similar to the following (for a library called `samplelibrary`:
-  //
-  // auto module = samplelibrary_ModuleProvider(moduleName, params);
-  // if (module != nullptr) {
-  //    return module;
-  // }
-  // return rncore_ModuleProvider(moduleName, params);
-  return rncore_ModuleProvider(moduleName, params);
-}
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainApplicationModuleProvider.h

@@ -1,11 +0,0 @@
-#pragma once
-#include <memory>
-#include <string>
-#include <ReactCommon/JavaTurboModule.h>
-namespace facebook {
-namespace react {
-std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string moduleName,
-    const JavaTurboModule::InitParams &params);
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp

@@ -1,38 +0,0 @@
-#include "MainApplicationTurboModuleManagerDelegate.h"
-#include "MainApplicationModuleProvider.h"
-namespace facebook {
-namespace react {
-jni::local_ref<MainApplicationTurboModuleManagerDelegate::jhybriddata>
-MainApplicationTurboModuleManagerDelegate::initHybrid(
-    jni::alias_ref<jhybridobject>) {
-  return makeCxxInstance();
-}
-void MainApplicationTurboModuleManagerDelegate::registerNatives() {
-  registerHybrid({
-      makeNativeMethod(
-          "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
-      makeNativeMethod(
-          "canCreateTurboModule",
-          MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
-  });
-}
-std::shared_ptr<TurboModule>
-MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string name,
-    const std::shared_ptr<CallInvoker> jsInvoker) {
-  // Not implemented yet: provide pure-C++ NativeModules here.
-  return nullptr;
-}
-std::shared_ptr<TurboModule>
-MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string name,
-    const JavaTurboModule::InitParams &params) {
-  return MainApplicationModuleProvider(name, params);
-}
-bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
-    std::string name) {
-  return getTurboModule(name, nullptr) != nullptr ||
-      getTurboModule(name, {.moduleName = name}) != nullptr;
-}
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h

@@ -1,30 +0,0 @@
-#include <memory>
-#include <string>
-#include <ReactCommon/TurboModuleManagerDelegate.h>
-#include <fbjni/fbjni.h>
-namespace facebook {
-namespace react {
-class MainApplicationTurboModuleManagerDelegate
-    : public jni::HybridClass<
-          MainApplicationTurboModuleManagerDelegate,
-          TurboModuleManagerDelegate> {
- public:
-  // Adapt it to the package you used for your Java class.
-  static constexpr auto kJavaDescriptor =
-      "Lcom/rndiffapp/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
-  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
-  static void registerNatives();
-  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string name,
-      const std::shared_ptr<CallInvoker> jsInvoker) override;
-  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string name,
-      const JavaTurboModule::InitParams &params) override;
-  /**
-   * Test-only method. Allows user to verify whether a TurboModule can be
-   * created by instances of this class.
-   */
-  bool canCreateTurboModule(std::string name);
-};
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainComponentsRegistry.cpp

@@ -1,48 +0,0 @@
-#include "MainComponentsRegistry.h"
-#include <CoreComponentsRegistry.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/components/rncore/ComponentDescriptors.h>
-namespace facebook {
-namespace react {
-MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
-std::shared_ptr<ComponentDescriptorProviderRegistry const>
-MainComponentsRegistry::sharedProviderRegistry() {
-  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
-  // Custom Fabric Components go here. You can register custom
-  // components coming from your App or from 3rd party libraries here.
-  //
-  // providerRegistry->add(concreteComponentDescriptorProvider<
-  //        AocViewerComponentDescriptor>());
-  return providerRegistry;
-}
-jni::local_ref<MainComponentsRegistry::jhybriddata>
-MainComponentsRegistry::initHybrid(
-    jni::alias_ref<jclass>,
-    ComponentFactory *delegate) {
-  auto instance = makeCxxInstance(delegate);
-  auto buildRegistryFunction =
-      [](EventDispatcher::Weak const &eventDispatcher,
-         ContextContainer::Shared const &contextContainer)
-      -> ComponentDescriptorRegistry::Shared {
-    auto registry = MainComponentsRegistry::sharedProviderRegistry()
-                        ->createComponentDescriptorRegistry(
-                            {eventDispatcher, contextContainer});
-    auto mutableRegistry =
-        std::const_pointer_cast<ComponentDescriptorRegistry>(registry);
-    mutableRegistry->setFallbackComponentDescriptor(
-        std::make_shared<UnimplementedNativeViewComponentDescriptor>(
-            ComponentDescriptorParameters{
-                eventDispatcher, contextContainer, nullptr}));
-    return registry;
-  };
-  delegate->buildRegistryFunction = buildRegistryFunction;
-  return instance;
-}
-void MainComponentsRegistry::registerNatives() {
-  registerHybrid({
-      makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
-  });
-}
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainComponentsRegistry.h

@@ -1,24 +0,0 @@
-#pragma once
-#include <ComponentFactory.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-namespace facebook {
-namespace react {
-class MainComponentsRegistry
-    : public facebook::jni::HybridClass<MainComponentsRegistry> {
- public:
-  // Adapt it to the package you used for your Java class.
-  constexpr static auto kJavaDescriptor =
-      "Lcom/rndiffapp/newarchitecture/components/MainComponentsRegistry;";
-  static void registerNatives();
-  MainComponentsRegistry(ComponentFactory *delegate);
- private:
-  static std::shared_ptr<ComponentDescriptorProviderRegistry const>
-  sharedProviderRegistry();
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jclass>,
-      ComponentFactory *delegate);
-};
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/OnLoad.cpp

@@ -1,10 +0,0 @@
-#include <fbjni/fbjni.h>
-#include "MainApplicationTurboModuleManagerDelegate.h"
-#include "MainComponentsRegistry.h"
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
-  return facebook::jni::initialize(vm, [] {
-    facebook::react::MainApplicationTurboModuleManagerDelegate::
-        registerNatives();
-    facebook::react::MainComponentsRegistry::registerNatives();
-  });
-}

android/build.gradle

@@ -1,21 +1,16 @@
-import org.apache.tools.ant.taskdefs.condition.Os
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 /**
 * Project-wide gradle configuration properties for use by all modules
 */
 ext {
-    // kotlin_version is needed for react-native-camera-kit library
-    kotlin_version      = project.kotlinVersion
-    RNNKotlinVersion    = "1.6.20"
-    RNGH_kotlinVersion  = "1.6.20"
+    RNNKotlinVersion    = "1.4.31"
     buildToolsVersion   = project.buildToolsVersion
     minSdkVersion       = Integer.valueOf(project.minSdkVersion)
     compileSdkVersion   = Integer.valueOf(project.compileSdkVersion)
     targetSdkVersion    = Integer.valueOf(project.targetSdkVersion)
     supportLibVersion   = project.supportLibVersion
     gradlePluginVersion = project.gradlePluginVersion
-    kotlinPluginVersion = project.kotlinPluginVersion
 
     if (System.properties['os.arch'] == "aarch64") {
         // For M1 Users we need to use the NDK 24 which added support for aarch64
@@ -34,10 +29,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinPluginVersion}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
         classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}"
-        classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("de.undercouch:gradle-download-task:5.0.1")
         // WARNING: Do not place your application dependencies here!
         //          They belong in the individual module build.gradle files.
     }
@@ -66,20 +59,6 @@ allprojects {
     }
 
     repositories {
-        exclusiveContent {
-           // We get React Native's Android binaries exclusively through npm,
-           // from a local Maven repo inside node_modules/react-native/.
-           // (The use of exclusiveContent prevents looking elsewhere like Maven Central
-           // and potentially getting a wrong version.)
-           filter {
-               includeGroup "com.facebook.react"
-           }
-           forRepository {
-               maven {
-                   url "$rootDir/../node_modules/react-native/android"
-               }
-           }
-        }
         mavenLocal()
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
         maven { url("$rootDir/../node_modules/react-native/android") }
@@ -91,7 +70,6 @@ allprojects {
         google()
         jcenter() // Required for @react-native-community/blur:3.6.1, can be removed after updating to 3.6.1+
         mavenCentral()
-        //         maven { url "https://www.jitpack.io" }
-        maven { url 'https://mvnrepository.com/artifact/com.github.gundy/semver4j'}
+        maven { url "https://www.jitpack.io" }
     }
 }

android/gradle.properties

@@ -21,15 +21,14 @@
 # $keytool -genkey -v -keystore ./status-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias status
 
 # Version requirements used throughout the Gradle scripts
-kotlinVersion=1.6.20
+kotlinVersion=1.3.50
 minSdkVersion=23
 compileSdkVersion=31
 targetSdkVersion=31
-buildToolsVersion=31.0.0
+buildToolsVersion=30.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
-gradlePluginVersion=7.2.2
-kotlinPluginVersion=1.6.20
+gradlePluginVersion=4.1.0
 
 android.useAndroidX=true
 android.enableJetifier=true
@@ -49,9 +48,5 @@ org.gradle.jvmargs=-Xmx8704M
 versionCode=9999
 commitHash=unknown
 
-# Use this property to enable support to the new architecture.
-# This will allow you to use TurboModules and the Fabric render in
-# your application. You should enable this flag either if you want
-# to write custom TurboModules/Fabric components OR use libraries that
-# are providing them.
-newArchEnabled=false
+# Flipper
+FLIPPER_VERSION=0.54.0

android/settings.gradle

@@ -20,10 +20,3 @@ include ':react-native-status-keycard'
 project(':react-native-status-keycard').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-status-keycard/android')
 include ':react-native-blur'
 project(':react-native-blur').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/blur/android')
-includeBuild('../node_modules/react-native-gradle-plugin')
-if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
-    include(":ReactAndroid")
-    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
-    include(":ReactAndroid:hermes-engine")
-    project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
-}

babel.config.js

@@ -1,19 +1,24 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
-  plugins: ['react-native-reanimated/plugin'],
-  env: {
-    test: {
-      presets: [
-        '@babel/preset-react',
-        [
-          '@babel/preset-env',
-          {
-            targets: {
-              node: '14',
-            },
-          },
-        ],
-      ],
-    },
-  },
-};
+
+    "presets": [
+        "module:metro-react-native-babel-preset"
+    ],
+    "plugins": [
+        "react-native-reanimated/plugin"
+    ],
+    "env": {
+        "test": {
+            "presets": [
+                '@babel/preset-react',
+                [
+                    '@babel/preset-env',
+                    {
+                        targets: {
+                            node: '14',
+                        },
+                    },
+                ],
+            ],
+        }
+    }
+}

ci/Jenkinsfile.android

@@ -4,7 +4,7 @@ library 'status-jenkins-lib@v1.7.9'
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'linux && x86_64 && nix-2.14' }
+  agent { label 'linux && x86_64 && nix-2.11' }
 
   options {
     timestamps()

ci/Jenkinsfile.ios

@@ -4,7 +4,7 @@ library 'status-jenkins-lib@v1.7.9'
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'macos && arm64 && nix-2.14 && xcode-14.3' }
+  agent { label 'macos && arm64 && nix-2.11 && xcode-14.3' }
 
   parameters {
     string(
@@ -63,9 +63,7 @@ pipeline {
         script { api = ios.bundle() }
       }
       post {
-        failure {
-          archiveArtifacts 'ios/logs/*'
-        }
+        failure { archiveArtifacts 'ios/logs/*' }
       }
     }
     stage('Parallel Upload') {

ci/Jenkinsfile.tests

@@ -4,7 +4,7 @@ library 'status-jenkins-lib@v1.7.9'
 def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'linux && x86_64 && nix-2.14' }
+  agent { label 'linux && x86_64 && nix-2.11' }
 
   options {
     timestamps()

ci/tools/Jenkinsfile.nix-cache

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

doc/README.md

@@ -16,14 +16,10 @@
 
 [Merging PR process](merging-pr-process.md)
 
-[PR Review Policy](pr-review-policy.md)
-
 [Working on PR together with QA team](pipeline_process.md)
 
 [Debugging](debugging.md)
 
-[Patching](patching.md)
-
 
 ## Testing
 

doc/decisions/0014-wallet-team.md

@@ -1,31 +0,0 @@
-# 0014. Team-structure
-
-| Date | Tags |
-|---|---|
-| 2023-06-16 | wallet team |
-
-## Status
-
-Proposed
-
-## Context:
-
-In order to try out vertical team, which is a structure that is wanted by the company, we will be creating a wallet team within the mobile team.
-Some member of the mobile team will join the current wallet team, which is composed by developers from desktop and lead by @alaibe, on a voluntary basis.
-The responsibilities of the team are to implement the new wallet UI, with the support of the current wallet team, which will be assisting with the status-go work.
-
-## Decision
-
-Some team members have already expressed interest and some have been asked and accepted to join the wallet team, these team members are:
-
-- @rasom
-- @OmarBasem
-- @vkjr
-- @J-Son89
-- @briansztamfater
-- @smohamedjavid
-- @ulisesmac
-
-# Follow-up Actions
-
-- We still need 3/4 team members to join the wallet team

doc/decisions/0015-team-structure.md

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

doc/merging-pr-process.md

@@ -5,7 +5,6 @@
 3) Address feedback
 4) Make sure builds and tests are green (run `make test` locally, `make lint-fix` to fix any indentation issue and `make lint`)
 5) Once the PR has been reviewed by the dev team you can run e2e tests on it by going to https://github.com/status-im/status-mobile/projects/7 and move the pr under the column E2E tests. This will trigger tests.
-   1) Read our [PR Review Policy](pr-review-policy.md) for more details on our approach to PR reviews.
 6) Once e2e tests have run, they will report the result on the PR, if it's less than 100%, ask QA to take a look to make sure everything is in order (some might fail for legitimate reasons)
 7) Ask QA for manual testing if the PR requires it
 8) Once it has been tested successfully, squash everything into one commit. rebase and merge. The commands we use:

doc/patching.md

@@ -1,13 +0,0 @@
-# Patching
-
-## Libraries
-If 3rd party library has an issue and fix is not yet released (or we can't switch to a new release), we use forks. Fix should be commited to the fork, tagged and referenced from package.json.
-
-Example: [`react-native-hole-view`](https://github.com/status-im/react-native-hole-view#refs/tags/v2.1.1-status)
-
-## React Native
-When patch need to be applied to React Native itself Status does patching with Nix instead of doing it nodejs-way.
-
-Patches should be added to [this file](https://github.com/status-im/status-mobile/blob/develop/nix/deps/nodejs-patched/default.nix).
-
-Example: [patching `react-native/Yoga` to build app with XCode 14.3](https://github.com/status-im/status-mobile/pull/15589)

doc/pr-review-policy.md

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

doc/starting-guide.md

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

index.js

@@ -1,2 +1,2 @@
-import 'node-libs-react-native/globals';
-import './result/index.js';
+import "node-libs-react-native/globals";
+import "./result/index.js";

ios/.xcode.env

@@ -1,12 +0,0 @@
-# This `.xcode.env` file is versioned and is used to source the environment
-# used when running script phases inside Xcode.
-# To customize your local environment, you can create an `.xcode.env.local`
-# file that is not versioned.
-
-# NODE_BINARY variable contains the PATH to the node executable.
-#
-# Customize the NODE_BINARY variable here.
-# For example, to use nvm with brew, add the following line
-# . "$(brew --prefix nvm)/nvm.sh" --no-use
-export NODE_BINARY="${NODE_BINARY:-node}"
-export NODE_ARGS="${NODE_ARGS:- --max-old-space-size=16384 }"

ios/Podfile

@@ -1,34 +1,14 @@
+platform :ios, '11.0'
+
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '12.4'
-
-production = ENV["PRODUCTION"] == "1"
-
-# We need to enable codegen discovery to fix the issue of these files not being generated properly:
-# ios/build/generated/ios/FBReactNativeSpec/FBReactNativeSpec-generated.mm
-# ios/build/generated/ios/FBReactNativeSpec/FBReactNativeSpec.h
-# more details here : https://github.com/status-im/status-mobile/issues/15911
-# TODO: remove this flag once you upgrade react-native above version 0.70
-ENV['USE_CODEGEN_DISCOVERY'] = "1"
-
 abstract_target 'Status' do
   # Pods for StatusQuo
   config = use_native_modules!
 
-  # Flags change depending on the env values.
-  flags = get_default_flags()
-
-  use_react_native!(
-    :path => config[:reactNativePath],
-    # to enable hermes on iOS, change `false` to `true` and then install pods
-    :production => production,
-    :hermes_enabled => flags[:hermes_enabled],
-    :fabric_enabled => flags[:fabric_enabled],
-    :use_codegen_discovery => true,
-    # An absolute path to your application root.
-    :app_path => "#{Pod::Config.instance.installation_root}/.."
-  )
+  use_react_native!(:path => config[:reactNativePath],
+                    :hermes_enabled => false)
 
   pod 'react-native-image-resizer', :path => '../node_modules/react-native-image-resizer'
   pod 'react-native-config', :path => '../node_modules/react-native-config'

ios/Podfile.lock

@@ -4,14 +4,14 @@ PODS:
     - React
   - CryptoSwift (1.5.1)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.69.10)
-  - FBReactNativeSpec (0.69.10):
+  - FBLazyVector (0.67.5)
+  - FBReactNativeSpec (0.67.5):
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.69.10)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Core (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
+    - RCTRequired (= 0.67.5)
+    - RCTTypeSafety (= 0.67.5)
+    - React-Core (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
   - fmt (6.2.1)
   - glog (0.3.5)
   - HMSegmentedControl (1.5.6)
@@ -43,203 +43,192 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
-  - RCTRequired (0.69.10)
-  - RCTTypeSafety (0.69.10):
-    - FBLazyVector (= 0.69.10)
-    - RCTRequired (= 0.69.10)
-    - React-Core (= 0.69.10)
-  - React (0.69.10):
-    - React-Core (= 0.69.10)
-    - React-Core/DevSupport (= 0.69.10)
-    - React-Core/RCTWebSocket (= 0.69.10)
-    - React-RCTActionSheet (= 0.69.10)
-    - React-RCTAnimation (= 0.69.10)
-    - React-RCTBlob (= 0.69.10)
-    - React-RCTImage (= 0.69.10)
-    - React-RCTLinking (= 0.69.10)
-    - React-RCTNetwork (= 0.69.10)
-    - React-RCTSettings (= 0.69.10)
-    - React-RCTText (= 0.69.10)
-    - React-RCTVibration (= 0.69.10)
-  - React-bridging (0.69.10):
+  - RCTRequired (0.67.5)
+  - RCTTypeSafety (0.67.5):
+    - FBLazyVector (= 0.67.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi (= 0.69.10)
-  - React-callinvoker (0.69.10)
-  - React-Codegen (0.69.10):
-    - FBReactNativeSpec (= 0.69.10)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.69.10)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Core (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-Core (0.69.10):
+    - RCTRequired (= 0.67.5)
+    - React-Core (= 0.67.5)
+  - React (0.67.5):
+    - React-Core (= 0.67.5)
+    - React-Core/DevSupport (= 0.67.5)
+    - React-Core/RCTWebSocket (= 0.67.5)
+    - React-RCTActionSheet (= 0.67.5)
+    - React-RCTAnimation (= 0.67.5)
+    - React-RCTBlob (= 0.67.5)
+    - React-RCTImage (= 0.67.5)
+    - React-RCTLinking (= 0.67.5)
+    - React-RCTNetwork (= 0.67.5)
+    - React-RCTSettings (= 0.67.5)
+    - React-RCTText (= 0.67.5)
+    - React-RCTVibration (= 0.67.5)
+  - React-callinvoker (0.67.5)
+  - React-Core (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.10)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-Core/Default (= 0.67.5)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.69.10):
+  - React-Core/CoreModulesHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/Default (0.69.10):
+  - React-Core/Default (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/DevSupport (0.69.10):
+  - React-Core/DevSupport (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.10)
-    - React-Core/RCTWebSocket (= 0.69.10)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-jsinspector (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-Core/Default (= 0.67.5)
+    - React-Core/RCTWebSocket (= 0.67.5)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-jsinspector (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.69.10):
+  - React-Core/RCTActionSheetHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.69.10):
+  - React-Core/RCTAnimationHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.69.10):
+  - React-Core/RCTBlobHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTImageHeaders (0.69.10):
+  - React-Core/RCTImageHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.69.10):
+  - React-Core/RCTLinkingHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.69.10):
+  - React-Core/RCTNetworkHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.69.10):
+  - React-Core/RCTSettingsHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTTextHeaders (0.69.10):
+  - React-Core/RCTTextHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.69.10):
+  - React-Core/RCTVibrationHeaders (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
     - React-Core/Default
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-Core/RCTWebSocket (0.69.10):
+  - React-Core/RCTWebSocket (0.67.5):
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.69.10)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsiexecutor (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-Core/Default (= 0.67.5)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsiexecutor (= 0.67.5)
+    - React-perflogger (= 0.67.5)
     - Yoga
-  - React-CoreModules (0.69.10):
+  - React-CoreModules (0.67.5):
+    - FBReactNativeSpec (= 0.67.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/CoreModulesHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-RCTImage (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-cxxreact (0.69.10):
+    - RCTTypeSafety (= 0.67.5)
+    - React-Core/CoreModulesHeaders (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-RCTImage (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-cxxreact (0.67.5):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-jsinspector (= 0.69.10)
-    - React-logger (= 0.69.10)
-    - React-perflogger (= 0.69.10)
-    - React-runtimeexecutor (= 0.69.10)
-  - React-jsi (0.69.10):
+    - React-callinvoker (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-jsinspector (= 0.67.5)
+    - React-logger (= 0.67.5)
+    - React-perflogger (= 0.67.5)
+    - React-runtimeexecutor (= 0.67.5)
+  - React-jsi (0.67.5):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.69.10)
-  - React-jsi/Default (0.69.10):
+    - React-jsi/Default (= 0.67.5)
+  - React-jsi/Default (0.67.5):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.69.10):
+  - React-jsiexecutor (0.67.5):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-perflogger (= 0.69.10)
-  - React-jsinspector (0.69.10)
-  - React-logger (0.69.10):
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-perflogger (= 0.67.5)
+  - React-jsinspector (0.67.5)
+  - React-logger (0.67.5):
     - glog
   - react-native-background-timer (2.2.0):
     - React
@@ -247,6 +236,8 @@ PODS:
     - React-Core
   - react-native-blur (4.3.3):
     - React-Core
+  - react-native-camera-kit (8.0.4):
+    - React
   - react-native-cameraroll (4.0.4):
     - React-Core
   - react-native-config (1.5.0):
@@ -274,80 +265,75 @@ PODS:
   - react-native-status-keycard (2.5.39):
     - Keycard
     - React
-  - react-native-transparent-video (0.1.0):
-    - React-Core
   - react-native-webview (11.16.0):
     - React-Core
-  - React-perflogger (0.69.10)
-  - React-RCTActionSheet (0.69.10):
-    - React-Core/RCTActionSheetHeaders (= 0.69.10)
-  - React-RCTAnimation (0.69.10):
+  - React-perflogger (0.67.5)
+  - React-RCTActionSheet (0.67.5):
+    - React-Core/RCTActionSheetHeaders (= 0.67.5)
+  - React-RCTAnimation (0.67.5):
+    - FBReactNativeSpec (= 0.67.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTAnimationHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTBlob (0.69.10):
+    - RCTTypeSafety (= 0.67.5)
+    - React-Core/RCTAnimationHeaders (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTBlob (0.67.5):
+    - FBReactNativeSpec (= 0.67.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTBlobHeaders (= 0.69.10)
-    - React-Core/RCTWebSocket (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-RCTNetwork (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTImage (0.69.10):
+    - React-Core/RCTBlobHeaders (= 0.67.5)
+    - React-Core/RCTWebSocket (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-RCTNetwork (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTImage (0.67.5):
+    - FBReactNativeSpec (= 0.67.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTImageHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-RCTNetwork (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTLinking (0.69.10):
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTLinkingHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTNetwork (0.69.10):
+    - RCTTypeSafety (= 0.67.5)
+    - React-Core/RCTImageHeaders (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-RCTNetwork (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTLinking (0.67.5):
+    - FBReactNativeSpec (= 0.67.5)
+    - React-Core/RCTLinkingHeaders (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTNetwork (0.67.5):
+    - FBReactNativeSpec (= 0.67.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTNetworkHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTSettings (0.69.10):
+    - RCTTypeSafety (= 0.67.5)
+    - React-Core/RCTNetworkHeaders (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTSettings (0.67.5):
+    - FBReactNativeSpec (= 0.67.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.69.10)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTSettingsHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-RCTText (0.69.10):
-    - React-Core/RCTTextHeaders (= 0.69.10)
-  - React-RCTVibration (0.69.10):
+    - RCTTypeSafety (= 0.67.5)
+    - React-Core/RCTSettingsHeaders (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTText (0.67.5):
+    - React-Core/RCTTextHeaders (= 0.67.5)
+  - React-RCTVibration (0.67.5):
+    - FBReactNativeSpec (= 0.67.5)
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.69.10)
-    - React-Core/RCTVibrationHeaders (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - ReactCommon/turbomodule/core (= 0.69.10)
-  - React-runtimeexecutor (0.69.10):
-    - React-jsi (= 0.69.10)
-  - ReactCommon/turbomodule/core (0.69.10):
+    - React-Core/RCTVibrationHeaders (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-runtimeexecutor (0.67.5):
+    - React-jsi (= 0.67.5)
+  - ReactCommon/turbomodule/core (0.67.5):
     - DoubleConversion
     - glog
     - RCT-Folly (= 2021.06.28.00-v2)
-    - React-bridging (= 0.69.10)
-    - React-callinvoker (= 0.69.10)
-    - React-Core (= 0.69.10)
-    - React-cxxreact (= 0.69.10)
-    - React-jsi (= 0.69.10)
-    - React-logger (= 0.69.10)
-    - React-perflogger (= 0.69.10)
+    - React-callinvoker (= 0.67.5)
+    - React-Core (= 0.67.5)
+    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.67.5)
+    - React-logger (= 0.67.5)
+    - React-perflogger (= 0.67.5)
   - ReactNativeAudioToolkit (2.0.3):
     - React
-  - ReactNativeCameraKit (13.0.0):
-    - React-Core
   - ReactNativeNavigation (7.27.1):
     - HMSegmentedControl
     - React-Core
@@ -373,7 +359,7 @@ PODS:
     - SDWebImageWebPCoder (~> 0.8.4)
   - RNFS (2.16.6):
     - React
-  - RNGestureHandler (2.6.1):
+  - RNGestureHandler (2.5.0):
     - React-Core
   - RNHoleView (2.1.1):
     - React-Core
@@ -394,7 +380,7 @@ PODS:
     - React
   - RNReactNativeHapticFeedback (1.9.0):
     - React
-  - RNReanimated (2.11.0):
+  - RNReanimated (2.3.3):
     - DoubleConversion
     - FBLazyVector
     - FBReactNativeSpec
@@ -402,6 +388,7 @@ PODS:
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
+    - React
     - React-callinvoker
     - React-Core
     - React-Core/DevSupport
@@ -421,7 +408,7 @@ PODS:
     - React-RCTText
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNShare (8.2.2):
+  - RNShare (7.0.1):
     - React-Core
   - RNStaticSafeAreaInsets (2.2.0):
     - React-Core
@@ -459,10 +446,9 @@ DEPENDENCIES:
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
-  - React-bridging (from `../node_modules/react-native/ReactCommon`)
   - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
-  - React-Codegen (from `build/generated/ios`)
   - React-Core (from `../node_modules/react-native/`)
+  - React-Core/DevSupport (from `../node_modules/react-native/`)
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
   - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
   - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
@@ -473,6 +459,7 @@ DEPENDENCIES:
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
+  - react-native-camera-kit (from `../node_modules/react-native-camera-kit`)
   - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
   - react-native-config (from `../node_modules/react-native-config`)
   - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
@@ -485,7 +472,6 @@ DEPENDENCIES:
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-status (from `../modules/react-native-status`)
   - react-native-status-keycard (from `../node_modules/react-native-status-keycard`)
-  - react-native-transparent-video (from `../node_modules/react-native-transparent-video`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -500,7 +486,6 @@ DEPENDENCIES:
   - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - "ReactNativeAudioToolkit (from `../node_modules/@react-native-community/audio-toolkit`)"
-  - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
   - ReactNativeNavigation (from `../node_modules/react-native-navigation`)
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
@@ -564,12 +549,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/TypeSafety"
   React:
     :path: "../node_modules/react-native/"
-  React-bridging:
-    :path: "../node_modules/react-native/ReactCommon"
   React-callinvoker:
     :path: "../node_modules/react-native/ReactCommon/callinvoker"
-  React-Codegen:
-    :path: build/generated/ios
   React-Core:
     :path: "../node_modules/react-native/"
   React-CoreModules:
@@ -590,6 +571,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-blob-util"
   react-native-blur:
     :path: "../node_modules/@react-native-community/blur"
+  react-native-camera-kit:
+    :path: "../node_modules/react-native-camera-kit"
   react-native-cameraroll:
     :path: "../node_modules/@react-native-community/cameraroll"
   react-native-config:
@@ -614,8 +597,6 @@ EXTERNAL SOURCES:
     :path: "../modules/react-native-status"
   react-native-status-keycard:
     :path: "../node_modules/react-native-status-keycard"
-  react-native-transparent-video:
-    :path: "../node_modules/react-native-transparent-video"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
   React-perflogger:
@@ -644,8 +625,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon"
   ReactNativeAudioToolkit:
     :path: "../node_modules/@react-native-community/audio-toolkit"
-  ReactNativeCameraKit:
-    :path: "../node_modules/react-native-camera-kit"
   ReactNativeNavigation:
     :path: "../node_modules/react-native-navigation"
   RNCAsyncStorage:
@@ -703,33 +682,32 @@ SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
-  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: a8af91c2b5a0029d12ff6b32e428863d63c48991
-  FBReactNativeSpec: 1b2309b096448a1dc9d0c43999216f8fda809ae8
+  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  FBLazyVector: d2db9d00883282819d03bbd401b2ad4360d47580
+  FBReactNativeSpec: 94da4d84ba3b1acf459103320882daa481a2b62d
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: d93527a855523adb8c113837db4be68fb00e230d
+  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
   Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
-  RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
-  RCTRequired: 3581db0757e7ff9be10718a56b3d79b6a6bd3bdf
-  RCTTypeSafety: ce13e630c48340401ebfb28710959913f74b8b36
-  React: cca8f2b7cce018f79847ca79847fa367b206e8a1
-  React-bridging: b893643f09d3964afba6c347e00dd86cf10691e5
-  React-callinvoker: 9ac7cba30428eddf7a06d1253f8e7561b5c97334
-  React-Codegen: 6b4283af3720709c7ac4be18f4b32b07eb53f1d5
-  React-Core: 550b694774bc778b5c7bf7608fc12a484e01ec05
-  React-CoreModules: c332d5b416cb3ccf972e7af79d496498a700e073
-  React-cxxreact: c5c4106bfd2d0cee80b848e33b7ff4e35a721b16
-  React-jsi: 6ff3fb9b9764a499c959e0096c0d384fa2b4beef
-  React-jsiexecutor: 388f1c99404c848141d7ea162f61233d04829ede
-  React-jsinspector: a4463b3411b8b9b37153255ef694a84c77ba3c7f
-  React-logger: 2a0497622cbabc47fb769d97620952df14c1f814
+  RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
+  RCTRequired: 412e994c1e570cf35378a32c18fd46e50634938b
+  RCTTypeSafety: ef27340c728e6d673af345ed69e479a010c8a2d8
+  React: 36b9f5116572e5b80f01e562bb1f1451e8848e47
+  React-callinvoker: 91e62870884d3db3a0db33bbb1ba4e53fa5210ca
+  React-Core: 765ccc3861be1b93c7d5ca37f6b06e2efd6e7999
+  React-CoreModules: da2ddff50a92576b6d58fbfc80a62ba3f81d8a4e
+  React-cxxreact: b54cffd4feb550c3213cd38db4a2a4bdd896f715
+  React-jsi: 103674913e4159a07df20ef214c6b563e90e7b2e
+  React-jsiexecutor: e9895ccae253323ca70f693945fecbba091f0abd
+  React-jsinspector: ec4fe4f65ccf9d67c8429dda955d3412db8a25ef
+  React-logger: 85f4ef06b9723714b2dfa5b0e5502b673b271b58
   react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
   react-native-blur: c6d0a1dc2b4b519f7afe3b14d8151998632b6d18
+  react-native-camera-kit: 498a6d111a904834e0824e9073cfadef7303235f
   react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
@@ -742,22 +720,20 @@ SPEC CHECKSUMS:
   react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
   react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
   react-native-status-keycard: f1c1227b2d5984c10fb44db68e4bfd2937f31e98
-  react-native-transparent-video: e484ad11ace8e5f62516e2c5e15efd3cb4df24b0
   react-native-webview: 28a8636d97ee641f2ee8f20492d7a6c269c1d703
-  React-perflogger: bc57c4a953c1ec913b0d984cf4f2b9842a12bde0
-  React-RCTActionSheet: 3efa3546119a1050f6c34a461b386dd9e36eaf0b
-  React-RCTAnimation: e58fb9f1adf7b38af329881ea2740f43ffeea854
-  React-RCTBlob: d2238645553c3ec787324268c0676148d86e6cc4
-  React-RCTImage: e6d7c9ab978cae99364fcc96b9238fc7740a13da
-  React-RCTLinking: 329e88ce217dad464ef34b5d0c40b3ceaac6c9ec
-  React-RCTNetwork: c8967f2382aac31761ddb750fee53fa34cf7a4ee
-  React-RCTSettings: 8a825b4b5ea58f6713a7c97eea6cc82e9895188b
-  React-RCTText: ffcaac5c66bc065f2ccf79b6fe34585adb9e589b
-  React-RCTVibration: 0039c986626b78242401931bb23c803935fae9d1
-  React-runtimeexecutor: 5ebf1ddaa706bf2986123f22d2cad905443c2c5f
-  ReactCommon: 65754b8932ea80272714988268bbfb9f303264a5
+  React-perflogger: d32ee13196f4ae2e4098fb7f8e7ed4f864c6fb0f
+  React-RCTActionSheet: 81779c09e34a6a3d6b15783407ba9016a774f535
+  React-RCTAnimation: b778eaaa42a884abcc5719035a7a0b2f54672658
+  React-RCTBlob: 8edfc04c117decb0e7d4e6ab32bec91707e63ecb
+  React-RCTImage: 2022097f1291bfebd0003e477318c72b07853578
+  React-RCTLinking: bd8d889c65695181342541ce4420e9419845084c
+  React-RCTNetwork: eae64b805d967bf3ece2cec3ad09218eeb32cb74
+  React-RCTSettings: 0645af8aec5f40726e98d434a07ff58e75a81aa9
+  React-RCTText: e55de507cda263ff58404c3e7d75bf76c2b80813
+  React-RCTVibration: c3b8a3245267a3849b0c7cb91a37606bf5f3aa65
+  React-runtimeexecutor: 434efc9e5b6d0f14f49867f130b39376c971c1aa
+  ReactCommon: a30c2448e5a88bae6fcb0e3da124c14ae493dac1
   ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
-  ReactNativeCameraKit: 9d46a5d7dd544ca64aa9c03c150d2348faf437eb
   ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8
   RNCAsyncStorage: b2489b49e38c85e10ed45a888d13a2a4c7b32ea1
   RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543
@@ -765,15 +741,15 @@ SPEC CHECKSUMS:
   RNCPushNotificationIOS: c145c6253ea016e5efeff604f2720736b4a596f7
   RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
   RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
-  RNGestureHandler: 28ad20bf02257791f7f137b31beef34b9549f54b
+  RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
   RNHoleView: 07572d21c97fad71fdc47f7248a8513e15a38949
   RNImageCropPicker: 35a3ceb837446fa11547704709bb22b5fac6d584
   RNKeychain: 216f37338fcb9e5c3a2530f1e3295f737a690cb1
   RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
   RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
   RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
-  RNReanimated: 43adb0307a62c1ce9694f36f124ca3b51a15272a
-  RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
+  RNReanimated: 3ad6ec4e147462206be9d1c925df10b6ea850b0e
+  RNShare: 2dc2fcac3f7321cfd6b60a23ed4bf4d549f86f5f
   RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
   RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
@@ -783,8 +759,8 @@ SPEC CHECKSUMS:
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
-  Yoga: d24d6184b6b85f742536bd93bd07d69d7b9bb4c1
+  Yoga: 099a946cbf84c9b32ffdc4278d72db26710ecf92
 
-PODFILE CHECKSUM: a7c3cb360cf217ab90667d67deeab588677d540a
+PODFILE CHECKSUM: c29de3b14e3275299c51aa95520622f09d084bcb
 
 COCOAPODS: 1.12.1

ios/StatusIm.xcodeproj/project.pbxproj

@@ -8,14 +8,15 @@
 
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
-		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
+		09B7B3FF4CFA16C028BA0B05 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EC21589D612F7787EA45C863 /* libPods-Status-StatusIm-StatusImTests.a */; };
+		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
 		3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; };
 		3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2626CE245C3F2200D5F94B /* Dummy.swift */; };
 		3A8F8EAA24A4D31600BF206D /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A8F8EA924A4D31600BF206D /* GameKit.framework */; };
-		3AAD2ABC24A3A60E0075D594 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
+		3AAD2ABC24A3A60E0075D594 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		3AAD2ABD24A3A60E0075D594 /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2626CE245C3F2200D5F94B /* Dummy.swift */; };
 		3AAD2ABE24A3A60E0075D594 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		3AAD2AC024A3A60E0075D594 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
@@ -43,12 +44,12 @@
 		715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
+		7DC033789D9E0F726FD9C7AC /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		B0E570AEBE2BEB426BF60259 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D059F2E62D7CD9FB1896703 /* libPods-Status-StatusImPR.a */; };
+		8FC9C79C1A8446E7C7C18C60 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
-		B73930D752A70EAB45001773 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FBEDE2F94002488EF6B277DA /* libPods-Status-StatusIm.a */; };
 		BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; };
 		C14C5F8D29C0A149005C58A7 /* launch-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */; };
 		C14C5F9129C0AD9C005C58A7 /* launch-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */; };
@@ -60,7 +61,6 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
-		F5EC958C8908294B8536B835 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 06FA6B17CC0A7FAFA9DA5364 /* libPods-Status-StatusIm-StatusImTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,12 +108,9 @@
 		00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		06FA6B17CC0A7FAFA9DA5364 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		08A713A336BFEE0924821EC9 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
-		103861DFF36B6063BED2602B /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
-		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = "<group>"; };
+		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = StatusIm/AppDelegate.m; 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>"; };
@@ -122,21 +119,22 @@
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		3AAD2ADC24A3A60E0075D594 /* Status PR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Status PR.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
+		3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
-		4D059F2E62D7CD9FB1896703 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		4D7FC122A838AC3BFC46D82B /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
+		691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
+		6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
-		84C3C20891247EC6BFF93B51 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
-		886398AFEF2B823AC8A4912C /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
+		983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
@@ -146,14 +144,16 @@
 		B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = "<group>"; };
 		B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = "<group>"; };
 		B321D25F4493470980039457 /* Inter-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BoldItalic.otf"; path = "../resources/fonts/Inter-BoldItalic.otf"; sourceTree = "<group>"; };
+		BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		EBFEABB7D6CC1144D83FBA82 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
-		FBEDE2F94002488EF6B277DA /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
+		EC21589D612F7787EA45C863 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F5EC958C8908294B8536B835 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				09B7B3FF4CFA16C028BA0B05 /* 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 */,
-				B73930D752A70EAB45001773 /* libPods-Status-StatusIm.a in Frameworks */,
+				8FC9C79C1A8446E7C7C18C60 /* 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 */,
-				B0E570AEBE2BEB426BF60259 /* libPods-Status-StatusImPR.a in Frameworks */,
+				7DC033789D9E0F726FD9C7AC /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -222,7 +222,7 @@
 				B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */,
 				008F07F21AC5B25A0029DE68 /* main.jsbundle */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
-				13B07FB01A68108700A75B9A /* AppDelegate.mm */,
+				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				13B07FB71A68108700A75B9A /* main.m */,
 				3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */,
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				FBEDE2F94002488EF6B277DA /* libPods-Status-StatusIm.a */,
-				06FA6B17CC0A7FAFA9DA5364 /* libPods-Status-StatusIm-StatusImTests.a */,
-				4D059F2E62D7CD9FB1896703 /* libPods-Status-StatusImPR.a */,
+				983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */,
+				EC21589D612F7787EA45C863 /* libPods-Status-StatusIm-StatusImTests.a */,
+				6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				886398AFEF2B823AC8A4912C /* Pods-Status-StatusIm.debug.xcconfig */,
-				08A713A336BFEE0924821EC9 /* Pods-Status-StatusIm.release.xcconfig */,
-				EBFEABB7D6CC1144D83FBA82 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				84C3C20891247EC6BFF93B51 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				4D7FC122A838AC3BFC46D82B /* Pods-Status-StatusImPR.debug.xcconfig */,
-				103861DFF36B6063BED2602B /* Pods-Status-StatusImPR.release.xcconfig */,
+				3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */,
+				691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */,
+				6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				F083BDB009D93F14ABE9577A /* [CP] Check Pods Manifest.lock */,
+				BFA0BBBB8136DD48F804A077 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				D2C750D3F094DB4514432955 /* [CP] Copy Pods Resources */,
+				DF5B6F4FD3B7809799833669 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				29DFA8D4A1684BDC5257F30D /* [CP] Check Pods Manifest.lock */,
+				B6E3CF1D675245267368C9A7 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				81ABD64BC3E76C9EEE7A6C62 /* [CP] Copy Pods Resources */,
+				8D6472C92D0D90E9BAD8AD9A /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				B75C010670287761677282A4 /* [CP] Check Pods Manifest.lock */,
+				8E74556C932D28F855241EA1 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				C7E5420D406F9FB4ACC8ECE8 /* [CP] Copy Pods Resources */,
+				FDBEE007965D2FB13D66278F /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,28 +544,6 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
 		};
-		29DFA8D4A1684BDC5257F30D /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -594,7 +572,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		81ABD64BC3E76C9EEE7A6C62 /* [CP] Copy Pods Resources */ = {
+		8D6472C92D0D90E9BAD8AD9A /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -616,7 +594,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B75C010670287761677282A4 /* [CP] Check Pods Manifest.lock */ = {
+		8E74556C932D28F855241EA1 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -638,29 +616,51 @@
 			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;
 		};
-		C7E5420D406F9FB4ACC8ECE8 /* [CP] Copy Pods Resources */ = {
+		B6E3CF1D675245267368C9A7 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D2C750D3F094DB4514432955 /* [CP] Copy Pods Resources */ = {
+		BFA0BBBB8136DD48F804A077 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		DF5B6F4FD3B7809799833669 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -696,26 +696,26 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		F083BDB009D93F14ABE9577A /* [CP] Check Pods Manifest.lock */ = {
+		FDBEE007965D2FB13D66278F /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -735,7 +735,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				65F6941925780A4F00A45E76 /* Bridge.swift in Sources */,
-				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
+				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
 				3A2626CF245C3F2200D5F94B /* Dummy.swift in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
@@ -746,7 +746,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */,
-				3AAD2ABC24A3A60E0075D594 /* AppDelegate.mm in Sources */,
+				3AAD2ABC24A3A60E0075D594 /* AppDelegate.m in Sources */,
 				3AAD2ABD24A3A60E0075D594 /* Dummy.swift in Sources */,
 				3AAD2ABE24A3A60E0075D594 /* main.m in Sources */,
 			);
@@ -765,7 +765,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = EBFEABB7D6CC1144D83FBA82 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -782,7 +782,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -802,7 +802,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 84C3C20891247EC6BFF93B51 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -816,7 +816,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -835,11 +835,10 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 886398AFEF2B823AC8A4912C /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -849,7 +848,7 @@
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -879,7 +878,7 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -889,12 +888,6 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-DFOLLY_NO_CONFIG",
-					"-DFOLLY_MOBILE=1",
-					"-DFOLLY_USE_LIBCPP=1",
-				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
@@ -915,11 +908,10 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 08A713A336BFEE0924821EC9 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -929,7 +921,6 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -953,7 +944,7 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -963,12 +954,6 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-DFOLLY_NO_CONFIG",
-					"-DFOLLY_MOBILE=1",
-					"-DFOLLY_USE_LIBCPP=1",
-				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
@@ -988,11 +973,10 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4D7FC122A838AC3BFC46D82B /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
@@ -1001,7 +985,6 @@
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -1031,7 +1014,7 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1041,12 +1024,6 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-DFOLLY_NO_CONFIG",
-					"-DFOLLY_MOBILE=1",
-					"-DFOLLY_USE_LIBCPP=1",
-				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
@@ -1065,11 +1042,10 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 103861DFF36B6063BED2602B /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -1078,7 +1054,6 @@
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -1102,7 +1077,7 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1112,12 +1087,6 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-DFOLLY_NO_CONFIG",
-					"-DFOLLY_MOBILE=1",
-					"-DFOLLY_USE_LIBCPP=1",
-				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
@@ -1139,7 +1108,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1172,7 +1141,7 @@
 				ENABLE_TESTABILITY = YES;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1203,19 +1172,13 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-DFOLLY_NO_CONFIG",
-					"-DFOLLY_MOBILE=1",
-					"-DFOLLY_USE_LIBCPP=1",
-				);
+				ONLY_ACTIVE_ARCH = NO;
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = iphoneos;
 				VALID_ARCHS = arm64;
@@ -1229,7 +1192,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1261,7 +1224,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -1284,19 +1247,13 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
-				OTHER_CPLUSPLUSFLAGS = (
-					"$(OTHER_CFLAGS)",
-					"-DFOLLY_NO_CONFIG",
-					"-DFOLLY_MOBILE=1",
-					"-DFOLLY_USE_LIBCPP=1",
-				);
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

ios/StatusIm/AppDelegate.m

@@ -28,37 +28,36 @@
 #import <SDWebImage/SDWebImageDownloaderOperation.h>
 
 #import <Security/Security.h>
-// adding this for v0.68.x
-#import <React/RCTAppSetupUtils.h>
-#if RCT_NEW_ARCH_ENABLED
-#import <React/CoreModulesPlugins.h>
-#import <React/RCTCxxBridgeDelegate.h>
-#import <React/RCTFabricSurfaceHostingProxyRootView.h>
-#import <React/RCTSurfacePresenter.h>
-#import <React/RCTSurfacePresenterBridgeAdapter.h>
-#import <ReactCommon/RCTTurboModuleManager.h>
-#import <react/config/ReactNativeConfig.h>
-
-static NSString *const kRNConcurrentRoot = @"concurrentRoot";
-
-@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
-  RCTTurboModuleManager *_turboModuleManager;
-  RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
-  std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
-  facebook::react::ContextContainer::Shared _contextContainer;
-  }
-@end
-#endif
-
-
 
 //TODO: properly import the framework
-extern "C" NSString* StatusgoImageServerTLSCert();
+extern NSString* StatusgoImageServerTLSCert();
 
 @interface StatusDownloaderOperation : SDWebImageDownloaderOperation
   + (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler;
 @end
 
+ /*
+#if DEBUG
+#import <FlipperKit/FlipperClient.h>
+#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
+#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
+#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
+#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
+#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
+ */
+ /*
+static void InitializeFlipper(UIApplication *application) {
+  FlipperClient *client = [FlipperClient sharedClient];
+  SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
+  [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
+  [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
+  [client addPlugin:[FlipperKitReactPlugin new]];
+  [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
+  [client start];
+       }
+#endif
+  */
+
 @implementation AppDelegate
 {
     UIView *_blankView;
@@ -66,19 +65,9 @@ extern "C" NSString* StatusgoImageServerTLSCert();
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-  RCTAppSetupPrepareApp(application);
-
-  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
-  [ReactNativeNavigation bootstrapWithBridge:bridge];
-
-  #if RCT_NEW_ARCH_ENABLED
-      _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
-      _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-      _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
-      _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
-      bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
+  #if DEBUG
+    //InitializeFlipper(application);
   #endif
-
   signal(SIGPIPE, SIG_IGN);
   NSURL *jsCodeLocation;
 
@@ -101,6 +90,8 @@ extern "C" NSString* StatusgoImageServerTLSCert();
       dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:@"BLANK_PREVIEW"];
   [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults];
 
+  [ReactNativeNavigation bootstrapWithDelegate:self launchOptions:launchOptions];
+
   [RNSplashScreen show];
 
   UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
@@ -131,66 +122,15 @@ extern "C" NSString* StatusgoImageServerTLSCert();
   return [ReactNativeNavigation extraModulesForBridge:bridge];
 }
 
-
-/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
-///
-/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
-/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
-/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`.
-- (BOOL)concurrentRootEnabled
-{
-  // Switch this bool to turn on and off the concurrent root
-  return true;
-}
-- (NSDictionary *)prepareInitialProps
-{
-  NSMutableDictionary *initProps = [NSMutableDictionary new];
-#ifdef RCT_NEW_ARCH_ENABLED
-  initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
-#endif
-  return initProps;
-}
-
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 #endif
 }
 
-#if RCT_NEW_ARCH_ENABLED
-#pragma mark - RCTCxxBridgeDelegate
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
-{
-  _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                             delegate:self
-                                                            jsInvoker:bridge.jsCallInvoker];
-  return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
-}
-#pragma mark RCTTurboModuleManagerDelegate
-- (Class)getModuleClassFromName:(const char *)name
-{
-  return RCTCoreModulesClassProvider(name);
-}
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
-{
-  return nullptr;
-}
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                     initParams:
-                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
-{
-  return nullptr;
-}
-- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
-{
-  return RCTAppSetupDefaultModuleFromClass(moduleClass);
-}
-#endif
-
 - (void)applicationWillResignActive:(UIApplication *)application {
   if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BLANK_PREVIEW"]) {
     [self.window addSubview:_blankView];
@@ -267,7 +207,7 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
   pemCert = [pemCert stringByReplacingOccurrencesOfString:@"\n-----END CERTIFICATE-----" withString:@""];
   NSData *derCert = [[NSData alloc] initWithBase64EncodedString:pemCert options:NSDataBase64DecodingIgnoreUnknownCharacters];
   SecCertificateRef certRef = SecCertificateCreateWithData(NULL, (__bridge_retained CFDataRef) derCert);
-  CFArrayRef certArrayRef = CFArrayCreate(NULL, (const void **)&(certRef), 1, NULL);
+  CFArrayRef certArrayRef = CFArrayCreate(NULL, (void *)&certRef, 1, NULL);
   SecTrustSetAnchorCertificates(challenge.protectionSpace.serverTrust, certArrayRef);
 
   SecTrustResultType trustResult;

metro.config.js

@@ -5,15 +5,15 @@
  * @format
  */
 module.exports = {
-  transformer: {
-    getTransformOptions: async () => ({
-      transform: {
-        experimentalImportSupport: false,
-        inlineRequires: true,
-      },
-    }),
-  },
-  resolver: {
-    extraNodeModules: require('node-libs-react-native'),
-  },
+    transformer: {
+        getTransformOptions: async () => ({
+            transform: {
+                experimentalImportSupport: false,
+                inlineRequires: true,
+            },
+        }),
+    },
+    resolver: {
+        extraNodeModules: require('node-libs-react-native'),
+    },
 };

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java

@@ -154,8 +154,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
         // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
         return context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-    }
 
+    }
     private File getLogsFile() {
         final File pubDirectory = this.getPublicStorageDirectory();
         final File logFile = new File(pubDirectory, gethLogFileName);
@@ -414,17 +414,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         }
     }
 
-    @ReactMethod
-    public void loginAccount(final String request) {
-        Log.d(TAG, "loginAccount");
-        String result = Statusgo.loginAccount(request);
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "loginAccount result: " + result);
-        } else {
-            Log.e(TAG, "loginAccount failed: " + result);
-        }
-    }
-
     @ReactMethod
     public void exportUnencryptedDatabase(final String accountData, final String password, final Callback callback) {
         Log.d(TAG, "login");
@@ -1374,16 +1363,5 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
             }, callback);
     }
 
-    @ReactMethod
-    public void initLogging(final boolean enabled, final boolean mobileSystem, final String logLevel, final Callback callback) throws JSONException {
-        final JSONObject jsonConfig = new JSONObject();
-        jsonConfig.put("Enabled", enabled);
-        jsonConfig.put("MobileSystem", mobileSystem);
-        jsonConfig.put("Level", logLevel);
-        jsonConfig.put("File", getLogsFile().getAbsolutePath());
-        final String config = jsonConfig.toString();
-        executeRunnableStatusGoMethod(() -> Statusgo.initLogging(config), callback);
-    }
-
 }
 

modules/react-native-status/ios/RCTStatus/RCTStatus.m

@@ -304,14 +304,6 @@ RCT_EXPORT_METHOD(hashMessage:(NSString *)message
     callback(@[result]);
 }
 
-RCT_EXPORT_METHOD(localPairingPreflightOutboundCheck:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"LocalPairingPreflightOutboundCheck() method called");
-#endif
-    NSString *result = StatusgoLocalPairingPreflightOutboundCheck();
-    callback(@[result]);
-}
-
 RCT_EXPORT_METHOD(getConnectionStringForBootstrappingAnotherDevice:(NSString *)configJSON
                   callback:(RCTResponseSenderBlock)callback) {
 
@@ -623,14 +615,6 @@ RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
     NSLog(@"%@", result);
 }
 
-RCT_EXPORT_METHOD(loginAccount:(NSString *)request) {
-#if DEBUG
-    NSLog(@"LoginAccount() method called");
-#endif
-    NSString *result = StatusgoLoginAccount(request);
-    NSLog(@"%@", result);
-}
-
 RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
                   password:(NSString *)password
                   chatKey:(NSString *)chatKey) {
@@ -906,37 +890,6 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFileDirectory) {
     return rootUrl.path;
 }
 
-RCT_EXPORT_METHOD(initLogging:(BOOL)enabled
-                  mobileSystem:(BOOL)mobileSystem
-                  logLevel:(NSString *)logLevel
-                  callback:(RCTResponseSenderBlock)callback)
-{
-    NSString *logDirectory = [self logFileDirectory];
-    NSString *logFilePath = [logDirectory stringByAppendingPathComponent:@"geth.log"];
-
-    NSMutableDictionary *jsonConfig = [NSMutableDictionary dictionary];
-    jsonConfig[@"Enabled"] = @(enabled);
-    jsonConfig[@"MobileSystem"] = @(mobileSystem);
-    jsonConfig[@"Level"] = logLevel;
-    jsonConfig[@"File"] = logFilePath;
-
-    NSError *error = nil;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonConfig options:0 error:&error];
-
-    if (error) {
-        // Handle JSON serialization error
-        callback(@[error.localizedDescription]);
-        return;
-    }
-
-    NSString *config = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-
-    // Call your native logging initialization method here
-    NSString *initResult = StatusgoInitLogging(config);
-
-    callback(@[initResult]);
-}
-
 RCT_EXPORT_METHOD(generateAliasAsync:(NSString *)publicKey
                   callback:(RCTResponseSenderBlock)callback) {
 #if DEBUG

modules/react-native-status/nodejs/bindings.js

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

modules/react-native-status/nodejs/status.cpp

@@ -1873,35 +1873,6 @@ void _ConnectionChange(const FunctionCallbackInfo<Value>& args) {
 	ConnectionChange(arg0, arg1);
 }
 
-void _InitLogging(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-    Local<Context> context = isolate->GetCurrentContext();
-
-	if (args.Length() != 1) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for InitLogging")));
-		return;
-	}
-
-	// Check the argument types
-	if (!args[0]->IsString()) {
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'logSettingsJSON'")));
-		return;
-	}
-
-	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
-	char *arg0 = *arg0Obj;
-
-	// Call exported Go function, which returns a C string
-	char *c = InitLogging(arg0);
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-    args.GetReturnValue().Set(ret);
-    delete c;
-}
-
 
 void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountGenerateAndDeriveAddresses", _MultiAccountGenerateAndDeriveAddresses);
@@ -1951,14 +1922,13 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "signTypedData", _SignTypedData);
 	NODE_SET_METHOD(exports, "sendTransaction", _SendTransaction);
 	NODE_SET_METHOD(exports, "appStateChange", _AppStateChange);
-    NODE_SET_METHOD(exports, "setSignalEventCallback", _SetSignalEventCallback);
+        NODE_SET_METHOD(exports, "setSignalEventCallback", _SetSignalEventCallback);
 	NODE_SET_METHOD(exports, "validateNodeConfig", _ValidateNodeConfig);
 	NODE_SET_METHOD(exports, "hashTypedData", _HashTypedData);
 	NODE_SET_METHOD(exports, "recover", _Recover);
 	NODE_SET_METHOD(exports, "hashTransaction", _HashTransaction);
 	NODE_SET_METHOD(exports, "connectionChange", _ConnectionChange);
 	NODE_SET_METHOD(exports, "pollSignal", _PollSignal);
-	NODE_SET_METHOD(exports, "initLogging", _InitLogging);
 }
 
 NODE_MODULE(NODE_GYP_MODULE_NAME, init)

nix/KNOWN_ISSUES.md

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

nix/deps/gradle/deps.list

@@ -1,66 +1,58 @@
 androidx.activity:activity:1.0.0
+androidx.activity:activity:1.0.0-rc01
 androidx.activity:activity:1.2.4
 androidx.annotation:annotation-experimental:1.1.0
+androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
+androidx.appcompat:appcompat-resources:1.1.0
+androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
-androidx.appcompat:appcompat-resources:1.4.1
+androidx.appcompat:appcompat:1.0.2
+androidx.appcompat:appcompat:1.1.0
+androidx.appcompat:appcompat:1.1.0-rc01
 androidx.appcompat:appcompat:1.2.0
 androidx.appcompat:appcompat:1.3.1
-androidx.appcompat:appcompat:1.4.1
 androidx.arch.core:core-common:2.0.0
 androidx.arch.core:core-common:2.1.0
+androidx.arch.core:core-common:2.1.0-rc01
 androidx.arch.core:core-runtime:2.0.0
 androidx.arch.core:core-runtime:2.1.0
 androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
 androidx.autofill:autofill:1.1.0
-androidx.camera:camera-camera2:1.1.0
-androidx.camera:camera-core:1.1.0
-androidx.camera:camera-lifecycle:1.1.0
-androidx.camera:camera-view:1.1.0
 androidx.cardview:cardview:1.0.0
 androidx.collection:collection:1.0.0
 androidx.collection:collection:1.1.0
-androidx.concurrent:concurrent-futures:1.0.0
 androidx.constraintlayout:constraintlayout-solver:2.0.4
 androidx.constraintlayout:constraintlayout:2.0.4
 androidx.coordinatorlayout:coordinatorlayout:1.0.0
 androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.6.0
 androidx.core:core-splashscreen:1.0.0
+androidx.core:core:1.0.1
 androidx.core:core:1.1.0
-androidx.core:core:1.2.0
+androidx.core:core:1.1.0-rc01
 androidx.core:core:1.6.0
-androidx.core:core:1.7.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
 androidx.databinding:databinding-common:3.3.1
 androidx.databinding:databinding-common:3.5.4
 androidx.databinding:databinding-common:4.1.0
-androidx.databinding:databinding-common:7.2.1
-androidx.databinding:databinding-common:7.2.2
-androidx.databinding:databinding-common:7.3.0
 androidx.databinding:databinding-compiler-common:3.2.1
 androidx.databinding:databinding-compiler-common:3.3.1
 androidx.databinding:databinding-compiler-common:3.5.4
 androidx.databinding:databinding-compiler-common:4.1.0
-androidx.databinding:databinding-compiler-common:7.2.1
-androidx.databinding:databinding-compiler-common:7.2.2
-androidx.databinding:databinding-compiler-common:7.3.0
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
-androidx.emoji2:emoji2-views-helper:1.0.0
-androidx.emoji2:emoji2:1.0.0
-androidx.exifinterface:exifinterface:1.0.0
 androidx.exifinterface:exifinterface:1.1.0-beta01
 androidx.exifinterface:exifinterface:1.1.0-rc01
 androidx.exifinterface:exifinterface:1.2.0
-androidx.exifinterface:exifinterface:1.3.2
 androidx.fragment:fragment:1.0.0
 androidx.fragment:fragment:1.1.0
+androidx.fragment:fragment:1.1.0-rc01
 androidx.fragment:fragment:1.3.6
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-ui:1.0.0
@@ -68,21 +60,19 @@ androidx.legacy:legacy-support-core-utils:1.0.0
 androidx.legacy:legacy-support-v4:1.0.0
 androidx.lifecycle:lifecycle-common:2.0.0
 androidx.lifecycle:lifecycle-common:2.1.0
+androidx.lifecycle:lifecycle-common:2.1.0-rc01
 androidx.lifecycle:lifecycle-common:2.3.1
-androidx.lifecycle:lifecycle-common:2.4.0
 androidx.lifecycle:lifecycle-livedata-core:2.0.0
-androidx.lifecycle:lifecycle-livedata-core:2.1.0
 androidx.lifecycle:lifecycle-livedata-core:2.3.1
 androidx.lifecycle:lifecycle-livedata:2.0.0
-androidx.lifecycle:lifecycle-livedata:2.1.0
-androidx.lifecycle:lifecycle-process:2.4.0
 androidx.lifecycle:lifecycle-runtime:2.0.0
 androidx.lifecycle:lifecycle-runtime:2.1.0
+androidx.lifecycle:lifecycle-runtime:2.1.0-rc01
 androidx.lifecycle:lifecycle-runtime:2.3.1
-androidx.lifecycle:lifecycle-runtime:2.4.0
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
 androidx.lifecycle:lifecycle-viewmodel:2.0.0
 androidx.lifecycle:lifecycle-viewmodel:2.1.0
+androidx.lifecycle:lifecycle-viewmodel:2.1.0-rc01
 androidx.lifecycle:lifecycle-viewmodel:2.3.1
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
@@ -91,20 +81,25 @@ androidx.multidex:multidex:2.0.1
 androidx.print:print:1.0.0
 androidx.recyclerview:recyclerview:1.0.0
 androidx.recyclerview:recyclerview:1.1.0
-androidx.resourceinspection:resourceinspection-annotation:1.0.0
 androidx.savedstate:savedstate:1.0.0
+androidx.savedstate:savedstate:1.0.0-rc01
 androidx.savedstate:savedstate:1.1.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
-androidx.startup:startup-runtime:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02
 androidx.tracing:tracing:1.0.0
 androidx.transition:transition:1.2.0
 androidx.transition:transition:1.2.0-rc01
+androidx.vectordrawable:vectordrawable-animated:1.0.0
 androidx.vectordrawable:vectordrawable-animated:1.1.0
+androidx.vectordrawable:vectordrawable-animated:1.1.0-rc01
+androidx.vectordrawable:vectordrawable:1.0.1
 androidx.vectordrawable:vectordrawable:1.1.0
+androidx.vectordrawable:vectordrawable:1.1.0-rc01
+androidx.versionedparcelable:versionedparcelable:1.0.0
 androidx.versionedparcelable:versionedparcelable:1.1.0
+androidx.versionedparcelable:versionedparcelable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager2:viewpager2:1.0.0
 androidx.viewpager:viewpager:1.0.0
@@ -113,11 +108,10 @@ commons-codec:commons-codec:1.4
 commons-codec:commons-codec:1.6
 commons-codec:commons-codec:1.9
 commons-codec:commons-codec:1.10
-commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.1.1
 commons-logging:commons-logging:1.2
-com.adobe.xmp:xmpcore:6.0.6
+com.adobe.xmp:xmpcore:5.1.2
 com.afollestad.material-dialogs:commons:0.9.6.0
 com.afollestad.material-dialogs:core:0.9.6.0
 com.airbnb.android:lottie:3.4.4
@@ -128,9 +122,6 @@ com.android.databinding:baseLibrary:3.2.1
 com.android.databinding:baseLibrary:3.3.1
 com.android.databinding:baseLibrary:3.5.4
 com.android.databinding:baseLibrary:4.1.0
-com.android.databinding:baseLibrary:7.2.1
-com.android.databinding:baseLibrary:7.2.2
-com.android.databinding:baseLibrary:7.3.0
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
@@ -138,72 +129,47 @@ com.android.tools.analytics-library:crash:26.2.1
 com.android.tools.analytics-library:crash:26.3.1
 com.android.tools.analytics-library:crash:26.5.4
 com.android.tools.analytics-library:crash:27.1.0
-com.android.tools.analytics-library:crash:30.2.1
-com.android.tools.analytics-library:crash:30.2.2
-com.android.tools.analytics-library:crash:30.3.0
 com.android.tools.analytics-library:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
 com.android.tools.analytics-library:protos:26.3.1
 com.android.tools.analytics-library:protos:26.5.4
 com.android.tools.analytics-library:protos:27.1.0
-com.android.tools.analytics-library:protos:30.2.1
-com.android.tools.analytics-library:protos:30.2.2
-com.android.tools.analytics-library:protos:30.3.0
 com.android.tools.analytics-library:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
 com.android.tools.analytics-library:shared:26.3.1
 com.android.tools.analytics-library:shared:26.5.4
 com.android.tools.analytics-library:shared:27.1.0
-com.android.tools.analytics-library:shared:30.2.1
-com.android.tools.analytics-library:shared:30.2.2
-com.android.tools.analytics-library:shared:30.3.0
 com.android.tools.analytics-library:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
 com.android.tools.analytics-library:tracker:26.3.1
 com.android.tools.analytics-library:tracker:26.5.4
 com.android.tools.analytics-library:tracker:27.1.0
-com.android.tools.analytics-library:tracker:30.2.1
-com.android.tools.analytics-library:tracker:30.2.2
-com.android.tools.analytics-library:tracker:30.3.0
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09
-com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09
-com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
 com.android.tools.build:aapt2-proto:0.3.1
 com.android.tools.build:aapt2-proto:0.4.0
 com.android.tools.build:aapt2-proto:4.1.0-6503028
-com.android.tools.build:aapt2-proto:7.2.1-7984345
-com.android.tools.build:aapt2-proto:7.2.2-7984345
-com.android.tools.build:aapt2-proto:7.3.0-8691043
+com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524
 com.android.tools.build:aaptcompiler:4.1.0
-com.android.tools.build:aaptcompiler:7.2.1
-com.android.tools.build:aaptcompiler:7.2.2
-com.android.tools.build:aaptcompiler:7.3.0
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
 com.android.tools.build:apksig:3.3.1
 com.android.tools.build:apksig:3.5.4
 com.android.tools.build:apksig:4.1.0
-com.android.tools.build:apksig:7.2.1
-com.android.tools.build:apksig:7.2.2
-com.android.tools.build:apksig:7.3.0
 com.android.tools.build:apkzlib:3.2.1
 com.android.tools.build:apkzlib:3.3.1
 com.android.tools.build:apkzlib:3.5.4
 com.android.tools.build:apkzlib:4.1.0
-com.android.tools.build:apkzlib:7.2.1
-com.android.tools.build:apkzlib:7.2.2
-com.android.tools.build:apkzlib:7.3.0
 com.android.tools.build:builder-model:1.1.3
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
@@ -213,9 +179,6 @@ com.android.tools.build:builder-model:3.2.1
 com.android.tools.build:builder-model:3.3.1
 com.android.tools.build:builder-model:3.5.4
 com.android.tools.build:builder-model:4.1.0
-com.android.tools.build:builder-model:7.2.1
-com.android.tools.build:builder-model:7.2.2
-com.android.tools.build:builder-model:7.3.0
 com.android.tools.build:builder-test-api:1.1.3
 com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
@@ -225,9 +188,6 @@ com.android.tools.build:builder-test-api:3.2.1
 com.android.tools.build:builder-test-api:3.3.1
 com.android.tools.build:builder-test-api:3.5.4
 com.android.tools.build:builder-test-api:4.1.0
-com.android.tools.build:builder-test-api:7.2.1
-com.android.tools.build:builder-test-api:7.2.2
-com.android.tools.build:builder-test-api:7.3.0
 com.android.tools.build:builder:1.1.3
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
@@ -237,24 +197,16 @@ com.android.tools.build:builder:3.2.1
 com.android.tools.build:builder:3.3.1
 com.android.tools.build:builder:3.5.4
 com.android.tools.build:builder:4.1.0
-com.android.tools.build:builder:7.2.1
-com.android.tools.build:builder:7.2.2
-com.android.tools.build:builder:7.3.0
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.6.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
-com.android.tools.build:bundletool:1.8.2
-com.android.tools.build:bundletool:1.9.0
 com.android.tools.build:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
 com.android.tools.build:gradle-api:3.3.1
 com.android.tools.build:gradle-api:3.5.4
 com.android.tools.build:gradle-api:4.1.0
-com.android.tools.build:gradle-api:7.2.1
-com.android.tools.build:gradle-api:7.2.2
-com.android.tools.build:gradle-api:7.3.0
 com.android.tools.build:gradle-core:1.1.3
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
@@ -269,9 +221,6 @@ com.android.tools.build:gradle:3.2.1
 com.android.tools.build:gradle:3.3.1
 com.android.tools.build:gradle:3.5.4
 com.android.tools.build:gradle:4.1.0
-com.android.tools.build:gradle:7.2.1
-com.android.tools.build:gradle:7.2.2
-com.android.tools.build:gradle:7.3.0
 com.android.tools.build:manifest-merger:24.1.3
 com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
@@ -281,9 +230,6 @@ com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:manifest-merger:26.3.1
 com.android.tools.build:manifest-merger:26.5.4
 com.android.tools.build:manifest-merger:27.1.0
-com.android.tools.build:manifest-merger:30.2.1
-com.android.tools.build:manifest-merger:30.2.2
-com.android.tools.build:manifest-merger:30.3.0
 com.android.tools.build:transform-api:1.5.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
 com.android.tools.ddms:ddmlib:24.1.3
@@ -295,14 +241,14 @@ com.android.tools.ddms:ddmlib:26.2.1
 com.android.tools.ddms:ddmlib:26.3.1
 com.android.tools.ddms:ddmlib:26.5.4
 com.android.tools.ddms:ddmlib:27.1.0
-com.android.tools.ddms:ddmlib:30.2.1
-com.android.tools.ddms:ddmlib:30.2.2
-com.android.tools.ddms:ddmlib:30.3.0
 com.android.tools.external.com-intellij:intellij-core:26.0.0
 com.android.tools.external.com-intellij:intellij-core:26.0.1
+com.android.tools.external.com-intellij:intellij-core:27.1.0
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.0
 com.android.tools.external.lombok:lombok-ast:0.2.3
 com.android.tools.external.org-jetbrains:uast:26.0.0
 com.android.tools.external.org-jetbrains:uast:26.0.1
+com.android.tools.external.org-jetbrains:uast:27.1.0
 com.android.tools.jack:jack-api:0.9.0
 com.android.tools.jill:jill-api:0.9.0
 com.android.tools.layoutlib:layoutlib-api:24.1.3
@@ -314,53 +260,30 @@ com.android.tools.layoutlib:layoutlib-api:26.2.1
 com.android.tools.layoutlib:layoutlib-api:26.3.1
 com.android.tools.layoutlib:layoutlib-api:26.5.4
 com.android.tools.layoutlib:layoutlib-api:27.1.0
-com.android.tools.layoutlib:layoutlib-api:30.2.1
-com.android.tools.layoutlib:layoutlib-api:30.2.2
-com.android.tools.layoutlib:layoutlib-api:30.3.0
 com.android.tools.lint:lint-api:24.1.3
 com.android.tools.lint:lint-api:24.3.1
 com.android.tools.lint:lint-api:24.5.0
 com.android.tools.lint:lint-api:26.0.0
 com.android.tools.lint:lint-api:26.0.1
+com.android.tools.lint:lint-api:27.1.0
 com.android.tools.lint:lint-checks:24.1.3
 com.android.tools.lint:lint-checks:24.3.1
 com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
+com.android.tools.lint:lint-checks:27.1.0
 com.android.tools.lint:lint-gradle-api:26.2.1
 com.android.tools.lint:lint-gradle-api:26.3.1
 com.android.tools.lint:lint-gradle-api:26.5.4
 com.android.tools.lint:lint-gradle-api:27.1.0
+com.android.tools.lint:lint-gradle:27.1.0
 com.android.tools.lint:lint-model:27.1.0
-com.android.tools.lint:lint-model:30.2.1
-com.android.tools.lint:lint-model:30.2.2
-com.android.tools.lint:lint-model:30.3.0
-com.android.tools.lint:lint-typedef-remover:30.2.1
-com.android.tools.lint:lint-typedef-remover:30.2.2
-com.android.tools.lint:lint-typedef-remover:30.3.0
 com.android.tools.lint:lint:24.1.3
 com.android.tools.lint:lint:24.3.1
 com.android.tools.lint:lint:24.5.0
 com.android.tools.lint:lint:26.0.0
 com.android.tools.lint:lint:26.0.1
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.2
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0
-com.android.tools.utp:android-device-provider-gradle-proto:30.2.1
-com.android.tools.utp:android-device-provider-gradle-proto:30.2.2
-com.android.tools.utp:android-device-provider-gradle-proto:30.3.0
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.2
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.2
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.2
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.2
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0
+com.android.tools.lint:lint:27.1.0
 com.android.tools:annotations:24.1.3
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
@@ -370,9 +293,6 @@ com.android.tools:annotations:26.2.1
 com.android.tools:annotations:26.3.1
 com.android.tools:annotations:26.5.4
 com.android.tools:annotations:27.1.0
-com.android.tools:annotations:30.2.1
-com.android.tools:annotations:30.2.2
-com.android.tools:annotations:30.3.0
 com.android.tools:common:24.1.3
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
@@ -382,9 +302,6 @@ com.android.tools:common:26.2.1
 com.android.tools:common:26.3.1
 com.android.tools:common:26.5.4
 com.android.tools:common:27.1.0
-com.android.tools:common:30.2.1
-com.android.tools:common:30.2.2
-com.android.tools:common:30.3.0
 com.android.tools:dvlib:24.1.3
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
@@ -394,18 +311,12 @@ com.android.tools:dvlib:26.2.1
 com.android.tools:dvlib:26.3.1
 com.android.tools:dvlib:26.5.4
 com.android.tools:dvlib:27.1.0
-com.android.tools:dvlib:30.2.1
-com.android.tools:dvlib:30.2.2
-com.android.tools:dvlib:30.3.0
 com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
 com.android.tools:repository:26.3.1
 com.android.tools:repository:26.5.4
 com.android.tools:repository:27.1.0
-com.android.tools:repository:30.2.1
-com.android.tools:repository:30.2.2
-com.android.tools:repository:30.3.0
 com.android.tools:sdklib:24.1.3
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
@@ -415,9 +326,6 @@ com.android.tools:sdklib:26.2.1
 com.android.tools:sdklib:26.3.1
 com.android.tools:sdklib:26.5.4
 com.android.tools:sdklib:27.1.0
-com.android.tools:sdklib:30.2.1
-com.android.tools:sdklib:30.2.2
-com.android.tools:sdklib:30.3.0
 com.android.tools:sdk-common:24.1.3
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
@@ -427,31 +335,19 @@ com.android.tools:sdk-common:26.2.1
 com.android.tools:sdk-common:26.3.1
 com.android.tools:sdk-common:26.5.4
 com.android.tools:sdk-common:27.1.0
-com.android.tools:sdk-common:30.2.1
-com.android.tools:sdk-common:30.2.2
-com.android.tools:sdk-common:30.3.0
 com.android:signflinger:4.1.0
-com.android:signflinger:7.2.1
-com.android:signflinger:7.2.2
-com.android:signflinger:7.3.0
 com.android:zipflinger:4.1.0
-com.android:zipflinger:7.2.1
-com.android:zipflinger:7.2.2
-com.android:zipflinger:7.3.0
-com.diffplug.durian:durian-collect:1.2.0
-com.diffplug.durian:durian-core:1.2.0
-com.diffplug.durian:durian-io:1.2.0
-com.diffplug.spotless:spotless-lib-extra:2.30.0
-com.diffplug.spotless:spotless-lib:2.30.0
-com.diffplug.spotless:spotless-plugin-gradle:6.11.0
-com.drewnoakes:metadata-extractor:2.12.0
+com.drewnoakes:metadata-extractor:2.9.1
 com.facebook.conceal:conceal:1.1.3
 com.facebook.fbjni:fbjni-java-only:0.2.2
-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.flipper:flipper-fresco-plugin:0.54.0
+com.facebook.flipper:flipper:0.54.0
+com.facebook.fresco:animated-base:2.2.0
+com.facebook.fresco:animated-drawable:2.2.0
+com.facebook.fresco:animated-gif:2.2.0
 com.facebook.fresco:drawee:2.5.0
 com.facebook.fresco:fbcore:2.5.0
+com.facebook.fresco:flipper:2.2.0
 com.facebook.fresco:fresco:2.5.0
 com.facebook.fresco:imagepipeline-base:2.5.0
 com.facebook.fresco:imagepipeline-native:2.5.0
@@ -464,19 +360,13 @@ com.facebook.fresco:middleware:2.5.0
 com.facebook.fresco:nativeimagefilters:2.5.0
 com.facebook.fresco:nativeimagetranscoder:2.5.0
 com.facebook.fresco:soloader:2.5.0
+com.facebook.fresco:stetho:2.2.0
 com.facebook.fresco:ui-common:2.5.0
 com.facebook.infer.annotation:infer-annotation:0.18.0
-com.facebook.soloader:annotation:0.10.3
-com.facebook.soloader:nativeloader:0.10.3
-com.facebook.soloader:soloader:0.10.3
+com.facebook.soloader:annotation:0.10.1
+com.facebook.soloader:nativeloader:0.10.1
+com.facebook.soloader:soloader:0.10.1
 com.facebook.yoga:proguard-annotations:1.19.0
-com.fasterxml.jackson.core:jackson-annotations:2.11.1
-com.fasterxml.jackson.core:jackson-core:2.11.1
-com.fasterxml.jackson.core:jackson-databind:2.11.1
-com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.1
-com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1
-com.fasterxml.woodstox:woodstox-core:6.2.1
 com.github.Dimezis:BlurView:version-2.0.3
 com.github.bumptech.glide:annotations:4.12.0
 com.github.bumptech.glide:compiler:4.12.0
@@ -492,24 +382,10 @@ com.github.status-im:function:0.0.1
 com.github.wix-playground:ahbottomnavigation:3.3.0
 com.github.wix-playground:reflow-animator:1.0.6
 com.github.yalantis:ucrop:2.2.6-native
-com.googlecode.concurrent-trees:concurrent-trees:2.6.1
-com.googlecode.javaewah:JavaEWAH:1.1.13
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
-com.google.android.datatransport:transport-api:2.2.1
-com.google.android.datatransport:transport-backend-cct:2.3.3
-com.google.android.datatransport:transport-runtime:2.2.6
-com.google.android.gms:play-services-basement:18.0.0
-com.google.android.gms:play-services-base:18.0.1
-com.google.android.gms:play-services-mlkit-barcode-scanning:18.0.0
-com.google.android.gms:play-services-tasks:18.0.1
 com.google.android.material:material:1.2.0-alpha03
-com.google.android.odml:image:1.0.0-beta1
-com.google.android:annotations:4.1.1.4
-com.google.api.grpc:proto-google-common-protos:1.12.0
-com.google.api.grpc:proto-google-common-protos:2.0.1
 com.google.auto.value:auto-value-annotations:1.6.2
-com.google.auto.value:auto-value-annotations:1.6.3
 com.google.auto.value:auto-value:1.5.2
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
@@ -518,20 +394,11 @@ com.google.code.gson:gson:2.3
 com.google.code.gson:gson:2.8.0
 com.google.code.gson:gson:2.8.5
 com.google.code.gson:gson:2.8.6
-com.google.code.gson:gson:2.8.9
 com.google.crypto.tink:tink:1.3.0-rc2
-com.google.dagger:dagger:2.28.3
 com.google.errorprone:error_prone_annotations:2.0.18
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.errorprone:error_prone_annotations:2.3.1
 com.google.errorprone:error_prone_annotations:2.3.2
-com.google.errorprone:error_prone_annotations:2.3.4
-com.google.errorprone:error_prone_annotations:2.4.0
-com.google.errorprone:error_prone_annotations:2.7.1
-com.google.firebase:firebase-annotations:16.0.0
-com.google.firebase:firebase-components:16.1.0
-com.google.firebase:firebase-encoders-json:17.1.0
-com.google.firebase:firebase-encoders:16.1.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
@@ -540,100 +407,44 @@ com.google.guava:guava:23.0
 com.google.guava:guava:26.0-jre
 com.google.guava:guava:27.0.1-jre
 com.google.guava:guava:28.1-jre
-com.google.guava:guava:29.0-jre
-com.google.guava:guava:30.1-jre
-com.google.guava:guava:31.0.1-jre
-com.google.guava:listenablefuture:1.0
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jimfs:jimfs:1.1
-com.google.mlkit:barcode-scanning-common:17.0.0
-com.google.mlkit:barcode-scanning:17.0.2
-com.google.mlkit:common:18.0.0
-com.google.mlkit:vision-common:17.0.0
-com.google.mlkit:vision-interfaces:16.0.0
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java-util:3.10.0
-com.google.protobuf:protobuf-java-util:3.17.2
 com.google.protobuf:protobuf-java:3.0.0
 com.google.protobuf:protobuf-java:3.4.0
 com.google.protobuf:protobuf-java:3.10.0
-com.google.protobuf:protobuf-java:3.17.2
-com.google.testing.platform:core-proto:0.0.8-alpha07
 com.google.test.platform:core-proto:0.0.2-dev
+com.google.zxing:core:3.3.0
 com.intellij:annotations:12.0
+com.parse.bolts:bolts-applinks:1.4.0
 com.parse.bolts:bolts-tasks:1.4.0
-com.squareup.okhttp3:okhttp-tls:4.9.2
+com.squareup.okhttp3:okhttp-tls:4.9.1
 com.squareup.okhttp3:okhttp-urlconnection:4.9.2
 com.squareup.okhttp3:okhttp:4.9.2
 com.squareup.okio:okio:2.9.0
 com.squareup:javapoet:1.8.0
 com.squareup:javapoet:1.10.0
-com.squareup:javapoet:1.13.0
 com.squareup:javawriter:2.5.0
 com.sun.activation:javax.activation:1.2.0
 com.sun.istack:istack-commons-runtime:2.21
 com.sun.istack:istack-commons-runtime:3.0.7
-com.sun.istack:istack-commons-runtime:3.0.8
 com.sun.xml.fastinfoset:FastInfoset:1.2.13
 com.sun.xml.fastinfoset:FastInfoset:1.2.15
-com.sun.xml.fastinfoset:FastInfoset:1.2.16
 com.tunnelvisionlabs:antlr4-annotations:4.5
 com.tunnelvisionlabs:antlr4-runtime:4.5
 com.tunnelvisionlabs:antlr4:4.5
-de.undercouch:gradle-download-task:4.1.1
-de.undercouch:gradle-download-task:5.0.1
-io.grpc:grpc-api:1.21.1
-io.grpc:grpc-api:1.39.0
-io.grpc:grpc-context:1.21.1
-io.grpc:grpc-context:1.39.0
-io.grpc:grpc-core:1.21.1
-io.grpc:grpc-core:1.39.0
-io.grpc:grpc-netty:1.21.1
-io.grpc:grpc-netty:1.39.0
-io.grpc:grpc-protobuf-lite:1.21.1
-io.grpc:grpc-protobuf-lite:1.39.0
-io.grpc:grpc-protobuf:1.21.1
-io.grpc:grpc-protobuf:1.39.0
-io.grpc:grpc-stub:1.21.1
-io.grpc:grpc-stub:1.39.0
-io.netty:netty-buffer:4.1.34.Final
-io.netty:netty-buffer:4.1.52.Final
-io.netty:netty-codec-http2:4.1.34.Final
-io.netty:netty-codec-http2:4.1.52.Final
-io.netty:netty-codec-http:4.1.34.Final
-io.netty:netty-codec-http:4.1.52.Final
-io.netty:netty-codec-socks:4.1.34.Final
-io.netty:netty-codec-socks:4.1.52.Final
-io.netty:netty-codec:4.1.34.Final
-io.netty:netty-codec:4.1.52.Final
-io.netty:netty-common:4.1.34.Final
-io.netty:netty-common:4.1.52.Final
-io.netty:netty-handler-proxy:4.1.34.Final
-io.netty:netty-handler-proxy:4.1.52.Final
-io.netty:netty-handler:4.1.34.Final
-io.netty:netty-handler:4.1.52.Final
-io.netty:netty-resolver:4.1.34.Final
-io.netty:netty-resolver:4.1.52.Final
-io.netty:netty-transport:4.1.34.Final
-io.netty:netty-transport:4.1.52.Final
-io.opencensus:opencensus-api:0.21.0
-io.opencensus:opencensus-contrib-grpc-metrics:0.21.0
-io.perfmark:perfmark-api:0.23.0
+de.undercouch:gradle-download-task:3.4.3
+de.undercouch:gradle-download-task:4.0.2
 it.unimi.dsi:fastutil:7.2.0
-it.unimi.dsi:fastutil:8.4.0
-jakarta.activation:jakarta.activation-api:1.2.1
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
 javax.activation:javax.activation-api:1.2.0
-javax.annotation:javax.annotation-api:1.3.2
 javax.inject:javax.inject:1
 javax.xml.bind:jaxb-api:2.2.12-b140109.1041
 javax.xml.bind:jaxb-api:2.3.1
 junit:junit:4.12
 me.zhanghai.android.materialprogressbar:library:1.4.2
-net.java.dev.jna:jna-platform:5.6.0
-net.java.dev.jna:jna:5.6.0
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
 net.sf.proguard:proguard-base:5.1
@@ -646,177 +457,153 @@ net.sf.proguard:proguard-gradle:5.3.3
 net.sf.proguard:proguard-gradle:6.0.3
 org.abego.treelayout:org.abego.treelayout.core:1.0.1
 org.antlr:ST4:4.0.8
+org.antlr:antlr4-runtime:4.5.2-1
 org.antlr:antlr4:4.5.3
 org.antlr:antlr-runtime:3.5.2
 org.antlr:antlr:3.5.2
 org.apache.commons:commons-compress:1.8.1
 org.apache.commons:commons-compress:1.12
-org.apache.commons:commons-compress:1.20
 org.apache.commons:commons-lang3:3.3.2
 org.apache.commons:commons-lang3:3.9
 org.apache.httpcomponents:httpclient:4.1.1
 org.apache.httpcomponents:httpclient:4.2.6
 org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpclient:4.5.3
 org.apache.httpcomponents:httpclient:4.5.6
-org.apache.httpcomponents:httpclient:4.5.9
-org.apache.httpcomponents:httpclient:4.5.13
 org.apache.httpcomponents:httpcore:4.1
 org.apache.httpcomponents:httpcore:4.2.5
 org.apache.httpcomponents:httpcore:4.4.5
+org.apache.httpcomponents:httpcore:4.4.6
 org.apache.httpcomponents:httpcore:4.4.10
-org.apache.httpcomponents:httpcore:4.4.11
-org.apache.httpcomponents:httpcore:4.4.13
 org.apache.httpcomponents:httpmime:4.1
 org.apache.httpcomponents:httpmime:4.5.2
 org.apache.httpcomponents:httpmime:4.5.6
-org.bitbucket.b_c:jose4j:0.7.0
 org.bouncycastle:bcpkix-jdk15on:1.48
 org.bouncycastle:bcpkix-jdk15on:1.56
-org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.48
 org.bouncycastle:bcprov-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.60
-org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-qual:2.5.2
 org.checkerframework:checker-qual:2.8.1
-org.checkerframework:checker-qual:2.11.1
-org.checkerframework:checker-qual:3.5.0
-org.checkerframework:checker-qual:3.12.0
-org.codehaus.groovy:groovy-xml:3.0.10
-org.codehaus.groovy:groovy:3.0.10
+org.codehaus.groovy:groovy-all:2.4.15
 org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.codehaus.mojo:animal-sniffer-annotations:1.18
-org.codehaus.mojo:animal-sniffer-annotations:1.19
-org.codehaus.woodstox:stax2-api:4.2.1
 org.conscrypt:conscrypt-android:2.0.0
 org.eclipse.jdt.core.compiler:ecj:4.4
 org.eclipse.jdt.core.compiler:ecj:4.4.2
 org.eclipse.jdt.core.compiler:ecj:4.6.1
-org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r
 org.glassfish.jaxb:jaxb-core:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.3.1
-org.glassfish.jaxb:jaxb-runtime:2.3.2
 org.glassfish.jaxb:txw2:2.2.11
 org.glassfish.jaxb:txw2:2.3.1
-org.glassfish.jaxb:txw2:2.3.2
 org.hamcrest:hamcrest-core:1.3
-org.jacoco:org.jacoco.agent:0.8.7
-org.jacoco:org.jacoco.ant:0.8.7
 org.jacoco:org.jacoco.core:0.7.4.201502262128
-org.jacoco:org.jacoco.core:0.8.7
 org.jacoco:org.jacoco.report:0.7.4.201502262128
-org.jacoco:org.jacoco.report:0.8.7
 org.jdom:jdom2:2.0.6
-org.jetbrains.dokka:dokka-core:1.4.32
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
-org.jetbrains.intellij.deps:trove4j:1.0.20200330
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20
-org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.4.31
+org.jetbrains.kotlin:kotlin-android-extensions:1.3.50
+org.jetbrains.kotlin:kotlin-android-extensions:1.4.31
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20
-org.jetbrains.kotlin:kotlin-build-common:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-client:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-native-utils:1.6.20
-org.jetbrains.kotlin:kotlin-project-model:1.6.20
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.3.50
+org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.31
+org.jetbrains.kotlin:kotlin-build-common:1.3.50
+org.jetbrains.kotlin:kotlin-build-common:1.4.31
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.50
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4.31
+org.jetbrains.kotlin:kotlin-compiler-runner:1.3.50
+org.jetbrains.kotlin:kotlin-compiler-runner:1.4.31
+org.jetbrains.kotlin:kotlin-daemon-client:1.3.50
+org.jetbrains.kotlin:kotlin-daemon-client:1.4.31
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.3.50
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.4.31
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.3.50
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.4.31
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.3.50
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.4.31
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.4.31
+org.jetbrains.kotlin:kotlin-native-utils:1.3.50
 org.jetbrains.kotlin:kotlin-reflect:1.1.3-2
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
 org.jetbrains.kotlin:kotlin-reflect:1.3.20
 org.jetbrains.kotlin:kotlin-reflect:1.3.50
 org.jetbrains.kotlin:kotlin-reflect:1.3.72
-org.jetbrains.kotlin:kotlin-reflect:1.5.31
-org.jetbrains.kotlin:kotlin-reflect:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20
-org.jetbrains.kotlin:kotlin-script-runtime:1.6.20
+org.jetbrains.kotlin:kotlin-reflect:1.4.31
+org.jetbrains.kotlin:kotlin-scripting-common:1.3.50
+org.jetbrains.kotlin:kotlin-scripting-common:1.4.31
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.3.50
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.4.31
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.3.50
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.4.31
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.3.50
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31
+org.jetbrains.kotlin:kotlin-script-runtime:1.3.50
+org.jetbrains.kotlin:kotlin-script-runtime:1.4.31
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
+org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10
+org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.10
+org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib:1.5.31
-org.jetbrains.kotlin:kotlin-stdlib:1.6.10
-org.jetbrains.kotlin:kotlin-stdlib:1.6.20
+org.jetbrains.kotlin:kotlin-stdlib:1.4.10
+org.jetbrains.kotlin:kotlin-stdlib:1.4.31
+org.jetbrains.kotlin:kotlin-stdlib:1.5.10
+org.jetbrains.kotlin:kotlin-stdlib:1.5.30
 org.jetbrains.kotlin:kotlin-stdlib:1.6.21
-org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
-org.jetbrains.kotlin:kotlin-util-io:1.6.20
-org.jetbrains.kotlin:kotlin-util-klib:1.6.20
+org.jetbrains.kotlin:kotlin-util-io:1.3.50
+org.jetbrains.kotlin:kotlin-util-io:1.4.31
+org.jetbrains.kotlin:kotlin-util-klib:1.4.31
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
-org.jetbrains:markdown-jvm:0.2.1
-org.jetbrains:markdown:0.2.1
 org.json:json:20180813
-org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.7.7
 org.jvnet.staxex:stax-ex:1.8
-org.jvnet.staxex:stax-ex:1.8.1
 org.ow2.asm:asm-analysis:5.0.3
 org.ow2.asm:asm-analysis:5.1
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-analysis:7.0
-org.ow2.asm:asm-analysis:9.1
 org.ow2.asm:asm-commons:5.1
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-commons:7.0
-org.ow2.asm:asm-commons:9.1
 org.ow2.asm:asm-debug-all:5.0.1
 org.ow2.asm:asm-tree:5.0.3
 org.ow2.asm:asm-tree:5.1
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-tree:7.0
-org.ow2.asm:asm-tree:9.1
 org.ow2.asm:asm-util:5.1
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm-util:7.0
-org.ow2.asm:asm-util:9.1
 org.ow2.asm:asm:5.0.3
 org.ow2.asm:asm:5.1
 org.ow2.asm:asm:6.0
 org.ow2.asm:asm:7.0
-org.ow2.asm:asm:9.1
-org.slf4j:slf4j-api:1.7.30
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1
-org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
-xerces:xercesImpl:2.12.0
-xml-apis:xml-apis:1.4.01
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10
-com.android.tools.lint:lint-gradle:30.2.2
-com.android.tools.build:gradle:7.0.4

nix/deps/gradle/generate.sh

@@ -29,12 +29,12 @@ function gen_proj_list() {
     echo -e "Found ${GRN}$(wc -l < "${PROJ_LIST}")${RST} sub-projects..."
 }
 
-# Check each sub-project in parallel, the "" is for local deps.
+# Check each sub-project in parallel, the ":" is for local deps.
 function gen_deps_list() {
     PROJECTS=$(cat "${PROJ_LIST}")
     # WARNING: The ${PROJECTS[@]} needs to remain unquoted to expand correctly.
     # shellcheck disable=SC2068
-    "${CUR_DIR}/get_deps.sh" "" ${PROJECTS[@]} | sort -uV -o "${DEPS_LIST}"
+    "${CUR_DIR}/get_deps.sh" ":" ${PROJECTS[@]} | sort -uV -o "${DEPS_LIST}"
     echo -e "${CLR}Found ${GRN}$(wc -l < "${DEPS_LIST}")${RST} direct dependencies..."
 }
 
@@ -52,8 +52,9 @@ function gen_deps_json() {
     # Format URLs into a Nix consumable file.
     URLS=$(cat "${DEPS_URLS}")
     # Avoid rate limiting by using 4 of the available threads.
-    echo "${URLS}" | parallel --will-cite --keep-order --jobs 4 \
+    parallel --will-cite --keep-order --jobs 4 \
         "${CUR_DIR}/url2json.sh" \
+        ::: "${URLS}" \
         >> "${DEPS_JSON}"
 
     # Drop tailing comma on last object, stupid JSON
@@ -82,10 +83,6 @@ fi
 # Run each stage in order
 gen_proj_list
 gen_deps_list
-# FIXME: Temporary fix for missing package.
-echo 'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10' >> "${DEPS_LIST}"
-echo 'com.android.tools.lint:lint-gradle:30.2.2' >> "${DEPS_LIST}"
-echo 'com.android.tools.build:gradle:7.0.4' >> "${DEPS_LIST}"
 gen_deps_urls
 gen_deps_json
 

nix/deps/gradle/gradle_parser.awk

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

nix/deps/gradle/proj.list

@@ -37,5 +37,4 @@ react-native-status
 react-native-status-keycard
 react-native-svg
 react-native-touch-id
-react-native-transparent-video
 react-native-webview

nix/deps/nodejs-patched/default.nix

@@ -12,8 +12,10 @@ stdenv.mkDerivation {
     "patchBuildIdPhase"
     "patchHermesPhase"
     "patchJavaPhase"
+    "patchYogaNodePackagePhase"
     "patchReactNativePhase"
     "patchPodPhase"
+    "patchReactNativeXcodeScriptPhase"
     "installPhase"
   ];
 
@@ -68,7 +70,14 @@ stdenv.mkDerivation {
   patchJavaPhase = ''
     ${nodejs}/bin/node ./node_modules/jetifier/bin/jetify
   '';
-
+  # Patch React Native Yoga.cpp file
+  # FIXME: Remove this once release newer than 1.19.0 is used which includes:
+  # https://github.com/facebook/yoga/commit/f174de70
+  patchYogaNodePackagePhase = ''
+    substituteInPlace ./node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp --replace \
+        'node->getLayout().hadOverflow() |' \
+        'node->getLayout().hadOverflow() ||'
+  '';
   installPhase = ''
     mkdir -p $out
     cp -R node_modules $out/
@@ -98,6 +107,19 @@ stdenv.mkDerivation {
           '[RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];'
   '';
 
+# Patch React Native Xcode Script that searches for nvm
+# FIXME: Remove this once we upgrade react-native to 0.69.x
+    patchReactNativeXcodeScriptPhase = ''
+      substituteInPlace ./node_modules/react-native/scripts/find-node.sh --replace \
+              '# Define NVM_DIR and source the nvm.sh setup script' \
+              '<<MULTI_LINE_COMMENT${"\n"}# Define NVM_DIR and source the nvm.sh setup script'
+
+      substituteInPlace ./node_modules/react-native/scripts/find-node.sh --replace \
+              '# Set up the nodenv node version manager if present' \
+              'MULTI_LINE_COMMENT${"\n"}# Set up the nodenv node version manager if present'
+    '';
+
+
   # The ELF types are incompatible with the host platform, so let's not even try
   # TODO: Use Android NDK to strip binaries manually
   dontPatchELF = true;

nix/mobile/android/release.nix

@@ -134,11 +134,8 @@ in stdenv.mkDerivation rec {
     ${adhocEnvVars} ${pkgs.gradle}/bin/gradle \
       ${toString gradleOpts} \
       --console=plain \
-      --offline \
-      --no-daemon \
-      --no-scan \
-      --no-watch-fs \
-      --no-build-cache \
+      --offline --stacktrace \
+      -Dorg.gradle.daemon=false \
       -Dmaven.repo.local='${deps.gradle}' \
       -PversionCode=${toString buildNumber} \
       -PcommitHash=${commitHash} \
@@ -150,7 +147,7 @@ in stdenv.mkDerivation rec {
   checkPhase = ''
     ls ${apksPath}/*.apk \
       | xargs -n1 ${pkgs.unzip}/bin/unzip -qql \
-      | grep 'index.android.bundle'
+      | grep 'assets/index.android.bundle'
   '';
   installPhase = ''
     mkdir -p $out

nix/nix.conf

@@ -1,13 +1,11 @@
-# NOTE: If you are in Asia you might want to add https://nix-cache-cn.status.im/ to substituters.
-substituters = https://nix-cache.status.im/ https://cache.nixos.org/
-trusted-substituters = https://nix-cache.status.im/ https://cache.nixos.org/
+# NOTE: If you are in Asia you might want to add https://nix-cache-cn.status.im/ to extra-substituters
+extra-substituters = https://nix-cache.status.im/
+substituters = https://cache.nixos.org/
 trusted-public-keys = nix-cache.status.im-1:x/93lOfLU+duPplwMSBR+OlY4+mo+dCN7n0mr4oPwgY= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
 # Some downloads are multiple GB, default is 5 minutes
 stalled-download-timeout = 3600
 connect-timeout = 10
 max-jobs = auto
-# Build packages if fetching from cache fails.
-fallback = true
 # Helps avoid removing currently used dependencies via garbage collection
 keep-derivations = true
 keep-outputs = true

nix/overlay.nix

@@ -32,6 +32,18 @@ in {
   # For parsing gradle.properties into an attrset
   gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
 
+  # Clojure formatting tool
+  zprint = super.zprint.override rec {
+    buildGraalvmNativeImage = args: super.buildGraalvmNativeImage ( args // rec {
+      inherit (args) pname;
+      version = "1.2.5";
+      src = self.fetchurl {
+        url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
+        sha256 = "sha256-PWdR5jqyzvTk9HoxqDldwtZNik34dmebBtZZ5vtva4A=";
+      };
+    });
+  };
+
   # Fix for missing libarclite_macosx.a in Xcode 14.3.
   # https://github.com/ios-control/ios-deploy/issues/580
   ios-deploy = super.darwin.ios-deploy.overrideAttrs (old: rec {
@@ -44,17 +56,12 @@ in {
     };
   });
 
-  # Checks fail on darwin.
-  git-lfs = super.git-lfs.overrideAttrs (old: {
-    doCheck = false;
-  });
-
   # Package version adjustments
-  gradle = super.gradle_7;
+  gradle = super.gradle_6;
   nodejs = super.nodejs-18_x;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
-  openjdk = super.openjdk11_headless;
-  xcodeWrapper = super.xcodeenv.composeXcodeWrapper {
+  openjdk = super.openjdk8_headless;
+  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
     version = "14.0";
     allowHigher = true;
   };

nix/pkgs.nix

@@ -3,13 +3,21 @@
 { config ? { } }:
 
 let
+  inherit (import <nixpkgs> { }) fetchFromGitHub;
+
   # For testing local version of nixpkgs
   #nixpkgsSrc = (import <nixpkgs> { }).lib.cleanSource "/home/jakubgs/work/nixpkgs";
 
   # We follow the master branch of official nixpkgs.
-  nixpkgsSrc = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/e7603eba51f2c7820c0a182c6bbb351181caa8e7.tar.gz";
-    sha256 = "sha256:0mwck8jyr74wh1b7g6nac1mxy6a0rkppz8n12andsffybsipz5jw";
+  nixpkgsSrc = fetchFromGitHub {
+    name = "nixpkgs-source";
+    # FIXME: Fork used to get Cocoapods 1.12.0 and apksigner macOS build.
+    owner = "status-im";
+    repo = "nixpkgs";
+    rev = "d0c06fa3d3982a91aa01bd63ed84020cbde3d3ab";
+    sha256 = "sha256-8blvuUHnuf0hFr/PpBxVohJp5CaGXIXhgJlFN/cv7us=";
+    # To get the compressed Nix sha256, use:
+    # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };
 
   # Status specific configuration defaults

nix/pkgs/aapt2/default.nix

@@ -5,12 +5,12 @@
 { lib, stdenv, pkgs, fetchurl }:
 
 let
-  inherit (lib) getAttr;
+  inherit (lib) getAttr optionals;
   inherit (stdenv) isLinux isDarwin;
 
   pname = "aapt2";
   # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  version = "7.2.2-7984345";
+  version = "4.1.0-6503028";
 
   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-BKtK5f7lxp0YdQU4AFGL933vjEAykQ1RiKpDwfc32oI=";
-        osx = "sha256-OORgWnGQS0GwqZrSg8sFQb4FM23hrYHwmarcYd8EO/0=";
+        linux = "sha256-oxlBy5aJcb+FgHvy6Qmbi33GsubEuXVbYSHuD4O1wIY=";
+        osx = "sha256-zRWrjfV6P6MQaLlwNi7CBhI35U+osNfVvyL0T89NbuI=";
       };
     };
     sha = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}.sha1";
       sha256 = getAttr platform {
-        linux = "sha256-4F4REWQLj8hdnh1tIwRVgdWJjUBhvvINP56nIscwePA=";
-        osx = "sha256-n0jFUphzlFnNacolbXoNmNHs/hXfktVpYRlJ1JW9ukU=";
+        linux = "sha256-GlvbIDXnrjUga/NkmODJUZX+K5UtU/0fua5a8QY02+E=";
+        osx = "sha256-83WpYPsyVk/E9nddy2qUSAh+cBZ1PsS0N9516Tga35o=";
       };
     };
     pom = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.pom}";
-      sha256 = "sha256-XWEn9Zvxv0hgYU2yUSlZ4OiguZy1bz+Gh0wRrm4d9GQ=";
+      sha256 = "sha256-p7JdQj7hl/cjiVzT2ZFts1lLI9xlOOnnadXr0vDVhTs=";
     };
   };
 
@@ -50,8 +50,8 @@ in stdenv.mkDerivation {
   inherit pname version;
 
   srcs = with urls; [ jar sha pom ];
-  # patchelf is Linux specific and won't work on Darwin Platform
-  phases = if isDarwin then ["unpackPhase"] else ["unpackPhase" "patchPhase" "installPhase"];
+  phases = [ "unpackPhase" ]
+    ++ optionals isLinux [ "patchPhase" ]; # OSX binaries don't need patchelf
   buildInputs = with pkgs; [ zip unzip patchelf ];
 
   unpackPhase = ''
@@ -60,23 +60,27 @@ in stdenv.mkDerivation {
       filename=$(stripHash $src)
       cp $src $out/$filename
     done
-    tmpDir=$(mktemp -d)
-    unzip $out/${filenames.jar} -d $tmpDir
   '';
 
   # On Linux, we need to patch the interpreter in Java packages
   # that contain native executables to use Nix's interpreter instead.
   patchPhase = ''
-    # Patch executables from maven dependency to use Nix's interpreter
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $tmpDir/aapt2
-  '';
+    # We need an stdenv with a compiler
+    [[ -n "$NIX_CC" ]] || exit 1
 
-  # Rebuild the .jar file with patched binaries
-  installPhase = ''
+    # Patch executables from maven dependency to use Nix's interpreter
+    tmpDir=$(mktemp -d)
+    unzip $out/${filenames.jar} -d $tmpDir
+    for exe in `find $tmpDir/ -type f -executable`; do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
+    done
+
+    # Rebuild the .jar file with patched binaries
     pushd $tmpDir > /dev/null
     chmod u+w $out/${filenames.jar}
     zip -fr $out/${filenames.jar}
     chmod $out/${filenames.jar} --reference=$out/${filenames.jar}.sha1
     popd > /dev/null
+    rm -rf $tmpDir
   '';
 }

nix/pkgs/android-sdk/compose.nix

@@ -8,10 +8,9 @@
 # The "android-sdk-license" license is accepted
 # by setting android_sdk.accept_license = true.
 androidenv.composeAndroidPackages {
-  cmdLineToolsVersion = "9.0";
   toolsVersion = "26.1.1";
-  platformToolsVersion = "33.0.3";
-  buildToolsVersions = [ "31.0.0" ];
+  platformToolsVersion = "33.0.2";
+  buildToolsVersions = [ "30.0.0" ];
   platformVersions = [ "31" ];
   cmakeVersions = [ "3.18.1" ];
   ndkVersion = "22.1.7171670";

nix/pkgs/android-sdk/shell.nix

@@ -2,17 +2,18 @@
 
 mkShell {
   name = "android-sdk-shell";
-  buildInputs = [ openjdk ];
-
   shellHook = ''
+    export JAVA_HOME="${openjdk}"
+
     export ANDROID_HOME="${androidPkgs.sdk}"
     export ANDROID_NDK_ROOT="${androidPkgs.ndk}"
     export ANDROID_SDK_ROOT="$ANDROID_HOME"
 
+    export PATH="$ANDROID_HOME/bin:$PATH"
     export PATH="$ANDROID_NDK_ROOT:$PATH"
     export PATH="$ANDROID_SDK_ROOT/tools:$PATH"
     export PATH="$ANDROID_SDK_ROOT/tools/bin:$PATH"
-    export PATH="$(echo $ANDROID_SDK_ROOT/cmdline-tools/*/bin):$PATH"
     export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH"
+    export PATH="$ANDROID_SDK_ROOT/build-tools:$PATH"
   '';
 }

nix/pkgs/xcodeenv/compose-xcodewrapper.nix

@@ -0,0 +1,44 @@
+{ stdenv }:
+
+{ version ? "11.1"
+, allowHigher ? false
+, xcodeBaseDir ? "/Applications/Xcode.app" }:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "xcode-wrapper-${version}${if allowHigher then "-plus" else ""}";
+  # Fix 'xcodebuild: Operation not permitted' when 'sandbox=relaxed' is used.
+  # https://github.com/NixOS/nixpkgs/pull/228696
+  __noChroot = stdenv.isDarwin;
+  buildCommand = ''
+    mkdir -p $out/bin
+    cd $out/bin
+    ln -s /usr/bin/xcode-select
+    ln -s /usr/bin/security
+    ln -s /usr/bin/codesign
+    ln -s /usr/bin/xcrun
+    ln -s /usr/bin/plutil
+    ln -s /usr/bin/clang
+    ln -s /usr/bin/lipo
+    ln -s /usr/bin/file
+    ln -s /usr/bin/rev
+    ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
+    ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator"
+
+    cd ..
+    ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
+
+    # Check if we have the xcodebuild version that we want
+    currVer=$($out/bin/xcodebuild -version)
+    ${if allowHigher then ''
+    if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ]
+    '' else ''
+    if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ]
+    ''}
+    then
+        echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}"
+        exit 1
+    fi
+  '';
+}

nix/scripts/lib.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-set -eo pipefail
-GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 
 # Checking group ownership to identify installation type.
 file_group() {
@@ -50,41 +48,3 @@ nix_root() {
     fi
     echo "${NIX_ROOT}"
 }
-
-nix_current_version() {
-    nix-env --version | awk '{print $3}'
-}
-
-nix_get_local_setting() {
-    local NIX_LOCAL_CONFIG="${GIT_ROOT}/nix/nix.conf"
-    local KEY="${1}"
-    awk -F' = ' "/^${KEY} *=/{print \$2}" nix/nix.conf
-}
-
-nix_set_global_setting() {
-    local NIX_GLOBAL_CONFIG="/etc/nix/nix.conf"
-    local KEY="${1}"
-    local VAL="${2}"
-    if grep "${KEY}" "${NIX_GLOBAL_CONFIG}" 2>/dev/null; then
-        sed -i "s/${KEY} = \(.*\)$/${KEY} = ${VAL}/" "${NIX_GLOBAL_CONFIG}"
-    else
-        echo "${KEY} = ${VAL}" | sudo tee -a "${NIX_GLOBAL_CONFIG}" >/dev/null
-    fi
-}
-
-nix_daemon_restart() {
-    # Restarting Nix Daemon makes sense only on a multi-user install.
-    [[ $(nix_install_type) != "multi" ]] && return
-    if [[ "$(uname -s)" == "Darwin" ]]; then
-        echo "Restarting Nix daemon Launchd service..." >&2
-        sudo launchctl unload /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-        sudo launchctl load   /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-    elif [[ "$(uname -s)" == "Linux" ]] && [[ "$(nix_install_type)" == "multi" ]]; then
-        echo "Restarting Nix daemon Systemd service..." >&2
-        sudo systemctl daemon-reload
-        sudo systemctl restart nix-daemon
-    else
-        echo "Unknown platform! Unable to restart daemon!" >&2
-        exit 1
-    fi
-}

nix/scripts/setup.sh

@@ -3,11 +3,15 @@
 set -eo pipefail
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-source "${GIT_ROOT}/scripts/colors.sh"
 source "${GIT_ROOT}/nix/scripts/lib.sh"
-source "${GIT_ROOT}/nix/scripts/version.sh"
+source "${GIT_ROOT}/scripts/colors.sh"
 
-nix_install() {
+NIX_VERSION="2.11.1"
+NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
+NIX_INSTALL_SHA256="4569a01dc5f62056f29f3195673bc3242fc70bf2474927fb5d8549c4d997402d"
+NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"
+
+install_nix() {
     # Download installer and verify SHA256>
     curl -sSf "${NIX_INSTALL_URL}" -o "${NIX_INSTALL_PATH}"
     echo "${NIX_INSTALL_SHA256}  ${NIX_INSTALL_PATH}" | sha256sum -c
@@ -38,22 +42,6 @@ nix_install() {
         echo "Please see: https://nixos.org/nix/manual/#chap-installation" >&2
         exit 1
     fi
-
-    # Additional fixes
-    nix_add_extra_cache
-    nix_daemon_restart
-}
-
-# Adding directly to global config to avoid warnings like this:
-# "ignoring untrusted substituter 'https://nix-cache.status.im/', you are not a trusted user."
-nix_add_extra_cache() {
-    # Single-user installations do not have this issue.
-    [[ ! -f /etc/nix/nix.conf ]] && return
-    echo -e 'Adding our cache to Nix daemon config...' >&2
-    local NIX_SETTINGS=('substituters' 'trusted-substituters' 'trusted-public-keys')
-    for NIX_SETTING in "${NIX_SETTINGS[@]}"; do
-        nix_set_global_setting "${NIX_SETTING}" "$(nix_get_local_setting "${NIX_SETTING}")"
-    done
 }
 
 if [[ ! -x "$(command -v sha256sum)" ]]; then
@@ -84,5 +72,5 @@ fi
 
 # If none of the checks before succeeded we need to install Nix
 echo -e "${GRN}Setting up Nix package manager...${RST}"
-nix_install
+install_nix
 echo -e "${YLW}See STARTING_GUIDE.md if you're new here.${RST}"

nix/scripts/source.sh

@@ -12,7 +12,7 @@ source_nix_profile() {
         source "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh"
     elif [[ "${NIX_INSTALL_TYPE}" == "single" ]]; then
         source "${HOME}/.nix-profile/etc/profile.d/nix.sh"
-    elif [[ "${NIX_INSTALL_TYPE}" == "nixos" ]]; then
+    elif [[ "${NIX_INSTALL_TYPE}" == "nixops" ]]; then
         echo "Sourcing profile not necessary on NixOS!" >&2
     fi
 }

nix/scripts/upgrade.sh

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-# This script upgrades Nix to specific version.
-# https://nixos.org/manual/nix/stable/installation/upgrading.html
-set -eo pipefail
-
-GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-source "${GIT_ROOT}/scripts/colors.sh"
-source "${GIT_ROOT}/nix/scripts/lib.sh"
-source "${GIT_ROOT}/nix/scripts/source.sh"
-source "${GIT_ROOT}/nix/scripts/version.sh"
-
-nix_upgrade() {
-    echo -e "Upgrading Nix interpreter to: ${GRN}${NIX_VERSION}${RST}" >&2
-    nix-channel --update
-    nix-env --install --attr "nixpkgs.${NIX_PACKAGE}" "nixpkgs.cacert"
-    nix_daemon_restart
-}
-
-# Allow for sourcing the script
-if [[ "${BASH_SOURCE[0]}" != "$0" ]]; then
-    return
-fi
-
-if [[ "$(nix_current_version)" == "${NIX_VERSION}" ]]; then
-    echo -e "Nix interpreter already on version: ${GRN}${NIX_VERSION}${RST}"
-    exit 0
-fi
-
-NIX_INSTALL_TYPE=$(nix_install_type)
-if [[ "${NIX_INSTALL_TYPE}" == "nixos" ]]; then
-    echo -e "${YLW}WARNING:${RST} Upgrade Nix in your NixOS configuration!" >&2
-    exit 0
-elif [[ "${NIX_INSTALL_TYPE}" == "single" ]]; then
-    nix_upgrade
-elif [[ "${NIX_INSTALL_TYPE}" == "multi" ]]; then
-    sudo -i bash -c "source ${PWD}/${0}; nix_upgrade"
-fi

nix/scripts/version.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# WARNING: Versions 2.14, 2.15, 2.16 have an issue creating gcroots:
-# https://github.com/NixOS/nix/issues/8564
-export NIX_VERSION="2.13.4"
-export NIX_PACKAGE="nixVersions.nix_2_13"
-export NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
-export NIX_INSTALL_SHA256="a9908cc48f5886b4f22172bdd2f9657873276fd295e78c6ed97fb308c6d284d0"
-export NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"

nix/shell.nix

@@ -10,26 +10,21 @@ let
 in mkShell {
   name = "status-mobile-shell"; # for identifying all shells
 
-  buildInputs = let
-    appleSDKFrameworks = (with pkgs.darwin.apple_sdk.frameworks; [
-      IOKit CoreServices
-    ]);
-  in
-    with pkgs; lib.unique ([
-      # core utilities that should always be present in a shell
-      bash curl wget file unzip flock procps
-      git gnumake jq ncurses gnugrep parallel
-      lsof # used in start-react-native.sh
-      # build specific utilities
-      clojure maven watchman
-      # lint specific utilities
-      clj-kondo zprint
-      # other nice to have stuff
-      yarn nodejs python310
-    ] # and some special cases
-      ++ lib.optionals   stdenv.isDarwin ([ cocoapods clang tcl ] ++ appleSDKFrameworks)
-      ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ]
-    );
+  buildInputs = with pkgs; lib.unique ([
+    # core utilities that should always be present in a shell
+    bash curl wget file unzip flock procps
+    git gnumake jq ncurses gnugrep parallel
+    lsof # used in start-react-native.sh
+    # build specific utilities
+    clojure maven watchman
+    # lint specific utilities
+    clj-kondo zprint
+    # other nice to have stuff
+    yarn nodejs python27
+  ] # and some special cases
+    ++ lib.optionals stdenv.isDarwin [ cocoapods clang tcl ]
+    ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ]
+  );
 
   # avoid terminal issues
   TERM="xterm";

nix/shells.nix

@@ -57,7 +57,7 @@ let
 
     # for 'scripts/generate-keystore.sh'
     keytool = mkShell {
-      buildInputs = with pkgs; [ openjdk apksigner ];
+      buildInputs = with pkgs; [ openjdk8 apksigner ];
     };
 
     # for targets needing 'adb', 'apkanalyzer' and other SDK/NDK tools

package.json

@@ -10,8 +10,7 @@
     "app:compile:android": "shadow-cljs compile android",
     "app:watch": "shadow-cljs watch android",
     "app:packager": "react-native start --host 0.0.0.0 --port 8081",
-    "app:android": "react-native run-android",
-    "prettier": "node_modules/.bin/prettier --write ."
+    "app:android": "react-native run-android"
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.17.12",
@@ -26,7 +25,6 @@
     "@react-native-community/push-notification-ios": "^1.4.1",
     "@react-native-community/slider": "^3.0.0",
     "@walletconnect/client": "^2.0.0-beta.23",
-    "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",
     "create-react-class": "^15.6.2",
@@ -36,21 +34,21 @@
     "i18n-js": "^3.3.0",
     "node-libs-react-native": "^1.2.1",
     "qrcode": "^1.4.1",
-    "react": "18.0.0",
-    "react-dom": "18.0.0",
-    "react-native": "0.69.10",
+    "react": "17.0.2",
+    "react-dom": "^16.4.2",
+    "react-native": "0.67.5",
     "react-native-background-timer": "^2.1.1",
     "react-native-blob-util": "^0.13.18",
-    "react-native-camera-kit": "^13.0.0",
+    "react-native-camera-kit": "^8.0.4",
     "react-native-config": "^1.5.0",
     "react-native-dialogs": "^1.0.4",
     "react-native-draggable-flatlist": "^3.0.3",
     "react-native-fast-image": "^8.5.11",
     "react-native-fetch-polyfill": "^1.1.2",
     "react-native-fs": "^2.14.1",
-    "react-native-gesture-handler": "2.6.1",
+    "react-native-gesture-handler": "^2.5.0",
     "react-native-haptic-feedback": "^1.9.0",
-    "react-native-hole-view": "git+https://github.com/status-im/react-native-hole-view.git#refs/tags/v2.1.3-status",
+    "react-native-hole-view": "git+https://github.com/status-im/react-native-hole-view.git#refs/tags/v2.1.1-status",
     "react-native-image-crop-picker": "git+https://github.com/status-im/react-native-image-crop-picker.git#refs/tags/v0.36.2-status.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",
@@ -58,20 +56,19 @@
     "react-native-languages": "^3.0.2",
     "react-native-linear-gradient": "^2.5.6",
     "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-mail": "^6.1.1",
     "react-native-navigation": "^7.27.1",
     "react-native-orientation-locker": "^1.5.0",
     "react-native-permissions": "^2.1.5",
     "react-native-randombytes": "^3.6.1",
-    "react-native-reanimated": "2.11.0",
+    "react-native-reanimated": "2.3.3",
     "react-native-redash": "^16.0.11",
     "react-native-shake": "^3.3.1",
-    "react-native-share": "^8.2.2",
+    "react-native-share": "^7.0.1",
     "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": "^9.8.4",
     "react-native-touch-id": "^4.4.1",
-    "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.0.9",
     "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",
     "react-syntax-highlighter": "^15.5.0",
     "rn-emoji-keyboard": "0.7.0",
@@ -96,9 +93,8 @@
     "jest-image-snapshot": "^5.1.0",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
-    "prettier": "^2.8.8",
     "process": "0.11.10",
-    "react-test-renderer": "18.0.0",
+    "react-test-renderer": "17.0.2",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "2.11.16"
   },

react-native.config.js

@@ -1,31 +1,31 @@
 module.exports = {
-  dependencies: {
-    'react-native-config': {
-      platforms: {
-        ios: null,
-      },
+    dependencies: {
+        'react-native-config': {
+            platforms: {
+                ios: null,
+            },
+        },
+        'react-native-dialogs': {
+            platforms: {
+                android: null,
+                ios: null,
+            },
+        },
+        'react-native-image-resizer': {
+            platforms: {
+                ios: null,
+            },
+        },
+        'react-native-status-keycard': {
+            platforms: {
+                android: null,
+                ios: null,
+            },
+        },
+        '@react-native-community/blur': {
+            platforms: {
+                android: null,
+            },
+        },
     },
-    'react-native-dialogs': {
-      platforms: {
-        android: null,
-        ios: null,
-      },
-    },
-    'react-native-image-resizer': {
-      platforms: {
-        ios: null,
-      },
-    },
-    'react-native-status-keycard': {
-      platforms: {
-        android: null,
-        ios: null,
-      },
-    },
-    '@react-native-community/blur': {
-      platforms: {
-        android: null,
-      },
-    },
-  },
 };

resources/js/provider.js

@@ -1,372 +1,376 @@
 (function () {
-  if (typeof EthereumProvider === 'undefined') {
-    var callbackId = 0;
-    var callbacks = {};
+    if (typeof EthereumProvider === "undefined") {
+        var callbackId = 0;
+        var callbacks = {};
 
-    var bridgeSend = function (data) {
-      ReactNativeWebView.postMessage(JSON.stringify(data));
-    };
-
-    var history = window.history;
-    var pushState = history.pushState;
-    history.pushState = function (state) {
-      setTimeout(function () {
-        bridgeSend({
-          type: 'history-state-changed',
-          navState: { url: location.href, title: document.title },
-        });
-      }, 100);
-      return pushState.apply(history, arguments);
-    };
-
-    function sendAPIrequest(permission, params) {
-      var messageId = callbackId++;
-      var params = params || {};
-
-      bridgeSend({
-        type: 'api-request',
-        permission: permission,
-        messageId: messageId,
-        params: params,
-      });
-
-      return new Promise(function (resolve, reject) {
-        params['resolve'] = resolve;
-        params['reject'] = reject;
-        callbacks[messageId] = params;
-      });
-    }
-
-    function qrCodeResponse(data, callback) {
-      var result = data.data;
-      var regex = new RegExp(callback.regex);
-      if (!result) {
-        if (callback.reject) {
-          callback.reject(new Error('Cancelled'));
+        var bridgeSend = function (data) {
+            ReactNativeWebView.postMessage(JSON.stringify(data));
         }
-      } else if (regex.test(result)) {
-        if (callback.resolve) {
-          callback.resolve(result);
-        }
-      } else {
-        if (callback.reject) {
-          callback.reject(new Error("Doesn't match"));
-        }
-      }
-    }
 
-    function Unauthorized() {
-      this.name = 'Unauthorized';
-      this.id = 4100;
-      this.code = 4100;
-      this.message = 'The requested method and/or account has not been authorized by the user.';
-    }
-
-    Unauthorized.prototype = Object.create(Error.prototype);
-
-    function UserRejectedRequest() {
-      this.name = 'UserRejectedRequest';
-      this.id = 4001;
-      this.code = 4001;
-      this.message = 'The user rejected the request.';
-    }
-
-    UserRejectedRequest.prototype = Object.create(Error.prototype);
-    ReactNativeWebView.onMessage = function (message) {
-      data = JSON.parse(message);
-      var id = data.messageId;
-      var callback = callbacks[id];
-
-      if (callback) {
-        if (data.type === 'api-response') {
-          if (data.permission == 'qr-code') {
-            qrCodeResponse(data, callback);
-          } else if (data.isAllowed) {
-            if (data.permission == 'web3') {
-              var selectedAddress = data.data[0];
-              window.statusAppcurrentAccountAddress = selectedAddress;
-              // Set deprecated metamask fields
-              window.ethereum.selectedAddress = selectedAddress;
-              window.ethereum.emit('accountsChanged', data.data);
-            }
-            callback.resolve(data.data);
-          } else {
-            callback.reject(new UserRejectedRequest());
-          }
-        } else if (data.type === 'web3-send-async-callback') {
-          if (callback.beta) {
-            if (data.error) {
-              if (data.error.code == 4100) callback.reject(new Unauthorized());
-              else callback.reject(data.error);
-            } else {
-              if (window.statusAppDebug) {
-                console.log('resolve ' + callback.method + ' :' + JSON.stringify(data.result.result));
-              }
-              callback.resolve(data.result.result);
-            }
-          } else if (callback.results) {
-            callback.results.push(data.error || data.result);
-            if (callback.results.length == callback.num) callback.callback(undefined, callback.results);
-          } else {
-            callback.callback(data.error, data.result);
-          }
-        }
-      }
-    };
-
-    function web3SuccessResponse(payload, result) {
-      return {
-        id: payload.id,
-        jsonrpc: '2.0',
-        method: payload.method,
-        result: result,
-      };
-    }
-
-    function web3ErrorResponse(payload, error) {
-      return {
-        id: payload.id,
-        jsonrpc: '2.0',
-        method: payload.method,
-        error: error,
-      };
-    }
-
-    function getSyncResponse(payload) {
-      if (payload.method == 'eth_accounts' && typeof window.statusAppcurrentAccountAddress !== 'undefined') {
-        return web3SuccessResponse(payload, [window.statusAppcurrentAccountAddress]);
-      } else if (payload.method == 'eth_coinbase' && typeof window.statusAppcurrentAccountAddress !== 'undefined') {
-        return web3SuccessResponse(payload, window.statusAppcurrentAccountAddress);
-      } else if (payload.method == 'net_version') {
-        return web3SuccessResponse(payload, window.statusAppNetworkId);
-      } else if (payload.method == 'eth_chainId') {
-        return web3SuccessResponse(payload, '0x' + Number(window.statusAppNetworkId).toString(16));
-      } else if (payload.method == 'eth_uninstallFilter') {
-        return web3SuccessResponse(payload, true);
-      } else {
-        return null;
-      }
-    }
-
-    var StatusAPI = function () {};
-
-    StatusAPI.prototype.getContactCode = function () {
-      return sendAPIrequest('contact-code');
-    };
-
-    var EthereumProvider = function () {};
-
-    EthereumProvider.prototype.isStatus = true;
-    EthereumProvider.prototype.status = new StatusAPI();
-    EthereumProvider.prototype.isConnected = function () {
-      return true;
-    };
-    // Set legacy metamask fields https://docs.metamask.io/guide/ethereum-provider.html#legacy-api
-    EthereumProvider.prototype.networkVersion = window.statusAppNetworkId;
-    EthereumProvider.prototype.chainId = '0x' + Number(window.statusAppNetworkId).toString(16);
-
-    EthereumProvider.prototype._events = {};
-
-    EthereumProvider.prototype.on = function (name, listener) {
-      if (!this._events[name]) {
-        this._events[name] = [];
-      }
-      this._events[name].push(listener);
-    };
-
-    EthereumProvider.prototype.removeListener = function (name, listenerToRemove) {
-      if (!this._events[name]) {
-        return;
-      }
-
-      const filterListeners = (listener) => listener !== listenerToRemove;
-      this._events[name] = this._events[name].filter(filterListeners);
-    };
-
-    EthereumProvider.prototype.removeAllListeners = function () {
-      this._events = {};
-    };
-
-    EthereumProvider.prototype.emit = function (name, data) {
-      if (!this._events[name]) {
-        return;
-      }
-      this._events[name].forEach((cb) => {
-        // Fixes: https://github.com/status-im/status-mobile/issues/13642
-        // Metamask also errors on the same issue, but it's using https://github.com/MetaMask/safe-event-emitter and therefore the dapp still works
-        try {
-          cb(data);
-        } catch (e) {
-          setTimeout(() => {
-            throw e;
-          });
-        }
-      });
-    };
-    EthereumProvider.prototype.enable = function () {
-      if (window.statusAppDebug) {
-        console.log('enable');
-      }
-      return sendAPIrequest('web3');
-    };
-
-    EthereumProvider.prototype.scanQRCode = function (regex) {
-      return sendAPIrequest('qr-code', { regex: regex });
-    };
-
-    EthereumProvider.prototype.request = function (requestArguments) {
-      if (window.statusAppDebug) {
-        console.log('request: ' + JSON.stringify(requestArguments));
-      }
-      if (!requestArguments) {
-        return Promise.reject(new Error('Request is not valid.'));
-      }
-      var method = requestArguments.method;
-      if (!method) {
-        return Promise.reject(new Error('Request is not valid.'));
-      }
-
-      if (method === 'eth_requestAccounts') {
-        return sendAPIrequest('web3');
-      }
-
-      var syncResponse = getSyncResponse({ method: method });
-      if (syncResponse) {
-        return new Promise(function (resolve, reject) {
-          if (window.statusAppDebug) {
-            console.log('resolved sync method: ' + method + ', result: ' + JSON.stringify(syncResponse.result));
-          }
-          resolve(syncResponse.result);
-        });
-      }
-
-      var messageId = callbackId++;
-      var payload = {
-        id: messageId,
-        jsonrpc: '2.0',
-        method: method,
-        params: requestArguments.params,
-      };
-
-      bridgeSend({
-        type: 'web3-send-async-read-only',
-        messageId: messageId,
-        payload: payload,
-      });
-
-      return new Promise(function (resolve, reject) {
-        callbacks[messageId] = {
-          beta: true,
-          method: method,
-          resolve: resolve,
-          reject: reject,
+        var history = window.history;
+        var pushState = history.pushState;
+        history.pushState = function (state) {
+            setTimeout(function () {
+                bridgeSend({
+                    type: 'history-state-changed',
+                    navState: {url: location.href, title: document.title}
+                });
+            }, 100);
+            return pushState.apply(history, arguments);
         };
-      });
-    };
 
-    // (DEPRECATED) Support for legacy send method
-    EthereumProvider.prototype.send = function (param1, param2) {
-      // reference: https://docs.metamask.io/guide/ethereum-provider.html#legacy-methods
-      if (typeof param1 == 'object') {
-        //maybe ways of:
-        //1.ethereum.send(payload: JsonRpcRequest, callback: JsonRpcCallback): void;
-        //2.ethereum.send(payload: JsonRpcRequest): unknown;
-        if (window.statusAppDebug) {
-          console.log('send (legacy), payload: ' + JSON.stringify(param1) + ', callback: ' + param2);
-        }
+        function sendAPIrequest(permission, params) {
+            var messageId = callbackId++;
+            var params = params || {};
 
-        var syncResponse = getSyncResponse(param1);
-        if (syncResponse) {
-          if (param2) {
-            param2(null, syncResponse);
-            return;
-          } else return syncResponse;
-        }
-
-        this.request(param1).then(
-          (result) => {
-            if (param2) {
-              param2(null, web3SuccessResponse(param1, result));
-            }
-          },
-          (reason) => {
-            if (window.statusAppDebug) {
-              console.log('send (legacy) failed. payload: ' + JSON.stringify(param1) + ', reason: ' + reason);
-            }
-            if (param2) {
-              param2(reason, web3ErrorResponse(param1, reason));
-            }
-          },
-        );
-      } else if (typeof param1 == 'string') {
-        var method = param1;
-        var params = param2;
-        if (window.statusAppDebug) {
-          console.log('send (legacy), method: ' + method + ', params: ' + JSON.stringify(params));
-        }
-        return this.request({ method: method, params: params });
-      } else {
-        throw new Error('unsupported call to send, param1: ' + param1 + ', param2: ' + param2);
-      }
-    };
-
-    // (DEPRECATED) Support for legacy sendSync method
-    EthereumProvider.prototype.sendSync = function (payload) {
-      if (window.statusAppDebug) {
-        console.log('sendSync (legacy)' + JSON.stringify(payload));
-      }
-      if (payload.method == 'eth_uninstallFilter') {
-        this.sendAsync(payload, function (res, err) {});
-      }
-      var syncResponse = getSyncResponse(payload);
-      if (syncResponse) {
-        return syncResponse;
-      } else {
-        return web3SuccessResponse(payload, null);
-      }
-    };
-
-    // (DEPRECATED) Support for legacy sendAsync method
-    EthereumProvider.prototype.sendAsync = function (payload, callback) {
-      if (window.statusAppDebug) {
-        console.log('sendAsync (legacy)' + JSON.stringify(payload));
-      }
-      if (!payload) {
-        return new Error('Request is not valid.');
-      }
-      if (payload.method == 'eth_requestAccounts') {
-        return sendAPIrequest('web3');
-      }
-      var syncResponse = getSyncResponse(payload);
-      if (syncResponse && callback) {
-        callback(null, syncResponse);
-      } else {
-        var messageId = callbackId++;
-
-        if (Array.isArray(payload)) {
-          callbacks[messageId] = {
-            num: payload.length,
-            results: [],
-            callback: callback,
-          };
-          for (var i in payload) {
             bridgeSend({
-              type: 'web3-send-async-read-only',
-              messageId: messageId,
-              payload: payload[i],
+                type: 'api-request',
+                permission: permission,
+                messageId: messageId,
+                params: params
             });
-          }
-        } else {
-          callbacks[messageId] = { callback: callback };
-          bridgeSend({
-            type: 'web3-send-async-read-only',
-            messageId: messageId,
-            payload: payload,
-          });
-        }
-      }
-    };
-  }
 
-  window.ethereum = new EthereumProvider();
+            return new Promise(function (resolve, reject) {
+                params['resolve'] = resolve;
+                params['reject'] = reject;
+                callbacks[messageId] = params;
+            });
+        }
+
+        function qrCodeResponse(data, callback) {
+            var result = data.data;
+            var regex = new RegExp(callback.regex);
+            if (!result) {
+                if (callback.reject) {
+                    callback.reject(new Error("Cancelled"));
+                }
+            } else if (regex.test(result)) {
+                if (callback.resolve) {
+                    callback.resolve(result);
+                }
+            } else {
+                if (callback.reject) {
+                    callback.reject(new Error("Doesn't match"));
+                }
+            }
+        }
+
+        function Unauthorized() {
+            this.name = "Unauthorized";
+            this.id = 4100;
+            this.code = 4100;
+            this.message = "The requested method and/or account has not been authorized by the user.";
+        }
+
+        Unauthorized.prototype = Object.create(Error.prototype);
+
+        function UserRejectedRequest() {
+            this.name = "UserRejectedRequest";
+            this.id = 4001;
+            this.code = 4001;
+            this.message = "The user rejected the request.";
+        }
+
+        UserRejectedRequest.prototype = Object.create(Error.prototype);
+        ReactNativeWebView.onMessage = function (message) {
+            data = JSON.parse(message);
+            var id = data.messageId;
+            var callback = callbacks[id];
+
+            if (callback) {
+                if (data.type === "api-response") {
+                    if (data.permission == 'qr-code') {
+                        qrCodeResponse(data, callback);
+                    } else if (data.isAllowed) {
+                        if (data.permission == 'web3') {
+                            var selectedAddress = data.data[0]
+                            window.statusAppcurrentAccountAddress = selectedAddress;
+                            // Set deprecated metamask fields
+                            window.ethereum.selectedAddress = selectedAddress;
+                            window.ethereum.emit("accountsChanged", data.data);
+                        }
+                        callback.resolve(data.data);
+                    } else {
+                        callback.reject(new UserRejectedRequest());
+                    }
+                } else if (data.type === "web3-send-async-callback") {
+                    if (callback.beta) {
+                        if (data.error) {
+                            if (data.error.code == 4100)
+                                callback.reject(new Unauthorized());
+                            else
+                                callback.reject(data.error);
+                        } else {
+                            if (window.statusAppDebug) {
+                                console.log("resolve " + callback.method + " :" + JSON.stringify(data.result.result));
+                            }
+                            callback.resolve(data.result.result);
+                        }
+                    } else if (callback.results) {
+                        callback.results.push(data.error || data.result);
+                        if (callback.results.length == callback.num)
+                            callback.callback(undefined, callback.results);
+                    } else {
+                        callback.callback(data.error, data.result);
+                    }
+                }
+            }
+        };
+
+        function web3SuccessResponse(payload, result) {
+            return {
+                id: payload.id,
+                jsonrpc: "2.0",
+                method: payload.method,
+                result: result
+            };
+        }
+
+        function web3ErrorResponse(payload, error) {
+            return {
+                id: payload.id,
+                jsonrpc: "2.0",
+                method: payload.method,
+                error: error
+            };
+        }
+
+        function getSyncResponse(payload) {
+            if (payload.method == "eth_accounts" && (typeof window.statusAppcurrentAccountAddress !== "undefined")) {
+                return web3SuccessResponse(payload, [window.statusAppcurrentAccountAddress])
+            } else if (payload.method == "eth_coinbase" && (typeof window.statusAppcurrentAccountAddress !== "undefined")) {
+                return web3SuccessResponse(payload, window.statusAppcurrentAccountAddress)
+            } else if (payload.method == "net_version") {
+                return web3SuccessResponse(payload, window.statusAppNetworkId)
+            } else if (payload.method == "eth_chainId") {
+                return web3SuccessResponse(payload, "0x" + Number(window.statusAppNetworkId).toString(16))
+            } else if (payload.method == "eth_uninstallFilter") {
+                return web3SuccessResponse(payload, true);
+            } else {
+                return null;
+            }
+        }
+
+        var StatusAPI = function () {
+        };
+
+        StatusAPI.prototype.getContactCode = function () {
+            return sendAPIrequest('contact-code');
+        };
+
+        var EthereumProvider = function () {
+        };
+
+        EthereumProvider.prototype.isStatus = true;
+        EthereumProvider.prototype.status = new StatusAPI();
+        EthereumProvider.prototype.isConnected = function () {
+            return true;
+        };
+        // Set legacy metamask fields https://docs.metamask.io/guide/ethereum-provider.html#legacy-api
+        EthereumProvider.prototype.networkVersion = window.statusAppNetworkId;
+        EthereumProvider.prototype.chainId = "0x" + Number(window.statusAppNetworkId).toString(16);
+
+        EthereumProvider.prototype._events = {};
+
+        EthereumProvider.prototype.on = function (name, listener) {
+            if (!this._events[name]) {
+                this._events[name] = [];
+            }
+            this._events[name].push(listener);
+        }
+
+        EthereumProvider.prototype.removeListener = function (name, listenerToRemove) {
+            if (!this._events[name]) {
+                return
+            }
+
+            const filterListeners = (listener) => listener !== listenerToRemove;
+            this._events[name] = this._events[name].filter(filterListeners);
+        }
+
+        EthereumProvider.prototype.removeAllListeners = function () {
+            this._events = {};
+        }
+
+        EthereumProvider.prototype.emit = function (name, data) {
+            if (!this._events[name]) {
+                return
+            }
+            this._events[name].forEach(cb => {
+                // Fixes: https://github.com/status-im/status-mobile/issues/13642
+                // Metamask also errors on the same issue, but it's using https://github.com/MetaMask/safe-event-emitter and therefore the dapp still works
+                try {
+                    cb(data)
+                } catch (e) {
+                    setTimeout((() => {
+                        throw e
+                    }))
+                }
+            });
+        }
+        EthereumProvider.prototype.enable = function () {
+            if (window.statusAppDebug) {
+                console.log("enable");
+            }
+            return sendAPIrequest('web3');
+        };
+
+        EthereumProvider.prototype.scanQRCode = function (regex) {
+            return sendAPIrequest('qr-code', {regex: regex});
+        };
+
+        EthereumProvider.prototype.request = function (requestArguments) {
+            if (window.statusAppDebug) {
+                console.log("request: " + JSON.stringify(requestArguments));
+            }
+            if (!requestArguments) {
+                return Promise.reject(new Error('Request is not valid.'));
+            }
+            var method = requestArguments.method;
+            if (!method) {
+                return Promise.reject(new Error('Request is not valid.'));
+            }
+
+            if (method === 'eth_requestAccounts') {
+                return sendAPIrequest('web3');
+            }
+
+            var syncResponse = getSyncResponse({method: method});
+            if (syncResponse) {
+                return new Promise(function (resolve, reject) {
+                    if (window.statusAppDebug) {
+                        console.log("resolved sync method: " + method + ", result: " + JSON.stringify(syncResponse.result));
+                    }
+                    resolve(syncResponse.result);
+                });
+            }
+
+            var messageId = callbackId++;
+            var payload = {
+                id: messageId,
+                jsonrpc: "2.0",
+                method: method,
+                params: requestArguments.params
+            };
+
+            bridgeSend({
+                type: 'web3-send-async-read-only',
+                messageId: messageId,
+                payload: payload
+            });
+
+            return new Promise(function (resolve, reject) {
+                callbacks[messageId] = {
+                    beta: true,
+                    method: method,
+                    resolve: resolve,
+                    reject: reject
+                };
+            });
+        };
+
+        // (DEPRECATED) Support for legacy send method
+        EthereumProvider.prototype.send = function (param1, param2) {
+            // reference: https://docs.metamask.io/guide/ethereum-provider.html#legacy-methods
+            if (typeof param1 == 'object') {
+                //maybe ways of:
+                //1.ethereum.send(payload: JsonRpcRequest, callback: JsonRpcCallback): void;
+                //2.ethereum.send(payload: JsonRpcRequest): unknown;
+                if (window.statusAppDebug) {
+                    console.log("send (legacy), payload: " + JSON.stringify(param1) + ", callback: " + param2);
+                }
+
+                var syncResponse = getSyncResponse(param1);
+                if(syncResponse){
+                    if(param2){
+                        param2(null, syncResponse);
+                        return;
+                    }else
+                        return syncResponse;
+                }
+
+                this.request(param1).then(result => {
+                    if (param2) {
+                        param2(null, web3SuccessResponse(param1, result));
+                    }
+                }, reason => {
+                    if (window.statusAppDebug) {
+                        console.log("send (legacy) failed. payload: " + JSON.stringify(param1) + ", reason: " + reason)
+                    }
+                    if (param2) {
+                        param2(reason, web3ErrorResponse(param1, reason))
+                    }
+                });
+            } else if (typeof param1 == 'string') {
+                var method = param1;
+                var params = param2;
+                if (window.statusAppDebug) {
+                    console.log("send (legacy), method: " + method + ", params: " + JSON.stringify(params));
+                }
+                return this.request({method: method, params: params});
+            } else {
+                throw new Error("unsupported call to send, param1: " + param1 + ", param2: " + param2)
+            }
+        }
+
+        // (DEPRECATED) Support for legacy sendSync method
+        EthereumProvider.prototype.sendSync = function (payload) {
+            if (window.statusAppDebug) {
+                console.log("sendSync (legacy)" + JSON.stringify(payload));
+            }
+            if (payload.method == "eth_uninstallFilter") {
+                this.sendAsync(payload, function (res, err) {
+                })
+            }
+            var syncResponse = getSyncResponse(payload);
+            if (syncResponse) {
+                return syncResponse;
+            } else {
+                return web3SuccessResponse(payload, null);
+            }
+        };
+
+        // (DEPRECATED) Support for legacy sendAsync method
+        EthereumProvider.prototype.sendAsync = function (payload, callback) {
+            if (window.statusAppDebug) {
+                console.log("sendAsync (legacy)" + JSON.stringify(payload));
+            }
+            if (!payload) {
+                return new Error('Request is not valid.');
+            }
+            if (payload.method == 'eth_requestAccounts') {
+                return sendAPIrequest('web3');
+            }
+            var syncResponse = getSyncResponse(payload);
+            if (syncResponse && callback) {
+                callback(null, syncResponse);
+            } else {
+                var messageId = callbackId++;
+
+                if (Array.isArray(payload)) {
+                    callbacks[messageId] = {
+                        num: payload.length,
+                        results: [],
+                        callback: callback
+                    };
+                    for (var i in payload) {
+                        bridgeSend({
+                            type: 'web3-send-async-read-only',
+                            messageId: messageId,
+                            payload: payload[i]
+                        });
+                    }
+                } else {
+                    callbacks[messageId] = {callback: callback};
+                    bridgeSend({
+                        type: 'web3-send-async-read-only',
+                        messageId: messageId,
+                        payload: payload
+                    });
+                }
+            }
+        };
+    }
+
+    window.ethereum = new EthereumProvider();
 })();

scripts/update-status-go.sh

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-source "${GIT_ROOT}/scripts/colors.sh"
 source "${GIT_ROOT}/nix/scripts/source.sh"
 
+if [[ ! -x "$(command -v nix-prefetch-url)" ]]; then
+    echo "No 'nix-prefetch-url' utility found!" >&2
+    exit 1
+fi
+
 set -ef
 
 # urlencode <string>
@@ -21,29 +25,13 @@ urlencode() {
     LC_COLLATE=$old_lc_collate
 }
 
-identify_git_sha() {
-    # Do not fail on grep for refs
-    set +o pipefail
+VERSION_FILE="${GIT_ROOT}/status-go-version.json"
+SCRIPT_FILE="$(basename "$0")"
 
-    # ls-remote finds only tags, branches, and pull requests, but can't find commits
-    STATUS_GO_MATCHING_REFS=$(git ls-remote ${REPO_URL} ${1})
-
-    # It's possible that there's both a branch and a tag matching the given version
-    STATUS_GO_TAG_SHA1=$(echo "${STATUS_GO_MATCHING_REFS}" | grep 'refs/tags' | cut -f1)
-    STATUS_GO_BRANCH_SHA1=$(echo "${STATUS_GO_MATCHING_REFS}" | grep 'refs/heads' | cut -f1)
-
-    # Prefer tag over branch if both are found
-    if [[ -n "${STATUS_GO_TAG_SHA1}" ]]; then
-        echo -n "${STATUS_GO_TAG_SHA1}"
-    elif [[ -n "${STATUS_GO_BRANCH_SHA1}" ]]; then
-        echo -n "${STATUS_GO_BRANCH_SHA1}"
-    elif [[ "${#STATUS_GO_VERSION}" -gt 4 ]]; then
-        echo -n "${1}"
-    else
-        echo -e "${RED}${BLD}ERROR:${RST} Input not a tag or branch, but too short to be a SHA1!" >&2
-        exit 1
-    fi
-}
+STATUS_GO_REPO="${STATUS_GO_REPO:=status-go}"
+STATUS_GO_OWNER="${STATUS_GO_OWNER:=status-im}"
+REPO_URL="https://github.com/${STATUS_GO_OWNER}/${STATUS_GO_REPO}"
+STATUS_GO_VERSION=$1
 
 HELP_MESSAGE=$(cat <<-END
 This is a tool for upgrading status-go to a given version in:
@@ -70,11 +58,6 @@ Examples:
 END
 )
 
-if [[ ! -x "$(command -v nix-prefetch-url)" ]]; then
-    echo "No 'nix-prefetch-url' utility found!" >&2
-    exit 1
-fi
-
 if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
     echo "${HELP_MESSAGE}"
     exit 1
@@ -87,23 +70,31 @@ if [ $# -eq 0 ]; then
     exit 1
 fi
 
-VERSION_FILE="${GIT_ROOT}/status-go-version.json"
-SCRIPT_FILE="$(basename "$0")"
-
-STATUS_GO_REPO="${STATUS_GO_REPO:=status-go}"
-STATUS_GO_OWNER="${STATUS_GO_OWNER:=status-im}"
-REPO_URL="https://github.com/${STATUS_GO_OWNER}/${STATUS_GO_REPO}"
-STATUS_GO_VERSION=$1
-
 # If prefixed with # we assume argument is a PR number
 if [[ "${STATUS_GO_VERSION}" = PR-* ]]; then
     STATUS_GO_VERSION="refs/pull/${STATUS_GO_VERSION#"PR-"}/head"
 fi
 
-STATUS_GO_COMMIT_SHA1="$(identify_git_sha "${STATUS_GO_VERSION}")"
-STATUS_GO_COMMIT_URL="https://github.com/${STATUS_GO_OWNER}/${STATUS_GO_REPO}/commit/${STATUS_GO_COMMIT_SHA1}"
-STATUS_GO_ZIP_URL="${REPO_URL}/archive/$(urlencode ${STATUS_GO_VERSION}).zip"
-STATUS_GO_SHA256=$(nix-prefetch-url --unpack ${STATUS_GO_ZIP_URL} --name status-go-archive.zip)
+# ls-remote finds only tags, branches, and pull requests, but can't find commits
+STATUS_GO_MATCHING_REFS=$(git ls-remote ${REPO_URL} ${STATUS_GO_VERSION})
+
+# It's possible that there's both a branch and a tag matching the given version
+STATUS_GO_TAG_SHA1=$(echo "${STATUS_GO_MATCHING_REFS}" | grep 'refs/tags' | cut -f1)
+STATUS_GO_BRANCH_SHA1=$(echo "${STATUS_GO_MATCHING_REFS}" | grep 'refs/heads' | cut -f1)
+
+# Prefer tag over branch if both are found
+if [[ -n "${STATUS_GO_TAG_SHA1}" ]]; then
+    STATUS_GO_COMMIT_SHA1="${STATUS_GO_TAG_SHA1}"
+elif [[ -n "${STATUS_GO_BRANCH_SHA1}" ]]; then
+    STATUS_GO_COMMIT_SHA1="${STATUS_GO_BRANCH_SHA1}"
+elif [[ "${#STATUS_GO_VERSION}" -gt 4 ]]; then
+    STATUS_GO_COMMIT_SHA1="${STATUS_GO_VERSION}"
+else
+    echo "ERROR: Input not a tag or branch, but too short to be a SHA1!" >&2
+    exit 1
+fi
+
+STATUS_GO_SHA256=$(nix-prefetch-url --unpack ${REPO_URL}/archive/$(urlencode ${STATUS_GO_VERSION}).zip --name status-go-archive.zip)
 
 cat << EOF > ${VERSION_FILE}
 {
@@ -117,6 +108,6 @@ cat << EOF > ${VERSION_FILE}
 }
 EOF
 
-echo -e "${GRN}URL${RST}:     ${BLD}${STATUS_GO_COMMIT_URL}${RST}"
-echo -e "${GRN}SHA-1${RST}:   ${BLD}${STATUS_GO_COMMIT_SHA1}${RST}"
-echo -e "${GRN}SHA-256${RST}: ${BLD}${STATUS_GO_SHA256}${RST}"
+echo "SHA-1 for ${STATUS_GO_VERSION} is ${STATUS_GO_COMMIT_SHA1}.
+SHA-256 for source archive is ${STATUS_GO_SHA256}
+Owner is ${STATUS_GO_OWNER}"

shadow-cljs.edn

@@ -44,16 +44,15 @@
    ;; the target files (a.k.a hot reload). When false, you can manually
    ;; reload by calling `shadow.cljs.devtools.api/watch-compile-all!`.
    :devtools {:autobuild #shadow/env ["SHADOW_AUTOBUILD_ENABLED" :default true :as :bool]}
-   :dev {:devtools {:before-load-async status-im2.setup.hot-reload/before-reload
-                    :after-load-async  status-im2.setup.hot-reload/reload
-                    :build-notify      status-im2.setup.hot-reload/build-notify
-                    :preloads          [re-frisk-remote.preload
-                                        ;; In order to use component test helpers in
-                                        ;; the REPL we need to preload namespaces
-                                        ;; that are not normally required by
-                                        ;; production code, such as
-                                        ;; @testing-library/react-native.
-                                        test-helpers.component]}
+   :dev {:devtools {:after-load   status-im2.setup.hot-reload/reload
+                    :build-notify status-im2.setup.hot-reload/build-notify
+                    :preloads     [re-frisk-remote.preload
+                                   ;; In order to use component test helpers in
+                                   ;; the REPL we need to preload namespaces
+                                   ;; that are not normally required by
+                                   ;; production code, such as
+                                   ;; @testing-library/react-native.
+                                   test-helpers.component]}
          :closure-defines
          {status-im2.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
           status-im2.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"

src/js/worklets/bottom_sheet.js

@@ -1,15 +1,15 @@
-import { useDerivedValue, runOnJS as reaRunOnJS, runOnJS } from 'react-native-reanimated';
+import {useDerivedValue, runOnJS as reaRunOnJS, runOnJS} from "react-native-reanimated";
 
 export function useTranslateY(initialTranslationY, bottomSheetDy, panY) {
   return useDerivedValue(() => {
-    return initialTranslationY - (bottomSheetDy.value - panY.value);
-  });
+    return initialTranslationY - (bottomSheetDy.value - panY.value)
+  })
 }
 
 export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight, opacity) {
   return useDerivedValue(() => {
-    const calculatedOpacity = ((translateY.value - windowHeight) / -backgroundHeight) * opacity;
+    const calculatedOpacity = ((translateY.value - windowHeight) / -backgroundHeight) * opacity
 
-    return Math.max(Math.min(calculatedOpacity, opacity), 0);
-  });
+    return Math.max(Math.min(calculatedOpacity, opacity), 0)
+  })
 }

src/js/worklets/core.js

@@ -7,64 +7,70 @@ import { useDerivedValue, interpolate } from 'react-native-reanimated';
 // 2. remove keys with nil value, else useAnimatedStyle will throw an error
 //    https://github.com/status-im/status-mobile/issues/14756
 export function applyAnimationsToStyle(animations, style) {
-  return function () {
-    'worklet';
+  return function() {
+    'worklet'
 
-    var animatedStyle = {};
+    var animatedStyle = {}
 
     // Normal Style
     for (var key in style) {
-      if (key == 'transform') {
-        var transforms = style[key];
-        var filteredTransforms = [];
+      if (key == "transform") {
+	var transforms = style[key];
+	var filteredTransforms = []
 
-        for (var transform of transforms) {
-          var transformKey = Object.keys(transform)[0];
-          var transformValue = transform[transformKey];
-          if (transformValue !== null) {
-            filteredTransforms.push({ [transformKey.replace(/-./g, (x) => x[1].toUpperCase())]: transformValue });
-          }
-        }
+	for (var transform of transforms) {
+	  var transformKey = Object.keys(transform)[0];
+	  var transformValue = transform[transformKey];
+	  if(transformValue !== null) {
+	    filteredTransforms.push(
+	      {[transformKey.replace(/-./g, x=>x[1].toUpperCase())]: transformValue}
+	    );
+	  }
+	}
 
-        animatedStyle[key] = filteredTransforms;
+	animatedStyle[key] = filteredTransforms;
       } else {
-        var value = style[key];
-        if (value !== null) {
-          animatedStyle[key.replace(/-./g, (x) => x[1].toUpperCase())] = value;
-        }
+	var value = style[key];
+	if (value !== null) {
+	  animatedStyle[key.replace(/-./g, x=>x[1].toUpperCase())] = value;
+	}
       }
     }
 
     // Animations
     for (var key in animations) {
-      if (key == 'transform') {
+      if (key == "transform") {
         var transforms = animations[key];
-        var animatedTransforms = [];
+        var animatedTransforms = []
 
         for (var transform of transforms) {
           var transformKey = Object.keys(transform)[0];
-          var transformValue = transform[transformKey].value;
-          if (transformValue !== null) {
-            animatedTransforms.push({ [transformKey.replace(/-./g, (x) => x[1].toUpperCase())]: transformValue });
-          }
+	  var transformValue = transform[transformKey].value;
+	  if (transformValue !== null) {
+            animatedTransforms.push(
+	      {[transformKey.replace(/-./g, x=>x[1].toUpperCase())]: transformValue}
+	    );
+	  }
         }
 
         animatedStyle[key] = animatedTransforms;
       } else {
-        var animatedValue = animations[key].value;
-        if (animatedValue !== null) {
-          animatedStyle[key.replace(/-./g, (x) => x[1].toUpperCase())] = animatedValue;
-        }
+	var animatedValue = animations[key].value;
+	if (animatedValue !== null) {
+          animatedStyle[key.replace(/-./g, x=>x[1].toUpperCase())] = animatedValue;
+	}
       }
     }
 
     return animatedStyle;
   };
-}
+};
 
 export function interpolateValue(sharedValue, inputRange, outputRange, extrapolation) {
-  return useDerivedValue(function () {
-    'worklet';
-    return interpolate(sharedValue.value, inputRange, outputRange, extrapolation);
-  });
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return interpolate(sharedValue.value, inputRange, outputRange, extrapolation);
+    }
+  );
 }

src/js/worklets/lightbox.js

@@ -1,8 +1,10 @@
 import { useDerivedValue } from 'react-native-reanimated';
 
 export function infoLayout(input, isTop) {
-  return useDerivedValue(function () {
-    'worklet';
-    return isTop ? input.value : -input.value;
-  });
+    return useDerivedValue(
+        function () {
+            'worklet'
+            return isTop ? input.value : -input.value
+        }
+    );
 }

src/js/worklets/onboarding_carousel.js

@@ -5,39 +5,43 @@ const slideAnimationDuration = 300;
 const easeOut = {
   duration: slideAnimationDuration,
   easing: Easing.bezier(0, 0, 0.58, 1),
-};
+}
 
 // Derived Values
 export function dynamicProgressBarWidth(staticProgressBarWidth, progress) {
-  return useDerivedValue(function () {
-    'worklet';
-    return (staticProgressBarWidth * (progress.value || 0)) / 100;
-  });
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return staticProgressBarWidth * (progress.value || 0) / 100;
+    }
+  );
 }
 
 export function carouselLeftPosition(windowWidth, progress) {
-  return useDerivedValue(function () {
-    'worklet';
-    const progressValue = progress.value;
-    switch (true) {
-      case progressValue < 25:
-        return 0;
-      case progressValue === 25:
-        return withTiming(-windowWidth, easeOut);
-      case progressValue < 50:
-        return -windowWidth;
-      case progressValue === 50:
-        return withTiming(-2 * windowWidth, easeOut);
-      case progressValue < 75:
-        return -2 * windowWidth;
-      case progressValue === 75:
-        return withTiming(-3 * windowWidth, easeOut);
-      case progressValue < 100:
-        return -3 * windowWidth;
-      case progressValue === 100:
-        return withTiming(-4 * windowWidth, easeOut);
+  return useDerivedValue(
+    function () {
+      'worklet'
+      const progressValue = progress.value;
+      switch (true) {
+      case (progressValue < 25):
+	return 0;
+      case (progressValue === 25):
+	return withTiming(-windowWidth, easeOut);
+      case (progressValue < 50):
+	return -windowWidth;
+      case (progressValue === 50):
+	return withTiming(-2 * windowWidth, easeOut);
+      case (progressValue < 75):
+	return -2 * windowWidth;
+      case (progressValue === 75):
+	return withTiming(-3 * windowWidth, easeOut);
+      case (progressValue < 100):
+	return -3 * windowWidth;
+      case (progressValue === 100):
+	return withTiming(-4 * windowWidth, easeOut);
       default:
-        return 0;
-    }
-  });
+	return 0;
+      }
+    });
 }
+

src/js/worklets/parallax.js

@@ -1,45 +0,0 @@
-import { useAnimatedStyle, useAnimatedSensor, withTiming, interpolate, SensorType } from 'react-native-reanimated';
-import { Platform } from 'react-native';
-
-const PI = Math.PI;
-
-/*
-sensorAnimatedImage uses the pitch and roll of a device to move the content on screen in the respective direction. 
-
-This approach mostly follows the example here:
-https://github.com/notJust-dev/iOSLockScreen/blob/main/src/components/SensorAnimatedImage.js
-
-which is explained in better detail in this video 
-https://www.youtube.com/watch?v=iEBoZDHCN5Y&t=2205s
-there is a bug with the pitch and roll calculations provided directly from the sensor data so the calculation had to
-be done using the quaternions directly.
-*/
-export function sensorAnimatedImage(zIndex, offset, stretch) {
-  'worklet';
-  const rotationSensor = useAnimatedSensor(SensorType.ROTATION, { interval: 30 });
-  return useAnimatedStyle(function () {
-    const { qx, qz, qw, qy, pitch } = rotationSensor.sensor.value;
-
-    const roll = Math.asin(-2.0 * (qx * qz - qw * qy));
-
-    const translateY = withTiming(
-      interpolate(pitch, Platform.OS === 'ios' ? [-PI, PI] : [PI, -PI], [
-        (-offset * 3) / zIndex - offset + (offset - stretch),
-        (offset * 3) / zIndex - offset + (offset - stretch),
-      ]),
-      { duration: 10 },
-    );
-    const translateX = withTiming(
-      interpolate(
-        roll,
-        [1, -1],
-        [(-offset * 2) / zIndex - offset + (offset - stretch), (offset * 2) / zIndex - offset + (offset - stretch)],
-      ),
-      { duration: 10 },
-    );
-
-    return {
-      transform: [{ translateX }, { translateY }],
-    };
-  });
-}

src/js/worklets/record_audio.js

@@ -3,14 +3,16 @@ import { useDerivedValue } from 'react-native-reanimated';
 const MAX_SCALE = 1.8;
 
 export function ringScale(scale, subtract) {
-  return useDerivedValue(function () {
-    'worklet';
-    const value = scale.value;
-    const maxDelta = MAX_SCALE - 1;
-    const maxDeltaDiff = 1 - maxDelta;
-    const maxVirtualScale = MAX_SCALE + maxDelta;
-    const decimals = value - Math.floor(value);
-    const normalizedValue = value >= maxVirtualScale ? decimals + (parseInt(value) - 1) * maxDeltaDiff + 1 : value;
-    return (normalizedValue - subtract > MAX_SCALE ? normalizedValue - maxDelta : normalizedValue) - subtract;
-  });
+  return useDerivedValue(
+    function () {
+      'worklet'
+      const value = scale.value;
+      const maxDelta = MAX_SCALE - 1;
+      const maxDeltaDiff = 1 - maxDelta;
+      const maxVirtualScale = MAX_SCALE + maxDelta;
+      const decimals = value - Math.floor(value);
+      const normalizedValue = value >= maxVirtualScale ? (decimals + ((parseInt(value) - 1) * maxDeltaDiff) + 1) : value;
+      return (((normalizedValue - subtract) > MAX_SCALE ? normalizedValue - maxDelta : normalizedValue) - subtract);
+    }
+  );
 }

src/js/worklets/scroll_view.js

@@ -1,7 +1,7 @@
-import { useAnimatedScrollHandler } from 'react-native-reanimated';
+import {useAnimatedScrollHandler} from "react-native-reanimated";
 
 export function useAnimatedScrollHandlerWorklet(scrollY) {
-  return useAnimatedScrollHandler((event) => {
-    scrollY.value = event.contentOffset.y;
-  });
+    return useAnimatedScrollHandler((event) => {
+        scrollY.value = event.contentOffset.y;
+    })
 }

src/js/worklets/shell.js

@@ -0,0 +1,186 @@
+import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
+
+// Shell Worklets
+
+// Home Stack States
+const CLOSE_WITH_ANIMATION = 0;
+const OPEN_WITH_ANIMATION = 1;
+const CLOSE_WITHOUT_ANIMATION = 3;
+const OPEN_WITHOUT_ANIMATION = 4;
+
+// Derived Values
+export function stackOpacity (stackId, selectedStackId) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return selectedStackId.value == stackId ? 1 : 0;
+    }
+  );
+}
+
+export function stackZIndex (stackId, selectedStackId) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return selectedStackId.value == stackId ? 10 : 9;
+    }
+  );
+}
+
+export function bottomTabIconColor (stackId, selectedStackId, homeStackState,
+				    passThrough, selectedTabColor, defaultColor,
+				    passThroughColor) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      var homeStackStateValue = homeStackState.value;
+      if (selectedStackId.value == stackId &&
+	  (homeStackStateValue == OPEN_WITH_ANIMATION ||
+	   homeStackStateValue == OPEN_WITHOUT_ANIMATION)){
+	return selectedTabColor;
+      }
+      else if (passThrough.value){
+	return passThroughColor;
+      }
+      else {
+	return defaultColor;
+      }
+    }
+  );
+}
+
+export function bottomTabsHeight(homeStackState, height, extendedHeight) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      switch (homeStackState.value) {
+      case OPEN_WITH_ANIMATION:
+	return withTiming(extendedHeight, defaultDurationAndEasing);
+	break;
+      case CLOSE_WITH_ANIMATION:
+	return withTiming(height, defaultDurationAndEasing);
+	break;
+      case OPEN_WITHOUT_ANIMATION:
+	return extendedHeight;
+	break;
+      case CLOSE_WITHOUT_ANIMATION:
+	return height;
+	break;
+      }
+    }
+  )
+}
+
+
+// Home Stack
+
+const shellAnimationTime = 200;
+
+const defaultDurationAndEasing = {
+  duration: shellAnimationTime,
+  easing: Easing.bezier(0, 0, 1, 1),
+}
+
+export function homeStackOpacity (homeStackState) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      switch (homeStackState.value) {
+      case OPEN_WITH_ANIMATION:
+	return withTiming(1, defaultDurationAndEasing);
+	break;
+      case CLOSE_WITH_ANIMATION:
+	return withTiming(0, defaultDurationAndEasing);
+	break;
+      case OPEN_WITHOUT_ANIMATION:
+	return 1;
+	break;
+      case CLOSE_WITHOUT_ANIMATION:
+	return 0;
+	break;	
+      }
+    }
+  );
+}
+
+export function homeStackTop (homeStackState, top) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      switch (homeStackState.value) {
+      case OPEN_WITH_ANIMATION:
+	return withTiming(0, defaultDurationAndEasing);
+	break;
+      case CLOSE_WITH_ANIMATION:
+	return withTiming(top, defaultDurationAndEasing);
+	break;
+      case OPEN_WITHOUT_ANIMATION:
+	return 0;
+	break;
+      case CLOSE_WITHOUT_ANIMATION:
+	return top;
+	break;	
+      }
+    }
+  );
+}
+
+export function homeStackLeft (selectedStackId, animateHomeStackLeft, homeStackState, left) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      if (animateHomeStackLeft.value) {
+	var leftValue = left[selectedStackId.value];
+	switch (homeStackState.value) {
+	case OPEN_WITH_ANIMATION:
+	  return withSequence(withTiming(leftValue, {duration: 0}), withTiming(0, defaultDurationAndEasing))
+	  break;
+	case CLOSE_WITH_ANIMATION:
+	  return withTiming(leftValue, defaultDurationAndEasing);
+	  break;
+	case OPEN_WITHOUT_ANIMATION:
+	  return 0;
+	  break;
+	case CLOSE_WITHOUT_ANIMATION:
+	  return leftValue;
+	  break;	
+	}
+      } else {
+	return 0;
+      }
+    }
+  );
+}
+
+export function homeStackPointer (homeStackState) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      var homeStackStateValue = homeStackState.value;
+      return (homeStackStateValue == OPEN_WITH_ANIMATION ||
+	      homeStackStateValue == OPEN_WITHOUT_ANIMATION) ? "auto" : "none";
+    }
+  );
+}
+
+export function homeStackScale (homeStackState, minimizeScale) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      switch (homeStackState.value) {
+      case OPEN_WITH_ANIMATION:
+	return withTiming(1, defaultDurationAndEasing);
+	break;
+      case CLOSE_WITH_ANIMATION:
+	return withTiming(minimizeScale, defaultDurationAndEasing);
+	break;
+      case OPEN_WITHOUT_ANIMATION:
+	return 1;
+	break;
+      case CLOSE_WITHOUT_ANIMATION:
+	return minimizeScale;
+	break;	
+      }
+    }
+  );
+}

src/js/worklets/shell/bottom_tabs.js

@@ -1,47 +0,0 @@
-import { useDerivedValue, withTiming } from 'react-native-reanimated';
-import * as constants from './constants';
-
-export function bottomTabIconColor(
-  stackId,
-  selectedStackId,
-  homeStackState,
-  passThrough,
-  selectedTabColor,
-  defaultColor,
-  passThroughColor,
-) {
-  return useDerivedValue(function () {
-    'worklet';
-    var homeStackStateValue = homeStackState.value;
-    if (
-      selectedStackId.value == stackId &&
-      (homeStackStateValue == constants.OPEN_WITH_ANIMATION || homeStackStateValue == constants.OPEN_WITHOUT_ANIMATION)
-    ) {
-      return selectedTabColor;
-    } else if (passThrough.value) {
-      return passThroughColor;
-    } else {
-      return defaultColor;
-    }
-  });
-}
-
-export function bottomTabsHeight(homeStackState, height, extendedHeight) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (homeStackState.value) {
-      case constants.OPEN_WITH_ANIMATION:
-        return withTiming(extendedHeight, constants.LINEAR_EASING);
-        break;
-      case constants.CLOSE_WITH_ANIMATION:
-        return withTiming(height, constants.LINEAR_EASING);
-        break;
-      case constants.OPEN_WITHOUT_ANIMATION:
-        return extendedHeight;
-        break;
-      case constants.CLOSE_WITHOUT_ANIMATION:
-        return height;
-        break;
-    }
-  });
-}

src/js/worklets/shell/constants.js

@@ -1,27 +0,0 @@
-import { Easing } from 'react-native-reanimated';
-
-// Home Stack States
-export const CLOSE_WITH_ANIMATION = 0;
-export const OPEN_WITH_ANIMATION = 1;
-export const CLOSE_WITHOUT_ANIMATION = 2;
-export const OPEN_WITHOUT_ANIMATION = 3;
-
-// Floating Screen States
-export const CLOSE_SCREEN_WITH_SLIDE_ANIMATION = 0;
-export const OPEN_SCREEN_WITH_SLIDE_ANIMATION = 1;
-export const CLOSE_SCREEN_WITH_SHELL_ANIMATION = 2;
-export const OPEN_SCREEN_WITH_SHELL_ANIMATION = 3;
-export const CLOSE_SCREEN_WITHOUT_ANIMATION = 4;
-export const OPEN_SCREEN_WITHOUT_ANIMATION = 5;
-
-export const SHELL_ANIMATION_TIME = 200;
-
-export const LINEAR_EASING = {
-  duration: SHELL_ANIMATION_TIME,
-  easing: Easing.bezier(0, 0, 1, 1),
-};
-
-export const EASE_OUT_EASING = {
-  duration: SHELL_ANIMATION_TIME,
-  easing: Easing.bezier(0, 0, 0.58, 1),
-};

src/js/worklets/shell/floating_screen.js

@@ -1,90 +0,0 @@
-import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
-import * as constants from './constants';
-
-// Derived Values
-export function screenLeft(screenState, screenWidth, switcherCardLeftPosition) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (screenState.value) {
-      case constants.CLOSE_SCREEN_WITH_SLIDE_ANIMATION:
-        return withTiming(screenWidth, constants.EASE_OUT_EASING);
-      case constants.OPEN_SCREEN_WITH_SLIDE_ANIMATION:
-        return withTiming(0, constants.EASE_OUT_EASING);
-      case constants.CLOSE_SCREEN_WITHOUT_ANIMATION:
-        return screenWidth;
-      case constants.OPEN_SCREEN_WITHOUT_ANIMATION:
-        // Note - don't use return 0; its not working in ios
-        // https://github.com/software-mansion/react-native-reanimated/issues/3296#issuecomment-1573900172
-        return withSequence(withTiming(-1, { duration: 0 }), withTiming(0, { duration: 0 }));
-      case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
-        return withTiming(switcherCardLeftPosition, constants.EASE_OUT_EASING);
-      case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
-        return withTiming(0, constants.EASE_OUT_EASING);
-      default:
-        return screenWidth;
-    }
-  });
-}
-
-export function screenTop(screenState, switcherCardTopPosition) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (screenState.value) {
-      case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
-        return withTiming(switcherCardTopPosition, constants.EASE_OUT_EASING);
-      case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
-        return withTiming(0, constants.EASE_OUT_EASING);
-      default:
-        return 0;
-    }
-  });
-}
-
-export function screenWidth(screenState, screenWidth, switcherCardSize) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (screenState.value) {
-      case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
-        return withTiming(switcherCardSize, constants.EASE_OUT_EASING);
-      case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
-        return withSequence(
-          withTiming(switcherCardSize, { duration: 0 }),
-          withTiming(screenWidth, constants.EASE_OUT_EASING),
-        );
-      default:
-        return screenWidth;
-    }
-  });
-}
-
-export function screenHeight(screenState, screenHeight, switcherCardSize) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (screenState.value) {
-      case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
-        return withTiming(switcherCardSize, constants.EASE_OUT_EASING);
-      case constants.OPEN_SCREEN_WITH_SHELL_ANIMATION:
-        return withSequence(
-          withTiming(switcherCardSize, { duration: 0 }),
-          withTiming(screenHeight, constants.EASE_OUT_EASING),
-        );
-      default:
-        return screenHeight;
-    }
-  });
-}
-
-export function screenZIndex(screenState) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (screenState.value) {
-      case constants.CLOSE_SCREEN_WITH_SHELL_ANIMATION:
-      case constants.CLOSE_SCREEN_WITH_SLIDE_ANIMATION:
-        return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(-1, { duration: 0 }));
-      case constants.CLOSE_SCREEN_WITHOUT_ANIMATION:
-        return -1;
-      default:
-        return 1;
-    }
-  });
-}

src/js/worklets/shell/home_stack.js

@@ -1,113 +0,0 @@
-import { useDerivedValue, withTiming, withSequence, withDelay } from 'react-native-reanimated';
-import * as constants from './constants';
-
-// Derived values for each stack (communities, chat, wallet, browser)
-export function stackOpacity(stackId, selectedStackId) {
-  return useDerivedValue(function () {
-    'worklet';
-    return selectedStackId.value == stackId ? 1 : 0;
-  });
-}
-
-export function stackZIndex(stackId, selectedStackId) {
-  return useDerivedValue(function () {
-    'worklet';
-    return selectedStackId.value == stackId ? 10 : 9;
-  });
-}
-
-// Derived values for home stack (container)
-export function homeStackOpacity(homeStackState) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (homeStackState.value) {
-      case constants.OPEN_WITH_ANIMATION:
-        return withTiming(1, constants.LINEAR_EASING);
-      case constants.CLOSE_WITH_ANIMATION:
-        return withTiming(0, constants.LINEAR_EASING);
-      case constants.OPEN_WITHOUT_ANIMATION:
-        return 1;
-      case constants.CLOSE_WITHOUT_ANIMATION:
-        return 0;
-    }
-  });
-}
-
-export function homeStackTop(homeStackState, top) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (homeStackState.value) {
-      case constants.OPEN_WITH_ANIMATION:
-        return withTiming(0, constants.LINEAR_EASING);
-      case constants.CLOSE_WITH_ANIMATION:
-        return withTiming(top, constants.LINEAR_EASING);
-      case constants.OPEN_WITHOUT_ANIMATION:
-        return 0;
-      case constants.CLOSE_WITHOUT_ANIMATION:
-        return top;
-    }
-  });
-}
-
-export function homeStackLeft(selectedStackId, animateHomeStackLeft, homeStackState, left) {
-  return useDerivedValue(function () {
-    'worklet';
-    if (animateHomeStackLeft.value) {
-      var leftValue = left[selectedStackId.value];
-      switch (homeStackState.value) {
-        case constants.OPEN_WITH_ANIMATION:
-          return withSequence(withTiming(leftValue, { duration: 0 }), withTiming(0, constants.LINEAR_EASING));
-        case constants.CLOSE_WITH_ANIMATION:
-          return withTiming(leftValue, constants.LINEAR_EASING);
-        case constants.OPEN_WITHOUT_ANIMATION:
-          return 0;
-        case constants.CLOSE_WITHOUT_ANIMATION:
-          return leftValue;
-      }
-    } else {
-      return 0;
-    }
-  });
-}
-
-export function homeStackPointer(homeStackState) {
-  return useDerivedValue(function () {
-    'worklet';
-    var homeStackStateValue = homeStackState.value;
-    return homeStackStateValue == constants.OPEN_WITH_ANIMATION ||
-      homeStackStateValue == constants.OPEN_WITHOUT_ANIMATION
-      ? 'auto'
-      : 'none';
-  });
-}
-
-export function homeStackScale(homeStackState, minimizeScale) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (homeStackState.value) {
-      case constants.OPEN_WITH_ANIMATION:
-        return withTiming(1, constants.LINEAR_EASING);
-      case constants.CLOSE_WITH_ANIMATION:
-        return withTiming(minimizeScale, constants.LINEAR_EASING);
-      case constants.OPEN_WITHOUT_ANIMATION:
-        return 1;
-      case constants.CLOSE_WITHOUT_ANIMATION:
-        return minimizeScale;
-    }
-  });
-}
-
-export function homeStackBorderRadius(homeStackState) {
-  return useDerivedValue(function () {
-    'worklet';
-    switch (homeStackState.value) {
-      case constants.OPEN_WITH_ANIMATION:
-        return withDelay(constants.SHELL_ANIMATION_TIME, withTiming(0, { duration: 0 }));
-      case constants.CLOSE_WITH_ANIMATION:
-      case constants.CLOSE_WITHOUT_ANIMATION:
-        return 20;
-      case constants.OPEN_WITHOUT_ANIMATION:
-        return 0;
-    }
-  });
-}

src/mocks/js_dependencies.cljs

@@ -305,9 +305,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
   #js {:getInstallReferrer identity})
 
 (def react-native-camera-kit
-  #js
-   {:Camera     #js {}
-    :CameraType #js {}})
+  #js {:CameraKitCamera #js {}})
 
 (def react-native-push-notification
   #js
@@ -344,8 +342,6 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
   (clj->js {:default                    #js {}
             :useDeviceOrientationChange #js {}}))
 
-(def react-native-transparent-video #js {:default #js {}})
-
 (def wallet-connect-client
   #js
    {:default       #js {}
@@ -407,18 +403,14 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     "react-native-share"                            react-native-share
     "@react-native-async-storage/async-storage"     async-storage
     "react-native-svg"                              react-native-svg
-    "react-native-transparent-video"                react-native-transparent-video
     "react-native-orientation-locker"               react-native-orientation-locker
     "../src/js/worklets/core.js"                    worklet-factory
-    "../src/js/worklets/shell/bottom_tabs.js"       #js {}
-    "../src/js/worklets/shell/home_stack.js"        #js {}
-    "../src/js/worklets/shell/floating_screen.js"   #js {}
+    "../src/js/worklets/shell.js"                   #js {}
     "../src/js/worklets/bottom_sheet.js"            #js {}
     "../src/js/worklets/record_audio.js"            #js {}
     "../src/js/worklets/scroll_view.js"             #js {}
     "../src/js/worklets/onboarding_carousel.js"     #js {}
     "../src/js/worklets/lightbox.js"                #js {}
-    "../src/js/worklets/parallax.js"                #js {}
     "./fleets.js"                                   default-fleets
     "@walletconnect/client"                         wallet-connect-client
     "../translations/ar.json"                       (js/JSON.parse (slurp "./translations/ar.json"))

src/native_module/core.cljs

@@ -82,15 +82,6 @@
      key-uid
      #(.loginWithConfig ^js (status) account-data hashed-password config))))
 
-(defn login-account
-  "NOTE: beware, the password has to be sha3 hashed"
-  [{:keys [keyUid] :as request}]
-  (log/debug "[native-module] loginWithConfig")
-  (clear-web-data)
-  (init-keystore
-   keyUid
-   #(.loginAccount ^js (status) (types/clj->json request))))
-
 (defn create-account-and-login
   [request]
   (.createAccountAndLogin ^js (status) (types/clj->json request)))
@@ -257,13 +248,6 @@
   (log/debug "[native-module] hash-message")
   (.hashMessage ^js (status) message callback))
 
-(defn local-pairing-preflight-outbound-check
-  "Checks whether the device has allows connecting to the local server"
-  [callback]
-  (log/info "[native-module] Performing local pairing preflight check")
-  (when platform/ios?
-    (.localPairingPreflightOutboundCheck ^js (status) callback)))
-
 (defn get-connection-string-for-bootstrapping-another-device
   "Generates connection string form status-go for the purpose of local pairing on the sender end"
   [config-json callback]
@@ -545,7 +529,3 @@
 (defn log-file-directory
   []
   (.logFileDirectory ^js (status)))
-
-(defn init-status-go-logging
-  [{:keys [enable? mobile-system? log-level callback]}]
-  (.initLogging ^js (status) enable? mobile-system? log-level callback))

src/quo2/__visual_tests__/button.e2e.js

@@ -1,49 +1,44 @@
-const waitToNavigate = (duration) => new Promise((resolve) => setTimeout(() => resolve(), duration));
+const waitToNavigate = duration => new Promise(resolve => setTimeout(() => resolve(), duration));
 
-const SUPER_SECRET_PASSWORD = 'password';
+const SUPER_SECRET_PASSWORD = 'password'
 
 const loginToHomePage = async () => {
-  if (device.getPlatform() === 'ios') {
-    await device.setStatusBar({
-      time: '12:34',
-      dataNetwork: 'wifi',
-      wifiBars: '3',
-      batteryState: 'charging',
-      batteryLevel: '100',
-    });
-  }
-  await device.reloadReactNative();
-  await element(by.id('terms-of-service')).tap();
-  await waitToNavigate(400);
-  await element(by.id('get-started')).tap();
-  await waitToNavigate(300);
-  await element(by.id('generate-keys')).tap();
-  await waitToNavigate(200);
-  await element(by.text('Next')).tap();
-  await waitToNavigate(700);
-  await element(by.text('Next')).tap();
-  await waitToNavigate(700);
-  await element(by.id('password-placeholder')).typeText(SUPER_SECRET_PASSWORD);
-  await element(by.id('confirm-password-placeholder')).typeText(SUPER_SECRET_PASSWORD);
-  await element(by.text('Next')).tap();
-  await waitToNavigate(200);
-  await element(by.id('browser-stack')).tap();
-  await waitToNavigate(400);
-  await element(by.text('Quo2.0 Preview')).tap();
-  await waitToNavigate(400);
-};
+    if (device.getPlatform() === 'ios') {
+        await device.setStatusBar({ time: '12:34', dataNetwork: 'wifi', wifiBars: '3', batteryState: 'charging', batteryLevel: '100' });
+    }
+    await device.reloadReactNative();
+    await element(by.id('terms-of-service')).tap();
+    await waitToNavigate(400);
+    await element(by.id('get-started')).tap();
+    await waitToNavigate(300);
+    await element(by.id('generate-keys')).tap();
+    await waitToNavigate(200);
+    await element(by.text('Next')).tap();
+    await waitToNavigate(700);
+    await element(by.text('Next')).tap();
+    await waitToNavigate(700);
+    await element(by.id('password-placeholder')).typeText(SUPER_SECRET_PASSWORD);
+    await element(by.id('confirm-password-placeholder')).typeText(SUPER_SECRET_PASSWORD);
+    await element(by.text('Next')).tap();
+    await waitToNavigate(200);
+    await element(by.id("browser-stack")).tap();
+    await waitToNavigate(400);
+    await element(by.text("Quo2.0 Preview")).tap();
+    await waitToNavigate(400);
+}
 
 describe('Default Renders', () => {
-  beforeAll(async () => loginToHomePage());
-  beforeEach(async () => {});
-  afterEach(async () => {
-    await element(by.id('back-button')).tap();
-    await waitToNavigate(200);
-  });
+    beforeAll(async () => loginToHomePage())
+    beforeEach(async () => {
+    });
+    afterEach(async () => {
+        await element(by.id("back-button")).tap();
+        await waitToNavigate(200);
+    });
 
-  it(`button page should match image render`, async () => {
-    await element(by.id(`quo2-:button`)).tap();
-    await waitToNavigate(200);
-    const res = await jestExpect(`button`).toMatchImageSnapshot();
-  });
-});
+    it(`button page should match image render`, async () => {
+        await element(by.id(`quo2-:button`)).tap();
+        await waitToNavigate(200);
+        const res = await jestExpect(`button`).toMatchImageSnapshot();
+    })
+});

src/quo2/components/avatars/user_avatar/view.cljs

@@ -38,13 +38,13 @@
   uses `ring-background` to display the ring behind the initials when given. Otherwise,
   shows the `profile-picture` which already comes with the ring drawn."
   [{:keys [full-name status-indicator? online? size profile-picture ring-background
-           customization-color static? muted?]
+           customization-color static?]
     :or   {status-indicator?   true
            online?             true
            size                :big
            customization-color :turquoise}}]
   (let [full-name    (or full-name "empty name")
-        draw-ring?   (when-not muted? (and ring-background (valid-ring-sizes size)))
+        draw-ring?   (and ring-background (valid-ring-sizes size))
         outer-styles (style/outer size)
         ;; Once image is loaded, fast image rerenders view with the help of reagent atom,
         ;; But dynamic updates don't work when user-avatar is used inside hole-view

src/quo2/components/banners/banner/style.cljs

@@ -4,7 +4,7 @@
 
 (def container
   {:height           40
-   :background-color (colors/custom-color :blue 50 20)
+   :background-color colors/primary-50-opa-20
    :flex-direction   :row
    :align-items      :center
    :padding-right    22