android 12 try

android/app/build.gradle

@@ -92,10 +92,6 @@ 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,
-    /* 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,
@@ -136,12 +132,6 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
-/**
- * Architectures to build native code for in debug.
- */
-def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
-
-
 def getCommitHash = { ->
     if (project.hasProperty("commitHash")) {
         return project.commitHash
@@ -193,8 +183,6 @@ def getEnvOrConfig = { varName ->
 }
 
 android {
-    ndkVersion rootProject.ext.ndkVersion
-    
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
@@ -276,11 +264,6 @@ android {
             versionNameSuffix   "-SNAPSHOT"
             resValue "string", "build_config_package", "im.status.ethereum"
             signingConfig signingConfigs.debug
-            if (nativeArchitectures) {
-                ndk {
-                    abiFilters nativeArchitectures.split(',')
-                }
-            }
         }
         release {
             minifyEnabled enableProguardInReleaseBuilds
@@ -324,7 +307,6 @@ 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 "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
@@ -366,7 +348,7 @@ dependencies {
     implementation 'com.github.status-im:function:0.0.1'
     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"
+    implementation "com.squareup.okhttp3:okhttp-tls:3.12.12"
 }
 
 def getLocalNDKDir = { ->

android/app/src/debug/AndroidManifest.xml

@@ -7,7 +7,5 @@
     <!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
     <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
 
-   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" >
+    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+</manifest>
-    </application>
-</manifest>

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

@@ -29,6 +29,7 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
+import com.facebook.react.ReactFragmentActivity;
 import com.reactnativenavigation.NavigationActivity;
 import com.facebook.react.modules.core.PermissionListener;
 import androidx.core.splashscreen.SplashScreen;

android/build.gradle

@@ -11,15 +11,6 @@ ext {
     targetSdkVersion    = Integer.valueOf(project.targetSdkVersion)
     supportLibVersion   = project.supportLibVersion
     gradlePluginVersion = project.gradlePluginVersion
-
-    if (System.properties['os.arch'] == "aarch64") {
-        // For M1 Users we need to use the NDK 24 which added support for aarch64
-        ndkVersion = "24.0.8215888"
-    } else {
-        // Otherwise we default to the side-by-side NDK version from AGP.
-        ndkVersion = "21.4.7075529"
-    }
-
 }
 
 buildscript {

android/gradle.properties

@@ -25,10 +25,10 @@ kotlinVersion=1.3.50
 minSdkVersion=23
 compileSdkVersion=31
 targetSdkVersion=31
-buildToolsVersion=30.0.0
+buildToolsVersion=31.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
-gradlePluginVersion=4.1.0
+gradlePluginVersion=3.5.4
 
 android.useAndroidX=true
 android.enableJetifier=true

ci/Jenkinsfile.combined

@@ -19,7 +19,7 @@ pipeline {
   }
 
   /* WARNING: Defining parameters here with the ?: trick causes them to remember last value. */
-  parameters {
+  parameters { 
     choice(
       name: 'BUILD_TYPE',
       description: 'Makefile target to build. Optional Parameter.',

ios/Podfile

@@ -7,8 +7,7 @@ abstract_target 'Status' do
   # Pods for StatusQuo
   config = use_native_modules!
 
-  use_react_native!(:path => config[:reactNativePath],
+  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'
@@ -48,3 +47,4 @@ abstract_target 'Status' do
 
   use_native_modules!
 end
+

ios/Podfile.lock

@@ -1,18 +1,26 @@
 PODS:
-  - boost (1.76.0)
+  - boost-for-react-native (1.63.0)
   - BVLinearGradient (2.5.6):
     - React
   - CryptoSwift (1.5.1)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.67.5)
+  - FBLazyVector (0.63.5)
-  - FBReactNativeSpec (0.67.5):
+  - FBReactNativeSpec (0.63.5):
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - Folly (= 2020.01.13.00)
-    - RCTRequired (= 0.67.5)
+    - RCTRequired (= 0.63.5)
-    - RCTTypeSafety (= 0.67.5)
+    - RCTTypeSafety (= 0.63.5)
-    - React-Core (= 0.67.5)
+    - React-Core (= 0.63.5)
-    - React-jsi (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
-  - fmt (6.2.1)
+  - Folly (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - Folly/Default (= 2020.01.13.00)
+    - glog
+  - Folly/Default (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
   - glog (0.3.5)
   - HMSegmentedControl (1.5.6)
   - Keycard (3.0.6):
@@ -32,217 +40,185 @@ PODS:
     - RNPermissions
   - Permission-Microphone (2.1.5):
     - RNPermissions
-  - RCT-Folly (2021.06.28.00-v2):
+  - RCTRequired (0.63.5)
-    - boost
+  - RCTTypeSafety (0.63.5):
+    - FBLazyVector (= 0.63.5)
+    - Folly (= 2020.01.13.00)
+    - RCTRequired (= 0.63.5)
+    - React-Core (= 0.63.5)
+  - React (0.63.5):
+    - React-Core (= 0.63.5)
+    - React-Core/DevSupport (= 0.63.5)
+    - React-Core/RCTWebSocket (= 0.63.5)
+    - React-RCTActionSheet (= 0.63.5)
+    - React-RCTAnimation (= 0.63.5)
+    - React-RCTBlob (= 0.63.5)
+    - React-RCTImage (= 0.63.5)
+    - React-RCTLinking (= 0.63.5)
+    - React-RCTNetwork (= 0.63.5)
+    - React-RCTSettings (= 0.63.5)
+    - React-RCTText (= 0.63.5)
+    - React-RCTVibration (= 0.63.5)
+  - React-callinvoker (0.63.5)
+  - React-Core (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default (= 0.63.5)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/CoreModulesHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/Default (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/DevSupport (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default (= 0.63.5)
+    - React-Core/RCTWebSocket (= 0.63.5)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - React-jsinspector (= 0.63.5)
+    - Yoga
+  - React-Core/RCTActionSheetHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTAnimationHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTBlobHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTImageHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTLinkingHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTNetworkHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTSettingsHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTTextHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTVibrationHeaders (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-Core/RCTWebSocket (0.63.5):
+    - Folly (= 2020.01.13.00)
+    - glog
+    - React-Core/Default (= 0.63.5)
+    - React-cxxreact (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-jsiexecutor (= 0.63.5)
+    - Yoga
+  - React-CoreModules (0.63.5):
+    - FBReactNativeSpec (= 0.63.5)
+    - Folly (= 2020.01.13.00)
+    - RCTTypeSafety (= 0.63.5)
+    - React-Core/CoreModulesHeaders (= 0.63.5)
+    - React-jsi (= 0.63.5)
+    - React-RCTImage (= 0.63.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
+  - React-cxxreact (0.63.5):
+    - boost-for-react-native (= 1.63.0)
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - Folly (= 2020.01.13.00)
     - glog
-    - RCT-Folly/Default (= 2021.06.28.00-v2)
+    - React-callinvoker (= 0.63.5)
-  - RCT-Folly/Default (2021.06.28.00-v2):
+    - React-jsinspector (= 0.63.5)
-    - boost
+  - React-jsi (0.63.5):
+    - boost-for-react-native (= 1.63.0)
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - Folly (= 2020.01.13.00)
     - glog
-  - RCTRequired (0.67.5)
+    - React-jsi/Default (= 0.63.5)
-  - RCTTypeSafety (0.67.5):
+  - React-jsi/Default (0.63.5):
-    - FBLazyVector (= 0.67.5)
+    - boost-for-react-native (= 1.63.0)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - 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.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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default
-    - 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.67.5):
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - 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.67.5):
-    - FBReactNativeSpec (= 0.67.5)
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - 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
+    - Folly (= 2020.01.13.00)
     - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+  - React-jsiexecutor (0.63.5):
-    - 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
+    - Folly (= 2020.01.13.00)
     - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-cxxreact (= 0.63.5)
-    - React-jsi/Default (= 0.67.5)
+    - React-jsi (= 0.63.5)
-  - React-jsi/Default (0.67.5):
+  - React-jsinspector (0.63.5)
-    - boost (= 1.76.0)
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.67.5):
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
-    - 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
   - react-native-blob-util (0.13.18):
     - React-Core
-  - react-native-blur (4.3.2):
+  - react-native-blur (4.3.0):
     - React-Core
   - react-native-camera-kit (8.0.4):
     - React
   - react-native-cameraroll (4.0.4):
     - React-Core
-  - react-native-config (1.5.0):
+  - react-native-config (1.4.2):
-    - react-native-config/App (= 1.5.0)
+    - react-native-config/App (= 1.4.2)
-  - react-native-config/App (1.5.0):
+  - react-native-config/App (1.4.2):
     - React-Core
   - react-native-image-resizer (1.2.3):
     - React
@@ -269,71 +245,66 @@ PODS:
     - React
   - react-native-webview (11.16.0):
     - React-Core
-  - React-perflogger (0.67.5)
+  - React-RCTActionSheet (0.63.5):
-  - React-RCTActionSheet (0.67.5):
+    - React-Core/RCTActionSheetHeaders (= 0.63.5)
-    - React-Core/RCTActionSheetHeaders (= 0.67.5)
+  - React-RCTAnimation (0.63.5):
-  - React-RCTAnimation (0.67.5):
+    - FBReactNativeSpec (= 0.63.5)
-    - FBReactNativeSpec (= 0.67.5)
+    - Folly (= 2020.01.13.00)
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.63.5)
-    - RCTTypeSafety (= 0.67.5)
+    - React-Core/RCTAnimationHeaders (= 0.63.5)
-    - React-Core/RCTAnimationHeaders (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTBlob (0.63.5):
-  - React-RCTBlob (0.67.5):
+    - FBReactNativeSpec (= 0.63.5)
-    - FBReactNativeSpec (= 0.67.5)
+    - Folly (= 2020.01.13.00)
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/RCTBlobHeaders (= 0.63.5)
-    - React-Core/RCTBlobHeaders (= 0.67.5)
+    - React-Core/RCTWebSocket (= 0.63.5)
-    - React-Core/RCTWebSocket (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - React-jsi (= 0.67.5)
+    - React-RCTNetwork (= 0.63.5)
-    - React-RCTNetwork (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTImage (0.63.5):
-  - React-RCTImage (0.67.5):
+    - FBReactNativeSpec (= 0.63.5)
-    - FBReactNativeSpec (= 0.67.5)
+    - Folly (= 2020.01.13.00)
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.63.5)
-    - RCTTypeSafety (= 0.67.5)
+    - React-Core/RCTImageHeaders (= 0.63.5)
-    - React-Core/RCTImageHeaders (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - React-jsi (= 0.67.5)
+    - React-RCTNetwork (= 0.63.5)
-    - React-RCTNetwork (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTLinking (0.63.5):
-  - React-RCTLinking (0.67.5):
+    - FBReactNativeSpec (= 0.63.5)
-    - FBReactNativeSpec (= 0.67.5)
+    - React-Core/RCTLinkingHeaders (= 0.63.5)
-    - React-Core/RCTLinkingHeaders (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTNetwork (0.63.5):
-  - React-RCTNetwork (0.67.5):
+    - FBReactNativeSpec (= 0.63.5)
-    - FBReactNativeSpec (= 0.67.5)
+    - Folly (= 2020.01.13.00)
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.63.5)
-    - RCTTypeSafety (= 0.67.5)
+    - React-Core/RCTNetworkHeaders (= 0.63.5)
-    - React-Core/RCTNetworkHeaders (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTSettings (0.63.5):
-  - React-RCTSettings (0.67.5):
+    - FBReactNativeSpec (= 0.63.5)
-    - FBReactNativeSpec (= 0.67.5)
+    - Folly (= 2020.01.13.00)
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCTTypeSafety (= 0.63.5)
-    - RCTTypeSafety (= 0.67.5)
+    - React-Core/RCTSettingsHeaders (= 0.63.5)
-    - React-Core/RCTSettingsHeaders (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+  - React-RCTText (0.63.5):
-  - React-RCTText (0.67.5):
+    - React-Core/RCTTextHeaders (= 0.63.5)
-    - React-Core/RCTTextHeaders (= 0.67.5)
+  - React-RCTVibration (0.63.5):
-  - React-RCTVibration (0.67.5):
+    - FBReactNativeSpec (= 0.63.5)
-    - FBReactNativeSpec (= 0.67.5)
+    - Folly (= 2020.01.13.00)
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-Core/RCTVibrationHeaders (= 0.63.5)
-    - React-Core/RCTVibrationHeaders (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - React-jsi (= 0.67.5)
+    - ReactCommon/turbomodule/core (= 0.63.5)
-    - ReactCommon/turbomodule/core (= 0.67.5)
+  - ReactCommon/turbomodule/core (0.63.5):
-  - React-runtimeexecutor (0.67.5):
-    - React-jsi (= 0.67.5)
-  - ReactCommon/turbomodule/core (0.67.5):
     - DoubleConversion
+    - Folly (= 2020.01.13.00)
     - glog
-    - RCT-Folly (= 2021.06.28.00-v2)
+    - React-callinvoker (= 0.63.5)
-    - React-callinvoker (= 0.67.5)
+    - React-Core (= 0.63.5)
-    - React-Core (= 0.67.5)
+    - React-cxxreact (= 0.63.5)
-    - React-cxxreact (= 0.67.5)
+    - React-jsi (= 0.63.5)
-    - React-jsi (= 0.67.5)
-    - React-logger (= 0.67.5)
-    - React-perflogger (= 0.67.5)
   - ReactNativeAudioToolkit (2.0.3):
     - React
   - ReactNativeNavigation (7.27.1):
@@ -386,8 +357,8 @@ PODS:
     - DoubleConversion
     - FBLazyVector
     - FBReactNativeSpec
+    - Folly
     - glog
-    - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
     - React
@@ -433,16 +404,15 @@ PODS:
   - Yoga (1.14.0)
 
 DEPENDENCIES:
-  - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
-  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
+  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
+  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - Keycard (from `https://github.com/status-im/Keycard.swift.git`)
   - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera.podspec`)
   - Permission-Microphone (from `../node_modules/react-native-permissions/ios/Microphone.podspec`)
-  - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
@@ -455,7 +425,6 @@ DEPENDENCIES:
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
-  - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - 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`)"
@@ -474,7 +443,6 @@ DEPENDENCIES:
   - react-native-status (from `../modules/react-native-status`)
   - react-native-status-keycard (from `../node_modules/react-native-status-keycard`)
   - 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`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
   - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
@@ -484,7 +452,6 @@ DEPENDENCIES:
   - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
   - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
-  - 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`)"
   - ReactNativeNavigation (from `../node_modules/react-native-navigation`)
@@ -512,8 +479,8 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - boost-for-react-native
     - CryptoSwift
-    - fmt
     - HMSegmentedControl
     - libwebp
     - SDWebImage
@@ -523,8 +490,6 @@ SPEC REPOS:
     - TOCropViewController
 
 EXTERNAL SOURCES:
-  boost:
-    :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
   BVLinearGradient:
     :path: "../node_modules/react-native-linear-gradient"
   DoubleConversion:
@@ -532,7 +497,9 @@ EXTERNAL SOURCES:
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FBReactNativeSpec:
-    :path: "../node_modules/react-native/React/FBReactNativeSpec"
+    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec"
+  Folly:
+    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
   glog:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
   Keycard:
@@ -541,8 +508,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-permissions/ios/Camera.podspec"
   Permission-Microphone:
     :path: "../node_modules/react-native-permissions/ios/Microphone.podspec"
-  RCT-Folly:
-    :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
     :path: "../node_modules/react-native/Libraries/RCTRequired"
   RCTTypeSafety:
@@ -563,8 +528,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
-  React-logger:
-    :path: "../node_modules/react-native/ReactCommon/logger"
   react-native-background-timer:
     :path: "../node_modules/react-native-background-timer"
   react-native-blob-util:
@@ -601,8 +564,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-status-keycard"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
-  React-perflogger:
-    :path: "../node_modules/react-native/ReactCommon/reactperflogger"
   React-RCTActionSheet:
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
@@ -621,8 +582,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Text"
   React-RCTVibration:
     :path: "../node_modules/react-native/Libraries/Vibration"
-  React-runtimeexecutor:
-    :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
   ReactNativeAudioToolkit:
@@ -679,37 +638,35 @@ CHECKOUT OPTIONS:
     :submodules: true
 
 SPEC CHECKSUMS:
-  boost: a7c83b31436843459a1961bfd74b96033dc77234
+  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
-  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
+  DoubleConversion: cde416483dac037923206447da6e1454df403714
-  FBLazyVector: d2db9d00883282819d03bbd401b2ad4360d47580
+  FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
-  FBReactNativeSpec: 94da4d84ba3b1acf459103320882daa481a2b62d
+  FBReactNativeSpec: 7dfb84f624136a45727c813ed21d130cd3e61beb
-  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
+  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 9e3310013355e9221591364060e841c28041dfe3
+  glog: 6934faae5afbec23475648c8aeb6047ce973af65
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
   Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
-  RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
+  RCTRequired: 5520387431beaa5f32aa8726bf746cd5353119fe
-  RCTRequired: 412e994c1e570cf35378a32c18fd46e50634938b
+  RCTTypeSafety: bc90d6e287fa427c50ed770922bac30faf0bbfa3
-  RCTTypeSafety: ef27340c728e6d673af345ed69e479a010c8a2d8
+  React: 83a7f231f462b09260a53c5c51005e7659c66890
-  React: 36b9f5116572e5b80f01e562bb1f1451e8848e47
+  React-callinvoker: 1c3fdb5562c792212e149637b8a167516bb4b58e
-  React-callinvoker: 91e62870884d3db3a0db33bbb1ba4e53fa5210ca
+  React-Core: 8baca8644a516e772c77e3923697cfe2b58c1606
-  React-Core: 765ccc3861be1b93c7d5ca37f6b06e2efd6e7999
+  React-CoreModules: 200c931e17b332024c2e9d878f67b87c00c2c83b
-  React-CoreModules: da2ddff50a92576b6d58fbfc80a62ba3f81d8a4e
+  React-cxxreact: 9096ebaeebf6a1475a14448fa8bfc380c13d7882
-  React-cxxreact: b54cffd4feb550c3213cd38db4a2a4bdd896f715
+  React-jsi: 7d908b17758178b076a05a254523f1a4227b53d2
-  React-jsi: 103674913e4159a07df20ef214c6b563e90e7b2e
+  React-jsiexecutor: e06a32e42affb2bd89e4c8369349b5fcf787710c
-  React-jsiexecutor: e9895ccae253323ca70f693945fecbba091f0abd
+  React-jsinspector: fdbc08866b34ae8e1b788ea1cbd9f9d1ca2aa3d6
-  React-jsinspector: ec4fe4f65ccf9d67c8429dda955d3412db8a25ef
-  React-logger: 85f4ef06b9723714b2dfa5b0e5502b673b271b58
   react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
-  react-native-blur: 4db8c7556566df4e8714c1af5762a4ebc99175d5
+  react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
   react-native-camera-kit: 498a6d111a904834e0824e9073cfadef7303235f
   react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
-  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
+  react-native-config: c98128a72bc2c3a1ca72caec0b021f0fa944aa29
   react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
   react-native-lottie-splash-screen: 068688c15dd478301fda00f8d87d7fb7d5b9a93e
   react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
@@ -722,18 +679,16 @@ SPEC CHECKSUMS:
   react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
   react-native-status-keycard: f1c1227b2d5984c10fb44db68e4bfd2937f31e98
   react-native-webview: 28a8636d97ee641f2ee8f20492d7a6c269c1d703
-  React-perflogger: d32ee13196f4ae2e4098fb7f8e7ed4f864c6fb0f
+  React-RCTActionSheet: e911b99f0d6fa7711ffc2f62d236b12a32771835
-  React-RCTActionSheet: 81779c09e34a6a3d6b15783407ba9016a774f535
+  React-RCTAnimation: ad8b853170a059faf31d6add34f67d22391bbe01
-  React-RCTAnimation: b778eaaa42a884abcc5719035a7a0b2f54672658
+  React-RCTBlob: 134c7270b6672c9c05383b2e0f7f044ba39d7dda
-  React-RCTBlob: 8edfc04c117decb0e7d4e6ab32bec91707e63ecb
+  React-RCTImage: c5c74ba8850a193d73aef8efb8fcbb4f9cad7653
-  React-RCTImage: 2022097f1291bfebd0003e477318c72b07853578
+  React-RCTLinking: 12468e952704555c8cb4e3de94c7b5a266811326
-  React-RCTLinking: bd8d889c65695181342541ce4420e9419845084c
+  React-RCTNetwork: e9cfaeb9f3657ae91f895e798734141db6e1af5b
-  React-RCTNetwork: eae64b805d967bf3ece2cec3ad09218eeb32cb74
+  React-RCTSettings: 9a09419bd5e8494f6e146e2c9f5c8e2c6e90ed58
-  React-RCTSettings: 0645af8aec5f40726e98d434a07ff58e75a81aa9
+  React-RCTText: 393f059d7ec02c733da57240694201e734f0dc84
-  React-RCTText: e55de507cda263ff58404c3e7d75bf76c2b80813
+  React-RCTVibration: 3e83f53610d63d3c1fc4db303305e934e73047cc
-  React-RCTVibration: c3b8a3245267a3849b0c7cb91a37606bf5f3aa65
+  ReactCommon: b9ff54b6dd22ba4a776eda22d7f83ec27544ca35
-  React-runtimeexecutor: 434efc9e5b6d0f14f49867f130b39376c971c1aa
-  ReactCommon: a30c2448e5a88bae6fcb0e3da124c14ae493dac1
   ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
   ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8
   RNCAsyncStorage: b2489b49e38c85e10ed45a888d13a2a4c7b32ea1
@@ -749,7 +704,7 @@ SPEC CHECKSUMS:
   RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
   RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
   RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
-  RNReanimated: 3ad6ec4e147462206be9d1c925df10b6ea850b0e
+  RNReanimated: 69eda0e8790a2ee00de2fff03e89361e9bac749a
   RNShare: 2dc2fcac3f7321cfd6b60a23ed4bf4d549f86f5f
   RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
@@ -759,8 +714,8 @@ SPEC CHECKSUMS:
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
-  Yoga: 099a946cbf84c9b32ffdc4278d72db26710ecf92
+  Yoga: 0276e9f20976c8568e107cfc1163a8629051adc0
 
-PODFILE CHECKSUM: c29de3b14e3275299c51aa95520622f09d084bcb
+PODFILE CHECKSUM: dd4d6510a5580d20adac6c8a8dad97a0bc7d6508
 
 COCOAPODS: 1.12.0

ios/StatusIm.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
-		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 */; };
@@ -44,13 +43,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 */; };
-		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 */; };
 		BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; };
+		BFF6343F5A1F0F5FFFC8D020 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A4B974811E312E44D5BBE9EC /* libPods-Status-StatusIm-StatusImTests.a */; };
 		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 */; };
 		C14C5F9329C0ADB5005C58A7 /* launch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9229C0ADB5005C58A7 /* launch-icon.png */; };
@@ -61,6 +59,8 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
+		E9C92E7783C7FB91C9616112 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57CBBEA420F440D344DD99E5 /* libPods-Status-StatusImPR.a */; };
+		F51761A0F4D1FAE41A72435A /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928CC6D1D5BCCF9D3BC60D6A /* libPods-Status-StatusIm.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -119,24 +119,28 @@
 		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>"; };
+		43341A7CBCE457435677CC51 /* 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>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		564309A78329EB657677709C /* 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>"; };
+		57CBBEA420F440D344DD99E5 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		5F30F922E4B02AB10F6CB65E /* 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>"; };
 		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; };
+		70ACC04C7CF0A6C6421A805D /* 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>"; };
-		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>"; };
+		8B3C115CD813729DE4735219 /* 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>"; };
 		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; };
+		8D3CFDC9666FBD03D1AA059A /* 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>"; };
 		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; };
+		928CC6D1D5BCCF9D3BC60D6A /* 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>"; };
+		A4B974811E312E44D5BBE9EC /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
@@ -144,16 +148,12 @@
 		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>"; };
-		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 = (
-				09B7B3FF4CFA16C028BA0B05 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				BFF6343F5A1F0F5FFFC8D020 /* 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 */,
-				8FC9C79C1A8446E7C7C18C60 /* libPods-Status-StatusIm.a in Frameworks */,
+				F51761A0F4D1FAE41A72435A /* 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 */,
-				7DC033789D9E0F726FD9C7AC /* libPods-Status-StatusImPR.a in Frameworks */,
+				E9C92E7783C7FB91C9616112 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */,
+				928CC6D1D5BCCF9D3BC60D6A /* libPods-Status-StatusIm.a */,
-				EC21589D612F7787EA45C863 /* libPods-Status-StatusIm-StatusImTests.a */,
+				A4B974811E312E44D5BBE9EC /* libPods-Status-StatusIm-StatusImTests.a */,
-				6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */,
+				57CBBEA420F440D344DD99E5 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */,
+				564309A78329EB657677709C /* Pods-Status-StatusIm.debug.xcconfig */,
-				691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */,
+				5F30F922E4B02AB10F6CB65E /* Pods-Status-StatusIm.release.xcconfig */,
-				6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				43341A7CBCE457435677CC51 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				70ACC04C7CF0A6C6421A805D /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				8D3CFDC9666FBD03D1AA059A /* Pods-Status-StatusImPR.debug.xcconfig */,
-				FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */,
+				8B3C115CD813729DE4735219 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				BFA0BBBB8136DD48F804A077 /* [CP] Check Pods Manifest.lock */,
+				0F876BD5356F61BF142A01A0 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				DF5B6F4FD3B7809799833669 /* [CP] Copy Pods Resources */,
+				6ECED279DE66BA46FFB5EE0D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				B6E3CF1D675245267368C9A7 /* [CP] Check Pods Manifest.lock */,
+				119C58BA120E4E4D213DA7CD /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				8D6472C92D0D90E9BAD8AD9A /* [CP] Copy Pods Resources */,
+				3C1038075AE5E6FB86AC2319 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				8E74556C932D28F855241EA1 /* [CP] Check Pods Manifest.lock */,
+				50F1BA2DC5224CBE6FDD2998 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				FDBEE007965D2FB13D66278F /* [CP] Copy Pods Resources */,
+				E732E3E1B024946173BF6D3D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -546,6 +546,50 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\" --openssl-legacy-provider --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
 		};
+		0F876BD5356F61BF142A01A0 /* [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 = "/usr/bin/env 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;
+		};
+		119C58BA120E4E4D213DA7CD /* [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 = "/usr/bin/env 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;
@@ -574,7 +618,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		8D6472C92D0D90E9BAD8AD9A /* [CP] Copy Pods Resources */ = {
+		3C1038075AE5E6FB86AC2319 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -592,11 +636,11 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8E74556C932D28F855241EA1 /* [CP] Check Pods Manifest.lock */ = {
+		50F1BA2DC5224CBE6FDD2998 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -614,55 +658,11 @@
 				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env 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;
 		};
-		B6E3CF1D675245267368C9A7 /* [CP] Check Pods Manifest.lock */ = {
+		6ECED279DE66BA46FFB5EE0D /* [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 = (
-			);
-			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;
-		};
-		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 = (
@@ -680,7 +680,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -698,7 +698,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		FDBEE007965D2FB13D66278F /* [CP] Copy Pods Resources */ = {
+		E732E3E1B024946173BF6D3D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -716,7 +716,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -767,7 +767,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 43341A7CBCE457435677CC51 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -804,7 +804,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 70ACC04C7CF0A6C6421A805D /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -837,7 +837,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 564309A78329EB657677709C /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -896,7 +896,6 @@
 					"-lc++",
 					"-ObjC",
 				);
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
 				PROVISIONING_PROFILE = "9da75626-9594-43d9-a827-0f6d43c28f54";
@@ -912,7 +911,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 5F30F922E4B02AB10F6CB65E /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -963,7 +962,6 @@
 					"-lc++",
 					"-ObjC",
 				);
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
 				PROVISIONING_PROFILE = "e2202b12-7a66-4ff7-af3c-a52e35f32dc1";
@@ -977,7 +975,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 8D3CFDC9666FBD03D1AA059A /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1046,7 +1044,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 8B3C115CD813729DE4735219 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1145,7 +1143,7 @@
 				ENABLE_TESTABILITY = YES;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1183,7 +1181,6 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = iphoneos;
 				VALID_ARCHS = arm64;
 				"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
@@ -1228,7 +1225,6 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -1258,7 +1254,6 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 				VALID_ARCHS = arm64;

ios/StatusIm/AppDelegate.m

@@ -11,7 +11,7 @@
 #import <ReactNativeNavigation/ReactNativeNavigation.h>
 
 #import <asl.h>
-#import "RNCConfig.h"
+#import "ReactNativeConfig.h"
 #import "React/RCTLog.h"
 #import "RCTBundleURLProvider.h"
 #import "RNSplashScreen.h"
@@ -72,7 +72,7 @@ static void InitializeFlipper(UIApplication *application) {
   NSURL *jsCodeLocation;
 
   /* Set logging level from React Native */
-  NSString *logLevel = [RNCConfig envFor:@"LOG_LEVEL"];
+  NSString *logLevel = [ReactNativeConfig envFor:@"LOG_LEVEL"];
   if([logLevel isEqualToString:@"error"]){
     RCTSetLogThreshold(RCTLogLevelError);
   }
@@ -247,4 +247,4 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
   }
 }
 
-@end
+@end

ios/StatusIm/main.m

@@ -11,8 +11,7 @@
 
 #import "AppDelegate.h"
 
-int main(int argc, char *argv[])
+int main(int argc, char * argv[]) {
-{
   @autoreleasepool {
     return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
   }

ios/StatusImTests/StatusImTests.m

@@ -22,7 +22,7 @@
 
 @implementation StatusImTests
 
-- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL (^)(UIView *view))test
+- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
 {
   if (test(view)) {
     return YES;
@@ -42,11 +42,10 @@
   BOOL foundElement = NO;
 
   __block NSString *redboxError = nil;
-  RCTSetLogFunction(
+  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-      ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+    if (level >= RCTLogLevelError) {
-        if (level >= RCTLogLevelError) {
+      redboxError = message;
-         redboxError = message;
+    }
-        }
   });
 
   while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {

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

@@ -1,4 +1,5 @@
 #import "RCTStatus.h"
+#import "ReactNativeConfig.h"
 #import "React/RCTBridge.h"
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"

nix/deps/gradle/deps.list

@@ -1,5 +1,4 @@
 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
@@ -7,21 +6,17 @@ 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: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.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.cardview:cardview:1.0.0
 androidx.collection:collection:1.0.0
 androidx.collection:collection:1.1.0
@@ -33,18 +28,15 @@ 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.1.0-rc01
 androidx.core:core:1.6.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-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.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
 androidx.exifinterface:exifinterface:1.1.0-beta01
@@ -52,7 +44,6 @@ androidx.exifinterface:exifinterface:1.1.0-rc01
 androidx.exifinterface:exifinterface:1.2.0
 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
@@ -60,19 +51,16 @@ 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-livedata-core:2.0.0
 androidx.lifecycle:lifecycle-livedata-core:2.3.1
 androidx.lifecycle:lifecycle-livedata:2.0.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-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
@@ -82,24 +70,19 @@ androidx.print:print:1.0.0
 androidx.recyclerview:recyclerview:1.0.0
 androidx.recyclerview:recyclerview:1.1.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.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
@@ -122,7 +105,6 @@ com.android.databinding:baseLibrary:3.1.4
 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:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
@@ -130,53 +112,42 @@ com.android.databinding:compilerCommon:3.1.4
 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:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.1.4
 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:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.1.4
 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:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.1.4
 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.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-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:aapt2-proto:0.1.0
 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:4.1.0-alpha01-6193524
-com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.1.4
 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: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:builder-model:1.1.3
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
@@ -186,7 +157,6 @@ com.android.tools.build:builder-model:3.1.4
 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-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
@@ -196,7 +166,6 @@ com.android.tools.build:builder-test-api:3.1.4
 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:1.1.3
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
@@ -206,19 +175,16 @@ com.android.tools.build:builder:3.1.4
 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:bundletool:0.1.0-alpha01
 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:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.1.4
 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-core:1.1.3
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
@@ -234,7 +200,6 @@ com.android.tools.build:gradle:3.1.4
 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:manifest-merger:24.1.3
 com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
@@ -244,7 +209,6 @@ com.android.tools.build:manifest-merger:26.1.4
 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: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
@@ -256,15 +220,14 @@ com.android.tools.ddms:ddmlib:26.1.4
 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.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:intellij-core:26.5.4
-com.android.tools.external.com-intellij:kotlin-compiler:27.1.0
+com.android.tools.external.com-intellij:kotlin-compiler:26.5.4
 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.external.org-jetbrains:uast:26.5.4
 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
@@ -276,32 +239,29 @@ com.android.tools.layoutlib:layoutlib-api:26.1.4
 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.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-api:26.5.4
 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-checks:26.5.4
 com.android.tools.lint:lint-gradle-api:26.1.4
 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:26.5.4
-com.android.tools.lint:lint-gradle:27.1.0
-com.android.tools.lint:lint-model:27.1.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.lint:lint:27.1.0
+com.android.tools.lint:lint:26.5.4
 com.android.tools:annotations:24.1.3
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
@@ -311,7 +271,6 @@ com.android.tools:annotations:26.1.4
 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:common:24.1.3
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
@@ -321,7 +280,6 @@ com.android.tools:common:26.1.4
 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:dvlib:24.1.3
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
@@ -331,14 +289,12 @@ com.android.tools:dvlib:26.1.4
 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:repository:26.0.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.1.4
 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:sdklib:24.1.3
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
@@ -348,7 +304,6 @@ com.android.tools:sdklib:26.1.4
 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:sdk-common:24.1.3
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
@@ -358,39 +313,42 @@ com.android.tools:sdk-common:26.1.4
 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:signflinger:4.1.0
-com.android:zipflinger:4.1.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.fbjni:fbjni-java-only:0.0.3
 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:drawee:2.0.0
-com.facebook.fresco:fbcore:2.5.0
+com.facebook.fresco:drawee:2.2.0
+com.facebook.fresco:fbcore:2.0.0
+com.facebook.fresco:fbcore:2.2.0
 com.facebook.fresco:flipper:2.2.0
-com.facebook.fresco:fresco:2.5.0
+com.facebook.fresco:fresco:2.0.0
-com.facebook.fresco:imagepipeline-base:2.5.0
+com.facebook.fresco:fresco:2.2.0
-com.facebook.fresco:imagepipeline-native:2.5.0
+com.facebook.fresco:imagepipeline-base:2.0.0
-com.facebook.fresco:imagepipeline-okhttp3:2.5.0
+com.facebook.fresco:imagepipeline-base:2.2.0
-com.facebook.fresco:imagepipeline:2.5.0
+com.facebook.fresco:imagepipeline-native:2.2.0
-com.facebook.fresco:memory-type-ashmem:2.5.0
+com.facebook.fresco:imagepipeline-okhttp3:2.0.0
-com.facebook.fresco:memory-type-java:2.5.0
+com.facebook.fresco:imagepipeline:2.0.0
-com.facebook.fresco:memory-type-native:2.5.0
+com.facebook.fresco:imagepipeline:2.2.0
-com.facebook.fresco:middleware:2.5.0
+com.facebook.fresco:memory-type-ashmem:2.2.0
-com.facebook.fresco:nativeimagefilters:2.5.0
+com.facebook.fresco:memory-type-java:2.2.0
-com.facebook.fresco:nativeimagetranscoder:2.5.0
+com.facebook.fresco:memory-type-native:2.2.0
-com.facebook.fresco:soloader:2.5.0
+com.facebook.fresco:nativeimagefilters:2.0.0
+com.facebook.fresco:nativeimagefilters:2.2.0
+com.facebook.fresco:nativeimagetranscoder:2.0.0
+com.facebook.fresco:nativeimagetranscoder:2.2.0
+com.facebook.fresco:soloader:2.2.0
 com.facebook.fresco:stetho:2.2.0
-com.facebook.fresco:ui-common:2.5.0
+com.facebook.fresco:ui-common:2.2.0
-com.facebook.infer.annotation:infer-annotation:0.18.0
+com.facebook.infer.annotation:infer-annotation:0.11.2
-com.facebook.soloader:annotation:0.10.1
+com.facebook.soloader:annotation:0.9.0
-com.facebook.soloader:nativeloader:0.10.1
+com.facebook.soloader:nativeloader:0.9.0
-com.facebook.soloader:soloader:0.10.1
+com.facebook.soloader:soloader:0.9.0
-com.facebook.yoga:proguard-annotations:1.19.0
+com.facebook.yoga:proguard-annotations:1.14.1
 com.github.Dimezis:BlurView:version-2.0.2
 com.github.bumptech.glide:annotations:4.12.0
 com.github.bumptech.glide:compiler:4.12.0
@@ -409,7 +367,6 @@ com.github.yalantis:ucrop:2.2.6-native
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
 com.google.android.material:material:1.2.0-alpha03
-com.google.auto.value:auto-value-annotations:1.6.2
 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
@@ -419,56 +376,44 @@ com.google.code.gson:gson:2.7
 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.crypto.tink:tink:1.3.0-rc2
 com.google.errorprone:error_prone_annotations:2.0.18
 com.google.errorprone:error_prone_annotations:2.1.2
 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.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
 com.google.guava:guava:22.0
 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: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.protobuf:protobuf-java-util:3.4.0
-com.google.protobuf:protobuf-java-util:3.10.0
 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.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.1
+com.squareup.okhttp3:okhttp-tls:3.12.12
-com.squareup.okhttp3:okhttp-urlconnection:4.9.2
+com.squareup.okhttp3:okhttp-urlconnection:3.12.12
-com.squareup.okhttp3:okhttp:4.9.2
+com.squareup.okhttp3:okhttp:3.12.12
-com.squareup.okio:okio:2.9.0
+com.squareup.okio:okio:1.15.0
+com.squareup.okio:okio:1.17.4
 com.squareup:javapoet:1.8.0
-com.squareup:javapoet:1.10.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.xml.fastinfoset:FastInfoset:1.2.13
-com.sun.xml.fastinfoset:FastInfoset:1.2.15
 com.tunnelvisionlabs:antlr4-annotations:4.5
 com.tunnelvisionlabs:antlr4-runtime:4.5
 com.tunnelvisionlabs:antlr4:4.5
 de.undercouch:gradle-download-task:3.4.3
 de.undercouch:gradle-download-task:4.0.2
 it.unimi.dsi:fastutil:7.2.0
-javax.activation:javax.activation-api:1.2.0
 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.sf.jopt-simple:jopt-simple:4.9
@@ -510,20 +455,16 @@ org.bouncycastle:bcprov-jdk15on:1.48
 org.bouncycastle:bcprov-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.60
 org.checkerframework:checker-qual:2.5.2
-org.checkerframework:checker-qual:2.8.1
 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.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.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:txw2:2.2.11
-org.glassfish.jaxb:txw2:2.3.1
 org.hamcrest:hamcrest-core:1.3
 org.jacoco:org.jacoco.core:0.7.4.201502262128
 org.jacoco:org.jacoco.report:0.7.4.201502262128
@@ -536,7 +477,6 @@ 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.3.50
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.4.31
 org.jetbrains.kotlin:kotlin-build-common:1.3.50
@@ -561,7 +501,6 @@ 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.4.31
 org.jetbrains.kotlin:kotlin-scripting-common:1.3.50
 org.jetbrains.kotlin:kotlin-scripting-common:1.4.31
@@ -576,8 +515,6 @@ 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.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
@@ -585,15 +522,11 @@ 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.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.4.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30
 org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
@@ -602,8 +535,6 @@ org.jetbrains.kotlin:kotlin-stdlib:1.2.0
 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.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
@@ -613,26 +544,18 @@ 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.json:json:20180813
 org.jvnet.staxex:stax-ex:1.7.7
-org.jvnet.staxex:stax-ex:1.8
 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-commons:5.1
 org.ow2.asm:asm-commons:6.0
-org.ow2.asm:asm-commons:7.0
 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-util:5.1
 org.ow2.asm:asm-util:6.0
-org.ow2.asm:asm-util:7.0
 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.tensorflow:tensorflow-lite-metadata:0.1.0-rc1

nix/deps/gradle/deps.urls

@@ -1,4 +1,3 @@
-https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0-rc01/activity-1.0.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.2.4/activity-1.2.4.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.0.0/annotation-experimental-1.0.0.pom
@@ -6,28 +5,23 @@ https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimen
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.0/annotation-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.1/annotation-1.0.1.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.2/annotation-1.0.2.pom
-https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0-rc01/annotation-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.3.0/annotation-1.3.0.pom
-https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0-rc01/appcompat-resources-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.3.1/appcompat-resources-1.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.2/appcompat-1.0.2.pom
-https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0-rc01/appcompat-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.3.1/appcompat-1.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.0/core-common-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.1/core-common-2.0.1.pom
-https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0-rc01/core-common-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.0/core-runtime-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/autofill/autofill/1.1.0/autofill-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0.pom
@@ -39,7 +33,6 @@ https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.6.0/core-ktx-1.
 https://dl.google.com/dl/android/maven2/androidx/core/core-splashscreen/1.0.0/core-splashscreen-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.1/core-1.0.1.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0-rc01/core-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0.pom
@@ -51,18 +44,15 @@ https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/cus
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.3.1/databinding-common-3.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.5.4/databinding-common-3.5.4.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/4.1.0/databinding-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.3.1/databinding-compiler-common-3.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.4/databinding-compiler-common-3.5.4.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/4.1.0/databinding-compiler-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0/documentfile-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-beta01/exifinterface-1.1.0-beta01.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-rc01/exifinterface-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fragment-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0-rc01/fragment-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.3.6/fragment-1.3.6.pom
 https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0.pom
@@ -70,19 +60,16 @@ https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-ui/1
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-utils/1.0.0/legacy-support-core-utils-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-v4/1.0.0/legacy-support-v4-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.0.0/lifecycle-common-2.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0-rc01/lifecycle-common-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.3.1/lifecycle-common-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.0.0/lifecycle-livedata-core-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.3.1/lifecycle-livedata-core-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.0.0/lifecycle-livedata-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.0.0/lifecycle-runtime-2.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0-rc01/lifecycle-runtime-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.3.1/lifecycle-runtime-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.3.1/lifecycle-viewmodel-savedstate-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.0.0/lifecycle-viewmodel-2.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0-rc01/lifecycle-viewmodel-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.3.1/lifecycle-viewmodel-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0.pom
@@ -92,26 +79,21 @@ https://dl.google.com/dl/android/maven2/androidx/multidex/multidex/2.0.1/multide
 https://dl.google.com/dl/android/maven2/androidx/print/print/1.0.0/print-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.0.0/recyclerview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.1.0/recyclerview-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0-rc01/savedstate-1.0.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.1.0/savedstate-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/slidingpanelayout/slidingpanelayout/1.0.0/slidingpanelayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.0.0/swiperefreshlayout-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.1.0-alpha02/swiperefreshlayout-1.1.0-alpha02.pom
 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.1.0/swiperefreshlayout-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/tracing/tracing/1.0.0/tracing-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.0.0/transition-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0-rc01/transition-1.2.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0/transition-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.0.0/vectordrawable-animated-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0-rc01/vectordrawable-animated-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0/vectordrawable-animated-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.0.0/vectordrawable-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.0.1/vectordrawable-1.0.1.pom
-https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0-rc01/vectordrawable-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0/vectordrawable-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.0.0/versionedparcelable-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0-rc01/versionedparcelable-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0/versionedparcelable-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.1/versionedparcelable-1.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/viewpager2/viewpager2/1.0.0/viewpager2-1.0.0.pom
@@ -126,11 +108,9 @@ https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.1.
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.3.1/baseLibrary-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.1.4/compilerCommon-3.1.4.pom
-https://dl.google.com/dl/android/maven2/com/android/signflinger/4.1.0/signflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/26.0.2/animated-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/27.0.1/animated-vector-drawable-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/26.0.2/appcompat-v7-26.0.2.pom
@@ -154,85 +134,70 @@ https://dl.google.com/dl/android/maven2/com/android/support/support-vector-drawa
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.2.1/crash-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.3.1/crash-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.5.4/crash-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.1.4/protos-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.3.1/protos-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.1.4/shared-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.3.1/shared-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.1.4/tracker-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.3.1/tracker-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.1.4/annotations-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.3.1/annotations-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.1.0/aapt2-proto-0.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.4.0/aapt2-proto-0.4.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1.0-6503028/aapt2-proto-4.1.0-6503028.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1.0-alpha01-6193524/aapt2-proto-4.1.0-alpha01-6193524.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/4.1.0/aaptcompiler-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.1.4/apksig-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.3.1/apksig-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apksig-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.3.1/apkzlib-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/apkzlib-3.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.1.4/builder-model-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.3.1/builder-model-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.1.4/builder-test-api-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.3.1/builder-test-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.1.4/builder-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.3.1/builder-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.1.0-alpha01/bundletool-0.1.0-alpha01.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.6.0/bundletool-0.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.9.0/bundletool-0.9.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.0/bundletool-0.14.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.1.4/gradle-api-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.3.1/gradle-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.1.4/gradle-core-3.1.4.pom
@@ -242,98 +207,83 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.1.4/gra
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.3.1/gradle-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gradle-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-alpha10/jetifier-core-1.0.0-alpha10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02/jetifier-core-1.0.0-beta02.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta04/jetifier-core-1.0.0-beta04.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta09/jetifier-core-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-alpha10/jetifier-processor-1.0.0-alpha10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta02/jetifier-processor-1.0.0-beta02.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta04/jetifier-processor-1.0.0-beta04.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta09/jetifier-processor-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.1.4/manifest-merger-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.3.1/manifest-merger-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.1.4/common-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.3.1/common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.1.4/ddmlib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.3.1/ddmlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.1.4/dvlib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.3.1/dvlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/27.1.0/intellij-core-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.5.4/intellij-core-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/27.1.0/kotlin-compiler-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/26.5.4/kotlin-compiler-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/27.1.0/uast-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.5.4/uast-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.1.4/layoutlib-api-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.3.1/layoutlib-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/27.1.0/layoutlib-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/27.1.0/lint-api-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.5.4/lint-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/27.1.0/lint-checks-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.5.4/lint-checks-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.1.4/lint-gradle-api-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/26.5.4/lint-gradle-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/27.1.0/lint-gradle-27.1.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/27.1.0/lint-model-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.0/lint-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/27.1.0/lint-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.5.4/lint-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.1.4/repository-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.3.1/repository-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.1.4/sdklib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.3.1/sdklib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.1.4/sdk-common-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.3.1/sdk-common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-common-27.1.0.pom
-https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.1.0/zipflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom
-https://dl.google.com/dl/android/maven2/com/google/test/platform/core-proto/0.0.2-dev/core-proto-0.0.2-dev.pom
 https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.2/BlurView-version-2.0.2.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/android/3.1.1/android-3.1.1.pom
@@ -422,47 +372,38 @@ https://repo.maven.apache.org/maven2/com/android/tools/sdk-common/24.3.1/sdk-com
 https://repo.maven.apache.org/maven2/com/android/tools/sdk-common/24.5.0/sdk-common-24.5.0.pom
 https://repo.maven.apache.org/maven2/com/drewnoakes/metadata-extractor/2.9.1/metadata-extractor-2.9.1.pom
 https://repo.maven.apache.org/maven2/com/facebook/conceal/conceal/1.1.3/conceal-1.1.3.pom
-https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni-java-only/0.2.2/fbjni-java-only-0.2.2.pom
+https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni-java-only/0.0.3/fbjni-java-only-0.0.3.pom
 https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni/0.0.2/fbjni-0.0.2.pom
 https://repo.maven.apache.org/maven2/com/facebook/flipper/flipper-fresco-plugin/0.54.0/flipper-fresco-plugin-0.54.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/flipper/flipper/0.54.0/flipper-0.54.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-base/2.2.0/animated-base-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-drawable/2.2.0/animated-drawable-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-gif/2.2.0/animated-gif-2.2.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/drawee/2.5.0/drawee-2.5.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fresco/drawee/2.0.0/drawee-2.0.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/fbcore/2.5.0/fbcore-2.5.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fresco/fbcore/2.0.0/fbcore-2.0.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/flipper/2.2.0/flipper-2.2.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/fresco/2.5.0/fresco-2.5.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fresco/fresco/2.0.0/fresco-2.0.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-base/2.0.0/imagepipeline-base-2.0.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-base/2.2.0/imagepipeline-base-2.2.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-base/2.5.0/imagepipeline-base-2.5.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-okhttp3/2.0.0/imagepipeline-okhttp3-2.0.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-native/2.5.0/imagepipeline-native-2.5.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline/2.0.0/imagepipeline-2.0.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-okhttp3/2.5.0/imagepipeline-okhttp3-2.5.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline/2.5.0/imagepipeline-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/memory-type-ashmem/2.2.0/memory-type-ashmem-2.2.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/memory-type-ashmem/2.5.0/memory-type-ashmem-2.5.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagefilters/2.0.0/nativeimagefilters-2.0.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/memory-type-java/2.5.0/memory-type-java-2.5.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagetranscoder/2.0.0/nativeimagetranscoder-2.0.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/memory-type-native/2.5.0/memory-type-native-2.5.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/middleware/2.5.0/middleware-2.5.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagefilters/2.5.0/nativeimagefilters-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagetranscoder/2.2.0/nativeimagetranscoder-2.2.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagetranscoder/2.5.0/nativeimagetranscoder-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/soloader/2.2.0/soloader-2.2.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/soloader/2.5.0/soloader-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/ui-common/2.2.0/ui-common-2.2.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/fresco/ui-common/2.5.0/ui-common-2.5.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/infer/annotation/infer-annotation/0.11.2/infer-annotation-0.11.2.pom
-https://repo.maven.apache.org/maven2/com/facebook/infer/annotation/infer-annotation/0.18.0/infer-annotation-0.18.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.8.2/annotation-0.8.2.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.9.0/annotation-0.9.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.10.1/annotation-0.10.1.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.8.0/nativeloader-0.8.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.8.2/nativeloader-0.8.2.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.9.0/nativeloader-0.9.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.10.1/nativeloader-0.10.1.pom
+https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.6.0/soloader-0.6.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.8.2/soloader-0.8.2.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.9.0/soloader-0.9.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloader-0.10.1.pom
 https://repo.maven.apache.org/maven2/com/facebook/stetho/stetho/1.3.1/stetho-1.3.1.pom
-https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.14.1/proguard-annotations-1.14.1.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0.pom
@@ -474,10 +415,7 @@ https://repo.maven.apache.org/maven2/com/github/gundy/semver4j/0.16.4/semver4j-0
 https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.pom
 https://repo.maven.apache.org/maven2/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.pom
 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/3/auto-parent-3.pom
-https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/6/auto-parent-6.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.10.1/auto-value-annotations-1.10.1.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.2/auto-value-parent-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.10.1/auto-value-parent-1.10.1.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
@@ -494,20 +432,16 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.0/gson-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.6/gson-2.8.6.pom
-https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.3.0-rc2/tink-1.3.0-rc2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.1.2/error_prone_annotations-2.1.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.2.0/error_prone_annotations-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.2/error_prone_annotations-2.3.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.1.2/error_prone_parent-2.1.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.2/error_prone_parent-2.3.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.18.0/error_prone_parent-2.18.0.pom
-https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/17.0/guava-parent-17.0.pom
@@ -516,7 +450,6 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/23.0/guava-pa
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/26.0-android/guava-parent-26.0-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/26.0-jre/guava-parent-26.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/27.0.1-jre/guava-parent-27.0.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/28.1-jre/guava-parent-28.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
@@ -524,25 +457,19 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/26.0-jre/guava-26.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/27.0.1-jre/guava-27.0.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/28.1-jre/guava-28.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
-https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.pom
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-1.1.pom
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.10.0/protobuf-bom-3.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.0.0-rc-2/protobuf-bom-4.0.0-rc-2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.10.0/protobuf-java-util-3.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.4.0/protobuf-java-3.4.0.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.0.0-rc-2/protobuf-java-4.0.0-rc-2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.10.0/protobuf-parent-3.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.0.0-rc-2/protobuf-parent-4.0.0-rc-2.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.1.3/truth-parent-1.1.3.pom
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.pom
@@ -552,46 +479,40 @@ https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-1
 https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-applinks/1.4.0/bolts-applinks-1.4.0.pom
 https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.10.0/javapoet-1.10.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-tls/4.9.1/okhttp-tls-4.9.1.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-jvm/5.0.0-alpha.11/okhttp-jvm-5.0.0-alpha.11.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/4.9.2/okhttp-urlconnection-4.9.2.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-tls/3.12.12/okhttp-tls-3.12.12.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3.12.12/okhttp-urlconnection-3.12.12.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.9.1/okhttp-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.9.1/okhttp-4.9.1.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.12/okhttp-3.12.12.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.9.2/okhttp-4.9.2.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/5.0.0-alpha.11/okhttp-5.0.0-alpha.11.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.12/parent-3.12.12.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-jvm/3.3.0/okio-jvm-3.3.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.4/okio-parent-1.17.4.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.17.4/okio-1.17.4.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.3.0/okio-3.3.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/2.21/istack-commons-runtime-2.21.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.1.1/istack-commons-runtime-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/2.21/istack-commons-2.21.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/3.0.7/istack-commons-3.0.7.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.1/istack-commons-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ext-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.2/jaxb-bom-ext-4.0.2.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-parent-2.2.11.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.3.1/jaxb-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.2/jaxb-parent-4.0.2.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/jaxb-runtime-parent-2.2.11.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.3.1/jaxb-runtime-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/jaxb-txw-parent-2.2.11.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.3.1/jaxb-txw-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.2/jaxb-txw-parent-4.0.2.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.13/FastInfoset-1.2.13.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/2.1.0/FastInfoset-2.1.0.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/fastinfoset-project-1.2.13.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.15/fastinfoset-project-1.2.15.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/2.1.0/fastinfoset-project-2.1.0.pom
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.5/antlr4-annotations-4.5.pom
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.9.0/antlr4-annotations-4.9.0.pom
@@ -609,10 +530,8 @@ https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0
 https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.pom
 https://repo.maven.apache.org/maven2/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.pom
 https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom
-https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.3.1/jaxb-api-parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.4.0-b180830.0359/jaxb-api-parent-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jaxb-api-2.2.12-b140109.1041.pom
-https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180830.0359/jaxb-api-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.pom
 https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.pom
@@ -716,24 +635,20 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom
+https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.70/bcprov-jdk15on-1.70.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.8/checker-qual-2.5.8.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/checker-qual-2.8.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.32.0/checker-qual-3.32.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.17/animal-sniffer-annotations-1.17.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.18/animal-sniffer-annotations-1.18.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.22/animal-sniffer-annotations-1.22.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.23/animal-sniffer-annotations-1.23.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.14/animal-sniffer-parent-1.14.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.17/animal-sniffer-parent-1.17.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.18/animal-sniffer-parent-1.18.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.22/animal-sniffer-parent-1.22.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.23/animal-sniffer-parent-1.23.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-parent-34.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/40/mojo-parent-40.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/50/mojo-parent-50.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/70/mojo-parent-70.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/74/mojo-parent-74.pom
 https://repo.maven.apache.org/maven2/org/conscrypt/conscrypt-android/2.0.0/conscrypt-android-2.0.0.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
@@ -747,14 +662,11 @@ https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb-bom-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.1/jaxb-bom-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.2/jaxb-bom-4.0.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/2.2.11/jaxb-core-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.2/jaxb-core-4.0.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.2.11/jaxb-runtime-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runtime-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.2.11/txw2-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.2/txw2-4.0.2.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom
@@ -777,7 +689,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.31/kotlin-android-extensions-runtime-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.3.50/kotlin-android-extensions-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.4.31/kotlin-android-extensions-1.4.31.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotations-jvm/1.3.72/kotlin-annotations-jvm-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.3.50/kotlin-annotation-processing-gradle-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.4.31/kotlin-annotation-processing-gradle-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.3.50/kotlin-build-common-1.3.50.pom
@@ -802,7 +713,6 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.2.0/kotlin-reflect-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.20/kotlin-reflect-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.50/kotlin-reflect-1.3.50.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.31/kotlin-reflect-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.3.50/kotlin-scripting-common-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.4.31/kotlin-scripting-common-1.4.31.pom
@@ -819,30 +729,26 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.20/kotlin-stdlib-common-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.50/kotlin-stdlib-common-1.3.50.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.60/kotlin-stdlib-common-1.3.60.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.71/kotlin-stdlib-common-1.3.71.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.0/kotlin-stdlib-common-1.4.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.10/kotlin-stdlib-common-1.4.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.31/kotlin-stdlib-common-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.10/kotlin-stdlib-common-1.5.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.30/kotlin-stdlib-common-1.5.30.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.20/kotlin-stdlib-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/kotlin-stdlib-jdk7-1.4.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.31/kotlin-stdlib-jdk7-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.30/kotlin-stdlib-jdk7-1.5.30.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/kotlin-stdlib-jdk8-1.4.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.30/kotlin-stdlib-jdk8-1.5.30.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0/kotlin-stdlib-jre7-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.0/kotlin-stdlib-jre8-1.2.0.pom
@@ -854,36 +760,29 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.0/ko
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.20/kotlin-stdlib-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.50/kotlin-stdlib-1.3.50.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.60/kotlin-stdlib-1.3.60.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/kotlin-stdlib-1.3.71.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.0/kotlin-stdlib-1.4.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotlin-stdlib-1.4.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.31/kotlin-stdlib-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.10/kotlin-stdlib-1.5.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.30/kotlin-stdlib-1.5.30.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/kotlin-stdlib-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.4.31/kotlin-util-io-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.4.31/kotlin-util-klib-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
-https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
-https://repo.maven.apache.org/maven2/org/json/json/20230227/json-20230227.pom
 https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.2/junit-bom-5.9.2.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
-https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.3/objenesis-3.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0/asm-analysis-6.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.4/asm-commons-9.4.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/6.0_BETA/asm-debug-all-6.0_BETA.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/5.0.1/asm-parent-5.0.1.pom
@@ -894,23 +793,18 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/6.0_BETA/asm-parent-
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.4/asm-tree-9.4.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0/asm-util-6.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/7.0/asm-util-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.0.3/asm-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.0/asm-6.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.4/asm-9.4.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom
 https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/2.0.7/jcl-over-slf4j-2.0.7.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.7/slf4j-api-2.0.7.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/2.0.7/slf4j-jdk14-2.0.7.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.0.7/slf4j-parent-2.0.7.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
-https://repo.maven.apache.org/maven2/org/tensorflow/tensorflow-lite-metadata/0.1.0-rc1/tensorflow-lite-metadata-0.1.0-rc1.pom

nix/deps/nodejs-patched/default.nix

@@ -12,9 +12,6 @@ stdenv.mkDerivation {
     "patchBuildIdPhase"
     "patchHermesPhase"
     "patchJavaPhase"
-    "patchYogaNodePackagePhase"
-    "patchReactNativePhase"
-    "patchPodPhase"
     "installPhase"
   ];
 
@@ -69,44 +66,11 @@ 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/
   '';
 
-#  Fix glog configuration issue in react-native:
-#  https://github.com/facebook/react-native/issues/33966
-#  TODO: remove this patch when we reach react-native 0.71.4
-  patchReactNativePhase = ''
-    substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh --replace \
-      'sed -i' \
-      'sed -i.bak -e'
-    substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh --replace \
-       'src/glog/logging.h.in' \
-       'src/glog/logging.h.in && rm src/glog/logging.h.in.bak'
-     substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh --replace \
-        'src/config.h.in' \
-        'src/config.h.in && rm src/config.h.in.bak'
-  '';
-
-#  Fix pod issue in react-native 0.67.5:
-#  https://stackoverflow.com/questions/71248072/no-member-named-cancelbuttontintcolor-in-jsnativeactionsheetmanagerspecsh
-#  TODO: remove this patch when maybe after 0.68.5
-  patchPodPhase = ''
-    substituteInPlace ./node_modules/react-native/React/CoreModules/RCTActionSheetManager.mm --replace \
-          '[RCTConvert UIColor:options.cancelButtonTintColor() ? @(*options.cancelButtonTintColor()) : nil];' \
-          '[RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];'
-  '';
-
-
   # 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/overlay.nix

@@ -45,7 +45,7 @@ in {
   };
 
   # Package version adjustments
-  gradle = super.gradle_6;
+  gradle = super.gradle_5;
   nodejs = super.nodejs-18_x;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
   openjdk = super.openjdk8_headless;
@@ -53,9 +53,9 @@ in {
     version = "13.3";
     allowHigher = true;
   };
-  go = super.go_1_19;
+  go = super.go_1_18;
-  buildGoPackage = super.buildGo119Package;
+  buildGoPackage = super.buildGo118Package;
-  buildGoModule = super.buildGo119Module;
+  buildGoModule = super.buildGo118Module;
   gomobile = (super.gomobile.overrideAttrs (old: {
     patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
       url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";

nix/pkgs.nix

@@ -11,11 +11,10 @@ let
   # We follow the master branch of official nixpkgs.
   nixpkgsSrc = fetchFromGitHub {
     name = "nixpkgs-source";
-    # FIXME: Fork used to get Cocoapods 1.12.0 and apksigner macOS build.
+    owner = "status-im"; # FIXME: Fork used to get Cocoapods 1.12.0.
-    owner = "status-im";
     repo = "nixpkgs";
-    rev = "d0c06fa3d3982a91aa01bd63ed84020cbde3d3ab";
+    rev = "b9b2ed705edc00003d47625950602136be3e1ed5";
-    sha256 = "sha256-8blvuUHnuf0hFr/PpBxVohJp5CaGXIXhgJlFN/cv7us=";
+    sha256 = "sha256-F0qOawdKx7kgiGqwVikYIawL2taJ1XfcgHy0Wn0mho8=";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };

nix/pkgs/aapt2/default.nix

@@ -10,7 +10,7 @@ let
 
   pname = "aapt2";
   # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  version = "4.1.0-6503028";
+  version = "3.5.4-6197926";
 
   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-oxlBy5aJcb+FgHvy6Qmbi33GsubEuXVbYSHuD4O1wIY=";
+        linux = "0hrlbxdn6bkl6qr9y599mjs0dy72q0352j30vpkza4lbq5b7rj9v";
-        osx = "sha256-zRWrjfV6P6MQaLlwNi7CBhI35U+osNfVvyL0T89NbuI=";
+        osx = "0hhvxyr0jxci01qqkcrn80h4qs3b43lqxpbss0xvrkd1nwdilmnb";
       };
     };
     sha = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}.sha1";
       sha256 = getAttr platform {
-        linux = "sha256-GlvbIDXnrjUga/NkmODJUZX+K5UtU/0fua5a8QY02+E=";
+        linux = "0ipmkl911hf17g2pb39jjkwrbb07p0cd1qd10p2fl8d1icxf63sz";
-        osx = "sha256-83WpYPsyVk/E9nddy2qUSAh+cBZ1PsS0N9516Tga35o=";
+        osx = "156jbw4xm43902c0cqrag9l1s3fg6i1irsdz8m8659i9530ywwpx";
       };
     };
     pom = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.pom}";
-      sha256 = "sha256-p7JdQj7hl/cjiVzT2ZFts1lLI9xlOOnnadXr0vDVhTs=";
+      sha256 = "00ra1xz4x1sfcf0z6x9in3b1flpyvxjbhpvhacc32r8b58nfvqzp";
     };
   };
 

nix/pkgs/android-sdk/compose.nix

@@ -10,7 +10,7 @@
 androidenv.composeAndroidPackages {
   toolsVersion = "26.1.1";
   platformToolsVersion = "33.0.2";
-  buildToolsVersions = [ "30.0.0" ];
+  buildToolsVersions = [ "31.0.0" ];
   platformVersions = [ "31" ];
   cmakeVersions = [ "3.18.1" ];
   ndkVersion = "22.1.7171670";

nix/status-go/mobile/build.nix

@@ -41,6 +41,7 @@ in buildGoPackage {
     runHook preBuild
     echo -e "\nBuilding $pname for: ${concatStringsSep "," targets}"
 
+    set -x
     gomobile bind \
       ${concatStringsSep " " goBuildFlags} \
       -ldflags="$ldflags" \

package.json

@@ -12,6 +12,9 @@
     "app:packager": "react-native start --host 0.0.0.0 --port 8081",
     "app:android": "react-native run-android"
   },
+  "resolutions": {
+    "react-devtools-core": "^4.26.0"
+  },
   "dependencies": {
     "@babel/preset-typescript": "^7.17.12",
     "@react-native-async-storage/async-storage": "^1.17.9",
@@ -34,13 +37,13 @@
     "i18n-js": "^3.3.0",
     "node-libs-react-native": "^1.2.1",
     "qrcode": "^1.4.1",
-    "react": "17.0.2",
+    "react": "16.13.1",
     "react-dom": "^16.4.2",
-    "react-native": "0.67.5",
+    "react-native": "0.63.5",
     "react-native-background-timer": "^2.1.1",
     "react-native-blob-util": "^0.13.18",
     "react-native-camera-kit": "^8.0.4",
-    "react-native-config": "^1.5.0",
+    "react-native-config": "git+https://github.com/status-im/react-native-config.git#refs/tags/v1.4.2-status",
     "react-native-dialogs": "^1.0.4",
     "react-native-draggable-flatlist": "^3.0.3",
     "react-native-fast-image": "^8.5.11",
@@ -88,13 +91,13 @@
     "@types/jest": "^28.1.6",
     "concurrently": "^7.6.0",
     "detox": "^19.9.1",
-    "jest": "^26.6.3",
+    "jest": "^25.1.0",
     "jest-circus": "^26.0.0",
     "jest-image-snapshot": "^5.1.0",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
     "process": "0.11.10",
-    "react-test-renderer": "17.0.2",
+    "react-test-renderer": "16.13.1",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "2.11.16"
   },

src/quo2/components/code/code/style.cljs

@@ -1,87 +0,0 @@
-(ns quo2.components.code.code.style
-  (:require [quo2.foundations.colors :as colors]))
-
-;; Example themes:
-;; https://github.com/react-syntax-highlighter/react-syntax-highlighter/tree/master/src/styles/hljs
-(defn theme
-  [theme-key]
-  (case theme-key
-    :hljs-comment (colors/theme-colors colors/neutral-40 colors/neutral-60)
-    :hljs-title   (colors/custom-color-by-theme :sky 50 60)
-    :hljs-keyword (colors/custom-color-by-theme :green 50 60)
-    :hljs-string  (colors/custom-color-by-theme :turquoise 50 60)
-    :hljs-literal (colors/custom-color-by-theme :turquoise 50 60)
-    :hljs-number  (colors/custom-color-by-theme :turquoise 50 60)
-    :line-number  colors/neutral-40
-    nil))
-
-(defn text-style
-  [class-names]
-  (let [text-color (->> class-names
-                        (map keyword)
-                        (some (fn [class-name]
-                                (when-let [text-color (theme class-name)]
-                                  text-color))))]
-    (cond-> {:flex-shrink 1
-             :line-height 18}
-      text-color (assoc :color text-color))))
-
-(defn border-color
-  []
-  (colors/theme-colors colors/neutral-20 colors/neutral-80))
-
-(defn container
-  []
-  {:overflow         :hidden
-   :padding          8
-   :background-color (colors/theme-colors colors/white colors/neutral-80-opa-40)
-   :border-color     (border-color)
-   :border-width     1
-   :border-radius    16})
-
-(def gradient-container
-  {:position :absolute
-   :bottom   0
-   :left     0
-   :right    0
-   :z-index  1})
-
-(def gradient {:height 48})
-
-(defn line-number-container
-  [line-number-width]
-  {:position         :absolute
-   :bottom           0
-   :top              0
-   :left             0
-   :width            (+ line-number-width 8 7)
-   :background-color (colors/theme-colors colors/neutral-5 colors/neutral-80)})
-
-(defn divider
-  [line-number-width]
-  {:position         :absolute
-   :bottom           0
-   :top              0
-   :left             (+ line-number-width 7 7)
-   :width            1
-   :z-index          2
-   :background-color (border-color)})
-
-(def line {:flex-direction :row})
-
-(defn line-number
-  [width]
-  {:margin-right 20 ; 8+12 margin
-   :width        width})
-
-(def copy-button
-  {:position :absolute
-   :bottom   8
-   :right    8
-   :z-index  1})
-
-(defn gradient-color [] (colors/theme-colors colors/white colors/neutral-80))
-
-(defn button-background-color
-  []
-  (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5))

src/quo2/components/code/snippet.cljs

@@ -1,110 +1,175 @@
 (ns quo2.components.code.snippet
   (:require [cljs-bean.core :as bean]
             [clojure.string :as string]
+            [oops.core :as oops]
             [quo2.components.buttons.button :as button]
-            [quo2.components.code.code.style :as style]
             [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]
+            [quo2.theme :as theme]
             [react-native.core :as rn]
             [react-native.linear-gradient :as linear-gradient]
+            [react-native.masked-view :as masked-view]
             [react-native.syntax-highlighter :as highlighter]
             [reagent.core :as reagent]))
 
+;; Example themes:
+;; https://github.com/react-syntax-highlighter/react-syntax-highlighter/tree/master/src/styles/hljs
+(def ^:private themes
+  {:light {:hljs-comment {:color colors/neutral-40}
+           :hljs-title   {:color (colors/custom-color :blue 50)}
+           :hljs-keyword {:color (colors/custom-color :green 50)}
+           :hljs-string  {:color (colors/custom-color :turquoise 50)}
+           :hljs-literal {:color (colors/custom-color :turquoise 50)}
+           :hljs-number  {:color (colors/custom-color :turquoise 50)}
+           :line-number  {:color colors/neutral-40}}
+   :dark  {:hljs-comment {:color colors/neutral-60}
+           :hljs-title   {:color (colors/custom-color :blue 60)}
+           :hljs-keyword {:color (colors/custom-color :green 60)}
+           :hljs-string  {:color (colors/custom-color :turquoise 60)}
+           :hljs-literal {:color (colors/custom-color :turquoise 60)}
+           :hljs-number  {:color (colors/custom-color :turquoise 60)}
+           :line-number  {:color colors/neutral-40}}})
+
+(defn- text-style
+  [class-names]
+  (->> class-names
+       (map keyword)
+       (reduce #(merge %1 (get-in themes [(theme/get-theme) %2]))
+               {:flex-shrink 1
+                ;; Round to a nearest whole number to achieve consistent
+                ;; spacing (also important for calculating `max-text-height`).
+                ;; Line height seems to be inconsistent between text being
+                ;; wrapped and text being rendered on a newline using Flexbox
+                ;; layout.
+                :line-height 18})))
+
 (defn- render-nodes
   [nodes]
-  (map (fn [{:keys [children value last-line?] :as node}]
+  (map (fn [{:keys [children value] :as node}]
+         ;; Node can have :children or a :value.
          (if children
            (into [text/text
-                  (cond-> {:weight :code
+                  {:weight :code
-                           :size   :paragraph-2
+                   :size   :paragraph-2
-                           :style  (style/text-style (get-in node [:properties :className]))}
+                   :style  (text-style (get-in node [:properties :className]))}]
-                    last-line? (assoc :number-of-lines 1))]
                  (render-nodes children))
            ;; Remove newlines as we already render each line separately.
-           (string/trim-newline value)))
+           (-> value string/trim-newline)))
        nodes))
 
-(defn- line
-  [{:keys [line-number line-number-width]} children]
-  [rn/view {:style style/line}
-   [rn/view {:style (style/line-number line-number-width)}
-    [text/text
-     {:style  (style/text-style ["line-number"])
-      :weight :code
-      :size   :paragraph-2}
-     line-number]]
-   children])
-
 (defn- code-block
   [{:keys [rows line-number-width]}]
-  [rn/view
+  [into [:<>]
    (->> rows
         (render-nodes)
-        (map-indexed (fn [idx row-content]
+        ;; Line numbers
-                       [line
+        (map-indexed (fn [idx row]
-                        {:line-number       (inc idx)
+                       (conj [rn/view {:style {:flex-direction :row}}
-                         :line-number-width line-number-width}
+                              [rn/view
-                        row-content]))
+                               {:style {:width        line-number-width
-        (into [:<>]))])
+                                        ;; 8+12 margin
-
+                                        :margin-right 20}}
-(defn- mask-view
+                               [text/text
-  [{:keys [apply-mask?]} child]
+                                {:weight :code
-  (if apply-mask?
+                                 :size   :paragraph-2
-    [:<>
+                                 :style  (text-style ["line-number"])}
-     [rn/view {:style style/gradient-container}
+                                (inc idx)]]]
-      [linear-gradient/linear-gradient
+                             row))))])
-       {:style  style/gradient
-        :colors [:transparent (style/gradient-color)]}
-       [rn/view {:style style/gradient}]]]
-     child]
-    child))
-
-(defn- calc-line-number-width
-  [font-scale rows-to-show]
-  (let [max-line-digits (-> rows-to-show str count)]
-    (if (= 1 max-line-digits)
-      18 ;; ~ 9 is char width, 18 is width used in Figma.
-      (* 9 max-line-digits font-scale))))
 
 (defn- native-renderer
-  [{:keys [rows max-lines on-copy-press]
+  []
-    :or   {max-lines ##Inf}}]
+  (let [text-height (reagent/atom nil)]
-  (let [font-scale          (:font-scale (rn/use-window-dimensions))
+    (fn [{:keys [rows max-lines on-copy-press]}]
-        total-rows          (count rows)
+      (let [background-color      (colors/theme-colors
-        number-rows-to-show (min (count rows) max-lines)
+                                   colors/white
-        line-number-width   (calc-line-number-width font-scale number-rows-to-show)
+                                   colors/neutral-80-opa-40)
-        truncated?          (< number-rows-to-show total-rows)
+            background-color-left (colors/theme-colors
-        rows-to-show-coll   (if truncated?
+                                   colors/neutral-5
-                              (as-> rows $
+                                   colors/neutral-80)
-                                (update $ number-rows-to-show assoc :last-line? true)
+            border-color          (colors/theme-colors
-                                (take (inc number-rows-to-show) $))
+                                   colors/neutral-20
-                              rows)]
+                                   colors/neutral-80)
-    [rn/view {:style (style/container)}
+            rows                  (bean/->clj rows)
-     [rn/view {:style (style/line-number-container line-number-width)}]
+            font-scale            (:font-scale (rn/use-window-dimensions))
-     [rn/view {:style (style/divider line-number-width)}]
+            max-rows              (or max-lines (count rows)) ;; Cut down on rows to process.
-     [mask-view {:apply-mask? truncated?}
+            max-line-digits       (-> rows count (min max-rows) str count)
-      [code-block
+            ;; ~ 9 is char width, 18 is width used in Figma.
-       {:rows              rows-to-show-coll
+            line-number-width     (* font-scale (max 18 (* 9 max-line-digits)))
-        :line-number-width line-number-width}]]
+            max-text-height       (some-> max-lines
-     [rn/view {:style style/copy-button}
+                                          (* font-scale 18)) ;; 18 is font's line height.
-      [button/button
+            truncated?            (and max-text-height (< max-text-height @text-height))
-       {:icon                      true
+            maybe-mask-wrapper    (if truncated?
-        :type                      :grey
+                                    [masked-view/masked-view
-        :size                      24
+                                     {:mask-element
-        :on-press                  on-copy-press
+                                      (reagent/as-element
-        :override-background-color (style/button-background-color)}
+                                       [linear-gradient/linear-gradient
-       :main-icons/copy]]]))
+                                        {:colors    ["black" "transparent"]
+                                         :locations [0.75 1]
+                                         :style     {:flex 1}}])}]
+                                    [:<>])]
+
+        [rn/view
+         {:style {:overflow         :hidden
+                  :padding          8
+                  :background-color background-color
+                  :border-color     border-color
+                  :border-width     1
+                  :border-radius    8
+                  ;; Hide on intial render to avoid flicker when mask-wrapper is shown.
+                  :opacity          (if @text-height 1 0)}}
+         ;; Line number container
+         [rn/view
+          {:style {:position           :absolute
+                   :bottom             0
+                   :top                0
+                   :left               0
+                   :width              (+ line-number-width 8 8)
+                   :background-color   background-color-left
+                   :border-right-color border-color
+                   :border-right-width 1}}]
+         (conj maybe-mask-wrapper
+               [rn/view {:max-height max-text-height}
+                [rn/view
+                 {:on-layout (fn [evt]
+                               (let [height (oops/oget evt "nativeEvent.layout.height")]
+                                 (reset! text-height height)))}
+                 [code-block
+                  {:rows              (take max-rows rows)
+                   :line-number-width line-number-width}]]])
+
+         ;; Copy button
+         [rn/view
+          {:style {:position :absolute
+                   :bottom   8
+                   :right    8}}
+          [button/button
+           {:icon     true
+            :type     :grey
+            :size     24
+            :on-press on-copy-press}
+           :main-icons/copy]]]))))
+
+(defn- wrap-renderer-fn
+  [f {:keys [max-lines on-copy-press]}]
+  (fn [^js props]
+    (reagent/as-element [:f> f
+                         {:rows          (.-rows props)
+                          :max-lines     max-lines
+                          :on-copy-press on-copy-press}])))
 
 (defn snippet
   [{:keys [language max-lines on-copy-press]} children]
   [highlighter/highlighter
    {:language          language
-    :renderer          (fn [^js/Object props]
+    :renderer          (wrap-renderer-fn
-                         (reagent/as-element
+                        native-renderer
-                          [:f> native-renderer
+                        {:max-lines     max-lines
-                           {:rows          (-> props .-rows bean/->clj)
+                         :on-copy-press #(when on-copy-press
-                            :on-copy-press #(when on-copy-press (on-copy-press children))
+                                           (on-copy-press children))})
-                            :max-lines     max-lines}]))
+    ;; Default props to adapt Highlighter for react-native.
+    ;;:CodeTag           react-native/View
+    ;;:PreTag            react-native/View
     :show-line-numbers false
-    :style             {}
+    :style             #js {}
-    :custom-style      {:background-color nil}}
+    :custom-style      #js {:backgroundColor nil}}
    children])

src/quo2/components/inputs/input/view.cljs

@@ -139,7 +139,7 @@
        (assoc props
               :accessibility-label :password-input
               :auto-capitalize     :none
-              :auto-complete       :password-new
+              :auto-complete       :new-password
               :secure-text-entry   (not @password-shown?)
               :right-icon          {:style-fn  style/password-icon
                                     :icon-name (if @password-shown? :i/hide :i/reveal)

src/quo2/components/links/url_preview/component_spec.cljs

@@ -1,29 +0,0 @@
-(ns quo2.components.links.url-preview.component-spec
-  (:require
-    [quo2.components.links.url-preview.view :as view]
-    [test-helpers.component :as h]))
-
-(h/describe "Links - URL Preview"
-  (h/test "default render"
-    (h/render [view/view])
-    (h/is-truthy (h/query-by-label-text :title))
-    (h/is-truthy (h/query-by-label-text :logo))
-    (h/is-truthy (h/query-by-label-text :button-clear-preview))
-    (h/is-null (h/query-by-label-text :url-preview-loading)))
-
-  (h/test "on-clear event"
-    (let [on-clear (h/mock-fn)]
-      (h/render [view/view {:on-clear on-clear}])
-      (h/fire-event :press (h/get-by-label-text :button-clear-preview))
-      (h/was-called on-clear)))
-
-  (h/describe "loading state"
-    (h/test "shows a loading container"
-      (h/render [view/view {:loading? true :loading-message "Hello"}])
-      (h/is-null (h/query-by-label-text :title))
-      (h/is-truthy (h/query-by-label-text :url-preview-loading)))
-
-    (h/test "renders if `loading-message` is not passed"
-      (h/render [view/view {:loading? true}])
-      (h/is-null (h/query-by-label-text :title))
-      (h/is-truthy (h/query-by-label-text :url-preview-loading)))))

src/quo2/components/links/url_preview/style.cljs

@@ -1,58 +0,0 @@
-(ns quo2.components.links.url-preview.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(def horizontal-padding 12)
-
-(defn container
-  []
-  {:height             56
-   :background-color   (colors/theme-colors colors/neutral-5 colors/neutral-90)
-   :padding-vertical   10
-   :padding-horizontal horizontal-padding
-   :border-radius      12
-   :align-self         :stretch
-   :flex-direction     :row})
-
-(defn loading-container
-  []
-  {:height          56
-   :border-width    1
-   :border-radius   12
-   :border-style    :dashed
-   :align-items     :center
-   :justify-content :center
-   :align-self      :stretch
-   :padding         horizontal-padding
-   :border-color    (colors/theme-colors colors/neutral-30 colors/neutral-80)})
-
-(defn loading-message
-  []
-  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)})
-
-(def logo
-  {:width         16
-   :height        16
-   :top           1
-   :border-radius 8})
-
-(def content-container
-  {:margin-left 6
-   :flex        1})
-
-(defn title
-  []
-  {:color (colors/theme-colors colors/neutral-100 colors/white)})
-
-(defn body
-  []
-  {:text-transform :lowercase
-   :color          (colors/theme-colors colors/neutral-50 colors/neutral-40)})
-
-(def clear-button
-  {:border-color colors/danger-50
-   :border-width 1})
-
-(def clear-button-container
-  {:width       20
-   :height      20
-   :margin-left 6})

src/quo2/components/links/url_preview/view.cljs

@@ -1,63 +0,0 @@
-(ns quo2.components.links.url-preview.view
-  (:require
-    [quo2.components.icon :as icon]
-    [quo2.components.links.url-preview.style :as style]
-    [quo2.components.markdown.text :as text]
-    [quo2.foundations.colors :as colors]
-    [react-native.core :as rn]))
-
-(defn- logo-component
-  [{:keys [logo]}]
-  [rn/image
-   {:accessibility-label :logo
-    :source              logo
-    :style               style/logo}])
-
-(defn- content
-  [{:keys [title body]}]
-  [rn/view {:style style/content-container}
-   [text/text
-    {:accessibility-label :title
-     :size                :paragraph-2
-     :weight              :semi-bold
-     :number-of-lines     1
-     :style               (style/title)}
-    title]
-   [text/text
-    {:accessibility-label :body
-     :size                :paragraph-2
-     :weight              :medium
-     :number-of-lines     1
-     :style               (style/body)}
-    body]])
-
-(defn- clear-button
-  [{:keys [on-press]}]
-  [rn/touchable-opacity
-   {:on-press            on-press
-    :style               style/clear-button-container
-    :hit-slop            {:top 3 :right 3 :bottom 3 :left 3}
-    :accessibility-label :button-clear-preview}
-   [icon/icon :i/clear
-    {:size            20
-     :container-style style/clear-button
-     :color           (colors/theme-colors colors/neutral-50 colors/neutral-60)}]])
-
-(defn view
-  [{:keys [title body logo on-clear loading? loading-message container-style]}]
-  (if loading?
-    [rn/view
-     {:accessibility-label :url-preview-loading
-      :style               (merge (style/loading-container) container-style)}
-     [rn/text
-      {:size            :paragraph-2
-       :weight          :medium
-       :number-of-lines 1
-       :style           (style/loading-message)}
-      loading-message]]
-    [rn/view
-     {:accessibility-label :url-preview
-      :style               (merge (style/container) container-style)}
-     [logo-component {:logo logo}]
-     [content {:title title :body body}]
-     [clear-button {:on-press on-clear}]]))

src/quo2/components/list_items/user_list.cljs

@@ -5,7 +5,7 @@
             [quo2.components.icon :as icons]
             [quo2.foundations.colors :as colors]
             [quo2.components.messages.author.view :as author]
-            [quo2.components.selectors.selectors.view :as selectors]))
+            [quo2.components.selectors.selectors :as selectors]))
 
 (def container-style
   {:margin-horizontal  8

src/quo2/components/record_audio/record_audio/view.cljs

@@ -15,6 +15,7 @@
             [quo2.components.record-audio.record-audio.buttons.lock-button :as lock-button]
             [quo2.components.record-audio.record-audio.buttons.delete-button :as delete-button]
             [quo2.components.record-audio.record-audio.buttons.record-button :as record-button]
+            [react-native.platform :as platform]
             [clojure.string :as string]))
 
 (def ^:private min-audio-duration-ms 500)
@@ -537,7 +538,7 @@
           [rn/view
            {:test-ID                       "record-audio"
             :style                         style/button-container
-            :hit-slop                      {:top    -70
+            :hit-slop                      {:top    (if platform/ios? -70 0)
                                             :bottom 0
                                             :left   0
                                             :right  0}

src/quo2/components/selectors/__tests__/selectors_component_spec.cljs

@@ -0,0 +1,84 @@
+(ns quo2.components.selectors.--tests--.selectors-component-spec
+  (:require ["@testing-library/react-native" :as rtl]
+            [quo2.components.selectors.selectors :as selectors]
+            [reagent.core :as reagent]))
+
+(defn render-toggle
+  ([]
+   (render-toggle {}))
+  ([opts]
+   (rtl/render (reagent/as-element [selectors/toggle opts]))))
+
+(defn render-checkbox
+  ([]
+   (render-checkbox {}))
+  ([opts]
+   (rtl/render (reagent/as-element [selectors/checkbox opts]))))
+
+(defn render-checkbox-prefill
+  ([]
+   (render-checkbox-prefill {}))
+  ([opts]
+   (rtl/render (reagent/as-element [selectors/checkbox-prefill opts]))))
+
+(defn render-radio
+  ([]
+   (render-radio {}))
+  ([opts]
+   (rtl/render (reagent/as-element [selectors/radio opts]))))
+
+(js/global.test "default render of toggle component"
+  (fn []
+    (render-toggle)
+    (-> (js/expect (rtl/screen.getByTestId "toggle-component"))
+        (.toBeTruthy))))
+
+(js/global.test "toggle component on change is working"
+  (let [mock-fn (js/jest.fn)]
+    (fn []
+      (render-toggle {:on-change mock-fn})
+      (rtl/fireEvent.press (rtl/screen.getByTestId "toggle-component"))
+      (-> (js/expect mock-fn)
+          (.toHaveBeenCalledTimes 1)))))
+
+(js/global.test "default render of radio component"
+  (fn []
+    (render-radio)
+    (-> (js/expect (rtl/screen.getByTestId "radio-component"))
+        (.toBeTruthy))))
+
+(js/global.test "radio component on change is working"
+  (let [mock-fn (js/jest.fn)]
+    (fn []
+      (render-radio {:on-change mock-fn})
+      (rtl/fireEvent.press (rtl/screen.getByTestId "radio-component"))
+      (-> (js/expect mock-fn)
+          (.toHaveBeenCalledTimes 1)))))
+
+(js/global.test "default render of checkbox component"
+  (fn []
+    (render-checkbox)
+    (-> (js/expect (rtl/screen.getByTestId "checkbox-component"))
+        (.toBeTruthy))))
+
+(js/global.test "checkbox component on change is working"
+  (let [mock-fn (js/jest.fn)]
+    (fn []
+      (render-checkbox {:on-change mock-fn})
+      (rtl/fireEvent.press (rtl/screen.getByTestId "checkbox-component"))
+      (-> (js/expect mock-fn)
+          (.toHaveBeenCalledTimes 1)))))
+
+(js/global.test "default render of checkbox-prefill component"
+  (fn []
+    (render-checkbox-prefill)
+    (-> (js/expect (rtl/screen.getByTestId "checkbox-prefill-component"))
+        (.toBeTruthy))))
+
+(js/global.test "checkbox-prefill component on change is working"
+  (let [mock-fn (js/jest.fn)]
+    (fn []
+      (render-checkbox-prefill {:on-change mock-fn})
+      (rtl/fireEvent.press (rtl/screen.getByTestId "checkbox-prefill-component"))
+      (-> (js/expect mock-fn)
+          (.toHaveBeenCalledTimes 1)))))

src/quo2/components/selectors/disclaimer/view.cljs

@@ -1,7 +1,7 @@
 (ns quo2.components.selectors.disclaimer.view
   (:require [quo2.components.markdown.text :as text]
             [quo2.components.selectors.disclaimer.style :as style]
-            [quo2.components.selectors.selectors.view :as selectors]
+            [quo2.components.selectors.selectors :as selectors]
             [react-native.core :as rn]))
 
 (defn view
@@ -10,9 +10,8 @@
    {:style (merge container-style (style/container blur?))}
    [selectors/checkbox
     {:accessibility-label accessibility-label
-     :blur?               blur?
+     :on-change           on-change
-     :checked?            checked?
+     :checked?            checked?}]
-     :on-change           on-change}]
    [text/text
     {:size  :paragraph-2
      :style style/text}

src/quo2/components/selectors/selectors.cljs

@@ -0,0 +1,109 @@
+(ns quo2.components.selectors.selectors
+  (:require [quo2.components.icon :as icons]
+            [quo2.foundations.colors :as colors]
+            [react-native.core :as rn]
+            [reagent.core :as reagent]
+            [quo2.components.selectors.styles :as style]))
+
+(defn- handle-press
+  [disabled? on-change checked?]
+  (when (not disabled?)
+    (fn []
+      (swap! checked? not)
+      (when on-change (on-change @checked?)))))
+
+(defn checkbox-prefill
+  [{:keys [default-checked?]}]
+  (let [internal-checked? (reagent/atom (or default-checked? false))]
+    (fn [{:keys [on-change disabled? blurred-background? container-style checked?]}]
+      (when (and (not (nil? checked?)) (not= @internal-checked? checked?))
+        (reset! internal-checked? checked?))
+      (let [checked? (or checked? @internal-checked?)]
+        [rn/touchable-without-feedback
+         {:on-press (handle-press disabled? on-change internal-checked?)}
+         [rn/view
+          {:style               (merge
+                                 container-style
+                                 (style/checkbox-prefill blurred-background? disabled?))
+           :accessibility-label (str "checkbox-" (if checked? "on" "off"))
+           :accessibility-role  :checkbox
+           :testID              "checkbox-prefill-component"}
+          (when checked?
+            [rn/view
+             {:style
+              {:height 20
+               :width  20}}
+             [icons/icon :i/check-small
+              {:size  20
+               :color (colors/theme-colors
+                       (colors/alpha colors/neutral-100 (if disabled? 0.3 1))
+                       (colors/alpha colors/white (if disabled? 0.3 1)))}]])]]))))
+
+(defn checkbox
+  [{:keys [default-checked?]}]
+  (let [internal-checked? (reagent/atom (or default-checked? false))]
+    (fn [{:keys [on-change disabled? blurred-background? container-style checked?]}]
+      (when (and (not (nil? checked?)) (not= @internal-checked? checked?))
+        (reset! internal-checked? checked?))
+      (let [checked? (or checked? @internal-checked?)]
+        [rn/touchable-without-feedback
+         {:on-press (handle-press disabled? on-change internal-checked?)}
+         [rn/view
+          {:style (merge
+                   container-style
+                   {:height 20
+                    :width  20})}
+          [rn/view
+           {:style               (style/checkbox blurred-background? disabled? checked?)
+            :accessibility-label (str "checkbox-" (if checked? "on" "off"))
+            :accessibility-role  :checkbox
+            :testID              "checkbox-component"}
+           (when checked?
+             [rn/view
+              {:style
+               {:height 20
+                :width  20}}
+              [icons/icon :i/check-small
+               {:size  20
+                :color colors/white}]])]]]))))
+
+(defn radio
+  [{:keys [default-checked?]}]
+  (let [internal-checked? (reagent/atom (or default-checked? false))]
+    (fn [{:keys [on-change disabled? blurred-background? container-style checked?]}]
+      (when (and (not (nil? checked?)) (not= @internal-checked? checked?))
+        (reset! internal-checked? checked?))
+      (let [checked? (or checked? @internal-checked?)]
+        [rn/touchable-without-feedback
+         {:on-press (handle-press disabled? on-change internal-checked?)}
+         [rn/view
+          {:style               (merge
+                                 container-style
+                                 (style/radio checked? disabled? blurred-background?))
+           :accessibility-label (str "radio-" (if checked? "on" "off"))
+           :accessibility-role  :checkbox
+           :testID              "radio-component"}
+
+          [rn/view
+           {:style
+            (style/radio-inner checked? disabled? blurred-background?)}]]]))))
+
+(defn toggle
+  [{:keys [default-checked?]}]
+  (let [internal-checked? (reagent/atom (or default-checked? false))]
+    (fn [{:keys [on-change disabled? blurred-background? container-style checked?]}]
+      (when (and (not (nil? checked?)) (not= @internal-checked? checked?))
+        (reset! internal-checked? checked?))
+      (let [checked? (or checked? @internal-checked?)]
+        [rn/touchable-without-feedback
+         {:on-press (handle-press disabled? on-change internal-checked?)}
+         [rn/view
+          {:style               (merge
+                                 container-style
+                                 (style/toggle checked? disabled? blurred-background?))
+           :accessibility-label (str "toggle-" (if checked? "on" "off"))
+           :accessibility-role  :checkbox
+           :testID              "toggle-component"}
+          [rn/view
+           {:style
+            (style/toggle-inner checked? disabled? blurred-background?)}]]]))))

src/quo2/components/selectors/selectors/component_spec.cljs

@@ -1,68 +0,0 @@
-(ns quo2.components.selectors.selectors.component-spec
-  (:require [quo2.components.selectors.selectors.view :as selectors]
-            [reagent.core :as reagent]
-            [test-helpers.component :as h]))
-
-(defn render-toggle
-  ([]
-   (render-toggle {}))
-  ([opts]
-   (h/render (reagent/as-element [selectors/toggle opts]))))
-
-(defn render-checkbox
-  ([]
-   (render-checkbox {}))
-  ([opts]
-   (h/render (reagent/as-element [selectors/checkbox opts]))))
-
-(defn render-checkbox-prefill
-  ([]
-   (render-checkbox-prefill {}))
-  ([opts]
-   (h/render (reagent/as-element [selectors/checkbox-prefill opts]))))
-
-(defn render-radio
-  ([]
-   (render-radio {}))
-  ([opts]
-   (h/render (reagent/as-element [selectors/radio opts]))))
-
-(h/test "default render of toggle component"
-  (render-toggle)
-  (h/is-truthy (h/get-by-test-id "toggle-component")))
-
-(h/test "toggle component on change is working"
-  (let [mock-fn (h/mock-fn)]
-    (render-toggle {:on-change mock-fn})
-    (h/fire-event :press (h/get-by-test-id "toggle-component"))
-    (h/was-called mock-fn)))
-
-(h/test "default render of radio component"
-  (render-radio)
-  (h/is-truthy (h/get-by-test-id "radio-component")))
-
-(h/test "radio component on change is working"
-  (let [mock-fn (h/mock-fn)]
-    (render-radio {:on-change mock-fn})
-    (h/fire-event :press (h/get-by-test-id "radio-component"))
-    (h/was-called mock-fn)))
-
-(h/test "default render of checkbox component"
-  (render-checkbox)
-  (h/is-truthy (h/get-by-test-id "checkbox-component")))
-
-(h/test "checkbox component on change is working"
-  (let [mock-fn (h/mock-fn)]
-    (render-checkbox {:on-change mock-fn})
-    (h/fire-event :press (h/get-by-test-id "checkbox-component"))
-    (h/was-called mock-fn)))
-
-(h/test "default render of checkbox-prefill component"
-  (render-checkbox-prefill)
-  (h/is-truthy (h/get-by-test-id "checkbox-prefill-component")))
-
-(h/test "checkbox-prefill component on change is working"
-  (let [mock-fn (h/mock-fn)]
-    (render-checkbox-prefill {:on-change mock-fn})
-    (h/fire-event :press (h/get-by-test-id "checkbox-prefill-component"))
-    (h/was-called mock-fn)))

src/quo2/components/selectors/selectors/style.cljs

@@ -1,127 +0,0 @@
-(ns quo2.components.selectors.selectors.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(defn toggle-background-color
-  [custom-color]
-  {:normal {:checked   (colors/custom-color-by-theme custom-color 50 60)
-            :unchecked (colors/theme-colors colors/neutral-30 colors/neutral-80)}
-   :blur   {:checked   (colors/theme-colors (colors/custom-color custom-color 50) colors/white-opa-70)
-            :unchecked (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-10)}})
-
-(defn radio-border-color
-  [customization-color]
-  {:normal {:checked   (colors/custom-color-by-theme customization-color 50 60)
-            :unchecked (colors/theme-colors colors/neutral-30 colors/neutral-70)}
-   :blur   {:checked   (colors/theme-colors (colors/custom-color customization-color 50)
-                                            colors/white)
-            :unchecked (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-40)}})
-
-(defn radio-background-unchecked-color
-  []
-  {:normal (colors/theme-colors colors/white-opa-40 colors/neutral-80-opa-40)
-   :blur   colors/white-opa-5})
-
-(defn checkbox-background-color
-  [customization-color]
-  {:normal {:checked   (colors/custom-color-by-theme customization-color 50 60)
-            :unchecked (colors/theme-colors colors/white-opa-40 colors/neutral-80-opa-40)}
-   :blur   {:checked   (colors/theme-colors (colors/custom-color customization-color 50)
-                                            colors/white)
-            :unchecked colors/white-opa-5}})
-
-(defn checkbox-border-unchecked-color
-  []
-  {:normal (colors/theme-colors colors/neutral-30 colors/neutral-70)
-   :blur   (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-40)})
-
-(defn checkbox-prefill-background-color
-  []
-  {:normal (colors/theme-colors colors/neutral-30 colors/neutral-80)
-   :blur   (colors/theme-colors colors/neutral-80-opa-10 colors/white-opa-10)})
-
-(defn- get-color
-  [color-map & [blur? checked?]]
-  (let [blur-type (if blur? :blur :normal)]
-    (if (some? checked?)
-      (get-in color-map [blur-type (if checked? :checked :unchecked)])
-      (get color-map blur-type))))
-
-(defn toggle
-  [{:keys [checked? disabled? blur? container-style customization-color]}]
-  (assoc container-style
-         :height           20
-         :width            30
-         :border-radius    20
-         :opacity          (if disabled? 0.3 1)
-         :background-color (get-color (toggle-background-color customization-color) blur? checked?)))
-
-(defn toggle-inner
-  [{:keys [checked?]}]
-  {:height           16
-   :width            16
-   :background-color colors/white
-   :border-radius    20
-   :margin-left      (if checked? 12 2)
-   :margin-right     :auto
-   :margin-top       :auto
-   :margin-bottom    :auto})
-
-(defn radio
-  [{:keys [checked? disabled? blur? container-style customization-color]}]
-  (assoc container-style
-         :height           20
-         :width            20
-         :border-radius    20
-         :border-width     1.2
-         :opacity          (if disabled? 0.3 1)
-         :background-color (when-not checked?
-                             (get-color (radio-background-unchecked-color) blur?))
-         :border-color     (get-color (radio-border-color customization-color) blur? checked?)))
-
-(defn radio-inner
-  [{:keys [checked? blur? customization-color]}]
-  {:height           14
-   :width            14
-   :margin           1.8
-   :border-radius    7
-   :background-color (when checked?
-                       (get-color (radio-border-color customization-color) blur? checked?))})
-
-(defn checkbox
-  [{:keys [checked? disabled? blur? container-style customization-color]}]
-  (assoc container-style
-         :height           20
-         :width            20
-         :border-radius    6
-         :opacity          (if disabled? 0.3 1)
-         :border-width     (if checked? 0 1.2)
-         :background-color (get-color (checkbox-background-color customization-color) blur? checked?)
-         :border-color     (when-not checked?
-                             (get-color (checkbox-border-unchecked-color) blur?))))
-
-(defn common-checkbox-inner
-  [{:keys [checked?]}]
-  (let [size (if checked? 20 0)]
-    {:height size :width size}))
-
-(defn checkbox-check
-  [_checked? blur?]
-  {:size  20
-   :color (if blur?
-            (colors/theme-colors colors/white colors/neutral-100)
-            colors/white)})
-
-(defn checkbox-prefill
-  [{:keys [disabled? blur? container-style]}]
-  (assoc container-style
-         :height           21
-         :width            21
-         :border-radius    6
-         :opacity          (if disabled? 0.3 1)
-         :background-color (get-color (checkbox-prefill-background-color) blur?)))
-
-(defn checkbox-prefill-check
-  [checked? _blur?]
-  {:size  20
-   :color (when checked? (colors/theme-colors colors/neutral-100 colors/white))})
-

src/quo2/components/selectors/selectors/view.cljs

@@ -1,76 +0,0 @@
-(ns quo2.components.selectors.selectors.view
-  (:require [quo2.components.icon :as icons]
-            [quo2.components.selectors.selectors.style :as style]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]))
-
-(defn- handle-press
-  [on-change checked-atom checked?]
-  (when checked-atom (swap! checked-atom not))
-  (when on-change (on-change (not checked?))))
-
-(defn- selector
-  [{:keys [default-checked? checked?]}]
-  (let [controlled-component? (some? checked?)
-        internal-checked?     (when-not controlled-component?
-                                (reagent/atom (or default-checked? false)))]
-    (fn [{:keys [checked? disabled? blur? customization-color on-change container-style
-                 label-prefix outer-style-fn inner-style-fn icon-style-fn]
-          :or   {customization-color :blue}}]
-      (let [actual-checked?     (if controlled-component? checked? @internal-checked?)
-            accessibility-label (str label-prefix "-" (if actual-checked? "on" "off"))
-            test-id             (str label-prefix "-component")
-            outer-styles        (outer-style-fn {:checked?            actual-checked?
-                                                 :disabled?           disabled?
-                                                 :blur?               blur?
-                                                 :container-style     container-style
-                                                 :customization-color customization-color})]
-        [rn/touchable-without-feedback
-         (when-not disabled?
-           {:on-press #(handle-press on-change internal-checked? actual-checked?)})
-         [rn/view
-          {:style                             outer-styles
-           :needs-offscreen-alpha-compositing true
-           :accessibility-label               accessibility-label
-           :accessibility-role                :checkbox
-           :testID                            test-id}
-          [rn/view
-           {:style (inner-style-fn {:checked?            actual-checked?
-                                    :blur?               blur?
-                                    :customization-color customization-color})}
-           (when (and icon-style-fn actual-checked?)
-             [icons/icon :i/check-small (icon-style-fn actual-checked? blur?)])]]]))))
-
-(defn toggle
-  [props]
-  [selector
-   (assoc props
-          :label-prefix   "toggle"
-          :outer-style-fn style/toggle
-          :inner-style-fn style/toggle-inner)])
-
-(defn radio
-  [props]
-  [selector
-   (assoc props
-          :label-prefix   "radio"
-          :outer-style-fn style/radio
-          :inner-style-fn style/radio-inner)])
-
-(defn checkbox
-  [props]
-  [selector
-   (assoc props
-          :label-prefix   "checkbox"
-          :outer-style-fn style/checkbox
-          :inner-style-fn style/common-checkbox-inner
-          :icon-style-fn  style/checkbox-check)])
-
-(defn checkbox-prefill
-  [props]
-  [selector
-   (assoc props
-          :label-prefix   "checkbox-prefill"
-          :outer-style-fn style/checkbox-prefill
-          :inner-style-fn style/common-checkbox-inner
-          :icon-style-fn  style/checkbox-prefill-check)])

src/quo2/components/selectors/styles.cljs

@@ -0,0 +1,130 @@
+(ns quo2.components.selectors.styles
+  (:require [quo2.foundations.colors :as colors]))
+
+(defn get-color
+  [checked? disabled? blurred-background?]
+  (cond
+    checked?
+    (colors/custom-color-by-theme
+     :primary
+     50
+     60
+     (when disabled? 30)
+     (when disabled? 30))
+    blurred-background?
+    (colors/theme-colors
+     (colors/alpha colors/neutral-80 (if disabled? 0.05 0.1))
+     (colors/alpha colors/white (if disabled? 0.05 0.1)))
+    :else
+    (colors/theme-colors
+     (colors/alpha colors/neutral-20 (if disabled? 0.4 1))
+     (colors/alpha colors/neutral-70 (if disabled? 0.3 1)))))
+
+(defn checkbox-prefill
+  [blurred-background? disabled?]
+  {:height           21
+   :width            21
+   :border-radius    6
+   :background-color (if blurred-background?
+                       (colors/theme-colors
+                        (colors/alpha colors/neutral-80
+                                      (if disabled? 0.05 0.1))
+                        (colors/alpha colors/white (if disabled? 0.05 0.1)))
+                       (colors/theme-colors
+                        (colors/alpha colors/neutral-20
+                                      (if disabled? 0.3 1))
+                        (colors/alpha colors/neutral-70
+                                      (if disabled? 0.3 1))))})
+
+(defn checkbox
+  [blurred-background? disabled? checked?]
+  {:flex             1
+   :border-radius    6
+   :border-width     (if checked? 0 1)
+   :background-color (cond
+                       checked?
+                       (get-color checked? disabled? blurred-background?)
+                       blurred-background?
+                       (colors/theme-colors
+                        colors/white-opa-5
+                        colors/white-opa-10)
+                       :else
+                       (colors/theme-colors
+                        colors/white
+                        colors/neutral-80-opa-40))
+   :border-color     (if checked?
+                       :none
+                       (get-color checked?
+                                  disabled?
+                                  blurred-background?))})
+
+(defn checkbox-toggle
+  [checked? disabled? blurred-background?]
+  {:flex             1
+   :border-radius    6
+   :border-width     (if @checked? 0 1)
+   :background-color (cond
+                       @checked?
+                       (get-color @checked? disabled? blurred-background?)
+                       blurred-background?
+                       (colors/theme-colors
+                        colors/white-opa-5
+                        colors/white-opa-10)
+                       :else
+                       (colors/theme-colors
+                        colors/white
+                        colors/neutral-80-opa-40))
+   :border-color     (if @checked?
+                       :none
+                       (get-color @checked? disabled? blurred-background?))})
+
+(defn radio
+  [checked? disabled? blurred-background?]
+  {:height           20
+   :width            20
+   :border-radius    20
+   :border-width     1
+   :border-color     (get-color checked?
+                                disabled?
+                                blurred-background?)
+   :background-color (when-not blurred-background?
+                       (colors/theme-colors colors/white
+                                            (colors/alpha colors/neutral-80
+                                                          0.4)))})
+
+(defn toggle
+  [checked? disabled? blurred-background?]
+  {:height           20
+   :width            30
+   :border-radius    20
+   :background-color (get-color checked?
+                                disabled?
+                                blurred-background?)})
+
+(defn toggle-inner
+  [checked? disabled? blurred-background?]
+  {:margin-left      (if checked? 12 2)
+   :height           16
+   :width            16
+   :background-color (if blurred-background?
+                       (colors/theme-colors
+                        (colors/alpha colors/white (if disabled? 0.4 1))
+                        (colors/alpha colors/white (if disabled? 0.3 1)))
+                       (colors/theme-colors
+                        (colors/alpha colors/white 1)
+                        (colors/alpha colors/white (if disabled? 0.4 1))))
+   :border-radius    20
+   :margin-right     :auto
+   :margin-top       :auto
+   :margin-bottom    :auto})
+
+(defn radio-inner
+  [checked? disabled? blurred-background?]
+  {:margin-left      :auto
+   :height           14
+   :width            14
+   :background-color (when checked? (get-color checked? disabled? blurred-background?))
+   :border-radius    20
+   :margin-right     :auto
+   :margin-top       :auto
+   :margin-bottom    :auto})

src/quo2/components/settings/privacy_option.cljs

@@ -1,7 +1,7 @@
 (ns quo2.components.settings.privacy-option
   (:require [quo2.components.icon :as icons]
             [quo2.components.markdown.text :as text]
-            [quo2.components.selectors.selectors.view :as selectors]
+            [quo2.components.selectors.selectors :as selectors]
             [quo2.components.settings.style :as style]
             [quo2.foundations.colors :as colors]
             [react-native.core :as rn]))

src/quo2/components/share/qr_code/style.cljs

@@ -1,12 +0,0 @@
-(ns quo2.components.share.qr-code.style)
-
-(def container
-  {:flex-direction  :row
-   :justify-content :center})
-
-(defn image
-  [width height]
-  {:width         width
-   :height        height
-   :border-radius 12
-   :aspect-ratio  1})

src/quo2/components/share/qr_code/view.cljs

@@ -1,11 +0,0 @@
-(ns quo2.components.share.qr-code.view
-  (:require [quo2.components.share.qr-code.style :as style]
-            [react-native.core :as rn]))
-
-(defn qr-code
-  [{:keys [source width height]}]
-  [rn/view
-   {:style style/container}
-   [rn/image
-    {:source source
-     :style  (style/image width height)}]])

src/quo2/components/share/share_qr_code/component_spec.cljs

@@ -1,33 +0,0 @@
-(ns quo2.components.share.share-qr-code.component-spec
-  (:require [quo2.components.share.share-qr-code.view :as share-qr-code]
-            [test-helpers.component :as h]))
-
-(h/describe "Share QR Code component"
-  (h/test "renders share qr code component"
-    (h/render [share-qr-code/view
-               {:link-title " A test title"}])
-    (-> (js/expect (h/get-by-text "A test title"))
-        (.toBeTruthy)))
-
-  (h/test "renders share qr code url"
-    (h/render [share-qr-code/view
-               {:qr-url " A test url"}])
-    (-> (js/expect (h/get-by-text "A test url"))
-        (.toBeTruthy)))
-
-  (h/test "on press link event fires"
-    (let [event (h/mock-fn)]
-      (h/render [share-qr-code/view
-                 {:url-on-press event
-                  :qr-url       " A test url"}])
-      (h/fire-event :press (h/get-by-text "A test url"))
-      (-> (js/expect event)
-          (.toHaveBeenCalledTimes 1))))
-
-  (h/test "on press share event fires"
-    (let [event (h/mock-fn)]
-      (h/render [share-qr-code/view
-                 {:share-on-press event}])
-      (h/fire-event :press (h/get-by-label-text :share-profile))
-      (-> (js/expect event)
-          (.toHaveBeenCalledTimes 1)))))

src/quo2/components/share/share_qr_code/style.cljs

@@ -1,44 +0,0 @@
-(ns quo2.components.share.share-qr-code.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(def qr-code-container
-  {:padding-top        12
-   :padding-horizontal 12
-   :padding-bottom     8
-   :border-radius      16
-   :background-color   colors/white-opa-5
-   :flex-direction     :column
-   :justify-content    :center
-   :align-items        :center})
-
-(def profile-address-column
-  {:margin-horizontal :auto
-   :flex              4})
-
-(def profile-address-container
-  {:flex-direction  :row
-   :justify-content :space-between
-   :margin-top      6})
-
-(def profile-address-content-container
-  {:padding-top 2
-   :align-self  :flex-start})
-
-(def profile-address-content
-  {:color colors/white})
-
-(def profile-address-label
-  {:color colors/white-opa-40})
-
-(def share-button-container
-  {:flex            1
-   :flex-direction  :column
-   :justify-content :center
-   :align-items     :flex-end})
-
-(def icon-container
-  {:height          36
-   :flex-direction  :row
-   :align-items     :center
-   :justify-content :space-between
-   :padding-bottom  12})

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

@@ -1,49 +0,0 @@
-(ns quo2.components.share.share-qr-code.view
-  (:require [quo2.components.share.share-qr-code.style :as style]
-            [quo2.components.share.qr-code.view :as qr-code]
-            [react-native.blur :as blur]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.buttons.button :as button]
-            [react-native.core :as rn]))
-
-(defn view
-  [{:keys [source link-title
-           url-on-press url-on-long-press qr-url share-on-press]}]
-  [blur/ios-view
-   {:style     style/qr-code-container
-    :blur-type :light}
-   [qr-code/qr-code
-    {:source source
-     :width  "100%"
-     :height 311}]
-   [rn/view {:style style/profile-address-container}
-    [rn/view {:style style/profile-address-column}
-     [text/text
-      {:size   :paragraph-2
-       :weight :medium
-       :style  style/profile-address-label}
-      link-title]
-     [rn/touchable-highlight
-      {:active-opacity   1
-       :underlay-color   colors/neutral-80-opa-1-blur
-       :background-color :transparent
-       :on-press         url-on-press
-       :on-long-press    url-on-long-press
-       :style            style/profile-address-content-container}
-      [text/text
-       {:style           style/profile-address-content
-        :size            :paragraph-1
-        :weight          :medium
-        :ellipsize-mode  :middle
-        :number-of-lines 1}
-       qr-url]]]
-    [rn/view {:style style/share-button-container}
-     [button/button
-      {:icon                true
-       :type                :blur-bg
-       :size                32
-       :accessibility-label :share-profile
-       :override-theme      :dark
-       :on-press            share-on-press}
-      :i/share]]]])

src/quo2/components/text_combinations/title/style.cljs

@@ -1,15 +0,0 @@
-(ns quo2.components.text-combinations.title.style
-  (:require
-    [quo2.foundations.colors :as colors]))
-
-(def title-container
-  {:justify-content    :center
-   :margin-top         12
-   :padding-horizontal 20})
-
-(def title-text
-  {:color colors/white})
-
-(def subtitle-text
-  {:color         colors/white
-   :margin-bottom 8})

src/quo2/components/text_combinations/title/view.cljs

@@ -1,25 +0,0 @@
-(ns quo2.components.text-combinations.title.view
-  (:require
-    [quo2.components.markdown.text :as text]
-    [quo2.components.text-combinations.title.style :as style]
-    [react-native.core :as rn]))
-
-(defn title
-  [{:keys [title
-           title-accessibility-label
-           subtitle
-           subtitle-accessibility-label]}]
-  [rn/view {:style style/title-container}
-   [text/text
-    {:accessibility-label title-accessibility-label
-     :weight              :semi-bold
-     :size                :heading-1
-     :style               style/title-text}
-    title]
-   (when subtitle
-     [text/text
-      {:accessibility-label subtitle-accessibility-label
-       :weight              :regular
-       :size                :paragraph-1
-       :style               style/subtitle-text}
-      subtitle])])

src/quo2/core.cljs

@@ -33,7 +33,6 @@
     quo2.components.inputs.input.view
     quo2.components.inputs.title-input.view
     quo2.components.inputs.profile-input.view
-    quo2.components.links.url-preview.view
     quo2.components.list-items.channel
     quo2.components.list-items.menu-item
     quo2.components.list-items.preview-list
@@ -56,12 +55,10 @@
     quo2.components.record-audio.record-audio.view
     quo2.components.selectors.disclaimer.view
     quo2.components.selectors.filter.view
-    quo2.components.selectors.selectors.view
+    quo2.components.selectors.selectors
     quo2.components.separator
     quo2.components.settings.accounts.view
     quo2.components.settings.privacy-option
-    quo2.components.share.qr-code.view
-    quo2.components.share.share-qr-code.view
     quo2.components.onboarding.small-option-card.view
     quo2.components.tabs.segmented-tab
     quo2.components.tabs.account-selector
@@ -72,7 +69,6 @@
     quo2.components.tags.tag
     quo2.components.tags.tags
     quo2.components.tags.token-tag
-    quo2.components.text-combinations.title.view
     quo2.components.list-items.user-list))
 
 (def toast quo2.components.notifications.toast/toast)
@@ -95,11 +91,13 @@
 (def group-avatar-tag quo2.components.tags.context-tags/group-avatar-tag)
 (def audio-tag quo2.components.tags.context-tags/audio-tag)
 (def community-tag quo2.components.tags.context-tags/community-tag)
-
+(def tabs quo2.components.tabs.tabs/tabs)
+(def segmented-control quo2.components.tabs.segmented-tab/segmented-control)
+(def account-selector quo2.components.tabs.account-selector/account-selector)
 (def floating-shell-button quo2.components.navigation.floating-shell-button/floating-shell-button)
 (def page-nav quo2.components.navigation.page-nav/page-nav)
 (def disclaimer quo2.components.selectors.disclaimer.view/view)
-(def checkbox quo2.components.selectors.selectors.view/checkbox)
+(def checkbox quo2.components.selectors.selectors/checkbox)
 (def filter quo2.components.selectors.filter.view/view)
 (def skeleton quo2.components.loaders.skeleton/skeleton)
 (def author quo2.components.messages.author.view/author)
@@ -178,24 +176,9 @@
 (def privacy-option quo2.components.settings.privacy-option/card)
 (def account quo2.components.settings.accounts.view/account)
 
-;;;; SHARE
-(def qr-code quo2.components.share.qr-code.view/qr-code)
-(def share-qr-code quo2.components.share.share-qr-code.view/view)
-
-;;;; TABS
-(def tabs quo2.components.tabs.tabs/tabs)
-(def segmented-control quo2.components.tabs.segmented-tab/segmented-control)
-(def account-selector quo2.components.tabs.account-selector/account-selector)
-
 ;;;; TAGS
 (def tag quo2.components.tags.tag/tag)
 (def tags quo2.components.tags.tags/tags)
 (def permission-tag quo2.components.tags.permission-tag/tag)
 (def status-tag quo2.components.tags.status-tags/status-tag)
 (def token-tag quo2.components.tags.token-tag/tag)
-
-;;;; TITLE
-(def title quo2.components.text-combinations.title.view/title)
-
-;;;; LINKS
-(def url-preview quo2.components.links.url-preview.view/view)

src/quo2/core_spec.cljs

@@ -1,27 +1,24 @@
 (ns quo2.core-spec
-  (:require
+  (:require [quo2.components.avatars.user-avatar.component-spec]
-    [quo2.components.avatars.user-avatar.component-spec]
+            [quo2.components.banners.banner.component-spec]
-    [quo2.components.banners.banner.component-spec]
+            [quo2.components.buttons.--tests--.buttons-component-spec]
-    [quo2.components.buttons.--tests--.buttons-component-spec]
+            [quo2.components.colors.color-picker.component-spec]
-    [quo2.components.colors.color-picker.component-spec]
+            [quo2.components.counter.--tests--.counter-component-spec]
-    [quo2.components.counter.--tests--.counter-component-spec]
+            [quo2.components.dividers.--tests--.divider-label-component-spec]
-    [quo2.components.dividers.--tests--.divider-label-component-spec]
+            [quo2.components.dividers.strength-divider.component-spec]
-    [quo2.components.dividers.strength-divider.component-spec]
+            [quo2.components.drawers.action-drawers.component-spec]
-    [quo2.components.drawers.action-drawers.component-spec]
+            [quo2.components.drawers.drawer-buttons.component-spec]
-    [quo2.components.drawers.drawer-buttons.component-spec]
+            [quo2.components.drawers.permission-context.component-spec]
-    [quo2.components.drawers.permission-context.component-spec]
+            [quo2.components.inputs.input.component-spec]
-    [quo2.components.inputs.input.component-spec]
+            [quo2.components.inputs.profile-input.component-spec]
-    [quo2.components.inputs.profile-input.component-spec]
+            [quo2.components.inputs.title-input.component-spec]
-    [quo2.components.inputs.title-input.component-spec]
+            [quo2.components.markdown.--tests--.text-component-spec]
-    [quo2.components.links.url-preview.component-spec]
+            [quo2.components.onboarding.small-option-card.component-spec]
-    [quo2.components.markdown.--tests--.text-component-spec]
+            [quo2.components.password.tips.component-spec]
-    [quo2.components.onboarding.small-option-card.component-spec]
+            [quo2.components.profile.select-profile.component-spec]
-    [quo2.components.password.tips.component-spec]
+            [quo2.components.record-audio.record-audio.--tests--.record-audio-component-spec]
-    [quo2.components.profile.select-profile.component-spec]
+            [quo2.components.record-audio.soundtrack.--tests--.soundtrack-component-spec]
-    [quo2.components.record-audio.record-audio.--tests--.record-audio-component-spec]
+            [quo2.components.selectors.--tests--.selectors-component-spec]
-    [quo2.components.record-audio.soundtrack.--tests--.soundtrack-component-spec]
+            [quo2.components.selectors.disclaimer.component-spec]
-    [quo2.components.selectors.disclaimer.component-spec]
+            [quo2.components.selectors.filter.component-spec]
-    [quo2.components.selectors.filter.component-spec]
+            [quo2.components.tags.--tests--.status-tags-component-spec]))
-    [quo2.components.selectors.selectors.component-spec]
-    [quo2.components.share.share-qr-code.component-spec]
-    [quo2.components.tags.--tests--.status-tags-component-spec]))

src/react_native/syntax_highlighter.cljs

@@ -1,11 +1,5 @@
 (ns react-native.syntax-highlighter
-  (:require ["react-native" :as react-native]
+  (:require ["react-syntax-highlighter" :default Highlighter]
-            ["react-syntax-highlighter" :default Highlighter]))
+            [reagent.core :as reagent]))
 
-
+(def highlighter (reagent/adapt-react-class Highlighter))
-(defn highlighter
-  [props code-string]
-  [:> Highlighter
-   ;; Default props to adapt Highlighter for react-native.
-   (assoc props :Code-tag react-native/View :Pre-tag react-native/View)
-   code-string])

src/status_im/chat/models/input.cljs

@@ -41,19 +41,36 @@
 
 (rf/defn select-mention
   {:events [:chat.ui/select-mention]}
-  [{:keys [db] :as cofx} text-input-ref {:keys [primary-name searched-text match public-key] :as user}]
+  [{:keys [db] :as cofx} text-input-ref {:keys [primary-name searched-text match] :as user}]
-  (let [chat-id (:current-chat-id db)
+  (let [chat-id     (:current-chat-id db)
-        text    (get-in db [:chat/inputs chat-id :input-text])
+        new-text    (mentions/new-input-text-with-mention cofx user)
-        method  "wakuext_chatMentionNewInputTextWithMention"
+        at-sign-idx (get-in db [:chats/mentions chat-id :mentions :at-sign-idx])
-        params  [chat-id text primary-name]]
+        cursor      (+ at-sign-idx (count primary-name) 2)]
-    {:json-rpc/call [{:method     method
+    (rf/merge
-                      :params     params
+     cofx
-                      :on-success #(rf/dispatch [:mention/on-new-input-text-with-mentions-success %
+     {:db                   (-> db
-                                                 primary-name text-input-ref match searched-text
+                                (assoc-in [:chats/cursor chat-id] cursor)
-                                                 public-key])
+                                (assoc-in [:chats/mention-suggestions chat-id] nil))
-                      :on-error   #(rf/dispatch [:mention/on-error
+      :set-text-input-value [chat-id new-text text-input-ref]}
-                                                 {:method method
+     (set-chat-input-text new-text chat-id)
-                                                  :params params} %])}]}))
+     ;; NOTE(rasom): Some keyboards do not react on selection property passed to
+     ;; text input (specifically Samsung keyboard with predictive text set on).
+     ;; In this case, if the user continues typing after the programmatic change,
+     ;; the new text is added to the last known cursor position before
+     ;; programmatic change. By calling `reset-text-input-cursor` we force the
+     ;; keyboard's cursor position to be changed before the next input.
+     (mentions/reset-text-input-cursor text-input-ref cursor)
+     ;; NOTE(roman): on-text-input event is not dispatched when we change input
+     ;; programmatically, so we have to call `on-text-input` manually
+     (mentions/on-text-input
+      (let [match-len (count match)
+            start     (inc at-sign-idx)
+            end       (+ start match-len)]
+        {:new-text      match
+         :previous-text searched-text
+         :start         start
+         :end           end}))
+     (mentions/recheck-at-idxs {primary-name user}))))
 
 (rf/defn disable-chat-cooldown
   "Turns off chat cooldown (protection against message spamming)"
@@ -165,7 +182,8 @@
     (rf/merge cofx
               {:set-text-input-value [current-chat-id ""]}
               (clean-input current-chat-id)
-              (mentions/clear-mentions))))
+              (mentions/clear-mentions)
+              (mentions/clear-cursor))))
 
 (rf/defn send-messages
   [{:keys [db] :as cofx} input-text current-chat-id]
@@ -233,29 +251,13 @@
   [{{:keys [current-chat-id] :as db} :db :as cofx}]
   (let [{:keys [input-text metadata]} (get-in db [:chat/inputs current-chat-id])
         editing-message               (:editing-message metadata)
-        method                        "wakuext_chatMentionCheckMentions"
+        input-text-with-mentions      (mentions/check-mentions cofx input-text)]
-        params                        [current-chat-id input-text]]
+    (rf/merge cofx
-    {:json-rpc/call [{:method     method
+              (if editing-message
-                      :params     params
+                (send-edited-message input-text-with-mentions editing-message)
-                      :on-error   #(rf/dispatch [:mention/on-error {:method method :params params} %])
+                (send-messages input-text-with-mentions current-chat-id))
-                      :on-success #(rf/dispatch [:mention/on-check-mentions-success
+              (mentions/clear-mentions)
-                                                 current-chat-id
+              (mentions/clear-cursor))))
-                                                 editing-message
-                                                 input-text
-                                                 %])}]}))
-
-(rf/defn on-check-mentions-success
-  {:events [:mention/on-check-mentions-success]}
-  [{:keys [db] :as cofx} current-chat-id editing-message input-text new-text]
-  (log/debug "[mentions] on-check-mentions-success"
-             {:chat-id         current-chat-id
-              :editing-message editing-message
-              :input-text      input-text
-              :new-text        new-text})
-  (rf/merge cofx
-            (if editing-message
-              (send-edited-message new-text editing-message)
-              (send-messages new-text current-chat-id))))
 
 (rf/defn send-contact-request
   {:events [:contacts/send-contact-request]}
@@ -269,6 +271,7 @@
                                          :on-error    #(log/warn "failed to send a contact request" %)
                                          :on-success  #(re-frame/dispatch [:transport/message-sent %])}]}
             (mentions/clear-mentions)
+            (mentions/clear-cursor)
             (clean-input (:current-chat-id db))))
 
 (rf/defn cancel-contact-request
@@ -279,6 +282,7 @@
     (rf/merge cofx
               {:db (assoc-in db [:chat/inputs current-chat-id :metadata :sending-contact-request] nil)}
               (mentions/clear-mentions)
+              (mentions/clear-cursor)
               (clean-input (:current-chat-id db)))))
 
 (rf/defn chat-send-sticker

src/status_im/chat/models/mentions_test.cljs

@@ -0,0 +1,323 @@
+(ns status-im.chat.models.mentions-test
+  (:require [cljs.test :as test]
+            [clojure.string :as string]
+            [status-im.chat.models.mentions :as mentions]))
+
+(def ->info-input
+  [[:text "H."]
+   [:mention
+    "@helpinghand.eth"]
+   [:text
+    " "]])
+
+(def ->info-expected
+  {:at-sign-idx   2
+   :mention-end   19
+   :new-text      " "
+   :previous-text ""
+   :start         18
+   :end           18
+   :at-idxs       [{:mention? true
+                    :from     2
+                    :to       17
+                    :checked? true}]})
+
+(test/deftest test->info
+  (test/testing "->info base case"
+    (test/is (= ->info-expected (mentions/->info ->info-input)))))
+
+;; No mention
+(def mention-text-1 "parse-text")
+(def mention-text-result-1 [[:text "parse-text"]])
+
+;; Mention in the middle
+(def mention-text-2
+  "hey @0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073 he")
+(def mention-text-result-2
+  [[:text "hey "]
+   [:mention
+    "0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073"]
+   [:text " he"]])
+
+;; Mention at the beginning
+(def mention-text-3
+  "@0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073 he")
+(def mention-text-result-3
+  [[:mention
+    "0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073"]
+   [:text " he"]])
+
+;; Mention at the end
+(def mention-text-4
+  "hey @0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073")
+(def mention-text-result-4
+  [[:text "hey "]
+   [:mention
+    "0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073"]])
+
+;; Invalid mention
+(def mention-text-5
+  "invalid @0x04fBce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073")
+(def mention-text-result-5
+  [[:text
+    "invalid @0x04fBce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073"]])
+
+(test/deftest test-to-input
+  (test/testing "only text"
+    (test/is (= mention-text-result-1 (mentions/->input-field mention-text-1))))
+  (test/testing "in the middle"
+    (test/is (= mention-text-result-2 (mentions/->input-field mention-text-2))))
+  (test/testing "at the beginning"
+    (test/is (= mention-text-result-3 (mentions/->input-field mention-text-3))))
+  (test/testing "at the end"
+    (test/is (= mention-text-result-4 (mentions/->input-field mention-text-4))))
+  (test/testing "invalid"
+    (test/is (= mention-text-result-5 (mentions/->input-field mention-text-5)))))
+
+(test/deftest test-replace-mentions
+  (let [users {"User Number One"
+               {:primary-name "User Number One"
+                :public-key   "0xpk1"}
+               "User Number Two"
+               {:primary-name   "user2"
+                :secondary-name "User Number Two"
+                :public-key     "0xpk2"}
+               "User Number Three"
+               {:primary-name   "user3"
+                :secondary-name "User Number Three"
+                :public-key     "0xpk3"}}]
+    (test/testing "empty string"
+      (let [text   ""
+            result (mentions/replace-mentions text users)]
+        (test/is (= result text) (pr-str text))))
+
+    (test/testing "no text"
+      (let [text   nil
+            result (mentions/replace-mentions text users)]
+        (test/is (= result text) (pr-str text))))
+
+    (test/testing "incomlepte mention 1"
+      (let [text   "@"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result text) (pr-str text))))
+
+    (test/testing "incomplete mention 2"
+      (let [text   "@r"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result text) (pr-str text))))
+
+    (test/testing "no mentions"
+      (let [text   "foo bar @buzz kek @foo"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result text) (pr-str text))))
+
+    (test/testing "starts with mention"
+      (let [text   "@User Number One"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "@0xpk1") (pr-str text))))
+
+    (test/testing "starts with mention, comma after mention"
+      (let [text   "@User Number One,"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "@0xpk1,") (pr-str text))))
+
+    (test/testing "starts with mention but no space after"
+      (let [text   "@User Number Onefoo"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result text) (pr-str text))))
+
+    (test/testing "starts with mention, some text after mention"
+      (let [text   "@User Number One foo"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "@0xpk1 foo") (pr-str text))))
+
+    (test/testing "starts with some text, then mention"
+      (let [text   "text @User Number One"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "text @0xpk1") (pr-str text))))
+
+    (test/testing "starts with some text, then mention, then more text"
+      (let [text   "text @User Number One foo"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "text @0xpk1 foo") (pr-str text))))
+
+    (test/testing "no space before mention"
+      (let [text   "text@User Number One"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "text@0xpk1") (pr-str text))))
+
+    (test/testing "two different mentions"
+      (let [text   "@User Number One @User Number two"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "@0xpk1 @0xpk2") (pr-str text))))
+
+    (test/testing "two different mentions, separated with comma"
+      (let [text   "@User Number One,@User Number two"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "@0xpk1,@0xpk2") (pr-str text))))
+
+    (test/testing "two different mentions inside text"
+      (let [text   "foo@User Number One bar @User Number two baz"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "foo@0xpk1 bar @0xpk2 baz") (pr-str text))))
+
+    (test/testing "ens mention"
+      (let [text   "@user2"
+            result (mentions/replace-mentions text users)]
+        (test/is (= result "@0xpk2") (pr-str text))))
+
+    (test/testing "multiple mentions"
+      (let [text             (string/join
+                              " "
+                              (repeat 1000 "@User Number One @User Number two"))
+            result           (mentions/replace-mentions text users)
+            exprected-result (string/join
+                              " "
+                              (repeat 1000 "@0xpk1 @0xpk2"))]
+        (test/is (= exprected-result result))))
+    (test/testing "markdown"
+      (test/testing "single * case 1"
+        (let [text   "*@user2*"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "single * case 2"
+        (let [text   "*@user2 *"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "*@0xpk2 *") (pr-str text))))
+
+      (test/testing "single * case 3"
+        (let [text   "a*@user2*"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "single * case 4"
+        (let [text   "*@user2 foo*foo"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "*@0xpk2 foo*foo") (pr-str text))))
+
+      (test/testing "single * case 5"
+        (let [text   "a *@user2*"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "single * case 6"
+        (let [text   "*@user2 foo*"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "single * case 7"
+        (let [text   "@user2 *@user2 foo* @user2"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "@0xpk2 *@user2 foo* @0xpk2") (pr-str text))))
+
+      (test/testing "single * case 8"
+        (let [text   "*@user2 foo**@user2 foo*"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "single * case 9"
+        (let [text   "*@user2 foo***@user2 foo* @user2"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "*@user2 foo***@user2 foo* @0xpk2") (pr-str text))))
+
+      (test/testing "double * case 1"
+        (let [text   "**@user2**"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "double * case 2"
+        (let [text   "**@user2 **"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "**@0xpk2 **") (pr-str text))))
+
+      (test/testing "double * case 3"
+        (let [text   "a**@user2**"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "double * case 4"
+        (let [text   "**@user2 foo**foo"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "**@user2 foo**foo") (pr-str text))))
+
+      (test/testing "double * case 5"
+        (let [text   "a **@user2**"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "double * case 6"
+        (let [text   "**@user2 foo**"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "double * case 7"
+        (let [text   "@user2 **@user2 foo** @user2"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "@0xpk2 **@user2 foo** @0xpk2") (pr-str text))))
+
+      (test/testing "double * case 8"
+        (let [text   "**@user2 foo****@user2 foo**"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "double * case 9"
+        (let [text   "**@user2 foo*****@user2 foo** @user2"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "**@user2 foo*****@user2 foo** @0xpk2") (pr-str text))))
+
+      (test/testing "tripple * case 1"
+        (let [text   "***@user2 foo***@user2 foo*"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "***@user2 foo***@0xpk2 foo*") (pr-str text))))
+
+      (test/testing "tripple ~ case 1"
+        (let [text   "~~~@user2 foo~~~@user2 foo~"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "quote case 1"
+        (let [text   ">@user2"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "quote case 2"
+        (let [text   "\n>@user2"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "quote case 3"
+        (let [text   "\n> @user2 \n   \n @user2"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "\n> @user2 \n   \n @0xpk2") (pr-str text))))
+
+      (test/testing "quote case 4"
+        (let [text   ">@user2\n\n>@user2"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "quote case 5"
+        (let [text   "***hey\n\n>@user2\n\n@user2 foo***"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "***hey\n\n>@user2\n\n@0xpk2 foo***")
+                   (pr-str text))))
+
+      (test/testing "code case 1"
+        (let [text   "` @user2 `"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "code case 2"
+        (let [text   "` @user2 `"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "code case 3"
+        (let [text   "``` @user2 ```"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result text) (pr-str text))))
+
+      (test/testing "code case 4"
+        (let [text   "` ` @user2 ``"
+              result (mentions/replace-mentions text users)]
+          (test/is (= result "` ` @0xpk2 ``") (pr-str text)))))))

src/status_im/data_store/messages.cljs

@@ -41,8 +41,7 @@
         :albumId                  :album-id
         :imageWidth               :image-width
         :imageHeight              :image-height
-        :new                      :new?
+        :new                      :new?})
-        :albumImagesCount         :album-images-count})
 
       (update :quoted-message
               set/rename-keys

src/status_im/events.cljs

@@ -115,7 +115,7 @@
   {:events [:system-theme-mode-changed]}
   [{:keys [db] :as cofx} _]
   (let [current-theme-type (get-in cofx [:db :multiaccount :appearance])]
-    (when (and (multiaccounts.model/logged-in? db)
+    (when (and (multiaccounts.model/logged-in? cofx)
                (= current-theme-type status-im2.constants/theme-type-system))
       {:multiaccounts.ui/switch-theme-fx
        [(get-in db [:multiaccount :appearance])

src/status_im/keycard/recovery.cljs

@@ -238,7 +238,7 @@
                                                        :t/keycard-can-use-with-new-passcode
                                                        :t/keycard-backup-success-body))}}
             (cond
-              (multiaccounts.model/logged-in? db)
+              (multiaccounts.model/logged-in? cofx)
               (navigation/set-stack-root :profile-stack [:my-profile :keycard-settings])
 
               (:multiaccounts/login db)

src/status_im/mobile_sync_settings/core.cljs

@@ -21,7 +21,7 @@
 (rf/defn on-network-status-change
   [{:keys [db] :as cofx}]
   (let [initialized?                       (get db :network-status/initialized?)
-        logged-in?                         (multiaccounts.model/logged-in? db)
+        logged-in?                         (multiaccounts.model/logged-in? cofx)
         {:keys [remember-syncing-choice?]} (:multiaccount db)]
     (apply
      rf/merge

src/status_im/multiaccounts/key_storage/core.cljs

@@ -21,10 +21,10 @@
 (rf/defn key-and-storage-management-pressed
   "This event can be dispatched before login and from profile and needs to redirect accordingly"
   {:events [::key-and-storage-management-pressed]}
-  [{:keys [db] :as cofx}]
+  [cofx]
   (navigation/navigate-to
    cofx
-   (if (multiaccounts.model/logged-in? db)
+   (if (multiaccounts.model/logged-in? cofx)
      :actions-logged-in
      :actions-not-logged-in)
    nil))

src/status_im/multiaccounts/login/core.cljs

@@ -476,6 +476,9 @@
   "Decides which root should be initialised depending on user and app state"
   [db]
   (cond
+    (get db :local-pairing/completed-pairing?)
+    (re-frame/dispatch [:syncing/pairing-completed])
+
     (get db :onboarding-2/new-account?)
     (re-frame/dispatch [:onboarding-2/finalize-setup])
 
@@ -487,9 +490,8 @@
 
 (rf/defn login-only-events
   [{:keys [db] :as cofx} key-uid password save-password?]
-  (let [auth-method          (:auth-method db)
+  (let [auth-method     (:auth-method db)
-        new-auth-method      (get-new-auth-method auth-method save-password?)
+        new-auth-method (get-new-auth-method auth-method save-password?)]
-        pairing-in-progress? (get-in db [:syncing :pairing-in-progress?])]
     (log/debug "[login] login-only-events"
                "auth-method"     auth-method
                "new-auth-method" new-auth-method)
@@ -498,8 +500,7 @@
                :json-rpc/call
                [{:method     "settings_getSettings"
                  :on-success #(do (re-frame/dispatch [::get-settings-callback %])
-                                  (when-not pairing-in-progress?
+                                  (redirect-to-root db))}]}
-                                    (redirect-to-root db)))}]}
               (notifications/load-notification-preferences)
               (when save-password?
                 (keychain/save-user-password key-uid password))

src/status_im/multiaccounts/model.cljs

@@ -1,8 +1,9 @@
 (ns status-im.multiaccounts.model)
 
 (defn logged-in?
-  [{:keys [multiaccount]}]
+  [cofx]
-  (boolean multiaccount))
+  (boolean
+   (get-in cofx [:db :multiaccount])))
 
 (defn credentials
   [cofx]

src/status_im/multiaccounts/model_test.cljs

@@ -4,6 +4,6 @@
 
 (deftest logged-in-test
   (testing "multiaccount is defined"
-    (is (multiaccounts.model/logged-in? {:multiaccount {}})))
+    (is (multiaccounts.model/logged-in? {:db {:multiaccount {}}})))
   (testing "multiaccount is not there"
-    (is (not (multiaccounts.model/logged-in? {})))))
+    (is (not (multiaccounts.model/logged-in? {:db {}})))))

src/status_im/multiaccounts/update/core.cljs

@@ -1,29 +1,17 @@
 (ns status-im.multiaccounts.update.core
-  (:require [status-im.utils.types :as types]
+  (:require [status-im2.constants :as constants]
-            [status-im2.constants :as constants]
+            [utils.re-frame :as rf]
-            [taoensso.timbre :as log]
+            [status-im.utils.types :as types]
-            [utils.re-frame :as rf]))
+            [taoensso.timbre :as log]))
 
-(rf/defn send-contact-update
+(rf/defn send-multiaccount-update
-  [{:keys [db]}]
+  [{:keys [db] :as cofx}]
-  (let [{:keys [name preferred-name display-name address]} (:multiaccount db)]
+  (let [multiaccount                          (:multiaccount db)
+        {:keys [name preferred-name address]} multiaccount]
     {:json-rpc/call [{:method     "wakuext_sendContactUpdates"
-                      :params     [(or preferred-name display-name name) ""]
+                      :params     [(or preferred-name name) ""]
                       :on-success #(log/debug "sent contact update")}]}))
 
-(rf/defn update-multiaccount-account-name
-  "This updates the profile name in the profile list before login"
-  {:events [:multiaccounts.ui/update-name]}
-  [{:keys [db] :as cofx} raw-multiaccounts-from-status-go]
-  (let [{:keys [key-uid name preferred-name
-                display-name]} (:multiaccount db)
-        account                (some #(and (= (:key-uid %) key-uid) %) raw-multiaccounts-from-status-go)]
-    (when-let [new-name (and account (or preferred-name display-name name))]
-      (rf/merge cofx
-                {:json-rpc/call [{:method     "multiaccounts_updateAccount"
-                                  :params     [(assoc account :name new-name)]
-                                  :on-success #(log/debug "sent multiaccount update")}]}))))
-
 (rf/defn multiaccount-update
   "Takes effects (containing :db) + new multiaccount fields, adds all effects necessary for multiaccount update.
   Optionally, one can specify a success-event to be dispatched after fields are persisted."
@@ -37,21 +25,17 @@
       (throw
        (js/Error.
         "Please shake the phone to report this error and restart the app. multiaccount is currently empty, which means something went wrong when trying to update it with"))
-      (rf/merge
+      (rf/merge cofx
-       cofx
+                {:db (if setting-value
-       {:db (if setting-value
+                       (assoc-in db [:multiaccount setting] setting-value)
-              (assoc-in db [:multiaccount setting] setting-value)
+                       (update db :multiaccount dissoc setting))
-              (update db :multiaccount dissoc setting))
+                 :json-rpc/call
-        :json-rpc/call
+                 [{:method     "settings_saveSetting"
-        [{:method     "settings_saveSetting"
+                   :params     [setting setting-value]
-          :params     [setting setting-value]
+                   :on-success on-success}]}
-          :on-success on-success}]}
+                (when (and (not dont-sync?)
-
+                           (#{:name :prefered-name} setting))
-       (when (#{:name :preferred-name} setting)
+                  (send-multiaccount-update))))))
-         (constantly {:setup/open-multiaccounts #(rf/dispatch [:multiaccounts.ui/update-name %])}))
-
-       (when (and (not dont-sync?) (#{:name :preferred-name} setting))
-         (send-contact-update))))))
 
 (rf/defn clean-seed-phrase
   "A helper function that removes seed phrase from storage."
@@ -60,7 +44,7 @@
 
 (defn augment-synchronized-recent-stickers
   "Add 'url' parameter to stickers that are synchronized from other devices.
-   It is not sent from another devices but we have it in our db."
+   It is not sent from aanother devices but we have it in our db."
   [synced-stickers stickers-from-db]
   (mapv #(assoc %
                 :url

src/status_im/multiaccounts/update/core_test.cljs

@@ -1,5 +1,5 @@
 (ns status-im.multiaccounts.update.core-test
-  (:require [clojure.test :refer-macros [deftest is testing]]
+  (:require [clojure.test :refer-macros [deftest is]]
             [status-im.multiaccounts.update.core :as multiaccounts.update]))
 
 (deftest test-multiaccount-update
@@ -21,36 +21,3 @@
         json-rpc (into #{} (map :method (:json-rpc/call efx)))]
     (is (json-rpc "settings_saveSetting"))
     (is (nil? (get-in efx [:db :multiaccount :mnemonic])))))
-
-(deftest test-update-multiaccount-account-name
-  (let [cofx                             {:db {:multiaccount {:key-uid        1
-                                                              :name           "name"
-                                                              :preferred-name "preferred-name"
-                                                              :display-name   "display-name"}}}
-        raw-multiaccounts-from-status-go [{:key-uid 1 :name "old-name"}]]
-    (testing "wrong account"
-      (is (nil? (multiaccounts.update/update-multiaccount-account-name cofx []))))
-    (testing "name priority preferred-name > display-name > name"
-      (let [new-account-name= (fn [efx new-name]
-                                (-> efx
-                                    :json-rpc/call
-                                    first
-                                    :params
-                                    first
-                                    :name
-                                    (= new-name)))]
-        (is (new-account-name=
-             (multiaccounts.update/update-multiaccount-account-name
-              cofx
-              raw-multiaccounts-from-status-go)
-             "preferred-name"))
-        (is (new-account-name=
-             (multiaccounts.update/update-multiaccount-account-name
-              (update-in cofx [:db :multiaccount] dissoc :preferred-name)
-              raw-multiaccounts-from-status-go)
-             "display-name"))
-        (is (new-account-name=
-             (multiaccounts.update/update-multiaccount-account-name
-              (update-in cofx [:db :multiaccount] dissoc :preferred-name :display-name)
-              raw-multiaccounts-from-status-go)
-             "name"))))))

src/status_im/pairing/core.cljs

@@ -247,11 +247,11 @@
   [cofx installation-id]
   (rf/merge cofx
             (enable installation-id)
-            (multiaccounts.update/send-contact-update)))
+            (multiaccounts.update/send-multiaccount-update)))
 
 (rf/defn disable-installation-success
   {:events [:pairing.callback/disable-installation-success]}
   [cofx installation-id]
   (rf/merge cofx
             (disable installation-id)
-            (multiaccounts.update/send-contact-update)))
+            (multiaccounts.update/send-multiaccount-update)))

src/status_im/signals/core.cljs

@@ -60,29 +60,27 @@
   [{:keys [db] :as cofx} event]
   (log/info "local pairing signal received"
             {:event event})
-  (let [connection-success?             (and (= (:type event)
+  (let [connection-success?             (= (:type event)
-                                                constants/local-pairing-event-connection-success)
+                                           constants/local-pairing-event-connection-success)
-                                             (= (:action event)
-                                                constants/local-pairing-action-connect))
         error-on-pairing?               (contains? constants/local-pairing-event-errors (:type event))
         completed-pairing?              (and (= (:type event)
-                                                constants/local-pairing-event-transfer-success)
+                                                constants/local-pairing-event-process-success)
                                              (= (:action event)
-                                                constants/local-pairing-action-pairing-installation))
+                                                constants/local-pairing-action-pairing-account))
-        logged-in?                      (multiaccounts.model/logged-in? db)
+        logged-in?                      (multiaccounts.model/logged-in? cofx)
         ;; since `connection-success` event is received on both sender and receiver devices
         ;; we check the `logged-in?` status to identify the receiver and take the user to next screen
         navigate-to-syncing-devices?    (and connection-success? (not logged-in?))
         user-in-syncing-devices-screen? (= (:view-id db) :syncing-devices)]
     (merge {:db (cond-> db
                   connection-success?
-                  (assoc-in [:syncing :pairing-in-progress?] true)
+                  (assoc :local-pairing/completed-pairing? false)
 
                   error-on-pairing?
-                  (update-in [:syncing :pairing-in-progress?] dissoc)
+                  (dissoc :local-pairing/completed-pairing?)
 
                   completed-pairing?
-                  (assoc-in [:syncing :pairing-in-progress?] false))}
+                  (assoc :local-pairing/completed-pairing? true))}
            (when navigate-to-syncing-devices?
              {:dispatch [:navigate-to :syncing-devices]})
            (when (and error-on-pairing? user-in-syncing-devices-screen?)
@@ -91,9 +89,7 @@
                              :icon-color     colors/danger-50
                              :override-theme :light
                              :text           (i18n/label :t/error-syncing-connection-failed)}]
-                           [:navigate-back]]})
+                           [:navigate-back]]}))))
-           (when completed-pairing?
-             {:dispatch [:syncing/pairing-completed]}))))
 
 (rf/defn process
   {:events [:signals/signal-received]}

src/status_im/ui/screens/chat/components/input.cljs

@@ -10,7 +10,9 @@
             [re-frame.core :as re-frame]
             [reagent.core :as reagent]
             [status-im2.constants :as chat.constants]
+            [status-im.chat.models.mentions :as mentions]
             [utils.i18n :as i18n]
+            [status-im.multiaccounts.core :as multiaccounts]
             [status-im.ui.components.icons.icons :as icons]
             [status-im.ui.components.list.views :as list]
             [status-im.ui.screens.chat.components.reply :as reply]
@@ -93,7 +95,7 @@
         :color               (styles/send-icon-color)}])]])
 
 (defn on-selection-change
-  [timeout-id last-text-change args]
+  [timeout-id last-text-change mentionable-users args]
   (let [selection (.-selection ^js (.-nativeEvent ^js args))
         start     (.-start selection)
         end       (.-end selection)]
@@ -104,9 +106,10 @@
       (reset!
         timeout-id
         (utils.utils/set-timeout
-         #(re-frame/dispatch [:mention/on-selection-change
+         #(re-frame/dispatch [::mentions/on-selection-change
                               {:start start
-                               :end   end}])
+                               :end   end}
+                              mentionable-users])
          50)))
     ;; NOTE(rasom): on Android we dispatch event only in case if there
     ;; was no text changes during last 50ms. `on-selection-change` is
@@ -115,9 +118,10 @@
     (when (and platform/android?
                (or (not @last-text-change)
                    (< 50 (- (js/Date.now) @last-text-change))))
-      (re-frame/dispatch [:mention/on-selection-change
+      (re-frame/dispatch [::mentions/on-selection-change
                           {:start start
-                           :end   end}]))))
+                           :end   end}
+                          mentionable-users]))))
 
 (defonce input-texts (atom {}))
 (defonce mentions-enabled (reagent/atom {}))
@@ -179,7 +183,7 @@
   (re-frame/dispatch [:chat.ui/set-chat-input-text val]))
 
 (defn on-change
-  [last-text-change timeout-id refs chat-id sending-image args]
+  [last-text-change timeout-id mentionable-users refs chat-id sending-image args]
   (let [text      (.-text ^js (.-nativeEvent ^js args))
         prev-text (get @input-texts chat-id)]
     (when (and (seq prev-text) (empty? text) (not sending-image))
@@ -202,24 +206,46 @@
     ;; NOTE(rasom): on iOS `on-change` is dispatched after `on-text-input`,
     ;; that's why mention suggestions are calculated on `on-change`
     (when platform/ios?
-      (re-frame/dispatch [:mention/calculate-suggestions]))))
+      (re-frame/dispatch [::mentions/calculate-suggestions mentionable-users]))))
 
 (rf/defn set-input-text
   "Set input text for current-chat. Takes db and input text and cofx
   as arguments and returns new fx. Always clear all validation messages."
   {:events [:chat.ui.input/set-chat-input-text]}
   [{:keys [db]} text chat-id]
-  (let [params [chat-id text]
+  (let [text-with-mentions   (mentions/->input-field text)
-        method "wakuext_chatMentionToInputField"]
+        all-contacts         (:contacts/contacts db)
-    {:json-rpc/call [{:method     method
+        chat                 (get-in db [:chats chat-id])
-                      :params     params
+        current-multiaccount (:multiaccount db)
-                      :on-success #(rf/dispatch [:mention/on-to-input-field-success %])
+        community-members    (when (= (:chat-type chat) chat.constants/community-chat-type)
-                      :on-error   #(rf/dispatch [:mention/on-error
+                               (get-in db [:communities (:community-id chat) :members]))
-                                                 {:method method
+        mentionable-users    (mentions/get-mentionable-users
-                                                  :params params} %])}]}))
+                              chat
+                              all-contacts
+                              current-multiaccount
+                              community-members)
+        hydrated-mentions    (map
+                              (fn [[t mention :as e]]
+                                (if (= t :mention)
+                                  (let [mention (multiaccounts/displayed-name
+                                                 (get mentionable-users mention))]
+                                    [:mention
+                                     (if (string/starts-with? mention "@")
+                                       mention
+                                       (str "@" mention))])
+                                  e))
+                              text-with-mentions)
+        info                 (mentions/->info hydrated-mentions)
+        new-text             (string/join (map second hydrated-mentions))]
+    {:set-text-input-value [chat-id new-text]
+     :db
+     (-> db
+         (assoc-in [:chats/cursor chat-id] (:mention-end info))
+         (assoc-in [:chat/inputs-with-mentions chat-id] hydrated-mentions)
+         (assoc-in [:chats/mentions chat-id :mentions] info))}))
 
 (defn on-text-input
-  [chat-id args]
+  [mentionable-users chat-id args]
   (let [native-event  (.-nativeEvent ^js args)
         text          (.-text ^js native-event)
         previous-text (.-previousText ^js native-event)
@@ -230,7 +256,7 @@
       (swap! mentions-enabled assoc chat-id true))
 
     (re-frame/dispatch
-     [:mention/on-text-input
+     [::mentions/on-text-input
       {:new-text      text
        :previous-text previous-text
        :start         start
@@ -239,11 +265,12 @@
     ;; `on-change`, that's why mention suggestions are calculated
     ;; on `on-change`
     (when platform/android?
-      (re-frame/dispatch [:mention/calculate-suggestions]))))
+      (re-frame/dispatch [::mentions/calculate-suggestions mentionable-users]))))
 
 (defn text-input
   [{:keys [set-active-panel refs chat-id sending-image]}]
   (let [cooldown-enabled? @(re-frame/subscribe [:chats/current-chat-cooldown-enabled?])
+        mentionable-users @(re-frame/subscribe [:chats/mentionable-users])
         timeout-id        (atom nil)
         last-text-change  (atom nil)
         mentions-enabled  (get @mentions-enabled chat-id)
@@ -269,10 +296,11 @@
       :auto-capitalize :sentences
       :on-selection-change (partial on-selection-change
                                     timeout-id
-                                    last-text-change)
+                                    last-text-change
+                                    mentionable-users)
       :on-change
-      (partial on-change last-text-change timeout-id refs chat-id sending-image)
+      (partial on-change last-text-change timeout-id mentionable-users refs chat-id sending-image)
-      :on-text-input (partial on-text-input chat-id)}
+      :on-text-input (partial on-text-input mentionable-users chat-id)}
      (if mentions-enabled
        (for [[idx [type text]] (map-indexed
                                 (fn [idx item]

src/status_im/ui2/screens/chat/components/reply/view.cljs

@@ -76,8 +76,7 @@
     (format-reply-author from contact-name current-public-key)]])
 
 (defn reply-message
-  [{:keys [from identicon content-type contentType parsed-text content deleted? deleted-for-me?
+  [{:keys [from identicon content-type contentType parsed-text content deleted? deleted-for-me?]}
-           album-images-count]}
    in-chat-input? pin? recording-audio?]
   (let [contact-name       (rf/sub [:contacts/contact-name-by-identity from])
         current-public-key (rf/sub [:multiaccount/public-key])
@@ -114,12 +113,9 @@
                                            (= constants/content-type-audio content-type))
                                    {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}))}
           (case (or content-type contentType)
-            constants/content-type-image   (if album-images-count
+            constants/content-type-image   "Image"
-                                             (i18n/label :t/images-albums-count
+            constants/content-type-sticker "Sticker"
-                                                         {:album-images-count album-images-count})
+            constants/content-type-audio   "Audio"
-                                             (i18n/label :t/image))
-            constants/content-type-sticker (i18n/label :t/sticker)
-            constants/content-type-audio   (i18n/label :t/audio)
             (get-quoted-text-with-mentions (or parsed-text (:parsed-text content))))]])]
      (when (and in-chat-input? (not recording-audio?))
        [quo2.button/button

src/status_im/ui2/screens/chat/composer/input.cljs

@@ -5,6 +5,7 @@
             [re-frame.core :as re-frame]
             [reagent.core :as reagent]
             [status-im2.constants :as chat.constants]
+            [status-im.chat.models.mentions :as mentions]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]
             [utils.transforms :as transforms]
@@ -92,7 +93,7 @@
   (rf/dispatch [:chat.ui/set-chat-input-text val]))
 
 (defn on-selection-change
-  [timeout-id last-text-change args]
+  [timeout-id last-text-change mentionable-users args]
   (let [selection (.-selection ^js (.-nativeEvent ^js args))
         start     (.-start selection)
         end       (.-end selection)]
@@ -103,9 +104,10 @@
       (reset!
         timeout-id
         (background-timer/set-timeout
-         #(rf/dispatch [:mention/on-selection-change
+         #(rf/dispatch [::mentions/on-selection-change
                         {:start start
-                         :end   end}])
+                         :end   end}
+                        mentionable-users])
          50)))
     ;; NOTE(rasom): on Android we dispatch event only in case if there
     ;; was no text changes during last 50ms. `on-selection-change` is
