Android 11 - test

* Add missing color variants for selectors
* Rename test ns and replace rtl fns by helper ones
* Add missing disclaimer blur style in onboarding - create password

VERSION

@@ -1 +1 @@
-1.21.0
+1.22.0

android/app/build.gradle

@@ -92,6 +92,10 @@ 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,
@@ -132,6 +136,12 @@ 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
@@ -183,6 +193,8 @@ def getEnvOrConfig = { varName ->
 }
 
 android {
+    ndkVersion rootProject.ext.ndkVersion
+    
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
@@ -264,6 +276,11 @@ android {
             versionNameSuffix   "-SNAPSHOT"
             resValue "string", "build_config_package", "im.status.ethereum"
             signingConfig signingConfigs.debug
+            if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }
         }
         release {
             minifyEnabled enableProguardInReleaseBuilds
@@ -307,6 +324,7 @@ 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"
@@ -348,7 +366,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:3.12.12"
+    implementation "com.squareup.okhttp3:okhttp-tls:4.9.1"
 }
 
 def getLocalNDKDir = { ->

android/app/src/debug/AndroidManifest.xml

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

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

@@ -29,7 +29,6 @@ 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,6 +11,15 @@ 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=31.0.0
+buildToolsVersion=30.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
-gradlePluginVersion=3.5.4
+gradlePluginVersion=4.1.0
 
 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.',

doc/new-guidelines.md

@@ -90,6 +90,28 @@ their styles in the top-level of the properties map, prefer to add them inside t
  ]
 ```
 
+### Always apply animated styles in the style file
+
+When implementing styles for reanimated views, we should always define
+them in the style file and apply animations with reanimated/apply-animations-to-style
+in the style definition.
+
+```clojure
+;; bad
+(defn circle
+  []
+  (let [opacity (reanimated/use-shared-value 1)]
+    [reanimated/view {:style (reanimated/apply-animations-to-style
+                              {:opacity opacity}
+                              style/circle-container)}]))
+
+;; good
+(defn circle
+  []
+  (let [opacity (reanimated/use-shared-value 1)]
+    [reanimated/view {:style (style/circle-container opacity)}]))
+```
+
 ### Don't use percents to define width/height
 
 In ReactNative, all layouts use the [flexbox

ios/Podfile

@@ -7,7 +7,8 @@ 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'
@@ -47,4 +48,3 @@ abstract_target 'Status' do
 
   use_native_modules!
 end
-

ios/Podfile.lock

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

ios/StatusIm.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* 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 */; };
@@ -43,12 +44,13 @@
 		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 */; };
@@ -59,8 +61,6 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
-		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,28 +119,24 @@
 		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>"; };
-		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>"; };
+		3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		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>"; };
-		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>"; };
+		6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
-		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>"; };
-		928CC6D1D5BCCF9D3BC60D6A /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
-		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; };
@@ -148,12 +144,16 @@
 		B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = "<group>"; };
 		B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = "<group>"; };
 		B321D25F4493470980039457 /* Inter-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BoldItalic.otf"; path = "../resources/fonts/Inter-BoldItalic.otf"; sourceTree = "<group>"; };
+		BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
+		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 = (
-				BFF6343F5A1F0F5FFFC8D020 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				09B7B3FF4CFA16C028BA0B05 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +174,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				F51761A0F4D1FAE41A72435A /* libPods-Status-StatusIm.a in Frameworks */,
+				8FC9C79C1A8446E7C7C18C60 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +188,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				E9C92E7783C7FB91C9616112 /* libPods-Status-StatusImPR.a in Frameworks */,
+				7DC033789D9E0F726FD9C7AC /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				928CC6D1D5BCCF9D3BC60D6A /* libPods-Status-StatusIm.a */,
-				A4B974811E312E44D5BBE9EC /* libPods-Status-StatusIm-StatusImTests.a */,
-				57CBBEA420F440D344DD99E5 /* libPods-Status-StatusImPR.a */,
+				983EA05FB44F859255242D55 /* libPods-Status-StatusIm.a */,
+				EC21589D612F7787EA45C863 /* libPods-Status-StatusIm-StatusImTests.a */,
+				6955EB77D86338A4FA30BF8B /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				564309A78329EB657677709C /* Pods-Status-StatusIm.debug.xcconfig */,
-				5F30F922E4B02AB10F6CB65E /* Pods-Status-StatusIm.release.xcconfig */,
-				43341A7CBCE457435677CC51 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				70ACC04C7CF0A6C6421A805D /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				8D3CFDC9666FBD03D1AA059A /* Pods-Status-StatusImPR.debug.xcconfig */,
-				8B3C115CD813729DE4735219 /* Pods-Status-StatusImPR.release.xcconfig */,
+				3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */,
+				691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */,
+				6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				0F876BD5356F61BF142A01A0 /* [CP] Check Pods Manifest.lock */,
+				BFA0BBBB8136DD48F804A077 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				6ECED279DE66BA46FFB5EE0D /* [CP] Copy Pods Resources */,
+				DF5B6F4FD3B7809799833669 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				119C58BA120E4E4D213DA7CD /* [CP] Check Pods Manifest.lock */,
+				B6E3CF1D675245267368C9A7 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				3C1038075AE5E6FB86AC2319 /* [CP] Copy Pods Resources */,
+				8D6472C92D0D90E9BAD8AD9A /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				50F1BA2DC5224CBE6FDD2998 /* [CP] Check Pods Manifest.lock */,
+				8E74556C932D28F855241EA1 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				E732E3E1B024946173BF6D3D /* [CP] Copy Pods Resources */,
+				FDBEE007965D2FB13D66278F /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -417,7 +417,9 @@
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = 8B5X2M6H2Y;
 						LastSwiftMigration = 1140;
+						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -544,50 +546,6 @@
 			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;
@@ -616,7 +574,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		3C1038075AE5E6FB86AC2319 /* [CP] Copy Pods Resources */ = {
+		8D6472C92D0D90E9BAD8AD9A /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -634,11 +592,11 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = "/usr/bin/env sh";
+			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		50F1BA2DC5224CBE6FDD2998 /* [CP] Check Pods Manifest.lock */ = {
+		8E74556C932D28F855241EA1 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -656,11 +614,55 @@
 				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = "/usr/bin/env sh";
+			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;
 		};
-		6ECED279DE66BA46FFB5EE0D /* [CP] Copy Pods Resources */ = {
+		B6E3CF1D675245267368C9A7 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		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 = (
@@ -678,7 +680,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = "/usr/bin/env sh";
+			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -696,7 +698,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		E732E3E1B024946173BF6D3D /* [CP] Copy Pods Resources */ = {
+		FDBEE007965D2FB13D66278F /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -714,7 +716,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = "/usr/bin/env sh";
+			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -765,7 +767,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 43341A7CBCE457435677CC51 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 6D32AC40F159AF0551D2D2BF /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -802,7 +804,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 70ACC04C7CF0A6C6421A805D /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = BDC1942C3E1889184B8DFEA8 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -835,14 +837,15 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 564309A78329EB657677709C /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 3D03948FF807541657E64335 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
@@ -893,9 +896,11 @@
 					"-lc++",
 					"-ObjC",
 				);
+				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "9da75626-9594-43d9-a827-0f6d43c28f54";
+				PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -907,14 +912,15 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5F30F922E4B02AB10F6CB65E /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 691D1B2EE134FCF74D07E435 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
@@ -957,9 +963,11 @@
 					"-lc++",
 					"-ObjC",
 				);
+				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "e2202b12-7a66-4ff7-af3c-a52e35f32dc1";
+				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -969,7 +977,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8D3CFDC9666FBD03D1AA059A /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = E6B5FBF37AFD0AA1F05937C8 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1038,7 +1046,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8B3C115CD813729DE4735219 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = FBE095C8AC4C540F85C859D7 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1137,7 +1145,7 @@
 				ENABLE_TESTABILITY = YES;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1175,6 +1183,7 @@
 				);
 				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;
@@ -1219,6 +1228,7 @@
 				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;
@@ -1248,6 +1258,7 @@
 				);
 				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 "ReactNativeConfig.h"
+#import "RNCConfig.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 = [ReactNativeConfig envFor:@"LOG_LEVEL"];
+  NSString *logLevel = [RNCConfig envFor:@"LOG_LEVEL"];
   if([logLevel isEqualToString:@"error"]){
     RCTSetLogThreshold(RCTLogLevelError);
   }
@@ -247,4 +247,4 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
   }
 }
 
-@end
+@end

ios/StatusIm/main.m

@@ -11,7 +11,8 @@
 
 #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,10 +42,11 @@
   BOOL foundElement = NO;
 
   __block NSString *redboxError = nil;
-  RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-    if (level >= RCTLogLevelError) {
-      redboxError = message;
-    }
+  RCTSetLogFunction(
+      ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+        if (level >= RCTLogLevelError) {
+         redboxError = message;
+        }
   });
 
   while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {

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

@@ -149,11 +149,15 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         this.getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("gethEvent", params);
     }
 
-    private File getLogsFile() {
+    private File getPublicStorageDirectory() {
         final Context context = this.getReactApplicationContext();
         // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
         // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
-        final File pubDirectory = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+        return context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+
+    }
+    private File getLogsFile() {
+        final File pubDirectory = this.getPublicStorageDirectory();
         final File logFile = new File(pubDirectory, gethLogFileName);
 
         return logFile;
@@ -1170,8 +1174,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
 
 
     @ReactMethod(isBlockingSynchronousMethod = true) 
-    public String logFilePath() {
-        return getLogsFile().getAbsolutePath();
+    public String logFileDirectory() {
+        return getPublicStorageDirectory().getAbsolutePath();
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)

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

@@ -1,5 +1,4 @@
 #import "RCTStatus.h"
-#import "ReactNativeConfig.h"
 #import "React/RCTBridge.h"
 #import "React/RCTEventDispatcher.h"
 #import "Statusgo.h"
@@ -882,7 +881,7 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(backupDisabledDataDir) {
     return rootUrl.path;
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFilePath) {
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFileDirectory) {
     NSFileManager *fileManager = [NSFileManager defaultManager];
     NSURL *rootUrl =[[fileManager
                       URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]

nix/deps/gradle/deps.list

@@ -1,4 +1,5 @@
 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
@@ -6,17 +7,21 @@ 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
@@ -28,15 +33,18 @@ 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
@@ -44,6 +52,7 @@ 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
@@ -51,16 +60,19 @@ androidx.legacy:legacy-support-core-utils:1.0.0
 androidx.legacy:legacy-support-v4:1.0.0
 androidx.lifecycle:lifecycle-common:2.0.0
 androidx.lifecycle:lifecycle-common:2.1.0
+androidx.lifecycle:lifecycle-common:2.1.0-rc01
 androidx.lifecycle:lifecycle-common:2.3.1
 androidx.lifecycle:lifecycle-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
@@ -70,19 +82,24 @@ 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
@@ -105,6 +122,7 @@ 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
@@ -112,42 +130,53 @@ 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
@@ -157,6 +186,7 @@ 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
@@ -166,6 +196,7 @@ 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
@@ -175,16 +206,19 @@ 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
@@ -200,6 +234,7 @@ 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
@@ -209,6 +244,7 @@ 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
@@ -220,14 +256,15 @@ 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:26.5.4
-com.android.tools.external.com-intellij:kotlin-compiler:26.5.4
+com.android.tools.external.com-intellij:intellij-core:27.1.0
+com.android.tools.external.com-intellij:kotlin-compiler:27.1.0
 com.android.tools.external.lombok:lombok-ast:0.2.3
 com.android.tools.external.org-jetbrains:uast:26.0.0
 com.android.tools.external.org-jetbrains:uast:26.0.1
-com.android.tools.external.org-jetbrains:uast:26.5.4
+com.android.tools.external.org-jetbrains:uast:27.1.0
 com.android.tools.jack:jack-api:0.9.0
 com.android.tools.jill:jill-api:0.9.0
 com.android.tools.layoutlib:layoutlib-api:24.1.3
@@ -239,29 +276,32 @@ 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:26.5.4
+com.android.tools.lint:lint-api:27.1.0
 com.android.tools.lint:lint-checks:24.1.3
 com.android.tools.lint:lint-checks:24.3.1
 com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
-com.android.tools.lint:lint-checks:26.5.4
+com.android.tools.lint:lint-checks:27.1.0
 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:26.5.4
+com.android.tools.lint:lint-gradle-api:27.1.0
+com.android.tools.lint:lint-gradle:27.1.0
+com.android.tools.lint:lint-model:27.1.0
 com.android.tools.lint:lint: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:26.5.4
+com.android.tools.lint:lint:27.1.0
 com.android.tools:annotations:24.1.3
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
@@ -271,6 +311,7 @@ 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
@@ -280,6 +321,7 @@ 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
@@ -289,12 +331,14 @@ 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
@@ -304,6 +348,7 @@ 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
@@ -313,42 +358,39 @@ 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.0.3
+com.facebook.fbjni:fbjni-java-only:0.2.2
 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.0.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:drawee:2.5.0
+com.facebook.fresco:fbcore:2.5.0
 com.facebook.fresco:flipper:2.2.0
-com.facebook.fresco:fresco:2.0.0
-com.facebook.fresco:fresco:2.2.0
-com.facebook.fresco:imagepipeline-base:2.0.0
-com.facebook.fresco:imagepipeline-base:2.2.0
-com.facebook.fresco:imagepipeline-native:2.2.0
-com.facebook.fresco:imagepipeline-okhttp3:2.0.0
-com.facebook.fresco:imagepipeline:2.0.0
-com.facebook.fresco:imagepipeline:2.2.0
-com.facebook.fresco:memory-type-ashmem:2.2.0
-com.facebook.fresco:memory-type-java:2.2.0
-com.facebook.fresco:memory-type-native:2.2.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:fresco:2.5.0
+com.facebook.fresco:imagepipeline-base:2.5.0
+com.facebook.fresco:imagepipeline-native:2.5.0
+com.facebook.fresco:imagepipeline-okhttp3:2.5.0
+com.facebook.fresco:imagepipeline:2.5.0
+com.facebook.fresco:memory-type-ashmem:2.5.0
+com.facebook.fresco:memory-type-java:2.5.0
+com.facebook.fresco:memory-type-native:2.5.0
+com.facebook.fresco:middleware:2.5.0
+com.facebook.fresco:nativeimagefilters:2.5.0
+com.facebook.fresco:nativeimagetranscoder:2.5.0
+com.facebook.fresco:soloader:2.5.0
 com.facebook.fresco:stetho:2.2.0
-com.facebook.fresco:ui-common:2.2.0
-com.facebook.infer.annotation:infer-annotation:0.11.2
-com.facebook.soloader:annotation:0.9.0
-com.facebook.soloader:nativeloader:0.9.0
-com.facebook.soloader:soloader:0.9.0
-com.facebook.yoga:proguard-annotations:1.14.1
+com.facebook.fresco:ui-common:2.5.0
+com.facebook.infer.annotation:infer-annotation:0.18.0
+com.facebook.soloader:annotation:0.10.1
+com.facebook.soloader:nativeloader:0.10.1
+com.facebook.soloader:soloader:0.10.1
+com.facebook.yoga:proguard-annotations:1.19.0
 com.github.Dimezis:BlurView:version-2.0.2
 com.github.bumptech.glide:annotations:4.12.0
 com.github.bumptech.glide:compiler:4.12.0
@@ -367,6 +409,7 @@ 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
@@ -376,44 +419,56 @@ 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:3.12.12
-com.squareup.okhttp3:okhttp-urlconnection:3.12.12
-com.squareup.okhttp3:okhttp:3.12.12
-com.squareup.okio:okio:1.15.0
-com.squareup.okio:okio:1.17.4
+com.squareup.okhttp3:okhttp-tls:4.9.1
+com.squareup.okhttp3:okhttp-urlconnection:4.9.2
+com.squareup.okhttp3:okhttp:4.9.2
+com.squareup.okio:okio:2.9.0
 com.squareup:javapoet:1.8.0
+com.squareup:javapoet:1.10.0
 com.squareup: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
@@ -455,16 +510,20 @@ 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
@@ -477,6 +536,7 @@ 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
@@ -501,6 +561,7 @@ 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
@@ -515,6 +576,8 @@ 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
@@ -522,11 +585,15 @@ 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
@@ -535,6 +602,8 @@ 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
@@ -544,18 +613,26 @@ 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,3 +1,4 @@
+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
@@ -5,23 +6,28 @@ 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
@@ -33,6 +39,7 @@ 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
@@ -44,15 +51,18 @@ 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
@@ -60,16 +70,19 @@ 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
@@ -79,21 +92,26 @@ 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
@@ -108,9 +126,11 @@ 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
@@ -134,70 +154,85 @@ 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
@@ -207,83 +242,98 @@ 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/26.5.4/intellij-core-26.5.4.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/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/kotlin-compiler/27.1.0/kotlin-compiler-27.1.0.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/26.5.4/uast-26.5.4.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/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/26.5.4/lint-api-26.5.4.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-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/26.5.4/lint-checks-26.5.4.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-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/26.5.4/lint-gradle-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/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/26.5.4/lint-26.5.4.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/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
@@ -372,38 +422,47 @@ 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.0.3/fbjni-java-only-0.0.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/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.0.0/drawee-2.0.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/drawee/2.5.0/drawee-2.5.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/flipper/2.2.0/flipper-2.2.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/fresco/2.5.0/fresco-2.5.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-okhttp3/2.0.0/imagepipeline-okhttp3-2.0.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-base/2.5.0/imagepipeline-base-2.5.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-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/nativeimagefilters/2.0.0/nativeimagefilters-2.0.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-ashmem/2.5.0/memory-type-ashmem-2.5.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/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/infer/annotation/infer-annotation/0.11.2/infer-annotation-0.11.2.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.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/soloader/0.6.0/soloader-0.6.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.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.14.1/proguard-annotations-1.14.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/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
@@ -415,7 +474,10 @@ 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
@@ -432,16 +494,20 @@ 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
@@ -450,6 +516,7 @@ 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
@@ -457,19 +524,25 @@ 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
@@ -479,40 +552,46 @@ 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-jvm/5.0.0-alpha.11/okhttp-jvm-5.0.0-alpha.11.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-tls/4.9.1/okhttp-tls-4.9.1.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/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/3.12.12/okhttp-3.12.12.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/okhttp/4.9.1/okhttp-4.9.1.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/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
@@ -530,8 +609,10 @@ 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
@@ -635,20 +716,24 @@ 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.22/animal-sniffer-annotations-1.22.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.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.22/animal-sniffer-parent-1.22.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.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/70/mojo-parent-70.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/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
@@ -662,11 +747,14 @@ 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
@@ -689,6 +777,7 @@ 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
@@ -713,6 +802,7 @@ 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
@@ -729,26 +819,30 @@ 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
@@ -760,29 +854,36 @@ 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/9.4/asm-commons-9.4.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.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
@@ -793,18 +894,23 @@ 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/9.4/asm-tree-9.4.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.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/9.4/asm-9.4.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.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,6 +12,9 @@ stdenv.mkDerivation {
     "patchBuildIdPhase"
     "patchHermesPhase"
     "patchJavaPhase"
+    "patchYogaNodePackagePhase"
+    "patchReactNativePhase"
+    "patchPodPhase"
     "installPhase"
   ];
 
@@ -66,11 +69,44 @@ 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_5;
+  gradle = super.gradle_6;
   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_18;
-  buildGoPackage = super.buildGo118Package;
-  buildGoModule = super.buildGo118Module;
+  go = super.go_1_19;
+  buildGoPackage = super.buildGo119Package;
+  buildGoModule = super.buildGo119Module;
   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,10 +11,11 @@ let
   # We follow the master branch of official nixpkgs.
   nixpkgsSrc = fetchFromGitHub {
     name = "nixpkgs-source";
-    owner = "status-im"; # FIXME: Fork used to get Cocoapods 1.12.0.
+    # FIXME: Fork used to get Cocoapods 1.12.0 and apksigner macOS build.
+    owner = "status-im";
     repo = "nixpkgs";
-    rev = "b9b2ed705edc00003d47625950602136be3e1ed5";
-    sha256 = "sha256-F0qOawdKx7kgiGqwVikYIawL2taJ1XfcgHy0Wn0mho8=";
+    rev = "d0c06fa3d3982a91aa01bd63ed84020cbde3d3ab";
+    sha256 = "sha256-8blvuUHnuf0hFr/PpBxVohJp5CaGXIXhgJlFN/cv7us=";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };

nix/pkgs/aapt2/default.nix

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

nix/pkgs/android-sdk/compose.nix

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

nix/status-go/mobile/build.nix

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

package.json

@@ -12,9 +12,6 @@
     "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",
@@ -37,13 +34,13 @@
     "i18n-js": "^3.3.0",
     "node-libs-react-native": "^1.2.1",
     "qrcode": "^1.4.1",
-    "react": "16.13.1",
+    "react": "17.0.2",
     "react-dom": "^16.4.2",
-    "react-native": "0.63.5",
+    "react-native": "0.67.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": "git+https://github.com/status-im/react-native-config.git#refs/tags/v1.4.2-status",
+    "react-native-config": "^1.5.0",
     "react-native-dialogs": "^1.0.4",
     "react-native-draggable-flatlist": "^3.0.3",
     "react-native-fast-image": "^8.5.11",
@@ -91,13 +88,13 @@
     "@types/jest": "^28.1.6",
     "concurrently": "^7.6.0",
     "detox": "^19.9.1",
-    "jest": "^25.1.0",
+    "jest": "^26.6.3",
     "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": "16.13.1",
+    "react-test-renderer": "17.0.2",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "2.11.16"
   },

src/js/worklets/bottom_sheet.js

@@ -6,10 +6,10 @@ export function useTranslateY(initialTranslationY, bottomSheetDy, panY) {
   })
 }
 
-export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight) {
+export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight, opacity) {
   return useDerivedValue(() => {
-    const opacity = ((translateY.value - windowHeight) / -backgroundHeight) * 0.5
+    const calculatedOpacity = ((translateY.value - windowHeight) / -backgroundHeight) * opacity
 
-    return Math.max(Math.min(opacity, 0.5), 0)
+    return Math.max(Math.min(calculatedOpacity, opacity), 0)
   })
 }

src/js/worklets/onboarding_carousel.js

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

src/mocks/js_dependencies.cljs

@@ -293,7 +293,10 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     :createNativeWrapper      identity
     :default                  #js {}})
 
-(def react-native-redash #js {:clamp nil})
+(def react-native-redash
+  #js
+   {:clamp     nil
+    :withPause (fn [])})
 
 (def react-native-languages
   (clj->js {:default {:language            "en"
@@ -370,6 +373,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     "react-native-screens"                          (clj->js {})
     "react-native-reanimated"                       react-native-reanimated
     "react-native-redash/lib/module/v1"             react-native-redash
+    "react-native-redash"                           react-native-redash
     "react-native-fetch-polyfill"                   fetch
     "react-native-status-keycard"                   status-keycard
     "react-native-keychain"                         keychain
@@ -407,6 +411,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     "../src/js/worklets/bottom_sheet.js"            #js {}
     "../src/js/worklets/record_audio.js"            #js {}
     "../src/js/worklets/scroll_view.js"             #js {}
+    "../src/js/worklets/onboarding_carousel.js"     #js {}
     "../src/js/worklets/lightbox.js"                #js {}
     "./fleets.js"                                   default-fleets
     "@walletconnect/client"                         wallet-connect-client

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

@@ -0,0 +1,87 @@
+(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,175 +1,110 @@
 (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] :as node}]
-         ;; Node can have :children or a :value.
+  (map (fn [{:keys [children value last-line?] :as node}]
          (if children
            (into [text/text
-                  {:weight :code
-                   :size   :paragraph-2
-                   :style  (text-style (get-in node [:properties :className]))}]
+                  (cond-> {:weight :code
+                           :size   :paragraph-2
+                           :style  (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.
-           (-> value string/trim-newline)))
+           (string/trim-newline value)))
        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]}]
-  [into [:<>]
+  [rn/view
    (->> rows
         (render-nodes)
-        ;; Line numbers
-        (map-indexed (fn [idx row]
-                       (conj [rn/view {:style {:flex-direction :row}}
-                              [rn/view
-                               {:style {:width        line-number-width
-                                        ;; 8+12 margin
-                                        :margin-right 20}}
-                               [text/text
-                                {:weight :code
-                                 :size   :paragraph-2
-                                 :style  (text-style ["line-number"])}
-                                (inc idx)]]]
-                             row))))])
+        (map-indexed (fn [idx row-content]
+                       [line
+                        {:line-number       (inc idx)
+                         :line-number-width line-number-width}
+                        row-content]))
+        (into [:<>]))])
+
+(defn- mask-view
+  [{:keys [apply-mask?]} child]
+  (if apply-mask?
+    [:<>
+     [rn/view {:style style/gradient-container}
+      [linear-gradient/linear-gradient
+       {: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
-  []
-  (let [text-height (reagent/atom nil)]
-    (fn [{:keys [rows max-lines on-copy-press]}]
-      (let [background-color      (colors/theme-colors
-                                   colors/white
-                                   colors/neutral-80-opa-40)
-            background-color-left (colors/theme-colors
-                                   colors/neutral-5
-                                   colors/neutral-80)
-            border-color          (colors/theme-colors
-                                   colors/neutral-20
-                                   colors/neutral-80)
-            rows                  (bean/->clj rows)
-            font-scale            (:font-scale (rn/use-window-dimensions))
-            max-rows              (or max-lines (count rows)) ;; Cut down on rows to process.
-            max-line-digits       (-> rows count (min max-rows) str count)
-            ;; ~ 9 is char width, 18 is width used in Figma.
-            line-number-width     (* font-scale (max 18 (* 9 max-line-digits)))
-            max-text-height       (some-> max-lines
-                                          (* font-scale 18)) ;; 18 is font's line height.
-            truncated?            (and max-text-height (< max-text-height @text-height))
-            maybe-mask-wrapper    (if truncated?
-                                    [masked-view/masked-view
-                                     {:mask-element
-                                      (reagent/as-element
-                                       [linear-gradient/linear-gradient
-                                        {: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}])))
+  [{:keys [rows max-lines on-copy-press]
+    :or   {max-lines ##Inf}}]
+  (let [font-scale          (:font-scale (rn/use-window-dimensions))
+        total-rows          (count rows)
+        number-rows-to-show (min (count rows) max-lines)
+        line-number-width   (calc-line-number-width font-scale number-rows-to-show)
+        truncated?          (< number-rows-to-show total-rows)
+        rows-to-show-coll   (if truncated?
+                              (as-> rows $
+                                (update $ number-rows-to-show assoc :last-line? true)
+                                (take (inc number-rows-to-show) $))
+                              rows)]
+    [rn/view {:style (style/container)}
+     [rn/view {:style (style/line-number-container line-number-width)}]
+     [rn/view {:style (style/divider line-number-width)}]
+     [mask-view {:apply-mask? truncated?}
+      [code-block
+       {:rows              rows-to-show-coll
+        :line-number-width line-number-width}]]
+     [rn/view {:style style/copy-button}
+      [button/button
+       {:icon                      true
+        :type                      :grey
+        :size                      24
+        :on-press                  on-copy-press
+        :override-background-color (style/button-background-color)}
+       :main-icons/copy]]]))
 
 (defn snippet
   [{:keys [language max-lines on-copy-press]} children]
   [highlighter/highlighter
    {:language          language
-    :renderer          (wrap-renderer-fn
-                        native-renderer
-                        {:max-lines     max-lines
-                         :on-copy-press #(when on-copy-press
-                                           (on-copy-press children))})
-    ;; Default props to adapt Highlighter for react-native.
-    ;;:CodeTag           react-native/View
-    ;;:PreTag            react-native/View
+    :renderer          (fn [^js/Object props]
+                         (reagent/as-element
+                          [:f> native-renderer
+                           {:rows          (-> props .-rows bean/->clj)
+                            :on-copy-press #(when on-copy-press (on-copy-press children))
+                            :max-lines     max-lines}]))
     :show-line-numbers false
-    :style             #js {}
-    :custom-style      #js {:backgroundColor nil}}
+    :style             {}
+    :custom-style      {:background-color nil}}
    children])

src/quo2/components/common/unread_grey_dot/view.cljs

@@ -3,6 +3,7 @@
             [quo2.components.common.unread-grey-dot.style :as style]))
 
 (defn unread-grey-dot
-  []
+  [accessibility-label]
   [rn/view
-   {:style style/unread-grey-dot}])
+   (cond-> {:style style/unread-grey-dot}
+     accessibility-label (assoc :accessibility-label accessibility-label :accessible true))])

src/quo2/components/community/community_card_view.cljs

@@ -16,15 +16,13 @@
                  :height        230
                  :border-radius 20}
       :on-press on-press}
-     [rn/view
-      {:flex 1}
+     [rn/view {:style style/detail-container}
       [rn/view (style/community-cover-container 60)
        [rn/image
         {:source cover
-         :style
-         {:flex                    1
-          :border-top-right-radius 20
-          :border-top-left-radius  20}}]]
+         :style  {:flex                    1
+                  :border-top-right-radius 20
+                  :border-top-left-radius  20}}]]
       [rn/view (style/card-view-content-container 12)
        [rn/view (style/card-view-chat-icon 48)
         [icon/community-icon {:images images} 48]]
@@ -38,7 +36,7 @@
         {:title       name
          :description description}]
        [rn/view {:style (style/card-stats-position)}
-        [community-view/community-stats-column :card-view]]
+        [community-view/community-stats-column
+         {:type :card-view}]]
        [rn/view {:style (style/community-tags-position)}
         [community-view/community-tags tags]]]]]]])
-

src/quo2/components/community/community_list_view.cljs

@@ -27,7 +27,7 @@
     [counter/counter {:type :default} unread-mentions-count]
 
     unread-messages?
-    [unread-grey-dot]))
+    [unread-grey-dot :unviewed-messages-public]))
 
 (defn communities-list-view-item
   [props
@@ -46,7 +46,7 @@
     (merge {:style {:height        56
                     :border-radius 16}}
            props)
-    [rn/view {:flex 1}
+    [rn/view {:style style/detail-container}
      [rn/view (style/list-info-container)
       [community-icon/community-icon
        {:images community-icon} 32]
@@ -64,7 +64,8 @@
                                          colors/neutral-40
                                          colors/neutral-60))}}
         name]
-       [community-view/community-stats-column :list-view]]
+       [community-view/community-stats-column
+        {:type :list-view}]]
       (if (= status :gated)
         [community-view/permission-tag-container
          {:locked? locked?

src/quo2/components/community/community_view.cljs

@@ -5,6 +5,7 @@
             [quo2.components.tags.permission-tag :as permission]
             [quo2.components.tags.tag :as tag]
             [quo2.foundations.colors :as colors]
+            [quo.gesture-handler :as gesture-handler] ;;TODO move to quo2
             [react-native.core :as rn]))
 
 (defn community-stats
@@ -23,7 +24,7 @@
     members-count]])
 
 (defn community-stats-column
-  [type]
+  [{:keys [type]}]
   (let [icon-color (colors/theme-colors colors/neutral-50 colors/neutral-40)]
     [rn/view
      (if (= type :card-view)
@@ -41,7 +42,9 @@
 
 (defn community-tags
   [tags]
-  [rn/view (style/community-tags-container)
+  [gesture-handler/scroll-view
+   {:shows-horizontal-scroll-indicator false
+    :horizontal                        true}
    (for [{:keys [name emoji]} tags]
      ^{:key name}
      [rn/view {:margin-right 8}

src/quo2/components/community/style.cljs

@@ -22,6 +22,9 @@
                       colors/white
                       colors/neutral-90)})
 
+(def detail-container
+  {:flex 1})
+
 (defn stats-count-container
   []
   {:flex-direction :row
@@ -37,10 +40,6 @@
   {:flex-direction :row
    :align-items    :center})
 
-(defn community-tags-container
-  []
-  {:flex-direction :row})
-
 (defn card-stats-position
   []
   {:position :absolute
@@ -62,7 +61,7 @@
    :bottom                  0
    :left                    0
    :right                   0
-   :height                  20
+   :border-radius           20
    :padding-horizontal      padding-horizontal
    :border-top-right-radius 16
    :border-top-left-radius  16

src/quo2/components/drawers/drawer_buttons/style.cljs

@@ -1,7 +1,10 @@
 (ns quo2.components.drawers.drawer-buttons.style
-  (:require [quo2.foundations.colors :as colors]))
+  (:require [quo2.foundations.colors :as colors]
+            [react-native.platform :as platform]))
 
-(def outer-container {:height 216})
+(def outer-container
+  {:height        216
+   :border-radius 20})
 
 (def top-card
   {:flex                    1
@@ -9,7 +12,9 @@
    :padding-horizontal      20
    :border-top-left-radius  20
    :border-top-right-radius 20
-   :background-color        colors/neutral-80})
+   :background-color        (if platform/ios?
+                              colors/neutral-80-opa-80-blur
+                              colors/neutral-80)})
 
 (def bottom-card
   {:position                :absolute
@@ -21,7 +26,7 @@
    :padding-horizontal      20
    :border-top-left-radius  20
    :border-top-right-radius 20
-   :background-color        (colors/alpha colors/white 0.05)})
+   :background-color        colors/white-opa-5})
 
 (def bottom-container
   {:flex-direction  :row
@@ -35,14 +40,14 @@
    :width           28
    :justify-content :center
    :align-items     :center
-   :border-color    (colors/alpha colors/white 0.05)})
+   :border-color    colors/white-opa-5})
 
 (def bottom-text
   {:flex  1
-   :color (colors/alpha colors/white 0.7)})
+   :color colors/white-70-blur})
 
 (def top-text
-  {:color (colors/alpha colors/white 0.7)})
+  {:color colors/white-70-blur})
 
 (defn heading-text
   [gap]

src/quo2/components/drawers/drawer_buttons/view.cljs

@@ -3,6 +3,7 @@
             [quo2.components.icon :as icon]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
+            [react-native.blur :as blur]
             [quo2.components.drawers.drawer-buttons.style :as style]))
 
 (defn render-bottom
@@ -70,7 +71,7 @@
     child-2           string, keyword or hiccup
    "
   [{:keys [container-style top-card bottom-card]} child-1 child-2]
-  [rn/view
+  [blur/ios-view
    {:style (merge container-style style/outer-container)}
    [card
     (merge {:gap   4

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

@@ -139,7 +139,7 @@
        (assoc props
               :accessibility-label :password-input
               :auto-capitalize     :none
-              :auto-complete       :new-password
+              :auto-complete       :password-new
               :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/inputs/profile_input/view.cljs

@@ -6,6 +6,7 @@
     [quo2.components.inputs.title-input.view :as title-input]
     [quo2.foundations.colors :as colors]
     [react-native.core :as rn]
+    [react-native.platform :as platform]
     [react-native.hole-view :as hole-view]))
 
 (defn profile-input
@@ -18,20 +19,29 @@
     [rn/view
      {:style (style/container customization-color)}
      [rn/view
-      [hole-view/hole-view
-       {:holes [{:x            33
-                 :y            23
-                 :width        24
-                 :height       24
-                 :borderRadius 12}]}
-       [user-avatar/user-avatar
-        (assoc image-picker-props
-               :customization-color customization-color
-               :full-name           (if (seq full-name)
-                                      full-name
-                                      placeholder)
-               :status-indicator?   false
-               :size                :medium)]]
+      (if platform/ios?
+        [hole-view/hole-view
+         {:holes [{:x            33
+                   :y            23
+                   :width        24
+                   :height       24
+                   :borderRadius 12}]}
+         [user-avatar/user-avatar
+          (assoc image-picker-props
+                 :customization-color customization-color
+                 :full-name           (if (seq full-name)
+                                        full-name
+                                        placeholder)
+                 :status-indicator?   false
+                 :size                :medium)]]
+        [user-avatar/user-avatar
+         (assoc image-picker-props
+                :customization-color customization-color
+                :full-name           (if (seq full-name)
+                                       full-name
+                                       placeholder)
+                :status-indicator?   false
+                :size                :medium)])
       [buttons/button
        {:accessibility-label       :select-profile-picture-button
         :type                      :grey
@@ -47,6 +57,7 @@
      [rn/view {:style style/input-container}
       [title-input/title-input
        (merge title-input-props
-              {:override-theme      :dark
+              {:blur?               true
+               :override-theme      :dark
                :placeholder         placeholder
                :customization-color customization-color})]]]))

src/quo2/components/inputs/title_input/style.cljs

@@ -2,34 +2,35 @@
   (:require [quo2.foundations.colors :as colors]))
 
 (defn get-focused-placeholder-color
-  [blur?]
+  [blur? override-theme]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-20 (colors/alpha colors/white 0.2))
-    (colors/theme-colors colors/neutral-30 colors/neutral-60)))
+    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 override-theme)
+    (colors/theme-colors colors/neutral-30 colors/neutral-60 override-theme))
+)
 
 (defn get-placeholder-color
-  [blur?]
+  [blur? override-theme]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.3))
-    (colors/theme-colors colors/neutral-40 colors/neutral-50)))
+    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 override-theme)
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
 
 (defn- get-disabled-color
-  [blur?]
+  [blur? override-theme]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.3))
-    (colors/theme-colors colors/neutral-40 colors/neutral-50)))
+    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30)
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
 
 (defn- get-char-count-color
-  [blur?]
+  [blur? override-theme]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.4))
-    (colors/theme-colors colors/neutral-40 colors/neutral-50)))
+    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40)
+    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
 
 (defn get-selection-color
-  [customization-color blur?]
+  [customization-color blur? override-theme]
   (if blur?
-    (colors/theme-colors colors/neutral-100 colors/white)
-    (colors/custom-color customization-color (if colors/dark? 60 50))))
+    (colors/theme-colors colors/neutral-100 colors/white override-theme)
+    (colors/custom-color customization-color (if (or (= :dark override-theme) colors/dark?) 60 50))))
 
 (def text-input-container {:flex 1})
 
@@ -37,12 +38,12 @@
   [disabled? blur? override-theme]
   {:text-align-vertical :bottom
    :color               (if disabled?
-                          (get-disabled-color blur?)
+                          (get-disabled-color blur? override-theme)
                           (colors/theme-colors colors/neutral-100 colors/white override-theme))})
 
 (defn char-count
-  [blur?]
-  {:color (get-char-count-color blur?)})
+  [blur? override-theme]
+  {:color (get-char-count-color blur? override-theme)})
 
 (def container
   {:flex-direction  :row

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

@@ -45,21 +45,21 @@
           :editable (not disabled?)
           :max-length max-length
           :placeholder placeholder
-          :selection-color (style/get-selection-color customization-color blur?)
+          :selection-color (style/get-selection-color customization-color blur? override-theme)
           :placeholder-text-color (if @focused?
-                                    (style/get-focused-placeholder-color blur?)
-                                    (style/get-placeholder-color blur?))}]]
+                                    (style/get-focused-placeholder-color blur? override-theme)
+                                    (style/get-placeholder-color blur? override-theme))}]]
        [rn/view
         {:style style/counter-container}
         [text/text
          [text/text
-          {:style (style/char-count blur?)
+          {:style (style/char-count blur? override-theme)
            :size  :paragraph-2}
           (pad-0
            (str
             (count @value)))]
          [text/text
-          {:style (style/char-count blur?)
+          {:style (style/char-count blur? override-theme)
            :size  :paragraph-2}
           (str "/"
                (pad-0

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

@@ -0,0 +1,29 @@
+(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

@@ -0,0 +1,58 @@
+(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

@@ -0,0 +1,63 @@
+(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/channel.cljs

@@ -62,4 +62,4 @@
                 (not muted?)
                 (not (pos? (int mentions-count)))
                 unread-messages?)
-       [unread-grey-dot])]]])
+       [unread-grey-dot :unviewed-messages-public])]]])

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 :as selectors]))
+            [quo2.components.selectors.selectors.view :as selectors]))
 
 (def container-style
   {:margin-horizontal  8

src/quo2/components/navigation/page_nav.cljs

@@ -203,8 +203,8 @@
       }
    }
   "
-  [{:keys [one-icon-align-left? horizontal-description? align-mid?
-           page-nav-color page-nav-background-uri
+  [{:keys [container-style one-icon-align-left? horizontal-description?
+           align-mid? page-nav-color page-nav-background-uri
            mid-section
            left-section
            right-section-buttons]}]
@@ -222,13 +222,14 @@
          :left-icon               (:left-icon mid-section)
          :avatar                  (:avatar mid-section)}]
     [rn/view
-     {:style (cond-> {:display            :flex
-                      :flex-direction     :row
-                      ;;  iPhone 11 Pro's height in Figma divided by Component height 56/1125
-                      :align-items        :center
-                      :padding-horizontal 20
-                      :height             56
-                      :justify-content    :space-between}
+     {:style (cond-> (merge {:display            :flex
+                             :flex-direction     :row
+                             ;;  iPhone 11 Pro's height in Figma divided by Component height 56/1125
+                             :align-items        :center
+                             :padding-horizontal 20
+                             :height             56
+                             :justify-content    :space-between}
+                            container-style)
                page-nav-background-uri (assoc :background-color page-nav-color)
                page-nav-color          (assoc :background page-nav-background-uri))}
      [rn/view

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

@@ -15,7 +15,6 @@
             [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)
@@ -538,7 +537,7 @@
           [rn/view
            {:test-ID                       "record-audio"
             :style                         style/button-container
-            :hit-slop                      {:top    (if platform/ios? -70 0)
+            :hit-slop                      {:top    -70
                                             :bottom 0
                                             :left   0
                                             :right  0}

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

@@ -1,84 +0,0 @@
-(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 :as selectors]
+            [quo2.components.selectors.selectors.view :as selectors]
             [react-native.core :as rn]))
 
 (defn view
@@ -10,8 +10,9 @@
    {:style (merge container-style (style/container blur?))}
    [selectors/checkbox
     {:accessibility-label accessibility-label
-     :on-change           on-change
-     :checked?            checked?}]
+     :blur?               blur?
+     :checked?            checked?
+     :on-change           on-change}]
    [text/text
     {:size  :paragraph-2
      :style style/text}

src/quo2/components/selectors/selectors.cljs

@@ -1,109 +0,0 @@
-(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

@@ -0,0 +1,68 @@
+(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

@@ -0,0 +1,127 @@
+(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

@@ -0,0 +1,76 @@
+(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

@@ -1,130 +0,0 @@
-(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 :as selectors]
+            [quo2.components.selectors.selectors.view :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

@@ -0,0 +1,12 @@
+(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

@@ -0,0 +1,11 @@
+(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

@@ -0,0 +1,33 @@
+(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

@@ -0,0 +1,44 @@
+(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

@@ -0,0 +1,49 @@
+(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/tags/status_tags.cljs

@@ -11,12 +11,14 @@
 
 (def small-container-style
   (merge default-container-style
-         {:padding-horizontal 8
+         {:min-height         24
+          :padding-horizontal 8
           :padding-vertical   1}))
 
 (def large-container-style
   (merge default-container-style
-         {:padding-horizontal 11
+         {:min-height         32
+          :padding-horizontal 11
           :padding-vertical   4}))
 
 (defn base-tag
@@ -36,6 +38,7 @@
         :style               (assoc (if (= size :small)
                                       small-container-style
                                       large-container-style)
+                                    :align-self       :flex-start
                                     :border-width     1
                                     :border-color     border-color
                                     :background-color background-color)}
@@ -45,10 +48,11 @@
         [rn/view
          {:style {:justify-content :center
                   :align-items     :center}}
-         [icon/icon
-          icon
-          {:no-color true
-           :size     (if (= size :large) 20 12)}]]
+         (when icon
+           [icon/icon
+            icon
+            {:no-color true
+             :size     (if (= size :large) 20 12)}])]
         [text/text
          {:size   paragraph-size
           :weight :medium
@@ -56,11 +60,11 @@
                    :color        text-color}} label]]])))
 
 (defn- positive
-  [size theme label _]
+  [size theme label _ no-icon?]
   [base-tag
    {:accessibility-label :status-tag-positive
     :size                size
-    :icon                :i/positive-state
+    :icon                (when-not no-icon? :i/positive-state)
     :background-color    colors/success-50-opa-10
     :border-color        colors/success-50-opa-20
     :label               label
@@ -68,11 +72,11 @@
     :text-color          (if (= theme :dark) colors/success-60 colors/success-50)}])
 
 (defn- negative
-  [size theme label _]
+  [size theme label _ no-icon?]
   [base-tag
    {:accessibility-label :status-tag-negative
     :size                size
-    :icon                :i/negative-state
+    :icon                (when-not no-icon? :i/negative-state)
     :background-color    colors/danger-50-opa-10
     :border-color        colors/danger-50-opa-20
     :label               label
@@ -80,14 +84,15 @@
     :text-color          (if (= theme :light) colors/danger-50 colors/danger-60)}])
 
 (defn- pending
-  [size theme label blur?]
+  [size theme label blur? no-icon?]
   [base-tag
    {:accessibility-label :status-tag-pending
     :size                size
     :label               label
-    :icon                (if blur?
-                           :i/pending-dark-blur
-                           (if (= theme :light) :i/pending-light :i/pending-dark))
+    :icon                (when-not no-icon?
+                           (if blur?
+                             :i/pending-dark-blur
+                             (if (= theme :light) :i/pending-light :i/pending-dark)))
     :background-color    (if blur?
                            colors/white-opa-5
                            (colors/theme-colors colors/neutral-10 colors/neutral-80-opa-40 theme))
@@ -100,7 +105,7 @@
                            (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}])
 
 (defn status-tag
-  [{:keys [status size override-theme label blur?]}]
+  [{:keys [status size override-theme label blur? no-icon?]}]
   (when status
     (when-let [status-component (case (:type status)
                                   :positive positive
@@ -111,4 +116,5 @@
        size
        (or override-theme (quo2.theme/get-theme))
        label
-       blur?])))
+       blur?
+       no-icon?])))

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

@@ -0,0 +1,15 @@
+(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

@@ -0,0 +1,25 @@
+(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,6 +33,7 @@
     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
@@ -55,10 +56,12 @@
     quo2.components.record-audio.record-audio.view
     quo2.components.selectors.disclaimer.view
     quo2.components.selectors.filter.view
-    quo2.components.selectors.selectors
+    quo2.components.selectors.selectors.view
     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
@@ -69,6 +72,7 @@
     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)
@@ -91,13 +95,11 @@
 (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/checkbox)
+(def checkbox quo2.components.selectors.selectors.view/checkbox)
 (def filter quo2.components.selectors.filter.view/view)
 (def skeleton quo2.components.loaders.skeleton/skeleton)
 (def author quo2.components.messages.author.view/author)
@@ -176,9 +178,24 @@
 (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,24 +1,27 @@
 (ns quo2.core-spec
-  (:require [quo2.components.avatars.user-avatar.component-spec]
-            [quo2.components.banners.banner.component-spec]
-            [quo2.components.buttons.--tests--.buttons-component-spec]
-            [quo2.components.colors.color-picker.component-spec]
-            [quo2.components.counter.--tests--.counter-component-spec]
-            [quo2.components.dividers.--tests--.divider-label-component-spec]
-            [quo2.components.dividers.strength-divider.component-spec]
-            [quo2.components.drawers.action-drawers.component-spec]
-            [quo2.components.drawers.drawer-buttons.component-spec]
-            [quo2.components.drawers.permission-context.component-spec]
-            [quo2.components.inputs.input.component-spec]
-            [quo2.components.inputs.profile-input.component-spec]
-            [quo2.components.inputs.title-input.component-spec]
-            [quo2.components.markdown.--tests--.text-component-spec]
-            [quo2.components.onboarding.small-option-card.component-spec]
-            [quo2.components.password.tips.component-spec]
-            [quo2.components.profile.select-profile.component-spec]
-            [quo2.components.record-audio.record-audio.--tests--.record-audio-component-spec]
-            [quo2.components.record-audio.soundtrack.--tests--.soundtrack-component-spec]
-            [quo2.components.selectors.--tests--.selectors-component-spec]
-            [quo2.components.selectors.disclaimer.component-spec]
-            [quo2.components.selectors.filter.component-spec]
-            [quo2.components.tags.--tests--.status-tags-component-spec]))
+  (:require
+    [quo2.components.avatars.user-avatar.component-spec]
+    [quo2.components.banners.banner.component-spec]
+    [quo2.components.buttons.--tests--.buttons-component-spec]
+    [quo2.components.colors.color-picker.component-spec]
+    [quo2.components.counter.--tests--.counter-component-spec]
+    [quo2.components.dividers.--tests--.divider-label-component-spec]
+    [quo2.components.dividers.strength-divider.component-spec]
+    [quo2.components.drawers.action-drawers.component-spec]
+    [quo2.components.drawers.drawer-buttons.component-spec]
+    [quo2.components.drawers.permission-context.component-spec]
+    [quo2.components.inputs.input.component-spec]
+    [quo2.components.inputs.profile-input.component-spec]
+    [quo2.components.inputs.title-input.component-spec]
+    [quo2.components.links.url-preview.component-spec]
+    [quo2.components.markdown.--tests--.text-component-spec]
+    [quo2.components.onboarding.small-option-card.component-spec]
+    [quo2.components.password.tips.component-spec]
+    [quo2.components.profile.select-profile.component-spec]
+    [quo2.components.record-audio.record-audio.--tests--.record-audio-component-spec]
+    [quo2.components.record-audio.soundtrack.--tests--.soundtrack-component-spec]
+    [quo2.components.selectors.disclaimer.component-spec]
+    [quo2.components.selectors.filter.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/quo2/foundations/colors.cljs

@@ -117,6 +117,7 @@
 
 ;;;;Blur
 (def white-70-blur (alpha white 0.7))
+(def neutral-80-opa-1-blur (alpha "#192438" 0.1))
 (def neutral-5-opa-70-blur (alpha neutral-5 0.7))
 (def neutral-80-opa-80-blur (alpha "#192438" 0.8))
 (def neutral-90-opa-70-blur (alpha neutral-90 0.7))
@@ -127,6 +128,7 @@
 
 ;;Solid
 (def black "#000000")
+(def onboarding-header-black "#000716")
 
 ;;;;Primary
 

src/react_native/blur.cljs

@@ -1,5 +1,10 @@
 (ns react-native.blur
   (:require ["@react-native-community/blur" :as blur]
-            [reagent.core :as reagent]))
+            [react-native.platform :as platform]
+            [reagent.core :as reagent]
+            [react-native.core :as rn]))
 
 (def view (reagent/adapt-react-class (.-BlurView blur)))
+
+;; blur view is currently not working correctly on Android.
+(def ios-view (if platform/ios? view rn/view))

src/react_native/gesture.cljs

@@ -6,7 +6,8 @@
               Swipeable
               TouchableWithoutFeedback
               gestureHandlerRootHOC
-              FlatList)]
+              FlatList
+              ScrollView)]
             [react-native.flat-list :as rn-flat-list]
             [reagent.core :as reagent]))
 
@@ -69,6 +70,9 @@
         children))
 
 (def gesture-flat-list (reagent/adapt-react-class FlatList))
+
 (defn flat-list
   [props]
   [gesture-flat-list (rn-flat-list/base-list-props props)])
+
+(def scroll-view (reagent/adapt-react-class ScrollView))

src/react_native/reanimated.cljs

@@ -9,16 +9,18 @@
                              withDelay
                              withSpring
                              withRepeat
+                             withSequence
                              withDecay
                              Easing
                              Keyframe
                              cancelAnimation
                              SlideInUp
                              SlideOutUp
-                             LinearTransition)]
+                             LinearTransition
+                             runOnJS)]
             [reagent.core :as reagent]
+            ["react-native-redash" :refer (withPause)]
             [react-native.flat-list :as rn-flat-list]
-            [utils.collection]
             [utils.worklets.core :as worklets.core]))
 
 (def ^:const default-duration 300)
@@ -59,8 +61,12 @@
 (def with-decay withDecay)
 (def key-frame Keyframe)
 (def with-repeat withRepeat)
+(def with-sequence withSequence)
+(def with-pause withPause)
 (def cancel-animation cancelAnimation)
 
+(def run-on-js runOnJS)
+
 ;; Easings
 (def bezier (.-bezier ^js Easing))
 

src/react_native/syntax_highlighter.cljs

@@ -1,5 +1,11 @@
 (ns react-native.syntax-highlighter
-  (:require ["react-syntax-highlighter" :default Highlighter]
-            [reagent.core :as reagent]))
+  (:require ["react-native" :as react-native]
+            ["react-syntax-highlighter" :default Highlighter]))
 
-(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/add_new/core.cljs

@@ -83,7 +83,7 @@
       (if new-contact?
         (rf/merge cofx
                   (contact/add-contact chat-key nickname ens-name)
-                  (navigation/navigate-to-cofx :contacts-list {}))
+                  (navigation/navigate-to :contacts-list {}))
         (chat/start-chat cofx chat-key ens-name))
       {:utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
                           :content    (case validation-result

src/status_im/bottom_sheet/events.cljs

@@ -0,0 +1,30 @@
+(ns status-im.bottom-sheet.events
+  (:require [utils.re-frame :as rf]))
+
+(rf/defn show-bottom-sheet-old
+  [{:keys [db]} {:keys [view options]}]
+  {:dismiss-keyboard              nil
+   :show-bottom-sheet-overlay-old nil
+   :db                            (assoc db
+                                         :bottom-sheet/show?   true
+                                         :bottom-sheet/view    view
+                                         :bottom-sheet/options options)})
+
+(rf/defn show-bottom-sheet-event
+  {:events [:bottom-sheet/show-sheet-old]}
+  [cofx view options]
+  (show-bottom-sheet-old
+   cofx
+   {:view    view
+    :options options}))
+
+(rf/defn hide-bottom-sheet-old
+  {:events [:bottom-sheet/hide-old]}
+  [{:keys [db]}]
+  {:db                               (assoc db :bottom-sheet/show? false)
+   :dismiss-bottom-sheet-overlay-old nil})
+
+(rf/defn hide-bottom-sheet-navigation-overlay
+  {:events [:bottom-sheet/hide-old-navigation-overlay]}
+  [{}]
+  {:dismiss-bottom-sheet-overlay-old nil})

src/status_im/bottom_sheet/sheets.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.common.bottom-sheet.sheets
+(ns status-im.bottom-sheet.sheets
   (:require [utils.re-frame :as rf]
             [status-im.ui.screens.about-app.views :as about-app]
             [status-im.ui.screens.home.sheet.views :as home.sheet]
@@ -6,16 +6,15 @@
             [status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
             [status-im.ui.screens.multiaccounts.key-storage.views :as key-storage]
             [status-im.ui.screens.multiaccounts.recover.views :as recover.views]
-            [status-im2.common.bottom-sheet.view :as bottom-sheet]
-            [status-im2.contexts.chat.messages.pin.list.view :as pin.list]
+            [status-im.bottom-sheet.view :as bottom-sheet]
             [react-native.core :as rn]))
 
 (defn bottom-sheet
   []
   (let [dismiss-bottom-sheet-callback (fn []
-                                        (rf/dispatch [:bottom-sheet/hide])
+                                        (rf/dispatch [:bottom-sheet/hide-old])
                                         true)
-        {:keys [show? view options]} (rf/sub [:bottom-sheet])
+        {:keys [show? view options]} (rf/sub [:bottom-sheet-old])
         {:keys [content]
          :as   opts}
         (cond-> {:visible? show?}
@@ -31,12 +30,6 @@
           (= view :add-new)
           (merge home.sheet/add-new)
 
-          (= view :new-chat-bottom-sheet)
-          (merge home.sheet/new-chat-bottom-sheet-comp)
-
-          (= view :start-a-new-chat)
-          (merge home.sheet/start-a-new-chat)
-
           (= view :keycard.login/more)
           (merge keycard/more-sheet)
 
@@ -47,10 +40,8 @@
           (merge recover.views/bottom-sheet)
 
           (= view :migrate-account-password)
-          (merge key-storage/migrate-account-password)
+          (merge key-storage/migrate-account-password))]
 
-          (= view :pinned-messages-list)
-          (merge {:content pin.list/pinned-messages-list}))]
     [:f>
      (fn []
        (rn/use-effect (fn []

src/status_im/bottom_sheet/styles.cljs

@@ -0,0 +1,56 @@
+(ns status-im.bottom-sheet.styles
+  (:require [quo2.foundations.colors :as colors]))
+
+(def border-radius 20)
+
+(defn handle
+  [override-theme]
+  {:position         :absolute
+   :top              8
+   :width            32
+   :height           4
+   :background-color (colors/theme-colors colors/neutral-100 colors/white override-theme)
+   :opacity          0.1
+   :border-radius    100
+   :align-self       :center})
+
+(def backdrop
+  {:position         :absolute
+   :left             0
+   :right            0
+   :bottom           0
+   :top              0
+   :background-color colors/neutral-100})
+
+(def container
+  {:position :absolute
+   :left     0
+   :right    0
+   :top      0
+   :bottom   0
+   :overflow :hidden})
+
+(defn content-style
+  [insets bottom-safe-area-spacing?]
+  {:position       :absolute
+   :left           0
+   :right          0
+   :top            0
+   :padding-top    border-radius
+   :padding-bottom (if bottom-safe-area-spacing? (:bottom insets) 0)})
+
+(defn selected-background
+  [override-theme]
+  {:border-radius     12
+   :padding-left      12
+   :margin-horizontal 8
+   :margin-bottom     10
+   :height            48
+   :background-color  (colors/theme-colors colors/white colors/neutral-90 override-theme)})
+
+(defn background
+  [override-theme]
+  {:background-color        (colors/theme-colors colors/white colors/neutral-95 override-theme)
+   :flex                    1
+   :border-top-left-radius  border-radius
+   :border-top-right-radius border-radius})

src/status_im/bottom_sheet/view.cljs

@@ -0,0 +1,240 @@
+(ns status-im.bottom-sheet.view
+  (:require [oops.core :refer [oget]]
+            [quo.react :as react]
+            [status-im.bottom-sheet.styles :as styles]
+            [re-frame.core :as re-frame]
+            [react-native.background-timer :as timer]
+            [react-native.core :as rn]
+            [react-native.gesture :as gesture]
+            [react-native.hooks :as hooks]
+            [react-native.platform :as platform]
+            [react-native.reanimated :as reanimated]
+            [react-native.safe-area :as safe-area]
+            [reagent.core :as reagent]
+            [utils.worklets.bottom-sheet :as worklets.bottom-sheet]))
+
+(def animation-delay 450)
+
+(defn with-animation
+  [value & [options callback]]
+  (reanimated/with-spring
+   value
+   (clj->js (merge {:mass      2
+                    :stiffness 500
+                    :damping   200})
+            options)
+   callback))
+
+(defn get-bottom-sheet-gesture
+  [pan-y translate-y bg-height bg-height-expanded
+   window-height keyboard-shown disable-drag? expandable?
+   show-bottom-sheet? expanded? close-bottom-sheet gesture-running?]
+  (-> (gesture/gesture-pan)
+      (gesture/on-start
+       (fn [_]
+         (reset! gesture-running? true)
+         (when (and keyboard-shown (not disable-drag?) show-bottom-sheet?)
+           (re-frame/dispatch [:dismiss-keyboard]))))
+      (gesture/on-update
+       (fn [evt]
+         (when (and (not disable-drag?) show-bottom-sheet?)
+           (let [max-pan-up   (if (or @expanded? (not expandable?))
+                                0
+                                (- (- bg-height-expanded bg-height)))
+                 max-pan-down (if @expanded?
+                                bg-height-expanded
+                                bg-height)]
+             (reanimated/set-shared-value pan-y
+                                          (max
+                                           (min
+                                            (.-translationY evt)
+                                            max-pan-down)
+                                           max-pan-up))))))
+      (gesture/on-end
+       (fn [_]
+         (reset! gesture-running? false)
+         (when (and (not disable-drag?) show-bottom-sheet?)
+           (let [end-pan-y                  (- window-height (.-value translate-y))
+                 expand-threshold           (min (* bg-height 1.1) (+ bg-height 50))
+                 collapse-threshold         (max (* bg-height-expanded 0.9) (- bg-height-expanded 50))
+                 should-close-bottom-sheet? (< end-pan-y (max (* bg-height 0.7) 50))]
+             (cond
+               should-close-bottom-sheet?
+               (close-bottom-sheet)
+
+               (and (not @expanded?) (> end-pan-y expand-threshold))
+               (reset! expanded? true)
+
+               (and @expanded? (< end-pan-y collapse-threshold))
+               (reset! expanded? false))))))))
+
+(defn handle-comp
+  [window-width override-theme]
+  [rn/view
+   {:style {:width            window-width
+            :position         :absolute
+            :background-color :transparent
+            :top              0
+            :height           20}}
+   [rn/view {:style (styles/handle override-theme)}]])
+
+(defn bottom-sheet
+  [props children]
+  (let [{on-cancel                 :on-cancel
+         disable-drag?             :disable-drag?
+         show-handle?              :show-handle?
+         visible?                  :visible?
+         backdrop-dismiss?         :backdrop-dismiss?
+         expandable?               :expandable?
+         bottom-safe-area-spacing? :bottom-safe-area-spacing?
+         selected-item             :selected-item
+         is-initially-expanded?    :expanded?
+         override-theme            :override-theme
+         :or                       {show-handle?              true
+                                    backdrop-dismiss?         true
+                                    expandable?               false
+                                    bottom-safe-area-spacing? true
+                                    is-initially-expanded?    false}}
+        props
+        content-height (reagent/atom nil)
+        show-bottom-sheet? (reagent/atom nil)
+        keyboard-was-shown? (reagent/atom false)
+        expanded? (reagent/atom is-initially-expanded?)
+        gesture-running? (reagent/atom false)
+        reset-atoms (fn []
+                      (reset! show-bottom-sheet? nil)
+                      (reset! content-height nil)
+                      (reset! expanded? false)
+                      (reset! keyboard-was-shown? false)
+                      (reset! gesture-running? false))
+        close-bottom-sheet (fn []
+                             (reset! show-bottom-sheet? false)
+                             (when (fn? on-cancel) (on-cancel))
+                             (timer/set-timeout
+                              #(do
+                                 (re-frame/dispatch [:bottom-sheet/hide-old-navigation-overlay])
+                                 (reset-atoms))
+                              animation-delay))]
+    [safe-area/consumer
+     (fn [insets]
+       [:f>
+        (fn []
+          (let [{height       :height
+                 window-width :width}
+                (rn/use-window-dimensions)
+                window-height (if selected-item (- height 72) height)
+                {:keys [keyboard-shown]} (hooks/use-keyboard)
+                bg-height-expanded (- window-height (:top insets))
+                bg-height (max (min @content-height bg-height-expanded) 109)
+                bottom-sheet-dy (reanimated/use-shared-value 0)
+                pan-y (reanimated/use-shared-value 0)
+                translate-y (worklets.bottom-sheet/use-translate-y window-height bottom-sheet-dy pan-y)
+                bg-opacity
+                (worklets.bottom-sheet/use-background-opacity translate-y bg-height window-height 0.7)
+                on-content-layout (fn [evt]
+                                    (let [height (oget evt "nativeEvent" "layout" "height")]
+                                      (reset! content-height height)))
+                on-expanded (fn []
+                              (reanimated/set-shared-value bottom-sheet-dy bg-height-expanded)
+                              (reanimated/set-shared-value pan-y 0))
+                on-collapsed (fn []
+                               (reanimated/set-shared-value bottom-sheet-dy bg-height)
+                               (reanimated/set-shared-value pan-y 0))
+                bottom-sheet-gesture (get-bottom-sheet-gesture
+                                      pan-y
+                                      translate-y
+                                      bg-height
+                                      bg-height-expanded
+                                      window-height
+                                      keyboard-shown
+                                      disable-drag?
+                                      expandable?
+                                      show-bottom-sheet?
+                                      expanded?
+                                      close-bottom-sheet
+                                      gesture-running?)
+                handle-comp [gesture/gesture-detector {:gesture bottom-sheet-gesture}
+                             [handle-comp window-width override-theme]]]
+
+            (react/effect! #(do
+                              (cond
+                                (and
+                                 (nil? @show-bottom-sheet?)
+                                 visible?
+                                 (some? @content-height)
+                                 (> @content-height 0))
+                                (reset! show-bottom-sheet? true)
+
+                                (and @show-bottom-sheet? (not visible?))
+                                (close-bottom-sheet)))
+                           [@show-bottom-sheet? @content-height visible?])
+            (react/effect! #(do
+                              (when @show-bottom-sheet?
+                                (cond
+                                  keyboard-shown
+                                  (do
+                                    (reset! keyboard-was-shown? true)
+                                    (reset! expanded? true))
+                                  (and @keyboard-was-shown? (not keyboard-shown))
+                                  (reset! expanded? false))))
+                           [@show-bottom-sheet? @keyboard-was-shown? keyboard-shown])
+            (react/effect! #(do
+                              (when-not @gesture-running?
+                                (cond
+                                  @show-bottom-sheet?
+                                  (if @expanded?
+                                    (do
+                                      (reanimated/set-shared-value
+                                       bottom-sheet-dy
+                                       (with-animation (+ bg-height-expanded (.-value pan-y))))
+                                      ;; Workaround for
+                                      ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741
+                                      ;; withTiming/withSpring callback not working
+                                      ;; on-expanded should be called as a callback of
+                                      ;; with-animation instead, once this issue has been resolved
+                                      (timer/set-timeout on-expanded animation-delay))
+                                    (do
+                                      (reanimated/set-shared-value
+                                       bottom-sheet-dy
+                                       (with-animation (+ bg-height (.-value pan-y))))
+                                      ;; Workaround for
+                                      ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741
+                                      ;; withTiming/withSpring callback not working
+                                      ;; on-collapsed should be called as a callback of
+                                      ;; with-animation instead, once this issue has been resolved
+                                      (timer/set-timeout on-collapsed animation-delay)))
+
+                                  (= @show-bottom-sheet? false)
+                                  (reanimated/set-shared-value bottom-sheet-dy (with-animation 0)))))
+                           [@show-bottom-sheet? @expanded? @gesture-running?])
+
+            [:<>
+             [rn/touchable-without-feedback {:on-press (when backdrop-dismiss? close-bottom-sheet)}
+              [reanimated/view
+               {:style (reanimated/apply-animations-to-style
+                        {:opacity bg-opacity}
+                        styles/backdrop)}]]
+             (cond->> [reanimated/view
+                       {:style (reanimated/apply-animations-to-style
+                                {:transform [{:translateY translate-y}]}
+                                {:width  window-width
+                                 :height window-height})}
+                       [rn/view {:style styles/container}
+                        (when selected-item
+                          [rn/view {:style (styles/selected-background override-theme)}
+                           [selected-item]])
+                        [rn/view {:style (styles/background override-theme)}
+                         [rn/keyboard-avoiding-view
+                          {:behaviour (if platform/ios? :padding :height)
+                           :style     {:flex 1}}
+                          [rn/view
+                           {:style     (styles/content-style insets bottom-safe-area-spacing?)
+                            :on-layout (when-not (and
+                                                  (some? @content-height)
+                                                  (> @content-height 0))
+                                         on-content-layout)}
+                           children]]
+                         (when show-handle?
+                           handle-comp)]]]
+               (not show-handle?)
+               (conj [gesture/gesture-detector {:gesture bottom-sheet-gesture}]))]))])]))

src/status_im/browser/core.cljs

@@ -3,7 +3,7 @@
     ["eth-phishing-detect" :as eth-phishing-detect]
     [clojure.string :as string]
     [re-frame.core :as re-frame]
-    [status-im2.common.bottom-sheet.events :as bottom-sheet]
+    [status-im.bottom-sheet.events :as bottom-sheet]
     [status-im.browser.eip3085 :as eip3085]
     [status-im.browser.eip3326 :as eip3326]
     [status-im.browser.permissions :as browser.permissions]
@@ -572,7 +572,7 @@
   [{:keys [db] :as cofx} address]
   (rf/merge cofx
             {:browser/clear-web-data nil}
-            (bottom-sheet/hide-bottom-sheet)
+            (bottom-sheet/hide-bottom-sheet-old)
             (browser.permissions/clear-dapps-permissions)
             (multiaccounts.update/multiaccount-update :dapps-address address {})
             #(when (= (:view-id db) :browser)

src/status_im/browser/eip3085.cljs

@@ -28,7 +28,7 @@
                     :on-success #(re-frame/dispatch [:eip3085/send-success-call-to-bridge cofx id
                                                      message-id])
                     :on-error   #(log/error "failed to perform settings_saveSetting" %)}]
-   :dispatch      [:bottom-sheet/hide]})
+   :dispatch      [:bottom-sheet/hide-old]})
 
 (rf/defn deny-permission
   {:events [:eip3085.ui/dapp-permission-denied]}
@@ -37,7 +37,7 @@
                             :messageId message-id
                             :error     {:code    4001
                                         :message "User rejected the request."}}
-   :dispatch               [:bottom-sheet/hide]})
+   :dispatch               [:bottom-sheet/hide-old]})
 
 (rf/defn handle-add-ethereum-chain
   {:events [:eip3085/handle-add-ethereum-chain]}
@@ -64,7 +64,7 @@
                                                               :id           id
                                                               :new-network  network)]
         (if (network/chain-id-available? networks network)
-          {:dispatch [:bottom-sheet/show-sheet
+          {:dispatch [:bottom-sheet/show-sheet-old
                       {:content (fn []
                                   [sheet/permissions-panel dapp-name message-id params])}]}
           (send-success-call-to-bridge cofx id message-id)))

src/status_im/browser/eip3326.cljs

@@ -13,7 +13,7 @@
                             :messageId message-id
                             :error     {:code    4001
                                         :message "User rejected the request."}}
-   :dispatch               [:bottom-sheet/hide]})
+   :dispatch               [:bottom-sheet/hide-old]})
 
 (rf/defn handle-switch-ethereum-chain
   {:events [:eip3326/handle-switch-ethereum-chain]}
@@ -39,7 +39,7 @@
                                        :target-network-id target-network-id
                                        :network-from      network-from
                                        :network-to        network-to)]
-          {:dispatch [:bottom-sheet/show-sheet
+          {:dispatch [:bottom-sheet/show-sheet-old
                       {:content (fn []
                                   [sheet/permissions-panel dapp-name message-id params])}]}))
       {:browser/send-to-bridge {:type constants/web3-send-async-callback

src/status_im/chat/models/input.cljs

@@ -41,36 +41,19 @@
 
 (rf/defn select-mention
   {:events [:chat.ui/select-mention]}
-  [{:keys [db] :as cofx} text-input-ref {:keys [primary-name searched-text match] :as user}]
-  (let [chat-id     (:current-chat-id db)
-        new-text    (mentions/new-input-text-with-mention cofx user)
-        at-sign-idx (get-in db [:chats/mentions chat-id :mentions :at-sign-idx])
-        cursor      (+ at-sign-idx (count primary-name) 2)]
-    (rf/merge
-     cofx
-     {:db                   (-> db
-                                (assoc-in [:chats/cursor chat-id] cursor)
-                                (assoc-in [:chats/mention-suggestions chat-id] nil))
-      :set-text-input-value [chat-id new-text text-input-ref]}
-     (set-chat-input-text new-text chat-id)
-     ;; 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}))))
+  [{:keys [db] :as cofx} text-input-ref {:keys [primary-name searched-text match public-key] :as user}]
+  (let [chat-id (:current-chat-id db)
+        text    (get-in db [:chat/inputs chat-id :input-text])
+        method  "wakuext_chatMentionNewInputTextWithMention"
+        params  [chat-id text primary-name]]
+    {:json-rpc/call [{:method     method
+                      :params     params
+                      :on-success #(rf/dispatch [:mention/on-new-input-text-with-mentions-success %
+                                                 primary-name text-input-ref match searched-text
+                                                 public-key])
+                      :on-error   #(rf/dispatch [:mention/on-error
+                                                 {:method method
+                                                  :params params} %])}]}))
 
 (rf/defn disable-chat-cooldown
   "Turns off chat cooldown (protection against message spamming)"
@@ -182,8 +165,7 @@
     (rf/merge cofx
               {:set-text-input-value [current-chat-id ""]}
               (clean-input current-chat-id)
-              (mentions/clear-mentions)
-              (mentions/clear-cursor))))
+              (mentions/clear-mentions))))
 
 (rf/defn send-messages
   [{:keys [db] :as cofx} input-text current-chat-id]
@@ -251,13 +233,29 @@
   [{{: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)
-        input-text-with-mentions      (mentions/check-mentions cofx input-text)]
-    (rf/merge cofx
-              (if editing-message
-                (send-edited-message input-text-with-mentions editing-message)
-                (send-messages input-text-with-mentions current-chat-id))
-              (mentions/clear-mentions)
-              (mentions/clear-cursor))))
+        method                        "wakuext_chatMentionCheckMentions"
+        params                        [current-chat-id input-text]]
+    {:json-rpc/call [{:method     method
+                      :params     params
+                      :on-error   #(rf/dispatch [:mention/on-error {:method method :params params} %])
+                      :on-success #(rf/dispatch [:mention/on-check-mentions-success
+                                                 current-chat-id
+                                                 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]}
@@ -271,7 +269,6 @@
                                          :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
@@ -282,7 +279,6 @@
     (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