moved test_chat_gap to 1_1 medium group

[#13173] move stickers business logic to status-go

Signed-off-by: andrey <motor4ik@gmail.com>

.env

@@ -34,3 +34,4 @@ COLLECTIBLES_ENABLED=1
 COMMANDS_ENABLED=1
 TWO_MINUTES_SYNCING=1
 SWAP_ENABLED=1
+STICKERS_TEST_ENABLED=1

.env.e2e

@@ -34,3 +34,4 @@ COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
+STICKERS_TEST_ENABLED=1

.env.jenkins

@@ -37,3 +37,4 @@ METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 ENABLE_QUO_PREVIEW=1
+STICKERS_TEST_ENABLED=1

RELEASES.md

@@ -1,3 +1,49 @@
+## 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

android/app/src/debug/AndroidManifest.xml

@@ -2,7 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <!-- 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"/>
 
     <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
 </manifest>

android/app/src/pr/AndroidManifest.xml

@@ -3,5 +3,7 @@
 
     <!-- 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>

android/app/src/release/AndroidManifest.xml

@@ -3,5 +3,7 @@
 
     <!-- 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>

android/build.gradle

@@ -17,12 +17,12 @@ buildscript {
     repositories {
         flatDir { dirs "libs", "${rootDir}/app/libs" }
         google()
-        jcenter()
+        mavenCentral()
     }
     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,27 +45,22 @@ 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()
-        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()
-        jcenter()
-
-        // for geth, function, and status-go
+        // 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
+        google()
+        mavenCentral()
         maven { url "https://www.jitpack.io" }
     }
 }

ci/Jenkinsfile.android