@@ -114,12 +116,13 @@
     (when (and platform/android?
                (or (not @last-text-change)
                    (< 50 (- (js/Date.now) @last-text-change))))
-      (rf/dispatch [:mention/on-selection-change
+      (rf/dispatch [::mentions/on-selection-change
                     {:start start
-                     :end   end}]))))
+                     :end   end}
+                    mentionable-users]))))
 
 (defn on-change
-  [last-text-change timeout-id refs chat-id sending-image args]
+  [last-text-change timeout-id mentionable-users refs chat-id sending-image args]
   (let [text      (.-text ^js (.-nativeEvent ^js args))
         prev-text (get @input-texts chat-id)]
     (when (and (seq prev-text) (empty? text) (not sending-image))
@@ -144,10 +147,10 @@
     ;; NOTE(rasom): on iOS `on-change` is dispatched after `on-text-input`,
     ;; that's why mention suggestions are calculated on `on-change`
     (when platform/ios?
-      (rf/dispatch [:mention/calculate-suggestions]))))
+      (rf/dispatch [::mentions/calculate-suggestions mentionable-users]))))
 
 (defn on-text-input
-  [chat-id args]
+  [mentionable-users chat-id args]
   (let [native-event  (.-nativeEvent ^js args)
         text          (.-text ^js native-event)
         previous-text (.-previousText ^js native-event)
@@ -158,7 +161,7 @@
       (swap! mentions-enabled? assoc chat-id true))
 
     (rf/dispatch
-     [:mention/on-text-input
+     [::mentions/on-text-input
       {:new-text      text
        :previous-text previous-text
        :start         start
@@ -167,7 +170,7 @@
     ;; `on-change`, that's why mention suggestions are calculated
     ;; on `on-change`
     (when platform/android?
-      (rf/dispatch [:mention/calculate-suggestions]))))
+      (rf/dispatch [::mentions/calculate-suggestions mentionable-users]))))
 
 (defn text-input-style
   [chat-id]
@@ -190,6 +193,7 @@
 (defn text-input
   [{:keys [refs chat-id sending-image on-content-size-change]}]
   (let [cooldown-enabled? (rf/sub [:chats/current-chat-cooldown-enabled?])
+        mentionable-users (rf/sub [:chats/mentionable-users])
         timeout-id (reagent/atom nil)
         last-text-change (reagent/atom nil)
         mentions-enabled? (get @mentions-enabled? chat-id)
@@ -216,17 +220,18 @@
          :on-content-size-change on-content-size-change
          :on-selection-change (partial on-selection-change
                                        timeout-id
-                                       last-text-change)
+                                       last-text-change
+                                       mentionable-users)
          :on-change
-         (partial on-change last-text-change timeout-id refs chat-id sending-image)
+         (partial on-change last-text-change timeout-id mentionable-users refs chat-id sending-image)
-         :on-text-input (partial on-text-input chat-id)}
+         :on-text-input (partial on-text-input mentionable-users chat-id)}
         input-with-mentions (rf/sub [:chat/input-with-mentions])
         children (fn []
                    (if mentions-enabled?
                      (map-indexed
-                      (fn [index [mention-type text]]
+                      (fn [index [_ text]]
-                        ^{:key (str index "_" mention-type "_" text)}
+                        ^{:key (str index "_" type "_" text)}
-                        [rn/text (when (= mention-type :mention) {:style {:color colors/primary-50}})
+                        [rn/text (when (= type :mention) {:style {:color colors/primary-50}})
                          text])
                       input-with-mentions)
                      (get @input-texts chat-id)))]

src/status_im/utils/universal_links/core.cljs

@@ -184,7 +184,7 @@
   on login, otherwise just handle it"
   {:events [:universal-links/handle-url]}
   [{:keys [db] :as cofx} url]
-  (if (and (multiaccounts.model/logged-in? db) (= (:app-state db) "active"))
+  (if (and (multiaccounts.model/logged-in? cofx) (= (:app-state db) "active"))
     (route-url cofx url)
     (store-url-for-later cofx url)))
 

src/status_im2/common/home/actions/view.cljs

@@ -3,10 +3,7 @@
             [quo2.core :as quo]
             [status-im2.common.confirmation-drawer.view :as confirmation-drawer]
             [status-im2.constants :as constants]
-            [utils.re-frame :as rf]
+            [utils.re-frame :as rf]))
-            [status-im2.contexts.contacts.drawers.nickname-drawer.view :as nickname-drawer]
-            [clojure.string :as string]
-            [quo2.foundations.colors :as colors]))
 
 (defn- entry
   [{:keys [icon label on-press danger? sub-label chevron? add-divider? accessibility-label]}]
@@ -39,15 +36,8 @@
   (hide-sheet-and-dispatch [:chat/mark-all-as-read chat-id]))
 
 (defn edit-nickname-action
-  [contact]
+  [chat-id]
-  (hide-sheet-and-dispatch
+  (hide-sheet-and-dispatch [:chat.ui/edit-nickname chat-id]))
-   [:show-bottom-sheet
-    {:content (fn []
-                [nickname-drawer/nickname-drawer
-                 {:title               (i18n/label :t/add-nickname-title)
-                  :description         (i18n/label :t/nickname-visible-to-you)
-                  :contact             contact
-                  :accessibility-label :edit-nickname}])}]))
 
 (defn mute-chat-action
   [chat-id]
@@ -185,35 +175,13 @@
 
 (defn edit-nickname-entry
   [chat-id]
-  (let [{:keys [nickname public-key secondary-name]
+  (entry {:icon                :i/edit
-         :as   contact} (select-keys (rf/sub [:contacts/contact-by-address chat-id])
+          :label               (i18n/label :t/edit-nickname)
-                                     [:primary-name :nickname :public-key :secondary-name])
+          :on-press            #(edit-nickname-action chat-id)
-        no-nickname?    (string/blank? nickname)]
+          :danger?             false
-    (entry
+          :accessibility-label :edit-nickname
-     {:icon                (if no-nickname?
+          :sub-label           nil
-                             :i/edit
+          :chevron?            false}))
-                             :i/delete)
-      :label               (i18n/label (if no-nickname?
-                                         :t/add-nickname-title
-                                         :t/remove-nickname))
-      :on-press            (fn []
-                             (if no-nickname?
-                               (edit-nickname-action contact)
-                               (do
-                                 (rf/dispatch [:hide-bottom-sheet])
-                                 (rf/dispatch [:toasts/upsert
-                                               {:id         :remove-nickname
-                                                :icon       :correct
-                                                :icon-color (colors/theme-colors colors/success-60
-                                                                                 colors/success-50)
-                                                :text       (i18n/label
-                                                             :t/remove-nickname-toast
-                                                             {:secondary-name secondary-name})}])
-                                 (rf/dispatch [:contacts/update-nickname public-key ""]))))
-      :danger?             false
-      :accessibility-label :add-nickname
-      :sub-label           nil
-      :chevron?            false})))
 
 ;; TODO(OmarBasem): Requires design input.
 (defn edit-name-image-entry

src/status_im2/common/resources.cljs

@@ -21,7 +21,6 @@
    :photo1               (js/require "../resources/images/mock2/photo1.png")
    :photo2               (js/require "../resources/images/mock2/photo2.png")
    :photo3               (js/require "../resources/images/mock2/photo3.png")
-   :qr-code              (js/require "../resources/images/mock2/qr-code.png")
    :small-opt-card-icon  (js/require "../resources/images/mock2/small_opt_card_icon.png")
    :small-opt-card-main  (js/require "../resources/images/mock2/small_opt_card_main.png")
    :status-logo          (js/require "../resources/images/mock2/status-logo.png")

src/status_im2/constants.cljs

@@ -263,9 +263,6 @@
   An example of a connection string is -> cs2:5vd6J6:Jfc:27xMmHKEYwzRGXcvTtuiLZFfXscMx4Mz8d9wEHUxDj4p7:EG7Z13QScfWBJNJ5cprszzDQ5fBVsYMirXo8MaQFJvpF:3 "
   "cs")
 
