again some more fixing id700747

some more fixing id700747
more fixing id700747
2022-03-30 15:54:29 +03:00 · 2022-03-30 15:28:44 +03:00 · 2022-03-30 15:15:53 +03:00 · 2022-03-30 13:24:54 +03:00 · 2022-03-29 15:46:38 +03:00 · 2022-03-28 14:08:23 +03:00
216 changed files with 10053 additions and 10559 deletions
@@ -34,4 +34,3 @@ COLLECTIBLES_ENABLED=1
 COMMANDS_ENABLED=1
 TWO_MINUTES_SYNCING=1
 SWAP_ENABLED=1
-STICKERS_TEST_ENABLED=1
@@ -34,4 +34,3 @@ COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
-STICKERS_TEST_ENABLED=1
@@ -37,4 +37,3 @@ METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 ENABLE_QUO_PREVIEW=1
-STICKERS_TEST_ENABLED=1
@@ -41,7 +41,6 @@ local.properties
 # VS Code
 .vscode/ipch/
 .vscode/settings.json
-workspace.code-workspace

 # node.js
 #
@@ -1,49 +1,3 @@
-## 1.19 Release notes
-
-### Features
-
-* 💬 Re-open app on the last open chat ([details](https://github.com/status-im/status-react/issues/12782))
-* 🪙 Support \$UBI token ([details](https://github.com/status-im/status-react/issues/12975))
-* 🔔 Implementation of remote android notifications ([details](https://github.com/status-im/status-react/issues/12866))
-* 🔁 Sync clear history on paired devices ([details](https://github.com/status-im/status-react/issues/13004))
-* 📑 Synchronize browser bookmarks/favorites across devices ([details](https://github.com/status-im/status-react/issues/12961))
-* 🔕 Add mute option to android ([details](https://github.com/status-im/status-react/issues/12890))
-* 👛 Wallet Connect 2.0 integration ([details](https://github.com/status-im/status-react/issues/12546))
-* 💰 Implement Wallet Connect 1.0 ([details](https://github.com/status-im/status-react/issues/12870))
-* ⚙️ Sync settings ([details](https://github.com/status-im/status-react/pull/13053))
-
-### Improvements
-
-* Improve order of mailserver requests ([details](https://github.com/status-im/status-react/issues/12783))
-* Load images from an https server ([details](https://github.com/status-im/status-react/issues/12855))
-* Load audio messages from https server ([details](https://github.com/status-im/status-react/issues/13116))
-* Show message timestamps on tap, remove from bubbles 🕙 ([details](https://github.com/status-im/status-react/pull/12915))
-* support PUK and seed recovery during onboarding ([details](https://github.com/status-im/status-react/pull/12955))
-* update react-native-webview ([details](https://github.com/status-im/status-react/pull/12987))
-* Add group members to mentionable list ([details](https://github.com/status-im/status-react/pull/12994))
-* always use english for fallback text ([details](https://github.com/status-im/status-react/pull/13019))
-* Disable chat input for chats with a blocked user ([details](https://github.com/status-im/status-react/pull/13162))
-* Handle timeouts on mailserver requests ([details](https://github.com/status-im/status-react/issues/13022))
-* Human Readable data display when signing using eth_signTypedData_v3 ([details](https://github.com/status-im/status-react/issues/12535))
-
-### Bug Fixes
-
-* Bug/fix opensea api ([details](https://github.com/status-im/status-react/pull/13021))
-* Show "Fetch more messages" only in public chats and communities ([details](https://github.com/status-im/status-react/pull/12927))
-* Chats are not synced if delete and re-add them on the first device while the second device is offline ([details](https://github.com/status-im/status-react/issues/12913))
-* fix distortion of app theme due to change in system theme ([details](https://github.com/status-im/status-react/pull/12934))
-* Unable to perform swap on 1inch.exchange if initial swap was cancelled by closing bottom sheet ([details](https://github.com/status-im/status-react/issues/12920))
-* Error when trying to edit 'per-gas price limit' on 1inch.exchange ([details](https://github.com/status-im/status-react/issues/12991))
-* Allow adding emoji in status input even if it exceeds limit ([details](https://github.com/status-im/status-react/pull/12949))
-* Allow adding emoji to group intro message if it exceeds limit ([details](https://github.com/status-im/status-react/pull/13024))
-* Use higher base fee value for default tx fee calculation ([details](https://github.com/status-im/status-react/pull/13020))
-* Profile QR code overlaps share menu during sharing (IOS) ([details](https://github.com/status-im/status-react/pull/13050))
-* No value in 'Gas amount limit' field in NFT dapps ([details](https://github.com/status-im/status-react/pull/13051))
-* Stop showing fetch more button for cleared history ([details](https://github.com/status-im/status-react/pull/13084))
-* fix ens resolve issue while following deep link ([details](https://github.com/status-im/status-react/pull/13080))
-* Fix deadlock on syncing all data ([details](https://github.com/status-im/status-react/pull/13128))
-* Fix broken username and timestamp layout for long usernames ([details](https://github.com/status-im/status-react/pull/13174))
-
 ## 1.18.0 Release notes :package:

 ### Features
@@ -2,10 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools">

-    <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
-    <uses-permission tools:node="remove" android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <!-- 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"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
 </manifest>
@@ -125,15 +125,13 @@ public class MainActivity extends NavigationActivity
        switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
            case Configuration.UI_MODE_NIGHT_YES:
                setTheme(R.style.DarkTheme);
-                SplashScreen.show(this, R.style.DarkTheme, false);
+
                break;
            case Configuration.UI_MODE_NIGHT_NO:
                setTheme(R.style.LightTheme);
-                SplashScreen.show(this, R.style.LightTheme, false);
                break;
            default:
                setTheme(R.style.LightTheme);
-                SplashScreen.show(this, R.style.LightTheme, false);
        }
        // Make sure we get an Alert for every uncaught exceptions
        registerUncaughtExceptionHandler(MainActivity.this);
@@ -143,7 +141,7 @@ public class MainActivity extends NavigationActivity
        Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");

        setSecureFlag();
-
+        SplashScreen.show(this, true);
        // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
        super.onCreate(null);

@@ -3,7 +3,5 @@

    <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
    <uses-permission tools:node="remove" android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <!-- 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"/>

 </manifest>
@@ -3,7 +3,5 @@

    <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
    <uses-permission tools:node="remove" android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <!-- 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"/>

-</manifest>
+</manifest>
@@ -17,12 +17,12 @@ buildscript {
    repositories {
        flatDir { dirs "libs", "${rootDir}/app/libs" }
        google()
-        mavenCentral()
+        jcenter()
    }
    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
        classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}"
-        classpath "com.google.gms:google-services:4.3.10"
+	classpath "com.google.gms:google-services:4.3.10"
        // WARNING: Do not place your application dependencies here!
        //          They belong in the individual module build.gradle files.
    }
@@ -45,22 +45,27 @@ subprojects {

 allprojects {
    beforeEvaluate {
-        if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {
-            throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!')
-        }
+      if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {
+        throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!')
+      }
    }

    repositories {
        mavenLocal()
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        maven { url("$rootDir/../node_modules/react-native/android") }
-        // Android JSC is installed from npm
-        maven { url("$rootDir/../node_modules/jsc-android/dist") }
-        // For geth, function, and status-go
-        flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR }
-        // Everything Else
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url("$rootDir/../node_modules/react-native/android")
+        }
+        maven {
+            // Android JSC is installed from npm
+            url("$rootDir/../node_modules/jsc-android/dist")
+        }
+
        google()
-        mavenCentral()
+        jcenter()
+
+        // for geth, function, and status-go
+        flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR }
        maven { url "https://www.jitpack.io" }
    }
 }
@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.4.2'
+library 'status-jenkins-lib@v1.3.5'

 pipeline {
-  agent { label 'linux && x86_64 && nix-2.8' }
+  agent { label 'linux && x86_64 && nix-2.3' }

  options {
    timestamps()
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.4.2'
+library 'status-jenkins-lib@v1.3.5'

 pipeline {
  agent { label 'linux' }
@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.4.2'
+library 'status-jenkins-lib@v1.3.5'

 pipeline {
-  agent { label 'macos && x86_64 && nix-2.8 && xcode-13.3' }
+  agent { label 'macos && x86_64 && nix-2.3 && xcode-12.5' }

  parameters {
    string(
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.4.2'
+library 'status-jenkins-lib@v1.3.5'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -98,8 +98,8 @@ pipeline {
          nix.shell("""
              find /nix/store/ -mindepth 1 -maxdepth 1 -type d \
                -not -name '*.links' -and -not -name '*-status-react-*' \
-                | xargs nix copy \
-                  --to ssh-ng://${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST}
+                | xargs nix-copy-closure -v \
+                  --to ${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST}
            """,
            pure: false
          )
@@ -58,7 +58,7 @@ pipeline {
            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
            sh """
              python3 -m pytest \
-                --numprocesses 9 \
+                --numprocesses 15 \
                --rerun_count=2 \
                --testrail_report=True \
                -m testrail_id \
@@ -1,5 +1,3 @@
-library 'status-jenkins-lib@v1.4.2'
-
 pipeline {

  agent { label 'linux' }
@@ -14,7 +12,7 @@ pipeline {
    string(
      name: 'TEST_MARKERS',
      description: 'Marker expression for matching tests to run.',
-      defaultValue: 'critical',
+      defaultValue: 'critical or high',
    ) */
    string(
      name: 'APK_NAME',
@@ -97,13 +95,13 @@ pipeline {
            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
            sh """
              python3 -m pytest \
-                --numprocesses 9 \
+                --numprocesses 15 \
                --rerun_count=2 \
                --testrail_report=True \
                -m \"${params.TEST_MARKERS}\" \
                -k \"${params.KEYWORD_EXPRESSION}\" \
                --apk=${params.APK_NAME} \
-                --build=PR-${params.PR_ID}-${utils.timestamp()} \
+                --build=PR-${params.PR_ID} \
                --pr_number=${params.PR_ID} \
                ${extraPytestOpts}
            """
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.4.2'
+library 'status-jenkins-lib@v1.3.3'

 pipeline {
  agent { label 'macos' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.4.2'
+library 'status-jenkins-lib@v1.3.3'

 pipeline {
  agent { label 'linux' }
@@ -1,30 +1,30 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.4)
      rexml
    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.579.0)
-    aws-sdk-core (3.130.2)
+    aws-partitions (1.525.0)
+    aws-sdk-core (3.122.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.56.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.51.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.1)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.105.1)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.4.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
-    claide (1.1.0)
+    claide (1.0.3)
    colored (1.2)
    colored2 (3.1.2)
    commander (4.6.0)
@@ -36,18 +36,17 @@ GEM
      unf (>= 0.0.5, < 1.0.0)
    dotenv (2.7.6)
    emoji_regex (3.2.3)
-    excon (0.92.2)
-    faraday (1.10.0)
+    excon (0.88.0)
+    faraday (1.8.0)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
+      faraday-httpclient (~> 1.0.1)
      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
      faraday-patron (~> 1.0)
      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+      multipart-post (>= 1.2, < 3)
      ruby2_keywords (>= 0.0.4)
    faraday-cookie_jar (0.0.7)
      faraday (>= 0.8.0)
@@ -56,17 +55,14 @@ GEM
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.205.2)
+    fastimage (2.2.5)
+    fastlane (2.197.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -109,9 +105,9 @@ GEM
    fastlane-plugin-diawi (2.1.0)
      rest-client (>= 2.0.0)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.19.0)
+    google-apis-androidpublisher_v3 (0.13.0)
      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-core (0.4.1)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -120,28 +116,28 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-iamcredentials_v1 (0.10.0)
+    google-apis-iamcredentials_v1 (0.8.0)
      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
+    google-apis-playcustomapp_v1 (0.6.0)
      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.13.0)
+    google-apis-storage_v1 (0.9.0)
      google-apis-core (>= 0.4, < 2.a)
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
+    google-cloud-env (1.5.0)
+      faraday (>= 0.17.3, < 2.0)
    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.2)
-      addressable (~> 2.8)
+    google-cloud-storage (1.34.1)
+      addressable (~> 2.5)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
      google-apis-storage_v1 (~> 0.1)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.1.3)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.1.0)
+      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
@@ -152,13 +148,13 @@ GEM
    http-cookie (1.0.4)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.6.1)
+    jmespath (1.4.0)
    json (2.6.1)
    jwt (2.3.0)
    memoist (0.16.2)
-    mime-types (3.4.1)
+    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2021.0901)
    mini_magick (4.11.0)
    mini_mime (1.1.2)
    multi_json (1.15.0)
@@ -169,7 +165,7 @@ GEM
    optparse (0.1.1)
    os (1.1.4)
    plist (3.6.0)
-    public_suffix (4.0.7)
+    public_suffix (4.0.6)
    rake (13.0.6)
    representable (3.1.1)
      declarative (< 0.1.0)
@@ -186,9 +182,9 @@ GEM
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.16.1)
+    signet (0.16.0)
      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simctl (1.6.8)
@@ -205,7 +201,7 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8)
    unicode-display_width (1.8.0)
    webrick (1.7.0)
    word_wrap (1.0.0)
@@ -45,10 +45,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1ilhspsph7icrrz94f3qngjkj585hsyv9bnxr44iabcqqwymr79w";
+      sha256 = "181a2xf9zs0hz77jkpmxidvkjzs65vsyqv1a31fcali7f0kvh4h9";
      type = "gem";
    };
-    version = "1.579.0";
+    version = "1.525.0";
  };
  aws-sdk-core = {
    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -56,10 +56,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";
+      sha256 = "0krx8cfajc72gv6mpyb67vnhd2m2iya19846jgipgfris194gjm2";
      type = "gem";
    };
-    version = "3.130.2";
+    version = "3.122.0";
  };
  aws-sdk-kms = {
    dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +67,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";
+      sha256 = "0qac9dd6qriz6ldghkr8ga74zz28jl109kmvhvag74a3qf7k9dwj";
      type = "gem";
    };
-    version = "1.56.0";
+    version = "1.51.0";
  };
  aws-sdk-s3 = {
    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -78,10 +78,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0kxcc3abjxld66ryrivfq9wxxpik8ngr2b2dr7shgrsgf5zmrkh8";
+      sha256 = "12j7i6l52b6hsnj59grn0m1s9pn6l38zmra6ad8i12vdsvd185w7";
      type = "gem";
    };
-    version = "1.113.1";
+    version = "1.105.1";
  };
  aws-sigv4 = {
    dependencies = ["aws-eventstream"];
@@ -89,10 +89,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
+      sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
      type = "gem";
    };
-    version = "1.5.0";
+    version = "1.4.0";
  };
  babosa = {
    groups = ["default"];
@@ -110,20 +110,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
+      sha256 = "00s388z1akvj2j77ylr1mgp02zxp4ybcgc4ds3bz4647dfk0cwxk";
      type = "gem";
    };
-    version = "3.0.5";
+    version = "3.0.4";
  };
  claide = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
+      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
      type = "gem";
    };
-    version = "1.1.0";
+    version = "1.0.3";
  };
  colored = {
    groups = ["default"];
@@ -213,21 +213,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba";
+      sha256 = "15yrwawhvkjvfg0dsf8z81876ddj6161q0wh5s7pw4sim8z8pspr";
      type = "gem";
    };
-    version = "0.92.2";
+    version = "0.88.0";
  };
  faraday = {
-    dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
+    dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
+      sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
      type = "gem";
    };
-    version = "1.10.0";
+    version = "1.8.0";
  };
  faraday-cookie_jar = {
    dependencies = ["faraday" "http-cookie"];
@@ -280,17 +280,6 @@
    };
    version = "1.0.1";
  };
-  faraday-multipart = {
-    dependencies = ["multipart-post"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
  faraday-net_http = {
    groups = ["default"];
    platforms = [];
@@ -331,16 +320,6 @@
    };
    version = "1.0.0";
  };
-  faraday-retry = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
  faraday_middleware = {
    dependencies = ["faraday"];
    groups = ["default"];
@@ -357,10 +336,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr";
+      sha256 = "05i1fgqy4l40niwm9y56d04f876sm0cvc7q3w2rpddf8gya4lcs9";
      type = "gem";
    };
-    version = "2.2.6";
+    version = "2.2.5";
  };
  fastlane = {
    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
@@ -368,10 +347,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "091l4vl909rv6alydwlzhbk0lfmfphb7n2sjybdfy2azr07b6a0d";
+      sha256 = "1qlvg0sca8j1ryzxpvnmpjnh3fwmv6sk8l7mr9mv34z8rdy1iv3x";
      type = "gem";
    };
-    version = "2.205.2";
+    version = "2.197.0";
  };
  fastlane-plugin-clean_testflight_testers = {
    groups = ["default"];
@@ -410,10 +389,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0qc501qhgks10qr7dm42bjcsm6yrbg1lxy28akpxindvjk61zh9i";
+      sha256 = "1nxgda00y080xdavxs6nv5h2grwamds33b25nkjb4mij7385brs1";
      type = "gem";
    };
-    version = "0.19.0";
+    version = "0.13.0";
  };
  google-apis-core = {
    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@@ -421,10 +400,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "19v15vkgg86k79l51gfs7fab4h7fkv8358ckmkyp33jgsx3zr17b";
+      sha256 = "1nzzj66clgr9ldmbjqkzgpvqmd6bjjmbw6khpgq80mp3gks4ycqy";
      type = "gem";
    };
-    version = "0.4.2";
+    version = "0.4.1";
  };
  google-apis-iamcredentials_v1 = {
    dependencies = ["google-apis-core"];
@@ -432,10 +411,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1yibminaffzz5npq605m0vqc024dcybiw7xk5vr0jxzlsh8nxvhn";
+      sha256 = "0slpmdjsxbjdqs7qwkyfk3sdnfy5wliwf89jy8hq7l87a31r7lvk";
      type = "gem";
    };
-    version = "0.10.0";
+    version = "0.8.0";
  };
  google-apis-playcustomapp_v1 = {
    dependencies = ["google-apis-core"];
@@ -443,10 +422,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15wnkbn6kzijbyqkqrh7s6apjf5630yvf2v8zy93zk0x87n2drcd";
+      sha256 = "0v9y6avlnwxwv4vahhygrsmrpmric4zg8sxjd26vhhlxw6g8955b";
      type = "gem";
    };
-    version = "0.7.0";
+    version = "0.6.0";
  };
  google-apis-storage_v1 = {
    dependencies = ["google-apis-core"];
@@ -454,10 +433,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lcb9jkjipz1kgg8zyp8a6741andads55bxbldg3x8qmzkv9pv31";
+      sha256 = "0y6gyqj2cwsbdxk7wsrjzp9jz2hn2bk1zi1jjm5k311c3jlnj0r1";
      type = "gem";
    };
-    version = "0.13.0";
+    version = "0.9.0";
  };
  google-cloud-core = {
    dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -476,10 +455,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
+      sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag";
      type = "gem";
    };
-    version = "1.6.0";
+    version = "1.5.0";
  };
  google-cloud-errors = {
    groups = ["default"];
@@ -497,10 +476,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "09d1bvxma4czbgay9lhcqsrhh6pd8s9i5djflzpsn00h4isdilw3";
+      sha256 = "1pvcpqx64cxm05dzr9q7zxrymjq4jk46ifd1p4b6c9v3v0c9ipb5";
      type = "gem";
    };
-    version = "1.36.2";
+    version = "1.34.1";
  };
  googleauth = {
    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -508,10 +487,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1y80y72bpz04piiskfn93i5rzfy02mjchp3ym77yf2811gzz33d9";
+      sha256 = "12zm6r7jxqv8k1a4iyijq2gcywk2d62nizbnabwsnhnzxwxwxc3s";
      type = "gem";
    };
-    version = "1.1.3";
+    version = "1.1.0";
  };
  highline = {
    groups = ["default"];
@@ -559,10 +538,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
+      sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
      type = "gem";
    };
-    version = "1.6.1";
+    version = "1.4.0";
  };
  json = {
    groups = ["default"];
@@ -600,20 +579,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
+      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
      type = "gem";
    };
-    version = "3.4.1";
+    version = "3.3.1";
  };
  mime-types-data = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
+      sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv";
      type = "gem";
    };
-    version = "3.2022.0105";
+    version = "3.2021.0901";
  };
  mini_magick = {
    groups = ["default"];
@@ -720,10 +699,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
+      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
      type = "gem";
    };
-    version = "4.0.7";
+    version = "4.0.6";
  };
  rake = {
    groups = ["default"];
@@ -823,10 +802,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1";
+      sha256 = "0cgmadrpgkpcklvvm2cga9mnrfqwqlydwpask1wx617h5ha6954k";
      type = "gem";
    };
-    version = "0.16.1";
+    version = "0.16.0";
  };
  simctl = {
    dependencies = ["CFPropertyList" "naturally"];
@@ -927,10 +906,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz";
+      sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
      type = "gem";
    };
-    version = "0.0.8.1";
+    version = "0.0.8";
  };
  unicode-display_width = {
    groups = ["default"];
@@ -2,7 +2,7 @@ PODS:
  - boost-for-react-native (1.63.0)
  - BVLinearGradient (2.5.6):
    - React
-  - CryptoSwift (1.5.1)
+  - CryptoSwift (1.4.3)
  - DoubleConversion (1.1.6)
  - FBLazyVector (0.63.4)
  - FBReactNativeSpec (0.63.4):
@@ -22,11 +22,9 @@ PODS:
    - DoubleConversion
    - glog
  - glog (0.3.5)
-  - HMSegmentedControl (1.5.6)
-  - Keycard (3.0.5):
+  - Keycard (3.0.4):
    - CryptoSwift
    - secp256k1
-    - Zip
  - libwebp (1.2.1):
    - libwebp/demux (= 1.2.1)
    - libwebp/mux (= 1.2.1)
@@ -236,8 +234,8 @@ PODS:
    - React
  - react-native-slider (3.0.0):
    - React
-  - react-native-splash-screen (3.3.0):
-    - React-Core
+  - react-native-splash-screen (3.2.0):
+    - React
  - react-native-status (1.0.0):
    - React
  - react-native-status-keycard (2.5.37):
@@ -307,14 +305,14 @@ PODS:
    - React-jsi (= 0.63.4)
  - ReactNativeAudioToolkit (2.0.3):
    - React
-  - ReactNativeNavigation (7.27.1):
-    - HMSegmentedControl
+  - ReactNativeDarkMode (0.2.2):
+    - React
+  - ReactNativeNavigation (7.13.0):
    - React-Core
    - React-RCTImage
    - React-RCTText
-    - ReactNativeNavigation/Core (= 7.27.1)
-  - ReactNativeNavigation/Core (7.27.1):
-    - HMSegmentedControl
+    - ReactNativeNavigation/Core (= 7.13.0)
+  - ReactNativeNavigation/Core (7.13.0):
    - React-Core
    - React-RCTImage
    - React-RCTText
@@ -403,7 +401,6 @@ PODS:
  - TouchID (4.4.1):
    - React
  - Yoga (1.14.0)
-  - Zip (2.1.2)

 DEPENDENCIES:
  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
@@ -456,6 +453,7 @@ DEPENDENCIES:
  - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
  - "ReactNativeAudioToolkit (from `../node_modules/@react-native-community/audio-toolkit`)"
+  - ReactNativeDarkMode (from `../node_modules/react-native-dark-mode`)
  - ReactNativeNavigation (from `../node_modules/react-native-navigation`)
  - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
  - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
@@ -483,14 +481,12 @@ SPEC REPOS:
  trunk:
    - boost-for-react-native
    - CryptoSwift
-    - HMSegmentedControl
    - libwebp
    - SDWebImage
    - SDWebImageWebPCoder
    - SQLCipher
    - SSZipArchive
    - TOCropViewController
-    - Zip

 EXTERNAL SOURCES:
  BVLinearGradient:
@@ -589,6 +585,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon"
  ReactNativeAudioToolkit:
    :path: "../node_modules/@react-native-community/audio-toolkit"
+  ReactNativeDarkMode:
+    :path: "../node_modules/react-native-dark-mode"
  ReactNativeNavigation:
    :path: "../node_modules/react-native-navigation"
  RNCAsyncStorage:
@@ -633,7 +631,7 @@ EXTERNAL SOURCES:

 CHECKOUT OPTIONS:
  Keycard:
-    :commit: 29c26b51ef76304e9551657c605fb55b2540a077
+    :commit: d5bb5d68dbac19a34945918b51873fbba2c18310
    :git: https://github.com/status-im/Keycard.swift.git
  secp256k1:
    :commit: 46a1fa30d9b8babeae85ff519050f42394ab5fcc
@@ -643,14 +641,13 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
-  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
+  CryptoSwift: a0799ee936271bd2253a006f1e4523df21845000
  DoubleConversion: cde416483dac037923206447da6e1454df403714
  FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
  FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
  glog: 61334f8bdb4deea07543d4fbac3fb5948e78a7a5
-  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
-  Keycard: 07f1b4d4fadcf1218084cb3e1bb3a8bac3870c5a
+  Keycard: dd96182888da0aacf4de821b641103143bbb26cc
  libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
  Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
  Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
@@ -678,7 +675,7 @@ SPEC CHECKSUMS:
  react-native-safe-area-context: 60f654e00b6cc416573f6d5dbfce3839958eb57a
  react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
  react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
-  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
+  react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
  react-native-status: 45dbf1302ce3c258b459dfab137cd1c2c68c295d
  react-native-status-keycard: 961d01ca190889ddf220206822fd752f8f4f3f7a
  react-native-webview: 28a8636d97ee641f2ee8f20492d7a6c269c1d703
@@ -693,7 +690,8 @@ SPEC CHECKSUMS:
  React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
  ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
  ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
-  ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8
+  ReactNativeDarkMode: 0178ffca3b10f6a7c9f49d6f9810232b328fa949
+  ReactNativeNavigation: 4c4ca87edc0da4ee818158a62cb6188088454e5c
  RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36
  RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543
  RNCMaskedView: 71fc32d971f03b7f03d6ab6b86b730c4ee64f5b6
@@ -718,7 +716,6 @@ SPEC CHECKSUMS:
  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
  TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
  Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
-  Zip: b3fef584b147b6e582b2256a9815c897d60ddc67

 PODFILE CHECKSUM: 1a5b8878f89edd08eb4d37898a3a8721a7bb3388

@@ -35,20 +35,20 @@
 		3AAD2AD324A3A60E0075D594 /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
 		3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; };
-		41D83275EA021DE1470B64CB /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46444D4C653CD27349ED6C7D /* libPods-Status-StatusIm.a */; };
 		57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; };
 		65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
+		68E19BBDF749E72ED1F9DEF5 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 132CE3B093884B0FB239A0AB /* libPods-Status-StatusIm.a */; };
+		6C137817D5298C82BC79177C /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D4CB5416994C913628B8754 /* libPods-Status-StatusImPR.a */; };
 		70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		A469E8D0A04F890FD80E5C08 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4364C6D4F636EFD8B968531E /* libPods-Status-StatusImPR.a */; };
+		8770D567D65A8F938D95C371 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.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 */; };
-		C6359065E518CA78EF03F567 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 10DE74ADA21099BC94EFD94D /* libPods-Status-StatusIm-StatusImTests.a */; };
 		CE4E31B31D8695250033ED64 /* Statusgo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.framework */; };
 		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 */; };
@@ -96,38 +96,39 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		0032155E8656A85DCE5E0FBF /* 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>"; };
 		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
 		00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		10DE74ADA21099BC94EFD94D /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		132CE3B093884B0FB239A0AB /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = StatusIm/AppDelegate.m; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
+		3887F5B027AC2EC4E7B8BC02 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		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>"; };
-		42C2B8BE641784CC8F992EF6 /* 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>"; };
-		4364C6D4F636EFD8B968531E /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		46444D4C653CD27349ED6C7D /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3F224519278D376B19F4CA2B /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.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; };
+		5D4CB5416994C913628B8754 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
+		69291A6222A63434694EA2A6 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.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>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
-		7D0115BCCB8330F6AC68CB87 /* 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>"; };
+		784390E981501E6517651C4E /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
+		7ACFEF4386C8FF7558A13B3D /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
-		956436931E0887CF912BCC24 /* 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>"; };
+		977B1E37198B72A48870BFE5 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
@@ -140,8 +141,7 @@
 		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.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Statusgo.framework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.framework"; sourceTree = "<group>"; };
-		E7378B0A7AE6C80DCC3C45BA /* 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>"; };
-		F1D775582F9C7154A44F2520 /* 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>"; };
+		DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -149,7 +149,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C6359065E518CA78EF03F567 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				8770D567D65A8F938D95C371 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -162,7 +162,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.framework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				41D83275EA021DE1470B64CB /* libPods-Status-StatusIm.a in Frameworks */,
+				68E19BBDF749E72ED1F9DEF5 /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -176,7 +176,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.framework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				A469E8D0A04F890FD80E5C08 /* libPods-Status-StatusImPR.a in Frameworks */,
+				6C137817D5298C82BC79177C /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -233,20 +233,6 @@
 			name = Resources;
 			sourceTree = "<group>";
 		};
-		37F45ABDF8B0A9F2EF379D4B /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				7D0115BCCB8330F6AC68CB87 /* Pods-Status-StatusIm.debug.xcconfig */,
-				42C2B8BE641784CC8F992EF6 /* Pods-Status-StatusIm.release.xcconfig */,
-				E7378B0A7AE6C80DCC3C45BA /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				F1D775582F9C7154A44F2520 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				0032155E8656A85DCE5E0FBF /* Pods-Status-StatusImPR.debug.xcconfig */,
-				956436931E0887CF912BCC24 /* Pods-Status-StatusImPR.release.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		3AAD2AB624A3A5F10075D594 /* StatusImPR */ = {
 			isa = PBXGroup;
 			children = (
@@ -255,6 +241,19 @@
 			path = StatusImPR;
 			sourceTree = "<group>";
 		};
+		5C1C8762251D6EF495FB2384 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				3887F5B027AC2EC4E7B8BC02 /* Pods-Status-StatusIm.debug.xcconfig */,
+				784390E981501E6517651C4E /* Pods-Status-StatusIm.release.xcconfig */,
+				977B1E37198B72A48870BFE5 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				3F224519278D376B19F4CA2B /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				7ACFEF4386C8FF7558A13B3D /* Pods-Status-StatusImPR.debug.xcconfig */,
+				69291A6222A63434694EA2A6 /* Pods-Status-StatusImPR.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
@@ -274,8 +273,8 @@
 				83CBBA001A601CBA00E9B192 /* Products */,
 				A97BA941B2FB44B4B66EE6D3 /* Frameworks */,
 				1E7837547A9A40E18AD63CF3 /* Resources */,
+				5C1C8762251D6EF495FB2384 /* Pods */,
 				65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */,
-				37F45ABDF8B0A9F2EF379D4B /* Pods */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -312,9 +311,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.framework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				46444D4C653CD27349ED6C7D /* libPods-Status-StatusIm.a */,
-				10DE74ADA21099BC94EFD94D /* libPods-Status-StatusIm-StatusImTests.a */,
-				4364C6D4F636EFD8B968531E /* libPods-Status-StatusImPR.a */,
+				132CE3B093884B0FB239A0AB /* libPods-Status-StatusIm.a */,
+				DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.a */,
+				5D4CB5416994C913628B8754 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -326,11 +325,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				E8158908D8DBE8B42209130F /* [CP] Check Pods Manifest.lock */,
+				49A69B853BD9751F84878340 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				814AF5E700528A517FFCE669 /* [CP] Copy Pods Resources */,
+				AFAB37B70B6EB1B7D2E869AD /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -346,14 +345,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				ADD15A0C44EC35A40730E491 /* [CP] Check Pods Manifest.lock */,
+				2EAC54E16AB243C3EBBFE1BA /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				C25D61BD03A6CB56513896A5 /* [CP] Copy Pods Resources */,
+				291E1A8BC076990A77B59232 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -368,14 +367,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				78A12FD1CDEF079CF7CF7319 /* [CP] Check Pods Manifest.lock */,
+				3AAD2ABA24A3A60E0075D594 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				71AF560830EB55C8909CC37C /* [CP] Copy Pods Resources */,
+				3AAD2AD824A3A60E0075D594 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -523,6 +522,72 @@
 			shellPath = /bin/sh;
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"node\"\nexport NODE_ARGS=\" --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./react-native-xcode.log 2>&1";
 		};
+		291E1A8BC076990A77B59232 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		2EAC54E16AB243C3EBBFE1BA /* [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;
+		};
+		3AAD2ABA24A3A60E0075D594 /* [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-StatusImPR-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -551,7 +616,7 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
 		};
-		71AF560830EB55C8909CC37C /* [CP] Copy Pods Resources */ = {
+		3AAD2AD824A3A60E0075D594 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -573,7 +638,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		78A12FD1CDEF079CF7CF7319 /* [CP] Check Pods Manifest.lock */ = {
+		49A69B853BD9751F84878340 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -588,14 +653,14 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
+				"$(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;
 		};
-		814AF5E700528A517FFCE669 /* [CP] Copy Pods Resources */ = {
+		AFAB37B70B6EB1B7D2E869AD /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -617,50 +682,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		ADD15A0C44EC35A40730E491 /* [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;
-		};
-		C25D61BD03A6CB56513896A5 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -675,28 +696,6 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
 		};
-		E8158908D8DBE8B42209130F /* [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;
-		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -744,7 +743,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E7378B0A7AE6C80DCC3C45BA /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 977B1E37198B72A48870BFE5 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -777,7 +776,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = F1D775582F9C7154A44F2520 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 3F224519278D376B19F4CA2B /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -806,7 +805,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7D0115BCCB8330F6AC68CB87 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 3887F5B027AC2EC4E7B8BC02 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -876,7 +875,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 42C2B8BE641784CC8F992EF6 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 784390E981501E6517651C4E /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -930,13 +929,13 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
-				VALID_ARCHS = arm64;
+				VALID_ARCHS = "arm64";
 			};
 			name = Release;
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0032155E8656A85DCE5E0FBF /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 7ACFEF4386C8FF7558A13B3D /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -995,13 +994,13 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
-				VALID_ARCHS = arm64;
+				VALID_ARCHS = "arm64";
 			};
 			name = Debug;
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 956436931E0887CF912BCC24 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 69291A6222A63434694EA2A6 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1053,7 +1052,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
-				VALID_ARCHS = arm64;
+				VALID_ARCHS = "arm64";
 			};
 			name = Release;
 		};
@@ -1135,8 +1134,8 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
-				VALID_ARCHS = arm64;
-				"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
+				VALID_ARCHS = "arm64";
+				"VALID_ARCHS[sdk=iphonesimulator*]" = "x86_64";
 			};
 			name = Debug;
 		};
@@ -1209,7 +1208,7 @@
 				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = arm64;
+				VALID_ARCHS = "arm64";
 			};
 			name = Release;
 		};
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lsa-QA-3zn">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lsa-QA-3zn">
    <device id="retina4_7" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
@@ -20,11 +19,11 @@
                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="launch_image" translatesAutoresizingMaskIntoConstraints="NO" id="cqW-9w-FC0">
                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                            </imageView>
                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                        <viewLayoutGuide key="safeArea" id="2aN-f8-qiu"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                    </view>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="hOp-FG-FML" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -34,8 +33,5 @@
    </scenes>
    <resources>
        <image name="launch_image" width="90" height="101"/>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
    </resources>
 </document>
@@ -1,33 +1,35 @@
 # Known Issues

-## Too many open files
+## MacOS 10.15 "Catalina"

-### Single-User Installation
+There is an unsolved issue with the root(`/`) file system in `10.15` being read-only:
+https://github.com/NixOS/nix/issues/2925

-Nix can open a lot of files when fetching things for `/nix/store` which can cause
-```
-Too many open files"
-```
-The temporary way to fix this is set a new limit for current session using `ulimit`:
-```sh
-ulimit -n 131072
-```
-To increase limit permanently system-wide edit `/etc/sysctl.conf`:
-```
-fs.file-max = 131072
-```
-And use `sudo sysctl --system` to load these new settings.
+Our current recommended workaround is putting `/nix` under `/opt/nix` and symlinking it via `/etc/synthetic.conf`:

-### Multi-User Installation
-
-The other reason why this error could appear are limits fo `nix-daemon` service:
-https://github.com/NixOS/nix/issues/6007
-
-Since Systemd services ignore system-wide limits you will have to add the following line:
+```bash
+sudo mkdir /opt/nix
+sudo chown ${USER} /opt/nix
+sudo sh -c "echo 'nix\t/opt/nix' >> /etc/synthetic.conf"
+reboot
 ```
-LimitNOFILE=4096:1048576
+
+After the system reboots you should see the `/nix` symlink in place:
+
+```bash
+ % ls -l /nix
+lrwxr-xr-x  1 root  wheel  8 Oct 11 13:53 /nix -> /opt/nix
 ```
-To the `/etc/systemd/system/nix-daemon.service` service definition.
+
+In order to be able to use Nix with a symlinked `/nix` you need to include this in your shell:
+
+```bash
+export NIX_IGNORE_SYMLINK_STORE=1
+```
+
+Add it to your `.bashrc` or any other shell config file.
+
+__NOTE__: Your old `/nix` directory will end up in `/Users/Shared/Relocated Items/Security/nix` after OS upgrade.

 ## Cache Downloads Timing Out

@@ -67,11 +69,3 @@ Currently on NixOS `NIX_CONF_DIR` is being ignored in favor of the default `/etc
 This will be possible to fix once Nix `2.4` comes out with support for `NIX_USER_CONF_FILES`.

 For more details see https://github.com/NixOS/nix/issues/3723.
-
-## Extra Sandbox Files Not Available
-
-It's possible that on a multi-user installation files provided to the build sandbox using the `extra-sandbox-paths` option will ne be available, unless the current user is added to `trusted-users` in `nix.conf` file.
-
-Issues:
-* https://github.com/NixOS/nix/issues/6115
-* https://github.com/NixOS/nix/issues/6217
@@ -1,18 +1,15 @@
 androidx.activity:activity:1.0.0
-androidx.activity:activity:1.2.4
-androidx.annotation:annotation-experimental:1.1.0
+androidx.annotation:annotation-experimental:1.0.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
-androidx.annotation:annotation:1.2.0
 androidx.appcompat:appcompat-resources:1.1.0
-androidx.appcompat:appcompat-resources:1.3.1
+androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat:1.0.2
 androidx.appcompat:appcompat:1.1.0
-androidx.appcompat:appcompat:1.3.1
+androidx.appcompat:appcompat:1.2.0
 androidx.arch.core:core-common:2.0.0
 androidx.arch.core:core-common:2.1.0
 androidx.arch.core:core-runtime:2.0.0
-androidx.arch.core:core-runtime:2.1.0
 androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
 androidx.cardview:cardview:1.0.0
 androidx.collection:collection:1.0.0
@@ -21,10 +18,10 @@ androidx.constraintlayout:constraintlayout-solver:2.0.4
 androidx.constraintlayout:constraintlayout:2.0.4
 androidx.coordinatorlayout:coordinatorlayout:1.0.0
 androidx.coordinatorlayout:coordinatorlayout:1.1.0
-androidx.core:core-ktx:1.6.0
+androidx.core:core-ktx:1.3.2
 androidx.core:core:1.0.1
 androidx.core:core:1.1.0
-androidx.core:core:1.6.0
+androidx.core:core:1.3.2
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
@@ -40,24 +37,18 @@ 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.3.6
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-ui:1.0.0
 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.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.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.3.1
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.media:media:1.0.0
@@ -66,12 +57,11 @@ 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.1.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.test:monitor:1.2.0
-androidx.tracing:tracing:1.0.0
+androidx.test:monitor:1.3.0-rc03
 androidx.transition:transition:1.2.0
 androidx.transition:transition:1.2.0-rc01
 androidx.vectordrawable:vectordrawable-animated:1.0.0
@@ -80,7 +70,6 @@ androidx.vectordrawable:vectordrawable:1.0.1
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.0.0
 androidx.versionedparcelable:versionedparcelable:1.1.0
-androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager2:viewpager2:1.0.0
 androidx.viewpager:viewpager:1.0.0
 androidx.webkit:webkit:1.4.0
@@ -382,6 +371,7 @@ com.google.android.gms:play-services-tasks:17.0.0
 com.google.android.gms:strict-version-matcher-plugin:1.2.2
 com.google.android.material:material:1.2.0-alpha03
 com.google.auto.service:auto-service:1.0-rc4
+com.google.auto.value:auto-value-annotations:1.6.2
 com.google.auto.value:auto-value:1.5.2
 com.google.auto:auto-common:0.8
 com.google.code.findbugs:jsr305:1.3.9
@@ -434,6 +424,7 @@ com.google.protobuf:protobuf-java:3.4.0
 com.google.zxing:core:3.3.0
 com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
+com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0
 com.parse.bolts:bolts-applinks:1.4.0
 com.parse.bolts:bolts-tasks:1.4.0
 com.squareup.assertj:assertj-android:1.1.1
@@ -520,6 +511,7 @@ org.bouncycastle:bcprov-jdk15on:1.48
 org.bouncycastle:bcprov-jdk15on:1.52
 org.bouncycastle:bcprov-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.65
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.groovy:groovy-all:2.4.15
 org.codehaus.mojo:animal-sniffer-annotations:1.14
@@ -540,8 +532,8 @@ org.jacoco:org.jacoco.core:0.7.4.201502262128
 org.jacoco:org.jacoco.report:0.7.4.201502262128
 org.jdom:jdom2:2.0.6
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.4.31
@@ -586,17 +578,16 @@ 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.4.31
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30
 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.4.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31
 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.4.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31
 org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
@@ -605,7 +596,8 @@ 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.4.31
-org.jetbrains.kotlin:kotlin-stdlib:1.5.30
+org.jetbrains.kotlin:kotlin-test-common:1.4.31
+org.jetbrains.kotlin:kotlin-test:1.4.31
 org.jetbrains.kotlin:kotlin-util-io:1.3.50
 org.jetbrains.kotlin:kotlin-util-io:1.4.31
 org.jetbrains.kotlin:kotlin-util-klib:1.4.31
@@ -623,29 +615,45 @@ org.ow2.asm:asm-analysis:5.0.3
 org.ow2.asm:asm-analysis:5.1
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-analysis:7.2
 org.ow2.asm:asm-commons:5.1
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-commons:7.2
 org.ow2.asm:asm-debug-all:5.0.1
 org.ow2.asm:asm-tree:5.0.3
 org.ow2.asm:asm-tree:5.1
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-tree:7.2
 org.ow2.asm:asm-util:5.1
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm-util:7.2
 org.ow2.asm:asm:5.0.3
 org.ow2.asm:asm:5.1
 org.ow2.asm:asm:6.0
 org.ow2.asm:asm:7.0
+org.ow2.asm:asm:7.2
 org.robolectric:annotations:4.3
+org.robolectric:annotations:4.4
 org.robolectric:junit:4.3
+org.robolectric:junit:4.4
 org.robolectric:pluginapi:4.3
+org.robolectric:pluginapi:4.4
 org.robolectric:plugins-maven-dependency-resolver:4.3
+org.robolectric:plugins-maven-dependency-resolver:4.4
 org.robolectric:resources:4.3
+org.robolectric:resources:4.4
 org.robolectric:robolectric:4.3
+org.robolectric:robolectric:4.4
 org.robolectric:sandbox:4.3
+org.robolectric:sandbox:4.4
 org.robolectric:shadowapi:4.3
+org.robolectric:shadowapi:4.4
 org.robolectric:shadows-framework:4.3
+org.robolectric:shadows-framework:4.4
 org.robolectric:utils-reflector:4.3
+org.robolectric:utils-reflector:4.4
 org.robolectric:utils:4.3
+org.robolectric:utils:4.4
@@ -1,25 +1,19 @@
 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
-https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.1.0/annotation-experimental-1.1.0.pom
 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/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/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/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/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/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
@@ -28,15 +22,13 @@ https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayo
 https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout/2.0.4/constraintlayout-2.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.0.0/coordinatorlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.1.0/coordinatorlayout-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.6.0/core-ktx-1.6.0.pom
+https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-ktx-1.3.2.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/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
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.1/core-1.3.1.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core/1.5.0/core-1.5.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core/1.6.0/core-1.6.0.pom
+https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.2/core-1.3.2.pom
 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
@@ -52,24 +44,18 @@ https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1
 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/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
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-ui/1.0.0/legacy-support-core-ui-1.0.0.pom
 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/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/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/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
 https://dl.google.com/dl/android/maven2/androidx/localbroadcastmanager/localbroadcastmanager/1.0.0/localbroadcastmanager-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/media/media/1.0.0/media-1.0.0.pom
@@ -78,12 +64,11 @@ https://dl.google.com/dl/android/maven2/androidx/print/print/1.0.0/print-1.0.0.p
 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/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/swiperefreshlayout-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/test/monitor/1.2.0/monitor-1.2.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/test/monitor/1.3.0-rc03/monitor-1.3.0-rc03.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
@@ -94,7 +79,6 @@ https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1
 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/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
 https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/viewpager-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/webkit/webkit/1.4.0/webkit-1.4.0.pom
@@ -339,7 +323,6 @@ https://plugins.gradle.org/m2/com/facebook/fresco/memory-type-java/2.2.0/memory-
 https://plugins.gradle.org/m2/com/facebook/fresco/memory-type-native/2.2.0/memory-type-native-2.2.0.pom
 https://plugins.gradle.org/m2/com/facebook/fresco/nativeimagefilters/2.2.0/nativeimagefilters-2.2.0.pom
 https://plugins.gradle.org/m2/com/facebook/fresco/stetho/2.2.0/stetho-2.2.0.pom
-https://repo.maven.apache.org/maven2/antlr/antlr/2.7.1/antlr-2.7.1.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7.pom
 https://repo.maven.apache.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
 https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
@@ -465,8 +448,11 @@ https://repo.maven.apache.org/maven2/com/google/android/apps/common/testing/acce
 https://repo.maven.apache.org/maven2/com/google/auto/auto-common/0.8/auto-common-0.8.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/5/auto-parent-5.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/service/auto-service/1.0-rc4/auto-service-1.0-rc4.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.9/auto-value-annotations-1.9.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.9/auto-value-parent-1.9.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
@@ -488,12 +474,12 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 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.13.1/error_prone_annotations-2.13.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.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.13.1/error_prone_parent-2.13.1.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/google/5/google-5.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -503,14 +489,14 @@ 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/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-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/31.0.1-jre/guava-testlib-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 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/31.1-jre/guava-31.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.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/inject/guice-parent/5.1.0/guice-parent-5.1.0.pom
 https://repo.maven.apache.org/maven2/com/google/inject/guice/5.1.0/guice-5.1.0.pom
@@ -533,6 +519,7 @@ https://repo.maven.apache.org/maven2/com/google/zxing/core/3.3.0/core-3.3.0.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/zxing-parent/3.3.0/zxing-parent-3.3.0.pom
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
 https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom
+https://repo.maven.apache.org/maven2/com/nhaarman/mockitokotlin2/mockito-kotlin/2.2.0/mockito-kotlin-2.2.0.pom
 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/assertj/assertj-android/1.1.1/assertj-android-1.1.1.pom
@@ -543,30 +530,32 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3
 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.7/okhttp-5.0.0-alpha.7.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/5.0.0-alpha.5/okhttp-5.0.0-alpha.5.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-parent/1.15.0/okio-parent-1.15.0.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/3.1.0/okio-3.1.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.0.0/okio-3.0.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/all/2.0.1/all-2.0.1.pom
+https://repo.maven.apache.org/maven2/com/sun/activation/jakarta.activation/2.0.1/jakarta.activation-2.0.1.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/4.1.1/istack-commons-runtime-4.1.1.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.1.0-M1/istack-commons-runtime-4.1.0-M1.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/4.1.1/istack-commons-4.1.1.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.0-M1/istack-commons-4.1.0-M1.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/4.0.0-M4/jaxb-bom-ext-4.0.0-M4.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/3.0.2/jaxb-bom-ext-3.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/4.0.0-M4/jaxb-parent-4.0.0-M4.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/3.0.2/jaxb-parent-3.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-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/4.0.0-M4/jaxb-txw-parent-4.0.0-M4.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/3.0.2/jaxb-txw-parent-3.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/2.1.0/FastInfoset-2.1.0.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/2.0.0/FastInfoset-2.0.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/2.1.0/fastinfoset-project-2.1.0.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/2.0.0/fastinfoset-project-2.0.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
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-master/4.5/antlr4-master-4.5.pom
@@ -578,8 +567,8 @@ https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/3.4.3/gr
 https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/4.0.2/gradle-download-task-4.0.2.pom
 https://repo.maven.apache.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
 https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.0/jakarta.activation-api-2.1.0.pom
-https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0/jakarta.xml.bind-api-parent-4.0.0.pom
-https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0/jakarta.xml.bind-api-4.0.0.pom
+https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0-RC3/jakarta.xml.bind-api-parent-4.0.0-RC3.pom
+https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0-RC3/jakarta.xml.bind-api-4.0.0-RC3.pom
 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/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.pom
@@ -599,10 +588,13 @@ https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.pom
 https://repo.maven.apache.org/maven2/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.9.6.2.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.9.0/byte-buddy-agent-1.9.0.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.9.10/byte-buddy-agent-1.9.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.10.18/byte-buddy-agent-1.10.18.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.9.0/byte-buddy-parent-1.9.0.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.9.10/byte-buddy-parent-1.9.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.10.18/byte-buddy-parent-1.10.18.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.9.0/byte-buddy-1.9.0.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.9.10/byte-buddy-1.9.10.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.10.18/byte-buddy-1.10.18.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -627,22 +619,17 @@ https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-parent/6.0.3/progu
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-parent/6.3.0beta1/proguard-parent-6.3.0beta1.pom
 https://repo.maven.apache.org/maven2/org/abego/treelayout/org.abego.treelayout.core/1.0.1/org.abego.treelayout.core-1.0.1.pom
 https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.pom
-https://repo.maven.apache.org/maven2/org/antlr/ST4/4.3.3/ST4-4.3.3.pom
+https://repo.maven.apache.org/maven2/org/antlr/ST4/4.3.1/ST4-4.3.1.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.5.2-1/antlr4-master-4.5.2-1.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5.3.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.10.1/antlr4-master-4.10.1.pom
+https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.9.3/antlr4-master-4.9.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.5.2-1/antlr4-runtime-4.5.2-1.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.10.1/antlr4-runtime-4.10.1.pom
+https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.9.3/antlr4-runtime-4.9.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.3/antlr-master-3.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.5.2/antlr-master-3.5.2.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.5.3/antlr-master-3.5.3.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.3/antlr-runtime-3.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime-3.5.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr/3.5.2/antlr-3.5.2.pom
 https://repo.maven.apache.org/maven2/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.pom
-https://repo.maven.apache.org/maven2/org/antlr/stringtemplate/4.0.2/stringtemplate-4.0.2.pom
 https://repo.maven.apache.org/maven2/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/apache/ant/ant-parent/1.8.0/ant-parent-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/apache/ant/ant/1.8.0/ant-1.8.0.pom
@@ -655,12 +642,13 @@ https://repo.maven.apache.org/maven2/org/apache/apache/13/apache-13.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/15/apache-15.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/19/apache-19.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
-https://repo.maven.apache.org/maven2/org/apache/apache/25/apache-25.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/5/commons-parent-5.pom
@@ -673,6 +661,7 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/34/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/35/commons-parent-35.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/47/commons-parent-47.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
 https://repo.maven.apache.org/maven2/org/apache/geronimo/genesis/genesis-default-flava/2.3/genesis-default-flava-2.3.pom
@@ -713,40 +702,39 @@ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/project/7/project
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.8.5/maven-artifact-3.8.5.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-builder-support/3.8.5/maven-builder-support-3.8.5.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-compat/3.8.5/maven-compat-3.8.5.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.8.5/maven-core-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.8.4/maven-artifact-3.8.4.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-builder-support/3.8.4/maven-builder-support-3.8.4.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-compat/3.8.4/maven-compat-3.8.4.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.8.4/maven-core-3.8.4.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.8.5/maven-model-builder-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.8.4/maven-model-builder-3.8.4.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.8.5/maven-model-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.8.4/maven-model-3.8.4.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/10/maven-parent-10.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/11/maven-parent-11.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/19/maven-parent-19.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/34/maven-parent-34.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/35/maven-parent-35.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.8.5/maven-plugin-api-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.8.4/maven-plugin-api-3.8.4.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-project-builder/3.0-alpha-2/maven-project-builder-3.0-alpha-2.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/3.0-alpha-2/maven-project-3.0-alpha-2.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.8.5/maven-repository-metadata-3.8.5.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-resolver-provider/3.8.5/maven-resolver-provider-3.8.5.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.8.5/maven-settings-builder-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.8.4/maven-repository-metadata-3.8.4.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-resolver-provider/3.8.4/maven-resolver-provider-3.8.4.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.8.4/maven-settings-builder-3.8.4.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.8.5/maven-settings-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.8.4/maven-settings-3.8.4.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.0-alpha-2/maven-3.0-alpha-2.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.8.5/maven-3.8.5.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.8.0/maven-resolver-api-1.8.0.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-impl/1.8.0/maven-resolver-impl-1.8.0.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-named-locks/1.8.0/maven-resolver-named-locks-1.8.0.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-spi/1.8.0/maven-resolver-spi-1.8.0.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.8.0/maven-resolver-util-1.8.0.pom
-https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver/1.8.0/maven-resolver-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.8.4/maven-3.8.4.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.7.3/maven-resolver-api-1.7.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-impl/1.7.3/maven-resolver-impl-1.7.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-named-locks/1.7.3/maven-resolver-named-locks-1.7.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-spi/1.7.3/maven-resolver-spi-1.7.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.7.3/maven-resolver-util-1.7.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver/1.7.3/maven-resolver-1.7.3.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/34/maven-shared-components-34.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-file/1.0-beta-6/wagon-file-1.0-beta-6.pom
@@ -761,8 +749,8 @@ https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/3.5.1/wagon-provider-api-3.5.1.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/3.5.1/wagon-3.5.1.pom
-https://repo.maven.apache.org/maven2/org/apache/xbean/xbean-reflect/4.21/xbean-reflect-4.21.pom
-https://repo.maven.apache.org/maven2/org/apache/xbean/xbean/4.21/xbean-4.21.pom
+https://repo.maven.apache.org/maven2/org/apache/xbean/xbean-reflect/4.20/xbean-reflect-4.20.pom
+https://repo.maven.apache.org/maven2/org/apache/xbean/xbean/4.20/xbean-4.20.pom
 https://repo.maven.apache.org/maven2/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.pom
 https://repo.maven.apache.org/maven2/org/assertj/assertj-core/1.7.1/assertj-core-1.7.1.pom
 https://repo.maven.apache.org/maven2/org/assertj/assertj-core/3.8.0/assertj-core-3.8.0.pom
@@ -774,9 +762,10 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.48/bcprov
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52.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.65/bcprov-jdk15on-1.65.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/3.22.0/checker-qual-3.22.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.21.2/checker-qual-3.21.2.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
@@ -832,8 +821,7 @@ https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/eas
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/4.3/easymock-parent-4.3.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock/4.3/easymock-4.3.pom
-https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/1.0.0/angus-activation-project-1.0.0.pom
-https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/1.0.0/angus-activation-1.0.0.pom
+https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.6/project-1.0.6.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.7/project-1.0.7.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.pom
@@ -843,30 +831,30 @@ https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus/0.
 https://repo.maven.apache.org/maven2/org/eclipse/sisu/sisu-inject/0.3.5/sisu-inject-0.3.5.pom
 https://repo.maven.apache.org/maven2/org/eclipse/sisu/sisu-plexus/0.3.5/sisu-plexus-0.3.5.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/4.0.0-M4/jaxb-bom-4.0.0-M4.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/3.0.2/jaxb-bom-3.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.0-M4/jaxb-core-4.0.0-M4.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/3.0.2/jaxb-core-3.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/txw2/2.2.11/txw2-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.0-M4/txw2-4.0.0-M4.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/3.0.2/txw2-3.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
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.8/org.jacoco.build-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.7/org.jacoco.build-0.8.7.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.8/org.jacoco.core-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.7/org.jacoco.core-0.8.7.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jboss/weld/weld-parent/26/weld-parent-26.pom
 https://repo.maven.apache.org/maven2/org/jboss/weld/weld-parent/36/weld-parent-36.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.5.2/kotlinx-coroutines-android-1.5.2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.4.3/kotlinx-coroutines-android-1.4.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-common/1.1.1/kotlinx-coroutines-core-common-1.1.1.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.2/kotlinx-coroutines-core-jvm-1.5.2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.4.3/kotlinx-coroutines-core-jvm-1.4.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.1.1/kotlinx-coroutines-core-1.1.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.3.8/kotlinx-coroutines-core-1.3.8.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.1.0/kotlinx-metadata-jvm-0.1.0.pom
@@ -915,21 +903,20 @@ 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.50/kotlin-stdlib-common-1.3.50.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.4.10/kotlin-stdlib-common-1.4.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.30/kotlin-stdlib-common-1.4.30.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.5.31/kotlin-stdlib-common-1.5.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10.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.4.10/kotlin-stdlib-jdk7-1.4.10.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.4.31/kotlin-stdlib-jdk7-1.4.31.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.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.4.31/kotlin-stdlib-jdk8-1.4.31.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
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
@@ -942,9 +929,10 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/k
 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.71/kotlin-stdlib-1.3.71.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.30/kotlin-stdlib-1.4.30.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-test-common/1.4.31/kotlin-test-common-1.4.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.4.31/kotlin-test-1.4.31.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
@@ -956,7 +944,8 @@ https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.8.2/junit-bom-5.8.2.p
 https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter-api/5.7.0/junit-jupiter-api-5.7.0.pom
 https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-commons/1.7.0/junit-platform-commons-1.7.0.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/2.1.0/stax-ex-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0-M1/stax-ex-2.1.0-M1.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/2.23.0/mockito-core-2.23.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/2.28.2/mockito-core-2.28.2.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.6.28/mockito-core-3.6.28.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/2.6/objenesis-parent-2.6.pom
@@ -970,11 +959,13 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.0.3/asm-analysis
 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-analysis/9.3/asm-analysis-9.3.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.2/asm-analysis-7.2.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.3/asm-commons-9.3.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.2/asm-commons-7.2.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.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
@@ -986,34 +977,48 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.p
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.2/asm-tree-7.2.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.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-util/7.2/asm-util-7.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.0.3/asm-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.0/asm-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.3/asm-9.3.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.2/asm-7.2.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.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/ow2-1.5.pom
 https://repo.maven.apache.org/maven2/org/robolectric/annotations/4.3/annotations-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/annotations/4.4/annotations-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/junit/4.3/junit-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/junit/4.4/junit-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/pluginapi/4.3/pluginapi-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/pluginapi/4.4/pluginapi-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/plugins-maven-dependency-resolver/4.3/plugins-maven-dependency-resolver-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/plugins-maven-dependency-resolver/4.4/plugins-maven-dependency-resolver-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/resources/4.3/resources-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/resources/4.4/resources-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/robolectric/4.3/robolectric-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/robolectric/4.4/robolectric-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/sandbox/4.3/sandbox-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/sandbox/4.4/sandbox-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/shadowapi/4.3/shadowapi-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/shadowapi/4.4/shadowapi-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/shadows-framework/4.3/shadows-framework-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/shadows-framework/4.4/shadows-framework-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.3/utils-reflector-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.4/utils-reflector-4.4.pom
 https://repo.maven.apache.org/maven2/org/robolectric/utils/4.3/utils-4.3.pom
-https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/2.0.0-alpha7/jcl-over-slf4j-2.0.0-alpha7.pom
-https://repo.maven.apache.org/maven2/org/slf4j/jul-to-slf4j/2.0.0-alpha7/jul-to-slf4j-2.0.0-alpha7.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.0-alpha7/slf4j-api-2.0.0-alpha7.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/2.0.0-alpha7/slf4j-jdk14-2.0.0-alpha7.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.0.0-alpha7/slf4j-parent-2.0.0-alpha7.pom
-https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/2.0.0-alpha7/slf4j-simple-2.0.0-alpha7.pom
+https://repo.maven.apache.org/maven2/org/robolectric/utils/4.4/utils-4.4.pom
+https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/2.0.0-alpha6/jcl-over-slf4j-2.0.0-alpha6.pom
+https://repo.maven.apache.org/maven2/org/slf4j/jul-to-slf4j/2.0.0-alpha6/jul-to-slf4j-2.0.0-alpha6.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.0-alpha6/slf4j-api-2.0.0-alpha6.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/2.0.0-alpha6/slf4j-jdk14-2.0.0-alpha6.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.0.0-alpha6/slf4j-parent-2.0.0-alpha6.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/2.0.0-alpha6/slf4j-simple-2.0.0-alpha6.pom
 https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/buildsupport/5/buildsupport-5.pom
 https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/buildsupport/12/buildsupport-12.pom
 https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/public-parent/5/public-parent-5.pom
@@ -10,6 +10,7 @@ react-native-community_masked-view
 react-native-community_netinfo
 react-native-community_slider
 react-native-config
+react-native-dark-mode
 react-native-device-info
 react-native-dialogs
 react-native-fast-image
@@ -26,7 +27,6 @@ react-native-navigation
 react-native-nfc-manager
 react-native-notifications
 react-native-permissions
-react-native-randombytes
 react-native-reanimated
 react-native-safe-area-context
 react-native-shake
@@ -8,7 +8,7 @@ Modules provided by `yarn2nix` are normally fine, but we use `react-native-*` pa
 ```js
 repositories {
    google()
-    maven { url "https://www.jitpack.io" }
+    jcenter()
 }
 ```
 And these need to be patched and replaced with `mavenLocal()` to make sure Gradle doesn't try to fetch dependencies from remote repos.
@@ -11,5 +11,3 @@ keep-derivations = true
 keep-outputs = true
 # Extra isolation for network and filesystem, doesn't work on MacOS
 build-use-sandbox = false
-# Enable Nix v2 interface.
-experimental-features = nix-command
@@ -33,12 +33,12 @@ in {
  gradlePropParser = callPackage ./tools/gradlePropParser.nix { };

  # Package version adjustments
-  go = super.pkgs.go_1_17;
+  go = super.pkgs.go_1_16;
  gradle = super.pkgs.gradle_5;
-  nodejs = super.pkgs.nodejs-16_x;
+  nodejs = super.pkgs.nodejs-12_x;
  openjdk = super.pkgs.openjdk8_headless;
  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    version = "13.3";
+    version = "11.5";
    allowHigher = true;
  };
  gomobile = super.gomobile.override {
@@ -13,8 +13,8 @@ let
    name = "nixpkgs-source";
    owner = "status-im";
    repo = "nixpkgs";
-    rev = "4ba5f26780e7a27aa2e97676603cd9ef04f11e74";
-    sha256 = "sha256-ZpHXUuF9bvHooKwGuR1Mr/n2mE/LJ6/MCdCk2AfdD9M=";
+    rev = "15111f8a9ad423d300886b537647691c2faa28cd";
+    sha256 = "05ny644x3dpxigljnb4rmams5vrs5gkbcyqjfamvlqm8rdmsi0kn";
    # To get the compressed Nix sha256, use:
    # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
  };
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# This script is a wrapper around nix-build with some niceties.
+
 set -e

 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
@@ -8,7 +8,7 @@ source "${GIT_ROOT}/scripts/colors.sh"
 source "${GIT_ROOT}/nix/scripts/source.sh"

 # cleanup for artifacts created during builds
-cleanup() {
+function cleanup() {
  # clear trapped signals
  trap - EXIT ERR INT QUIT
  # do the actual cleanup, ignore failure
@@ -29,7 +29,7 @@ if [[ -n "${_NIX_CLEAN}" ]]; then
 fi

 # build output will end up under /nix, we have to extract it
-extractResults() {
+function extractResults() {
  local nixResultPath="$1"
  mkdir -p "${resultPath}"
  cp -vfr ${nixResultPath}/* "${resultPath}" | sed 's#'${PWD}'#.#'
@@ -5,16 +5,16 @@ set -e
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 source "${GIT_ROOT}/nix/scripts/source.sh"

-log() { echo "$@" 1>&2; }
+function log() { echo "$@" 1>&2; }

 # helpers for getting related paths in Nix store
-getSources()   { nix-store --query --binding src "${1}"; }
-getOutputs()   { nix-store --query --outputs "${1}"; }
-getDrvFiles()  { nix-store --query --deriver "${1}"; }
-getReferrers() { nix-store --query --referrers "${1}"; }
-getRoots()     { nix-store --query --roots "${1}"; }
+function getSources()   { nix-store --query --binding src "${1}"; }
+function getOutputs()   { nix-store --query --outputs "${1}"; }
+function getDrvFiles()  { nix-store --query --deriver "${1}"; }
+function getReferrers() { nix-store --query --referrers "${1}"; }
+function getRoots()     { nix-store --query --roots "${1}"; }

-findRelated() {
+function findRelated() {
    path="${1}"
    found+=("${path}")
    if [[ "${path}" =~ .*.chroot ]]; then
@@ -51,7 +51,7 @@ findRelated() {
 }

 # used to find things to delete based on a regex
-findByRegex() {
+function findByRegex() {
    regex="${1}"

    log "Searching by regex: '${regex}'"
@@ -70,7 +70,7 @@ findByRegex() {
 }

 # used to find things to delete based on a given path
-findByResult() {
+function findByResult() {
    mainPath="${1}"
    log "Searching by result: '${mainPath}'"

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-# Checking group ownership to identify installation type.
-file_group() {
-    UNAME=$(uname -s)
-    if [[ "${UNAME}" == "Linux" ]]; then
-        stat -Lc "%G" "${1}" 2>/dev/null
-    elif [[ "${UNAME}" == "Darwin" ]]; then
-        stat -Lf "%Sg" "${1}" 2>/dev/null
-    fi
-}
-
-os_name() {
-    source /etc/os-release 2>/dev/null
-    echo "${NAME}"
-}
-
-is_arch_linux() {
-    [[ -f /etc/arch-release ]]
-}
-
-nix_install_type() {
-    NIX_STORE_DIR_GROUP=$(file_group /nix/store)
-    if [[ "$(os_name)" =~ NixOS ]]; then
-        echo "nixos"
-    elif [[ "${NIX_STORE_DIR_GROUP}" == "nixbld" ]]; then
-        echo "multi"
-    elif [[ "${NIX_STORE_DIR_GROUP}" == "${USER}" ]]; then
-        echo "single"
-    elif [[ "${NIX_STORE_DIR_GROUP}" == "" ]]; then
-        echo "No Nix installtion detected!" >&2
-        echo "none"
-    else
-        echo "Unknown Nix installtion type!" >&2
-        exit 1
-    fi
-}
@@ -23,13 +23,13 @@ source "${GIT_ROOT}/scripts/colors.sh"
 # More concise output from 'time'
 export TIMEFORMAT="Done in: %Es"

-removeDir() {
+function removeDir() {
    [[ ! -d "${tmp}" ]] && return
    chmod -R u+w "${tmp}"
    rm -rf "${tmp}"
 }

-copyNodeModules() {
+function copyNodeModules() {
  local src="${1}"
  local dst="${2}"
  # WARNING: The ../ is there to avoid a Nix builtins.path bug:
@@ -51,7 +51,7 @@ copyNodeModules() {

 # Find files that were modified and should cause a re-copying of node modules.
 # Some files are generated/modified by build processes and should be ignored.
-findFilesNewerThan() {
+function findFilesNewerThan() {
  local sentinel="${1}"
  local dir="${2}"
  find ${dir} -type f -writable \
@@ -63,7 +63,7 @@ findFilesNewerThan() {
      -print 
 }

-nodeModulesUnchanged() {
+function nodeModulesUnchanged() {
  local src="$1"
  local dst="$2"
  local sentinelFile="${dst}/.copied~"
@@ -98,7 +98,7 @@ nodeModulesUnchanged() {
  return 0
 }

-replaceNodeModules() {
+function replaceNodeModules() {
  local src="$1"
  local dst="$2"
  local sentinelFile="${dst}/.copied~"
@@ -1,82 +1,24 @@
 #!/usr/bin/env bash
-# This script removes all Nix files.
+
+set -e

 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-source "${GIT_ROOT}/nix/scripts/lib.sh"
 source "${GIT_ROOT}/scripts/colors.sh"

-nix_purge_multi_user() {
-    sudo systemctl stop nix-daemon.socket
-    sudo systemctl stop nix-daemon.service
-    sudo systemctl disable nix-daemon.socket
-    sudo systemctl disable nix-daemon.service
-    sudo systemctl daemon-reload
-    sudo rm -fr /etc/nix
-    sudo rm -f /etc/profile.d/nix.sh*
-
-    # Remove nix build users and groups
-    for NIX_USER in $(awk -F: '/nixbld/{print $1}' /etc/passwd); do
-        sudo userdel "${NIX_USER}"
-    done
-    sudo groupdel nixbld
-
-    # Restore old shell profiles
-    NIX_PROFILE_FILES=(
-        /etc/bash.bashrc /etc/bashrc /etc/bash/bashrc
-        /etc/zsh.zshhrc /etc/zshrc /etc/zsh/zshrc
-    )
-    for NIX_FILE in "${NIX_PROFILE_FILES[@]}"; do
-        if [[ -f "${NIX_FILE}.backup-before-nix" ]]; then
-            sudo mv -f "${NIX_FILE}.backup-before-nix" "${NIX_FILE}"
-        fi
-    done
-}
-
-nix_purge_user_profile() {
-    sudo rm -rf \
-        ~/.nix-* \
-        ~/.cache/nix \
-        ~/.config/nixpkgs \
-        ${GIT_ROOT}/.nix-gcroots
-}
-
-nix_purge_root() {
-    NIX_ROOT="/nix"
-    if [[ $(uname -s) == "Darwin" ]]; then
-        # Special case due to read-only root on MacOS Catalina
-        NIX_ROOT="/opt/nix"
-    fi
-    if [[ -z "${NIX_ROOT}" ]]; then
-        echo -e "${RED}Unable to identify Nix root!${RST}" >&2
-        exit 1
-    fi
-    sudo rm -fr "${NIX_ROOT}"
-}
-
-NIX_INSTALL_TYPE=$(nix_install_type)
-
-if [[ "${1}" == "--force" ]] && [[ "${NIX_INSTALL_TYPE}" != "nixos" ]]; then
-    echo -e "${YLW}Purge forced, no checks performed!${RST}" >&2
-    nix_purge_multi_user
-    nix_purge_user_profile
-    nix_purge_root
-    exit
-fi
-
 # Purging /nix on NixOS would be disasterous
-if [[ "${NIX_INSTALL_TYPE}" == "nixos" ]]; then
-    echo -e "${RED}You should not purge Nix files on NixOS!${RST}" >&2
-    exit
-elif [[ "${NIX_INSTALL_TYPE}" == "none" ]]; then
-    echo -e "${YLW}Nothing to remove, Nix not installed.${RST}" >&2
-    exit
-elif [[ "${NIX_INSTALL_TYPE}" == "multi" ]]; then
-    echo -e "${YLW}Detected multi-user Nix installation.${RST}" >&2
-    nix_purge_multi_user
-elif [[ "${NIX_INSTALL_TYPE}" == "single" ]]; then
-    echo -e "${YLW}Detected single-user Nix installation.${RST}" >&2
-    nix_purge_user_profile
+if [[ -f "/etc/os-release" ]]; then
+    OS_NAME=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+    if [[ "$OS_NAME" == "NixOS" ]]; then
+        echo -e "${RED}You should not purge Nix files on NixOS!${RST}" >&2
+        exit
+    fi
 fi
-nix_purge_root

+NIX_ROOT="/nix"
+if [[ $(uname -s) == "Darwin" ]]; then
+    # Special case due to read-only root on MacOS Catalina
+    NIX_ROOT="/opt/nix"
+fi
+
+sudo rm -rf ${NIX_ROOT}/* ~/.nix-profile ~/.nix-defexpr ~/.nix-channels ~/.cache/nix ~/.status .nix-gcroots
 echo -e "${GRN}Purged all Nix files from your system.${RST}" >&2
@@ -1,73 +1,51 @@
 #!/usr/bin/env bash
-# This script installs a specific version of Nix.
-set -eo pipefail

 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-source "${GIT_ROOT}/nix/scripts/lib.sh"
 source "${GIT_ROOT}/scripts/colors.sh"

-NIX_VERSION="2.8.0"
+NIX_VERSION="2.3.12"
 NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
-NIX_INSTALL_SHA256="f43bfedfca9151479462d8bc11f238615a2d52f19b14894d8e2b59980e75ef72"
+NIX_INSTALL_SHA256="468a49a1cef293d59508bb3b62625dfcd99ec00334a14309f125cf8de513d5f1"
 NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"

-install_nix() {
-    # Download installer and verify SHA256>
-    curl -sSf "${NIX_INSTALL_URL}" -o "${NIX_INSTALL_PATH}"
-    echo "${NIX_INSTALL_SHA256}  ${NIX_INSTALL_PATH}" | sha256sum -c
-    chmod +x "${NIX_INSTALL_PATH}"
-
-    # Identify installation type.
-    if [[ -z "${NIX_INSTALL_OPTS}" ]]; then
-        if [[ "$(uname -r)" =~ microsoft ]]; then
-            # Systemd is not started by default on WSL.
-            NIX_INSTALL_OPTS="--no-daemon"
-        elif [[ "$(uname -s)" == "Darwin" ]]; then
-            # Single-user not supported on Darwin.
-            NIX_INSTALL_OPTS="--daemon"
-        elif [[ "$(uname -s)" == "Linux" ]]; then
-            # Open file limit issues on Linux.
-            # https://github.com/NixOS/nix/issues/6007
-            # Alson known issues with nix-daemon.socket on Arch.
-            NIX_INSTALL_OPTS="--no-daemon"
-        fi
-    fi
-
-    # Run the installer
-    "${NIX_INSTALL_PATH}" "${NIX_INSTALL_OPTS}"
-    if [[ $? -eq 0 ]]; then
-        echo -e "${GRN}The Nix package manager was successfully installed.${RST}"
-    else
-        echo -e "${RED}Failed to install Nix package manager!${RST}" >&2
-        echo "Please see: https://nixos.org/nix/manual/#chap-installation" >&2
-        exit 1
-    fi
+function install_nix() {
+  # Don't break people's profiles
+  export NIX_INSTALLER_NO_MODIFY_PROFILE=1
+  # Fix for installing on MacOS Catalina
+  export NIX_IGNORE_SYMLINK_STORE=1
+  # Download installer and verify SHA256
+  curl -s "${NIX_INSTALL_URL}" -o "${NIX_INSTALL_PATH}"
+  echo "${NIX_INSTALL_SHA256}  ${NIX_INSTALL_PATH}" | sha256sum -c
+  chmod +x "${NIX_INSTALL_PATH}"
+  # Run the installer
+  "${NIX_INSTALL_PATH}" --no-daemon
+  if [ $? -eq 0 ]; then
+    echo -e "${GRN}The Nix package manager was successfully installed.${RST}"
+  else
+    echo -e "${RED}Failed to install Nix package manager!${RST}" >&2
+    echo "Please see: https://nixos.org/nix/manual/#chap-installation" >&2
+    exit 1
+  fi
 }

-if [[ ! -x "$(command -v sha256sum)" ]]; then
-    echo -e "${RED}The 'sha256sum' utility is required for Nix installation.${RST}" >&2
-    echo -e "${YLW}Install 'coreutils' package on your system.${RST}" >&2
-    exit 1
+if [[ ! -x "$(command -v git)" ]]; then
+  echo -e "${RED}The 'curl' utility is required for Nix installation.${RST}" >&2
+  exit 1
 fi

-if [[ ! -x "$(command -v curl)" ]]; then
-    echo -e "${RED}The 'curl' utility is required for Nix installation.${RST}" >&2
-    exit 1
-fi
-
-if [[ "$(source /etc/os-release 2>/dev/null && echo "${NAME}")" == *NixOS* ]]; then
-    echo -e "${GRN}Already running NixOS.${RST}"
-    exit
+if [[ "$(source /etc/os-release && echo "${NAME}")" == *NixOS* ]]; then
+  echo -e "${GRN}Already running NixOS.${RST}"
+  exit
 fi

 if [[ -x "$(command -v nix)" ]]; then
-    echo -e "${GRN}Nix package manager already installed.${RST}"
-    exit
+  echo -e "${GRN}Nix package manager already installed.${RST}"
+  exit
 fi

 if [[ "${IN_NIX_SHELL}" == 'pure' ]]; then
-    echo -e "${GRN}Already in a pure Nix shell.${RST}"
-    exit
+  echo -e "${GRN}Already in a pure Nix shell.${RST}"
+  exit
 fi

 # If none of the checks before succeeded we need to install Nix
@@ -1,41 +1,33 @@
 #!/usr/bin/env bash
+
 # This script makes sure we have Nix tools available
-set -e

 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-source "${GIT_ROOT}/nix/scripts/lib.sh"
-source "${GIT_ROOT}/scripts/colors.sh"

-source_nix_profile() {
-    NIX_INSTALL_TYPE=$(nix_install_type)
-    if [[ "${NIX_INSTALL_TYPE}" == "multi" ]]; then
-        source "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh"
-    elif [[ "${NIX_INSTALL_TYPE}" == "single" ]]; then
-        source "${HOME}/.nix-profile/etc/profile.d/nix.sh"
-    elif [[ "${NIX_INSTALL_TYPE}" == "nixops" ]]; then
-        echo "Sourcing profile not necessary on NixOS!" >&2
-    fi
-}
-
-main() {
-    # Just stop if Nix is already available
-    if [[ -x $(command -v nix) ]]; then
-        return
-    fi
+# Location of profile script for Nix that adjusts PATH
+export NIX_PROFILE_SH="${HOME}/.nix-profile/etc/profile.d/nix.sh"

+function source_nix() {
+  # Just stop if Nix is already available
+  if [[ -x $(command -v nix) ]]; then
+    return
+  elif [[ -f "${NIX_PROFILE_SH}" ]]; then
+    # Load Nix profile if it exists
+    source "${NIX_PROFILE_SH}"
+    return
+  else
    # Setup Nix if not available
-    if [[ ! -d /nix ]]; then
-        ${GIT_ROOT}/nix/scripts/setup.sh
-    fi
+    ${GIT_ROOT}/nix/scripts/setup.sh
+  fi

-    # Load Nix profile
-    source_nix_profile
+  # Load Nix profile
+  source "${NIX_PROFILE_SH}"

-    # Verify Nix is available
-    if [[ ! -x $(command -v nix) ]]; then
-        echo -e "${RED}Nix not available, sourcing profile failed!${RST}" >&2
-        exit 1
-    fi
+  # Verify Nix is available
+  if [[ ! -x $(command -v nix) ]]; then
+    echo "Nix not available, sourcing profile failed!" > /dev/stderr
+    exit 1
+  fi
 }

-main
+source_nix
@@ -12,9 +12,9 @@
  },
  "dependencies": {
    "@react-native-community/async-storage": "^1.11.0",
-    "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
+    "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#v2.0.3-status-v6",
    "@react-native-community/blur": "^3.6.0",
-    "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#refs/tags/v4.0.4-status.0",
+    "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#v4.0.4-status.0",
    "@react-native-community/clipboard": "^1.2.2",
    "@react-native-community/hooks": "^2.5.1",
    "@react-native-community/masked-view": "^0.1.6",
@@ -23,7 +23,7 @@
    "@react-native-community/slider": "^3.0.0",
    "@walletconnect/client": "^2.0.0-beta.23",
    "@walletconnect/client-legacy": "npm:@walletconnect/client@^1.7.1",
-    "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/v4.0.2-status",
+    "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status",
    "buffer": "^5.4.2",
    "chance": "^1.1.0",
    "create-react-class": "^15.6.2",
@@ -41,7 +41,7 @@
    "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": "git+https://github.com/status-im/react-native-config.git#v1.4.2-status",
    "react-native-device-info": "^7.4.0",
    "react-native-dialogs": "^1.0.4",
    "react-native-draggable-flatlist": "^3.0.3",
@@ -50,14 +50,14 @@
    "react-native-fs": "^2.14.1",
    "react-native-gesture-handler": "^1.8.0",
    "react-native-haptic-feedback": "^1.9.0",
-    "react-native-image-crop-picker": "git+https://github.com/status-im/react-native-image-crop-picker.git#refs/tags/v0.36.2-status.0",
+    "react-native-image-crop-picker": "git+https://github.com/status-im/react-native-image-crop-picker.git#v0.36.2-status.0",
    "react-native-image-resizer": "^1.2.3",
-    "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#refs/tags/v0.2.1.status",
-    "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#refs/tags/v.3.0.0-5-status",
+    "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#v0.2.1.status",
+    "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#v.3.0.0-5-status",
    "react-native-languages": "^3.0.2",
    "react-native-linear-gradient": "^2.5.6",
    "react-native-mail": "^6.1.1",
-    "react-native-navigation": "^7.27.1",
+    "react-native-navigation": "^7.13.0",
    "react-native-notifications": "^4.1.3",
    "react-native-permissions": "^2.1.5",
    "react-native-randombytes": "^3.6.1",
@@ -66,12 +66,12 @@
    "react-native-safe-area-context": "^2.0.0",
    "react-native-shake": "^3.3.1",
    "react-native-share": "^7.0.1",
-    "react-native-splash-screen": "3.3.0",
-    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.37",
+    "react-native-splash-screen": "^3.2.0",
+    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.37",
    "react-native-svg": "^9.8.4",
    "react-native-touch-id": "^4.4.1",
-    "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",
-    "rn-emoji-keyboard": "git+https://github.com/status-im/rn-emoji-keyboard.git#refs/tags/v0.4.3",
+    "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v11.16.0-status",
+    "rn-emoji-keyboard": "git+https://github.com/status-im/rn-emoji-keyboard.git#v0.4.2",
    "tdigest": "^0.1.1",
    "web3-utils": "^1.2.1"
  },
@@ -86,7 +86,7 @@
    "jest": "^25.1.0",
    "nyc": "^14.1.1",
    "process": "0.11.10",
-    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
+    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#v2.0.2-status",
    "shadow-cljs": "^2.10.14"
  }
 }
@@ -50,9 +50,6 @@ Examples:
    # Using tag name
    ${SCRIPT_FILE} v2.1.1

-    # Using commit SHA1
-    ${SCRIPT_FILE} 1a2b3c4d
-
    # Using PR number
    ${SCRIPT_FILE} PR-2134
 END
@@ -85,12 +82,13 @@ STATUS_GO_BRANCH_SHA1=$(echo "${STATUS_GO_MATCHING_REFS}" | grep 'refs/heads' |
 # Prefer tag over branch if both are found
 if [[ -n "${STATUS_GO_TAG_SHA1}" ]]; then
    STATUS_GO_COMMIT_SHA1="${STATUS_GO_TAG_SHA1}"
-elif [[ -n "${STATUS_GO_BRANCH_SHA1}" ]]; then
-    STATUS_GO_COMMIT_SHA1="${STATUS_GO_BRANCH_SHA1}"
-elif [[ "${#STATUS_GO_VERSION}" -gt 4 ]]; then
-    STATUS_GO_COMMIT_SHA1="${STATUS_GO_VERSION}"
 else
-    echo "ERROR: Input not a tag or branch, but too short to be a SHA1!" >&2
+    STATUS_GO_COMMIT_SHA1="${STATUS_GO_BRANCH_SHA1}"
+fi
+
+if [[ -z "${STATUS_GO_COMMIT_SHA1}" ]]; then
+    echo "ERROR: Failed to find a SHA1 for rev '${STATUS_GO_VERSION}'."
+    echo "NOTE: To set SHA1 you can just edit ${VERSION_FILE} by hand."
    exit 1
 fi

@@ -47,7 +47,6 @@
                                       :ValueXY                 (fn [])
                                       :View                    {}
                                       :FlatList                {}
-                                       :Image                   {}
                                       :ScrollView              {}
                                       :Text                    {}}
            :Easing                   {:bezier (fn [])
@@ -6,8 +6,7 @@
            ["@react-native-community/hooks" :as hooks]
            ["react-native-navigation" :refer (Navigation)]
            ["rn-emoji-keyboard" :refer (EmojiKeyboard)]
-            ["react-native-draggable-flatlist" :default DraggableFlatList]
-            [status-im.utils.config :as config]))
+            ["react-native-draggable-flatlist" :default DraggableFlatList]))

 (def rn-draggable-flatlist (reagent/adapt-react-class DraggableFlatList))

@@ -75,9 +74,6 @@
 (def animated-view
  (reagent/adapt-react-class (.-View ^js animated)))

-(def animated-image-view
-  (reagent/adapt-react-class (.-Image ^js animated)))
-
 (def ui-manager  (.-UIManager ^js rn))

 (def layout-animation (.-LayoutAnimation ^js rn))
@@ -107,10 +103,6 @@
                                               :delete   #js {:type     (:ease-in-ease-out layout-animation-types)
                                                              :property (:opacity layout-animation-properties)}}})

-(defonce enable-layout-animations
-  (when (and platform/android? config/quo-preview-enabled?)
-    (.setLayoutAnimationEnabledExperimental ^js ui-manager true)))
-
 (def activity-indicator (reagent/adapt-react-class (.-ActivityIndicator ^js rn)))

 ;; Flat-list
@@ -1,11 +1,7 @@
 (ns quo.theme
-  (:require [quo.design-system.colors :as colors]
-            [reagent.core :as reagent]))
+  (:require [quo.design-system.colors :as colors]))

-(def theme (reagent/atom nil))
-
-(defn dark? []
-  (= :dark @theme))
+(def theme (atom nil))

 (defn get-theme []
  @theme)
@@ -1,10 +1,10 @@
 (ns quo2.components.button
  (:require [quo.react-native :as rn]
+            [status-im.ui.components.icons.icons :as icons]
            [quo2.foundations.colors :as colors]
            [quo2.components.text :as text]
            [quo.theme :as theme]
-            [reagent.core :as reagent]
-            [quo2.components.icon :as quo2.icons]))
+            [reagent.core :as reagent]))

 (def themes {:light {:primary   {:icon-color       colors/white
                                 :label            {:style {:color colors/white}}
@@ -16,9 +16,9 @@
                                 :background-color {:default  colors/primary-50-opa-20
                                                    :pressed  colors/primary-50-opa-40
                                                    :disabled colors/primary-50-opa-20}}
-                     :grey      {:icon-color       colors/black
+                     :grey      {:icon-color       colors/neutral-50
                                 :label            {:style {:color colors/black}}
-                                 :background-color {:default  colors/neutral-20
+                                 :background-color {:default  colors/neutral-40
                                                    :pressed  colors/neutral-30
                                                    :disabled colors/neutral-20}}
                     :outline   {:icon-color   colors/neutral-50
@@ -61,7 +61,7 @@
                                                    :pressed  colors/danger-40
                                                    :disabled colors/danger-50}}}})

-(defn style-container [type size disabled background-color border-color icon above width before after]
+(defn style-container [type size disabled background-color border-color icon above]
  (merge {:height             size
          :align-items        :center
          :justify-content    :center
@@ -74,14 +74,7 @@
                                  32 10
                                  24 8))
          :background-color   background-color
-          :padding-horizontal (when-not (or icon before after)
-                                (case size 56 16 40 16 32 12 24 8))
-          :padding-left       (when-not (or icon before)
-                                (case size 56 16 40 16 32 12 24 8))
-          :padding-right      (when-not (or icon after)
-                                (case size 56 16 40 16 32 12 24 8))}
-         (when width
-           {:width width})
+          :padding-horizontal (if icon 0 (case size 56 16 40 16 32 12 24 8))}
         (when icon
           {:width size})
         (when border-color
@@ -104,15 +97,14 @@
   [button {:icon true} :main-icons/close-circle]"
  [_ _]
  (let [pressed (reagent/atom false)]
-    (fn [{:keys [on-press disabled type size before after above width
-                 on-long-press accessibility-label icon style]
+    (fn [{:keys [on-press disabled type size before after above
+                 on-long-press accessibility-label icon]
          :or   {type :primary
                 size 40}}
         children]
      (let [{:keys [icon-color background-color label border-color]}
            (get-in themes [(theme/get-theme) type])
-            state (cond disabled :disabled @pressed :pressed :else :default)
-            icon-size (when (= 24 size) 12)]
+            state (cond disabled :disabled @pressed :pressed :else :default)]
        [rn/touchable-without-feedback (merge {:disabled            disabled
                                               :accessibility-label accessibility-label}
                                              (when on-press
@@ -126,35 +118,17 @@
                                              {:on-press-out (fn []
                                                               (reset! pressed nil))})

-         [rn/view {:style (merge
-                           (style-container
-                            type
-                            size
-                            disabled
-                            (get background-color state)
-                            (get border-color state)
-                            icon
-                            above
-                            width
-                            before
-                            after)
-                           style)}
+         [rn/view {:style (style-container type size disabled (get background-color state) (get border-color state) icon above)}
          (when above
            [rn/view
-             [quo2.icons/icon above {:container-style {:margin-bottom 2}
-                                     :color           icon-color
-                                     :size            icon-size}]])
+             [icons/icon above {:color icon-color}]])
          (when before
            [rn/view
-             [quo2.icons/icon before {:container-style {:margin-left  (if (= size 40) 12 8)
-                                                        :margin-right 4}
-                                      :color           icon-color
-                                      :size            icon-size}]])
+             [icons/icon before {:color icon-color}]])
          [rn/view
           (cond
             icon
-             [quo2.icons/icon children {:color icon-color
-                                        :size  icon-size}]
+             [icons/icon children {:color icon-color}]

             (string? children)
             [text/text (merge {:size            (when (#{56 24} size) :paragraph-2)
@@ -167,7 +141,4 @@
             children)]
          (when after
            [rn/view
-             [quo2.icons/icon after {:container-style {:margin-left  4
-                                                       :margin-right (if (= size 40) 12 8)}
-                                     :color           icon-color
-                                     :size            icon-size}]])]]))))
+             [icons/icon after {:color icon-color}]])]]))))
@@ -1,10 +0,0 @@
-(ns quo2.components.icon
-  (:require [status-im.ui.components.icons.icons :as icons]))
-
-(defn icon
-  ([icon-name] (icon icon-name nil))
-  ([icon-name {:keys [size] :as props}]
-   (let [size (or size 20)]
-     [icons/icon (str (name icon-name) size) (merge props
-                                                    {:width size
-                                                     :height size})])))
@@ -5,7 +5,7 @@

 (defn tabs [{:keys [default-active on-change]}]
  (let [active-tab-id (reagent/atom default-active)]
-    (fn [{:keys [data size] :or {size 32}}]
+    (fn [{:keys [data size]}]
      (let [active-id @active-tab-id]
        [rn/view {:flex-direction :row}
         (for [{:keys [label id]} data]
@@ -29,6 +29,5 @@
  (let [this (reagent/current-component)
        props (reagent/props this)
        style (text-style props)]
-    (into [rn/text (merge {:style style}
-                          (dissoc props :style :size :align :weight :color))]
-          (reagent/children this))))
+    (into [rn/text {:style style}]
+          (reagent/children this))))
@@ -1,6 +1,5 @@
 (ns quo2.foundations.colors
-  (:require [clojure.string :as string]
-            [quo.theme :as theme]))
+  (:require [clojure.string :as string]))

 (defn alpha [value opacity]
  (if (string/starts-with? value "#")
@@ -34,13 +33,6 @@
 (def neutral-50-opa-30 (alpha neutral-50 0.3))
 (def neutral-50-opa-40 (alpha neutral-50 0.4))

-;;70 with transparency
-(def neutral-70-opa-60 (alpha neutral-70 0.6))
-(def neutral-70-opa-70 (alpha neutral-70 0.7))
-(def neutral-70-opa-80 (alpha neutral-70 0.8))
-(def neutral-70-opa-90 (alpha neutral-70 0.9))
-(def neutral-70-opa-95 (alpha neutral-70 0.95))
-
 ;;80 with transparency
 (def neutral-80-opa-60 (alpha neutral-80 0.6))
 (def neutral-80-opa-70 (alpha neutral-80 0.7))
@@ -181,17 +173,4 @@
 (def info-50-opa-10 (alpha info-50 0.1))
 (def info-50-opa-20 (alpha info-50 0.2))
 (def info-50-opa-30 (alpha info-50 0.3))
-(def info-50-opa-40 (alpha info-50 0.4))
-
-;;;;Switcher
-(def switcher-background "#040B14")
-
-;;switcher-screen with transparency
-(def switcher-background-opa-60 (alpha switcher-background 0.6))
-(def switcher-background-opa-70 (alpha switcher-background 0.7))
-(def switcher-background-opa-80 (alpha switcher-background 0.8))
-(def switcher-background-opa-90 (alpha switcher-background 0.9))
-(def switcher-background-opa-95 (alpha switcher-background 0.95))
-
-(defn theme-colors [light dark]
-  (if (theme/dark?) dark light))
+(def info-50-opa-40 (alpha info-50 0.4))
@@ -2,24 +2,23 @@

 (def heading-1 {:font-size   27
                :line-height 32.4
-                :letter-spacing -0.5})
+                :letter-spacing -2.1})

 (def heading-2 {:font-size   19
                :line-height 25.65
-                :letter-spacing -0.4})
+                :letter-spacing -1.6})

 (def paragraph-1 {:font-size   15
                  :line-height 21.75
-                  :letter-spacing -0.1})
+                  :letter-spacing -0.9})

 (def paragraph-2 {:font-size   13
                  :line-height 18.2
-                  :letter-spacing 0})
+                  :letter-spacing -0.3})

 (def label {:font-size   11
            :line-height 15.62
-            :letter-spacing -0.055
-            :text-transform :uppercase})
+            :letter-spacing -0.055})

 (def font-regular {:font-family "Inter-Regular"}) ; 400

@@ -70,12 +70,12 @@
                                    :theme :before :after)
                            {:on-press #(println "Hello world!")}
                            (when @above
-                              {:above :main-icons2/placeholder})
+                              {:above :main-icons/close-circle})
                            (when @before
-                              {:before :main-icons2/placeholder})
+                              {:before :main-icons/back})
                            (when @after
-                              {:after :main-icons2/placeholder}))
-         (if @icon :main-icons2/placeholder @label)]]])))
+                              {:after :main-icons/next}))
+         (if @icon :main-icons/close-circle @label)]]])))

 (defn preview-button []
  [rn/view {:background-color (:ui-background @colors/theme)
@@ -8,8 +8,12 @@
 (def descriptor [{:label   "Size:"
                  :key     :size
                  :type    :select
-                  :options [{:key   28
+                  :options [{:key   32
+                             :value "32"}
+                            {:key   28
                             :value "28"}
+                            {:key   24
+                             :value "24"}
                            {:key   20
                             :value "20"}]}])

@@ -10,8 +10,12 @@
                  :type    :select
                  :options [{:key   32
                             :value "32"}
+                            {:key   28
+                             :value "28"}
                            {:key   24
-                             :value "24"}]}])
+                             :value "24"}
+                            {:key   20
+                             :value "20"}]}])

 (defn cool-preview []
  (let [state  (reagent/atom {:size  32})]
@@ -27,6 +27,8 @@
                             :value "Medium"}
                            {:key   :semi-bold
                             :value "Semi-bold"}
+                            {:key   :bold
+                             :value "Bold"}
                            {:key   :monospace
                             :value "Monospace"}]}])

@@ -39,7 +39,7 @@
        network (ethereum/chain-keyword db)]
    {:db             (assoc-in db [:acquisition :network-status]
                               (get network-statuses :initiated))
-     ::json-rpc/call [{:method     "wakuext_signMessageWithChatKey"
+     ::json-rpc/call [{:method     (json-rpc/call-ext-method "signMessageWithChatKey")
                       :params     [msg]
                       :on-error   #(re-frame/dispatch [::on-error (i18n/label :t/sign-request-failed)])
                       :on-success #(re-frame/dispatch [::call-acquisition-gateway
@@ -68,7 +68,7 @@

 (fx/defn qr-code-handled
  {:events [::qr-code-handled]}
-  [{:keys [db] :as cofx} {:keys [type public-key chat-id data ens-name]} {:keys [new-contact? nickname] :as opts}]
+  [{:keys [db] :as cofx} {:keys [type public-key chat-id data ens-name]} {:keys [new-contact?] :as opts}]
  (let [public-key? (and (string? data)
                         (string/starts-with? data "0x"))
        chat-key (cond
@@ -80,7 +80,7 @@
    (if-not validation-result
      (if new-contact?
        (fx/merge cofx
-                  (contact/add-contact chat-key nickname ens-name)
+                  (contact/add-contact chat-key nil ens-name)
                  (navigation/navigate-to-cofx :contacts-list {}))
        (chat/start-chat cofx chat-key ens-name))
      {:utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
@@ -18,7 +18,7 @@
  {:events [:multiaccounts.ui/perform-backup-pressed]}
  [{:keys [db]}]
  {:db (assoc db :backup/performing-backup true)
-   ::json-rpc/call [{:method     "wakuext_backupData"
+   ::json-rpc/call [{:method     (json-rpc/call-ext-method "backupData")
                     :params     []
                     :on-error   #(do
                                    (log/error "failed to perfom backup" %)
@@ -10,6 +10,7 @@
            [status-im.native-module.core :as status]
            [status-im.ui.components.list-selection :as list-selection]
            [status-im.navigation :as navigation]
+            [status-im.utils.contenthash :as contenthash]
            [status-im.utils.fx :as fx]
            [status-im.utils.http :as http]
            [status-im.utils.platform :as platform]
@@ -181,6 +182,20 @@
                               :history new-history
                               :history-index new-index))))))

+(defmulti storage-gateway :namespace)
+
+(defmethod storage-gateway :ipns
+  [{:keys [hash]}]
+  (str "https://" hash))
+
+(defmethod storage-gateway :ipfs
+  [{:keys [hash]}]
+  (contenthash/ipfs-url hash))
+
+(defmethod storage-gateway :swarm
+  [{:keys [hash]}]
+  (str "https://gateway.ethswarm.org/bzz/" hash))
+
 (fx/defn resolve-ens-multihash-success
  {:events [:browser.callback/resolve-ens-multihash-success]}
  [{:keys [db] :as cofx} url]
@@ -10,7 +10,6 @@
            [quo.design-system.colors :as colors]
            [status-im.constants :as constants]
            [status-im.navigation :as navigation]
-            [status-im.navigation2 :as navigation2]
            [status-im.utils.clocks :as utils.clocks]
            [status-im.utils.fx :as fx]
            [status-im.utils.utils :as utils]
@@ -49,7 +48,7 @@

 (defn active-chat? [cofx chat-id]
  (let [chat (get-chat cofx chat-id)]
-    (:active chat)))
+    (not (nil? chat))))

 (defn foreground-chat?
  [{{:keys [current-chat-id view-id]} :db} chat-id]
@@ -116,11 +115,11 @@
  "Add chats to db and update"
  [{:keys [db] :as cofx} chats]
  (let [{:keys [all-chats chats-home-list removed-chats]}
-        (reduce (fn [acc {:keys [chat-id profile-public-key timeline? community-id active muted] :as chat}]
-                  (if (not (or active muted))
+        (reduce (fn [acc {:keys [chat-id profile-public-key timeline? community-id active] :as chat}]
+                  (if (not active)
                    (update acc :removed-chats conj chat-id)
                    (cond-> acc
-                      (and (not profile-public-key) (not timeline?) (not community-id) active)
+                      (and (not profile-public-key) (not timeline?) (not community-id))
                      (update :chats-home-list conj chat-id)
                      :always
                      (assoc-in [:all-chats chat-id] chat))))
@@ -136,9 +135,7 @@
                     (update :chats #(apply dissoc % removed-chats))
                     (update :chats-home-list set/difference removed-chats))}
            (when (not-empty removed-chats)
-              {:clear-message-notifications
-               [removed-chats
-                (get-in db [:multiaccount :remote-push-notifications-enabled?])]}))
+              {:clear-multiple-message-notifications removed-chats}))
     leave-removed-chat)))

 (fx/defn clear-history
@@ -180,9 +177,8 @@
  [{:keys [db now] :as cofx} chat-id]
  (fx/merge
   cofx
-   {:db (-> (if (get-in db [:chats chat-id :muted])
-              (assoc-in db [:chats chat-id :active] false)
-              (update db :chats dissoc chat-id))
+   {:db (-> db
+            (update :chats dissoc chat-id)
            (update :chats-home-list disj chat-id)
            (assoc-in [:current-chat-id] nil))
    ::json-rpc/call [{:method "wakuext_deactivateChat"
@@ -226,8 +222,6 @@
  {:events [:chat.ui/remove-chat]}
  [{:keys [db now] :as cofx} chat-id]
  (fx/merge cofx
-            {:clear-message-notifications
-             [[chat-id] (get-in db [:multiaccount :remote-push-notifications-enabled?])]}
            (deactivate-chat chat-id)
            (offload-messages chat-id)
            (when (not (= (:view-id db) :home))
@@ -264,15 +258,6 @@
                 (navigation/pop-to-root-tab % :chat-stack))
              (navigation/navigate-to-cofx :chat nil))))

-(fx/defn navigate-to-chat-nav2
-  "Takes coeffects map and chat-id, returns effects necessary for navigation and preloading data"
-  {:events [:chat.ui/navigate-to-chat-nav2]}
-  [{db :db :as cofx} chat-id from-switcher?]
-  (fx/merge cofx
-            {:db (assoc db :current-chat-id chat-id)}
-            (preload-chat-data chat-id)
-            (navigation2/navigate-to-nav2 :chat chat-id nil from-switcher?)))
-
 (fx/defn handle-clear-history-response
  {:events [::history-cleared]}
  [{:keys [db]} chat-id response]
@@ -393,9 +378,9 @@
 (fx/defn mute-chat
  {:events [::mute-chat-toggled]}
  [{:keys [db] :as cofx} chat-id muted?]
-  (let [method (if muted? "wakuext_muteChat" "wakuext_unmuteChat")]
+  (let [method (if muted? "muteChat" "unmuteChat")]
    {:db (assoc-in db [:chats chat-id :muted] muted?)
-     ::json-rpc/call [{:method method
+     ::json-rpc/call [{:method (json-rpc/call-ext-method method)
                       :params [chat-id]
                       :on-error #(re-frame/dispatch [::mute-chat-failed chat-id muted? %])
                       :on-success #(log/debug "muted chat successfully")}]}))
@@ -14,7 +14,8 @@
            [status-im.utils.fx :as fx]
            ["emojilib" :as emojis]
            [status-im.chat.models.mentions :as mentions]
-            [status-im.utils.utils :as utils]))
+            [status-im.utils.utils :as utils]
+            [status-im.multiaccounts.update.core :as multiaccounts.update]))

 (defn text->emoji
  "Replaces emojis in a specified `text`"
@@ -229,12 +230,12 @@
                                     :text              (i18n/label :t/update-to-listen-audio {"locale" "en"})})))

 (fx/defn send-sticker-message
-  [cofx {:keys [hash packID]} current-chat-id]
-  (when-not (or (string/blank? hash) (string/blank? packID))
+  [cofx {:keys [hash pack]} current-chat-id]
+  (when-not (string/blank? hash)
    (chat.message/send-message cofx {:chat-id      current-chat-id
                                     :content-type constants/content-type-sticker
                                     :sticker {:hash hash
-                                               :pack (int packID)}
+                                               :pack pack}
                                     :text    (i18n/label :t/update-to-see-sticker {"locale" "en"})})))

 (fx/defn send-edited-message [{:keys [db] :as cofx} text {:keys [message-id]}]
@@ -264,16 +265,13 @@

 (fx/defn chat-send-sticker
  {:events [:chat/send-sticker]}
-  [{{:keys [current-chat-id] :as db} :db :as cofx} {:keys [hash packID] :as sticker}]
+  [{{:keys [current-chat-id multiaccount]} :db :as cofx} {:keys [hash] :as sticker}]
  (fx/merge
   cofx
-   {:db (update db
-                :stickers/recent-stickers
-                (fn [recent]
-                  (conj (remove #(= hash (:hash %)) recent) sticker)))
-    ::json-rpc/call [{:method     "stickers_addRecent"
-                      :params     [(int packID) hash]
-                      :on-success #()}]}
+   (multiaccounts.update/multiaccount-update
+    :stickers/recent-stickers
+    (conj (remove #(= hash %) (:stickers/recent-stickers multiaccount)) hash)
+    {})
   (send-sticker-message sticker current-chat-id)))

 (fx/defn chat-send-audio
@@ -59,7 +59,7 @@
  {:events [::resolve-community-info]}
  [{:keys [db]} community-id]
  {:db (community-resolving db community-id)
-   ::json-rpc/call [{:method     "wakuext_requestCommunityInfoFromMailserver"
+   ::json-rpc/call [{:method     (json-rpc/call-ext-method "requestCommunityInfoFromMailserver")
                     :params     [community-id]
                     :on-success #(re-frame/dispatch [::community-resolved community-id %])
                     :on-error   #(do
@@ -69,7 +69,7 @@
 (fx/defn load-link-preview-data
  {:events [::load-link-preview-data]}
  [cofx link]
-  {::json-rpc/call [{:method     "wakuext_getLinkPreviewData"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "getLinkPreviewData")
                     :params     [link]
                     :on-success #(re-frame/dispatch [::cache-link-preview-data link %])
                     :on-error   #(re-frame/dispatch [::cache-link-preview-data
@@ -100,7 +100,7 @@

 (fx/defn request-link-preview-whitelist
  [_]
-  {::json-rpc/call [{:method     "wakuext_getLinkPreviewWhitelist"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "getLinkPreviewWhitelist")
                     :params     []
                     :on-success #(re-frame/dispatch [::link-preview-whitelist-received %])
                     :on-error   #(log/error "Failed to get link preview whitelist")}]})
@@ -7,8 +7,7 @@
            [status-im.chat.models.message-list :as message-list]
            [taoensso.timbre :as log]
            [status-im.ethereum.json-rpc :as json-rpc]
-            [status-im.chat.models.pin-message :as models.pin-message]
-            [status-im.notifications-center.core :as notification-center]))
+            [status-im.chat.models.pin-message :as models.pin-message]))

 (defn cursor->clock-value
  [^js cursor]
@@ -24,10 +23,10 @@
  [{:keys [db]} ^js new-chats-js]
  (let [{:keys [all-chats chats-home-list]}
        (reduce (fn [acc ^js chat-js]
-                  (let [{:keys [chat-id profile-public-key timeline? community-id active] :as chat}
+                  (let [{:keys [chat-id profile-public-key timeline? community-id] :as chat}
                        (data-store.chats/<-rpc-js chat-js)]
                    (cond-> acc
-                      (and (not profile-public-key) (not timeline?) (not community-id) active)
+                      (and (not profile-public-key) (not timeline?) (not community-id))
                      (update :chats-home-list conj chat-id)
                      :always
                      (assoc-in [:all-chats chat-id] chat))))
@@ -46,7 +45,7 @@

 (fx/defn load-chat
  [_ chat-id]
-  {::json-rpc/call [{:method "wakuext_chat"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "chat")
                     :params [chat-id]
                     :on-success #(re-frame/dispatch [:chats-list/load-chat-success %])
                     :on-failure #(log/error "failed to fetch chats" 0 -1 %)}]})
@@ -67,37 +66,29 @@

 (fx/defn handle-mark-all-read-successful
  {:events [::mark-all-read-successful]}
-  [{:keys [db] :as cofx} chat-id]
-  (fx/merge cofx
-            {:db (mark-chat-all-read db chat-id)}
-            (notification-center/get-activity-center-notifications-count)))
+  [{:keys [db]} chat-id]
+  {:db (mark-chat-all-read db chat-id)})

 (fx/defn handle-mark-all-read-in-community-successful
  {:events [::mark-all-read-in-community-successful]}
-  [{:keys [db] :as cofx} chat-ids]
-  (fx/merge cofx
-            {:db (reduce mark-chat-all-read db chat-ids)}
-            (notification-center/get-activity-center-notifications-count)))
+  [{:keys [db]} chat-ids]
+  {:db (reduce mark-chat-all-read db chat-ids)})

 (fx/defn handle-mark-all-read
  {:events [:chat.ui/mark-all-read-pressed :chat/mark-all-as-read]}
-  [{db :db} chat-id]
-  {:clear-message-notifications  [[chat-id]
-                                  (get-in db [:multiaccount :remote-push-notifications-enabled?])]
-   ::json-rpc/call [{:method     "wakuext_markAllRead"
+  [_ chat-id]
+  {:clear-message-notifications chat-id
+   ::json-rpc/call [{:method     (json-rpc/call-ext-method "markAllRead")
                     :params     [chat-id]
                     :on-success #(re-frame/dispatch [::mark-all-read-successful chat-id])}]})

 (fx/defn handle-mark-mark-all-read-in-community
  {:events [:chat.ui/mark-all-read-in-community-pressed]}
-  [{db :db} community-id]
-  (let [community-chat-ids (map #(str community-id %)
-                                (keys (get-in db [:communities community-id :chats])))]
-    {:clear-message-notifications  [community-chat-ids
-                                    (get-in db [:multiaccount :remote-push-notifications-enabled?])]
-     ::json-rpc/call [{:method     "wakuext_markAllReadInCommunity"
-                       :params     [community-id]
-                       :on-success #(re-frame/dispatch [::mark-all-read-in-community-successful %])}]}))
+  [_ community-id]
+  {:clear-message-notifications community-id
+   ::json-rpc/call [{:method     (json-rpc/call-ext-method "markAllReadInCommunity")
+                     :params     [community-id]
+                     :on-success #(re-frame/dispatch [::mark-all-read-in-community-successful %])}]})

 (fx/defn messages-loaded
  "Loads more messages for current chat"
@@ -247,10 +247,7 @@
      (merge mentionable-users
             (mentionable-contacts-from-identites all-contacts public-key (keys community-members)))

-      (= chat-type constants/public-chat-type)
-      (merge mentionable-users (select-keys mentionable-contacts (keys mentionable-users)))
-
-      :else mentionable-users)))
+      :else (merge mentionable-users mentionable-contacts))))

 (def ending-chars "[\\s\\.,;:]")
 (def ending-chars-regex (re-pattern ending-chars))
@@ -174,7 +174,7 @@
 (fx/defn resend-message
  [{:keys [db] :as cofx} chat-id message-id]
  (fx/merge cofx
-            {::json-rpc/call [{:method "wakuext_reSendChatMessage"
+            {::json-rpc/call [{:method (json-rpc/call-ext-method "reSendChatMessage")
                               :params [message-id]
                               :on-success #(log/debug "re-sent message successfully")
                               :on-error #(log/error "failed to re-send message" %)}]}
@@ -23,7 +23,7 @@
  {:events [::accept-request-address-for-transaction]}
  [{:keys [db]} message-id address]
  {:db (dissoc db :commands/select-account)
-   ::json-rpc/call [{:method "wakuext_acceptRequestAddressForTransaction"
+   ::json-rpc/call [{:method (json-rpc/call-ext-method "acceptRequestAddressForTransaction")
                     :params [message-id address]
                     :js-response true
                     :on-success #(re-frame/dispatch [:transport/message-sent %])}]})
@@ -31,7 +31,7 @@
 (fx/defn handle-decline-request-address-for-transaction
  {:events [::decline-request-address-for-transaction]}
  [_ message-id]
-  {::json-rpc/call [{:method "wakuext_declineRequestAddressForTransaction"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "declineRequestAddressForTransaction")
                     :params [message-id]
                     :js-response true
                     :on-success #(re-frame/dispatch [:transport/message-sent %])}]})
@@ -39,7 +39,7 @@
 (fx/defn handle-decline-request-transaction
  {:events [::decline-request-transaction]}
  [cofx message-id]
-  {::json-rpc/call [{:method "wakuext_declineRequestTransaction"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "declineRequestTransaction")
                     :params [message-id]
                     :js-response true
                     :on-success #(re-frame/dispatch [:transport/message-sent %])}]})
@@ -103,8 +103,7 @@
  [cofx response-js]
  (fx/merge cofx
            (handle-response cofx response-js)
-            (navigation/pop-to-root-tab :chat-stack)
-            (notification-center/get-activity-center-notifications-count)))
+            (navigation/pop-to-root-tab :chat-stack)))

 (fx/defn joined
  {:events [::joined ::requested-to-join]}
@@ -157,18 +156,14 @@

 (fx/defn leave
  {:events [::leave]}
-  [{:keys [db] :as cofx} community-id]
-  (let [community-chat-ids (map #(str community-id %)
-                                (keys (get-in db [:communities community-id :chats])))]
-    {:clear-message-notifications  [community-chat-ids
-                                    (get-in db [:multiaccount :remote-push-notifications-enabled?])]
-     ::json-rpc/call [{:method     "wakuext_leaveCommunity"
-                       :params     [community-id]
-                       :js-response true
-                       :on-success #(re-frame/dispatch [::left %])
-                       :on-error   #(do
-                                      (log/error "failed to leave community" community-id %)
-                                      (re-frame/dispatch [::failed-to-leave %]))}]}))
+  [cofx community-id]
+  {::json-rpc/call [{:method     "wakuext_leaveCommunity"
+                     :params     [community-id]
+                     :js-response true
+                     :on-success #(re-frame/dispatch [::left %])
+                     :on-error   #(do
+                                    (log/error "failed to leave community" community-id %)
+                                    (re-frame/dispatch [::failed-to-leave %]))}]})

 (fx/defn fetch [_]
  {::json-rpc/call [{:method "wakuext_communities"
@@ -171,8 +171,4 @@
 (def ^:const visibility-status-inactive 4)

 (def ^:const wallet-connect-version-1 1)
-(def ^:const wallet-connect-version-2 2)
-
-(def ^:const sticker-pack-status-installed 1)
-(def ^:const sticker-pack-status-pending 2)
-(def ^:const sticker-pack-status-owned 3)
+(def ^:const wallet-connect-version-2 2)
@@ -44,9 +44,7 @@
           {:db (-> db
                    (update :chats dissoc public-key)
                    (update :chats-home-list disj public-key)
-                    (assoc-in [:contacts/contacts public-key :added] false))
-            :clear-message-notifications
-            [[public-key] (get-in db [:multiaccount :remote-push-notifications-enabled?])]}
+                    (assoc-in [:contacts/contacts public-key :added] false))}
           (notification-center/get-activity-center-notifications-count)
           fxs)))

@@ -70,7 +70,7 @@
  {:events [::send-contact-request]}
  [{:keys [db] :as cofx} public-key]
  (let [{:keys [name profile-image]} (own-info db)]
-    {::json-rpc/call [{:method "wakuext_sendContactUpdate"
+    {::json-rpc/call [{:method (json-rpc/call-ext-method "sendContactUpdate")
                       :params [public-key name profile-image]
                       :on-success #(log/debug "contact request sent" public-key)}]}))

@@ -97,13 +97,12 @@
                                 :community-id (.-contentCommunityId chat)}
       :last-clock-value        (.-lastClockValue chat)
       :profile-public-key      (.-profile chat)
-       :highlight               (.-highlight chat)
-       :active                  (.-active chat)}
+       :highlight               (.-highlight chat)}
      rpc->type
      unmarshal-members))

 (fx/defn fetch-chats-rpc [_ {:keys [on-success]}]
-  {::json-rpc/call [{:method "wakuext_chatsPreview"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "chatsPreview")
                     :params []
                     :js-response true
                     :on-success #(on-success ^js %)
@@ -15,14 +15,14 @@

 (fx/defn fetch-contacts-rpc
  [_ on-success]
-  {::json-rpc/call [{:method "wakuext_contacts"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "contacts")
                     :params []
                     :on-success #(on-success (map <-rpc %))
                     :on-failure #(log/error "failed to fetch contacts" %)}]})

 (fx/defn add
  [_ public-key nickname ens-name on-success]
-  {::json-rpc/call [{:method "wakuext_addContact"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "addContact")
                     :params [{:id public-key :nickname nickname :ensName ens-name}]
                     :js-response true
                     :on-success #(do
@@ -33,7 +33,7 @@

 (fx/defn set-nickname
  [_ public-key nickname on-success]
-  {::json-rpc/call [{:method "wakuext_setContactLocalNickname"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "setContactLocalNickname")
                     :params [{:id public-key :nickname nickname}]
                     :js-response true
                     :on-success #(do
@@ -43,14 +43,14 @@
                     :on-failure #(log/error "failed to set contact nickname " public-key nickname %)}]})

 (fx/defn block [_ contact-id on-success]
-  {::json-rpc/call [{:method "wakuext_blockContact"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "blockContact")
                     :params [contact-id]
                     :js-response true
                     :on-success on-success
                     :on-failure #(log/error "failed to block contact" % contact-id)}]})

 (fx/defn unblock [_ contact-id on-success]
-  {::json-rpc/call [{:method "wakuext_unblockContact"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "unblockContact")
                     :params [contact-id]
                     :on-success on-success
                     :js-response true
@@ -54,14 +54,14 @@
                               limit
                               on-success
                               on-failure]
-  {::json-rpc/call [{:method     "wakuext_chatMessages"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "chatMessages")
                     :params     [chat-id cursor limit]
                     :on-success (fn [result]
                                   (on-success (update result :messages #(map <-rpc %))))
                     :on-failure on-failure}]})

 (defn mark-seen-rpc [chat-id ids on-success]
-  {::json-rpc/call [{:method "wakuext_markMessagesSeen"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "markMessagesSeen")
                     :params [chat-id ids]
                     :on-success #(do
                                    (log/debug "successfully marked as seen" %)
@@ -69,19 +69,19 @@
                     :on-failure #(log/error "failed to get messages" %)}]})

 (defn delete-message-rpc [id]
-  {::json-rpc/call [{:method "wakuext_deleteMessage"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "deleteMessage")
                     :params [id]
                     :on-success #(log/debug "successfully deleted message" id)
                     :on-failure #(log/error "failed to delete message" % id)}]})

 (defn delete-messages-from-rpc [author]
-  {::json-rpc/call [{:method "wakuext_deleteMessagesFrom"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "deleteMessagesFrom")
                     :params [author]
                     :on-success #(log/debug "successfully deleted messages from" author)
                     :on-failure #(log/error "failed to delete messages from" % author)}]})

 (defn delete-messages-by-chat-id-rpc [chat-id]
-  {::json-rpc/call [{:method "wakuext_deleteMessagesByChatID"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "deleteMessagesByChatID")
                     :params [chat-id]
                     :on-success #(log/debug "successfully deleted messages by chat-id" chat-id)
                     :on-failure #(log/error "failed to delete messages by chat-id" % chat-id)}]})
@@ -17,7 +17,7 @@
                                     limit
                                     on-success
                                     on-failure]
-  {::json-rpc/call [{:method     "wakuext_chatPinnedMessages"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "chatPinnedMessages")
                     :params     [chat-id cursor limit]
                     :on-success (fn [result]
                                   (let [result (clojure.set/rename-keys result {:pinnedMessages :pinned-messages})]
@@ -25,7 +25,7 @@
                     :on-failure on-failure}]})

 (fx/defn send-pin-message [cofx pin-message]
-  {::json-rpc/call [{:method "wakuext_sendPinMessage"
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "sendPinMessage")
                     :params [(messages/->rpc pin-message)]
                     :on-success #(log/debug "successfully pinned message" pin-message)
                     :on-failure #(log/error "failed to pin message" % pin-message)}]})
@@ -24,7 +24,7 @@
                                limit
                                on-success
                                on-failure]
-  {::json-rpc/call [{:method     "wakuext_emojiReactionsByChatID"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "emojiReactionsByChatID")
                     :params     [chat-id cursor limit]
                     :on-success (fn [result]
                                   (on-success (map <-rpc result)))
@@ -46,6 +46,8 @@
                                           config/default-network))
      (update :wallet/visible-tokens rpc->visible-tokens)
      (update :pinned-mailservers rpc->pinned-mailservers)
+      (update :stickers/packs-installed rpc->stickers-packs)
+      (update :stickers/packs-pending set)
      (update :link-previews-enabled-sites set)
      (update :custom-bootnodes rpc->custom-bootnodes)
      (update :custom-bootnodes-enabled? rpc->custom-bootnodes)
@@ -33,6 +33,7 @@
             :dimensions/window                  (dimensions/window)
             :registry                           {}
             :visibility-status-updates          {}
+             :stickers/packs-owned               #{}
             :stickers/packs-pending             #{}
             :keycard                            {:nfc-enabled?   false
                                                  :pin            {:original     []
@@ -138,7 +138,7 @@
       #(re-frame/dispatch [::name-resolved username
                            (cond
                              (not public-key) :owned
-                              (and (string/ends-with? % "0000000000000000000000000000000000000000000000000000000000000000") (not custom-domain?))
+                              (string/ends-with? % "0000000000000000000000000000000000000000000000000000000000000000")
                              :invalid-ens
                              (= % public-key) :connected
                              :else :connected-with-different-key)
@@ -0,0 +1,29 @@
+(ns status-im.ethereum.eip165
+  "Utility function related to [EIP165](https://eips.ethereum.org/EIPS/eip-165)"
+  (:require [status-im.ethereum.abi-spec :as abi-spec]
+            [status-im.ethereum.json-rpc :as json-rpc]))
+
+(def supports-interface-hash "0x01ffc9a7")
+(def marker-hash "0xffffffff")
+
+(defn supports-interface?
+  [contract hash cb]
+  (json-rpc/eth-call
+   {:contract contract
+    :method "supportsInterface(bytes4)"
+    :params [hash]
+    :on-success cb}))
+
+(defn supports?
+  "Calls cb with true if `supportsInterface` is supported by this contract.
+   See EIP for details."
+  [contract cb]
+  (supports-interface?
+   contract
+   supports-interface-hash
+   #(if (true? (abi-spec/hex-to-boolean %))
+      (supports-interface? contract
+                           marker-hash
+                           (fn [response]
+                             (cb (false? (abi-spec/hex-to-boolean response)))))
+      (cb false))))
@@ -0,0 +1,23 @@
+(ns status-im.ethereum.erc721
+  "
+  Helper functions to interact with [ERC721](https://eips.ethereum.org/EIPS/eip-721) smart contract
+  "
+  (:require [status-im.ethereum.json-rpc :as json-rpc]))
+
+(defn token-of-owner-by-index
+  [contract address index cb]
+  (json-rpc/eth-call
+   {:contract contract
+    :method "tokenOfOwnerByIndex(address,uint256)"
+    :params [address index]
+    :outputs ["uint256"]
+    :on-success (fn [[token]] (cb token))}))
+
+(defn token-uri
+  [contract tokenId cb]
+  (json-rpc/eth-call
+   {:contract contract
+    :method "tokenURI(uint256)"
+    :params [tokenId]
+    :outputs ["string"]
+    :on-success (fn [[uri]] (cb uri))}))
@@ -2,11 +2,247 @@
  (:require [clojure.string :as string]
            [re-frame.core :as re-frame]
            [status-im.ethereum.abi-spec :as abi-spec]
+            [status-im.ethereum.decode :as decode]
            [status-im.native-module.core :as status]
+            [status-im.utils.money :as money]
            [status-im.utils.types :as types]
            [status-im.utils.utils :as utils]
            [taoensso.timbre :as log]))

+(def json-rpc-api
+  {"eth_call" {}
+   "eth_getBalance"
+   {:on-result money/bignumber}
+   "eth_estimateGas"
+   {:on-result #(money/bignumber (if (= (int %) 21000) % (int (* % 1.2))))}
+   "eth_gasPrice"
+   {:on-result money/bignumber}
+   "eth_getBlockByHash"
+   {:on-result #(-> (update % :number decode/uint)
+                    (update :timestamp decode/uint))}
+   "eth_getTransactionByHash" {}
+   "eth_getTransactionReceipt" {}
+   "eth_getBlockByNumber" {}
+   "eth_maxPriorityFeePerGas" {}
+   "eth_newBlockFilter" {:subscription? true}
+   "eth_newFilter" {:subscription? true}
+   "eth_getCode" {}
+   "eth_syncing" {}
+   "eth_feeHistory" {}
+   "ens_publicKeyOf" {}
+   "ens_addressOf" {}
+   "ens_expireAt" {}
+   "ens_ownerOf" {}
+   "ens_contentHash" {}
+   "ens_resourceURL" {}
+   "ens_registerPrepareTx" {}
+   "ens_setPubKeyPrepareTx" {}
+   "net_version" {}
+   "web3_clientVersion" {}
+   "shh_generateSymKeyFromPassword" {}
+   "shh_getSymKey" {}
+   "shh_markTrustedPeer" {}
+   "waku_generateSymKeyFromPassword" {}
+   "waku_getSymKey" {}
+   "waku_markTrustedPeer" {}
+   "wakuext_post" {}
+   "wakuext_requestAllHistoricMessagesWithRetries" {}
+   "wakuext_toggleUseMailservers" {}
+   "wakuext_editMessage" {}
+   "wakuext_deleteMessageAndSend" {}
+   "wakuext_fillGaps" {}
+   "wakuext_syncChatFromSyncedFrom" {}
+   "wakuext_createPublicChat" {}
+   "wakuext_createOneToOneChat" {}
+   "wakuext_createProfileChat" {}
+   "wakuext_startMessenger" {}
+   "wakuext_sendPairInstallation" {}
+   "wakuext_syncDevices" {}
+   "wakuext_syncBookmark" {}
+   "wakuext_requestMessages" {}
+   "wakuext_sendDirectMessage" {}
+   "wakuext_sendPublicMessage" {}
+   "wakuext_enableInstallation" {}
+   "wakuext_disableInstallation" {}
+   "wakuext_sendChatMessage" {}
+   "wakuext_sendChatMessages" {}
+   "wakuext_backupData" {}
+   "wakuext_confirmJoiningGroup" {}
+   "wakuext_addAdminsToGroupChat" {}
+   "wakuext_addMembersToGroupChat" {}
+   "wakuext_removeMemberFromGroupChat" {}
+   "wakuext_leaveGroupChat" {}
+   "wakuext_changeGroupChatName" {}
+   "wakuext_createGroupChatWithMembers" {}
+   "wakuext_createGroupChatFromInvitation" {}
+   "wakuext_reSendChatMessage" {}
+   "wakuext_getOurInstallations" {}
+   "wakuext_setInstallationMetadata" {}
+   "wakuext_loadFilters" {}
+   "wakuext_loadFilter" {}
+   "wakuext_removeFilters" {}
+   "wakuext_sendContactUpdate" {}
+   "wakuext_sendContactUpdates" {}
+   "wakuext_chatsPreview" {}
+   "wakuext_activeChats" {}
+   "wakuext_chat" {}
+   "wakuext_addSystemMessages" {}
+   "wakuext_deleteMessagesFrom" {}
+   "wakuext_deleteMessagesByChatID" {}
+   "wakuext_deleteMessage" {}
+   "wakuext_markMessagesSeen" {}
+   "wakuext_markAllRead" {}
+   "wakuext_markAllReadInCommunity" {}
+   "wakuext_confirmMessagesProcessedByID" {}
+   "wakuext_chatMessages" {}
+   "wakuext_saveChat" {}
+   "wakuext_muteChat" {}
+   "wakuext_unmuteChat" {}
+   "wakuext_contacts" {}
+   "wakuext_removeContact" {}
+   "wakuext_setContactLocalNickname" {}
+   "wakuext_clearHistory" {}
+   "wakuext_prepareContent" {}
+   "wakuext_blockContact" {}
+   "wakuext_unblockContact" {}
+   "wakuext_addContact" {}
+   "wakuext_updateMailservers" {}
+   "wakuext_sendEmojiReaction" {}
+   "wakuext_disconnectActiveMailserver" {}
+   "wakuext_sendEmojiReactionRetraction" {}
+   "wakuext_emojiReactionsByChatID" {}
+   "wakuext_getLinkPreviewWhitelist" {}
+   "wakuext_getLinkPreviewData" {}
+   "wakuext_requestCommunityInfoFromMailserver" {}
+   "wakuext_deactivateChat" {}
+   "wakuext_sendPinMessage" {}
+   "wakuext_setPinnedMailservers" {}
+   "wakuext_chatPinnedMessages" {}
+   ;;TODO not used anywhere?
+   "wakuext_deleteChat" {}
+   "wakuext_saveContact" {}
+   "wakuext_verifyENSNames" {}
+   "wakuext_requestAddressForTransaction" {}
+   "wakuext_requestTransaction" {}
+   "wakuext_acceptRequestAddressForTransaction" {}
+   "wakuext_declineRequestAddressForTransaction" {}
+   "wakuext_declineRequestTransaction" {}
+   "wakuext_sendTransaction" {}
+   "wakuext_acceptRequestTransaction" {}
+   "wakuext_signMessageWithChatKey" {}
+   "wakuext_sendGroupChatInvitationRequest" {}
+   "wakuext_sendGroupChatInvitationRejection" {}
+   "wakuext_getGroupChatInvitations" {}
+   "wakuext_registerForPushNotifications" {}
+   "wakuext_unregisterFromPushNotifications" {}
+   "wakuext_enablePushNotificationsFromContactsOnly" {}
+   "wakuext_disablePushNotificationsFromContactsOnly" {}
+   "wakuext_startPushNotificationsServer" {}
+   "wakuext_stopPushNotificationsServer" {}
+   "wakuext_disableSendingNotifications" {}
+   "wakuext_enableSendingNotifications" {}
+   "wakuext_addPushNotificationsServer" {}
+   "wakuext_getPushNotificationsServers" {}
+   "wakuext_enablePushNotificationsBlockMentions" {}
+   "wakuext_disablePushNotificationsBlockMentions" {}
+   "wakuext_unreadActivityCenterNotificationsCount" {}
+   "wakuext_setUserStatus" {}
+   "wakuext_statusUpdates" {}
+   "multiaccounts_getIdentityImages" {}
+   "multiaccounts_getIdentityImage" {}
+   "multiaccounts_storeIdentityImage" {}
+   "multiaccounts_storeIdentityImageFromURL" {}
+   "multiaccounts_deleteIdentityImage" {}
+   "wakuext_changeIdentityImageShowTo" {}
+   "wakuext_createCommunity" {}
+   "wakuext_editCommunity" {}
+   "wakuext_createCommunityChat" {}
+   "wakuext_editCommunityChat" {}
+   "wakuext_inviteUsersToCommunity" {}
+   "wakuext_shareCommunity" {}
+   "wakuext_removeUserFromCommunity" {}
+   "wakuext_banUserFromCommunity" {}
+   "wakuext_requestToJoinCommunity" {}
+   "wakuext_acceptRequestToJoinCommunity" {}
+   "wakuext_declineRequestToJoinCommunity" {}
+   "wakuext_pendingRequestsToJoinForCommunity" {}
+   "wakuext_joinCommunity" {}
+   "wakuext_leaveCommunity" {}
+   "wakuext_communities" {}
+   "wakuext_importCommunity" {}
+   "wakuext_exportCommunity" {}
+   "wakuext_createCommunityCategory" {}
+   "wakuext_reorderCommunityCategories" {}
+   "wakuext_reorderCommunityChat" {}
+   "wakuext_editCommunityCategory" {}
+   "wakuext_deleteCommunityCategory" {}
+   "wakuext_deleteCommunityChat" {}
+   "wakuext_ensVerified" {}
+   "wakuext_dismissActivityCenterNotifications" {}
+   "wakuext_acceptActivityCenterNotifications" {}
+   "wakuext_dismissAllActivityCenterNotifications" {}
+   "wakuext_acceptAllActivityCenterNotifications" {}
+   "wakuext_markAllActivityCenterNotificationsRead" {}
+   "wakuext_activityCenterNotifications" {}
+   "status_chats" {}
+   "rpcstats_getStats" {}
+   "rpcstats_reset" {}
+   "localnotifications_switchWalletNotifications" {}
+   "localnotifications_notificationPreferences" {}
+   "wallet_setInitialBlocksRange" {}
+   "wallet_getTransfersByAddress" {}
+   "wallet_watchTransaction" {}
+   "wallet_checkRecentHistory" {}
+   "wallet_getCachedBalances" {}
+   "wallet_storePendingTransaction" {}
+   "wallet_deletePendingTransaction" {}
+   "wallet_getPendingTransactions" {}
+   "wallet_getTokensBalances" {}
+   "wallet_getCustomTokens" {}
+   "wallet_addCustomToken" {}
+   "wallet_addFavourite" {}
+   "wallet_getFavourites" {}
+   "wallet_deleteCustomToken" {}
+   "wallet_getCryptoOnRamps" {}
+   "wallet_getOpenseaCollectionsByOwner" {}
+   "wallet_getOpenseaAssetsByOwnerAndCollection" {}
+   "wallet_loadTransferByHash" {}
+   "wallet_getTokens" {};, %* [chainId]}
+   "wallet_getTokensBalancesForChainIDs" {};, %* [@[chainId], accounts, tokens]
+   "browsers_getBrowsers" {}
+   "browsers_addBrowser" {}
+   "browsers_deleteBrowser" {}
+   "browsers_getBookmarks" {}
+   "browsers_storeBookmark" {}
+   "browsers_updateBookmark" {}
+   "browsers_removeBookmark" {}
+   "mailservers_getMailserverRequestGaps" {}
+   "mailservers_addMailserverRequestGaps" {}
+   "mailservers_deleteMailserverRequestGaps" {}
+   "mailservers_deleteMailserverRequestGapsByChatID" {}
+   "permissions_addDappPermissions" {}
+   "permissions_getDappPermissions" {}
+   "permissions_deleteDappPermissions" {}
+   "settings_saveSetting" {}
+   "settings_getSettings" {}
+   "accounts_getAccounts" {}
+   "accounts_saveAccounts" {}
+   "accounts_deleteAccount" {}
+   "mailservers_ping" {}
+   "mailservers_addMailserver" {}
+   "mailservers_getMailservers" {}
+   "mailservers_deleteMailserver" {}
+   "mailservers_addMailserverTopic" {}
+   "mailservers_addMailserverTopics" {}
+   "mailservers_getMailserverTopics" {}
+   "mailservers_deleteMailserverTopic" {}
+   "mailservers_addChatRequestRange" {}
+   "mailservers_addChatRequestRanges" {}
+   "mailservers_getChatRequestRanges" {}
+   "mailservers_deleteChatRequestRange" {}
+   "appmetrics_saveAppMetrics" {}
+   "appmetrics_getAppMetrics" {}})
+
 (defn on-error-retry
  [call-method {:keys [method number-of-retries delay on-error] :as arg}]
  (if (pos? number-of-retries)
@@ -14,35 +250,62 @@
      (let [updated-delay (if delay
                            (min 2000 (* 2 delay))
                            50)]
-        (log/debug "[on-error-retry]" method "number-of-retries" number-of-retries "delay" delay "error" error)
+        (log/debug "[on-error-retry]" method
+                   "number-of-retries" number-of-retries
+                   "delay" delay
+                   "error" error)
        (utils/set-timeout #(call-method (-> arg
                                             (update :number-of-retries dec)
                                             (assoc :delay updated-delay)))
                           updated-delay)))
    on-error))

+(defn call-ext-method [method]
+  (str "wakuext_" method))
+
 (defn call
  [{:keys [method params on-success on-error js-response] :as arg}]
-  (let [params (or params [])
-        on-error (or on-error (on-error-retry call arg) #(log/warn :json-rpc/error method :error % :params params))]
-    (status/call-private-rpc
-     (types/clj->json {:jsonrpc "2.0"
-                       :id      1
-                       :method  method
-                       :params  params})
-     (fn [response]
-       (if (string/blank? response)
-         (on-error {:message "Blank response"})
-         (let [response-js (types/json->js response)]
-           (if (.-error response-js)
-             (on-error (types/js->clj (.-error response-js)))
-             (on-success (if js-response
-                           (.-result response-js)
-                           (types/js->clj (.-result response-js)))))))))))
+  (if-let [method-options (json-rpc-api method)]
+    (let [params (or params [])
+          {:keys [id on-result subscription?]
+           :or {on-result identity
+                id 1}} method-options
+          on-error (or
+                    on-error
+                    (on-error-retry call arg)
+                    #(log/warn :json-rpc/error method :error % :params params))]
+      (if (nil? method)
+        (do
+          (log/error :json-rpc/method-not-found method)
+          (on-error :json-rpc/method-not-found))
+        (status/call-private-rpc
+         (types/clj->json {:jsonrpc "2.0"
+                           :id      id
+                           :method  (if subscription?
+                                      "eth_subscribeSignal"
+                                      method)
+                           :params  (if subscription?
+                                      [method params]
+                                      params)})
+         (fn [response]
+           (if (string/blank? response)
+             (on-error {:message "Blank response"})
+             (let [response-js (types/json->js response)]
+               (if (.-error response-js)
+                 (on-error (types/js->clj (.-error response-js)))
+                 (if subscription?
+                   (re-frame/dispatch
+                    [:ethereum.callback/subscription-success
+                     (types/js->clj (.-result response-js)) on-success])
+                   (on-success (on-result (if js-response
+                                            (.-result response-js)
+                                            (types/js->clj (.-result response-js)))))))))))))
+    (log/warn "method" method "not found" arg)))

 (defn eth-call
  [{:keys [contract method params outputs on-success block]
-    :or {block "latest" params []}
+    :or {block "latest"
+         params []}
    :as arg}]
  (call {:method "eth_call"
         :params [{:to contract
@@ -57,8 +320,15 @@
         :on-error
         (on-error-retry eth-call arg)}))

+;; effects
 (re-frame/reg-fx
 ::call
 (fn [params]
   (doseq [param params]
-     (call param))))
+     (call param))))
+
+(re-frame/reg-fx
+ ::eth-call
+ (fn [params]
+   (doseq [param params]
+     (eth-call param))))
@@ -6,8 +6,23 @@
            [status-im.utils.fx :as fx]
            [taoensso.timbre :as log]))

+(fx/defn handle-signal
+  [cofx {:keys [subscription_id data] :as event}]
+  (if-let [handler (get-in cofx [:db :ethereum/subscriptions subscription_id])]
+    (handler data)
+    (log/warn ::unknown-subscription :event event)))
+
+(fx/defn handle-error
+  [cofx {:keys [subscription_id data] :as event}]
+  (log/error ::error event))
+
+(fx/defn register-subscription
+  {:events [:ethereum.callback/subscription-success]}
+  [{:keys [db]} id handler]
+  {:db (assoc-in db [:ethereum/subscriptions id] handler)})
+
 (fx/defn new-transfers
-  [cofx block-number accounts]
+  [{:keys [db] :as cofx} block-number accounts]
  (log/debug "[wallet-subs] new-transfers"
             "accounts" accounts
             "block" block-number)
@@ -26,7 +41,7 @@
      (assoc :dispatch event))))

 (fx/defn recent-history-fetching-ended
-  [{:keys [db]} {:keys [accounts blockNumber]}]
+  [{:keys [db] :as cofx} {:keys [accounts blockNumber]}]
  (log/debug "[wallet-subs] recent-history-fetching-ended"
             "accounts" accounts
             "block" blockNumber)
@@ -61,11 +76,11 @@
   (wallet.core/after-checking-history)))

 (fx/defn non-archival-node-detected
-  [{:keys [db]} _]
+  [{:keys [db] :as cofx} _]
  {:db (assoc db :wallet/non-archival-node true)})

 (fx/defn new-wallet-event
-  [cofx {:keys [type blockNumber accounts] :as event}]
+  [cofx {:keys [type blockNumber accounts newTransactions] :as event}]
  (log/info "[wallet-subs] new-wallet-event"
            "event-type" type
            "blockNumber" blockNumber
@@ -63,9 +63,7 @@
            [status-im.multiaccounts.login.core :as login.core]
            [status-im.signing.core :as signing]
            status-im.wallet-connect.core
-            status-im.wallet-connect-legacy.core
-            status-im.navigation2
-            status-im.navigation2.core))
+            status-im.wallet-connect-legacy.core))

 (re-frame/reg-fx
 :dismiss-keyboard
@@ -8,8 +8,7 @@
            [status-im.navigation :as navigation]
            [status-im.utils.fx :as fx]
            [status-im.constants :as constants]
-            [status-im.i18n.i18n :as i18n]
-            [status-im.notifications-center.core :as notification-center]))
+            [status-im.i18n.i18n :as i18n]))

 (fx/defn navigate-chat-updated
  {:events [:navigate-chat-updated]}
@@ -21,11 +20,9 @@

 (fx/defn handle-chat-removed
  {:events [:chat-removed]}
-  [cofx response]
-  (fx/merge cofx
-            {:dispatch-n [[:sanitize-messages-and-process-response response]
-                          [:pop-to-root-tab :chat-stack]]}
-            (notification-center/get-activity-center-notifications-count)))
+  [_ response]
+  {:dispatch-n [[:sanitize-messages-and-process-response response]
+                [:pop-to-root-tab :chat-stack]]})

 (fx/defn handle-chat-update
  {:events [:chat-updated]}
@@ -37,7 +34,7 @@
  "Format group update message and sign membership"
  {:events [:group-chats.ui/remove-member-pressed]}
  [_ chat-id member]
-  {::json-rpc/call [{:method     "wakuext_removeMemberFromGroupChat"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "removeMemberFromGroupChat")
                     :params     [nil chat-id member]
                     :js-response true
                     :on-success #(re-frame/dispatch [:chat-updated %])}]})
@@ -45,7 +42,7 @@
 (fx/defn join-chat
  {:events [:group-chats.ui/join-pressed]}
  [_ chat-id]
-  {::json-rpc/call [{:method     "wakuext_confirmJoiningGroup"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "confirmJoiningGroup")
                     :params     [chat-id]
                     :js-response true
                     :on-success #(re-frame/dispatch [:chat-updated %])}]})
@@ -55,7 +52,7 @@
   :interceptors [(re-frame/inject-cofx :random-guid-generator)]}
  [{:keys [db] :as cofx} group-name]
  (let [selected-contacts (:group/selected-contacts db)]
-    {::json-rpc/call [{:method     "wakuext_createGroupChatWithMembers"
+    {::json-rpc/call [{:method     (json-rpc/call-ext-method "createGroupChatWithMembers")
                       :params     [nil group-name (into [] selected-contacts)]
                       :js-response true
                       :on-success #(re-frame/dispatch [:chat-updated %])}]}))
@@ -65,7 +62,7 @@
  (if (get-in cofx [:db :chats chat-id])
    {:dispatch-n [[:accept-all-activity-center-notifications-from-chat chat-id]
                  [:chat.ui/navigate-to-chat chat-id]]}
-    {::json-rpc/call [{:method     "wakuext_createGroupChatFromInvitation"
+    {::json-rpc/call [{:method     (json-rpc/call-ext-method "createGroupChatFromInvitation")
                       :params     [chat-name chat-id invitation-admin]
                       :js-response true
                       :on-success #(re-frame/dispatch [:chat-updated %])}]}))
@@ -73,7 +70,7 @@
 (fx/defn make-admin
  {:events [:group-chats.ui/make-admin-pressed]}
  [_ chat-id member]
-  {::json-rpc/call [{:method     "wakuext_addAdminsToGroupChat"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "addAdminsToGroupChat")
                     :params     [nil chat-id [member]]
                     :js-response true
                     :on-success #(re-frame/dispatch [:chat-updated %])}]})
@@ -82,7 +79,7 @@
  "Add members to a group chat"
  {:events [:group-chats.ui/add-members-pressed]}
  [{{:keys [current-chat-id selected-participants]} :db :as cofx}]
-  {::json-rpc/call [{:method     "wakuext_addMembersToGroupChat"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "addMembersToGroupChat")
                     :params     [nil current-chat-id selected-participants]
                     :js-response true
                     :on-success #(re-frame/dispatch [:chat-updated %])}]})
@@ -92,7 +89,7 @@
  {:events [:group-chats.ui/add-members-from-invitation]}
  [{{:keys [current-chat-id] :as db} :db :as cofx} id participant]
  {:db             (assoc-in db [:group-chat/invitations id :state] constants/invitation-state-approved)
-   ::json-rpc/call [{:method     "wakuext_addMembersToGroupChat"
+   ::json-rpc/call [{:method     (json-rpc/call-ext-method "addMembersToGroupChat")
                     :params     [nil current-chat-id [participant]]
                     :js-response true
                     :on-success #(re-frame/dispatch [:chat-updated %])}]})
@@ -101,7 +98,7 @@
  "Leave chat"
  {:events [:group-chats.ui/leave-chat-confirmed]}
  [{:keys [db] :as cofx} chat-id]
-  {::json-rpc/call [{:method     "wakuext_leaveGroupChat"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "leaveGroupChat")
                     :params     [nil chat-id true]
                     :js-response true
                     :on-success #(re-frame/dispatch [:chat-removed %])}]})
@@ -126,7 +123,7 @@
  [{:keys [db] :as cofx} chat-id new-name]
  (when (valid-name? new-name)
    {:db             (assoc-in db [:chats chat-id :name] new-name)
-     ::json-rpc/call [{:method     "wakuext_changeGroupChatName"
+     ::json-rpc/call [{:method     (json-rpc/call-ext-method "changeGroupChatName")
                       :params     [nil chat-id new-name]
                       :js-response true
                       :on-success #(re-frame/dispatch [:chat-updated %])}]}))
@@ -148,7 +145,7 @@
  (let [{:keys [invitation-admin]} (get chats current-chat-id)
        message (get-in db [:chat/memberships current-chat-id :message])]
    {:db             (assoc-in db [:chat/memberships current-chat-id] nil)
-     ::json-rpc/call [{:method     "wakuext_sendGroupChatInvitationRequest"
+     ::json-rpc/call [{:method     (json-rpc/call-ext-method "sendGroupChatInvitationRequest")
                       :params     [nil current-chat-id invitation-admin message]
                       :js-response true
                       :on-success #(re-frame/dispatch [:sanitize-messages-and-process-response %])}]}))
@@ -157,7 +154,7 @@
  "Send group chat membership rejection"
  {:events [:send-group-chat-membership-rejection]}
  [cofx invitation-id]
-  {::json-rpc/call [{:method     "wakuext_sendGroupChatInvitationRejection"
+  {::json-rpc/call [{:method     (json-rpc/call-ext-method "sendGroupChatInvitationRejection")
                     :params     [nil invitation-id]
                     :js-response true
                     :on-success #(re-frame/dispatch [:sanitize-messages-and-process-response %])}]})
@@ -18,6 +18,7 @@
            [status-im.popover.core :as popover]
            [status-im.communities.core :as communities]
            [status-im.transport.core :as transport]
+            [status-im.stickers.core :as stickers]
            [status-im.mobile-sync-settings.core :as mobile-network]
            [status-im.utils.fx :as fx]
            [status-im.utils.keychain.core :as keychain]
@@ -142,13 +143,13 @@
  {:events [::initialize-wallet]}
  [{:keys [db] :as cofx} accounts tokens custom-tokens
   favourites scan-all-tokens? new-account?]
+  (check-invalid-ens cofx)
  (fx/merge
   cofx
   {:db                          (assoc db :multiaccount/accounts
                                        (rpc->accounts accounts))
    ;; NOTE: Local notifications should be enabled only after wallet was started
    ::enable-local-notifications nil}
-   (check-invalid-ens)
   (wallet/initialize-tokens tokens custom-tokens)
   (wallet/initialize-favourites favourites)
   (wallet/get-pending-transactions)
@@ -346,7 +347,7 @@

 (fx/defn get-group-chat-invitations [_]
  {::json-rpc/call
-   [{:method     "wakuext_getGroupChatInvitations"
+   [{:method     (json-rpc/call-ext-method "getGroupChatInvitations")
     :on-success #(re-frame/dispatch [::initialize-invitations %])}]})

 (fx/defn initialize-communities-enabled
@@ -414,11 +415,6 @@
           (when (= stored-key-uid key-uid)
             (re-frame/dispatch [:chat.ui/navigate-to-chat chat-id])))))))))

-(fx/defn check-last-chat
-  {:events [::check-last-chat]}
-  [{:keys [db]}]
-  {::open-last-chat (get-in db [:multiaccount :key-uid])})
-
 (fx/defn get-chats-callback
  {:events [::get-chats-callback]}
  [{:keys [db] :as cofx}]
@@ -444,6 +440,7 @@
              (initialize-transactions-management-enabled)
              (check-network-version network-id)
              (contact/initialize-contacts)
+              (stickers/init-stickers-packs)
              (initialize-browser)
              (mobile-network/on-network-status-change)
              (get-group-chat-invitations)
@@ -1,13 +1,12 @@
 (ns status-im.multiaccounts.update.core
-  (:require [status-im.constants :as constants]
-            [status-im.ethereum.json-rpc :as json-rpc]
+  (:require [status-im.ethereum.json-rpc :as json-rpc]
            [status-im.utils.fx :as fx]
            [taoensso.timbre :as log]))

 (fx/defn send-multiaccount-update [{:keys [db] :as cofx}]
  (let [multiaccount (:multiaccount db)
        {:keys [name preferred-name address]} multiaccount]
-    {::json-rpc/call [{:method "wakuext_sendContactUpdates"
+    {::json-rpc/call [{:method (json-rpc/call-ext-method "sendContactUpdates")
                       :params [(or preferred-name name) ""]
                       :on-success #(log/debug "sent contact update")}]}))

@@ -43,15 +42,7 @@

 (fx/defn optimistic
  [{:keys [db] :as cofx} setting setting-value]
-  (let [current-multiaccount (:multiaccount db)
-        setting-value (if (= :currency setting)
-                        (keyword setting-value)
-                        setting-value)
-        db (if (= :stickers/packs-installed setting)
-             ;;updating :stickers/packs for installed stickers
-             (let [packs-installed-keys (keys (js->clj setting-value))]
-               (reduce #(assoc-in %1 [:stickers/packs %2 :status] constants/sticker-pack-status-installed) db packs-installed-keys))
-             db)]
+  (let [current-multiaccount (:multiaccount db)]
    {:db (if setting-value
           (assoc-in db [:multiaccount setting] setting-value)
           (update db :multiaccount dissoc setting))}))
@@ -13,8 +13,7 @@
   [status-im.ui.screens.views :as views]
   [status-im.utils.fx :as fx]
   [status-im.utils.platform :as platform]
-   [taoensso.timbre :as log]
-   [status-im.multiaccounts.login.core :as login-core]))
+   [taoensso.timbre :as log]))

 (def debug? ^boolean js/goog.DEBUG)

@@ -27,9 +26,6 @@
 (defonce modals (atom []))
 (defonce dissmissing (atom false))

-(defonce set-navigation-default-options
-  (.setDefaultOptions Navigation (clj->js {:layout {:orientation "portrait"}})))
-
 ;; REGISTER COMPONENT (LAZY)
 (defn reg-comp [key]
  (log/debug "reg-comp" key)
@@ -207,8 +203,7 @@
                                    (re-frame/dispatch-sync [::set-multiaccount-root])
                                    (when @root-id
                                      (reset! root-comp-id @root-id)
-                                      (.setRoot Navigation (clj->js (get (roots/roots) @root-id)))
-                                      (re-frame/dispatch [::login-core/check-last-chat])))
+                                      (.setRoot Navigation (clj->js (get (roots/roots) @root-id)))))
                                  (.hide ^js splash-screen))))

 (defn get-screen-component [comp]
@@ -305,7 +300,7 @@
                              :id      comp
                              :options (merge (cond-> (roots/status-bar-options)
                                                (and platform/android? (not (quo.colors/dark?)))
-                                                (assoc-in [:statusBar :backgroundColor] "#99999A"))
+                                                (assoc-in [:statusBar :translucent] true))
                                              {:layout  {:componentBackgroundColor (if platform/android?
                                                                                     (:backdrop @quo.colors/theme)
                                                                                     "transparent")}
@@ -13,8 +13,6 @@

 (defn topbar-options []
  {:noBorder   true
-   :scrollEdgeAppearance {:active   false
-                          :noBorder true}
   :elevation  0
   :title {:color colors/black}
   :rightButtonColor colors/black
@@ -116,7 +114,6 @@
                                           :id      :intro
                                           :options (status-bar-options)}}]
                   :options  (merge (default-root)
-                                    (status-bar-options)
                                    {:topBar (assoc (topbar-options) :visible false)})}}}

   ;; ONBOARDING
@@ -126,7 +123,6 @@
                                           :id      :get-your-keys
                                           :options (status-bar-options)}}]
                   :options  (merge (default-root)
-                                    (status-bar-options)
                                    {:topBar (assoc (topbar-options) :elevation 0 :noBorder true :animate false)})}}}

   ;;PROGRESS
@@ -147,7 +143,6 @@
                                           :id      :login
                                           :options (get-screen-options :login)}}]
                   :options  (merge (default-root)
-                                    (status-bar-options)
                                    {:topBar (topbar-options)})}}}

   :multiaccounts-keycard
@@ -159,7 +154,6 @@
                                           :id      :keycard-login-pin
                                           :options (get-screen-options :keycard-login-pin)}}]
                   :options  (merge (default-root)
-                                    (status-bar-options)
                                    {:topBar (topbar-options)})}}}

   ;;WELCOME
@@ -168,7 +162,6 @@
                                           :id      :welcome
                                           :options (status-bar-options)}}]
                   :options  (merge (default-root)
-                                    (status-bar-options)
                                    {:topBar (assoc (topbar-options) :visible false)})}}}

   ;;NOTIFICATIONS
@@ -177,7 +170,6 @@
                                           :id      :onboarding-notification
                                           :options (status-bar-options)}}]
                   :options  (merge (default-root)
-                                    (status-bar-options)
                                    {:topBar (assoc (topbar-options) :visible false)})}}}

   ;; TERMS OF SERVICE
@@ -186,5 +178,4 @@
                                           :id      :force-accept-tos
                                           :options (get-screen-options :force-accept-tos)}}]
                   :options  (merge (default-root)
-                                    (status-bar-options)
                                    {:topBar (assoc (topbar-options) :visible false)})}}}})
@@ -1,49 +0,0 @@
-(ns status-im.navigation2
-  (:require [status-im.utils.fx :as fx]
-            [status-im.utils.datetime :as datetime]))
-
-(def parent-stack (atom :home-stack))
-
-(fx/defn init-root-nav2
-  {:events [:init-root-nav2]}
-  [_ root-id]
-  {:init-root-fx-nav2 root-id})
-
-(fx/defn open-modal-nav2
-  {:events [:open-modal-nav2]}
-  [_ modal]
-  {:open-modal-fx-nav2 modal})
-
-(fx/defn close-modal-nav2
-  {:events [:close-modal-nav2]}
-  [_ modal]
-  {:close-modal-fx-nav2 modal})
-
-(defn navigate-from-home-stack [go-to-view-id id db]
-  (reset! parent-stack go-to-view-id)
-  {:navigate-to-fx-nav2 [go-to-view-id id]
-   :db (assoc-in db [:navigation2/navigation2-stacks id] {:type  go-to-view-id
-                                                          :id    id
-                                                          :clock (datetime/timestamp)})})
-
-(defn navigate-from-switcher [go-to-view-id id db from-home?]
-  (reset! parent-stack go-to-view-id)
-  {:navigate-from-switcher-fx [go-to-view-id id from-home?]
-   :db (assoc-in db [:navigation2/navigation2-stacks id] {:type  go-to-view-id
-                                                          :id    id
-                                                          :clock (datetime/timestamp)})})
-
-(fx/defn navigate-to-nav2
-  {:events [:navigate-to-nav2]}
-  [{:keys [db] :as cofx} go-to-view-id id screen-params from-switcher?]
-  (let [view-id     (:view-id db)
-        stacks      (:navigation2/navigation2-stacks db)
-        from-home?  (= view-id :home-stack)]
-    (if from-switcher?
-      (navigate-from-switcher go-to-view-id id db from-home?)
-      (if from-home?
-        (navigate-from-home-stack go-to-view-id id db)
-        ;; TODO(parvesh) - new stacks created from other screens should be stacked on current stack, instead of creating new entry
-        (navigate-from-home-stack go-to-view-id id db)))))
-
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pavloburykh	8427a4cc16	again some more fixing id700747	2022-03-30 15:54:29 +03:00
pavloburykh	6a31dc7aa7	some more fixing id700747	2022-03-30 15:28:44 +03:00
pavloburykh	214ce62d4d	more fixing id700747	2022-03-30 15:15:53 +03:00
pavloburykh	c24966d1a9	fixing id700747	2022-03-30 13:24:54 +03:00
pavloburykh	d50324d8e6	fixing tests 700747 and 700759	2022-03-29 15:46:38 +03:00
pavloburykh	880858690a	removed accidentaly added git line	2022-03-28 14:08:23 +03:00
pavloburykh	3f0435a374	changed common_password to qwerty1234	2022-03-28 14:02:48 +03:00