@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.3.5'
+library 'status-jenkins-lib@v1.4.1'
 
 pipeline {
-  agent { label 'linux && x86_64 && nix-2.3' }
+  agent { label 'linux && x86_64 && nix-2.8' }
 
   options {
     timestamps()

ci/Jenkinsfile.combined

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

ci/Jenkinsfile.ios

@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.3.5'
+library 'status-jenkins-lib@v1.4.1'
 
 pipeline {
-  agent { label 'macos && x86_64 && nix-2.3 && xcode-12.5' }
+  agent { label 'macos && x86_64 && nix-2.8 && xcode-13.3' }
 
   parameters {
     string(

ci/Jenkinsfile.nix-cache

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.3.5'
+library 'status-jenkins-lib@v1.4.1'
 
 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-closure -v \
-                  --to ${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST}
+                | xargs nix copy \
+                  --to ssh-ng://${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST}
             """,
             pure: false
           )

ci/tests/Jenkinsfile.e2e-nightly

@@ -58,7 +58,7 @@ pipeline {
             sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
-                --numprocesses 15 \
+                --numprocesses 9 \
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \

ci/tests/Jenkinsfile.e2e-prs

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

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.playstore-meta

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

fastlane/Gemfile.lock

@@ -1,30 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.4)
+    CFPropertyList (3.0.5)
       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.525.0)
-    aws-sdk-core (3.122.0)
+    aws-partitions (1.579.0)
+    aws-sdk-core (3.130.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.51.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-kms (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.105.1)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.113.1)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    claide (1.0.3)
+    claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
@@ -36,17 +36,18 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.2.3)
-    excon (0.88.0)
-    faraday (1.8.0)
+    excon (0.92.2)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -55,14 +56,17 @@ 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.5)
-    fastlane (2.197.0)
+    fastimage (2.2.6)
+    fastlane (2.205.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -105,9 +109,9 @@ GEM
     fastlane-plugin-diawi (2.1.0)
       rest-client (>= 2.0.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.13.0)
+    google-apis-androidpublisher_v3 (0.19.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-core (0.4.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -116,28 +120,28 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.8.0)
+    google-apis-iamcredentials_v1 (0.10.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.6.0)
+    google-apis-playcustomapp_v1 (0.7.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.9.0)
+    google-apis-storage_v1 (0.13.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.5.0)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-storage (1.36.2)
+      addressable (~> 2.8)
       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.0)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.1.3)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
@@ -148,13 +152,13 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
     json (2.6.1)
     jwt (2.3.0)
     memoist (0.16.2)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     multi_json (1.15.0)
@@ -165,7 +169,7 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.6)
     representable (3.1.1)
       declarative (< 0.1.0)
@@ -182,9 +186,9 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.16.0)
+    signet (0.16.1)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -201,7 +205,7 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)

fastlane/gemset.nix

@@ -45,10 +45,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "181a2xf9zs0hz77jkpmxidvkjzs65vsyqv1a31fcali7f0kvh4h9";
+      sha256 = "1ilhspsph7icrrz94f3qngjkj585hsyv9bnxr44iabcqqwymr79w";
       type = "gem";
     };
-    version = "1.525.0";
+    version = "1.579.0";
   };
   aws-sdk-core = {
     dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -56,10 +56,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0krx8cfajc72gv6mpyb67vnhd2m2iya19846jgipgfris194gjm2";
+      sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";
       type = "gem";
     };
-    version = "3.122.0";
+    version = "3.130.2";
   };
   aws-sdk-kms = {
     dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +67,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qac9dd6qriz6ldghkr8ga74zz28jl109kmvhvag74a3qf7k9dwj";
+      sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";
       type = "gem";
     };
-    version = "1.51.0";
+    version = "1.56.0";
   };
   aws-sdk-s3 = {
     dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -78,10 +78,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12j7i6l52b6hsnj59grn0m1s9pn6l38zmra6ad8i12vdsvd185w7";
+      sha256 = "0kxcc3abjxld66ryrivfq9wxxpik8ngr2b2dr7shgrsgf5zmrkh8";
       type = "gem";
     };
-    version = "1.105.1";
+    version = "1.113.1";
   };
   aws-sigv4 = {
     dependencies = ["aws-eventstream"];
@@ -89,10 +89,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
+      sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.5.0";
   };
   babosa = {
     groups = ["default"];
@@ -110,20 +110,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00s388z1akvj2j77ylr1mgp02zxp4ybcgc4ds3bz4647dfk0cwxk";
+      sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
       type = "gem";
     };
-    version = "3.0.4";
+    version = "3.0.5";
   };
   claide = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+      sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.0";
   };
   colored = {
     groups = ["default"];
@@ -213,21 +213,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15yrwawhvkjvfg0dsf8z81876ddj6161q0wh5s7pw4sim8z8pspr";
+      sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba";
       type = "gem";
     };
-    version = "0.88.0";
+    version = "0.92.2";
   };
   faraday = {
-    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"];
+    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"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
+      sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.10.0";
   };
   faraday-cookie_jar = {
     dependencies = ["faraday" "http-cookie"];
@@ -280,6 +280,17 @@
     };
     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 = [];
@@ -320,6 +331,16 @@
     };
     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"];
@@ -336,10 +357,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05i1fgqy4l40niwm9y56d04f876sm0cvc7q3w2rpddf8gya4lcs9";
+      sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr";
       type = "gem";
     };
-    version = "2.2.5";
+    version = "2.2.6";
   };
   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"];
@@ -347,10 +368,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qlvg0sca8j1ryzxpvnmpjnh3fwmv6sk8l7mr9mv34z8rdy1iv3x";
+      sha256 = "091l4vl909rv6alydwlzhbk0lfmfphb7n2sjybdfy2azr07b6a0d";
       type = "gem";
     };
-    version = "2.197.0";
+    version = "2.205.2";
   };
   fastlane-plugin-clean_testflight_testers = {
     groups = ["default"];
@@ -389,10 +410,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nxgda00y080xdavxs6nv5h2grwamds33b25nkjb4mij7385brs1";
+      sha256 = "0qc501qhgks10qr7dm42bjcsm6yrbg1lxy28akpxindvjk61zh9i";
       type = "gem";
     };
-    version = "0.13.0";
+    version = "0.19.0";
   };
   google-apis-core = {
     dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@@ -400,10 +421,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nzzj66clgr9ldmbjqkzgpvqmd6bjjmbw6khpgq80mp3gks4ycqy";
+      sha256 = "19v15vkgg86k79l51gfs7fab4h7fkv8358ckmkyp33jgsx3zr17b";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.4.2";
   };
   google-apis-iamcredentials_v1 = {
     dependencies = ["google-apis-core"];
@@ -411,10 +432,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0slpmdjsxbjdqs7qwkyfk3sdnfy5wliwf89jy8hq7l87a31r7lvk";
+      sha256 = "1yibminaffzz5npq605m0vqc024dcybiw7xk5vr0jxzlsh8nxvhn";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.10.0";
   };
   google-apis-playcustomapp_v1 = {
     dependencies = ["google-apis-core"];
@@ -422,10 +443,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0v9y6avlnwxwv4vahhygrsmrpmric4zg8sxjd26vhhlxw6g8955b";
+      sha256 = "15wnkbn6kzijbyqkqrh7s6apjf5630yvf2v8zy93zk0x87n2drcd";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.7.0";
   };
   google-apis-storage_v1 = {
     dependencies = ["google-apis-core"];
@@ -433,10 +454,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0y6gyqj2cwsbdxk7wsrjzp9jz2hn2bk1zi1jjm5k311c3jlnj0r1";
+      sha256 = "0lcb9jkjipz1kgg8zyp8a6741andads55bxbldg3x8qmzkv9pv31";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.13.0";
   };
   google-cloud-core = {
     dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -455,10 +476,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag";
+      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.6.0";
   };
   google-cloud-errors = {
     groups = ["default"];
@@ -476,10 +497,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pvcpqx64cxm05dzr9q7zxrymjq4jk46ifd1p4b6c9v3v0c9ipb5";
+      sha256 = "09d1bvxma4czbgay9lhcqsrhh6pd8s9i5djflzpsn00h4isdilw3";
       type = "gem";
     };
-    version = "1.34.1";
+    version = "1.36.2";
   };
   googleauth = {
     dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -487,10 +508,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12zm6r7jxqv8k1a4iyijq2gcywk2d62nizbnabwsnhnzxwxwxc3s";
+      sha256 = "1y80y72bpz04piiskfn93i5rzfy02mjchp3ym77yf2811gzz33d9";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.3";
   };
   highline = {
     groups = ["default"];
@@ -538,10 +559,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+      sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.6.1";
   };
   json = {
     groups = ["default"];
@@ -579,20 +600,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
+      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.4.1";
   };
   mime-types-data = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv";
+      sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
       type = "gem";
     };
-    version = "3.2021.0901";
+    version = "3.2022.0105";
   };
   mini_magick = {
     groups = ["default"];
@@ -699,10 +720,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+      sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
       type = "gem";
     };
-    version = "4.0.6";
+    version = "4.0.7";
   };
   rake = {
     groups = ["default"];
@@ -802,10 +823,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cgmadrpgkpcklvvm2cga9mnrfqwqlydwpask1wx617h5ha6954k";
+      sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1";
       type = "gem";
     };
-    version = "0.16.0";
+    version = "0.16.1";
   };
   simctl = {
     dependencies = ["CFPropertyList" "naturally"];
@@ -906,10 +927,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
+      sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz";
       type = "gem";
     };
-    version = "0.0.8";
+    version = "0.0.8.1";
   };
   unicode-display_width = {
     groups = ["default"];

ios/Podfile.lock

@@ -2,7 +2,7 @@ PODS:
   - boost-for-react-native (1.63.0)
   - BVLinearGradient (2.5.6):
     - React
-  - CryptoSwift (1.4.3)
+  - CryptoSwift (1.5.1)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.4)
   - FBReactNativeSpec (0.63.4):
@@ -22,9 +22,10 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - Keycard (3.0.4):
+  - Keycard (3.0.5):
     - CryptoSwift
     - secp256k1
+    - Zip
   - libwebp (1.2.1):
     - libwebp/demux (= 1.2.1)
     - libwebp/mux (= 1.2.1)
@@ -305,8 +306,6 @@ PODS:
     - React-jsi (= 0.63.4)
   - ReactNativeAudioToolkit (2.0.3):
     - React
-  - ReactNativeDarkMode (0.2.2):
-    - React
   - ReactNativeNavigation (7.13.0):
     - React-Core
     - React-RCTImage
@@ -401,6 +400,7 @@ PODS:
   - TouchID (4.4.1):
     - React
   - Yoga (1.14.0)
+  - Zip (2.1.2)
 
 DEPENDENCIES:
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
@@ -453,7 +453,6 @@ 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`)"
@@ -487,6 +486,7 @@ SPEC REPOS:
     - SQLCipher
     - SSZipArchive
     - TOCropViewController
+    - Zip
 
 EXTERNAL SOURCES:
   BVLinearGradient:
@@ -585,8 +585,6 @@ 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:
@@ -631,7 +629,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   Keycard:
-    :commit: d5bb5d68dbac19a34945918b51873fbba2c18310
+    :commit: 29c26b51ef76304e9551657c605fb55b2540a077
     :git: https://github.com/status-im/Keycard.swift.git
   secp256k1:
     :commit: 46a1fa30d9b8babeae85ff519050f42394ab5fcc
@@ -641,13 +639,13 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
-  CryptoSwift: a0799ee936271bd2253a006f1e4523df21845000
+  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
   FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
   glog: 61334f8bdb4deea07543d4fbac3fb5948e78a7a5
-  Keycard: dd96182888da0aacf4de821b641103143bbb26cc
+  Keycard: 07f1b4d4fadcf1218084cb3e1bb3a8bac3870c5a
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
   Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
@@ -690,7 +688,6 @@ SPEC CHECKSUMS:
   React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
   ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
-  ReactNativeDarkMode: 0178ffca3b10f6a7c9f49d6f9810232b328fa949
   ReactNativeNavigation: 4c4ca87edc0da4ee818158a62cb6188088454e5c
   RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36
   RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543
@@ -716,6 +713,7 @@ SPEC CHECKSUMS:
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
   Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
+  Zip: b3fef584b147b6e582b2256a9815c897d60ddc67
 
 PODFILE CHECKSUM: 1a5b8878f89edd08eb4d37898a3a8721a7bb3388
 

ios/StatusIm.xcodeproj/project.pbxproj

@@ -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 */; };
-		8770D567D65A8F938D95C371 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.a */; };
+		A469E8D0A04F890FD80E5C08 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4364C6D4F636EFD8B968531E /* libPods-Status-StatusImPR.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
 		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,39 +96,38 @@
 /* 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>"; };
-		132CE3B093884B0FB239A0AB /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		10DE74ADA21099BC94EFD94D /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.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>"; };
-		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>"; };
+		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; };
 		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>"; };
-		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>"; };
+		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>"; };
 		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>"; };
-		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>"; };
+		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>"; };
 		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>"; };
@@ -141,7 +140,8 @@
 		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>"; };
-		DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		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>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -149,7 +149,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8770D567D65A8F938D95C371 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				C6359065E518CA78EF03F567 /* 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 */,
-				68E19BBDF749E72ED1F9DEF5 /* libPods-Status-StatusIm.a in Frameworks */,
+				41D83275EA021DE1470B64CB /* 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 */,
-				6C137817D5298C82BC79177C /* libPods-Status-StatusImPR.a in Frameworks */,
+				A469E8D0A04F890FD80E5C08 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -233,6 +233,20 @@
 			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 = (
@@ -241,19 +255,6 @@
 			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 = (
@@ -273,8 +274,8 @@
 				83CBBA001A601CBA00E9B192 /* Products */,
 				A97BA941B2FB44B4B66EE6D3 /* Frameworks */,
 				1E7837547A9A40E18AD63CF3 /* Resources */,
-				5C1C8762251D6EF495FB2384 /* Pods */,
 				65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */,
+				37F45ABDF8B0A9F2EF379D4B /* Pods */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -311,9 +312,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.framework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				132CE3B093884B0FB239A0AB /* libPods-Status-StatusIm.a */,
-				DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.a */,
-				5D4CB5416994C913628B8754 /* libPods-Status-StatusImPR.a */,
+				46444D4C653CD27349ED6C7D /* libPods-Status-StatusIm.a */,
+				10DE74ADA21099BC94EFD94D /* libPods-Status-StatusIm-StatusImTests.a */,
+				4364C6D4F636EFD8B968531E /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -325,11 +326,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				49A69B853BD9751F84878340 /* [CP] Check Pods Manifest.lock */,
+				E8158908D8DBE8B42209130F /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				AFAB37B70B6EB1B7D2E869AD /* [CP] Copy Pods Resources */,
+				814AF5E700528A517FFCE669 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -345,14 +346,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				2EAC54E16AB243C3EBBFE1BA /* [CP] Check Pods Manifest.lock */,
+				ADD15A0C44EC35A40730E491 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				291E1A8BC076990A77B59232 /* [CP] Copy Pods Resources */,
+				C25D61BD03A6CB56513896A5 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -367,14 +368,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				3AAD2ABA24A3A60E0075D594 /* [CP] Check Pods Manifest.lock */,
+				78A12FD1CDEF079CF7CF7319 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				3AAD2AD824A3A60E0075D594 /* [CP] Copy Pods Resources */,
+				71AF560830EB55C8909CC37C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -522,72 +523,6 @@
 			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;
@@ -616,7 +551,7 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
 		};
-		3AAD2AD824A3A60E0075D594 /* [CP] Copy Pods Resources */ = {
+		71AF560830EB55C8909CC37C /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -638,7 +573,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		49A69B853BD9751F84878340 /* [CP] Check Pods Manifest.lock */ = {
+		78A12FD1CDEF079CF7CF7319 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -653,14 +588,14 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
+				"$(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;
 		};
-		AFAB37B70B6EB1B7D2E869AD /* [CP] Copy Pods Resources */ = {
+		814AF5E700528A517FFCE669 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -682,6 +617,50 @@
 			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;
@@ -696,6 +675,28 @@
 			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 */
@@ -743,7 +744,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 977B1E37198B72A48870BFE5 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = E7378B0A7AE6C80DCC3C45BA /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -776,7 +777,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3F224519278D376B19F4CA2B /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = F1D775582F9C7154A44F2520 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -805,7 +806,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3887F5B027AC2EC4E7B8BC02 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 7D0115BCCB8330F6AC68CB87 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -875,7 +876,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 784390E981501E6517651C4E /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 42C2B8BE641784CC8F992EF6 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -929,13 +930,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 = 7ACFEF4386C8FF7558A13B3D /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 0032155E8656A85DCE5E0FBF /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -994,13 +995,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 = 69291A6222A63434694EA2A6 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 956436931E0887CF912BCC24 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1052,7 +1053,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;
 		};
@@ -1134,8 +1135,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;
 		};
@@ -1208,7 +1209,7 @@
 				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = "arm64";
+				VALID_ARCHS = arm64;
 			};
 			name = Release;
 		};

nix/KNOWN_ISSUES.md

@@ -1,35 +1,33 @@
 # Known Issues
 
-## MacOS 10.15 "Catalina"
+## Too many open files
 
-There is an unsolved issue with the root(`/`) file system in `10.15` being read-only:
-https://github.com/NixOS/nix/issues/2925
+### Single-User Installation
 
-Our current recommended workaround is putting `/nix` under `/opt/nix` and symlinking it via `/etc/synthetic.conf`:
-
-```bash
-sudo mkdir /opt/nix
-sudo chown ${USER} /opt/nix
-sudo sh -c "echo 'nix\t/opt/nix' >> /etc/synthetic.conf"
-reboot
+Nix can open a lot of files when fetching things for `/nix/store` which can cause
 ```
-
-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
+Too many open files"
 ```
-
-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
+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.
 
-Add it to your `.bashrc` or any other shell config file.
+### Multi-User Installation
 
-__NOTE__: Your old `/nix` directory will end up in `/Users/Shared/Relocated Items/Security/nix` after OS upgrade.
+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:
+```
+LimitNOFILE=4096:1048576
+```
+To the `/etc/systemd/system/nix-daemon.service` service definition.
 
 ## Cache Downloads Timing Out
 
@@ -69,3 +67,11 @@ 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

nix/deps/gradle/deps.urls

@@ -323,6 +323,7 @@ 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
@@ -474,12 +475,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.11.0/error_prone_annotations-2.11.0.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_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.11.0/error_prone_parent-2.11.0.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/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
@@ -489,14 +490,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.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-parent/31.1-jre/guava-parent-31.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 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.0.1-jre/guava-31.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/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
@@ -530,32 +531,31 @@ 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.5/okhttp-5.0.0-alpha.5.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/5.0.0-alpha.6/okhttp-5.0.0-alpha.6.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.0.0/okio-3.0.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/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.0-M1/istack-commons-runtime-4.1.0-M1.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.1.1/istack-commons-runtime-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/2.21/istack-commons-2.21.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.0-M1/istack-commons-4.1.0-M1.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.1/istack-commons-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/3.0.2/jaxb-bom-ext-3.0.2.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/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/3.0.2/jaxb-parent-3.0.2.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-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/3.0.2/jaxb-txw-parent-3.0.2.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/fastinfoset/FastInfoset/1.2.13/FastInfoset-1.2.13.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/2.1.0/FastInfoset-2.1.0.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/fastinfoset-project-1.2.13.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/2.0.0/fastinfoset-project-2.0.0.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/2.1.0/fastinfoset-project-2.1.0.pom
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.5/antlr4-annotations-4.5.pom
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.9.0/antlr4-annotations-4.9.0.pom
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-master/4.5/antlr4-master-4.5.pom
@@ -567,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-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/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/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
@@ -619,17 +619,22 @@ 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.1/ST4-4.3.1.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/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.9.3/antlr4-master-4.9.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-runtime/4.5.2-1/antlr4-runtime-4.5.2-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-runtime/4.10.1/antlr4-runtime-4.10.1.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
@@ -642,13 +647,12 @@ 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
@@ -661,7 +665,6 @@ 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
@@ -702,39 +705,40 @@ 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.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-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-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.4/maven-model-builder-3.8.4.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/2.2.1/maven-model-2.2.1.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-model/3.8.5/maven-model-3.8.5.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-plugin-api/3.8.4/maven-plugin-api-3.8.4.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-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.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-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-settings/2.2.1/maven-settings-2.2.1.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-settings/3.8.5/maven-settings-3.8.5.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.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/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/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
@@ -749,8 +753,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.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/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/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
@@ -765,7 +769,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov
 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.21.2/checker-qual-3.21.2.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.21.4/checker-qual-3.21.4.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
@@ -821,7 +825,8 @@ 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/ee4j/project/1.0.6/project-1.0.6.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.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
@@ -831,21 +836,21 @@ 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/3.0.2/jaxb-bom-3.0.2.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-core/2.2.11/jaxb-core-2.2.11.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-core/4.0.0-M4/jaxb-core-4.0.0-M4.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/3.0.2/txw2-3.0.2.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/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.7/org.jacoco.build-0.8.7.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.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.7/org.jacoco.core-0.8.7.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.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
@@ -907,6 +912,7 @@ 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.4.31/kotlin-stdlib-common-1.4.31.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-common/1.6.20/kotlin-stdlib-common-1.6.20.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
@@ -944,7 +950,7 @@ 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-M1/stax-ex-2.1.0-M1.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/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
@@ -960,12 +966,12 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5
 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/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-analysis/9.3/asm-analysis-9.3.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/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-commons/9.3/asm-commons-9.3.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
@@ -978,7 +984,7 @@ 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/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-tree/9.3/asm-tree-9.3.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
@@ -988,7 +994,7 @@ 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/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/asm/asm/9.3/asm-9.3.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
@@ -1013,12 +1019,12 @@ https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.3/utils-r
 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/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/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/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

nix/deps/gradle/proj.list

@@ -10,7 +10,6 @@ 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
@@ -27,6 +26,7 @@ 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

nix/deps/nodejs-patched/README.md

@@ -8,7 +8,7 @@ Modules provided by `yarn2nix` are normally fine, but we use `react-native-*` pa
 ```js
 repositories {
     google()
-    jcenter()
+    maven { url "https://www.jitpack.io" }
 }
 ```
 And these need to be patched and replaced with `mavenLocal()` to make sure Gradle doesn't try to fetch dependencies from remote repos.

nix/nix.conf

@@ -11,3 +11,5 @@ 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

nix/overlay.nix

@@ -33,12 +33,12 @@ in {
   gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
 
   # Package version adjustments
-  go = super.pkgs.go_1_16;
+  go = super.pkgs.go_1_17;
   gradle = super.pkgs.gradle_5;
-  nodejs = super.pkgs.nodejs-12_x;
+  nodejs = super.pkgs.nodejs-16_x;
   openjdk = super.pkgs.openjdk8_headless;
   xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    version = "11.5";
+    version = "13.3";
     allowHigher = true;
   };
   gomobile = super.gomobile.override {

nix/pkgs.nix

@@ -13,8 +13,8 @@ let
     name = "nixpkgs-source";
     owner = "status-im";
     repo = "nixpkgs";
-    rev = "15111f8a9ad423d300886b537647691c2faa28cd";
-    sha256 = "05ny644x3dpxigljnb4rmams5vrs5gkbcyqjfamvlqm8rdmsi0kn";
+    rev = "4ba5f26780e7a27aa2e97676603cd9ef04f11e74";
+    sha256 = "sha256-ZpHXUuF9bvHooKwGuR1Mr/n2mE/LJ6/MCdCk2AfdD9M=";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };

nix/scripts/build.sh

@@ -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
-function cleanup() {
+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
-function extractResults() {
+extractResults() {
   local nixResultPath="$1"
   mkdir -p "${resultPath}"
   cp -vfr ${nixResultPath}/* "${resultPath}" | sed 's#'${PWD}'#.#'

nix/scripts/clean.sh

@@ -5,16 +5,16 @@ set -e
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 source "${GIT_ROOT}/nix/scripts/source.sh"
 
-function log() { echo "$@" 1>&2; }
+log() { echo "$@" 1>&2; }
 
 # helpers for getting related paths in Nix store
-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}"; }
+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 findRelated() {
+findRelated() {
     path="${1}"
     found+=("${path}")
     if [[ "${path}" =~ .*.chroot ]]; then
@@ -51,7 +51,7 @@ function findRelated() {
 }
 
 # used to find things to delete based on a regex
-function findByRegex() {
+findByRegex() {
     regex="${1}"
 
     log "Searching by regex: '${regex}'"
@@ -70,7 +70,7 @@ function findByRegex() {
 }
 
 # used to find things to delete based on a given path
-function findByResult() {
+findByResult() {
     mainPath="${1}"
     log "Searching by result: '${mainPath}'"
 

nix/scripts/lib.sh

@@ -0,0 +1,37 @@
+#!/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
+}

nix/scripts/node_modules.sh

@@ -23,13 +23,13 @@ source "${GIT_ROOT}/scripts/colors.sh"
 # More concise output from 'time'
 export TIMEFORMAT="Done in: %Es"
 
-function removeDir() {
+removeDir() {
     [[ ! -d "${tmp}" ]] && return
     chmod -R u+w "${tmp}"
     rm -rf "${tmp}"
 }
 
-function copyNodeModules() {
+copyNodeModules() {
   local src="${1}"
   local dst="${2}"
   # WARNING: The ../ is there to avoid a Nix builtins.path bug:
@@ -51,7 +51,7 @@ function 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.
-function findFilesNewerThan() {
+findFilesNewerThan() {
   local sentinel="${1}"
   local dir="${2}"
   find ${dir} -type f -writable \
@@ -63,7 +63,7 @@ function findFilesNewerThan() {
       -print 
 }
 
-function nodeModulesUnchanged() {
+nodeModulesUnchanged() {
   local src="$1"
   local dst="$2"
   local sentinelFile="${dst}/.copied~"
@@ -98,7 +98,7 @@ function nodeModulesUnchanged() {
   return 0
 }
 
-function replaceNodeModules() {
+replaceNodeModules() {
   local src="$1"
   local dst="$2"
   local sentinelFile="${dst}/.copied~"

nix/scripts/purge.sh

@@ -1,24 +1,82 @@
 #!/usr/bin/env bash
-
-set -e
+# This script removes all Nix files.
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
+source "${GIT_ROOT}/nix/scripts/lib.sh"
 source "${GIT_ROOT}/scripts/colors.sh"
 
-# Purging /nix on NixOS would be disasterous
-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
+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
 
-NIX_ROOT="/nix"
-if [[ $(uname -s) == "Darwin" ]]; then
-    # Special case due to read-only root on MacOS Catalina
-    NIX_ROOT="/opt/nix"
+# 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
 fi
+nix_purge_root
 
-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

nix/scripts/setup.sh

@@ -1,51 +1,73 @@
 #!/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.3.12"
+NIX_VERSION="2.8.0"
 NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
-NIX_INSTALL_SHA256="468a49a1cef293d59508bb3b62625dfcd99ec00334a14309f125cf8de513d5f1"
+NIX_INSTALL_SHA256="f43bfedfca9151479462d8bc11f238615a2d52f19b14894d8e2b59980e75ef72"
 NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"
 
-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
+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
 }
 
-if [[ ! -x "$(command -v git)" ]]; then
-  echo -e "${RED}The 'curl' utility is required for Nix installation.${RST}" >&2
-  exit 1
+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
 fi
 
-if [[ "$(source /etc/os-release && echo "${NAME}")" == *NixOS* ]]; then
-  echo -e "${GRN}Already running NixOS.${RST}"
-  exit
+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
 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

nix/scripts/source.sh

@@ -1,33 +1,41 @@
 #!/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"
 
-# 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
-    ${GIT_ROOT}/nix/scripts/setup.sh
-  fi
-
-  # Load Nix profile
-  source "${NIX_PROFILE_SH}"
-
-  # Verify Nix is available
-  if [[ ! -x $(command -v nix) ]]; then
-    echo "Nix not available, sourcing profile failed!" > /dev/stderr
-    exit 1
-  fi
+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
 }
 
-source_nix
+main() {
+    # Just stop if Nix is already available
+    if [[ -x $(command -v nix) ]]; then
+        return
+    fi
+
+    # Setup Nix if not available
+    if [[ ! -d /nix ]]; then
+        ${GIT_ROOT}/nix/scripts/setup.sh
+    fi
+
+    # Load Nix profile
+    source_nix_profile
+
+    # Verify Nix is available
+    if [[ ! -x $(command -v nix) ]]; then
+        echo -e "${RED}Nix not available, sourcing profile failed!${RST}" >&2
+        exit 1
+    fi
+}
+
+main

package.json

@@ -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#v2.0.3-status-v6",
+    "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
     "@react-native-community/blur": "^3.6.0",
-    "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#v4.0.4-status.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/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#v4.0.2-status",
+    "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/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#v1.4.2-status",
+    "react-native-config": "git+https://github.com/status-im/react-native-config.git#refs/tags/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,10 +50,10 @@
     "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#v0.36.2-status.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-resizer": "^1.2.3",
-    "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-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-languages": "^3.0.2",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-mail": "^6.1.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.2.0",
-    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.37",
+    "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-svg": "^9.8.4",
     "react-native-touch-id": "^4.4.1",
-    "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",
+    "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",
     "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#v2.0.2-status",
+    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "^2.10.14"
   }
 }

scripts/update-status-go.sh

@@ -50,6 +50,9 @@ Examples:
     # Using tag name
     ${SCRIPT_FILE} v2.1.1
 
+    # Using commit SHA1
+    ${SCRIPT_FILE} 1a2b3c4d
+
     # Using PR number
     ${SCRIPT_FILE} PR-2134
 END
@@ -82,13 +85,12 @@ 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}"
-else
+elif [[ -n "${STATUS_GO_BRANCH_SHA1}" ]]; then
     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."
+elif [[ "${#STATUS_GO_VERSION}" -gt 4 ]]; then
+    STATUS_GO_COMMIT_SHA1="${STATUS_GO_VERSION}"
+else
+    echo "ERROR: Input not a tag or branch, but too short to be a SHA1!" >&2
     exit 1
 fi
 

src/mocks/js_dependencies.cljs

@@ -47,6 +47,7 @@
                                        :ValueXY                 (fn [])
                                        :View                    {}
                                        :FlatList                {}
+                                       :Image                   {}
                                        :ScrollView              {}
                                        :Text                    {}}
             :Easing                   {:bezier (fn [])

src/quo/react_native.cljs

@@ -6,7 +6,8 @@
             ["@react-native-community/hooks" :as hooks]
             ["react-native-navigation" :refer (Navigation)]
             ["rn-emoji-keyboard" :refer (EmojiKeyboard)]
-            ["react-native-draggable-flatlist" :default DraggableFlatList]))
+            ["react-native-draggable-flatlist" :default DraggableFlatList]
+            [status-im.utils.config :as config]))
 
 (def rn-draggable-flatlist (reagent/adapt-react-class DraggableFlatList))
 
@@ -74,6 +75,9 @@
 (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))
@@ -103,6 +107,10 @@
                                                :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

src/quo/theme.cljs

@@ -1,7 +1,11 @@
 (ns quo.theme
-  (:require [quo.design-system.colors :as colors]))
+  (:require [quo.design-system.colors :as colors]
+            [reagent.core :as reagent]))
 
-(def theme (atom nil))
+(def theme (reagent/atom nil))
+
+(defn dark? []
+  (= :dark @theme))
 
 (defn get-theme []
   @theme)

src/quo2/components/button.cljs

@@ -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]))
+            [reagent.core :as reagent]
+            [quo2.components.icon :as quo2.icons]))
 
 (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/neutral-50
+                     :grey      {:icon-color       colors/black
                                  :label            {:style {:color colors/black}}
-                                 :background-color {:default  colors/neutral-40
+                                 :background-color {:default  colors/neutral-20
                                                     :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]
+(defn style-container [type size disabled background-color border-color icon above width before after]
   (merge {:height             size
           :align-items        :center
           :justify-content    :center
@@ -74,7 +74,14 @@
                                   32 10
                                   24 8))
           :background-color   background-color
-          :padding-horizontal (if icon 0 (case size 56 16 40 16 32 12 24 8))}
+          :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})
          (when icon
            {:width size})
          (when border-color
@@ -97,14 +104,15 @@
    [button {:icon true} :main-icons/close-circle]"
   [_ _]
   (let [pressed (reagent/atom false)]
-    (fn [{:keys [on-press disabled type size before after above
-                 on-long-press accessibility-label icon]
+    (fn [{:keys [on-press disabled type size before after above width
+                 on-long-press accessibility-label icon style]
           :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)]
+            state (cond disabled :disabled @pressed :pressed :else :default)
+            icon-size (when (= 24 size) 12)]
         [rn/touchable-without-feedback (merge {:disabled            disabled
                                                :accessibility-label accessibility-label}
                                               (when on-press
@@ -118,17 +126,35 @@
                                               {:on-press-out (fn []
                                                                (reset! pressed nil))})
 
-         [rn/view {:style (style-container type size disabled (get background-color state) (get border-color state) icon above)}
+         [rn/view {:style (merge
+                           (style-container
+                            type
+                            size
+                            disabled
+                            (get background-color state)
+                            (get border-color state)
+                            icon
+                            above
+                            width
+                            before
+                            after)
+                           style)}
           (when above
             [rn/view
-             [icons/icon above {:color icon-color}]])
+             [quo2.icons/icon above {:container-style {:margin-bottom 2}
+                                     :color           icon-color
+                                     :size            icon-size}]])
           (when before
             [rn/view
-             [icons/icon before {:color icon-color}]])
+             [quo2.icons/icon before {:container-style {:margin-left  (if (= size 40) 12 8)
+                                                        :margin-right 4}
+                                      :color           icon-color
+                                      :size            icon-size}]])
           [rn/view
            (cond
              icon
-             [icons/icon children {:color icon-color}]
+             [quo2.icons/icon children {:color icon-color
+                                        :size  icon-size}]
 
              (string? children)
              [text/text (merge {:size            (when (#{56 24} size) :paragraph-2)
@@ -141,4 +167,7 @@
              children)]
           (when after
             [rn/view
-             [icons/icon after {:color icon-color}]])]]))))
+             [quo2.icons/icon after {:container-style {:margin-left  4
+                                                       :margin-right (if (= size 40) 12 8)}
+                                     :color           icon-color
+                                     :size            icon-size}]])]]))))

src/quo2/components/icon.cljs

@@ -0,0 +1,10 @@
+(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})])))

src/quo2/components/tabs.cljs

@@ -5,7 +5,7 @@
 
 (defn tabs [{:keys [default-active on-change]}]
   (let [active-tab-id (reagent/atom default-active)]
-    (fn [{:keys [data size]}]
+    (fn [{:keys [data size] :or {size 32}}]
       (let [active-id @active-tab-id]
         [rn/view {:flex-direction :row}
          (for [{:keys [label id]} data]

src/quo2/components/text.cljs

@@ -29,5 +29,6 @@
   (let [this (reagent/current-component)
         props (reagent/props this)
         style (text-style props)]
-    (into [rn/text {:style style}]
-          (reagent/children this))))
+    (into [rn/text (merge {:style style}
+                          (dissoc props :style :size :align :weight :color))]
+          (reagent/children this))))

src/quo2/foundations/colors.cljs

@@ -1,5 +1,6 @@
 (ns quo2.foundations.colors
-  (:require [clojure.string :as string]))
+  (:require [clojure.string :as string]
+            [quo.theme :as theme]))
 
 (defn alpha [value opacity]
   (if (string/starts-with? value "#")
@@ -33,6 +34,13 @@
 (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))
@@ -173,4 +181,17 @@
 (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))
+(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))

src/quo2/foundations/typography.cljs

@@ -2,23 +2,24 @@
 
 (def heading-1 {:font-size   27
                 :line-height 32.4
-                :letter-spacing -2.1})
+                :letter-spacing -0.5})
 
 (def heading-2 {:font-size   19
                 :line-height 25.65
-                :letter-spacing -1.6})
+                :letter-spacing -0.4})
 
 (def paragraph-1 {:font-size   15
                   :line-height 21.75
-                  :letter-spacing -0.9})
+                  :letter-spacing -0.1})
 
 (def paragraph-2 {:font-size   13
                   :line-height 18.2
-                  :letter-spacing -0.3})
+                  :letter-spacing 0})
 
 (def label {:font-size   11
             :line-height 15.62
-            :letter-spacing -0.055})
+            :letter-spacing -0.055
+            :text-transform :uppercase})
 
 (def font-regular {:font-family "Inter-Regular"}) ; 400
 

src/quo2/screens/button.cljs

@@ -70,12 +70,12 @@
                                     :theme :before :after)
                             {:on-press #(println "Hello world!")}
                             (when @above
-                              {:above :main-icons/close-circle})
+                              {:above :main-icons2/placeholder})
                             (when @before
-                              {:before :main-icons/back})
+                              {:before :main-icons2/placeholder})
                             (when @after
-                              {:after :main-icons/next}))
-         (if @icon :main-icons/close-circle @label)]]])))
+                              {:after :main-icons2/placeholder}))
+         (if @icon :main-icons2/placeholder @label)]]])))
 
 (defn preview-button []
   [rn/view {:background-color (:ui-background @colors/theme)

src/quo2/screens/segmented.cljs

@@ -8,12 +8,8 @@
 (def descriptor [{:label   "Size:"
                   :key     :size
                   :type    :select
-                  :options [{:key   32
-                             :value "32"}
-                            {:key   28
+                  :options [{:key   28
                              :value "28"}
-                            {:key   24
-                             :value "24"}
                             {:key   20
                              :value "20"}]}])
 

src/quo2/screens/tabs.cljs

@@ -10,12 +10,8 @@
                   :type    :select
                   :options [{:key   32
                              :value "32"}
-                            {:key   28
-                             :value "28"}
                             {:key   24
-                             :value "24"}
-                            {:key   20
-                             :value "20"}]}])
+                             :value "24"}]}])
 
 (defn cool-preview []
   (let [state  (reagent/atom {:size  32})]

src/quo2/screens/text.cljs

@@ -27,8 +27,6 @@
                              :value "Medium"}
                             {:key   :semi-bold
                              :value "Semi-bold"}
-                            {:key   :bold
-                             :value "Bold"}
                             {:key   :monospace
                              :value "Monospace"}]}])
 

src/status_im/browser/core.cljs

@@ -10,7 +10,6 @@
             [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]
@@ -182,20 +181,6 @@
                                :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]

src/status_im/chat/models.cljs

@@ -10,6 +10,7 @@
             [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]
@@ -48,7 +49,7 @@
 
 (defn active-chat? [cofx chat-id]
   (let [chat (get-chat cofx chat-id)]
-    (not (nil? chat))))
+    (:active chat)))
 
 (defn foreground-chat?
   [{{:keys [current-chat-id view-id]} :db} chat-id]
@@ -115,11 +116,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] :as chat}]
-                  (if (not active)
+        (reduce (fn [acc {:keys [chat-id profile-public-key timeline? community-id active muted] :as chat}]
+                  (if (not (or active muted))
                     (update acc :removed-chats conj chat-id)
                     (cond-> acc
-                      (and (not profile-public-key) (not timeline?) (not community-id))
+                      (and (not profile-public-key) (not timeline?) (not community-id) active)
                       (update :chats-home-list conj chat-id)
                       :always
                       (assoc-in [:all-chats chat-id] chat))))
@@ -135,7 +136,9 @@
                      (update :chats #(apply dissoc % removed-chats))
                      (update :chats-home-list set/difference removed-chats))}
             (when (not-empty removed-chats)
-              {:clear-multiple-message-notifications removed-chats}))
+              {:clear-message-notifications
+               [removed-chats
+                (get-in db [:multiaccount :remote-push-notifications-enabled?])]}))
      leave-removed-chat)))
 
 (fx/defn clear-history
@@ -177,8 +180,9 @@
   [{:keys [db now] :as cofx} chat-id]
   (fx/merge
    cofx
-   {:db (-> db
-            (update :chats dissoc chat-id)
+   {:db (-> (if (get-in db [:chats chat-id :muted])
+              (assoc-in db [:chats chat-id :active] false)
+              (update db :chats dissoc chat-id))
             (update :chats-home-list disj chat-id)
             (assoc-in [:current-chat-id] nil))
     ::json-rpc/call [{:method "wakuext_deactivateChat"
@@ -222,6 +226,8 @@
   {: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))
@@ -258,6 +264,15 @@
                  (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]

src/status_im/chat/models/input.cljs

@@ -14,8 +14,7 @@
             [status-im.utils.fx :as fx]
             ["emojilib" :as emojis]
             [status-im.chat.models.mentions :as mentions]
-            [status-im.utils.utils :as utils]
-            [status-im.multiaccounts.update.core :as multiaccounts.update]))
+            [status-im.utils.utils :as utils]))
 
 (defn text->emoji
   "Replaces emojis in a specified `text`"
@@ -230,12 +229,12 @@
                                      :text              (i18n/label :t/update-to-listen-audio {"locale" "en"})})))
 
 (fx/defn send-sticker-message
-  [cofx {:keys [hash pack]} current-chat-id]
-  (when-not (string/blank? hash)
+  [cofx {:keys [hash packID]} current-chat-id]
+  (when-not (or (string/blank? hash) (string/blank? packID))
     (chat.message/send-message cofx {:chat-id      current-chat-id
                                      :content-type constants/content-type-sticker
                                      :sticker {:hash hash
-                                               :pack pack}
+                                               :pack (int packID)}
                                      :text    (i18n/label :t/update-to-see-sticker {"locale" "en"})})))
 
 (fx/defn send-edited-message [{:keys [db] :as cofx} text {:keys [message-id]}]
@@ -265,13 +264,16 @@
 
 (fx/defn chat-send-sticker
   {:events [:chat/send-sticker]}
-  [{{:keys [current-chat-id multiaccount]} :db :as cofx} {:keys [hash] :as sticker}]
+  [{{:keys [current-chat-id] :as db} :db :as cofx} {:keys [hash packID] :as sticker}]
   (fx/merge
    cofx
-   (multiaccounts.update/multiaccount-update
-    :stickers/recent-stickers
-    (conj (remove #(= hash %) (:stickers/recent-stickers multiaccount)) hash)
-    {})
+   {: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 #()}]}
    (send-sticker-message sticker current-chat-id)))
 
 (fx/defn chat-send-audio

src/status_im/chat/models/loading.cljs

@@ -7,7 +7,8 @@
             [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.chat.models.pin-message :as models.pin-message]
+            [status-im.notifications-center.core :as notification-center]))
 
 (defn cursor->clock-value
   [^js cursor]
@@ -23,10 +24,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] :as chat}
+                  (let [{:keys [chat-id profile-public-key timeline? community-id active] :as chat}
                         (data-store.chats/<-rpc-js chat-js)]
                     (cond-> acc
-                      (and (not profile-public-key) (not timeline?) (not community-id))
+                      (and (not profile-public-key) (not timeline?) (not community-id) active)
                       (update :chats-home-list conj chat-id)
                       :always
                       (assoc-in [:all-chats chat-id] chat))))
@@ -66,29 +67,37 @@
 
 (fx/defn handle-mark-all-read-successful
   {:events [::mark-all-read-successful]}
-  [{:keys [db]} chat-id]
-  {:db (mark-chat-all-read db chat-id)})
+  [{:keys [db] :as cofx} chat-id]
+  (fx/merge cofx
+            {:db (mark-chat-all-read db chat-id)}
+            (notification-center/get-activity-center-notifications-count)))
 
 (fx/defn handle-mark-all-read-in-community-successful
   {:events [::mark-all-read-in-community-successful]}
-  [{:keys [db]} chat-ids]
-  {:db (reduce mark-chat-all-read db chat-ids)})
+  [{: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)))
 
 (fx/defn handle-mark-all-read
   {:events [:chat.ui/mark-all-read-pressed :chat/mark-all-as-read]}
-  [_ chat-id]
-  {:clear-message-notifications chat-id
+  [{db :db} chat-id]
+  {:clear-message-notifications  [[chat-id]
+                                  (get-in db [:multiaccount :remote-push-notifications-enabled?])]
    ::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]}
-  [_ 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 %])}]})
+  [{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     (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"

src/status_im/chat/models/mentions.cljs

@@ -247,7 +247,10 @@
       (merge mentionable-users
              (mentionable-contacts-from-identites all-contacts public-key (keys community-members)))
 
-      :else (merge mentionable-users mentionable-contacts))))
+      (= chat-type constants/public-chat-type)
+      (merge mentionable-users (select-keys mentionable-contacts (keys mentionable-users)))
+
+      :else mentionable-users)))
 
 (def ending-chars "[\\s\\.,;:]")
 (def ending-chars-regex (re-pattern ending-chars))

src/status_im/communities/core.cljs

@@ -103,7 +103,8 @@
   [cofx response-js]
   (fx/merge cofx
             (handle-response cofx response-js)
-            (navigation/pop-to-root-tab :chat-stack)))
+            (navigation/pop-to-root-tab :chat-stack)
+            (notification-center/get-activity-center-notifications-count)))
 
 (fx/defn joined
   {:events [::joined ::requested-to-join]}
@@ -156,14 +157,18 @@
 
 (fx/defn leave
   {:events [::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 %]))}]})
+  [{: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 %]))}]}))
 
 (fx/defn fetch [_]
   {::json-rpc/call [{:method "wakuext_communities"

src/status_im/constants.cljs

@@ -171,4 +171,8 @@
 (def ^:const visibility-status-inactive 4)
 
 (def ^:const wallet-connect-version-1 1)
-(def ^:const wallet-connect-version-2 2)
+(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)

src/status_im/contact/block.cljs

@@ -44,7 +44,9 @@
            {:db (-> db
                     (update :chats dissoc public-key)
                     (update :chats-home-list disj public-key)
-                    (assoc-in [:contacts/contacts public-key :added] false))}
+                    (assoc-in [:contacts/contacts public-key :added] false))
+            :clear-message-notifications
+            [[public-key] (get-in db [:multiaccount :remote-push-notifications-enabled?])]}
            (notification-center/get-activity-center-notifications-count)
            fxs)))
 

src/status_im/data_store/chats.cljs

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

src/status_im/data_store/settings.cljs

@@ -46,8 +46,6 @@
                                            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)

src/status_im/db.cljs

@@ -33,7 +33,6 @@
              :dimensions/window                  (dimensions/window)
              :registry                           {}
              :visibility-status-updates          {}
-             :stickers/packs-owned               #{}
              :stickers/packs-pending             #{}
              :keycard                            {:nfc-enabled?   false
                                                   :pin            {:original     []

src/status_im/ens/core.cljs

@@ -138,7 +138,7 @@
        #(re-frame/dispatch [::name-resolved username
                             (cond
                               (not public-key) :owned
-                              (string/ends-with? % "0000000000000000000000000000000000000000000000000000000000000000")
+                              (and (string/ends-with? % "0000000000000000000000000000000000000000000000000000000000000000") (not custom-domain?))
                               :invalid-ens
                               (= % public-key) :connected
                               :else :connected-with-different-key)

src/status_im/ethereum/json_rpc.cljs

@@ -209,6 +209,7 @@
    "wallet_loadTransferByHash" {}
    "wallet_getTokens" {};, %* [chainId]}
    "wallet_getTokensBalancesForChainIDs" {};, %* [@[chainId], accounts, tokens]
+   "wallet_fetchPrices" {}
    "browsers_getBrowsers" {}
    "browsers_addBrowser" {}
    "browsers_deleteBrowser" {}
@@ -241,7 +242,16 @@
    "mailservers_getChatRequestRanges" {}
    "mailservers_deleteChatRequestRange" {}
    "appmetrics_saveAppMetrics" {}
-   "appmetrics_getAppMetrics" {}})
+   "appmetrics_getAppMetrics" {}
+   "stickers_market" {}
+   "stickers_installed" {}
+   "stickers_install" {}
+   "stickers_addRecent" {}
+   "stickers_recent" {}
+   "stickers_buyPrepareTx" {}
+   "stickers_processPending" {}
+   "stickers_addPending" {}
+   "stickers_pending" {}})
 
 (defn on-error-retry
   [call-method {:keys [method number-of-retries delay on-error] :as arg}]

src/status_im/events.cljs

@@ -63,7 +63,9 @@
             [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.wallet-connect-legacy.core
+            status-im.navigation2
+            status-im.navigation2.core))
 
 (re-frame/reg-fx
  :dismiss-keyboard

src/status_im/group_chats/core.cljs

@@ -8,7 +8,8 @@
             [status-im.navigation :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.constants :as constants]
-            [status-im.i18n.i18n :as i18n]))
+            [status-im.i18n.i18n :as i18n]
+            [status-im.notifications-center.core :as notification-center]))
 
 (fx/defn navigate-chat-updated
   {:events [:navigate-chat-updated]}
@@ -20,9 +21,11 @@
 
 (fx/defn handle-chat-removed
   {:events [:chat-removed]}
-  [_ response]
-  {:dispatch-n [[:sanitize-messages-and-process-response response]
-                [:pop-to-root-tab :chat-stack]]})
+  [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)))
 
 (fx/defn handle-chat-update
   {:events [:chat-updated]}

src/status_im/multiaccounts/login/core.cljs

@@ -18,7 +18,6 @@
             [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]
@@ -143,13 +142,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)
@@ -415,6 +414,11 @@
            (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}]
@@ -440,7 +444,6 @@
               (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)

src/status_im/navigation/core.cljs

@@ -13,7 +13,8 @@
    [status-im.ui.screens.views :as views]
    [status-im.utils.fx :as fx]
    [status-im.utils.platform :as platform]
-   [taoensso.timbre :as log]))
+   [taoensso.timbre :as log]
+   [status-im.multiaccounts.login.core :as login-core]))
 
 (def debug? ^boolean js/goog.DEBUG)
 
@@ -26,6 +27,9 @@
 (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)
@@ -203,7 +207,8 @@
                                     (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)))))
+                                      (.setRoot Navigation (clj->js (get (roots/roots) @root-id)))
+                                      (re-frame/dispatch [::login-core/check-last-chat])))
                                   (.hide ^js splash-screen))))
 
 (defn get-screen-component [comp]

src/status_im/navigation2.cljs

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

src/status_im/navigation2/core.cljs

@@ -0,0 +1,77 @@
+(ns status-im.navigation2.core
+  (:require [re-frame.core :as re-frame]
+            [status-im.ui.screens.views :as views]
+            [status-im.navigation2.utils :as nav2-utils]
+            [status-im.navigation2.roots :as roots]
+            [status-im.navigation.roots :as nav-roots]
+            ["react-native-navigation" :refer (Navigation)]))
+
+(def tab-key-idx {:home        0
+                  :communities 1
+                  :wallet      2
+                  :browser     3})
+
+(defonce set-navigation-default-options
+  (.setDefaultOptions Navigation (clj->js {:options {:topBar {:visible false}}})))
+
+;; TODO (parvesh) - improve open-modal and close-modal
+(defn open-modal [comp]
+  (.showModal Navigation
+              (clj->js {:stack {:children
+                                [{:component
+                                  {:name      comp
+                                   :id        comp
+                                   :options   {:topBar {:visible false}}}}]}})))
+
+(defn close-modal [_])
+
+(defn close-all-modals []
+  (.dismissAllModals Navigation))
+
+(defn get-id [comp id]
+  (str comp "-" id))
+
+(defn get-options [show-topbar? options]
+  (if show-topbar?
+    (merge options
+           (nav-roots/status-bar-options)
+           (nav-roots/merge-top-bar (nav-roots/topbar-options) options))
+    {:topBar {:visible false}}))
+
+(defn change-stack-root [[comp _]]
+  (let [{:keys [options]} (get views/screens comp)]
+    (.setStackRoot Navigation
+                   (name comp)
+                   (clj->js {:stack {:id       comp
+                                     :children [{:component {:id      comp
+                                                             :name    comp
+                                                             :options (get-options false options)}}]}}))))
+
+(defn navigate [[comp _]]
+  (let [{:keys [options]} (get views/screens comp)]
+    (reset! nav2-utils/container-stack-view-id comp)
+    (.push Navigation
+           (name :home-stack)
+           (clj->js {:stack {:id       comp
+                             :children [{:component {:id      comp
+                                                     :name    comp
+                                                     :options (get-options false options)}}]}}))))
+
+(defn navigate-from-switcher [[comp id from-home?]]
+  (if from-home?
+    (navigate [comp id])
+    (change-stack-root [comp id])))
+
+(re-frame/reg-fx
+ :init-root-fx-nav2
+ (fn [new-root-id]
+   (reset! nav2-utils/container-stack-view-id new-root-id)
+   (.setRoot Navigation (clj->js (get (roots/roots) new-root-id)))))
+
+(re-frame/reg-fx :open-modal-fx-nav2 open-modal)
+
+(re-frame/reg-fx :close-modal-fx-nav2 close-modal)
+
+(re-frame/reg-fx :navigate-to-fx-nav2 navigate)
+
+(re-frame/reg-fx :navigate-from-switcher-fx navigate-from-switcher)

src/status_im/navigation2/home_stack.cljs

@@ -0,0 +1,27 @@
+(ns status-im.navigation2.home-stack
+  (:require [quo.react-native :as rn]
+            [quo2.screens.main :as quo2.preview]
+            [status-im.switcher.switcher :as switcher]
+            [status-im.ui.screens.home.views :as home]
+            [status-im.switcher.constants :as switcher-constants]
+            [status-im.ui.screens.browser.empty-tab.views :as empty-tab]
+            [status-im.ui.screens.wallet.accounts.views :as wallet.accounts]
+            [status-im.switcher.bottom-tabs :as bottom-tabs]))
+
+;; TODO(parvesh) - improve stack changing performance (load all stacks at once)
+(defn stack-view []
+  (let [{:keys [width height]} (switcher-constants/dimensions)]
+       ;; bottom-tabs-height     (switcher-constants/bottom-tabs-height)]
+    [rn/view {:style {:width  width
+                      :height (- height 80)}} ;; TODO(parvesh) - add height for ios
+     (case @bottom-tabs/selected-tab-id
+       :chats-stack       [home/home]
+       :communities-stack [quo2.preview/main-screen]
+       :wallet-stack      [wallet.accounts/accounts-overview]
+       :browser-stack     [empty-tab/empty-tab])]))
+
+(defn home []
+  [:<>
+   [stack-view]
+   [bottom-tabs/bottom-tabs]
+   [switcher/switcher :home-stack]])

src/status_im/navigation2/roots.cljs

@@ -0,0 +1,9 @@
+(ns status-im.navigation2.roots)
+
+(defn roots []
+  {:home-stack
+   {:root
+    {:stack {:id       :home-stack
+             :children [{:component {:name    :home-stack
+                                     :id      :home-stack
+                                     :options {:topBar {:visible false}}}}]}}}})

src/status_im/navigation2/screens.cljs

@@ -0,0 +1,6 @@
+(ns status-im.navigation2.screens
+  (:require [status-im.navigation2.home-stack :as home-stack]))
+
+(def screens [{:name      :home-stack
+               :insets    {:top false}
+               :component home-stack/home}])

src/status_im/navigation2/stack_with_switcher.cljs

@@ -0,0 +1,7 @@
+(ns status-im.navigation2.stack-with-switcher
+  (:require [status-im.switcher.switcher :as switcher]))
+
+(defn overlap-stack [comp view-id]
+  [:<>
+   [comp]
+   [switcher/switcher view-id]])

src/status_im/navigation2/utils.cljs

@@ -0,0 +1,3 @@
+(ns status-im.navigation2.utils)
+
+(defonce container-stack-view-id (atom nil))

src/status_im/notifications/core.cljs

@@ -102,18 +102,19 @@
      (pn-android/disable-notifications)
      (.abandonPermissions ^js pn-ios))))
 
-(re-frame/reg-fx
- :clear-message-notifications
- (fn [chat-id]
-   (when platform/android?
-     (pn-android/clear-message-notifications chat-id))))
+(defn clear-all-message-notifications []
+  (if platform/android?
+    (pn-android/clear-all-message-notifications)
+    (.removeAllDeliveredNotifications ^js pn-ios)))
 
 (re-frame/reg-fx
- :clear-multiple-message-notifications
- (fn [chat-ids]
-   (when platform/android?
-     (doseq [chat-id chat-ids]
-       (pn-android/clear-message-notifications chat-id)))))
+ :clear-message-notifications
+ (fn [[chat-ids remote-push-notifications-enabled?]]
+   (if remote-push-notifications-enabled?
+     (clear-all-message-notifications)
+     (when platform/android?
+       (doseq [chat-id chat-ids]
+         (pn-android/clear-message-notifications chat-id))))))
 
 (fx/defn handle-enable-notifications-event
   {:events [:notifications/registered-for-push-notifications]}

src/status_im/pairing/core.cljs

@@ -43,12 +43,10 @@
     (= our-installation-id (:installation-id b))
     1
     :else
-    (let [enabled-compare (compare (:enabled? b)
-                                   (:enabled? a))]
+    (let [enabled-compare (compare (:enabled? b) (:enabled? a))]
       (if (not= 0 enabled-compare)
         enabled-compare
-        (compare (:timestamp b)
-                 (:timestamp a))))))
+        (compare (:timestamp a) (:timestamp b))))))
 
 (defn sort-installations
   [our-installation-id installations]
@@ -189,10 +187,10 @@
                        :params     [(or preferred-name name) identicon]
                        :on-success #(log/debug "successfully synced devices")}]}))
 
-(defn installation<-rpc [{:keys [metadata id enabled]}]
+(defn installation<-rpc [{:keys [metadata id enabled timestamp]}]
   {:installation-id id
    :name (:name metadata)
-   :timestamp (:timestamp metadata)
+   :timestamp timestamp
    :device-type (:deviceType metadata)
    :enabled? enabled})
 

src/status_im/stickers/core.cljs

@@ -1,24 +1,13 @@
 (ns status-im.stickers.core
-  (:require [cljs.reader :as edn]
-            [clojure.set :as clojure.set]
-            [clojure.string :as string]
+  (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
-            [status-im.ethereum.abi-spec :as abi-spec]
-            [status-im.ethereum.contracts :as contracts]
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.navigation :as navigation]
-            [status-im.multiaccounts.update.core :as multiaccounts.update]
-            [status-im.signing.core :as signing]
-            [status-im.utils.contenthash :as contenthash]
             [status-im.utils.fx :as fx]
-            [status-im.utils.utils :as utils]))
-
-(defn pack-data-callback
-  [id]
-  (fn [[_ _ _ _ price contenthash]]
-    (when-let [url (contenthash/url contenthash)]
-      (re-frame/dispatch [:stickers/load-pack url id price]))))
+            [status-im.utils.utils :as utils]
+            [status-im.utils.config :as config]
+            [status-im.constants :as constants]))
 
 (re-frame/reg-fx
  :stickers/set-pending-timeout-fx
@@ -26,193 +15,109 @@
    (utils/set-timeout #(re-frame/dispatch [:stickers/pending-timeout])
                       10000)))
 
-(defn eth-call-pack-data
-  [contract id]
-  (json-rpc/eth-call
-   {:contract contract
-    ;; Returns vector of pack data parameters by pack id:
-    ;; [category owner mintable timestamp price contenthash]
-    :method "getPackData(uint256)"
-    :params [id]
-    :outputs ["bytes4[]" "address" "bool" "uint256" "uint256" "bytes"]
-    :on-success (pack-data-callback id)}))
-
-(re-frame/reg-fx
- :stickers/pack-data-fx
- (fn [[contract id]]
-   (eth-call-pack-data contract id)))
-
-(re-frame/reg-fx
- :stickers/load-packs-fx
- (fn [[contract]]
-   (json-rpc/eth-call
-    {:contract contract
-     ;; Returns number of packs registered in the contract
-     :method "packCount()"
-     :outputs ["uint256"]
-     :on-success
-     (fn [[count]]
-       (dotimes [id count]
-         (eth-call-pack-data contract id)))})))
-
-(re-frame/reg-fx
- :stickers/owned-packs-fx
- (fn [[contract address]]
-   (json-rpc/eth-call
-    {:contract contract
-     ;; Returns vector of owned tokens ids in the contract by address
-     :method "balanceOf(address)"
-     :params [address]
-     :outputs ["uint256"]
-     :number-of-retries 3
-     :on-success
-     (fn [[count]]
-       (dotimes [id count]
-         (json-rpc/eth-call
-          {:contract contract
-           ;; Returns pack id in the contract by token id
-           :method "tokenOfOwnerByIndex(address,uint256)"
-           :params [address id]
-           :outputs ["uint256"]
-           :number-of-retries 3
-           :on-success
-           (fn [[token-id]]
-             (json-rpc/eth-call
-              {:contract contract
-               ;; Returns pack id in the contract by token id
-               :method "tokenPackId(uint256)"
-               :params [token-id]
-               :outputs ["uint256"]
-               :number-of-retries 3
-               :on-success
-               (fn [[pack-id]]
-                 (re-frame/dispatch [:stickers/pack-owned pack-id]))}))})))})))
-
-(fx/defn init-stickers-packs
-  [{:keys [db] :as cofx}]
-  (let [sticker-packs (get-in db [:multiaccount :stickers/packs-installed])
-        pending-packs (get-in db [:multiaccount :stickers/packs-pending] #{})]
-    (cond-> {:db (assoc db
-                        :stickers/packs-installed sticker-packs
-                        :stickers/packs sticker-packs
-                        :stickers/packs-pending pending-packs)}
-      (not-empty pending-packs)
-      (assoc :stickers/set-pending-timeout-fx nil))))
-
 (fx/defn install-stickers-pack
   {:events [:stickers/install-pack]}
-  [{{:keys [multiaccount] :as db} :db :as cofx} id]
-  (let [pack (get-in db [:stickers/packs id])]
-    (fx/merge
-     cofx
-     {:db (-> db
-              (assoc-in [:stickers/packs-installed id] pack))}
-     ;;(assoc :stickers/selected-pack id))} TODO it doesn't scroll to selected pack on Android
-     (multiaccounts.update/multiaccount-update
-      :stickers/packs-installed
-      (assoc (:stickers/packs-installed multiaccount) id pack)
-      {}))))
-
-(defn valid-sticker? [sticker]
-  (contains? sticker :hash))
-
-(fx/defn load-sticker-pack-success
-  {:events [:stickers/load-sticker-pack-success]}
-  [{:keys [db] :as cofx} edn-string id price]
-  (let [{:keys [stickers] :as pack} (assoc (get (edn/read-string edn-string) 'meta)
-                                           :id id :price price)]
-    (fx/merge cofx
-              {:db (cond-> db
-                     (and (seq stickers)
-                          (every? valid-sticker? stickers))
-                     (assoc-in [:stickers/packs id] pack))})))
-
-(fx/defn open-sticker-pack
-  {:events [:stickers/open-sticker-pack]}
-  [{{:stickers/keys [packs packs-installed] :networks/keys [current-network] :as db} :db :as cofx} id]
-  (when (and id (string/starts-with? current-network "mainnet"))
-    (let [pack    (or (get packs-installed id)
-                      (get packs id))
-          contract-address (contracts/get-address db :status/stickers)
-          pack-contract (contracts/get-address db :status/sticker-pack)
-          address  (ethereum/default-address db)]
-      (fx/merge cofx
-                (navigation/open-modal :stickers-pack {:id id})
-                #(when (and contract-address (not pack))
-                   {:stickers/pack-data-fx [contract-address id]
-                    :stickers/owned-packs-fx [pack-contract address]})))))
-
-(fx/defn load-pack
-  {:events [:stickers/load-pack]}
-  [_ url id price]
-  {:http-get {:url url
-              :on-success
-              (fn [o]
-                (re-frame/dispatch [:stickers/load-sticker-pack-success o id price]))}})
+  [{db :db :as cofx} id]
+  (fx/merge
+   cofx
+   {:db             (assoc-in db [:stickers/packs id :status] constants/sticker-pack-status-installed)
+    ::json-rpc/call [{:method     "stickers_install"
+                      :params     [(ethereum/chain-id db) id]
+                      :on-success #()}]}))
 
 (fx/defn load-packs
   {:events [:stickers/load-packs]}
   [{:keys [db]}]
-  (let [contract      (contracts/get-address db :status/stickers)
-        pack-contract (contracts/get-address db :status/sticker-pack)
-        address       (ethereum/default-address db)]
-    (when contract
-      {:stickers/owned-packs-fx [pack-contract address]
-       :stickers/load-packs-fx [contract]})))
+  {::json-rpc/call [{:method     "stickers_market"
+                     :params     [(ethereum/chain-id db)]
+                     :on-success #(re-frame/dispatch [:stickers/stickers-market-success %])}
+                    {:method     "stickers_installed"
+                     :params     []
+                     :on-success #(re-frame/dispatch [:stickers/stickers-installed-success %])}
+                    {:method     "stickers_pending"
+                     :params     []
+                     :on-success #(re-frame/dispatch [:stickers/stickers-pending-success %])}
+                    {:method     "stickers_recent"
+                     :params     []
+                     :on-success #(re-frame/dispatch [:stickers/stickers-recent-success %])}]})
 
-(fx/defn approve-pack
+(fx/defn buy-pack
   {:events [:stickers/buy-pack]}
-  [{db :db :as cofx} pack-id price]
-  (let [address                 (ethereum/default-address db)
-        sticker-market-contract (contracts/get-address db :status/sticker-market)
-        snt-contract            (contracts/get-address db :status/snt)]
-    (signing/eth-transaction-call
-     cofx
-     {:contract snt-contract
-      :method "approveAndCall(address,uint256,bytes)"
-      :params [sticker-market-contract
-               price
-               (abi-spec/encode "buyToken(uint256,address,uint256)" [pack-id address price])]
-      :on-result [:stickers/pending-pack pack-id]})))
+  [{db :db} pack-id]
+  {::json-rpc/call [{:method     "stickers_buyPrepareTx"
+                     :params     [(ethereum/chain-id db) (ethereum/default-address db) (int pack-id)]
+                     :on-success #(re-frame/dispatch [:signing.ui/sign
+                                                      {:tx-obj    %
+                                                       :on-result [:stickers/pending-pack pack-id]}])}]})
 
 (fx/defn pending-pack
   {:events [:stickers/pending-pack]}
-  [{{:keys [multiaccount] :as db} :db :as cofx} id]
-  (let [contract (contracts/get-address db :status/sticker-pack)
-        address  (ethereum/default-address db)
-        pending (get multiaccount :stickers/packs-pending #{})]
-    (when contract
-      (fx/merge cofx
-                {:db (update db :stickers/packs-pending conj id)
-                 :stickers/owned-packs-fx [contract address]}
-                (multiaccounts.update/multiaccount-update
-                 :stickers/packs-pending
-                 (conj pending id)
-                 {})
-                #(when (zero? (count (:stickers/packs-pending db)))
-                   {:stickers/set-pending-timeout-fx nil})))))
+  [{db :db} id]
+  {:db                              (-> db
+                                        (assoc-in [:stickers/packs id :status] constants/sticker-pack-status-pending)
+                                        (update :stickers/packs-pending conj id))
+   :stickers/set-pending-timeout-fx nil
+   ::json-rpc/call                  [{:method     "stickers_addPending"
+                                      :params     [(ethereum/chain-id db) (int id)]
+                                      :on-success #()}]})
 
 (fx/defn pending-timeout
   {:events [:stickers/pending-timeout]}
-  [{{:stickers/keys [packs-pending packs-owned] :as db} :db :as cofx}]
-  (let [packs-diff (clojure.set/difference packs-pending packs-owned)
-        contract   (contracts/get-address db :status/sticker-pack)
-        address    (ethereum/default-address db)]
-    (when contract
-      (fx/merge cofx
-                (merge {:db (assoc db :stickers/packs-pending packs-diff)}
-                       (when-not (zero? (count packs-diff))
-                         {:stickers/owned-packs-fx [contract address]
-                          :stickers/set-pending-timeout-fx nil}))
-                (multiaccounts.update/multiaccount-update
-                 :stickers/packs-pending
-                 packs-diff
-                 {})))))
+  [{{:stickers/keys [packs-pending] :as db} :db}]
+  (when (seq packs-pending)
+    {::json-rpc/call [{:method     "stickers_processPending"
+                       :params     [(ethereum/chain-id db)]
+                       :on-success #(re-frame/dispatch [:stickers/stickers-process-pending-success %])}]}))
 
-(fx/defn pack-owned
-  {:events [:stickers/pack-owned]}
-  [{db :db} id]
-  {:db (update db :stickers/packs-owned conj id)})
+(fx/defn stickers-process-pending-success
+  {:events [:stickers/stickers-process-pending-success]}
+  [{{:stickers/keys [packs-pending packs] :as db} :db} purchased]
+  (let [purchased-ids (map :id (vals purchased))
+        packs-pending (apply disj packs-pending purchased-ids)
+        packs (reduce (fn [packs id]
+                        (assoc-in packs [id :status] constants/sticker-pack-status-owned))
+                      packs
+                      purchased-ids)]
+    (merge
+     {:db (-> db
+              (assoc :stickers/packs packs)
+              (assoc :stickers/packs-pending packs-pending))}
+     (when (seq packs-pending)
+       {:stickers/set-pending-timeout-fx nil}))))
+
+(fx/defn stickers-market-success
+  {:events [:stickers/stickers-market-success]}
+  [{:keys [db]} packs]
+  (let [packs (reduce (fn [acc pack] (assoc acc (:id pack) pack)) {} packs)]
+    {:db (update db :stickers/packs merge packs)}))
+
+(fx/defn stickers-installed-success
+  {:events [:stickers/stickers-installed-success]}
+  [{:keys [db]} packs]
+  (let [packs (reduce (fn [acc [_ pack]] (assoc acc (:id pack) pack)) {} packs)]
+    {:db (update db :stickers/packs merge packs)}))
+
+(fx/defn stickers-pending-success
+  {:events [:stickers/stickers-pending-success]}
+  [{:keys [db]} packs]
+  (let [packs (reduce (fn [acc [_ pack]] (assoc acc (:id pack) pack)) {} packs)]
+    (merge
+     {:db (-> db
+              (assoc :stickers/packs-pending (into #{} (keys packs)))
+              (update :stickers/packs merge packs))}
+     (when (seq packs)
+       {:stickers/set-pending-timeout-fx nil}))))
+
+(fx/defn stickers-recent-success
+  {:events [:stickers/stickers-recent-success]}
+  [{:keys [db]} packs]
+  {:db (assoc db :stickers/recent-stickers packs)})
+
+(fx/defn open-sticker-pack
+  {:events [:stickers/open-sticker-pack]}
+  [{{:networks/keys [current-network]} :db :as cofx} id]
+  (when (and id (or config/stickers-test-enabled? (string/starts-with? current-network "mainnet")))
+    (navigation/open-modal cofx :stickers-pack {:id id})))
 
 (fx/defn select-pack
   {:events [:stickers/select-pack]}

src/status_im/stickers/core_test.cljs

@@ -1,7 +0,0 @@
-(ns status-im.stickers.core-test
-  (:require [cljs.test :refer-macros [deftest is]]
-            [status-im.stickers.core :as stickers]))
-
-(deftest valid-sticker?
-  (is (true?  (stickers/valid-sticker? {:hash ""})))
-  (is (false? (stickers/valid-sticker? {}))))

src/status_im/subs.cljs

@@ -87,6 +87,7 @@
 (reg-root-key-sub :home-items-show-number :home-items-show-number)
 (reg-root-key-sub :waku/v2-peer-stats :peer-stats)
 (reg-root-key-sub :visibility-status-updates :visibility-status-updates)
+(reg-root-key-sub :navigation2/navigation2-stacks :navigation2/navigation2-stacks)
 
 ;;NOTE this one is not related to ethereum network
 ;; it is about cellular network/ wifi network
@@ -136,9 +137,7 @@
 ;;stickers
 (reg-root-key-sub :stickers/selected-pack :stickers/selected-pack)
 (reg-root-key-sub :stickers/packs :stickers/packs)
-(reg-root-key-sub :stickers/installed-packs :stickers/packs-installed)
-(reg-root-key-sub :stickers/packs-owned :stickers/packs-owned)
-(reg-root-key-sub :stickers/packs-pending :stickers/packs-pending)
+(reg-root-key-sub :stickers/recent-stickers :stickers/recent-stickers)
 
 ;;mailserver
 (reg-root-key-sub :mailserver/current-id :mailserver/current-id)
@@ -1336,7 +1335,7 @@
  (fn [[{:keys [processing]} sending-image mainnet? one-to-one-chat? {:keys [public?]} reply edit]]
    (let [sending-image (seq sending-image)]
      {:send          (not processing)
-      :stickers      (and mainnet?
+      :stickers      (and (or config/stickers-test-enabled? mainnet?)
                           (not sending-image)
                           (not reply))
       :image         (and (not reply)
@@ -1515,23 +1514,20 @@
 ;;STICKERS =============================================================================================================
 
 (re-frame/reg-sub
- :stickers/installed-packs-vals
- :<- [:stickers/installed-packs]
+ :stickers/installed-packs
+ :<- [:stickers/packs]
  (fn [packs]
-   (vals packs)))
+   (filter #(= (:status %) constants/sticker-pack-status-installed) (vals packs))))
 
 (re-frame/reg-sub
  :stickers/all-packs
  :<- [:stickers/packs]
- :<- [:stickers/installed-packs]
- :<- [:stickers/packs-owned]
- :<- [:stickers/packs-pending]
- (fn [[packs installed owned pending]]
-   (map (fn [{:keys [id] :as pack}]
-          (cond-> pack
-            (get installed id) (assoc :installed true)
-            (get owned id) (assoc :owned true)
-            (get pending id) (assoc :pending true)))
+ (fn [packs]
+   (map (fn [{:keys [status] :as pack}]
+          (-> pack
+              (assoc :installed (= status constants/sticker-pack-status-installed))
+              (assoc :pending (= status constants/sticker-pack-status-pending))
+              (assoc :owned (= status constants/sticker-pack-status-owned))))
         (vals packs))))
 
 (re-frame/reg-sub
@@ -1541,19 +1537,6 @@
  (fn [[{:keys [id]} packs]]
    (first (filter #(= (:id %) id) packs))))
 
-(defn find-pack-id-for-hash [sticker-uri packs]
-  (some (fn [{:keys [stickers id]}]
-          (when (some #(= sticker-uri (:hash %)) stickers)
-            id))
-        packs))
-
-(re-frame/reg-sub
- :stickers/recent
- :<- [:multiaccount]
- :<- [:stickers/installed-packs-vals]
- (fn [[{:keys [:stickers/recent-stickers]} packs]]
-   (map (fn [hash] {:hash hash :pack (find-pack-id-for-hash hash packs)}) recent-stickers)))
-
 ;;HOME ==============================================================================================================
 
 (def memo-home-items (atom nil))
@@ -2339,6 +2322,13 @@
  (fn [[contact] _]
    (:added contact)))
 
+(re-frame/reg-sub
+ :contacts/contact-blocked?
+ (fn [[_ identity] _]
+   [(re-frame/subscribe [:contacts/contact-by-identity identity])])
+ (fn [[contact] _]
+   (:blocked contact)))
+
 (re-frame/reg-sub
  :contacts/contact-two-names-by-identity
  (fn [[_ identity] _]
@@ -2957,3 +2947,19 @@
  :<- [:bookmarks]
  (fn [bookmarks]
    (into {} (remove #(:removed (second %)) bookmarks))))
+
+;; NAVIGATION2
+
+
+(re-frame/reg-sub
+ :navigation2/switcher-cards
+ :<- [:navigation2/navigation2-stacks]
+ (fn [stacks [_ toggle-switcher-screen]]
+   (sort-by :clock >
+            (reduce (fn [acc stack-vector]
+                      (let [{:keys [type clock id]} (get stack-vector 1)]
+                        (conj acc {:type  type
+                                   :clock clock
+                                   :id    id
+                                   :toggle-switcher-screen toggle-switcher-screen})))
+                    '() stacks))))

src/status_im/switcher/animation.cljs

@@ -0,0 +1,47 @@
+(ns status-im.switcher.animation
+  (:require [quo.react-native :as rn]
+            [reagent.core :as reagent]
+            [status-im.switcher.constants :as constants]
+            [status-im.ui.components.animation :as anim]))
+
+(def bottom-tabs-opacity (anim/create-value 1))
+(def bottom-tabs-position (anim/create-value 0))
+
+;; TODO(parvesh): Use 300, after using dispatch-later for opening card(otherwise pending animation issue)
+;; or OnAnimationEnd
+(def layout-animation #js {:duration 250
+                           :create   #js {:type     (:ease-in-ease-out rn/layout-animation-types)
+                                          :property (:scale-xy rn/layout-animation-properties)}
+                           :update   #js {:type     (:ease-in-ease-out rn/layout-animation-types)
+                                          :property (:scale-xy rn/layout-animation-properties)}
+                           :delete   #js {:type     (:ease-in-ease-out rn/layout-animation-types)
+                                          :property (:scale-xy rn/layout-animation-properties)}})
+
+(defn animate-layout [show? anim-values]
+  (let [{:keys [width height]} (constants/dimensions)
+        target-radius          (- (max width height)
+                                  constants/switcher-button-radius)]
+    (rn/configure-next layout-animation)
+    (reset! (:switcher-screen-radius anim-values) (if show? target-radius 1))
+    (reagent/flush)))
+
+(defn timing-animation [property toValue]
+  (anim/timing property {:toValue         toValue
+                         :duration        300
+                         :useNativeDriver true}))
+
+(defn animate-components [show? view-id anim-values]
+  (anim/start
+   (anim/parallel
+    (into
+     [(timing-animation (:switcher-button-opacity anim-values) (if show? 0 1))
+      (timing-animation (:switcher-close-button-icon-opacity anim-values) (if show? 1 0))
+      (timing-animation (:switcher-close-button-background-opacity anim-values) (if show? 0.2 0))]
+     (when (= view-id :home-stack)
+       [(timing-animation bottom-tabs-opacity (if show? 0 1))
+        (timing-animation bottom-tabs-position (if show? (constants/bottom-tabs-height) 0))])))))
+
+(defn animate [show? view-id anim-values]
+  (reagent/flush)
+  (animate-layout show? anim-values)
+  (animate-components show? view-id anim-values))

src/status_im/switcher/bottom_tabs.cljs

@@ -0,0 +1,30 @@
+(ns status-im.switcher.bottom-tabs
+  (:require [quo.react-native :as rn]
+            [reagent.core :as reagent]
+            [status-im.switcher.styles :as styles]
+            [status-im.ui.components.icons.icons :as icons]))
+
+(def selected-tab-id (reagent/atom :chats-stack))
+
+(defn bottom-tab-pressed [tab-id]
+  (when-not (= tab-id @selected-tab-id)
+    (reset! selected-tab-id tab-id)))
+
+;; TODO(parvesh) - reimplement tab with counter, once design is complete
+;;                 (implement natively, for performance improvement)
+(defn bottom-tab [icon tab-id]
+  [rn/touchable-opacity {:style          {:padding 15}
+                         :active-opacity 1
+                         :on-press       #(bottom-tab-pressed tab-id)}
+   [icons/icon icon (styles/bottom-tab-icon
+                     (if (= tab-id @selected-tab-id)
+                       :bottom-tabs-selected-tab
+                       :bottom-tabs-non-selected-tab))]])
+
+(defn bottom-tabs []
+  [rn/animated-view {:style (styles/bottom-tabs)}
+   [bottom-tab :main-icons/redesign-messages :chats-stack]
+   [bottom-tab :main-icons/communities :communities-stack]
+   [rn/view {:width 10}]
+   [bottom-tab :main-icons/redesign-wallet :wallet-stack]
+   [bottom-tab :main-icons/browser :browser-stack]])

src/status_im/switcher/cards/messaging_card.cljs

@@ -0,0 +1,30 @@
+(ns status-im.switcher.cards.messaging-card
+  (:require [quo.react-native :as rn]
+            [quo2.components.text :as text]
+            [status-im.constants :as constants]
+            [quo2.components.button :as button]
+            [status-im.utils.handlers :refer [>evt <sub]]
+            [status-im.switcher.cards.styles :as styles]))
+
+(defn on-press [id toggle-switcher-screen]
+  (toggle-switcher-screen)
+  (>evt [:chat.ui/navigate-to-chat-nav2 id true]))
+
+;; TODO - add last message for other content types
+(defn last-message [{:keys [content content-type]}]
+  (cond
+    (= constants/content-type-text content-type)
+    [text/text (styles/messaging-card-last-message-text-props) (:text content)]))
+
+(defn card [{:keys [id toggle-switcher-screen]}]
+  (let [chat (<sub [:chats/chat id])]
+    [rn/touchable-without-feedback {:on-press #(on-press id toggle-switcher-screen)}
+     [rn/view {:style (styles/messaging-card-main-container)}
+      [rn/view {:style (styles/messaging-card-secondary-container)}
+       [text/text (styles/messaging-card-title-props) (:alias chat)]
+       [text/text (styles/messaging-card-subtitle-props) "Message"]
+       [rn/view {:style (styles/messaging-card-details-container)}
+        [last-message (:last-message chat)]]]
+      [rn/view {:style (styles/messaging-card-avatar-container)}]
+      [button/button (styles/messaging-card-close-button-props) :main-icons/close]]]))
+

src/status_im/switcher/cards/styles.cljs

@@ -0,0 +1,103 @@
+(ns status-im.switcher.cards.styles
+  (:require [quo.theme :as theme]
+            [quo2.foundations.colors :as colors]))
+
+(def themes
+  {:light {:messaging-card-container-background-color           "#26A69A"
+           :messaging-card-secondary-container-background-color colors/white
+           :messaging-card-title-color                          colors/black
+           :messaging-card-subtitle-color                       colors/neutral-50
+           :messaging-card-last-message-text-color              colors/black
+           :messaging-card-close-button-bg-color                colors/white-opa-50
+           :messaging-card-close-button-icon-color              colors/black}
+   :dark  {:messaging-card-container-background-color           "#26A69A"
+           :messaging-card-secondary-container-background-color colors/neutral-90
+           :messaging-card-title-color                          colors/white
+           :messaging-card-subtitle-color                       colors/neutral-40
+           :messaging-card-last-message-text-color              colors/white
+           :messaging-card-close-button-bg-color                colors/neutral-80-opa-60
+           :messaging-card-close-button-icon-color              colors/white}})
+
+(defn get-color [key]
+  (get-in themes [(theme/get-theme) key]))
+
+;; Messaging Card
+
+(defn messaging-card-main-container []
+  {:width            160
+   :height           172
+   :border-radius    16
+   :margin           8
+   :background-color (get-color :messaging-card-container-background-color)})
+
+(defn messaging-card-secondary-container []
+  {:width            160
+   :height           132
+   :background-color (get-color :messaging-card-secondary-container-background-color)
+   :border-radius    16
+   :position         :absolute
+   :bottom           0})
+
+(defn messaging-card-title []
+  {:position          :absolute
+   :top               32
+   :margin-horizontal 12
+   :color             (get-color :messaging-card-title-color)})
+
+(defn messaging-card-title-props []
+  {:size            :paragraph-1
+   :weight          :semi-bold
+   :number-of-lines 1
+   :ellipsize-mode  :tail
+   :style           (messaging-card-title)})
+
+(defn messaging-card-subtitle []
+  {:position          :absolute
+   :top               54
+   :margin-horizontal 12
+   :color             (get-color :messaging-card-subtitle-color)})
+
+(defn messaging-card-subtitle-props []
+  {:size            :paragraph-2
+   :weight          :medium
+   :style           (messaging-card-subtitle)})
+
+(defn messaging-card-details-container []
+  {:position          :absolute
+   :bottom            12
+   :margin-horizontal 12
+   :width             136
+   :height            36})
+
+(defn messaging-card-last-message-text []
+  {:color           (get-color :messaging-card-last-message-text-color)})
+
+(defn messaging-card-last-message-text-props []
+  {:size            :paragraph-2
+   :weight          :regular
+   :number-of-lines 2
+   :ellipsize-mode  :tail
+   :style           (messaging-card-last-message-text)})
+
+(defn messaging-card-close-button []
+  {:position         :absolute
+   :right            8
+   :top              8
+   :background-color (get-color :messaging-card-close-button-bg-color)
+   :icon-color       (get-color :messaging-card-icon-color)})
+
+(defn messaging-card-close-button-props []
+  {:size  24
+   :type  :grey
+   :icon  true
+   :on-press #(print "close pressed")
+   :style (messaging-card-close-button)})
+
+(defn messaging-card-avatar-container []
+  {:width    48
+   :height   48
+   :border-radius 24
+   :position :absolute
+   :left     12
+   :top      16
+   :background-color :pink})

src/status_im/switcher/constants.cljs

@@ -0,0 +1,32 @@
+(ns status-im.switcher.constants
+  (:require [status-im.utils.handlers :refer [<sub]]
+            [status-im.utils.platform :as platform]))
+
+(def switcher-button-radius 24)
+
+(def switcher-button-size
+  (* switcher-button-radius 2))
+
+(def switcher-bottom-positions
+  {:android
+   {:home-stack 17
+    :chat       57}
+   :ios
+   {:home-stack 35
+    :chat       67}})
+
+(defn switcher-bottom-position [view-id]
+  (get-in
+   switcher-bottom-positions
+   [(keyword platform/os) view-id]))
+
+(defn switcher-center-position [view-id]
+  (+ (switcher-bottom-position view-id) (/ switcher-button-size 2)))
+
+;; TODO(parvesh) - use different height for android and ios(Confirm from Design)
+(defn bottom-tabs-height []
+  (if platform/android? 55 80))
+
+;; TODO - move to switcher/utils.cljs
+(defn dimensions []
+  (<sub [:dimensions/window]))

src/status_im/switcher/styles.cljs

@@ -0,0 +1,97 @@
+(ns status-im.switcher.styles
+  (:require [quo.theme :as theme]
+            [quo2.foundations.colors :as colors]
+            [status-im.switcher.constants :as constants]
+            [status-im.switcher.animation :as animation]))
+
+(def themes
+  {:light {:bottom-tabs-bg-color           colors/neutral-80
+           :bottom-tabs-on-scroll-bg-color colors/neutral-80-opa-80
+           :bottom-tabs-non-selected-tab   colors/neutral-50
+           :bottom-tabs-selected-tab       colors/white}
+   :dark  {:bottom-tabs-bg-color           colors/neutral-80
+           :bottom-tabs-on-scroll-bg-color colors/neutral-80-opa-60
+           :bottom-tabs-non-selected-tab   colors/neutral-40
+           :bottom-tabs-selected-tab       colors/white}})
+
+(defn get-color [key]
+  (get-in themes [(theme/get-theme) key]))
+
+;; Bottom Tabs
+(defn bottom-tab-icon [tab-state]
+  {:width  20
+   :height 20
+   :color  (get-color tab-state)})
+
+(defn bottom-tabs []
+  {:background-color (get-color :bottom-tabs-bg-color)
+   :flex-direction   :row
+   :flex             1
+   :align-items      :center
+   :justify-content  :space-around
+   :height           (constants/bottom-tabs-height)
+   :position         :absolute
+   :bottom           0
+   :right            0
+   :left             0
+   :opacity          animation/bottom-tabs-opacity
+   :transform        [{:translateY animation/bottom-tabs-position}]})
+
+;; Switcher
+(defn switcher-button [opacity]
+  {:width      constants/switcher-button-size
+   :height     constants/switcher-button-size
+   :opacity    opacity})
+
+(defn merge-switcher-button-common-styles [style]
+  (merge
+   {:width           constants/switcher-button-size
+    :height          constants/switcher-button-size
+    :border-radius   constants/switcher-button-radius
+    :position        :absolute
+    :bottom          0
+    :z-index         3
+    :align-items     :center
+    :align-self      :center
+    :justify-content :center}
+   style))
+
+(defn switcher-button-touchable [view-id]
+  (merge-switcher-button-common-styles
+   {:align-self :center
+    :bottom     (constants/switcher-bottom-position view-id)}))
+
+(defn switcher-close-button-background [opacity]
+  (merge-switcher-button-common-styles
+   {:background-color colors/switcher-background
+    :opacity          opacity}))
+
+(defn switcher-close-button-icon [opacity]
+  (merge-switcher-button-common-styles
+   {:opacity          opacity}))
+
+(defn switcher-screen [view-id radius]
+  (let [bottom (- (constants/switcher-center-position view-id) radius)
+        size   (* 2 radius)]
+    (merge-switcher-button-common-styles
+     {:background-color colors/switcher-background-opa-80
+      :bottom           bottom
+      :border-radius    1000
+      :width            size
+      :overflow         :hidden
+      :height           size})))
+
+(defn switcher-screen-container [view-id radius]
+  (let [radius                 radius
+        bottom                 (- radius (constants/switcher-center-position view-id))
+        {:keys [width height]} (constants/dimensions)]
+    {:position         :absolute
+     :align-self       :center
+     :bottom           bottom
+     :width            width
+     :height           (- height 25)
+     :align-items      :center}))
+
+(defn switcher-switch-screen []
+  {:margin-top  40
+   :align-items :center})

src/status_im/switcher/switcher.cljs

@@ -0,0 +1,44 @@
+(ns status-im.switcher.switcher
+  (:require [quo.react-native :as rn]
+            [reagent.core :as reagent]
+            [status-im.switcher.styles :as styles]
+            [status-im.ui.components.animation :as anim]
+            [status-im.switcher.animation :as animation]
+            [status-im.ui.components.icons.icons :as icons]
+            [status-im.react-native.resources :as resources]
+            [status-im.switcher.switcher-container :as switcher-container]))
+
+(defn toggle-switcher-screen [switcher-opened? view-id anim-values]
+  (swap! switcher-opened? not)
+  (animation/animate @switcher-opened? view-id anim-values))
+
+(defn switcher-button [switcher-opened? view-id anim-values]
+  [rn/touchable-opacity {:active-opacity 1
+                         :on-press       #(toggle-switcher-screen switcher-opened? view-id anim-values)
+                         :style          (styles/switcher-button-touchable view-id)}
+   [rn/animated-view {:style (styles/switcher-close-button-background
+                              (:switcher-close-button-background-opacity anim-values))}]
+   [rn/animated-view {:style (styles/switcher-close-button-icon
+                              (:switcher-close-button-icon-opacity anim-values))}
+    [icons/icon :main-icons/close {:color :white}]]
+   [rn/animated-image-view {:source (resources/get-image :status-logo)
+                            :style  (styles/switcher-button
+                                     (:switcher-button-opacity anim-values))}]])
+
+(defn switcher-screen [switcher-opened? view-id anim-values]
+  [rn/view {:style          (styles/switcher-screen
+                             view-id @(:switcher-screen-radius anim-values))
+            :pointer-events (if switcher-opened? :auto :none)}
+   [switcher-container/container
+    view-id @(:switcher-screen-radius anim-values)
+    #(toggle-switcher-screen switcher-opened? view-id anim-values)]])
+
+(defn switcher [view-id]
+  (let [switcher-opened? (reagent/atom false)
+        anim-values      {:switcher-button-opacity                  (anim/create-value 1)
+                          :switcher-close-button-icon-opacity       (anim/create-value 0)
+                          :switcher-close-button-background-opacity (anim/create-value 0)
+                          :switcher-screen-radius                   (reagent/atom 1)}]
+    [:<>
+     [switcher-screen switcher-opened? view-id anim-values]
+     [switcher-button switcher-opened? view-id anim-values]]))

src/status_im/switcher/switcher_container.cljs

@@ -0,0 +1,34 @@
+(ns status-im.switcher.switcher-container
+  (:require [quo.react-native :as rn]
+            status-im.switcher.cards.messaging-card
+            [status-im.switcher.styles :as styles]
+            [status-im.utils.handlers :refer [<sub]]
+            [status-im.switcher.cards.messaging-card :as messaging-card]))
+
+;; TODO - use something like this to avoid multiple renders etc.
+;; (defn switch-screen [toggle-switcher-screen]
+;;   (let [cards (<sub [:navigation2/switcher-cards])
+;;         new-cards (reduce (fn [acc card]
+;;                             (conj acc (assoc card :toggle-switcher-screen toggle-switcher-screen)))
+;;                           () cards)]
+;;     (fn []
+;;       [rn/view {:style (styles/switcher-switch-screen)}
+;;        [rn/flat-list {:width                     352
+;;                       :data                      new-cards
+;;                       :render-fn                 messaging-card/card
+;;                       :num-columns               2
+;;                       :key-fn                    str}]])))
+
+(defn switch-screen [toggle-switcher-screen]
+  (let [cards (<sub [:navigation2/switcher-cards toggle-switcher-screen])]
+    [rn/view {:style (styles/switcher-switch-screen)}
+     [rn/flat-list {:width                     352
+                    :data                      cards
+                    :render-fn                 messaging-card/card
+                    :num-columns               2
+                    :key-fn                    str}]]))
+
+(defn container [view-id switcher-screen-radius toggle-switcher-screen]
+  [rn/view {:style (styles/switcher-screen-container
+                    view-id switcher-screen-radius)}
+   [switch-screen toggle-switcher-screen]])

src/status_im/switcher/utils.cljs

@@ -0,0 +1,6 @@
+(ns status-im.switcher.utils
+  (:require [re-frame.core :as re-frame]))
+
+(def switcher-container-view-id (atom nil))
+
+(re-frame/reg-fx :switcher-container-view-id #(reset! switcher-container-view-id %))