-(def ^:const local-pairing-role-sender "sender")
-(def ^:const local-pairing-role-receiver "receiver")
-
 ;; sender and receiver events
 (def ^:const local-pairing-event-connection-success "connection-success")
 (def ^:const local-pairing-event-connection-error "connection-error")

src/status_im2/contexts/chat/messages/composer/controls/style.cljs

@@ -4,6 +4,7 @@
 (defn controls
   [bottom-inset]
   {:padding-horizontal 20
+   :elevation          4
    :z-index            3
    :position           :absolute
    :background-color   (colors/theme-colors colors/white colors/neutral-90)

src/status_im2/contexts/chat/messages/link_preview/view.cljs

@@ -4,7 +4,6 @@
     [utils.i18n :as i18n]
     [reagent.core :as reagent]
     [react-native.core :as rn]
-    [react-native.fast-image :as fast-image]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.messages.link-preview.events]
     [status-im2.contexts.chat.messages.link-preview.style :as style]
@@ -124,7 +123,7 @@
               (when-not (string/blank? thumbnail-url)
                 [:<>
                  [rn/view (style/separator)]
-                 [fast-image/fast-image
+                 [rn/image
                   {:source              {:uri thumbnail-url}
                    :style               (style/image (select-keys preview-data [:height :width]))
                    :accessibility-label :member-photo}]])]]))))}))

src/status_im2/contexts/chat/messages/pin/banner/view.cljs

@@ -3,41 +3,19 @@
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
-(defn resolve-message
-  [parsed-text]
-  (reduce
-   (fn [acc {:keys [type literal destination] :as some-text}]
-     (str acc
-          (case type
-            "paragraph"
-            (resolve-message (:children some-text))
-
-            "mention"
-            (rf/sub [:messages/resolve-mention literal])
-
-            "status-tag"
-            (str "#" literal)
-
-            "link"
-            destination
-
-            literal)))
-   ""
-   parsed-text))
-
 (defn banner
   [chat-id]
   (let [pinned-messages (rf/sub [:chats/pinned-sorted-list chat-id])
         latest-pinned-message-id (-> pinned-messages last :message-id)
         latest-pinned-message (get (rf/sub [:chats/chat-messages chat-id]) latest-pinned-message-id)
-        latest-pin-text (get-in latest-pinned-message [:content :parsed-text])
+        latest-pin-text (get-in latest-pinned-message [:content :text])
         {:keys [deleted? deleted-for-me?]} latest-pinned-message
         pins-count (count pinned-messages)
 
         latest-pin-text
         (cond deleted?        (i18n/label :t/message-deleted-for-everyone)
               deleted-for-me? (i18n/label :t/message-deleted-for-you)
-              :else           (resolve-message latest-pin-text))]
+              :else           latest-pin-text)]
     [quo/banner
      {:latest-pin-text latest-pin-text
       :pins-count      pins-count

src/status_im2/contexts/chat/messages/pin/banner/view_test.cljs

@@ -1,34 +0,0 @@
-(ns status-im2.contexts.chat.messages.pin.banner.view-test
-  (:require [status-im2.contexts.chat.messages.pin.banner.view :as view]
-            [cljs.test :as t]
-            [utils.re-frame :as rf]))
-
-(def mentions
-  {"0xsome_id" "foobar"})
-
-(defn sub
-  [[_ mention]]
-  (get mentions mention mention))
-
-(def parsed-text
-  [{:type "paragraph"
-    :children
-    [{:literal ""}
-     {:type "mention"
-      :literal
-      "0xsome_id"}
-     {:literal " i just mention you here to debug this issue "}
-     {:type "link"
-      :children
-      [{:literal "https://foo.bar"}]
-      :literal ""
-      :title ""
-      :destination "https://foo.bar"}
-     {:literal " , no worries"}]}])
-
-(t/deftest test-resolve-message
-  (with-redefs [rf/sub sub]
-    (t/testing ""
-      (let [text (view/resolve-message parsed-text)]
-        (t/is (= text
-                 "foobar i just mention you here to debug this issue https://foo.bar , no worries"))))))

src/status_im2/contexts/contacts/drawers/nickname_drawer/style.cljs

@@ -1,32 +0,0 @@
-(ns status-im2.contexts.contacts.drawers.nickname-drawer.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(defn context-container
-  []
-  {:flex-direction   :row
-   :background-color (colors/theme-colors colors/neutral-10 colors/neutral-80)
-   :border-radius    20
-   :align-items      :center
-   :align-self       :flex-start
-   :padding          4
-   :margin-top       8
-   :margin-left      -4
-   :margin-bottom    16})
-
-(def buttons-container
-  {:flex-direction  :row
-   :justify-content :space-between
-   :margin-top      20})
-
-(def nickname-container
-  {:margin-horizontal 20})
-
-(defn nickname-description
-  []
-  {:margin-left 4
-   :color       (colors/theme-colors colors/neutral-50 colors/neutral-40)})
-
-(def nickname-description-container
-  {:flex-direction :row
-   :align-items    :center
-   :margin-top     8})

src/status_im2/contexts/contacts/drawers/nickname_drawer/view.cljs

@@ -1,81 +0,0 @@
-(ns status-im2.contexts.contacts.drawers.nickname-drawer.view
-  (:require [clojure.string :as string]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.icon :as icons]
-            [quo2.core :as quo]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]
-            [status-im2.contexts.contacts.drawers.nickname-drawer.style :as style]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]))
-
-(defn add-nickname-and-show-toast
-  [primary-name entered-nickname public-key]
-  (when-not (string/blank? entered-nickname)
-    (rf/dispatch [:hide-bottom-sheet])
-    (rf/dispatch [:toasts/upsert
-                  {:id         :add-nickname
-                   :icon       :i/correct
-                   :icon-color (colors/theme-colors colors/success-60 colors/success-50)
-                   :text       (i18n/label
-                                :t/set-nickname-toast
-                                {:primary-name primary-name
-                                 :nickname     (string/trim entered-nickname)})}])
-    (rf/dispatch [:contacts/update-nickname public-key (string/trim entered-nickname)])))
-
-(defn nickname-drawer
-  [{:keys [contact]}]
-  (let [{:keys [primary-name nickname public-key]} contact
-        entered-nickname                           (reagent/atom (or nickname ""))
-        photo-path                                 (when-not (empty? (:images contact))
-                                                     (rf/sub [:chats/photo-path public-key]))]
-    (fn [{:keys [title description accessibility-label
-                 close-button-text]}]
-      [rn/view
-       {:style               style/nickname-container
-        :accessibility-label accessibility-label}
-       [quo/text
-        {:weight :semi-bold
-         :size   :heading-1} title]
-       [rn/view {:style (style/context-container)}
-        [quo/user-avatar
-         {:full-name        primary-name
-          :profile-picture  photo-path
-          :size             :xxs
-          :status-indicator false}]
-        [quo/text
-         {:weight :medium
-          :size   :paragraph-2
-          :style  {:margin-left 4}} primary-name]]
-       [quo/input
-        {:type              :text
-         :blur?             true
-         :placeholder       (i18n/label :t/type-nickname)
-         :auto-focus        true
-         :max-length        32
-         :on-change-text    (fn [nickname]
-                              (reset! entered-nickname nickname))
-         :on-submit-editing #(add-nickname-and-show-toast primary-name @entered-nickname public-key)}]
-       [rn/view
-        {:style style/nickname-description-container}
-        [icons/icon :i/info
-         {:size  16
-          :color (colors/theme-colors colors/black colors/white)}]
-        [quo/text
-         {:weight :regular
-          :size   :paragraph-2
-          :style  (style/nickname-description)}
-         description]]
-       [rn/view {:style style/buttons-container}
-        [quo/button
-         {:type     :grey
-          :style    {:flex 0.48}
-          :on-press #(rf/dispatch [:hide-bottom-sheet])}
-         (or close-button-text (i18n/label :t/cancel))]
-
-        [quo/button
-         {:type     :primary
-          :disabled (string/blank? @entered-nickname)
-          :style    {:flex 0.48}
-          :on-press #(add-nickname-and-show-toast primary-name @entered-nickname public-key)}
-         title]]])))

src/status_im2/contexts/onboarding/create_password/view.cljs

@@ -170,9 +170,8 @@
           (when (= @focused-input :repeat-password)
             [rn/view {:style style/disclaimer-container}
              [quo/disclaimer
-              {:blur?     true
+              {:on-change #(reset! accepts-disclaimer? %)
-               :checked?  @accepts-disclaimer?
+               :checked?  @accepts-disclaimer?}
-               :on-change #(reset! accepts-disclaimer? %)}
               (i18n/label :t/password-creation-disclaimer)]])
 
           [rn/view {:style style/button-container}

src/status_im2/contexts/onboarding/enable_notifications/style.cljs

@@ -1,25 +1,26 @@
 (ns status-im2.contexts.onboarding.enable-notifications.style
   (:require
+    [react-native.platform :as platform]
     [quo2.foundations.colors :as colors]))
 
-(def default-margin 20)
+(def title-container
+  {:justify-content    :center
+   :margin-top         12
+   :padding-horizontal 20})
 
-(defn page-container
+(def enable-notifications-buttons
-  [insets]
+  {:margin 20})
+
+(def enable-notifications
   {:flex             1
-   :padding-top      (:top insets)
+   :padding-top      (if platform/ios? 44 0)
    :background-color colors/neutral-80-opa-80-blur})
 
 (def page-illustration
   {:flex              1
    :background-color  colors/danger-50
    :align-items       :center
-   :margin-horizontal default-margin
+   :margin-horizontal 20
    :border-radius     20
-   :margin-top        default-margin
+   :margin-top        20
    :justify-content   :center})
-
-(defn buttons
-  [insets]
-  {:margin        default-margin
-   :margin-bottom (+ default-margin (:bottom insets))})

src/status_im2/contexts/onboarding/enable_notifications/view.cljs

@@ -6,11 +6,9 @@
     [utils.re-frame :as rf]
     [react-native.core :as rn]
     [react-native.platform :as platform]
-    [react-native.safe-area :as safe-area]
     [status-im.notifications.core :as notifications]
     [status-im2.contexts.onboarding.common.background.view :as background]
-    [status-im2.contexts.onboarding.enable-notifications.style :as style]
+    [status-im2.contexts.onboarding.enable-notifications.style :as style]))
-    [status-im2.contexts.shell.animation :as shell.animation]))
 
 (defn navigation-bar
   []
@@ -27,44 +25,47 @@
 
 (defn page-title
   []
-  [quo/title
+  [rn/view {:style style/title-container}
-   {:title                        (i18n/label :t/intro-wizard-title6)
+   [quo/text
-    :title-accessibility-label    :notifications-title
+    {:accessibility-label :notifications-screen-title
-    :subtitle                     (i18n/label :t/enable-notifications-sub-title)
+     :weight              :semi-bold
-    :subtitle-accessibility-label :notifications-sub-title}])
+     :size                :heading-1
+     :style               {:color colors/white}}
+    (i18n/label :t/intro-wizard-title6)]
+   [quo/text
+    {:accessibility-label :notifications-screen-sub-title
+     :weight              :regular
+     :size                :paragraph-1
+     :style               {:color colors/white}}
+    (i18n/label :t/enable-notifications-sub-title)]])
 
 (defn enable-notification-buttons
-  [{:keys [insets]}]
+  []
-  (let [profile-color (:color (rf/sub [:onboarding-2/profile]))]
+  [rn/view {:style style/enable-notifications-buttons}
-    [rn/view {:style (style/buttons insets)}
+   [quo/button
-     [quo/button
+    {:on-press                  (fn []
-      {:on-press                  (fn []
+                                  (rf/dispatch [::notifications/switch true platform/ios?])
-                                    (shell.animation/change-selected-stack-id :communities-stack true)
+                                  (rf/dispatch [:init-root :welcome]))
-                                    (rf/dispatch [::notifications/switch true platform/ios?])
+     :type                      :primary
-                                    (rf/dispatch [:init-root :welcome]))
+     :before                    :i/notifications
-       :type                      :primary
+     :accessibility-label       :enable-notifications-button
-       :before                    :i/notifications
+     :override-background-color (colors/custom-color :magenta 60)}
-       :accessibility-label       :enable-notifications-button
+    (i18n/label :t/intro-wizard-title6)]
-       :override-background-color (colors/custom-color profile-color 60)}
+   [quo/button
-      (i18n/label :t/intro-wizard-title6)]
+    {:on-press                  #(rf/dispatch [:init-root :welcome])
-     [quo/button
+     :accessibility-label       :enable-notifications-later-button
-      {:on-press                  (fn []
+     :override-background-color colors/white-opa-5
-                                    (shell.animation/change-selected-stack-id :communities-stack true)
+     :style                     {:margin-top 12}}
-                                    (rf/dispatch [:init-root :welcome]))
+    (i18n/label :t/maybe-later)]])
-       :accessibility-label       :enable-notifications-later-button
-       :override-background-color colors/white-opa-5
-       :style                     {:margin-top 12}}
-      (i18n/label :t/maybe-later)]]))
 
 (defn enable-notifications
   []
-  [safe-area/consumer
+  [rn/view {:style style/enable-notifications}
-   (fn [insets]
+   [background/view true]
-     [rn/view {:style (style/page-container insets)}
+   [navigation-bar]
-      [background/view true]
+   [page-title]
-      [navigation-bar]
+   [rn/view {:style style/page-illustration}
-      [page-title]
+    [quo/text
-      [rn/view {:style style/page-illustration}
+     "[Illustration here]"]]
-       [quo/text
+   [enable-notification-buttons]])
-        "Illustration here"]]
+
-      [enable-notification-buttons {:insets insets}]])])

src/status_im2/contexts/onboarding/events.cljs

@@ -163,7 +163,8 @@
                             constants/auth-method-biometric
                             (get-in db [:onboarding-2/profile :auth-method]))]
 
-    (cond-> {:dispatch [:navigate-to :enable-notifications]}
+    (cond-> {:db       (dissoc db :onboarding-2/profile)
+             :dispatch [:navigate-to :enable-notifications]}
       biometric-enabled?
       (assoc :biometric/enable-and-save-password
              {:key-uid         key-uid

src/status_im2/contexts/onboarding/sign_in/view.cljs

@@ -15,8 +15,7 @@
             [status-im2.contexts.onboarding.common.background.view :as background]
             [status-im2.contexts.onboarding.sign-in.style :as style]
             [utils.i18n :as i18n]
-            [utils.re-frame :as rf]
+            [utils.re-frame :as rf]))
-            [utils.transforms :as transforms]))
 
 (defonce camera-permission-granted? (reagent/atom false))
 
@@ -86,20 +85,14 @@
 
 (defn- qr-scan-hole-area
   [qr-view-finder]
-  (let [status-bar-height (rn/status-bar-height)]
+  [rn/view
-    [rn/view
+   {:style     style/qr-view-finder
-     {:style     style/qr-view-finder
+    :on-layout (fn [event]
-      :on-layout (fn [event]
+                 (let [layout      (js->clj (oops/oget event "nativeEvent.layout")
-                   (let [layout      (transforms/js->clj (oops/oget event "nativeEvent.layout"))
+                                            :keywordize-keys
-                         width       (:width layout)
+                                            true)
-                         y           (if platform/android?
+                       view-finder (assoc layout :height (:width layout))]
-                                       (+ status-bar-height (:y layout))
+                   (reset! qr-view-finder view-finder)))}])
-                                       (:y layout))
-                         view-finder (-> layout
-                                         (assoc :height width)
-                                         (assoc :y y))]
-                     (reset! qr-view-finder view-finder)))}]))
-
 
 (defn- border
   [border1 border2 corner]

src/status_im2/contexts/onboarding/welcome/style.cljs

@@ -1,25 +1,24 @@
 (ns status-im2.contexts.onboarding.welcome.style
   (:require
+    [react-native.platform :as platform]
     [quo2.foundations.colors :as colors]))
 
-(def default-margin 20)
+(def title-container
+  {:justify-content    :center
+   :margin-top         12
+   :padding-horizontal 20})
 
-(defn page-container
+(def welcome-container
-  [insets]
   {:flex             1
-   :padding-top      (:top insets)
+   :padding-top      (if platform/ios? 44 0)
    :background-color colors/neutral-80-opa-80-blur})
 
 (def page-illustration
   {:flex              1
    :background-color  colors/danger-50
    :align-items       :center
-   :margin-horizontal default-margin
+   :margin-horizontal 20
    :border-radius     20
-   :margin-top        default-margin
+   :margin-top        20
    :justify-content   :center})
 
-(defn buttons
-  [insets]
-  {:margin        default-margin
-   :margin-bottom (+ default-margin (:bottom insets))})

src/status_im2/contexts/onboarding/welcome/view.cljs

@@ -5,20 +5,24 @@
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
     [react-native.core :as rn]
-    [react-native.safe-area :as safe-area]
     [status-im2.contexts.onboarding.welcome.style :as style]
     [status-im2.contexts.onboarding.common.background.view :as background]))
 
 (defn page-title
   []
-  (let [new-account? (rf/sub [:onboarding-2/new-account?])]
+  [rn/view {:style style/title-container}
-    [quo/title
+   [quo/text
-     {:title                        (i18n/label (if new-account?
+    {:accessibility-label :notifications-screen-title
-                                                  :t/welcome-to-web3
+     :weight              :semi-bold
-                                                  :t/welcome-back))
+     :size                :heading-1
-      :title-accessibility-label    :welcome-title
+     :style               {:color colors/white}}
-      :subtitle                     (i18n/label :t/welcome-to-web3-sub-title)
+    (i18n/label :t/welcome-to-web3)]
-      :subtitle-accessibility-label :welcome-sub-title}]))
+   [quo/text
+    {:accessibility-label :notifications-screen-sub-title
+     :weight              :regular
+     :size                :paragraph-1
+     :style               {:color colors/white}}
+    (i18n/label :t/welcome-to-web3-sub-title)]])
 
 
 (defn navigation-bar
@@ -35,20 +39,17 @@
 
 (defn view
   []
-  (let [profile-color (:color (rf/sub [:onboarding-2/profile]))]
+  [rn/view {:style style/welcome-container}
-    [safe-area/consumer
+   [background/view true]
-     (fn [insets]
+   [navigation-bar :enable-notifications]
-       [rn/view {:style (style/page-container insets)}
+   [page-title]
-        [background/view true]
+   [rn/view {:style style/page-illustration}
-        [navigation-bar :enable-notifications]
+    [quo/text
-        [page-title]
+     "Illustration here"]]
-        [rn/view {:style style/page-illustration}
+   [quo/button
-         [quo/text
+    {:on-press                  #(rf/dispatch [:init-root :shell-stack])
-          "Illustration here"]]
+     :type                      :primary
-        [rn/view {:style (style/buttons insets)}
+     :accessibility-label       :welcome-button
-         [quo/button
+     :override-background-color (colors/custom-color :magenta 60)
-          {:on-press                  #(rf/dispatch [:init-root :shell-stack])
+     :style                     {:margin 20}}
-           :type                      :primary
+    (i18n/label :t/start-using-status)]])
-           :accessibility-label       :welcome-button
-           :override-background-color (colors/custom-color profile-color 60)}
-          (i18n/label :t/start-using-status)]]])]))

src/status_im2/contexts/quo_preview/code/snippet.cljs

@@ -26,23 +26,6 @@
         s.logger.Error(\"failed to set Server.port\", zap.Error(err))
         return
     }
-
-    if s.afterPortChanged != nil {
-        s.afterPortChanged(s.port)
-    }
-    s.run = true
-
-    err = s.server.Serve(listener)
-    if err != http.ErrServerClosed {
-        s.logger.Error(\"server failed unexpectedly, restarting\", zap.Error(err))
-        err = s.Start()
-        if err != nil {
-            s.logger.Error(\"server start failed, giving up\", zap.Error(err))
-        }
-        return
-    }
-
-    s.run = false
 }")
 
 (def clojure-example
@@ -76,13 +59,9 @@
                :value :clojure}
               {:key   :go
                :value :go}]}
-   {:label   "Max lines:"
+   {:label "Max lines:"
-    :key     :max-lines
+    :key   :max-lines
-    :type    :select
+    :type  :text}
-    :options (map (fn [n]
-                    {:key   n
-                     :value (str n " lines")})
-                  (range 0 41 5))}
    {:label "Syntax highlight:"
     :key   :syntax
     :type  :boolean}])
@@ -90,7 +69,7 @@
 (defn cool-preview
   []
   (let [state (reagent/atom {:language  :clojure
-                             :max-lines 40
+                             :max-lines ""
                              :syntax    true})]
     (fn []
       (let [language  (if (:syntax @state) (:language @state) :text)

src/status_im2/contexts/quo_preview/links/url_preview.cljs

@@ -1,56 +0,0 @@
-(ns status-im2.contexts.quo-preview.links.url-preview
-  (:require
-    [quo2.core :as quo]
-    [quo2.foundations.colors :as colors]
-    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [status-im2.common.resources :as resources]
-    [status-im2.contexts.quo-preview.preview :as preview]))
-
-(def descriptor
-  [{:label "Title"
-    :key   :title
-    :type  :text}
-   {:label "Body"
-    :key   :body
-    :type  :text}
-   {:label "Loading?"
-    :key   :loading?
-    :type  :boolean}
-   {:label "Loading message"
-    :key   :loading-message
-    :type  :text}])
-
-(defn cool-preview
-  []
-  (let [state (reagent/atom
-               {:title           "Status - Private, Secure Communication"
-                :body            "Status.im"
-                :loading?        false
-                :loading-message "Generating preview"})]
-    (fn []
-      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
-       [rn/view {:style {:padding-bottom 150}}
-        [preview/customizer state descriptor]
-        [rn/view
-         {:style {:align-items        :center
-                  :padding-horizontal 16
-                  :margin-top         50}}
-         [quo/url-preview
-          {:title           (:title @state)
-           :body            (:body @state)
-           :logo            (resources/get-mock-image :status-logo)
-           :loading?        (:loading? @state)
-           :loading-message (:loading-message @state)
-           :on-clear        #(js/alert "Clear button pressed")}]]]])))
-
-(defn preview
-  []
-  [rn/view
-   {:style {:background-color (colors/theme-colors colors/white colors/neutral-95)
-            :flex             1}}
-   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :header                       [cool-preview]
-     :key-fn                       str}]])

src/status_im2/contexts/quo_preview/main.cljs

@@ -39,7 +39,6 @@
     [status-im2.contexts.quo-preview.info.information-box :as information-box]
     [status-im2.contexts.quo-preview.inputs.profile-input :as profile-input]
     [status-im2.contexts.quo-preview.inputs.title-input :as title-input]
-    [status-im2.contexts.quo-preview.links.url-preview :as url-preview]
     [status-im2.contexts.quo-preview.list-items.channel :as channel]
     [status-im2.contexts.quo-preview.list-items.preview-lists :as preview-lists]
     [status-im2.contexts.quo-preview.markdown.text :as text]
@@ -65,8 +64,6 @@
     [status-im2.contexts.quo-preview.selectors.selectors :as selectors]
     [status-im2.contexts.quo-preview.settings.accounts :as accounts]
     [status-im2.contexts.quo-preview.settings.privacy-option :as privacy-option]
-    [status-im2.contexts.quo-preview.share.qr-code :as qr-code]
-    [status-im2.contexts.quo-preview.share.share-qr-code :as share-qr-code]
     [status-im2.contexts.quo-preview.switcher.switcher-cards :as switcher-cards]
     [status-im2.contexts.quo-preview.tabs.account-selector :as account-selector]
     [status-im2.contexts.quo-preview.tabs.segmented-tab :as segmented]
@@ -76,7 +73,6 @@
     [status-im2.contexts.quo-preview.tags.status-tags :as status-tags]
     [status-im2.contexts.quo-preview.tags.tags :as tags]
     [status-im2.contexts.quo-preview.tags.token-tag :as token-tag]
-    [status-im2.contexts.quo-preview.title.title :as title]
     [status-im2.contexts.quo-preview.inputs.input :as input]
     [status-im2.contexts.quo-preview.wallet.lowest-price :as lowest-price]
     [status-im2.contexts.quo-preview.wallet.network-amount :as network-amount]
@@ -181,9 +177,6 @@
                            {:name      :title-input
                             :insets    {:top false}
                             :component title-input/preview-title-input}]
-   :links                 [{:name      :url-preview
-                            :options   {:insets {:top? true}}
-                            :component url-preview/preview}]
    :list-items            [{:name      :channel
                             :insets    {:top false}
                             :component channel/preview-channel}
@@ -265,12 +258,6 @@
                            {:name      :accounts
                             :insets    {:top false}
                             :component accounts/preview-accounts}]
-   :share                 [{:name      :qr-code
-                            :insets    {:top false}
-                            :component qr-code/preview-qr-code}
-                           {:name      :share-qr-code
-                            :insets    {:top false}
-                            :component share-qr-code/preview-share-qr-code}]
    :tabs                  [{:name      :segmented
                             :insets    {:top false}
                             :component segmented/preview-segmented}
@@ -295,9 +282,6 @@
                            {:name      :token-tag
                             :insets    {:top false}
                             :component token-tag/preview-token-tag}]
-   :text-combinations     [{:name      :title
-                            :insets    {:top false}
-                            :component title/preview-title}]
    :wallet                [{:name      :lowest-price
                             :insets    {:top false}
                             :component lowest-price/preview-lowest-price}

src/status_im2/contexts/quo_preview/selectors/selectors.cljs

@@ -1,71 +1,91 @@
 (ns status-im2.contexts.quo-preview.selectors.selectors
-  (:require [quo2.components.markdown.text :as text]
+  (:require ["react-native" :refer [StyleSheet]]
-            [quo2.components.selectors.selectors.view :as quo2]
+            [oops.core :refer [oget]]
+            [quo.previews.preview :as preview]
+            [quo.react-native :as rn]
+            [quo2.components.markdown.text :as text]
+            [quo2.components.selectors.selectors :as quo2]
             [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
             [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]))
+            [status-im.ui.components.react :as react]))
 
 (def descriptor
-  [{:label "Disabled"
+  [{:label "Disabled?"
     :key   :disabled?
-    :type  :boolean}
+    :type  :boolean}])
-   {:label "Blur"
-    :key   :blur?
-    :type  :boolean}
-   {:label   "Customization color"
-    :key     :customization-color
-    :type    :select
-    :options (map (fn [[color _]]
-                    {:key color :value (name color)})
-                  colors/customization)}])
-
-(defn selector-preview
-  [text component {:keys [disabled? blur? customization-color]}]
-  [rn/view
-   {:style {:margin      6
-            :align-items :center}}
-   [text/text {:size :paragraph-1} text]
-   [component
-    {:container-style     {:margin 4}
-     :disabled?           disabled?
-     :blur?               blur?
-     :customization-color customization-color}]])
 
 (defn cool-preview
   []
-  (let [state (reagent/atom {:disabled?           false
+  (let [state (reagent/atom {:disabled false})]
-                             :blur?               false
-                             :customization-color :blue})]
     (fn []
       [rn/view
+       {:margin-bottom 50
+        :padding       16}
        [preview/customizer state descriptor]
-       [rn/view {:style {:margin-vertical 24}}
-        [preview/blur-view
-         {:style                 {:width       "100%"
-                                  :align-items :center
-                                  :top         (if (:blur? @state) 32 16)
-                                  :position    (if (:blur? @state)
-                                                 :absolute
-                                                 :relative)}
-          :height                300
-          :show-blur-background? (:blur? @state)}
 
-         [rn/view
+       [rn/view
-          {:style {:flex        1
+        {:padding-vertical 60
-                   :align-items :center}}
+         :align-items      :center}
-          [selector-preview "Toggle" quo2/toggle @state]
+        [text/text {:size :heading-2} "Toggle"]
-          [selector-preview "Radio" quo2/radio @state]
+        [quo2/toggle
-          [selector-preview "Checkbox" quo2/checkbox @state]
+         {:container-style {:margin-top 0}
-          [selector-preview "Checkbox Prefill" quo2/checkbox-prefill @state]]]]])))
+          :disabled?       (:disabled? @state)}]
+        [text/text {:size :heading-2} "Radio"]
+        [quo2/radio
+         {:container-style {:margin-top 0}
+          :disabled?       (:disabled? @state)}]
+        [text/text {:size :heading-2} "Checkbox"]
+        [quo2/checkbox
+         {:container-style {:margin-top 0}
+          :disabled?       (:disabled? @state)}]
+        [text/text {:size :heading-2} "Checkbox Prefill"]
+        [quo2/checkbox-prefill
+         {:container-style {:margin-top 0}
+          :disabled?       (:disabled? @state)}]]
+
+       [rn/view
+        {:padding-vertical 60
+         :align-items      :center}
+        [react/blur-view
+         {:style      (oget StyleSheet "absoluteFill")
+          :blurAmount 20
+          :blurType   (if (colors/dark?) :dark :light)}
+         [react/linear-gradient
+          {:style  (oget StyleSheet "absoluteFill")
+           :colors [(colors/alpha "#4CB4EF" 0.2)
+                    (colors/alpha "#FB8F61" 0.2)
+                    (colors/alpha "#647084" 0.2)]
+           :start  {:x 0 :y 0}
+           :end    {:x 1 :y 1}}]]
+
+        [text/text {:size :heading-2} "Toggle"]
+        [quo2/toggle
+         {:container-style     {:margin-top 0}
+          :disabled?           (:disabled? @state)
+          :blurred-background? true}]
+        [text/text {:size :heading-2} "Radio"]
+        [quo2/radio
+         {:container-style     {:margin-top 0}
+          :disabled?           (:disabled? @state)
+          :blurred-background? true}]
+        [text/text {:size :heading-2} "Checkbox"]
+        [quo2/checkbox
+         {:container-style     {:margin-top 0}
+          :disabled?           (:disabled? @state)
+          :blurred-background? true}]
+        [text/text {:size :heading-2} "Checkbox Prefill"]
+        [quo2/checkbox-prefill
+         {:container-style     {:margin-top 0}
+          :disabled?           (:disabled? @state)
+          :blurred-background? true}]]])))
 
 (defn preview-selectors
   []
   [rn/view
-   {:style {:background-color (colors/theme-colors colors/white colors/neutral-95)
+   {:background-color (colors/theme-colors colors/white colors/neutral-90)
-            :flex             1}}
+    :flex             1}
    [rn/flat-list
-    {:style                     {:flex 1}
+    {:flex                      1
      :keyboardShouldPersistTaps :always
      :header                    [cool-preview]
      :key-fn                    str}]])

src/status_im2/contexts/quo_preview/share/qr_code.cljs

@@ -1,32 +0,0 @@
-(ns status-im2.contexts.quo-preview.share.qr-code
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [quo2.core :as quo]
-            [status-im2.common.resources :as resources]))
-
-(defn cool-preview
-  []
-  (fn []
-    [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
-     [rn/view {:style {:padding-bottom 150}}
-      [rn/view {:style {:flex 1}}]
-      [rn/view
-       {:style {:padding-vertical 60
-                :flex-direction   :row
-                :justify-content  :center}}
-       [quo/qr-code
-        {:source (resources/get-mock-image :qr-code)
-         :height 250
-         :width  250}]]]]))
-
-(defn preview-qr-code
-  []
-  [rn/view
-   {:style {:background-color (colors/theme-colors colors/white
-                                                   colors/neutral-90)
-            :flex             1}}
-   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :header                       [cool-preview]
-     :key-fn                       str}]])

src/status_im2/contexts/quo_preview/share/share_qr_code.cljs

@@ -1,54 +0,0 @@
-(ns status-im2.contexts.quo-preview.share.share-qr-code
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [quo2.core :as quo]
-            [status-im2.contexts.quo-preview.preview :as preview]
-            [status-im2.common.resources :as resources]
-            [reagent.core :as reagent]))
-
-
-(def descriptor
-  [{:label "URL"
-    :key   :url
-    :type  :text}
-   {:label "Link title"
-    :key   :link-title
-    :type  :text}])
-
-(defn cool-preview
-  []
-  (let [state (reagent/atom {:info-button? true
-                             :link-title   "Link to profile"
-                             :url          "status.app/u/zQ34e1zlOdas0pKnvrweeedsasas12adjie8"})]
-    (fn []
-      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
-       [rn/view {:style {:padding-bottom 150}}
-        [rn/view {:style {:flex 1}}]
-        [preview/customizer state descriptor]
-        [rn/view
-         {:style {:padding-vertical 60
-                  :justify-content  :center}}
-         [preview/blur-view
-          {:show-blur-background? true
-           :height                600
-           :blur-view-props       {:padding-top        20
-                                   :padding-horizontal 20}}
-          [quo/share-qr-code
-           {:source            (resources/get-mock-image :qr-code)
-            :link-title        (:link-title @state)
-            :url-on-press      #(js/alert "url pressed")
-            :url-on-long-press #(js/alert "url long pressed")
-            :share-on-press    #(js/alert "share pressed")
-            :qr-url            (:url @state)}]]]]])))
-
-(defn preview-share-qr-code
-  []
-  [rn/view
-   {:style {:background-color (colors/theme-colors colors/white
-                                                   colors/neutral-90)
-            :flex             1}}
-   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :header                       [cool-preview]
-     :key-fn                       str}]])

src/status_im2/contexts/quo_preview/title/title.cljs

@@ -1,42 +0,0 @@
-(ns status-im2.contexts.quo-preview.title.title
-  (:require [quo2.components.text-combinations.title.view :as quo2]
-            [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]
-            [status-im2.contexts.quo-preview.preview :as preview]))
-
-(def descriptor
-  [{:label "Title"
-    :key   :title
-    :type  :text}
-   {:label "Subtitle"
-    :key   :subtitle
-    :type  :text}])
-
-(defn cool-preview
-  []
-  (let [state (reagent/atom {:title                        "Title"
-                             :title-accessibility-label    :title
-                             :subtitle                     ""
-                             :subtitle-accessibility-label :subtitle})]
-    (fn []
-      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
-       [rn/view {:padding-bottom 150}
-        [preview/customizer state descriptor]
-        [rn/view
-         {:padding-vertical 60
-          :align-items      :center}
-         [quo2/title @state]]]])))
-
-(defn preview-title
-  []
-  [rn/view
-   {:background-color (colors/theme-colors colors/white colors/neutral-90)
-    :flex             1}
-   [rn/flat-list
-    {:flex                         1
-     :flex-grow                    1
-     :nested-scroll-enabled        true
-     :keyboard-should-persist-taps :always
-     :header                       [cool-preview]
-     :key-fn                       str}]])

src/status_im2/contexts/syncing/events.cljs

@@ -13,17 +13,10 @@
 
 (rf/defn local-pairing-completed
   {:events [:syncing/pairing-completed]}
-  [{:keys [db]}]
+  [{:keys [db] :as cofx}]
-  (let [receiver? (= (get-in db [:syncing :role]) constants/local-pairing-role-receiver)]
+  (rf/merge cofx
-    (merge
+            {:db       (dissoc db :local-pairing/completed-pairing?)
-     {:db (dissoc db :syncing)}
+             :dispatch [:init-root :enable-notifications]}))
-     (when receiver?
-       {:dispatch [:init-root :enable-notifications]}))))
-
-(rf/defn local-pairing-update-role
-  {:events [:syncing/update-role]}
-  [{:keys [db]} role]
-  {:db (assoc-in db [:syncing :role] role)})
 
 (defn- get-default-node-config
   [installation-id]
@@ -51,7 +44,6 @@
                                                           :nodeConfig final-node-config
                                                           :settingCurrentNetwork config/default-network
                                                           :deviceType utils.platform/os}}))]
-            (rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
             (status/input-connection-string-for-bootstrapping
              connection-string
              config-map
@@ -69,8 +61,7 @@
                            [:show-bottom-sheet
                             {:content (fn []
                                         [sheet/qr-code-view-with-connection-string
-                                         connection-string])}])
+                                         connection-string])}]))]
-                          (rf/dispatch [:syncing/update-role constants/local-pairing-role-sender]))]
     (if valid-password?
       (let [sha3-pwd   (status/sha3 (str (security/safe-unmask-data entered-password)))
             key-uid    (get-in db [:multiaccount :key-uid])

src/status_im2/subs/chat/chats.cljs

@@ -3,6 +3,7 @@
             [quo.design-system.colors :as colors]
             [re-frame.core :as re-frame]
             [status-im.add-new.db :as db]
+            [status-im.chat.models.mentions :as mentions]
             [status-im.communities.core :as communities]
             [status-im.group-chats.core :as group-chat]
             [status-im.group-chats.db :as group-chats.db]
@@ -437,6 +438,26 @@
  (fn [[current-chat pk]]
    (group-chat/member-removed? current-chat pk)))
 
+(re-frame/reg-sub
+ :chats/mentionable-users
+ :<- [:chats/current-chat]
+ :<- [:contacts/blocked-set]
+ :<- [:contacts/contacts]
+ :<- [:multiaccount]
+ :<- [:communities/current-community-members]
+ (fn
+   [[{:keys [users] :as chat}
+     blocked
+     all-contacts
+     {:keys [public-key] :as current-multiaccount}
+     community-members]]
+   (let [mentionable-users (mentions/get-mentionable-users chat
+                                                           all-contacts
+                                                           current-multiaccount
+                                                           community-members)
+         members-left      (into #{} (filter #(group-chat/member-removed? chat %) (keys users)))]
+     (apply dissoc mentionable-users (conj (concat blocked members-left) public-key)))))
+
 (re-frame/reg-sub
  :chat/mention-suggestions
  :<- [:chats/current-chat-id]

src/status_im2/subs/general.cljs

@@ -29,7 +29,7 @@
 (re-frame/reg-sub
  :multiaccount/logged-in?
  (fn [db]
-   (multiaccounts.model/logged-in? db)))
+   (multiaccounts.model/logged-in? {:db db})))
 
 (re-frame/reg-sub
  :hide-screen?