[#12731 ] Blank space in place of 1-1 chat with a blocked user on the home screen

Signed-off-by: andrey <motor4ik@gmail.com> (cherry picked from commit cd30a04626)
[#12720 ] attempt to fix crash on accepting starter pack
2021-10-21 14:32:26 +02:00 · 2021-10-21 13:40:56 +03:00 · 2021-10-20 19:28:32 +01:00 · 2021-10-20 19:27:12 +01:00 · 2021-10-20 16:12:34 +02:00 · 2021-10-20 16:12:34 +02:00
239 changed files with 2730 additions and 5721 deletions
@@ -31,4 +31,3 @@ DATABASE_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 COLLECTIBLES_ENABLED=1
-COMMANDS_ENABLED=1
@@ -68,7 +68,7 @@ Upgrade (e2e):
 - [ ] 3. Upload builds for DO store,  https://dev.status.im/ (Jakub)

 #### 5) At time of publishing
- [ ] 1. Notify marketing to push comms and blog post (Jonny + get review on blog from QA team)
+- [ ] 1. Notify marketing to push comms and blog post (Jonny)
 - [ ] 2. Publish release to app store and playstore
 - [ ] 3. Final push to update prod site https://status.im/,  [instructions](https://github.com/status-im/infra-docs/blob/master/articles/status_release_upload.md) (Jakub - requires credentials to upload) 
 - [ ] 4. Add the link to the post about the release and publish the release: https://github.com/status-im/status-react/releases (Jakub)
@@ -42,7 +42,7 @@ export NIX_CONF_DIR = $(PWD)/nix
 # Location of symlinks to derivations that should not be garbage collected
 export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-react
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
-export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE
+export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE,NIMBUS_SRC_OVERRIDE

 # Useful for Andoird release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
@@ -57,10 +57,13 @@ endif
 # Nix targets
 #----------------

-# WARNING: This has to be located right before all the targets.
+# WARNING: This has to be located right before the targets
+ifdef IN_NIX_SHELL
+SHELL := env bash
+else
 SHELL := ./nix/scripts/shell.sh
+endif

-shell: export TARGET ?= default
 shell: ##@prepare Enter into a pre-configured shell
 ifndef IN_NIX_SHELL
 	@ENTER_NIX_SHELL
@@ -1,80 +1,3 @@
-## 1.18.0 Release notes :package:
-
-### Features
-* 🚦Online status indicator <https://github.com/status-im/status-react/issues/12547>
-* 👛 Add possibility to select wallet for ENS names <https://github.com/status-im/status-react/pull/12761>
-* 🐞 Bug reporting and logs sharing improvements <https://github.com/status-im/status-react/pull/12773>
-* 🍳 Simplify Keycard onboarding by using defaults for pairing password <https://github.com/status-im/status-react/issues/12685>
-* 💾 Backup contacts via Waku <https://github.com/status-im/status-react/issues/12550>
-* 🪙 Added ENS token <https://github.com/status-im/status-react/issues/12807>
-* 🌠 Using react-native-fast-image for stickers <https://github.com/status-im/status-react/pull/12769>
-#### Message reliability improvements
-* 𝌗 Show loading until all messages are processed <https://github.com/status-im/status-react/pull/12834>
-* 💪🏼 More robust message confirmations handling <https://github.com/status-im/status-react/pull/12824>
-* 📶 Allow sending messages when offline <https://github.com/status-im/status-react/issues/11889>
-#### Improvements on device pairing 
-* 🔔💻 Notification in activity centre now sync across devices <https://github.com/status-im/status-react/issues/12571>
-* ✅💻 Sync read messages across devices <https://github.com/status-im/status-react/pull/12698>
-#### Network settings improvements
-* ✨ Add Binance Smart chain <https://github.com/status-im/status-react/pull/12809>
-* ♏︎ Added custom network symbol <https://github.com/status-im/status-react/commit/c16b0860ec921a61c119857de27c6f29e301e4f6>
-* 💰 Network fee on xDai chain <https://github.com/status-im/status-react/pull/12845>
-* 📇 Support tx history (in a way) when on BSC chains <https://github.com/status-im/status-react/pull/12843>
-* 🙅🏻 Remove POA network from the list <https://github.com/status-im/status-react/pull/12887>
-
-### Bug Fixes
-* Fix activity center community invite preview <https://github.com/status-im/status-react/pull/12803>
-* Missing notifications for some contacts <https://github.com/status-im/status-react/issues/12776>
-* Fixes scrolling issues on the 'Max priority fee' bottom sheet <https://github.com/status-im/status-react/issues/12530>
-* Handle Keycard timeout on iOS 15 <https://github.com/status-im/status-react/pull/12826>
-* Allow user to be reinvited to the same group after leaving <https://github.com/status-im/status-react/pull/12814>
-* Fix for "TypeError: Network request failed" when switching to Goerli network <https://github.com/status-im/status-react/issues/11964>
-* Fix for Spin of death on adding custom NFT token contract <https://github.com/status-im/status-react/issues/12365>
-* Changing screen orientation results in breaking images / layout <https://github.com/status-im/status-react/issues/12858>
-
-
-## 1.17
-
-### For iOS and Android
-
-### Features
-
- 🖼️ Add ability to Share image from Status ([details](https://github.com/status-im/status-react/pull/12528))
- 🕵️ Private Profile Photos ([details](https://github.com/status-im/status-react/pull/11768))
- 🥥 Custom Emoji Thumbnails for Community Channels ([details](https://github.com/status-im/status-react/pull/12594))
- 🔄 Sync deleted chats ([details](https://github.com/status-im/status-react/pull/12662))
- 🔃 Sync removed/deleted/blocked contacts ([details](https://github.com/status-im/status-react/pull/12541))
- 💸 Allow overriding nonce when sending transaction ([details](https://github.com/status-im/status-react/pull/12679))
- 🗑️ Delete messages ([details](https://github.com/status-im/status-react/pull/12390))
- 🎨 NFT Support via OpenSea ([details](https://github.com/status-im/status-react/pull/12485))
- 🤳🏻 Enable collectibles and NFT as profile picture ([details](https://github.com/status-im/status-react/pull/12615))
-
-### Improvements
-
- Move pull to refresh to the account overview screen ([details](https://github.com/status-im/status-react/pull/12479))
- Add $RARE token to our default list ([details](https://github.com/status-im/status-react/pull/12521))
- Small UI Design Improvements ([details](https://github.com/status-im/status-react/pull/12544))
- Chats list performance ([details](https://github.com/status-im/status-react/pull/12554))
- Add push notification on group chat invite ([details](https://github.com/status-im/status-react/pull/12440))
- Contacts performance ([details](https://github.com/status-im/status-react/pull/12643))
- Add profile image in push notifications ([details](https://github.com/status-im/status-react/pull/12427))
- Enable UI for signing legacy txs on networks without eip1559 ([details](https://github.com/status-im/status-react/pull/12692))
- Doubled the character limit on timeline posts ([details](https://github.com/status-im/status-react/commit/a9333ad52ca71f512d5306f802927d0c20d63944))
-
-### Bugfixes
-
- Don't show notifications from self ([details](https://github.com/status-im/status-react/pull/12505))
- Request permissions before saving images ([details](https://github.com/status-im/status-react/pull/12516))
- Re-enable amount/fee validation on tx signing ([details](https://github.com/status-im/status-react/pull/12537))
- Fix browser history sorting ([details](https://github.com/status-im/status-react/pull/12497))
- Fix show/hide password on Android ([details](https://github.com/status-im/status-react/pull/12536))
- Fix connecting autofarm.network dapps with status wallet freezes ([details](https://github.com/status-im/status-react/pull/12529))
- RPC URL is lower-cased when entered in URL field when adding ([details](https://github.com/status-im/status-react/pull/12574))
- Allow retrieving of profile updates after removing contact ([details](https://github.com/status-im/status-react/pull/12581))
- Fetch history on receiving pubchat installation ([details](https://github.com/status-im/status-react/pull/12644))
- Can't send funds to multisig - Out of gas ([details](https://github.com/status-im/status-react/pull/12648))
- Fix handling errors on eth_gasPrice ([details](https://github.com/status-im/status-react/pull/12710))
-
 ## 1.16

 ### For iOS and Android
@@ -1 +1 @@
-1.18.0
+1.17.0
@@ -64,15 +64,3 @@
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
-
-# fast-image
-
-keep public class com.dylanvann.fastimage.* {*;}
-keep public class com.dylanvann.fastimage.** {*;}
-keep public class * implements com.bumptech.glide.module.GlideModule
-keep public class com.bumptech.glide.annotation.GlideModule
-keep public class * extends com.bumptech.glide.module.AppGlideModule
-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
@@ -1,7 +1,7 @@
 library 'status-jenkins-lib@v1.3.3'

 pipeline {
-  agent { label 'macos && x86_64 && xcode-12.5' }
+  agent { label 'macos-xcode-12.5' }

  parameters {
    string(
@@ -29,7 +29,7 @@ pipeline {
      name: 'HOST_LABEL',
      description: 'Label of host to run on',
      /* Using startTimeInMillis to randomize which host gets the update. */
-      defaultValue: "maci7-0${(currentBuild.startTimeInMillis % 3) + 1}",
+      defaultValue: "macos-0${(currentBuild.startTimeInMillis % 3) + 1}",
    )
  }

@@ -1,76 +1,62 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.4)
-      rexml
-    addressable (2.8.0)
+    CFPropertyList (3.0.3)
+    addressable (2.7.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-eventstream (1.1.1)
+    aws-partitions (1.442.0)
+    aws-sdk-core (3.113.1)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.239.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.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.105.1)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.93.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.3)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.0.3)
    colored (1.2)
    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
    declarative (0.0.20)
-    digest-crc (0.6.4)
+    declarative-option (0.1.0)
+    digest-crc (0.6.3)
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
    dotenv (2.7.6)
-    emoji_regex (3.2.3)
-    excon (0.88.0)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+    emoji_regex (3.2.2)
+    excon (0.79.0)
+    faraday (1.3.0)
      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
+      ruby2_keywords
    faraday-cookie_jar (0.0.7)
      faraday (>= 0.8.0)
      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.0.0)
      faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.197.0)
+    fastimage (2.2.3)
+    fastlane (2.179.0)
      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
+      addressable (>= 2.3, < 3.0.0)
      artifactory (~> 3.0)
      aws-sdk-s3 (~> 1.0)
      babosa (>= 1.0.3, < 2.0.0)
      bundler (>= 1.12.0, < 3.0.0)
      colored
-      commander (~> 4.6)
+      commander-fastlane (>= 4.4.6, < 5.0.0)
      dotenv (>= 2.1.1, < 3.0.0)
      emoji_regex (>= 0.1, < 4.0)
      excon (>= 0.71.0, < 1.0.0)
@@ -79,20 +65,19 @@ GEM
      faraday_middleware (~> 1.0)
      fastimage (>= 2.1.0, < 3.0.0)
      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
+      google-api-client (>= 0.37.0, < 0.39.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
+      highline (>= 1.7.2, < 2.0.0)
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
      multipart-post (~> 2.0.0)
      naturally (~> 2.2)
-      optparse (~> 0.1.1)
      plist (>= 3.1.0, < 4.0.0)
      rubyzip (>= 2.0.0, < 3.0.0)
      security (= 0.1.3)
      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
      terminal-notifier (>= 2.0.0, < 3.0.0)
      terminal-table (>= 1.4.5, < 2.0.0)
      tty-screen (>= 0.6.3, < 1.0.0)
@@ -105,71 +90,75 @@ 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-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-api-client (0.38.0)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
      mini_mime (~> 1.0)
      representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.12)
+    google-apis-core (0.3.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.14)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
      rexml
+      signet (~> 0.14)
      webrick
-    google-apis-iamcredentials_v1 (0.8.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.6.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.9.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.3.0)
+      google-apis-core (~> 0.1)
+    google-apis-storage_v1 (0.3.0)
+      google-apis-core (~> 0.1)
    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-errors (1.2.0)
-    google-cloud-storage (1.34.1)
+    google-cloud-errors (1.1.0)
+    google-cloud-storage (1.31.0)
      addressable (~> 2.5)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
      google-apis-storage_v1 (~> 0.1)
-      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
      mini_mime (~> 1.0)
-    googleauth (1.1.0)
+    googleauth (0.16.1)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
+      signet (~> 0.14)
+    highline (1.7.10)
    http-accept (1.7.0)
-    http-cookie (1.0.4)
+    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
    jmespath (1.4.0)
-    json (2.6.1)
-    jwt (2.3.0)
+    json (2.5.1)
+    jwt (2.2.2)
    memoist (0.16.2)
    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2021.0225)
    mini_magick (4.11.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.0)
    multi_json (1.15.0)
    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
    netrc (0.11.0)
-    optparse (0.1.1)
-    os (1.1.4)
+    os (1.1.1)
    plist (3.6.0)
    public_suffix (4.0.6)
-    rake (13.0.6)
-    representable (3.1.1)
+    rake (13.0.3)
+    representable (3.0.4)
      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
+      declarative-option (< 0.2.0)
      uber (< 0.2.0)
    rest-client (2.1.0)
      http-accept (>= 1.7.0, < 2.0)
@@ -179,21 +168,21 @@ GEM
    retriable (3.1.2)
    rexml (3.2.5)
    rouge (2.0.7)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    ruby2_keywords (0.0.4)
+    rubyzip (2.3.0)
    security (0.1.3)
-    signet (0.16.0)
-      addressable (~> 2.8)
+    signet (0.15.0)
+      addressable (~> 2.3)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simctl (1.6.8)
      CFPropertyList
      naturally
+    slack-notifier (2.3.2)
    terminal-notifier (2.0.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
    tty-screen (0.8.1)
    tty-spinner (0.9.3)
@@ -201,17 +190,16 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (1.8.0)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
    webrick (1.7.0)
    word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.19.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
    xcpretty (0.3.0)
      rouge (~> 2.0.7)
    xcpretty-travis-formatter (1.0.1)
@@ -5,10 +5,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
+      sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
      type = "gem";
    };
-    version = "2.8.0";
+    version = "2.7.0";
  };
  artifactory = {
    groups = ["default"];
@@ -35,20 +35,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
+      sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.1.1";
  };
  aws-partitions = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "181a2xf9zs0hz77jkpmxidvkjzs65vsyqv1a31fcali7f0kvh4h9";
+      sha256 = "0lm08fmahg3m87vbsfv73iswgvicdwcxfmkzr6v9qshlkg36lafd";
      type = "gem";
    };
-    version = "1.525.0";
+    version = "1.442.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 = "0i3x8p9gymc9977dcdkz5ca6mrmh7ym6p2mrscbh49nfd9gi5zg0";
      type = "gem";
    };
-    version = "3.122.0";
+    version = "3.113.1";
  };
  aws-sdk-kms = {
    dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +67,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0qac9dd6qriz6ldghkr8ga74zz28jl109kmvhvag74a3qf7k9dwj";
+      sha256 = "01pd0f4srsa65zl4zq4014p9j5yrr2yy9h9ab17g3w9d0qqm2vsh";
      type = "gem";
    };
-    version = "1.51.0";
+    version = "1.43.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 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94";
      type = "gem";
    };
-    version = "1.105.1";
+    version = "1.93.0";
  };
  aws-sigv4 = {
    dependencies = ["aws-eventstream"];
@@ -89,10 +89,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";
+      sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw";
      type = "gem";
    };
-    version = "1.4.0";
+    version = "1.2.3";
  };
  babosa = {
    groups = ["default"];
@@ -105,15 +105,14 @@
    version = "1.0.4";
  };
  CFPropertyList = {
-    dependencies = ["rexml"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "00s388z1akvj2j77ylr1mgp02zxp4ybcgc4ds3bz4647dfk0cwxk";
+      sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
      type = "gem";
    };
-    version = "3.0.4";
+    version = "3.0.3";
  };
  claide = {
    groups = ["default"];
@@ -145,16 +144,16 @@
    };
    version = "3.1.2";
  };
-  commander = {
+  commander-fastlane = {
    dependencies = ["highline"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx";
+      sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65";
      type = "gem";
    };
-    version = "4.6.0";
+    version = "4.4.6";
  };
  declarative = {
    groups = ["default"];
@@ -166,16 +165,26 @@
    };
    version = "0.0.20";
  };
+  declarative-option = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
  digest-crc = {
    dependencies = ["rake"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2";
+      sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a";
      type = "gem";
    };
-    version = "0.6.4";
+    version = "0.6.3";
  };
  domain_name = {
    dependencies = ["unf"];
@@ -203,31 +212,31 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0jsnrkfy345v66jlm2xrz8znivfnamg3mfzkddn414bndf2vxn7c";
+      sha256 = "15xqimc9dr9yyrf09dy8g60s65bvgg6xyyr7q74352r9vhwyg357";
      type = "gem";
    };
-    version = "3.2.3";
+    version = "3.2.2";
  };
  excon = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15yrwawhvkjvfg0dsf8z81876ddj6161q0wh5s7pw4sim8z8pspr";
+      sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23";
      type = "gem";
    };
-    version = "0.88.0";
+    version = "0.79.0";
  };
  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-net_http" "multipart-post" "ruby2_keywords"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
+      sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
      type = "gem";
    };
-    version = "1.8.0";
+    version = "1.3.0";
  };
  faraday-cookie_jar = {
    dependencies = ["faraday" "http-cookie"];
@@ -240,46 +249,6 @@
    };
    version = "0.0.7";
  };
-  faraday-em_http = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  faraday-em_synchrony = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  faraday-excon = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
-  faraday-httpclient = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
  faraday-net_http = {
    groups = ["default"];
    platforms = [];
@@ -290,67 +259,37 @@
    };
    version = "1.0.1";
  };
-  faraday-net_http_persistent = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  faraday-patron = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
-  faraday-rack = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
  faraday_middleware = {
    dependencies = ["faraday"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
+      sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.0.0";
  };
  fastimage = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "05i1fgqy4l40niwm9y56d04f876sm0cvc7q3w2rpddf8gya4lcs9";
+      sha256 = "0lgr0vs9kg5622qaf2l3f37b238dncs037fisiygvkbq8sg11i68";
      type = "gem";
    };
-    version = "2.2.5";
+    version = "2.2.3";
  };
  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"];
+    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1qlvg0sca8j1ryzxpvnmpjnh3fwmv6sk8l7mr9mv34z8rdy1iv3x";
+      sha256 = "1wspwgc1q31049a20k2gnzmizdvq4jdmzyd2fnz7r4g68fygj3sj";
      type = "gem";
    };
-    version = "2.197.0";
+    version = "2.179.0";
  };
  fastlane-plugin-clean_testflight_testers = {
    groups = ["default"];
@@ -383,27 +322,27 @@
    };
    version = "1.1.3";
  };
-  google-apis-androidpublisher_v3 = {
-    dependencies = ["google-apis-core"];
+  google-api-client = {
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1nxgda00y080xdavxs6nv5h2grwamds33b25nkjb4mij7385brs1";
+      sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1";
      type = "gem";
    };
-    version = "0.13.0";
+    version = "0.38.0";
  };
  google-apis-core = {
-    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet" "webrick"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1nzzj66clgr9ldmbjqkzgpvqmd6bjjmbw6khpgq80mp3gks4ycqy";
+      sha256 = "1jx4jiyfjxd8pxlpi94f07cb5yvljb5rv7i8xzjq2xrrlvdf212a";
      type = "gem";
    };
-    version = "0.4.1";
+    version = "0.3.0";
  };
  google-apis-iamcredentials_v1 = {
    dependencies = ["google-apis-core"];
@@ -411,21 +350,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0slpmdjsxbjdqs7qwkyfk3sdnfy5wliwf89jy8hq7l87a31r7lvk";
+      sha256 = "1gqpxcc0cjv4838q38g3mx9pgk7681w6irr6zwcygvnvbsvbbpsh";
      type = "gem";
    };
-    version = "0.8.0";
-  };
-  google-apis-playcustomapp_v1 = {
-    dependencies = ["google-apis-core"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0v9y6avlnwxwv4vahhygrsmrpmric4zg8sxjd26vhhlxw6g8955b";
-      type = "gem";
-    };
-    version = "0.6.0";
+    version = "0.3.0";
  };
  google-apis-storage_v1 = {
    dependencies = ["google-apis-core"];
@@ -433,10 +361,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0y6gyqj2cwsbdxk7wsrjzp9jz2hn2bk1zi1jjm5k311c3jlnj0r1";
+      sha256 = "0q6d5grhrkyfxmzlv0y39i6wzq5ayq1lkp33vfcg9pm8jyzcz7b2";
      type = "gem";
    };
-    version = "0.9.0";
+    version = "0.3.0";
  };
  google-cloud-core = {
    dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -465,10 +393,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0nakfswnck6grjpyhckzl40qccyys3sy999h5axk0rldx96fnivd";
+      sha256 = "0q3h996b6vl2ryfbm9jwczjcbnwhkpqs6hingxp22rhzk7qxi9z0";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.1.0";
  };
  google-cloud-storage = {
    dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
@@ -476,10 +404,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1pvcpqx64cxm05dzr9q7zxrymjq4jk46ifd1p4b6c9v3v0c9ipb5";
+      sha256 = "1bjkwnsii4svw2g09xjqpkq3mck820kj9nhx3vlv7rjmlh3bg68s";
      type = "gem";
    };
-    version = "1.34.1";
+    version = "1.31.0";
  };
  googleauth = {
    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@@ -487,20 +415,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "12zm6r7jxqv8k1a4iyijq2gcywk2d62nizbnabwsnhnzxwxwxc3s";
+      sha256 = "1438alhx4n4rdgf6q7ni8qj1b10y8lr9z9spphhjyhacby1ifsjn";
      type = "gem";
    };
-    version = "1.1.0";
+    version = "0.16.1";
  };
  highline = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
+      sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
      type = "gem";
    };
-    version = "2.0.3";
+    version = "1.7.10";
  };
  http-accept = {
    groups = ["default"];
@@ -518,10 +446,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9";
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
      type = "gem";
    };
-    version = "1.0.4";
+    version = "1.0.3";
  };
  httpclient = {
    groups = ["default"];
@@ -548,20 +476,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
+      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
      type = "gem";
    };
-    version = "2.6.1";
+    version = "2.5.1";
  };
  jwt = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838";
+      sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n";
      type = "gem";
    };
-    version = "2.3.0";
+    version = "2.2.2";
  };
  memoist = {
    groups = ["default"];
@@ -589,10 +517,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv";
+      sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
      type = "gem";
    };
-    version = "3.2021.0901";
+    version = "3.2021.0225";
  };
  mini_magick = {
    groups = ["default"];
@@ -609,10 +537,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
+      sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih";
      type = "gem";
    };
-    version = "1.1.2";
+    version = "1.1.0";
  };
  multi_json = {
    groups = ["default"];
@@ -664,25 +592,15 @@
    };
    version = "0.11.0";
  };
-  optparse = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0j9l5a1zszvrlggp1ldx82i4kkqx34g4g3amwp488s499w5l1cvj";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
  os = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap";
+      sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x";
      type = "gem";
    };
-    version = "1.1.4";
+    version = "1.1.1";
  };
  plist = {
    groups = ["default"];
@@ -709,21 +627,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
+      sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
      type = "gem";
    };
-    version = "13.0.6";
+    version = "13.0.3";
  };
  representable = {
-    dependencies = ["declarative" "trailblazer-option" "uber"];
+    dependencies = ["declarative" "declarative-option" "uber"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "09xwzz94ryp57wyjrqysiz1sslnxd4r4m9wayy63jb7f8qfx1kys";
+      sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
      type = "gem";
    };
-    version = "3.1.1";
+    version = "3.0.4";
  };
  rest-client = {
    dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
@@ -771,20 +689,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
+      sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
      type = "gem";
    };
-    version = "0.0.5";
+    version = "0.0.4";
  };
  rubyzip = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+      sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
      type = "gem";
    };
-    version = "2.3.2";
+    version = "2.3.0";
  };
  security = {
    groups = ["default"];
@@ -802,10 +720,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0cgmadrpgkpcklvvm2cga9mnrfqwqlydwpask1wx617h5ha6954k";
+      sha256 = "1vvxmfm9khxp35xs8qxc82i7hakylxbn7kx4apinvxaid6rlq60g";
      type = "gem";
    };
-    version = "0.16.0";
+    version = "0.15.0";
  };
  simctl = {
    dependencies = ["CFPropertyList" "naturally"];
@@ -818,6 +736,16 @@
    };
    version = "1.6.8";
  };
+  slack-notifier = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv";
+      type = "gem";
+    };
+    version = "2.3.2";
+  };
  terminal-notifier = {
    groups = ["default"];
    platforms = [];
@@ -839,16 +767,6 @@
    };
    version = "1.8.0";
  };
-  trailblazer-option = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10";
-      type = "gem";
-    };
-    version = "0.1.2";
-  };
  tty-cursor = {
    groups = ["default"];
    platforms = [];
@@ -906,20 +824,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
+      sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
      type = "gem";
    };
-    version = "0.0.8";
+    version = "0.0.7.7";
  };
  unicode-display_width = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
+      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
      type = "gem";
    };
-    version = "1.8.0";
+    version = "1.7.0";
  };
  webrick = {
    groups = ["default"];
@@ -942,15 +860,15 @@
    version = "1.0.0";
  };
  xcodeproj = {
-    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
+    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4";
+      sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn";
      type = "gem";
    };
-    version = "1.21.0";
+    version = "1.19.0";
  };
  xcpretty = {
    dependencies = ["rouge"];
@@ -25,6 +25,7 @@ abstract_target 'Status' do
  pod 'secp256k1', git: "https://github.com/status-im/secp256k1.swift.git", submodules: true

  target 'StatusIm' do
+    pod 'RNShare', :path => '../node_modules/react-native-share'

    target 'StatusImTests' do
      inherit! :complete
@@ -25,15 +25,6 @@ PODS:
  - Keycard (3.0.4):
    - CryptoSwift
    - secp256k1
-  - libwebp (1.2.1):
-    - libwebp/demux (= 1.2.1)
-    - libwebp/mux (= 1.2.1)
-    - libwebp/webp (= 1.2.1)
-  - libwebp/demux (1.2.1):
-    - libwebp/webp
-  - libwebp/mux (1.2.1):
-    - libwebp/demux
-  - libwebp/webp (1.2.1)
  - Permission-Camera (2.1.5):
    - RNPermissions
  - Permission-Microphone (2.1.5):
@@ -230,7 +221,7 @@ PODS:
    - React
  - react-native-status (1.0.0):
    - React
-  - react-native-status-keycard (2.5.36):
+  - react-native-status-keycard (2.5.35):
    - Keycard
    - React
  - react-native-webview (11.3.0):
@@ -318,10 +309,6 @@ PODS:
    - React
  - RNDeviceInfo (7.4.0):
    - React-Core
-  - RNFastImage (8.5.11):
-    - React-Core
-    - SDWebImage (~> 5.11.1)
-    - SDWebImageWebPCoder (~> 0.8.4)
  - RNFS (2.16.6):
    - React
  - RNGestureHandler (1.8.0):
@@ -376,12 +363,6 @@ PODS:
    - React-Core
  - RNSVG (9.13.6):
    - React
-  - SDWebImage (5.11.1):
-    - SDWebImage/Core (= 5.11.1)
-  - SDWebImage/Core (5.11.1)
-  - SDWebImageWebPCoder (0.8.4):
-    - libwebp (~> 1.0)
-    - SDWebImage/Core (~> 5.10)
  - secp256k1 (0.1.6)
  - SQLCipher (3.4.2):
    - SQLCipher/standard (= 3.4.2)
@@ -448,7 +429,6 @@ DEPENDENCIES:
  - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
  - "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)"
  - RNDeviceInfo (from `../node_modules/react-native-device-info`)
-  - RNFastImage (from `../node_modules/react-native-fast-image`)
  - RNFS (from `../node_modules/react-native-fs`)
  - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
  - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
@@ -469,9 +449,6 @@ SPEC REPOS:
  trunk:
    - boost-for-react-native
    - CryptoSwift
-    - libwebp
-    - SDWebImage
-    - SDWebImageWebPCoder
    - SQLCipher
    - SSZipArchive
    - TOCropViewController
@@ -579,8 +556,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/@react-native-community/push-notification-ios"
  RNDeviceInfo:
    :path: "../node_modules/react-native-device-info"
-  RNFastImage:
-    :path: "../node_modules/react-native-fast-image"
  RNFS:
    :path: "../node_modules/react-native-fs"
  RNGestureHandler:
@@ -611,7 +586,7 @@ EXTERNAL SOURCES:

 CHECKOUT OPTIONS:
  Keycard:
-    :commit: d5bb5d68dbac19a34945918b51873fbba2c18310
+    :commit: abf2be41c70846ab6f11c8bd445faf81b0befc1f
    :git: https://github.com/status-im/Keycard.swift.git
  secp256k1:
    :commit: 46a1fa30d9b8babeae85ff519050f42394ab5fcc
@@ -628,7 +603,6 @@ SPEC CHECKSUMS:
  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
  glog: 5bc68409594b19a3e5c5cbced7b1ecf61053b709
  Keycard: dd96182888da0aacf4de821b641103143bbb26cc
-  libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
  Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
  Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
  RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
@@ -653,7 +627,7 @@ SPEC CHECKSUMS:
  react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
  react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
  react-native-status: 45dbf1302ce3c258b459dfab137cd1c2c68c295d
-  react-native-status-keycard: eb84554a23315510948613a9467e7e3481be340c
+  react-native-status-keycard: de55c01648d24ff7c17a77f3aa29a0421f44143c
  react-native-webview: af9990b21a9aeafa8e8347746eb4116c0de086af
  React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
  React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
@@ -673,7 +647,6 @@ SPEC CHECKSUMS:
  RNCMaskedView: 71fc32d971f03b7f03d6ab6b86b730c4ee64f5b6
  RNCPushNotificationIOS: c145c6253ea016e5efeff604f2720736b4a596f7
  RNDeviceInfo: 9538a884f862fe4aa0d7cead9f34e292d41ba8f6
-  RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
  RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
  RNGestureHandler: 7a5833d0f788dbd107fbb913e09aa0c1ff333c39
  RNImageCropPicker: 35a3ceb837446fa11547704709bb22b5fac6d584
@@ -684,8 +657,6 @@ SPEC CHECKSUMS:
  RNReanimated: 70f662b5232dd5d19ccff581e919a54ea73df51c
  RNShare: 2dc2fcac3f7321cfd6b60a23ed4bf4d549f86f5f
  RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
-  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
-  SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
  secp256k1: f61d67e6fdcb85fd727acf1bf35ace6036db540c
  SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
  SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
@@ -693,6 +664,6 @@ SPEC CHECKSUMS:
  TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
  Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6

-PODFILE CHECKSUM: 1a5b8878f89edd08eb4d37898a3a8721a7bb3388
+PODFILE CHECKSUM: 2769eb02c836ad1eaddf5f34a0c61153c4c5fbec

 COCOAPODS: 1.11.0
@@ -371,7 +371,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
    }

    @ReactMethod
-    public void exportUnencryptedDatabase(final String accountData, final String password, final Callback callback) {
+    public void exportUnencryptedDatabase(final String accountData, final String password) {
        Log.d(TAG, "login");

        final File newFile = getExportDBFile();
@@ -460,7 +460,6 @@ RCT_EXPORT_METHOD(saveAccountAndLogin:(NSString *)multiaccountData
 #if DEBUG
    NSLog(@"SaveAccountAndLogin() method called");
 #endif
-    [self getExportDbFilePath];
    NSString *keyUID = [self getKeyUID:multiaccountData];
    NSString *finalConfig = [self prepareDirAndUpdateConfig:config
                                                 withKeyUID:keyUID];
@@ -478,7 +477,6 @@ RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
 #if DEBUG
    NSLog(@"SaveAccountAndLoginWithKeycard() method called");
 #endif
-    [self getExportDbFilePath];
    NSString *keyUID = [self getKeyUID:multiaccountData];
    NSString *finalConfig = [self prepareDirAndUpdateConfig:config
                                                 withKeyUID:keyUID];
@@ -486,17 +484,6 @@ RCT_EXPORT_METHOD(saveAccountAndLoginWithKeycard:(NSString *)multiaccountData
    NSLog(@"%@", result);
 }

- (NSString *) getExportDbFilePath {
-    NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"export.db"];
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    
-    if ([fileManager fileExistsAtPath:filePath]) {
-        [fileManager removeItemAtPath:filePath error:nil];
-    }
-    
-    return filePath;
-}
-
 - (NSURL *) getKeyStoreDir:(NSString *)keyUID {
    NSFileManager *fileManager = [NSFileManager defaultManager];
    NSURL *rootUrl =[[fileManager
@@ -536,7 +523,6 @@ RCT_EXPORT_METHOD(login:(NSString *)accountData
 #if DEBUG
    NSLog(@"Login() method called");
 #endif
-    [self getExportDbFilePath];
    [self migrateKeystore:accountData password:password];
    NSString *result = StatusgoLogin(accountData, password);
    NSLog(@"%@", result);
@@ -549,7 +535,6 @@ RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
 #if DEBUG
    NSLog(@"LoginWithKeycard() method called");
 #endif
-    [self getExportDbFilePath];
    [self migrateKeystore:accountData password:password];

    NSString *result = StatusgoLoginWithKeycard(accountData, password, chatKey);
@@ -868,16 +853,11 @@ StatusgoStartLocalNotifications();
 }

 RCT_EXPORT_METHOD(exportUnencryptedDatabase:(NSString *)accountData
-                  password:(NSString *)password
-                  callback:(RCTResponseSenderBlock)callback) {
+                  password:(NSString *)password) {
 #if DEBUG
    NSLog(@"exportUnencryptedDatabase() method called");
 #endif
-    
-    NSString *filePath = [self getExportDbFilePath];
-    StatusgoExportUnencryptedDatabase(accountData, password, filePath);
-    
-    callback(@[filePath]);
+    "";
 }

 RCT_EXPORT_METHOD(importUnencryptedDatabase:(NSString *)accountData
@@ -47,9 +47,9 @@ It pulls in all the `pkgs`, `targets` and `shells` defined in [`nix/default.nix`

 # Shells

-Normally shells are started using `make shell TARGET=default`, but that is essentially the same as calling:
+Normally shells are started using `make shell TARGET=android`, but that is essentially the same as calling:
 ```bash
-nix-shell -A shells.default default.nix
+nix-shell -A shells.android default.nix
 ```
 The [`nix/scripts/shell.sh`](./scripts/shell.sh) script is essentially a wrapper around that command to make it usable as shell for the `Makefile`.

@@ -47,8 +47,6 @@ This way your shell and all other nix commands should run in a setup that is tai

 For valid values you can check the [`nix/shells.nix`](/nix/shells.nix) file.

-:warning: __WARNING__: To have Nix pick up all changes a new `nix-shell` needs to be spawned.
-
 ## Using a local status-go repository

 If you need to use a locally checked-out status-go repository, you can achieve that by defining the `STATUS_GO_SRC_OVERRIDE`
@@ -13,6 +13,7 @@
      abi-include = "armeabi-v7a;arm64-v8a;x86"; # Android architectures to build for
    };

+    nimbus = { src-override = null; };
    status-go = { src-override = null; };
  };

@@ -601,20 +601,6 @@
    }
  },

-  {
-    "path": "androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0",
-    "host": "https://dl.google.com/dl/android/maven2",
-    "type": "aar",
-    "pom": {
-      "sha1": "34832395bc9a4fe2aafdd73605ddf9da9f842e7a",
-      "sha256": "1qi9p1nmdw8d0wpy0nmakvnpj4hgb0xf3aicd8qzn0nclszr2zkg"
-    },
-    "jar": {
-      "sha1": "e8a2f661f33bbfa8e9d226aa5dacae90aedf2fc9",
-      "sha256": "19xf8zwzxlvq2l4qfwfijasjpv3jlz5ylmh5cykpbr4m618qxrma"
-    }
-  },
-
  {
    "path": "androidx/fragment/fragment/1.0.0/fragment-1.0.0",
    "host": "https://dl.google.com/dl/android/maven2",
@@ -5487,90 +5473,6 @@
    }
  },

-  {
-    "path": "com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0",
-    "host": "https://repo.maven.apache.org/maven2",
-    "type": "jar",
-    "pom": {
-      "sha1": "94d5a495b107bd421804a296c9073439402c0996",
-      "sha256": "0r1f6n03hrh7m0br3wzx81bz8addxk2pgc0cnfw2bx1n46d469z4"
-    },
-    "jar": {
-      "sha1": "298d793db124809d74ad9a90de5eddc408898c84",
-      "sha256": "13nyz9h7ibplz14nybkcmk464kgg8iasp5c1qf4ws7wkiyzhqhzs"
-    }
-  },
-
-  {
-    "path": "com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0",
-    "host": "https://repo.maven.apache.org/maven2",
-    "type": "jar",
-    "pom": {
-      "sha1": "4a090fcf1fe6ec3782581efc517a8f621e85a804",
-      "sha256": "121xrlvir16f38k7qif0c311l2ccivxaqsq6sr4csdd1jgs25agc"
-    },
-    "jar": {
-      "sha1": "75cf5e43fd6e6c6e769e060014feb985284cfae7",
-      "sha256": "16n94cf2d7sba5r6kzh8sqvvaikl5ph9an6lz4pdabd579rrf0h3"
-    }
-  },
-
-  {
-    "path": "com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0",
-    "host": "https://repo.maven.apache.org/maven2",
-    "type": "jar",
-    "pom": {
-      "sha1": "0c90a83f7490992222d8bf7227b35e6bc0e4f552",
-      "sha256": "1m0a7yiafry9g84vgqmaznxqhs0sg008vya13i2ckhbcky2nblk4"
-    },
-    "jar": {
-      "sha1": "6d44c9103551e3ff51f00ac26077c143a8fb74f9",
-      "sha256": "0yb38pnjbsb8qc5c4hffp40a4gihj0g65gwdwwp5ib26jq3cj33g"
-    }
-  },
-
-  {
-    "path": "com/github/bumptech/glide/gifdecoder/4.12.0/gifdecoder-4.12.0",
-    "host": "https://repo.maven.apache.org/maven2",
-    "type": "aar",
-    "pom": {
-      "sha1": "9105e854c39f7d5dbcfd04f644a243f31e48033d",
-      "sha256": "1s9qsf8awvnrr3a5ia7ppcj2vx51pnqwd8mvdmqjdl5y0w3vv4w1"
-    },
-    "jar": {
-      "sha1": "a00cc6741d9f7cf025dd93293c724a688c47631e",
-      "sha256": "0158p9w1w80m8fmnzff23n89n8lkw9s3kh9hn81almb8nzaiqyhr"
-    }
-  },
-
-  {
-    "path": "com/github/bumptech/glide/glide/4.12.0/glide-4.12.0",
-    "host": "https://repo.maven.apache.org/maven2",
-    "type": "aar",
-    "pom": {
-      "sha1": "74ef469a4966c69ec7346df8b3895ac11474f8be",
-      "sha256": "1h5qbi06valf58madv01zlapny64368r17x21lck54wy2dr4hvgx"
-    },
-    "jar": {
-      "sha1": "3f57db6cc954212739bb0d693ec48ecbc8ab73c4",
-      "sha256": "11432hpyjc74rhf494xn50c6qcmx49mgii227zjpz5v2vd599qka"
-    }
-  },
-
-  {
-    "path": "com/github/bumptech/glide/okhttp3-integration/4.12.0/okhttp3-integration-4.12.0",
-    "host": "https://repo.maven.apache.org/maven2",
-    "type": "aar",
-    "pom": {
-      "sha1": "86bab5a64ff1b3492ca0a416b59de2ed89d46608",
-      "sha256": "0x30kznlw383w6yvz7vynk7mwbhscx4j1lyjl9aa0419byiyw7ng"
-    },
-    "jar": {
-      "sha1": "8235c8ea4484c142ac058b736e807f9c56346e59",
-      "sha256": "086nrnk2i6jgfi6iv2s3gfqhywzzm79isd87x84ks7wpvbs2wwhd"
-    }
-  },
-
  {
    "path": "com/github/clans/fab/1.6.4/fab-1.6.4",
    "host": "https://repo.maven.apache.org/maven2",
@@ -5946,16 +5848,16 @@
  },

  {
-    "path": "com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0",
+    "path": "com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "jar",
    "pom": {
-      "sha1": "972fdb73175fce135e78555269ede8c8d3b36f74",
-      "sha256": "1k6021km41hzmh68yzzj9hhsfs5i1qjw7cljv7facxwaaygxr06n"
+      "sha1": "ffe29062ff5242287b65c16ec45e6a65bb946231",
+      "sha256": "1kh82i3xl6wdr9pnbhiwx6szgfc2i7gjjw5q45p88xglr5ay13m4"
    },
    "jar": {
-      "sha1": "9bc20b94d3ac42489cf6ce1e42509c86f6f861a1",
-      "sha256": "18940w3fbh9z4d9xrazfkw69y640ymfk7z42dhgd91pvbp9d8jd2"
+      "sha1": "74fe3b8b4f3fc84dc940d0ca4c4b270dbc902764",
+      "sha256": "151n2rp4849dp0za82q1s1xpji0r3v1fd6a7li56nyp27b1vsizr"
    }
  },

@@ -6000,12 +5902,12 @@
  },

  {
-    "path": "com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0",
+    "path": "com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "pom",
    "pom": {
-      "sha1": "0d70888ba27b15543d639b0be077b1d0d6d38c40",
-      "sha256": "1yl9y1rcgq47cdk11y3xi8f0fvnbq5gfkglp430h1ychqj3im287"
+      "sha1": "a4f56c023d5284d3161dac51af134af6856e1fe9",
+      "sha256": "1d73xa8z8dyxg327zkk7i22nz2b3c864012dwdivaxar10yi42sj"
    }
  },

@@ -6094,26 +5996,26 @@
  },

  {
-    "path": "com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre",
+    "path": "com/google/guava/guava-parent/30.1.1-jre/guava-parent-30.1.1-jre",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "pom",
    "pom": {
-      "sha1": "eb78b5264bd92cca5655396c44420eef3ad3ec0f",
-      "sha256": "1237q1g77j1nxs1y17x6mqrfxxwizlib71gfmhbiihcrf2mbddmk"
+      "sha1": "3d726f4e77f9b282e3b99bb1d62713a44cab3118",
+      "sha256": "0d1qxmg3paxpb7aagf0717d71vb594r9h9mdiahvz5r4r92vs8h4"
    }
  },

  {
-    "path": "com/google/guava/guava-testlib/31.0.1-jre/guava-testlib-31.0.1-jre",
+    "path": "com/google/guava/guava-testlib/30.1.1-jre/guava-testlib-30.1.1-jre",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "jar",
    "pom": {
-      "sha1": "bb1f67204ecb500e089ceee3be38a72ba088d012",
-      "sha256": "15v5xd9smw1bav1nq84ppmdy3bays6hir539w3ybc5vjlia0dxzf"
+      "sha1": "718328d28bf5dcae3d414e2a862d6e594e2fb704",
+      "sha256": "1x7j2ws804hmbk79pba9g3yr7ff6y96g1y83ywn3182r51dbzcg5"
    },
    "jar": {
-      "sha1": "6f9d0fb58913ce77de477280b21f8801fb617151",
-      "sha256": "11svxhaqf7na9bk06j94rrdxdxrcd16xfccjpr9ham1cp5w83c12"
+      "sha1": "f57a75cdd54390c2b648b06828dac53b7b5de070",
+      "sha256": "16q94j7kj73qkcb027b09jic9izbjg2qi8hcsg8l2x0yzanwjzwa"
    }
  },

@@ -6188,16 +6090,16 @@
  },

  {
-    "path": "com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre",
+    "path": "com/google/guava/guava/30.1.1-jre/guava-30.1.1-jre",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "jar",
    "pom": {
-      "sha1": "d0ec1628dcc04e4835721416103672384ea3136f",
-      "sha256": "15pkn904mhp97v67yfqiw936cxpzr9kpi0pjr9f0rii11j96dr9b"
+      "sha1": "0f55555f43cb33c8c2f911e962ae5e4bc2f522b0",
+      "sha256": "0nfckp66ygbm7lgaw4bqfjhizd2l6xwz39pynxgqbdyli8ccj63d"
    },
    "jar": {
-      "sha1": "119ea2b2bc205b138974d351777b20f02b92704b",
-      "sha256": "1fc7y1dan9jqfg7j27f9iywa6mdagd8x2fhrnfgj3gc7bvb99gnm"
+      "sha1": "87e0fd1df874ea3cbe577702fe6f17068b790fd8",
+      "sha256": "01jghgcy1dpkp4fvnnqr7n8fdmrlxkybnqn3mzrhp23dwaf25kj4"
    }
  },

@@ -6537,20 +6439,6 @@
    }
  },

-  {
-    "path": "com/squareup/okhttp3/okhttp/3.9.1/okhttp-3.9.1",
-    "host": "https://repo.maven.apache.org/maven2",
-    "type": "jar",
-    "pom": {
-      "sha1": "7a34bfe0899e4b1a4b84f4e9e79c221bd37e9808",
-      "sha256": "1vjwzaf5y4qfc5pvbsa79m11zjvzhn1b3rszvv6xxky1rpha3hdw"
-    },
-    "jar": {
-      "sha1": "84b4b7d1c4a238e7899972b7446c250691e65f1f",
-      "sha256": "0pkqnz1dmfrhvr17qbv1dr5nylvfnf5l8vgw0zjjdfiblhbi1l50"
-    }
-  },
-
  {
    "path": "com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1",
    "host": "https://repo.maven.apache.org/maven2",
@@ -6593,16 +6481,6 @@
    }
  },

-  {
-    "path": "com/squareup/okhttp3/parent/3.9.1/parent-3.9.1",
-    "host": "https://repo.maven.apache.org/maven2",
-    "type": "pom",
-    "pom": {
-      "sha1": "e55ee2b70a7a64431236eac139096e369db69bb6",
-      "sha256": "0lqm0gpbxfkw7n530hfr2jxr7r4cgiia2ahd0m1kb6kwdfzf05gm"
-    }
-  },
-
  {
    "path": "com/squareup/okhttp3/parent/3.12.1/parent-3.12.1",
    "host": "https://repo.maven.apache.org/maven2",
@@ -6662,16 +6540,16 @@
  },

  {
-    "path": "com/squareup/okio/okio/3.0.0/okio-3.0.0",
+    "path": "com/squareup/okio/okio/3.0.0-alpha.9/okio-3.0.0-alpha.9",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "jar",
    "pom": {
-      "sha1": "b2fec062f421241a455a83d82790f442fef0ea7c",
-      "sha256": "0kqm1maql7kmk7lsnbm1619ghfn1jl0kv0fv8raizijy4csxa2ln"
+      "sha1": "f62aeda2c9fb9f6352b777290d3bb11ad41a299f",
+      "sha256": "1wib24qikdyw3hy5gjs71fhi5hjbyqvwp5p4wigmag40i4fwgjc5"
    },
    "jar": {
-      "sha1": "ed092ec73ae87b0295689e5e04e025361da01761",
-      "sha256": "17lpfiavx20hvv32irzmpy05jq77w9ihhslybqr0rjdj8gnn7gnw"
+      "sha1": "b1d6cc65ba9a6570fa636011f4c06839b0ca3cab",
+      "sha256": "08xhbcbfk5db9dvimnpm8fq9k5jqda4hxcmqhnmkbjqf5abr4gsa"
    }
  },

@@ -7036,26 +6914,26 @@
  },

  {
-    "path": "jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0-RC2/jakarta.xml.bind-api-parent-4.0.0-RC2",
+    "path": "jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0-RC1/jakarta.xml.bind-api-parent-4.0.0-RC1",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "pom",
    "pom": {
-      "sha1": "89412e0394f9e398e13416fde8da8b3a80fa0fec",
-      "sha256": "0bpclrb04qff6adkn37rk4zp5y8ky0vjnp5cxyzv8zc8182fhmr1"
+      "sha1": "efe14e69792180ca3f81078c14c0bd547e5dca26",
+      "sha256": "1sx2yqsfskirdzdq0ag9by16n9a6hnpmjpnh2fkljqhkzk7qpxwc"
    }
  },

  {
-    "path": "jakarta/xml/bind/jakarta.xml.bind-api/4.0.0-RC2/jakarta.xml.bind-api-4.0.0-RC2",
+    "path": "jakarta/xml/bind/jakarta.xml.bind-api/4.0.0-RC1/jakarta.xml.bind-api-4.0.0-RC1",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "jar",
    "pom": {
-      "sha1": "894741e8eca308287531b49bd3045e247cd43515",
-      "sha256": "15qcygb76b7khpgsq94azpfqkfxp50fn0yypmdy3p3rm8bnpbypc"
+      "sha1": "4564665af2595621358ad4fefe79e8d3f2ef67e5",
+      "sha256": "1nbh7hrd5ly4440ldmcyv29pkbw2sgsv9c0ivfiq4c1bj0ykmhn9"
    },
    "jar": {
-      "sha1": "79f7ab7d98c0b95bef12d0b33b9b34af415ce222",
-      "sha256": "18dwxaillwc1bssp0wypjhgg9vygk0p5wcr9j6dh63xk0zd6pkqd"
+      "sha1": "22215443c4142528ea6fcf7ea9b3b4ea0bf807fa",
+      "sha256": "1nmnsykrnqm9504l0fj48jikykg3q1wca3zjfvj86vgwdfsj7nij"
    }
  },

@@ -7630,12 +7508,12 @@
  },

  {
-    "path": "org/antlr/antlr4-master/4.9.3/antlr4-master-4.9.3",
+    "path": "org/antlr/antlr4-master/4.9.2/antlr4-master-4.9.2",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "pom",
    "pom": {
-      "sha1": "036b2162383e22b5a6c8c254e485921b5d77ad0c",
-      "sha256": "1f9m37864g54qh5ckpgx15kjv2i627ixl5q71b551pxssdac0p2n"
+      "sha1": "e5187c4f54155f23d4871af1ed3d4d60f7ab9a03",
+      "sha256": "0k4hh1i6np6961q26lhryvxgplsasyrw7dyxvzf4cqbf6290bpn6"
    }
  },

@@ -7654,16 +7532,16 @@
  },

  {
-    "path": "org/antlr/antlr4-runtime/4.9.3/antlr4-runtime-4.9.3",
+    "path": "org/antlr/antlr4-runtime/4.9.2/antlr4-runtime-4.9.2",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "jar",
    "pom": {
-      "sha1": "7ed961275fcdee7e2b69a66bf1ae6c4f9f5a1ab8",
-      "sha256": "193skn41436jxppf34gpjm782a7vp7z1c4cvflxgla86xbj48zjg"
+      "sha1": "726d2331b5f8ada7a0dbde7579c0968d391f324b",
+      "sha256": "0v8qsyil9k0mpv602dcsjx422kk1w1m53xfv801v5bm597wh2697"
    },
    "jar": {
-      "sha1": "81befc16ebedb8b8aea3e4c0835dd5ca7e8523a8",
-      "sha256": "198ys0lhpimjj5vzhpk82aiqqdqfphrjmsjjsqhz7i4vjsa6a6hk"
+      "sha1": "ece33ec76e002dfde574cf7b57451a91a99185c5",
+      "sha256": "1xkm036832k3rwvjsafkbxdgm7ajfb69wsxcnwyd966mimi5600j"
    }
  },

@@ -8520,16 +8398,16 @@
  },

  {
-    "path": "org/checkerframework/checker-qual/3.19.0/checker-qual-3.19.0",
+    "path": "org/checkerframework/checker-qual/3.18.0/checker-qual-3.18.0",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "jar",
    "pom": {
-      "sha1": "7afbf123d32e21bee825bb85dc0be42ca6466fed",
-      "sha256": "0wd3i9zrk3zbsxgpfjcsy68ba9sq5xhyvi13v05p0jx9w5f9rfi9"
+      "sha1": "ebf9e21b69f9e3b4e2596475f8d4cba93cd7b55d",
+      "sha256": "0idx3iyyazyij9mgwk87znwiygrmzlryfcprd8jsshwbji85pq32"
    },
    "jar": {
-      "sha1": "838b42bb6f7f73315167b359d24649845cef1c48",
-      "sha256": "0s5a93bln2b109brsys40wak9jw66rks9817glkk59pkhf8w89x8"
+      "sha1": "7d1ffd35973fa4c94c3aebf187a26cf0b4350281",
+      "sha256": "18f32axna3q3pks2rbmm0n6cms3951mxkmrgxd0hd0cb78dlkm4r"
    }
  },

@@ -9786,16 +9664,16 @@
  },

  {
-    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.5.31/kotlin-stdlib-common-1.5.31",
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.5.20/kotlin-stdlib-common-1.5.20",
    "host": "https://repo.maven.apache.org/maven2",
    "type": "jar",
    "pom": {
-      "sha1": "6f778763702ed6371c2cab78b3424ff2188a7283",
-      "sha256": "1hl32bjj7bwhcwl5viilbyzq7kvysnbxmv2jjslvxln3p13fj5dn"
+      "sha1": "ff9efa52b84c931eae3642ff77c9a280685f328e",
+      "sha256": "1rjvmadqfwijz06a0ps1kcv0k24kw1kwcqf69lwq2hyszr0div28"
    },
    "jar": {
-      "sha1": "043331609c7de811fed085e0dfd150874b157c32",
-      "sha256": "1b929r0199idbrdc4jbhmcvzfrpiysdik3cnw673ha5h4s7a38nz"
+      "sha1": "3d79dbd48bf605f4aac1e7028981a1953e245cbb",
+      "sha256": "0dhx6shmrbkwidvff28kqvwdi5fz4kl5mk9shpird4mz0jc546cq"
    }
  },

@@ -9855,6 +9733,20 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.20/kotlin-stdlib-jdk7-1.5.20",
+    "host": "https://repo.maven.apache.org/maven2",
+    "type": "jar",
+    "pom": {
+      "sha1": "b87c15b4c11bb991b6b11b1cf3610511cd132d87",
+      "sha256": "03bbw19ndjafma09lzqzfhffywmb1ga36q4ryi1zzqcq8z0bf7q8"
+    },
+    "jar": {
+      "sha1": "218b60e1d446d1e0a18bc7aa8663634b136fbcc5",
+      "sha256": "01lx6lkldji6wwi5zvv3aspcc2y6da22qpqdmyck0c040b9gc45i"
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71",
    "host": "https://repo.maven.apache.org/maven2",
@@ -9911,6 +9803,20 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.20/kotlin-stdlib-jdk8-1.5.20",
+    "host": "https://repo.maven.apache.org/maven2",
+    "type": "jar",
+    "pom": {
+      "sha1": "e429fcf535ac1072110da79655b09c41e84ec54d",
+      "sha256": "0zs7kr8hl5b8p8bpx2z711blw4k577w5ggrf3l1nk0kk8k9mhs2r"
+    },
+    "jar": {
+      "sha1": "636c5653641cd956de9aee5792155b07ea49825e",
+      "sha256": "12nkz2bjfksl0k7zf4y5phmfjgwln1w9j4z31y7ynhwwavzczsd7"
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0/kotlin-stdlib-jre7-1.2.0",
    "host": "https://repo.maven.apache.org/maven2",
@@ -10121,6 +10027,20 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.5.20/kotlin-stdlib-1.5.20",
+    "host": "https://repo.maven.apache.org/maven2",
+    "type": "jar",
+    "pom": {
+      "sha1": "dbfd9bfb8048d59c62978d600dba7187491c5730",
+      "sha256": "0vlir0h87b2vnn2n9s379hvbnkdji778gh2czdqsi47zar7nfxnn"
+    },
+    "jar": {
+      "sha1": "9de35cc611bcecec8edce1d56d8e659953806751",
+      "sha256": "1a33p9lddzr7hss99nc8wv3967h64sryrq9dg0nxfimcdb17kkc0"
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-test-common/1.4.31/kotlin-test-common-1.4.31",
    "host": "https://repo.maven.apache.org/maven2",
@@ -34,7 +34,6 @@ androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
 androidx.exifinterface:exifinterface:1.1.0-beta01
 androidx.exifinterface:exifinterface:1.1.0-rc01
-androidx.exifinterface:exifinterface:1.2.0
 androidx.fragment:fragment:1.0.0
 androidx.fragment:fragment:1.1.0
 androidx.interpolator:interpolator:1.0.0
@@ -334,12 +333,6 @@ com.facebook.soloader:annotation:0.9.0
 com.facebook.soloader:nativeloader:0.9.0
 com.facebook.soloader:soloader:0.9.0
 com.facebook.yoga:proguard-annotations:1.14.1
-com.github.bumptech.glide:annotations:4.12.0
-com.github.bumptech.glide:compiler:4.12.0
-com.github.bumptech.glide:disklrucache:4.12.0
-com.github.bumptech.glide:gifdecoder:4.12.0
-com.github.bumptech.glide:glide:4.12.0
-com.github.bumptech.glide:okhttp3-integration:4.12.0
 com.github.clans:fab:1.6.4
 com.github.gundy:semver4j:0.16.4
 com.github.status-im.status-keycard-java:android:3.0.4
@@ -41,7 +41,6 @@ https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0
 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-beta01/exifinterface-1.1.0-beta01.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-rc01/exifinterface-1.1.0-rc01.pom
-https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fragment-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0.pom
@@ -390,12 +389,6 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.6.0/soload
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.8.2/soloader-0.8.2.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.9.0/soloader-0.9.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/stetho/stetho/1.3.1/stetho-1.3.1.pom
-https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
-https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
-https://repo.maven.apache.org/maven2/com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0.pom
-https://repo.maven.apache.org/maven2/com/github/bumptech/glide/gifdecoder/4.12.0/gifdecoder-4.12.0.pom
-https://repo.maven.apache.org/maven2/com/github/bumptech/glide/glide/4.12.0/glide-4.12.0.pom
-https://repo.maven.apache.org/maven2/com/github/bumptech/glide/okhttp3-integration/4.12.0/okhttp3-integration-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/clans/fab/1.6.4/fab-1.6.4.pom
 https://repo.maven.apache.org/maven2/com/github/gundy/semver4j/0.16.4/semver4j-0.16.4.pom
 https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.pom
@@ -425,12 +418,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.10.0/error_prone_annotations-2.10.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.1.2/error_prone_parent-2.1.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/17.0/guava-parent-17.0.pom
@@ -439,14 +432,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/30.1.1-jre/guava-parent-30.1.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/30.1.1-jre/guava-testlib-30.1.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/30.1.1-jre/guava-30.1.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.pom
@@ -473,17 +466,15 @@ https://repo.maven.apache.org/maven2/com/squareup/assertj/assertj-android/1.1.1/
 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3.12.12/okhttp-urlconnection-3.12.12.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.9.1/okhttp-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.12/okhttp-3.12.12.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/5.0.0-alpha.2/okhttp-5.0.0-alpha.2.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.12/parent-3.12.12.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-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/2.9.0/okio-2.9.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.0.0-alpha.9/okio-3.0.0-alpha.9.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
@@ -514,8 +505,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-RC1/jakarta.activation-api-2.1.0-RC1.pom
-https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0-RC2/jakarta.xml.bind-api-parent-4.0.0-RC2.pom
-https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0-RC2/jakarta.xml.bind-api-4.0.0-RC2.pom
+https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0-RC1/jakarta.xml.bind-api-parent-4.0.0-RC1.pom
+https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0-RC1/jakarta.xml.bind-api-4.0.0-RC1.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.3.2/javax.annotation-api-1.3.2.pom
@@ -561,9 +552,9 @@ 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/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.9.2/antlr4-master-4.9.2.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.9.2/antlr4-runtime-4.9.2.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.5.2/antlr-master-3.5.2.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.pom
@@ -636,7 +627,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.65/bcprov-jdk15on-1.65.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.19.0/checker-qual-3.19.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.18.0/checker-qual-3.18.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
@@ -731,15 +722,17 @@ 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.21/kotlin-stdlib-common-1.4.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.30/kotlin-stdlib-common-1.4.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.31/kotlin-stdlib-common-1.4.31.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.31/kotlin-stdlib-common-1.5.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.20/kotlin-stdlib-common-1.5.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
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.31/kotlin-stdlib-jdk7-1.4.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.20/kotlin-stdlib-jdk7-1.5.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.31/kotlin-stdlib-jdk8-1.4.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.20/kotlin-stdlib-jdk8-1.5.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0/kotlin-stdlib-jre7-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.0/kotlin-stdlib-jre8-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
@@ -755,6 +748,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.21/kotlin-stdlib-1.4.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.30/kotlin-stdlib-1.4.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.31/kotlin-stdlib-1.4.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.20/kotlin-stdlib-1.5.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-common/1.4.31/kotlin-test-common-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.4.31/kotlin-test-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50.pom
@@ -12,7 +12,6 @@ react-native-config
 react-native-dark-mode
 react-native-device-info
 react-native-dialogs
-react-native-fast-image
 react-native-fs
 react-native-gesture-handler
 react-native-haptic-feedback
@@ -28,7 +27,6 @@ react-native-permissions
 react-native-reanimated
 react-native-safe-area-context
 react-native-shake
-react-native-share
 react-native-splash-screen
 react-native-status
 react-native-status-keycard
@@ -55,6 +55,26 @@ fi
 # Get the relative path without full URL
 OBJ_REL_NAME="${OBJ_REL_URL#${REPO_URL}/}"

+OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_REL_URL}.jar")
+# Dependency might be a JAR or an AAR
+if [[ ${?} -eq 0 ]]; then
+    # Some deps have only a POM, nor JAR or AAR
+    OBJ_TYPE="jar"
+    OBJ_PATH=$(get_nix_path "${OBJ_NIX_FETCH_OUT}")
+    OBJ_SHA256=$(get_nix_sha "${OBJ_NIX_FETCH_OUT}")
+    OBJ_SHA1=$(get_sha1 "${OBJ_PATH}")
+else
+    OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_REL_URL}.aar")
+    if [[ ${?} -eq 0 ]]; then
+        OBJ_TYPE="aar"
+        OBJ_PATH=$(get_nix_path "${OBJ_NIX_FETCH_OUT}")
+        OBJ_SHA256=$(get_nix_sha "${OBJ_NIX_FETCH_OUT}")
+        OBJ_SHA1=$(get_sha1 "${OBJ_PATH}")
+    else
+        OBJ_TYPE="pom"
+    fi
+fi
+
 # Both JARs and AARs have a POM
 POM_NIX_FETCH_OUT=$(nix_fetch "${OBJ_REL_URL}.pom")
 POM_PATH=$(get_nix_path "${POM_NIX_FETCH_OUT}")
@@ -65,23 +85,6 @@ fi
 POM_SHA256=$(get_nix_sha "${POM_NIX_FETCH_OUT}")
 POM_SHA1=$(get_sha1 "${POM_PATH}")

-# Identify packaging type, JAR, AAR, or just POM.
-OBJ_TYPE=$(grep -oP '<packaging>\K[^<]+' "${POM_PATH}")
-# Bundle is a JAR made using maven-bundle-plugin.
-case "${OBJ_TYPE}" in
-    ''|'bundle') OBJ_TYPE=jar;;
-    'aar.asc')   OBJ_TYPE=aar;;
-esac
-# Some dependencies have only a POM file.
-if [[ "${OBJ_TYPE}" != "pom" ]]; then
-    OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_REL_URL}.${OBJ_TYPE}")
-    if [[ ${?} -eq 0 ]]; then
-        OBJ_PATH=$(get_nix_path "${OBJ_NIX_FETCH_OUT}")
-        OBJ_SHA256=$(get_nix_sha "${OBJ_NIX_FETCH_OUT}")
-        OBJ_SHA1=$(get_sha1 "${OBJ_PATH}")
-    fi
-fi
-
 # Format into a Nix attrset entry
 echo -ne "
  {
@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
  BUILD_ENV = buildEnv;

  # custom env variables derived from config
-  STATUS_GO_SRC_OVERRIDE = getConfig "status-go.src-override" null;
+  STATUS_GO_SRC_OVERRIDE = getConfig "nimbus.src-override" null;
  ANDROID_APK_SIGNED = getConfig "android.apk-signed" "true";
  ANDROID_ABI_SPLIT = getConfig "android.abi-split" "false";
  ANDROID_ABI_INCLUDE = androidAbiInclude;
@@ -42,8 +42,6 @@ in {
    allowHigher = true;
  };
  gomobile = super.gomobile.override {
-    # FIXME: No Android SDK packages for aarch64-darwin.
-    withAndroidPkgs = stdenv.system != "aarch64-darwin";
    androidPkgs = self.androidEnvCustom.compose;
  };

@@ -11,10 +11,10 @@ let
  # We follow the master branch of official nixpkgs.
  nixpkgsSrc = fetchFromGitHub {
    name = "nixpkgs-source";
-    owner = "status-im";
+    owner = "NixOS";
    repo = "nixpkgs";
-    rev = "15111f8a9ad423d300886b537647691c2faa28cd";
-    sha256 = "05ny644x3dpxigljnb4rmams5vrs5gkbcyqjfamvlqm8rdmsi0kn";
+    rev = "65135081f63ca2f5eaa9b7b54bfc7bf31502cfd6";
+    sha256 = "074lyh19x8xs8xqf4wwwl64870rpml96g7dhx1y09i81w5k29aga";
    # To get the compressed Nix sha256, use:
    # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
  };
@@ -4,7 +4,7 @@ let
  inherit (lib) strings;
 in buildGo116Module rec {
  pname = "go-maven-resolver";
-  version = "v1.1.2";
+  version = "v1.1.1";

  vendorSha256 = "1p9pl33zpbw8zc85301mnp692lkr46ppm1q99wnqwynzi7x8hnkn";

@@ -13,6 +13,6 @@ in buildGo116Module rec {
    owner = "status-im";
    repo = pname;
    rev = version;
-    sha256 = "0p3qz5w8spzdxs70m1sdfwi0ajv4ciw3f7fxligf45vj2fwp5dab";
+    sha256 = "0pjab7v4cq3w5z3h0g9bfahqfs4raqp8y9sxwsri4zgbvdllq11q";
  };
 }
@@ -15,53 +15,46 @@ source "${GIT_ROOT}/nix/scripts/source.sh"
 export TERM=xterm # fix for colors
 shift # we remove the first -c from arguments

+nixArgs=(
+  "--show-trace"
+)
+
 if [[ -z "${TARGET}" ]]; then
-    export TARGET="default"
+    TARGET="default"
    echo -e "${YLW}Missing TARGET, assuming default target.${RST} See nix/README.md for more details." 1>&2
 fi
-
 # Minimal shell with just Nix sourced, useful for `make nix-gc`.
 if [[ "${TARGET}" == "nix" ]]; then
    eval $@
-    exit 0
-fi
-if [[ -n "${IN_NIX_SHELL}" ]] && [[ -n "${NIX_SHELL_TARGET}" ]]; then
-    if [[ "${NIX_SHELL_TARGET}" == "${TARGET}" ]]; then
-        echo -e "${YLW}Nix shell for TARGET=${TARGET} is already active.${RST}" >&2
-        exit 0
-    else
-        # Nesting nix shells does not work due to how we detect already present shell.
-        echo -e "${RED}Cannot nest Nix shells with different targets!${RST}" >&2
-        exit 1
-    fi
+    exit
 fi

 entryPoint="default.nix"
-nixArgs=(
-    "--show-trace"
-    "--attr shells.${TARGET}"
-)
+nixArgs+=("--attr shells.${TARGET}")

 config=''
-if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
-    config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
+if [ -n "${STATUS_GO_SRC_OVERRIDE}" ]; then
+  config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
+fi
+if [ -n "${NIMBUS_SRC_OVERRIDE}" ]; then
+  config+="status-im.nimbus.src-override=\"${NIMBUS_SRC_OVERRIDE}\";"
 fi
 config+="status-im.build-type=\"${BUILD_TYPE}\";"

-if [[ -n "$config" ]]; then
-    nixArgs+=("--arg config {$config}")
+if [ -n "$config" ]; then
+  nixArgs+=("--arg config {$config}")
 fi

 # This variable allows specifying which env vars to keep for Nix pure shell
 # The separator is a colon
 if [[ -n "${_NIX_KEEP}" ]]; then
-    nixArgs+=("--keep ${_NIX_KEEP//,/ --keep }")
+  nixArgs+=("--keep ${_NIX_KEEP//,/ --keep }")
 fi

 # Not all builds are ready to be run in a pure environment
 if [[ -n "${_NIX_PURE}" ]]; then
-    nixArgs+=("--pure")
-    pureDesc='pure '
+  nixArgs+=("--pure")
+  pureDesc='pure '
 fi

 echo -e "${GRN}Configuring ${pureDesc}Nix shell for target '${TARGET}'...${RST}" 1>&2
@@ -72,8 +65,7 @@ ${GIT_ROOT}/nix/scripts/gcroots.sh "shells.${TARGET}"
 # ENTER_NIX_SHELL is the fake command used when `make shell` is run.
 # It is just a special string, not a variable, and a marker to not use `--run`.
 if [[ "${@}" == "ENTER_NIX_SHELL" ]]; then
-    export NIX_SHELL_TARGET="${TARGET}"
-    exec nix-shell ${nixArgs[@]} --keep NIX_SHELL_TARGET ${entryPoint}
+  exec nix-shell ${nixArgs[@]} ${entryPoint}
 else
-    exec nix-shell ${nixArgs[@]} --run "$@" ${entryPoint}
+  exec nix-shell ${nixArgs[@]} --run "$@" ${entryPoint}
 fi
@@ -14,6 +14,7 @@ let

  # Combines with many other shells
  node-sh = mkShell {
+    buildInputs = [ pkgs.androidPkgs ];
    shellHook = ''
      export STATUS_REACT_HOME=$(git rev-parse --show-toplevel)
      $STATUS_REACT_HOME/nix/scripts/node_modules.sh ${pkgs.deps.nodejs-patched}
@@ -51,8 +52,8 @@ let
      shellHook = ''
        export STATUS_GO_ANDROID_LIBDIR="DUMMY"
        export STATUS_NIX_MAVEN_REPO="${pkgs.deps.gradle}"
-        export ANDROID_SDK_ROOT="${pkgs.androidPkgs.sdk}"
-        export ANDROID_NDK_ROOT="${pkgs.androidPkgs.ndk}"
+        export ANDROID_SDK_ROOT="${pkgs.androidPkgs}"
+        export ANDROID_NDK_ROOT="${pkgs.androidPkgs}/ndk-bundle"
      '';
    };

@@ -0,0 +1,47 @@
+#
+# This fetches nimbus source from local folder or GitHub and
+# loads the derivation defined in the `nix/default.nix` in the repo.
+#
+
+{ config, lib, stdenv, callPackage, fetchFromGitHub }:
+
+let
+  inherit (lib) getConfig attrByPath strings traceValFn;
+
+  repo = "nimbus";
+
+  localPath = getConfig "nimbus.src-override" "";
+  localSrc =
+    # We use builtins.path so that we can name the resulting derivation.
+    # Name would be taken from the checkout directory, and wouldn't be deterministic.
+    builtins.path rec {
+      path = traceValFn (path: ''
+        Using local ${repo} sources from ${path}
+      '') localPath;
+      name = "${repo}-source-local";
+      filter =
+        # Keep this filter as restrictive as possible in order to
+        # avoid unnecessary rebuilds and limit closure size
+        lib.mkFilter {
+          root = path;
+          include = [
+            "nix.*" "wrappers.*" "vendor.*"
+            "Makefile" "nim.cfg" "nimbus.nimble" "default.nix"
+          ];
+        };
+    };
+
+  ghSrc = fetchFromGitHub rec {
+    inherit repo;
+    name = "${repo}-source-${strings.substring 0 7 rev}";
+    rev = "73278f20d0bf27fb7c6c331b515abb765814f1cc";
+    owner = "status-im";
+    sha256 = "0myq234zqnpmqsc2452xygnyc6sjs8x1blyrpa4bi9v2cwbyap5c";
+    fetchSubmodules = true;
+  };
+
+  src = if localPath != "" then localSrc else ghSrc;
+
+  nimbusDeriv = import "${src}/nix/default.nix";
+
+in nimbusDeriv
@@ -1,9 +1,9 @@
 { config, utils, lib, callPackage, fetchFromGitHub }:

 let
-  inherit (lib) strings traceValFn attrByPath importJSON getConfig;
+  inherit (lib) strings traceValFn attrByPath importJSON;

-  srcOverride = getConfig "status-go.src-override" null;
+  srcOverride = attrByPath [ "status-im" "status-go" "src-override" ] null config;
  # Warning message about using local sources
  localSrcWarn = (path: "Using local status-go sources from ${path}");

@@ -27,7 +27,7 @@ let
        include = [ ".*" ];
        exclude = [
          ".*/[.]git.*" ".*[.]md" ".*[.]yml" ".*/.*_test.go$"
-          "VERSION" "_assets/.*" "build/.*"
+          "_assets/.*" "build/.*"
          ".*/.*LICENSE.*" ".*/CONTRIB.*" ".*/AUTHOR.*"
        ];
      };
@@ -39,7 +39,6 @@
    "react-native-dark-mode": "^0.2.2",
    "react-native-device-info": "^7.4.0",
    "react-native-dialogs": "^1.0.4",
-    "react-native-fast-image": "8.5.11",
    "react-native-fetch-polyfill": "^1.1.2",
    "react-native-fs": "^2.14.1",
    "react-native-gesture-handler": "^1.8.0",
@@ -59,7 +58,7 @@
    "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-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.35",
    "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.3.0-status",
@@ -138,7 +138,7 @@
        } else if (payload.method == "net_version"){
            return web3Response(payload, window.statusAppNetworkId)
        } else if (payload.method == "eth_chainId"){
-            return web3Response(payload, "0x" + Number(window.statusAppNetworkId).toString(16))
+            return web3Response(payload, "0x" + window.statusAppNetworkId.toString(16))
        } else if (payload.method == "eth_uninstallFilter"){
            return web3Response(payload, true);
        } else {
@@ -159,7 +159,7 @@
    EthereumProvider.prototype.isConnected = function () { return true; };
    // Set legacy metamask fields https://docs.metamask.io/guide/ethereum-provider.html#legacy-api
    EthereumProvider.prototype.networkVersion = window.statusAppNetworkId;
-    EthereumProvider.prototype.chainId = "0x" + Number(window.statusAppNetworkId).toString(16);
+    EthereumProvider.prototype.chainId = "0x" + window.statusAppNetworkId.toString(16);

    EthereumProvider.prototype._events = {};

@@ -179,10 +179,6 @@
        this._events[name] = this._events[name].filter(filterListeners);
    }

-    EthereumProvider.prototype.removeAllListeners = function () {
-        this._events = {};
-    }
-
    EthereumProvider.prototype.emit = function (name, data) {
        if (!this._events[name]) {
          return
@@ -222,7 +218,6 @@
         var syncResponse = getSyncResponse({method: method});
         if (syncResponse){
             return new Promise(function (resolve, reject) {
-                                        if (window.statusAppDebug) { console.log("resolve sync: " + resolve + " " + JSON.stringify(syncResponse.result)); }
                                        resolve(syncResponse.result);
                                    });
         }
@@ -26,6 +26,9 @@ config=''
 if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
  config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
 fi
+if [[ -n "${NIMBUS_SRC_OVERRIDE}" ]]; then
+  config+="status-im.nimbus.src-override=\"${NIMBUS_SRC_OVERRIDE}\";"
+fi
 if [[ "${ANDROID_APK_SIGNED}" == "true" ]]; then
  config+="status-im.android.keystore-path=\"$(must_get_env KEYSTORE_PATH)\";"
 fi
@@ -19,11 +19,20 @@
                    :restSpeedThreshold        0.1
                    :restDisplacementThreshold 0.1})

+;; NOTE(Ferossgp): RNGH does not work in modal react native
+(defn modal [{:keys [visible] :as props} & children]
+  (if platform/android?
+    (into [rn/view {:style          styles/container
+                    :pointer-events (if visible :box-none :none)}]
+          (when visible children))
+    (into [rn/modal props] children)))
+
 (defn bottom-sheet-hooks [props]
  (let [{on-cancel          :onCancel
         disable-drag?      :disableDrag?
         show-handle?       :showHandle?
         visible?           :visible?
+         transparent        :transparent
         backdrop-dismiss?  :backdropDismiss?
         back-button-cancel :backButtonCancel
         children           :children
@@ -38,11 +47,7 @@
        {window-height :height}   (rn/use-window-dimensions)
        {:keys [keyboard-shown
                keyboard-height]} (rn/use-keyboard)
-        keyboard-height-android-delta (if (and platform/android? keyboard-shown) (+ keyboard-height 20) 0)
        safe-area                 (safe-area/use-safe-area)
-        window-height             (- window-height (if platform/android?
-                                                     (+ 50 keyboard-height-android-delta) ;; TODO : remove 50 when react-native-navigation v8 will be implemented https://github.com/wix/react-native-navigation/issues/7225
-                                                     0))
        min-height                (+ (* styles/vertical-padding 2) (:bottom safe-area))
        max-height                (- window-height (:top safe-area) styles/margin-top)
        visible                   (react/state false)
@@ -177,42 +182,48 @@
         (close-sheet)))
     [visible?])
    (reagent/as-element
-     [rn/view {:style          styles/container
-               :pointer-events :box-none}
-      [gesture-handler/tap-gesture-handler (merge {:enabled backdrop-dismiss?}
-                                                  tap-gesture-handler)
-       [animated/view {:style (merge (styles/backdrop)
-                                     (when platform/ios?
-                                       {:opacity          opacity
-                                        :background-color (:backdrop @colors/theme)}))}]]
-      [animated/view {:style (merge (styles/content-container window-height)
-                                    {:transform [{:translateY (if (= sheet-height max-height)
-                                                                (animated/add translate-y keyboard-height-android-delta)
-                                                                translate-y)}
-                                                 {:translateY (* window-height 2)}]})}
-       [gesture-handler/pan-gesture-handler (merge on-master-event
-                                                   {:ref      master-ref
-                                                    :wait-for body-ref
-                                                    :enabled  (not disable-drag?)})
-        [animated/view  {:style styles/content-header}
-         (when show-handle?
-           [rn/view {:style styles/handle}])]]
-       [gesture-handler/pan-gesture-handler (merge on-body-event
-                                                   {:ref      body-ref
-                                                    :wait-for master-ref
-                                                    :enabled  (and (not disable-drag?)
-                                                                   (not= sheet-height max-height))})
-        [animated/view {:height sheet-height}
-         [animated/scroll-view {:bounces        false
-                                :flex           1
-                                :scroll-enabled (= sheet-height max-height)}
-          [animated/view {:style     {:padding-top    styles/vertical-padding
-                                      :padding-bottom (+ styles/vertical-padding
-                                                         (if (and platform/ios? keyboard-shown)
-                                                           keyboard-height
-                                                           (:bottom safe-area)))}
-                          :on-layout #(reset! height (.-nativeEvent.layout.height ^js %))}
-           (into [:<>]
-                 (react/get-children children))]]]]]])))
+     [modal {:visible                @visible
+             :transparent            true
+             :presentation-style     :overFullScreen
+             :hardware-accelerated   true
+             :on-request-close       (fn []
+                                       (when back-button-cancel
+                                         (close-sheet)))}
+      [rn/view {:style          styles/container
+                :opacity        (if transparent 0 1)
+                :pointer-events :box-none}
+       [gesture-handler/tap-gesture-handler (merge {:enabled backdrop-dismiss?}
+                                                   tap-gesture-handler)
+        [animated/view {:style (merge (styles/backdrop)
+                                      (when platform/ios?
+                                        {:opacity          opacity
+                                         :background-color (:backdrop @colors/theme)}))}]]
+       [animated/view {:style (merge (styles/content-container window-height)
+                                     {:transform [{:translateY translate-y}
+                                                  {:translateY (* window-height 2)}]})}
+        [gesture-handler/pan-gesture-handler (merge on-master-event
+                                                    {:ref      master-ref
+                                                     :wait-for body-ref
+                                                     :enabled  (not disable-drag?)})
+         [animated/view  {:style styles/content-header}
+          (when show-handle?
+            [rn/view {:style styles/handle}])]]
+        [gesture-handler/pan-gesture-handler (merge on-body-event
+                                                    {:ref      body-ref
+                                                     :wait-for master-ref
+                                                     :enabled  (and (not disable-drag?)
+                                                                    (not= sheet-height max-height))})
+         [animated/view {:height sheet-height}
+          [animated/scroll-view {:bounces        false
+                                 :flex           1
+                                 :scroll-enabled (= sheet-height max-height)}
+           [animated/view {:style     {:padding-top    styles/vertical-padding
+                                       :padding-bottom (+ styles/vertical-padding
+                                                          (if (and platform/ios? keyboard-shown)
+                                                            keyboard-height
+                                                            (:bottom safe-area)))}
+                           :on-layout #(reset! height (.-nativeEvent.layout.height ^js %))}
+            (into [:<>]
+                  (react/get-children children))]]]]]]])))

-(def bottom-sheet (reagent/adapt-react-class (react/memo bottom-sheet-hooks)))
+(def bottom-sheet (reagent/adapt-react-class (react/memo bottom-sheet-hooks)))
@@ -49,15 +49,15 @@
                     :hold       hold
                     :disabled   disabled}]]]))))

-(defn switch-view [{:keys [transition hold disabled value]}]
+(defn switch-view [{:keys [transition hold disabled]}]
  [animated/view {:style               (styles/switch-style transition disabled)
-                  :accessibility-label (str "switch-" (if value "on" "off"))
+                  :accessibility-label :switch
                  :accessibility-role  :switch}
   [animated/view {:style (styles/switch-bullet-style transition hold)}]])

-(defn radio-view [{:keys [transition hold disabled value]}]
+(defn radio-view [{:keys [transition hold disabled]}]
  [animated/view {:style (styles/radio-style transition disabled)
-                  :accessibility-label (str "radio-" (if value "on" "off"))
+                  :accessibility-label :radio
                  :accessibility-role  :radio}
   [animated/view {:style (styles/radio-bullet-style transition hold)}]])

@@ -67,15 +67,15 @@
     [rn/touchable-without-feedback
      {:on-press (when (and onChange (not disabled)) onChange)}
      [rn/view {:style               (styles/checkbox-style value disabled)
-                :accessibility-label (str "checkbox-" (if value "on" "off"))
+                :accessibility-label :checkbox
                :accessibility-role  :checkbox}
       [rn/view {:style (styles/check-icon-style value)}
        [icons/tiny-icon :tiny-icons/tiny-check {:color colors/white}]]]])))

-(defn animated-checkbox-view [{:keys [transition hold disabled value]}]
+(defn animated-checkbox-view [{:keys [transition hold disabled]}]
  [animated/view
   {:style               (styles/animated-checkbox-style transition disabled)
-    :accessibility-label (str "checkbox-" (if value "on" "off"))
+    :accessibility-label :checkbox
    :accessibility-role  :checkbox}
   [animated/view {:style (styles/animated-check-icon-style transition hold)}
    [icons/tiny-icon :tiny-icons/tiny-check {:color colors/white}]]])
@@ -218,7 +218,4 @@
      (set! pin-background (:pin-background old-colors-mapping-colors)))
    (reset! theme-type type)))

-;; Colors related to Visibility Status
-(def color-online "#7CDA00")
-(def color-dnd "#FA6565")
-(def color-inactive "#939BA1")
+
@@ -26,7 +26,7 @@
  [cofx {:keys [key id]} public]
  (fx/merge cofx
            {::persistence/chat-initalized! true}
-            (chat/start-chat key nil)))
+            (chat/start-chat key)))

 (fx/defn start-public-chat
  {:events [::start-public-chat]}
@@ -37,7 +37,7 @@

 (fx/defn join-public-chat
  [cofx chat-name]
-  (chat/start-public-chat cofx chat-name nil))
+  (chat/start-public-chat cofx chat-name {:navigation-reset? true}))

 (fx/defn accept-pack
  {:events [::accept-pack]}
@@ -78,9 +78,9 @@
    (if-not validation-result
      (if new-contact?
        (fx/merge cofx
-                  (contact/add-contact chat-key nil nil)
+                  (contact/add-contact chat-key nil)
                  (navigation/navigate-to-cofx :contacts-list {}))
-        (chat/start-chat cofx chat-key nil))
+        (chat/start-chat cofx chat-key))
      {:utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
                          :content    (case validation-result
                                        :invalid
@@ -9,7 +9,7 @@

 (def key->string str)

-(defn set-item! [key value]
+(defn- set-item! [key value]
  (-> ^js async-storage
      (.setItem (key->string key)
                (clj->transit value))
@@ -1,26 +0,0 @@
-(ns status-im.backup.core
-  (:require [re-frame.core :as re-frame]
-            [taoensso.timbre :as log]
-            [status-im.ethereum.json-rpc :as json-rpc]
-            [status-im.utils.fx :as fx]))
-
-(fx/defn handle-backup-failed
-  {:events [::backup-failed]}
-  [{:keys [db]}]
-  {:db (dissoc db :backup/performing-backup)})
-
-(fx/defn handle-backup-perfomed
-  {:events [::backup-performed]}
-  [{:keys [db]}]
-  {:db (dissoc db :backup/performing-backup)})
-
-(fx/defn handle-perform-backup-pressed
-  {:events [:multiaccounts.ui/perform-backup-pressed]}
-  [{:keys [db]}]
-  {:db (assoc db :backup/performing-backup true)
-   ::json-rpc/call [{:method     (json-rpc/call-ext-method "backupData")
-                     :params     []
-                     :on-error   #(do
-                                    (log/error "failed to perfom backup" %)
-                                    (re-frame/dispatch [::backup-failed %]))
-                     :on-success #(re-frame/dispatch [::backup-performed %])}]})
@@ -4,7 +4,6 @@
            [status-im.multiaccounts.model :as multiaccounts.model]
            [status-im.chat.models.message-list :as message-list]
            [status-im.data-store.chats :as chats-store]
-            [status-im.data-store.contacts :as contacts-store]
            [status-im.ethereum.json-rpc :as json-rpc]
            [status-im.i18n.i18n :as i18n]
            [quo.design-system.colors :as colors]
@@ -129,13 +128,11 @@
                (map (map-chats cofx) chats))]
    (fx/merge
     cofx
-     (merge {:db (-> db
-                     (update :chats merge all-chats)
-                     (update :chats-home-list set/union chats-home-list)
-                     (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}))
+     {:db (-> db
+              (update :chats merge all-chats)
+              (update :chats-home-list set/union chats-home-list)
+              (update :chats #(apply dissoc % removed-chats))
+              (update :chats-home-list set/difference removed-chats))}
     leave-removed-chat)))

 (fx/defn clear-history
@@ -199,23 +196,15 @@

 (fx/defn close-chat
  {:events [:close-chat]}
-  [{:keys [db] :as cofx}]
-  (let [chat-id (:current-chat-id db)
-        navigate-after-home-to-chat (:navigate-after-home-to-chat db)]
-    (chat.state/reset-visible-item)
-    (if navigate-after-home-to-chat
-      {:db (dissoc db :navigate-after-home-to-chat)}
-      (fx/merge cofx
-                {:db (dissoc db :current-chat-id)}
-                (offload-messages chat-id)))))
-
-(fx/defn force-close-chat
-  [{:keys [db] :as cofx} chat-id]
-  (do
-    (chat.state/reset-visible-item)
-    (fx/merge cofx
-              {:db (dissoc db :current-chat-id)}
-              (offload-messages chat-id))))
+  [{:keys [db] :as cofx} target-chat-id]
+  (let [chat-id (:current-chat-id db)]
+    (if (:ignore-close-chat db)
+      {:db (dissoc db :ignore-close-chat)}
+      (when (= target-chat-id chat-id)
+        (chat.state/reset-visible-item)
+        (fx/merge cofx
+                  {:db (dissoc db :current-chat-id)}
+                  (offload-messages chat-id))))))

 (fx/defn remove-chat
  "Removes chat completely from app, producing all necessary effects for that"
@@ -242,21 +231,19 @@
 (fx/defn navigate-to-chat
  "Takes coeffects map and chat-id, returns effects necessary for navigation and preloading data"
  {:events [:chat.ui/navigate-to-chat]}
-  [{db :db :as cofx} chat-id]
-  (let [home-view? (= (get db :view-id) :home)]
-    (fx/merge cofx
-              (close-chat)
-              (force-close-chat chat-id)
-              (fn [{:keys [db]}]
-                {:db (assoc db :current-chat-id chat-id :navigate-after-home-to-chat (not home-view?))})
-              (preload-chat-data chat-id)
-              #(when (group-chat? cofx chat-id)
-                 (loading/load-chat % chat-id))
-              #(when-not home-view?
-                 (navigation/change-tab % :chat))
-              #(when-not home-view?
-                 (navigation/pop-to-root-tab % :chat-stack))
-              (navigation/navigate-to-cofx :chat nil))))
+  [{db :db :as cofx} chat-id dont-reset?]
+  (fx/merge cofx
+            (close-chat (:current-chat-id db))
+            (fn [{:keys [db]}]
+              {:db (assoc db :current-chat-id chat-id :ignore-close-chat true)})
+            (preload-chat-data chat-id)
+            #(when (group-chat? cofx chat-id)
+               (loading/load-chat % chat-id))
+            #(when-not dont-reset?
+               (navigation/change-tab % :chat))
+            #(when-not dont-reset?
+               (navigation/pop-to-root-tab % :chat-stack))
+            (navigation/navigate-to-cofx :chat nil)))

 (fx/defn handle-clear-history-response
  {:events [::history-cleared]}
@@ -267,16 +254,10 @@
 (fx/defn handle-one-to-one-chat-created
  {:events [::one-to-one-chat-created]}
  [{:keys [db]} chat-id response]
-  (let [chat (chats-store/<-rpc (first (:chats response)))
-        contact-rpc (first (:contacts response))
-        contact (when contact-rpc (contacts-store/<-rpc contact-rpc))]
-    {:db (cond-> db
-           contact
-           (assoc-in [:contacts/contacts chat-id] contact)
-           :always
-           (assoc-in [:chats chat-id] chat)
-           :always
-           (update :chats-home-list conj chat-id))
+  (let [chat (chats-store/<-rpc (first (:chats response)))]
+    {:db (-> db
+             (assoc-in [:chats chat-id] chat)
+             (update :chats-home-list conj chat-id))
     :dispatch [:chat.ui/navigate-to-chat chat-id]}))

 (fx/defn navigate-to-user-pinned-messages
@@ -288,11 +269,11 @@
 (fx/defn start-chat
  "Start a chat, making sure it exists"
  {:events [:chat.ui/start-chat]}
-  [{:keys [db] :as cofx} chat-id ens-name]
+  [{:keys [db] :as cofx} chat-id]
  ;; don't allow to open chat with yourself
  (when (not= (multiaccounts.model/current-public-key cofx) chat-id)
    {::json-rpc/call [{:method "wakuext_createOneToOneChat"
-                       :params [{:id chat-id :ensName ens-name}]
+                       :params [{:id chat-id}]
                       :on-success #(re-frame/dispatch [::one-to-one-chat-created chat-id %])
                       :on-error #(log/error "failed to create one-to-on chat" chat-id %)}]}))

@@ -304,11 +285,14 @@

 (fx/defn handle-public-chat-created
  {:events [::public-chat-created]}
-  [{:keys [db]} chat-id _ response]
-  {:db (-> db
-           (assoc-in [:chats chat-id] (chats-store/<-rpc (first (:chats response))))
-           (update :chats-home-list conj chat-id))
-   :dispatch [:chat.ui/navigate-to-chat chat-id]})
+  [{:keys [db]} chat-id {:keys [dont-navigate?]} response]
+  (let [chat (chats-store/<-rpc (first (:chats response)))
+        db-with-chat {:db (-> db
+                              (assoc-in [:chats chat-id] chat)
+                              (update :chats-home-list conj chat-id))}]
+    (if dont-navigate?
+      db-with-chat
+      (assoc db-with-chat :dispatch [:chat.ui/navigate-to-chat chat-id]))))

 (fx/defn create-public-chat-go [_ chat-id opts]
  {::json-rpc/call [{:method "wakuext_createPublicChat"
@@ -319,10 +303,11 @@
 (fx/defn start-public-chat
  "Starts a new public chat"
  {:events [:chat.ui/start-public-chat]}
-  [cofx topic {:keys [profile-public-key] :as opts}]
+  [cofx topic {:keys [dont-navigate? profile-public-key] :as opts}]
  (if (or (new-public-chat.db/valid-topic? topic) profile-public-key)
    (if (active-chat? cofx topic)
-      (navigate-to-chat cofx topic)
+      (when-not dont-navigate?
+        (navigate-to-chat cofx topic false))
      (create-public-chat-go
       cofx
       topic
@@ -61,8 +61,7 @@
  [db chat-id]
  (update-in db [:chats chat-id] assoc
             :unviewed-messages-count 0
-             :unviewed-mentions-count 0
-             :highlight false))
+             :unviewed-mentions-count 0))

 (fx/defn handle-mark-all-read-successful
  {:events [::mark-all-read-successful]}
@@ -14,8 +14,7 @@
   [quo.design-system.colors :as colors]
   [status-im.navigation :as navigation]
   [status-im.utils.handlers :refer [>evt]]
-   [status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles]
-   [status-im.notifications-center.core :as notification-center]))
+   [status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles]))

 (def crop-size 1000)

@@ -288,8 +287,7 @@
 (fx/defn edit-channel
  {:events [::edit-channel-confirmation-pressed]}
  [{:keys [db] :as cofx}]
-  (let [{:keys [name description color community-id emoji edit-channel-id category-id]}
-        (get db :communities/create-channel)]
+  (let [{:keys [name description color community-id emoji edit-channel-id]} (get db :communities/create-channel)]
    {::json-rpc/call [{:method     "wakuext_editCommunityChat"
                       :params     [community-id
                                    edit-channel-id
@@ -297,7 +295,6 @@
                                                   :description  description
                                                   :color        color
                                                   :emoji        emoji}
-                                     :category_id  category-id
                                     :permissions {:access constants/community-channel-access-no-membership}}]
                       :js-response true
                       :on-success #(re-frame/dispatch [::community-channel-edited %])
@@ -345,7 +342,7 @@

 (fx/defn edit-channel-pressed
  {:events [::edit-channel-pressed]}
-  [{:keys [db] :as cofx} community-id chat-name description color emoji chat-id category-id]
+  [{:keys [db] :as cofx} community-id chat-name description color emoji chat-id]
  (let [{:keys [color emoji]} (if (string/blank? emoji)
                                (rand-nth emoji-thumbnail-styles/emoji-picker-default-thumbnails)
                                {:color color :emoji emoji})]
@@ -355,8 +352,7 @@
                                                          :color           color
                                                          :community-id    community-id
                                                          :emoji           emoji
-                                                          :edit-channel-id chat-id
-                                                          :category-id     category-id})}
+                                                          :edit-channel-id chat-id})}
              (navigation/open-modal :edit-community-channel nil))))

 (fx/defn community-created
@@ -448,8 +444,7 @@
  [cofx response-js]
  (fx/merge cofx
            (bottom-sheet/hide-bottom-sheet)
-            (handle-response response-js)
-            (notification-center/get-activity-center-notifications-count)))
+            (handle-response response-js)))

 (fx/defn member-ban
  {:events [::member-ban]}
@@ -591,56 +586,3 @@
    (fx/merge cofx
              (navigation/navigate-back)
              (remove-chat-from-category community-id id categoryID))))
-
-(fx/defn reorder-category
-  {:events [::reorder-community-category]}
-  [_ community-id category-id new-position]
-  {::json-rpc/call [{:method     "wakuext_reorderCommunityCategories"
-                     :params     [{:communityId community-id
-                                   :categoryId  category-id
-                                   :position    new-position}]
-                     :js-response true
-                     :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])
-                     :on-error    #(log/error "failed to reorder community category" %)}]})
-
-(defn category-hash [public-key community-id category-id]
-  (hash (str public-key community-id category-id)))
-
-(fx/defn store-category-state
-  {:events [::store-category-state]}
-  [{:keys [db]} community-id category-id state-open?]
-  (let [public-key (get-in db [:multiaccount :public-key])
-        hash       (category-hash public-key community-id category-id)]
-    {::async-storage/set! {hash state-open?}}))
-
-(fx/defn update-category-states-in-db
-  {:events [::category-states-loaded]}
-  [{:keys [db]} community-id hashes states]
-  (let [public-key     (get-in db [:multiaccount :public-key])
-        categories-old (get-in db [:communities community-id :categories])
-        categories     (reduce (fn [acc [category-id category]]
-                                 (let [hash             (get hashes category-id)
-                                       state            (get states hash)
-                                       category-updated (assoc category :state state)]
-                                   (assoc acc category-id category-updated)))
-                               {} categories-old)]
-    {:db (update-in db [:communities community-id :categories] merge categories)}))
-
-(fx/defn load-category-states
-  {:events [::load-category-states]}
-  [{:keys [db]} community-id]
-  (let [public-key            (get-in db [:multiaccount :public-key])
-        categories            (get-in db [:communities community-id :categories])
-        {:keys [keys hashes]} (reduce (fn [acc category]
-                                        (let [category-id (get category 0)
-                                              hash        (category-hash
-                                                           public-key
-                                                           community-id
-                                                           category-id)]
-                                          (-> acc
-                                              (assoc-in [:hashes category-id] hash)
-                                              (update :keys #(conj % hash)))))
-                                      {} categories)]
-    {::async-storage/get {:keys keys
-                          :cb   #(re-frame/dispatch
-                                  [::category-states-loaded community-id hashes %])}}))
@@ -162,9 +162,3 @@
 (def ^:const activity-center-notification-type-private-group-chat 2)
 (def ^:const activity-center-notification-type-mention 3)
 (def ^:const activity-center-notification-type-reply 4)
-
-(def ^:const visibility-status-unknown 0)
-(def ^:const visibility-status-automatic 1)
-(def ^:const visibility-status-dnd 2)
-(def ^:const visibility-status-always-online 3)
-(def ^:const visibility-status-inactive 4)
@@ -5,8 +5,6 @@
            [status-im.data-store.chats :as chats-store]
            [status-im.data-store.contacts :as contacts-store]
            [status-im.navigation :as navigation]
-            [status-im.utils.types :as types]
-            [status-im.notifications-center.core :as notification-center]
            [status-im.utils.fx :as fx]))

 (fx/defn clean-up-chat
@@ -36,25 +34,23 @@
 (fx/defn contact-blocked
  {:events [::contact-blocked]}
  [{:keys [db] :as cofx} {:keys [public-key]} chats]
-  (let [fxs (when chats
-              (map #(->> (chats-store/<-rpc %)
-                         (clean-up-chat public-key)) (types/js->clj chats)))]
+  (let [fxs (map #(clean-up-chat public-key %) chats)]
    (apply fx/merge
           cofx
           {:db (-> db
                    (update :chats dissoc public-key)
                    (update :chats-home-list disj public-key)
                    (assoc-in [:contacts/contacts public-key :added] false))}
-           (notification-center/get-activity-center-notifications-count)
           fxs)))

 (fx/defn block-contact
  {:events [:contact.ui/block-contact-confirmed]}
-  [{:keys [db] :as cofx} public-key]
+  [{:keys [db now] :as cofx} public-key]
  (let [contact (-> (contact.db/public-key->contact
                     (:contacts/contacts db)
                     public-key)
-                    (assoc :blocked true
+                    (assoc :last-updated now
+                           :blocked true
                           :added false))
        from-one-to-one-chat? (not (get-in db [:chats (:current-chat-id db) :group-chat]))]
    (fx/merge cofx
@@ -63,28 +59,20 @@
                       (update :contacts/blocked (fnil conj #{}) public-key)
                       ;; update the contact in contacts list
                       (assoc-in [:contacts/contacts public-key] contact))}
-              (contacts-store/block
-               public-key #(do (re-frame/dispatch [::contact-blocked contact (.-chats %)])
-                               (re-frame/dispatch [:sanitize-messages-and-process-response %])
-                               (re-frame/dispatch [:hide-popover])))
+              (contacts-store/block contact #(do (re-frame/dispatch [::contact-blocked contact (map chats-store/<-rpc %)])
+                                                 (re-frame/dispatch [:hide-popover])))
              ;; reset navigation to avoid going back to non existing one to one chat
              (if from-one-to-one-chat?
                (navigation/pop-to-root-tab :chat-stack)
                (navigation/navigate-back)))))

-(fx/defn contact-unblocked
-  {:events [::contact-unblocked]}
-  [{:keys [db]} contact-id]
-  (let [contact (-> (get-in db [:contacts/contacts contact-id])
-                    (assoc :blocked false))]
-    {:db (-> db
-             (update :contacts/blocked disj contact-id)
-             (assoc-in [:contacts/contacts contact-id] contact))}))
-
 (fx/defn unblock-contact
-  {:events [:contact.ui/unblock-contact-pressed]}
-  [cofx contact-id]
-  (contacts-store/unblock
-   cofx
-   contact-id
-   #(re-frame/dispatch [::contact-unblocked contact-id])))
+  {:events [:contact.ui/unblock-contact-pressed ::contact-unblocked]}
+  [{:keys [db now] :as cofx} public-key]
+  (let [contact (-> (get-in db [:contacts/contacts public-key])
+                    (assoc :last-updated now :blocked false))]
+    (fx/merge cofx
+              {:db (-> db
+                       (update :contacts/blocked disj public-key)
+                       (assoc-in [:contacts/contacts public-key] contact))}
+              (contacts-store/save-contact contact nil))))
@@ -3,8 +3,7 @@
            [status-im.navigation :as navigation]
            [status-im.utils.fx :as fx]
            [status-im.chat.models :as chat]
-            [status-im.contact.core :as contact]
-            [status-im.notifications-center.core :as notification-center]))
+            [status-im.contact.core :as contact]))

 (fx/defn send-message-pressed
  {:events       [:contact.ui/send-message-pressed]
@@ -12,7 +11,6 @@
  [cofx {:keys [public-key]}]
  (fx/merge cofx
            {:dispatch-later [{:ms 1000 :dispatch [:chat.ui/start-chat public-key]}]}
-            (notification-center/accept-all-activity-center-notifications-from-chat public-key)
            (navigation/pop-to-root-tab :chat-stack)))

 (fx/defn contact-code-submitted
@@ -22,10 +20,12 @@
  (let [{:keys [public-key ens-name]} new-identity]
    (fx/merge cofx
              #(if new-contact?
-                 (contact/add-contact % public-key nickname ens-name)
-                 (chat/start-chat % public-key ens-name))
+                 (contact/add-contact % public-key nickname)
+                 (chat/start-chat % public-key))
              #(when new-contact?
-                 (navigation/navigate-back %)))))
+                 (navigation/navigate-back %))
+              #(when ens-name
+                 (contact/name-verified % public-key ens-name)))))

 (fx/defn pinned-messages-pressed
  {:events       [:contact.ui/pinned-messages-pressed]}
@@ -3,9 +3,11 @@
            [status-im.contact.db :as contact.db]
            [status-im.data-store.contacts :as contacts-store]
            [status-im.ethereum.json-rpc :as json-rpc]
+            [status-im.mailserver.core :as mailserver]
            [status-im.navigation :as navigation]
            [status-im.utils.fx :as fx]
            [taoensso.timbre :as log]
+            [clojure.string :as string]
            [status-im.constants :as constants]
            [status-im.contact.block :as contact.block]))

@@ -52,7 +54,10 @@
               (conj nil)

               (and blocked (not was-blocked))
-               (conj [::contact.block/contact-blocked contact chats]))))
+               (conj [::contact.block/contact-blocked contact chats])
+
+               (and was-blocked (not blocked))
+               (conj [::contact.block/contact-unblocked public-key]))))
         [[:offload-messages constants/timeline-chat-id]]
         contacts)]
    (merge
@@ -66,6 +71,17 @@
     (when (> (count events) 1)
       {:dispatch-n events}))))

+(fx/defn upsert-contact
+  [{:keys [db] :as cofx}
+   {:keys [public-key] :as contact}]
+  (fx/merge cofx
+            {:db            (-> db
+                                (update-in [:contacts/contacts public-key] merge contact))}
+            (fn [cf]
+              (contacts-store/save-contact cf
+                                           (get-in cf [:db :contacts/contacts public-key])
+                                           #(re-frame/dispatch [::send-contact-request  public-key])))))
+
 (fx/defn send-contact-request
  {:events [::send-contact-request]}
  [{:keys [db] :as cofx} public-key]
@@ -76,17 +92,22 @@

 (fx/defn add-contact
  "Add a contact and set pending to false"
-  {:events [:contact.ui/add-to-contact-pressed]}
-  [{:keys [db] :as cofx} public-key nickname ens-name]
+  {:events [:contact.ui/add-to-contact-pressed]
+   :interceptors [(re-frame/inject-cofx :random-id-generator)]}
+  [{:keys [db] :as cofx} public-key nickname]
  (when (not= (get-in db [:multiaccount :public-key]) public-key)
-    (contacts-store/add
-     cofx
-     public-key
-     nickname
-     ens-name
-     #(do
-        (re-frame/dispatch [:sanitize-messages-and-process-response %])
-        (re-frame/dispatch [:offload-messages constants/timeline-chat-id])))))
+    (let [contact (cond-> (get-in db [:contacts/contacts public-key]
+                                  (build-contact cofx public-key))
+                    (and nickname (not (string/blank? nickname)))
+                    (assoc :nickname nickname)
+                    :else
+                    (assoc :added true))]
+      (fx/merge cofx
+                {:db (dissoc db :contacts/new-identity)
+                 :dispatch-n [[:start-profile-chat public-key]
+                              [:offload-messages constants/timeline-chat-id]]}
+                (upsert-contact contact)
+                (mailserver/process-next-messages-request)))))

 (fx/defn remove-contact
  "Remove a contact from current account's contact list"
@@ -98,6 +119,16 @@
                     :on-success #(log/debug "contact removed successfully")}]
   :dispatch [:offload-messages constants/timeline-chat-id]})

+(fx/defn create-contact
+  "Create entry in contacts"
+  [{:keys [db] :as cofx} public-key]
+  (when (not= (get-in db [:multiaccount :public-key]) public-key)
+    (let [contact (build-contact cofx public-key)]
+      (log/info "create contact" contact)
+      (fx/merge cofx
+                {:db (dissoc db :contacts/new-identity)}
+                (upsert-contact contact)))))
+
 (fx/defn initialize-contacts [cofx]
  (contacts-store/fetch-contacts-rpc cofx #(re-frame/dispatch [::contacts-loaded %])))

@@ -110,12 +141,29 @@
                        :new-chat-name "")}
            (navigation/navigate-to-cofx :contact-toggle-list nil)))

+(fx/defn name-verified
+  {:events [:contacts/ens-name-verified]}
+  [{:keys [db now] :as cofx} public-key ens-name]
+  (let [contact (-> (or (get-in db [:contacts/contacts public-key])
+                        (build-contact cofx public-key))
+                    (assoc :name ens-name
+                           :ens-verified true))]
+    (fx/merge cofx
+              {:db            (-> db
+                                  (update-in [:contacts/contacts public-key] merge contact))
+               ::json-rpc/call [{:method "wakuext_ensVerified"
+                                 :params [public-key ens-name]
+                                 :on-success #(log/debug "ens name verified successuful")}]})))
+
 (fx/defn update-nickname
  {:events [:contacts/update-nickname]}
  [{:keys [db] :as cofx} public-key nickname]
-  (fx/merge cofx
-            (contacts-store/set-nickname
-             public-key
-             nickname
-             #(re-frame/dispatch [:sanitize-messages-and-process-response %]))
-            (navigation/navigate-back)))
+  (let [contact (-> (build-contact cofx public-key)
+                    (merge (get-in db [:contacts/contacts public-key])))]
+    (fx/merge cofx
+              {:db (assoc-in db [:contacts/contacts public-key]
+                             (if (string/blank? nickname)
+                               (dissoc contact :nickname)
+                               (assoc contact :nickname nickname)))}
+              (upsert-contact {:public-key public-key})
+              (navigation/navigate-back))))
@@ -28,10 +28,7 @@
           :chat-type constants/one-to-one-chat-type
           :chat-name name
           :public? false
-           :group-chat false)
-
-    :else
-    chat))
+           :group-chat false)))

 (defn <-rpc [item]
  (-> item
@@ -93,11 +93,9 @@
       :unviewed-mentions-count (.-unviewedMentionsCount chat)
       :last-message            {:content      {:text        (.-text chat)
                                                :parsed-text (types/js->clj (.-parsedText chat))}
-                                 :content-type (.-contentType chat)
-                                 :community-id (.-contentCommunityId chat)}
+                                 :content-type (.-contentType chat)}
       :last-clock-value        (.-lastClockValue chat)
-       :profile-public-key      (.-profile chat)
-       :highlight               (.-highlight chat)}
+       :profile-public-key      (.-profile chat)}
      rpc->type
      unmarshal-members))

@@ -13,6 +13,15 @@
                                    :lastUpdated :last-updated
                                    :localNickname :nickname}))

+(defn ->rpc [contact]
+  (clojure.set/rename-keys contact {:public-key :id
+                                    :ens-verified :ensVerified
+                                    :ens-verified-at :ensVerifiedAt
+                                    :last-ens-clock-value :lastENSClockValue
+                                    :ens-verification-retries :ensVerificationRetries
+                                    :last-updated :lastUpdated
+                                    :nickname :localNickname}))
+
 (fx/defn fetch-contacts-rpc
  [_ on-success]
  {::json-rpc/call [{:method (json-rpc/call-ext-method "contacts")
@@ -20,38 +29,18 @@
                     :on-success #(on-success (map <-rpc %))
                     :on-failure #(log/error "failed to fetch contacts" %)}]})

-(fx/defn add
-  [_ public-key nickname ens-name on-success]
-  {::json-rpc/call [{:method (json-rpc/call-ext-method "addContact")
-                     :params [{:id public-key :nickname nickname :ensName ens-name}]
-                     :js-response true
+(fx/defn save-contact
+  [_ {:keys [public-key] :as contact} on-success]
+  {::json-rpc/call [{:method (json-rpc/call-ext-method "saveContact")
+                     :params [(->rpc contact)]
                     :on-success #(do
-                                    (log/info "saved contact" public-key "successfuly")
+                                    (log/debug "saved contact" public-key "successfuly")
                                    (when on-success
-                                      (on-success %)))
-                     :on-failure #(log/error "failed to add contact" public-key %)}]})
+                                      (on-success)))
+                     :on-failure #(log/error "failed to save contact" public-key %)}]})

-(fx/defn set-nickname
-  [_ public-key nickname on-success]
-  {::json-rpc/call [{:method (json-rpc/call-ext-method "setContactLocalNickname")
-                     :params [{:id public-key :nickname nickname}]
-                     :js-response true
-                     :on-success #(do
-                                    (log/debug "set contact nickname" public-key "successfuly" nickname)
-                                    (when on-success
-                                      (on-success %)))
-                     :on-failure #(log/error "failed to set contact nickname " public-key nickname %)}]})
-
-(fx/defn block [_ contact-id on-success]
+(fx/defn block [_ contact on-success]
  {::json-rpc/call [{:method (json-rpc/call-ext-method "blockContact")
-                     :params [contact-id]
-                     :js-response true
+                     :params [(->rpc contact)]
                     :on-success on-success
-                     :on-failure #(log/error "failed to block contact" % contact-id)}]})
-
-(fx/defn unblock [_ contact-id on-success]
-  {::json-rpc/call [{:method (json-rpc/call-ext-method "unblockContact")
-                     :params [contact-id]
-                     :on-success on-success
-                     :js-response true
-                     :on-failure #(log/error "failed to unblock contact" % contact-id)}]})
+                     :on-failure #(log/error "failed to block contact" % contact)}]})
@@ -2,6 +2,21 @@
  (:require [cljs.test :refer-macros [deftest is testing]]
            [status-im.data-store.contacts :as c]))

+(deftest contact->rpc
+  (let [contact {:public-key "pk"
+                 :address "address"
+                 :name "name"
+                 :identicon "identicon"
+                 :last-updated 1}
+        expected-contact {:id "pk"
+                          :address "address"
+                          :name "name"
+                          :identicon "identicon"
+
+                          :lastUpdated 1}]
+    (testing "->rpc"
+      (is (= expected-contact (c/->rpc contact))))))
+
 (deftest contact<-rpc
  (let [contact {:id "pk"
                 :address "address"
@@ -1,8 +1,7 @@
 (ns status-im.data-store.settings
  (:require
   [status-im.utils.config :as config]
-   [status-im.ethereum.eip55 :as eip55]
-   [status-im.data-store.visibility-status-updates :as visibility-status-updates]))
+   [status-im.ethereum.eip55 :as eip55]))

 (defn rpc->networks [networks]
  (reduce (fn [acc {:keys [id] :as network}]
@@ -51,5 +50,4 @@
      (update :link-previews-enabled-sites set)
      (update :custom-bootnodes rpc->custom-bootnodes)
      (update :custom-bootnodes-enabled? rpc->custom-bootnodes)
-      (update :currency keyword)
-      (visibility-status-updates/<-rpc-settings)))
+      (update :currency keyword)))
@@ -1,24 +0,0 @@
-(ns status-im.data-store.visibility-status-updates
-  (:require [clojure.set :as clojure.set]
-            [re-frame.core :as re-frame]
-            [status-im.ethereum.json-rpc :as json-rpc]
-            [status-im.utils.fx :as fx]
-            [taoensso.timbre :as log]))
-
-(defn <-rpc [visibility-status-update]
-  (clojure.set/rename-keys visibility-status-update {:publicKey  :public-key
-                                                     :statusType :status-type}))
-(defn <-rpc-settings [settings]
-  (-> settings
-      (clojure.set/rename-keys
-       {:current-user-status :current-user-visibility-status})
-      (update :current-user-visibility-status <-rpc)))
-
-(fx/defn fetch-visibility-status-updates-rpc [_]
-  {::json-rpc/call [{:method     "wakuext_statusUpdates"
-                     :params     []
-                     :on-success #(re-frame/dispatch
-                                   [:visibility-status-updates/visibility-status-updates-loaded
-                                    (:statusUpdates ^js %)])
-                     :on-failure #(log/error
-                                   "failed to fetch visibility-status-updates" %)}]})
@@ -32,7 +32,6 @@
             :tooltips                           {}
             :dimensions/window                  (dimensions/window)
             :registry                           {}
-             :visibility-status-updates          {}
             :stickers/packs-owned               #{}
             :stickers/packs-pending             #{}
             :keycard                            {:nfc-enabled?   false
@@ -15,8 +15,7 @@
            [status-im.utils.datetime :as datetime]
            [status-im.utils.fx :as fx]
            [status-im.utils.money :as money]
-            [status-im.utils.random :as random]
-            [status-im.bottom-sheet.core :as bottom-sheet]))
+            [status-im.utils.random :as random]))

 (defn fullname [custom-domain? username]
  (if custom-domain?
@@ -77,17 +76,15 @@

 (fx/defn set-state
  {:events [::name-resolved]}
-  [{:keys [db]} username state address]
+  [{:keys [db]} username state]
  (when (= username
           (get-in db [:ens/registration :username]))
-    {:db (-> db
-             (assoc-in [:ens/registration :state] state)
-             (assoc-in [:ens/registration :address] address))}))
+    {:db (assoc-in db [:ens/registration :state] state)}))

 (fx/defn on-resolver-found
  {:events [::resolver-found]}
-  [{:keys [db] :as cofx} resolver-contract address]
-  (let [{:keys [username custom-domain?]} (:ens/registration db)
+  [{:keys [db] :as cofx} resolver-contract]
+  (let [{:keys [state username custom-domain?]} (:ens/registration db)
        {:keys [public-key]} (:multiaccount db)
        {:keys [x y]} (ethereum/coordinates public-key)
        namehash (ens/namehash (str username (when-not custom-domain?
@@ -95,7 +92,6 @@
    (signing/eth-transaction-call
     cofx
     {:contract   resolver-contract
-      :from       address
      :method     "setPubkey(bytes32,bytes32,bytes32)"
      :params     [namehash x y]
      :on-result  [::save-username custom-domain? username true]
@@ -119,7 +115,7 @@
 (fx/defn on-input-submitted
  {:events [::input-submitted ::input-icon-pressed]}
  [{:keys [db] :as cofx}]
-  (let [{:keys [state username custom-domain? address]} (:ens/registration db)
+  (let [{:keys [state username custom-domain?]} (:ens/registration db)
        registry-contract (get ens/ens-registries (ethereum/chain-keyword db))
        ens-name (str username (when-not custom-domain?
                                 ".stateofus.eth"))]
@@ -128,14 +124,14 @@
      (navigation/navigate-to-cofx cofx :ens-checkout {})
      :connected-with-different-key
      (ens/resolver registry-contract ens-name
-                    #(re-frame/dispatch [::resolver-found % address]))
+                    #(re-frame/dispatch [::resolver-found %]))
      :connected
      (save-username cofx custom-domain? username true)
      ;; for other states, we do nothing
      nil)))

 (defn- on-resolve-owner
-  [registry custom-domain? username addresses public-key response resolve-last-id* resolve-last-id]
+  [registry custom-domain? username address public-key response resolve-last-id* resolve-last-id]
  (when (= @resolve-last-id* resolve-last-id)
    (cond

@@ -145,14 +141,14 @@

      ;; if we get an address back, we try to get the public key associated
      ;; with the username as well
-      (get addresses (eip55/address->checksum response))
+      (= (eip55/address->checksum address)
+         (eip55/address->checksum response))
      (resolver/pubkey registry (fullname custom-domain? username)
                       #(re-frame/dispatch [::name-resolved username
                                            (cond
                                              (not public-key) :owned
                                              (= % public-key) :connected
-                                              :else :connected-with-different-key)
-                                            (eip55/address->checksum response)]))
+                                              :else :connected-with-different-key)]))

      :else
      (re-frame/dispatch [::name-resolved username :taken]))))
@@ -166,9 +162,10 @@
 (fx/defn register-name
  {:events [::register-name-pressed]}
  [{:keys [db] :as cofx}]
-  (let [{:keys [custom-domain? username address]}
+  (let [{:keys [custom-domain? username]}
        (:ens/registration db)
        {:keys [public-key]} (:multiaccount db)
+        address (ethereum/default-address db)
        chain (ethereum/chain-keyword db)
        chain-id (ethereum/chain-id db)
        amount (registration-cost chain-id)
@@ -180,7 +177,6 @@
        cofx
        {:contract   (contracts/get-address db :status/snt)
         :method     "approveAndCall(address,uint256,bytes)"
-         :from       address
         :params     [contract
                      (money/unit->token amount 18)
                      (abi-spec/encode "register(bytes32,address,bytes32,bytes32)"
@@ -224,12 +220,12 @@
     (when (= state :searching)
       (let [{:keys [multiaccount]} db
             {:keys [public-key]} multiaccount
-             addresses (ethereum/addresses-without-watch db)
+             address (ethereum/default-address db)
             registry (get ens/ens-registries (ethereum/chain-keyword db))]
         {::resolve-owner [registry
                           (fullname custom-domain? username)
                           #(on-resolve-owner
-                             registry custom-domain? username addresses public-key %
+                             registry custom-domain? username address public-key %
                             resolve-last-id @resolve-last-id)]})))))

 (fx/defn return-to-ens-main-screen
@@ -251,13 +247,6 @@
                     (update :ens/registration dissoc :username :state)
                     (update-in [:ens/registration :custom-domain?] not))}))

-(fx/defn change-address
-  {:events [::change-address]}
-  [{:keys [db] :as cofx} _ {:keys [address]}]
-  (fx/merge cofx
-            {:db (assoc-in db [:ens/registration :address] address)}
-            (bottom-sheet/hide-bottom-sheet)))
-
 (fx/defn save-preferred-name
  {:events [::save-preferred-name]}
  [{:keys [db] :as cofx} name]
@@ -1,7 +1,6 @@
 (ns status-im.ethereum.core
  (:require [clojure.string :as string]
-            ["web3-utils" :as utils]
-            [status-im.ethereum.eip55 :as eip55]))
+            ["web3-utils" :as utils]))

 (defn sha3 [s]
  (when s
@@ -17,20 +16,15 @@
    (.hexToUtf8 utils s)
    (catch :default _ nil)))

-(def BSC-mainnet-chain-id 56)
-(def BSC-testnet-chain-id 97)
-
 ;; IDs standardized in https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md#list-of-chain-ids
+
 (def chains
-  {:mainnet     {:id 1 :name "Mainnet"}
-   :testnet     {:id 3 :name "Ropsten"}
-   :rinkeby     {:id 4 :name "Rinkeby"}
-   :xdai        {:id 100 :name "xDai"}
-   :goerli      {:id 5 :name "Goerli"}
-   :bsc         {:id   BSC-mainnet-chain-id
-                 :name "BSC"}
-   :bsc-testnet {:id   BSC-testnet-chain-id
-                 :name "BSC tetnet"}})
+  {:mainnet {:id 1 :name "Mainnet"}
+   :testnet {:id 3 :name "Ropsten"}
+   :rinkeby {:id 4 :name "Rinkeby"}
+   :xdai    {:id 100 :name "xDai"}
+   :poa     {:id 99 :name "POA"}
+   :goerli  {:id 5 :name "Goerli"}})

 (defn chain-id->chain-keyword [i]
  (or (some #(when (= i (:id (val %))) (key %)) chains)
@@ -51,12 +45,11 @@
 (defn testnet? [id]
  (contains? #{(chain-keyword->chain-id :testnet)
               (chain-keyword->chain-id :rinkeby)
-               (chain-keyword->chain-id :goerli)
-               (chain-keyword->chain-id :bsc-testnet)} id))
+               (chain-keyword->chain-id :goerli)} id))

 (defn sidechain? [id]
  (contains? #{(chain-keyword->chain-id :xdai)
-               (chain-keyword->chain-id :bsc)} id))
+               (chain-keyword->chain-id :poa)} id))

 (defn network-with-upstream-rpc? [network]
  (get-in network [:config :UpstreamConfig :Enabled]))
@@ -81,11 +74,6 @@
      get-default-account
      :address))

-(defn addresses-without-watch [db]
-  (into #{}
-        (remove #(= (:type %) :watch)
-                (map #(eip55/address->checksum (:address %)) (get db :multiaccount/accounts)))))
-
 (defn naked-address [s]
  (when s
    (string/replace s hex-prefix "")))
@@ -113,16 +101,6 @@
        network-id (get db :networks/current-network)]
    (get networks network-id)))

-(defn binance-chain-id? [chain-id]
-  (or (= BSC-mainnet-chain-id chain-id)
-      (= BSC-testnet-chain-id chain-id)))
-
-(defn binance-chain? [db]
-  (-> db
-      current-network
-      network->chain-id
-      binance-chain-id?))
-
 (def custom-rpc-node-id-len 45)

 (defn custom-rpc-node? [{:keys [id]}]
@@ -136,17 +114,13 @@
      network->chain-keyword
      name))

-(defn get-current-network
-  [{:networks/keys [current-network networks]}]
-  (get networks current-network))
-
 (defn chain-keyword
-  [db]
-  (network->chain-keyword (get-current-network db)))
+  [{:networks/keys [current-network networks]}]
+  (network->chain-keyword (get networks current-network)))

 (defn chain-id
-  [db]
-  (network->chain-id (get-current-network db)))
+  [{:networks/keys [current-network networks]}]
+  (network->chain-id (get networks current-network)))

 (defn snt-symbol [db]
  (chain-keyword->snt-symbol (chain-keyword db)))
@@ -56,7 +56,6 @@
   "wakuext_disableInstallation" {}
   "wakuext_sendChatMessage" {}
   "wakuext_sendChatMessages" {}
-   "wakuext_backupData" {}
   "wakuext_confirmJoiningGroup" {}
   "wakuext_addAdminsToGroupChat" {}
   "wakuext_addMembersToGroupChat" {}
@@ -91,12 +90,9 @@
   "wakuext_unmuteChat" {}
   "wakuext_contacts" {}
   "wakuext_removeContact" {}
-   "wakuext_setContactLocalNickname" {}
   "wakuext_clearHistory" {}
   "wakuext_prepareContent" {}
   "wakuext_blockContact" {}
-   "wakuext_unblockContact" {}
-   "wakuext_addContact" {}
   "wakuext_updateMailservers" {}
   "wakuext_sendEmojiReaction" {}
   "wakuext_sendEmojiReactionRetraction" {}
@@ -135,8 +131,6 @@
   "wakuext_enablePushNotificationsBlockMentions" {}
   "wakuext_disablePushNotificationsBlockMentions" {}
   "wakuext_unreadActivityCenterNotificationsCount" {}
-   "wakuext_setUserStatus" {}
-   "wakuext_statusUpdates" {}
   "multiaccounts_getIdentityImages" {}
   "multiaccounts_getIdentityImage" {}
   "multiaccounts_storeIdentityImage" {}
@@ -194,7 +188,6 @@
   "wallet_getCryptoOnRamps" {}
   "wallet_getOpenseaCollectionsByOwner" {}
   "wallet_getOpenseaAssetsByOwnerAndCollection" {}
-   "wallet_loadTransferByHash" {}
   "browsers_getBrowsers" {}
   "browsers_addBrowser" {}
   "browsers_deleteBrowser" {}
@@ -34,20 +34,19 @@
        tokens))

 (defn network->icon [network]
-  (let [s     (str "./resources/images/tokens/" (name network) "/0-native.png")
-        s-js  (str "." s)
+  (let [s     (str "../resources/images/tokens/" (name network) "/0-native.png")
        image (gensym)]
    (if (.exists (io/file s))
      `(let [~image (atom nil)]
         (fn []
           (or @~image
-               (reset! ~image (js/require ~s-js)))))
+               (reset! ~image (js/require ~s)))))
      `(let [~image (atom nil)]
         (fn []
           (or
            @~image
            (reset! ~image
-                    (js/require "../resources/images/tokens/default-token.png"))))))))
+                    (js/require "../resources/images/tokens/default-native.png"))))))))

 (defmacro resolve-native-currency-icons
  "In react-native arguments to require must be static strings.
@@ -1,53 +1,46 @@
 (ns status-im.ethereum.tokens
-  (:require [clojure.string :as string]
-            [status-im.ethereum.core :as ethereum])
+  (:require [clojure.string :as string])
  (:require-macros
   [status-im.ethereum.macros :as ethereum.macros :refer [resolve-icons]]))

 (def default-native-currency
  (memoize
-   (fn [symbol]
-     {:name           "Native"
-      :symbol         :ETH
-      :symbol-display symbol
-      :decimals       18
-      :icon           {:source (js/require "../resources/images/tokens/default-token.png")}})))
+   (fn []
+     {:name     "Native"
+      :symbol   :ETH
+      :decimals 18
+      :icon     {:source (js/require "../resources/images/tokens/default-native.png")}})))

 (def snt-icon-source (js/require "../resources/images/tokens/mainnet/SNT.png"))

 (def all-native-currencies
  (ethereum.macros/resolve-native-currency-icons
-   {:mainnet     {:name     "Ether"
-                  :symbol   :ETH
-                  :decimals 18}
-    :testnet     {:name           "Ropsten Ether"
-                  :symbol         :ETH
-                  :symbol-display :ETHro
-                  :decimals       18}
-    :rinkeby     {:name           "Rinkeby Ether"
-                  :symbol         :ETH
-                  :symbol-display :ETHri
-                  :decimals       18}
-    :xdai        {:name            "xDAI"
-                  :symbol          :ETH
-                  :symbol-display  :xDAI
-                  :symbol-exchange :DAI
-                  :decimals        18}
-    :bsc         {:name           "BSC"
-                  :symbol         :ETH
-                  :symbol-display :BNB
-                  :decimals       18}
-    :bsc-testnet {:name           "BSC test"
-                  :symbol         :ETH
-                  :symbol-display :BNBtest
-                  :decimals       18}}))
+   {:mainnet {:name     "Ether"
+              :symbol   :ETH
+              :decimals 18}
+    :testnet {:name           "Ropsten Ether"
+              :symbol         :ETH
+              :symbol-display :ETHro
+              :decimals       18}
+    :rinkeby {:name           "Rinkeby Ether"
+              :symbol         :ETH
+              :symbol-display :ETHri
+              :decimals       18}
+    :poa     {:name           "POA"
+              :symbol         :ETH
+              :symbol-display :POA
+              :decimals       18}
+    :xdai    {:name            "xDAI"
+              :symbol          :ETH
+              :symbol-display  :xDAI
+              :symbol-exchange :DAI
+              :decimals        18}}))

 (def native-currency-symbols
  (set (map #(-> % val :symbol) all-native-currencies)))

-(defn native-currency [{:keys [symbol] :as current-network}]
-  (let [chain (ethereum/network->chain-keyword current-network)]
-    (get all-native-currencies chain (default-native-currency symbol))))
+(defn native-currency [chain]
+  (-> (get all-native-currencies chain (default-native-currency))))

 (defn ethereum? [symbol]
  (native-currency-symbols symbol))
@@ -774,10 +767,6 @@
                   {:address  "0xba5BDe662c17e2aDFF1075610382B9B691296350"
                    :symbol   :RARE
                    :name     "SuperRare"
-                    :decimals 18}
-                   {:address  "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72"
-                    :symbol   :ENS
-                    :name     "Ethereum Name Service"
                    :decimals 18}])
   :testnet
   (resolve-icons :testnet
@@ -862,8 +851,8 @@
 (defn address->token [all-tokens address]
  (get all-tokens (string/lower-case address)))

-(defn asset-for [all-tokens current-network symbol]
-  (let [native-coin (native-currency current-network)]
+(defn asset-for [all-tokens chain symbol]
+  (let [native-coin (native-currency chain)]
    (if (or (= (:symbol-display native-coin) symbol)
            (= (:symbol native-coin) symbol))
      native-coin
@@ -2,7 +2,6 @@
  (:require [cljs.spec.alpha :as spec]
            [re-frame.core :as re-frame]
            [status-im.ens.core :as ens]
-            [status-im.ethereum.core :as ethereum]
            [status-im.ethereum.decode :as decode]
            [status-im.ethereum.eip55 :as eip55]
            [status-im.ethereum.encode :as encode]
@@ -14,31 +13,16 @@

 (def confirmations-count-threshold 12)

-(def etherscan-supported?
-  #{(ethereum/chain-keyword->chain-id :mainnet)
-    (ethereum/chain-keyword->chain-id :testnet)
-    (ethereum/chain-keyword->chain-id :rinkeby)})
+(def etherscan-supported? #{:testnet :mainnet :rinkeby})

-(def binance-mainnet-chain-id (ethereum/chain-keyword->chain-id :bsc))
-(def binance-testnet-chain-id (ethereum/chain-keyword->chain-id :bsc-testnet))
-
-(def network->subdomain {3 "ropsten"
-                         4 "rinkeby"})
-
-(defn get-transaction-details-url [chain-id hash]
-  {:pre [(number? chain-id) (string? hash)]
-   :post [(or (nil? %) (string? %))]}
-  (cond
-    (etherscan-supported? chain-id)
-    (let [network-subdomain (when-let [subdomain (network->subdomain chain-id)]
-                              (str subdomain "."))]
-      (str "https://" network-subdomain "etherscan.io/tx/" hash))
-
-    (= chain-id binance-mainnet-chain-id)
-    (str "https://bscscan.com/tx/" hash)
-
-    (= chain-id binance-testnet-chain-id)
-    (str "https://testnet.bscscan.com/tx/" hash)))
+(let [network->subdomain {:testnet "ropsten" :rinkeby "rinkeby"}]
+  (defn get-transaction-details-url [chain hash]
+    {:pre [(keyword? chain) (string? hash)]
+     :post [(or (nil? %) (string? %))]}
+    (when (etherscan-supported? chain)
+      (let [network-subdomain (when-let [subdomain (network->subdomain chain)]
+                                (str subdomain "."))]
+        (str "https://" network-subdomain "etherscan.io/tx/" hash)))))

 (def default-erc20-token
  {:symbol   :ERC20
@@ -374,7 +358,6 @@
     (tx-fetching-in-progress [address]))))

 (fx/defn get-fetched-transfers
-  {:events [:transaction/get-fetched-transfers]}
  [{:keys [db]}]
  {:transactions/get-transfers
   {:chain-tokens (:wallet/all-tokens db)
@@ -1,64 +1,62 @@
 (ns status-im.events
-  (:require clojure.set
-            [re-frame.core :as re-frame]
-            status-im.add-new.core
-            [status-im.anon-metrics.core :as anon-metrics]
-            [status-im.async-storage.core :as async-storage]
-            status-im.backup.core
-            status-im.bootnodes.core
-            status-im.bottom-sheet.core
-            status-im.browser.core
-            status-im.browser.permissions
+  (:require [re-frame.core :as re-frame]
            [status-im.chat.models :as chat]
-            status-im.chat.models.images
-            status-im.chat.models.input
-            status-im.chat.models.loading
-            status-im.chat.models.transport
-            [status-im.constants :as constants]
-            status-im.contact.block
-            status-im.contact.chat
-            status-im.contact.core
-            status-im.currency.core
-            [status-im.ethereum.json-rpc :as json-rpc]
-            status-im.ethereum.subscriptions
-            status-im.fleet.core
-            status-im.http.core
            [status-im.i18n.i18n :as i18n]
-            status-im.init.core
-            [status-im.keycard.core :as keycard]
-            status-im.log-level.core
-            status-im.mailserver.constants
            [status-im.mailserver.core :as mailserver]
-            [status-im.multiaccounts.biometric.core :as biometric]
            [status-im.multiaccounts.core :as multiaccounts]
+            [status-im.ui.components.react :as react]
+            [status-im.utils.fx :as fx]
+            status-im.utils.logging.core
+            [status-im.wallet.core :as wallet]
+            [status-im.keycard.core :as keycard]
+            [status-im.utils.dimensions :as dimensions]
+            [status-im.multiaccounts.biometric.core :as biometric]
+            [status-im.constants :as constants]
+            [status-im.native-module.core :as status]
+            [status-im.ui.components.permissions :as permissions]
+            [status-im.utils.utils :as utils]
+            [status-im.ethereum.json-rpc :as json-rpc]
+            [status-im.anon-metrics.core :as anon-metrics]
+            [status-im.utils.universal-links.core :as universal-links]
+            clojure.set
+            status-im.currency.core
+            status-im.navigation
+            status-im.utils.universal-links.core
+            status-im.wallet.custom-tokens.core
+            status-im.waku.core
+            status-im.wallet.choose-recipient.core
+            status-im.wallet.accounts.core
+            status-im.popover.core
+            status-im.bottom-sheet.core
+            status-im.add-new.core
+            status-im.search.core
+            status-im.http.core
+            status-im.profile.core
+            status-im.chat.models.images
+            status-im.ui.screens.privacy-and-security-settings.events
            status-im.multiaccounts.login.core
            status-im.multiaccounts.logout.core
            status-im.multiaccounts.update.core
-            [status-im.native-module.core :as status]
-            [status-im.navigation :as navigation]
-            status-im.notifications-center.core
            status-im.pairing.core
-            status-im.popover.core
-            status-im.profile.core
-            status-im.search.core
            status-im.signals.core
            status-im.stickers.core
            status-im.transport.core
-            [status-im.ui.components.permissions :as permissions]
-            [status-im.ui.components.react :as react]
-            status-im.ui.screens.privacy-and-security-settings.events
-            [status-im.utils.dimensions :as dimensions]
-            [status-im.utils.fx :as fx]
-            status-im.utils.logging.core
-            [status-im.utils.universal-links.core :as universal-links]
-            [status-im.utils.utils :as utils]
-            status-im.visibility-status-popover.core
-            status-im.visibility-status-updates.core
-            status-im.waku.core
-            status-im.wallet.accounts.core
-            status-im.wallet.choose-recipient.core
-            [status-im.wallet.core :as wallet]
-            status-im.wallet.custom-tokens.core))
+            status-im.init.core
+            status-im.log-level.core
+            status-im.mailserver.constants
+            status-im.ethereum.subscriptions
+            status-im.fleet.core
+            status-im.contact.block
+            status-im.contact.core
+            status-im.contact.chat
+            status-im.chat.models.input
+            status-im.chat.models.loading
+            status-im.bootnodes.core
+            status-im.browser.core
+            status-im.browser.permissions
+            status-im.chat.models.transport
+            status-im.notifications-center.core
+            [status-im.navigation :as navigation]))

 (re-frame/reg-fx
 :dismiss-keyboard
@@ -192,24 +190,8 @@
 (fx/defn on-will-focus
  {:events [:screens/on-will-focus]
   :interceptors [anon-metrics/interceptor]}
-  [{:keys [db] :as cofx} view-id]
+  [cofx view-id]
  (fx/merge cofx
-            (cond
-              (= :chat view-id)
-              {::async-storage/set! {:chat-id (get-in cofx [:db :current-chat-id])
-                                     :key-uid (get-in cofx [:db :multiaccount :key-uid])}
-               :db (assoc db :screens/was-focused-once? true)}
-
-              (= :login view-id)
-              {}
-
-              (not (get db :screens/was-focused-once?))
-              {:db (assoc db :screens/was-focused-once? true)}
-
-              :else
-              {::async-storage/set! {:chat-id nil
-                                     :key-uid nil}
-               :db (assoc db :screens/was-focused-once? true)})
            #(case view-id
               :keycard-settings (keycard/settings-screen-did-load %)
               :reset-card (keycard/reset-card-screen-did-load %)
@@ -61,7 +61,7 @@
  [cofx {:keys [chat-id invitation-admin chat-name]}]
  (if (get-in cofx [:db :chats chat-id])
    {:dispatch-n [[:accept-all-activity-center-notifications-from-chat chat-id]
-                  [:chat.ui/navigate-to-chat chat-id]]}
+                  [:chat.ui/navigate-to-chat chat-id false]]}
    {::json-rpc/call [{:method     (json-rpc/call-ext-method "createGroupChatFromInvitation")
                       :params     [chat-name chat-id invitation-admin]
                       :js-response true
@@ -10,7 +10,6 @@
            [status-im.utils.keychain.core :as keychain]
            [status-im.utils.types :as types]
            [taoensso.timbre :as log]
-            [status-im.utils.datetime :as utils.datetime]
            [status-im.bottom-sheet.core :as bottom-sheet]
            [status-im.utils.platform :as platform]
            [status-im.popover.core :as popover]))
@@ -417,14 +416,6 @@

 ;; Get application info

-(fx/defn update-pairings
-  [{:keys [db]} instance-uid pairing]
-  (let  [paired-on (utils.datetime/timestamp)
-         pairings  (-> (get-in db [:keycard :pairings])
-                       (assoc  instance-uid {:pairing pairing :paired-on paired-on}))]
-    {:keycard/persist-pairings pairings
-     :db (assoc-in db [:keycard :pairings] pairings)}))
-
 (fx/defn get-application-info
  {:events [:keycard/get-application-info]}
  [{:keys [db]} on-card-read]
@@ -434,8 +425,9 @@
 (fx/defn on-get-application-info-success
  {:events [:keycard.callback/on-get-application-info-success]}
  [{:keys [db] :as cofx} info on-success]
-  (let [{:keys [pin-retry-counter puk-retry-counter instance-uid new-pairing]} info
+  (let [{:keys [pin-retry-counter puk-retry-counter]} info
        view-id (:view-id db)
+
        {:keys [on-card-read]} (:keycard db)
        on-success' (or on-success on-card-read)
        enter-step  (get-in db [:keycard :pin :enter-step])]
@@ -451,8 +443,6 @@
              (assoc-in [:keycard :application-info :applet-installed?] true)
              (assoc-in [:keycard :application-info-error] nil))}
     (stash-on-card-read)
-     (when new-pairing
-       (update-pairings instance-uid new-pairing))
     (when (and (zero? pin-retry-counter)
                (pos? puk-retry-counter)
                (not= enter-step :puk))
@@ -462,7 +452,6 @@
         (blocked-keycard-popup cofx)
         (when on-success'
           (dispatch-event cofx on-success')))))))
-
 (fx/defn on-get-application-info-error
  {:events [:keycard.callback/on-get-application-info-error]}
  [{:keys [db] :as cofx} error]
@@ -70,9 +70,7 @@
                  (mnemonic/set-mnemonic))
                (when (= flow :recovery)
                  (onboarding/proceed-with-generating-key)))
-      (if (get-in db [:keycard :secrets :password])
-        (onboarding/load-pairing-screen cofx)
-        (recovery/load-pair-screen cofx)))))
+      (recovery/load-pair-screen cofx))))

 (fx/defn navigate-to-keycard-settings
  {:events [:profile.ui/keycard-settings-button-pressed]}
@@ -525,14 +523,14 @@
    (fx/merge cofx
              {:db (assoc-in db [:keycard :card-state] card-state)}
              (set-setup-step card-state)
+              (common/hide-connection-sheet)

              (when paired?
                (load-pairing))

-              (if (and flow
-                       (= card-state :init))
-                (proceed-setup-with-initialized-card flow instance-uid paired?)
-                (common/hide-connection-sheet))
+              (when (and flow
+                         (= card-state :init))
+                (proceed-setup-with-initialized-card flow instance-uid paired?))

              (when (= card-state :pre-init)
                (if (= flow :import)
@@ -585,7 +583,7 @@
  {:db (-> db
           (assoc-in [:keycard :nfc-running?] false)
           (assoc-in [:keycard :card-connected?] false))
-   :dispatch-later [{:ms 500 :dispatch [:keycard.ui/start-nfc]}]})
+   :keycard/start-nfc nil})

 (fx/defn on-register-card-events
  {:events [:keycard.callback/on-register-card-events]}
@@ -21,7 +21,6 @@
              (assoc-in [:keycard :setup-step] :recovery-phrase)
              (assoc-in [:keycard :secrets :mnemonic] mnemonic))}
     (common/clear-on-card-connected)
-     (common/hide-connection-sheet)
     (navigation/navigate-replace :keycard-onboarding-recovery-phrase nil))))

 (fx/defn load-loading-keys-screen
@@ -232,14 +232,12 @@
  [{:keys [db] :as cofx} secrets]
  (let [secrets' (js->clj secrets :keywordize-keys true)]
    (fx/merge cofx
-              {:db (-> db
-                       (assoc-in [:keycard :card-state] :init)
-                       (assoc-in [:keycard :setup-step] :secret-keys)
-                       (update-in [:keycard :secrets] merge secrets'))}
-              (common/show-connection-sheet
-               {:on-card-connected :keycard/get-application-info
-                :on-card-read      :keycard/check-card-state
-                :handler           (common/get-application-info :keycard/check-card-state)}))))
+              {:keycard/get-application-info nil
+               :db                              (-> db
+                                                    (assoc-in [:keycard :card-state] :init)
+                                                    (assoc-in [:keycard :setup-step] :secret-keys)
+                                                    (update-in [:keycard :secrets] merge secrets'))}
+              (load-pairing-screen))))

 (fx/defn on-install-applet-and-init-card-error
  {:events [:keycard.callback/on-install-applet-and-init-card-error
@@ -184,9 +184,8 @@

 (fx/defn handle-successful-request
  {:events [::request-success]}
-  [{:keys [db] :as cofx} response-js]
-  {:db       (dissoc db :mailserver/current-request)
-   :dispatch [:sanitize-messages-and-process-response response-js]})
+  [{:keys [db]} response-js]
+  {:db (dissoc db :mailserver/current-request)})

 (fx/defn process-next-messages-request
  {:events [::request-messages]}
@@ -64,17 +64,6 @@
        (str "@" (or username ens-name)))
      (or alias (gfycat/generate-gfy public-key)))))

-(defn contact-by-identity [contacts identity]
-  (or (get contacts identity)
-      (contact-with-names {:public-key identity})))
-
-(defn contact-two-names-by-identity [contact current-multiaccount identity]
-  (let [me? (= (:public-key current-multiaccount) identity)]
-    (if me?
-      [(or (:preferred-name current-multiaccount)
-           (gfycat/generate-gfy identity))]
-      (contact-two-names contact false))))
-
 (def photo-quality-thumbnail :thumbnail)
 (def photo-quality-large :large)

@@ -191,7 +191,6 @@
                  :latest-derived-path   0
                  :signing-phrase        signing-phrase
                  :send-push-notifications? true
-                  :backup-enabled?       true
                  :installation-id       (random-guid-generator)
                  ;; default mailserver (history node) setting
                  :use-mailservers?      true
@@ -37,10 +37,7 @@
            [status-im.notifications-center.core :as notifications-center]
            [status-im.navigation :as navigation]
            [status-im.signing.eip1559 :as eip1559]
-            [status-im.data-store.chats :as data-store.chats]
-            [status-im.data-store.visibility-status-updates :as visibility-status-updates-store]
-            [status-im.ui.components.react :as react]
-            [status-im.utils.platform :as platform]))
+            [status-im.data-store.chats :as data-store.chats]))

 (re-frame/reg-fx
 ::initialize-communities-enabled
@@ -67,8 +64,8 @@

 (re-frame/reg-fx
 ::export-db
- (fn [[key-uid account-data hashed-password callback]]
-   (status/export-db key-uid account-data hashed-password callback)))
+ (fn [[key-uid account-data hashed-password]]
+   (status/export-db key-uid account-data hashed-password)))

 (re-frame/reg-fx
 ::import-db
@@ -122,11 +119,8 @@
         (wallet/get-cached-balances scan-all-tokens?))
   (when-not (get db :wallet/new-account)
     (wallet/restart-wallet-service nil))
-   (when (or (not (utils.mobile-sync/syncing-allowed? cofx))
-             (ethereum/binance-chain? db))
+   (when-not (utils.mobile-sync/syncing-allowed? cofx)
     (transactions/get-fetched-transfers))
-   (when (ethereum/binance-chain? db)
-     (wallet/request-current-block-update))
   (prices/update-prices)))

 (fx/defn login
@@ -148,15 +142,10 @@
  [{:keys [db]}]
  (let [{:keys [key-uid password name identicon]} (:multiaccounts/login db)]
    {::export-db [key-uid
-                  (types/clj->json {:name      name
-                                    :key-uid   key-uid
-                                    :identicon identicon})
-                  (ethereum/sha3 (security/safe-unmask-data password))
-                  (fn [path]
-                    (when platform/ios?
-                      (let [uri (str "file://" path)]
-                        (.share ^js react/sharing (clj->js {:title "Unencrypted database"
-                                                            :url   uri})))))]}))
+                  (types/clj->json {:name       name
+                                    :key-uid    key-uid
+                                    :identicon  identicon})
+                  (ethereum/sha3 (security/safe-unmask-data password))]}))

 (fx/defn import-db-submitted
  {:events [:multiaccounts.login.ui/import-db-submitted]}
@@ -303,20 +292,17 @@
  (let [{:networks/keys [current-network networks]
         :as            settings}
        (data-store.settings/rpc->settings settings)
-        multiaccount (dissoc settings :networks/current-network :networks/networks)
-        ;;for some reason we save default networks in db, in case when we want to modify default-networks for
-        ;; existing accounts we have to merge them again into networks
-        merged-networks (merge networks config/default-networks-by-id)]
+        multiaccount (dissoc settings :networks/current-network :networks/networks)]
    (fx/merge cofx
              {:db (-> db
                       (dissoc :multiaccounts/login)
                       (assoc :networks/current-network current-network
-                              :networks/networks merged-networks
+                              :networks/networks networks
                              :multiaccount multiaccount))}
              (data-store.chats/fetch-chats-rpc
               {:on-success
                #(do (re-frame/dispatch [:chats-list/load-success %])
-                     (re-frame/dispatch [::get-chats-callback]))})
+                     (re-frame/dispatch [::get-chats-callback settings]))})
              (acquisition/login)
              (initialize-appearance)
              (initialize-communities-enabled)
@@ -325,24 +311,11 @@
              (logging/set-log-level (:log-level multiaccount))
              (notifications-center/get-activity-center-notifications-count))))

-(re-frame/reg-fx
- ::open-last-chat
- (fn [key-uid]
-   (async-storage/get-item
-    :chat-id
-    (fn [chat-id]
-      (when chat-id
-        (async-storage/get-item
-         :key-uid
-         (fn [stored-key-uid]
-           (when (= stored-key-uid key-uid)
-             (re-frame/dispatch [:chat.ui/navigate-to-chat chat-id])))))))))
-
 (fx/defn get-chats-callback
  {:events [::get-chats-callback]}
-  [{:keys [db] :as cofx}]
-  (let [{:networks/keys [current-network networks]} db
-        notifications-enabled? (get-in db [:multiaccount :notifications-enabled?])
+  [{:keys [db] :as cofx} settings]
+  (let [{:keys          [notifications-enabled?]
+         :networks/keys [current-network networks]} settings
        network-id   (str (get-in networks [current-network :config :NetworkId]))]
    (fx/merge cofx
              (cond-> {::eip1559/check-eip1559-activation
@@ -352,8 +325,7 @@
                       ::initialize-wallet
                       (fn [accounts custom-tokens favourites]
                         (re-frame/dispatch [::initialize-wallet
-                                             accounts custom-tokens favourites]))
-                       ::open-last-chat (get-in db [:multiaccount :key-uid])}
+                                             accounts custom-tokens favourites]))}
                notifications-enabled?
                (assoc ::notifications/enable nil))
              (transport/start-messenger)
@@ -366,8 +338,7 @@
              (get-group-chat-invitations)
              (multiaccounts/get-profile-picture)
              (multiaccounts/switch-preview-privacy-mode-flag)
-              (link-preview/request-link-preview-whitelist)
-              (visibility-status-updates-store/fetch-visibility-status-updates-rpc))))
+              (link-preview/request-link-preview-whitelist))))

 (defn get-new-auth-method [auth-method save-password?]
  (when save-password?
@@ -395,7 +366,7 @@
           config/metrics-enabled?)
      (navigation/navigate-to :anon-metrics-opt-in {})

-      :else  (re-frame/dispatch [:init-root :chat-stack]))))
+      :else (re-frame/dispatch [:init-root :chat-stack]))))

 (fx/defn login-only-events
  [{:keys [db] :as cofx} key-uid password save-password?]
@@ -89,7 +89,8 @@
                                          :mainnet #{:SNT}
                                          :rinkeby #{:MOKSHA
                                                     :KDO}
-                                          :xdai    #{}}
+                                          :xdai    #{}
+                                          :poa     #{}}
   :preview-privacy? true
   :fleet        :eth.prod
   :identicon                            "data:image/png;base64iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAADAFBMVEX////YsYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABPGFwxAAABAHRSTlP//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKmfXxgAABnNJREFUeNoBaAaX+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEAAAAAAQEBAQAAAAABAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQAAAAABAQEBAAAAAAEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAAAAAEBAQEAAAAAAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEAAAAAAQEBAQAAAAABAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQAAAAABAQEBAAAAAAEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAAAAAEBAQEAAAAAAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEAAAAAAQEBAQAAAAABAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQAAAAABAQEBAAAAAAEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAAAAAEBAQEAAAAAAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEAAAAAAQEBAQAAAAABAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQAAAAABAQEBAAAAAAEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAAAAAAEBAQEAAAAAAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQEBAAAAAAEBAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEAAAAAAQEBAQEBAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQEBAQEBAQAAAAABAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAEBAQEBAQEBAAAAAAEBAQEBAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAloYA4a9rBHIAAAAASUVORK5CYII="
@@ -47,11 +47,6 @@
           (assoc-in db [:multiaccount setting] setting-value)
           (update db :multiaccount dissoc setting))}))

-(fx/defn toggle-backup-enabled
-  {:events [:multiaccounts.ui/switch-backup-enabled]}
-  [cofx enabled?]
-  (multiaccount-update cofx :backup-enabled? enabled? {}))
-
 (fx/defn toggle-opensea-nfts-visibility
  {:events [::toggle-opensea-nfts-visiblity]}
  [cofx visible?]
@@ -66,12 +66,12 @@

 (defn export-db
  "NOTE: beware, the password has to be sha3 hashed"
-  [key-uid account-data hashed-password callback]
+  [key-uid account-data hashed-password]
  (log/debug "[native-module] export-db")
  (clear-web-data)
  (init-keystore
   key-uid
-   #(.exportUnencryptedDatabase ^js (status) account-data hashed-password callback)))
+   #(.exportUnencryptedDatabase ^js (status) account-data hashed-password)))

 (defn import-db
  "NOTE: beware, the password has to be sha3 hashed"
@@ -1,6 +1,6 @@
 (ns status-im.navigation
-  (:require [status-im.anon-metrics.core :as anon-metrics]
-            [status-im.utils.fx :as fx]))
+  (:require [status-im.utils.fx :as fx]
+            [status-im.anon-metrics.core :as anon-metrics]))

 (defn- all-screens-params [db view screen-params]
  (cond-> db
@@ -1,18 +1,17 @@
 (ns status-im.navigation.core
  (:require
-   ["react-native" :as rn]
-   ["react-native-gesture-handler" :refer (gestureHandlerRootHOC)]
-   ["react-native-navigation" :refer (Navigation)]
-   [quo.components.text-input :as quo.text-input]
-   [quo.design-system.colors :as quo.colors]
   [re-frame.core :as re-frame]
-   [status-im.navigation.roots :as roots]
-   [status-im.ui.components.icons.icons :as icons]
-   [status-im.ui.components.react :as react]
   [status-im.ui.screens.views :as views]
-   [status-im.utils.fx :as fx]
   [status-im.utils.platform :as platform]
-   [taoensso.timbre :as log]))
+   [status-im.navigation.roots :as roots]
+   [status-im.ui.components.react :as react]
+   [quo.components.text-input :as quo.text-input]
+   [status-im.ui.components.icons.icons :as icons]
+   [quo.design-system.colors :as quo.colors]
+   [status-im.utils.fx :as fx]
+   ["react-native-navigation" :refer (Navigation)]
+   ["react-native-gesture-handler" :refer (gestureHandlerRootHOC)]
+   ["react-native" :as rn]))

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

@@ -27,7 +26,6 @@

 ;; REGISTER COMPONENT (LAZY)
 (defn reg-comp [key]
-  (log/debug "reg-comp" key)
  (if-let [comp (get views/components (keyword key))]
    (.registerComponent Navigation key (fn [] (views/component comp)))
    (let [screen (views/screen key)]
@@ -37,7 +35,6 @@
  (.setLazyComponentRegistrator Navigation reg-comp))

 (defn dismiss-all-modals []
-  (log/debug "dissmiss-all-modals")
  (when @curr-modal
    (reset! curr-modal false)
    (reset! dissmissing true)
@@ -47,7 +44,6 @@

 ;; PUSH SCREEN
 (defn navigate [comp]
-  (log/debug "NAVIGATE" comp)
  (let [{:keys [options]} (get views/screens comp)]
    (.push Navigation
           (name @root-comp-id)
@@ -61,7 +57,6 @@

 ;; OPEN MODAL
 (defn update-modal-topbar-options [options]
-  (log/debug "update-modal-topbar-options" options)
  (merge options
         (roots/merge-top-bar {:elevation       0
                               :noBorder        true
@@ -73,7 +68,6 @@
                              options)))

 (defn open-modal [comp]
-  (log/debug "open-modal" comp)
  (let [{:keys [options]} (get views/screens comp)]
    (if @dissmissing
      (reset! dissmissing comp)
@@ -94,7 +88,6 @@

 ;; DISSMISS MODAL
 (defn dissmissModal []
-  (log/debug "dissmissModal")
  (reset! dissmissing true)
  (.dismissModal Navigation (name (last @modals))))

@@ -112,7 +105,6 @@
           (handler)))))))

 (defn set-view-id [view-id]
-  (log/debug "set-view-id" view-id)
  (when-let [{:keys [on-focus]} (get views/screens view-id)]
    (re-frame/dispatch [:set :view-id view-id])
    (re-frame/dispatch [:screens/on-will-focus view-id])
@@ -143,11 +135,8 @@
   (.events Navigation)
   (fn [^js evn]
     (let [view-id (keyword (.-componentName evn))]
-       (log/debug "screen-appear-reg" view-id)
       (when (get views/screens view-id)
-         (when (and (not= view-id :bottom-sheet)
-                    (not= view-id :popover)
-                    (not= view-id :visibility-status-popover))
+         (when (and (not= view-id :bottom-sheet) (not= view-id :popover))
           (set-view-id view-id)
           (when-not @curr-modal
             (reset! pushed-screen-id view-id))))))))
@@ -157,8 +146,7 @@
  (.registerComponentDidDisappearListener
   (.events Navigation)
   (fn [^js evn]
-     (when-not (#{"popover" "bottom-sheet" "signing-sheet" "visibility-status-popover"}
-                (.-componentName evn))
+     (when-not (#{"popover" "bottom-sheet" "signing-sheet"} (.-componentName evn))
       (doseq [[_ {:keys [ref value]}] @quo.text-input/text-input-refs]
         (.setNativeProps ^js ref (clj->js {:text value})))
       (doseq [[^js text-input default-value] @react/text-input-refs]
@@ -168,7 +156,6 @@
 (re-frame/reg-fx
 :init-root-fx
 (fn [new-root-id]
-   (log/debug :init-root-fx new-root-id)
   (reset! root-comp-id new-root-id)
   (reset! root-id @root-comp-id)
   (.setRoot Navigation (clj->js (get (roots/roots) new-root-id)))))
@@ -176,7 +163,6 @@
 (re-frame/reg-fx
 :init-root-with-component-fx
 (fn [[new-root-id new-root-comp-id]]
-   (log/debug :init-root-with-component-fx new-root-id new-root-comp-id)
   (reset! root-comp-id new-root-comp-id)
   (reset! root-id @root-comp-id)
   (.setRoot Navigation (clj->js (get (roots/roots) new-root-id)))))
@@ -184,7 +170,6 @@
 (fx/defn set-multiaccount-root
  {:events [::set-multiaccount-root]}
  [{:keys [db]}]
-  (log/debug :set-multiaccounts-root)
  (let [key-uid          (get-in db [:multiaccounts/login :key-uid])
        keycard-account? (boolean (get-in db [:multiaccounts/multiaccounts
                                              key-uid
@@ -204,7 +189,6 @@
                                  (.hide ^js splash-screen))))

 (defn get-screen-component [comp]
-  (log/debug :get-screen-component comp)
  (let [{:keys [options]} (get views/screens comp)]
    {:component {:id      comp
                 :name    comp
@@ -216,7 +200,6 @@
 (re-frame/reg-fx
 :set-stack-root-fx
 (fn [[stack comp]]
-   (log/debug :set-stack-root-fx stack comp)
   (.setStackRoot Navigation
                  (name stack)
                  (clj->js (if (vector? comp)
@@ -239,7 +222,6 @@
 (re-frame/reg-fx
 :change-tab-fx
 (fn [tab]
-   (log/debug :change-tab-fx)
   (reset! root-comp-id (get tab-root-ids (get tab-key-idx tab)))
   (.mergeOptions Navigation "tabs-stack" (clj->js {:bottomTabs {:currentTabIndex (get tab-key-idx tab)}}))
   ;;when we change tab we want to dismiss all modals
@@ -249,7 +231,6 @@
 (re-frame/reg-fx
 :change-tab-count-fx
 (fn [[tab cnt]]
-   (log/debug :change-tab-count-fx tab cnt)
   (.mergeOptions Navigation
                  (name (get tab-root-ids (get tab-key-idx tab)))
                  (clj->js {:bottomTab (cond
@@ -269,7 +250,6 @@
 (re-frame/reg-fx
 :pop-to-root-tab-fx
 (fn [comp]
-   (log/debug :pop-to-root-tab-fx comp)
   (dismiss-all-modals)
   (.popToRoot Navigation (name comp))))

@@ -293,7 +273,7 @@
                 {:component {:name    comp
                              :id      comp
                              :options (merge (cond-> (roots/status-bar-options)
-                                                (and platform/android? (not (quo.colors/dark?)))
+                                                (and platform/android? (quo.colors/dark?))
                                                (assoc-in [:statusBar :translucent] true))
                                              {:layout  {:componentBackgroundColor (if platform/android?
                                                                                     (:backdrop @quo.colors/theme)
@@ -310,18 +290,6 @@
 (re-frame/reg-fx :show-popover (fn [] (show-overlay "popover")))
 (re-frame/reg-fx :hide-popover (fn [] (dissmiss-overlay "popover")))

-;; VISIBILITY STATUS POPOVER
-(defonce visibility-status-popover-reg
-  (.registerComponent Navigation
-                      "visibility-status-popover"
-                      (fn [] (gestureHandlerRootHOC views/visibility-status-popover-comp))
-                      (fn [] views/visibility-status-popover-comp)))
-
-(re-frame/reg-fx :show-visibility-status-popover
-                 (fn [] (show-overlay "visibility-status-popover")))
-(re-frame/reg-fx :hide-visibility-status-popover
-                 (fn [] (dissmiss-overlay "visibility-status-popover")))
-
 ;; BOTTOM SHEETS
 (defonce bottom-sheet-reg
  (.registerComponent Navigation
@@ -360,13 +328,11 @@
 (re-frame/reg-fx
 :navigate-to-fx
 (fn [key]
-   (log/debug :navigate-to-fx key)
   (navigate key)))

 (re-frame/reg-fx
 :navigate-back-fx
 (fn []
-   (log/debug :navigate-back-fx)
   (if @curr-modal
     (dissmissModal)
     (.pop Navigation (name @root-comp-id)))))
@@ -374,6 +340,5 @@
 (re-frame/reg-fx
 :navigate-replace-fx
 (fn [view-id]
-   (log/debug :navigate-replace-fx view-id)
   (.pop Navigation (name @root-comp-id))
   (navigate view-id)))
@@ -35,7 +35,6 @@

 (defn default-root []
  {:layout {:componentBackgroundColor colors/white
-            :orientation              "portrait"
            :backgroundColor          colors/white}})

 (defn merge-top-bar [root-options options]
@@ -19,7 +19,6 @@
 (def default-manage
  {:name  {:value ""}
   :url   {:value ""}
-   :symbol {:value ""}
   :chain {:value :mainnet}})

 (defn validate-string [{:keys [value]}]
@@ -39,7 +38,6 @@
  (-> manage
      (update :url validate-url)
      (update :name validate-string)
-      (update :symbol validate-string)
      (update :chain validate-string)
      (update :network-id validate-network-id)))

@@ -153,7 +151,7 @@
                       :on-success #(re-frame/dispatch [:navigate-back])}]}))

 (defn new-network
-  [random-id network-name symbol upstream-url chain-type chain-id]
+  [random-id network-name upstream-url chain-type chain-id]
  (let [data-dir (str "/ethereum/" (name chain-type) "_rpc")
        config   {:NetworkId      (or (when chain-id (int chain-id))
                                      (ethereum/chain-keyword->chain-id chain-type))
@@ -162,7 +160,6 @@
                                   :URL     upstream-url}}]
    {:id         random-id
     :name       network-name
-     :symbol     symbol
     :config     config}))

 (fx/defn save
@@ -172,11 +169,10 @@
    random-id-generator :random-id-generator :as cofx}]
  (if (valid-manage? manage)
    ;; rename network-id from UI to chain-id
-    (let [{:keys [name url chain network-id symbol]} manage
+    (let [{:keys [name url chain network-id]} manage
          random-id (string/replace (random-id-generator) "-" "")
          network (new-network random-id
                               (:value name)
-                               (:value symbol)
                               (:value url)
                               (:value chain)
                               (:value network-id))
@@ -34,13 +34,11 @@
 (deftest new-network-test
  (let [actual (network.core/new-network "randomid"
                                         "network-name"
-                                         "network-symbol"
                                         "upstream-url"
                                         :mainnet
                                         nil)]
    (is (= {:id     "randomid"
            :name   "network-name"
-            :symbol "network-symbol"
            :config {:NetworkId      1
                     :DataDir        "/ethereum/mainnet_rpc"
                     :UpstreamConfig {:Enabled true
@@ -50,13 +48,11 @@
 (deftest new-network-id-test
  (let [actual (network.core/new-network "randomid"
                                         "network-name"
-                                         "network-symbol"
                                         "upstream-url"
                                         :mainnet
                                         "5777")]
    (is (= {:id     "randomid"
            :name   "network-name"
-            :symbol "network-symbol"
            :config {:NetworkId      5777
                     :DataDir        "/ethereum/mainnet_rpc"
                     :UpstreamConfig {:Enabled true
@@ -67,31 +63,21 @@
  (testing "a valid manage"
    (is (network.core/valid-manage? {:url   {:value "http://valid.com"}
                                     :name  {:value "valid"}
-                                     :symbol {:value "valid"}
                                     :chain {:value "valid"}})))
  (testing "invalid url"
    (is (not (network.core/valid-manage? {:url   {:value "invalid"}
                                          :name  {:value "valid"}
-                                          :symbol {:value "valid"}
                                          :chain {:value "valid"}}))))

  (testing "invalid name"
    (is (not (network.core/valid-manage? {:url   {:value "http://valid.com"}
                                          :name  {:value ""}
-                                          :symbol {:value "valid"}
                                          :chain {:value "valid"}}))))

  (testing "invalid chain"
    (is (not (network.core/valid-manage? {:url   {:value "http://valid.com"}
                                          :name  {:value "valid"}
-                                          :symbol {:value "valid"}
-                                          :chain {:value ""}}))))
-
-  (testing "invalid symbol"
-    (is (not (network.core/valid-manage? {:url   {:value "http://valid.com"}
-                                          :name  {:value "valid"}
-                                          :symbol {:value ""}
-                                          :chain {:value "valid"}})))))
+                                          :chain {:value ""}})))))

 (deftest set-input-test
  (testing "it updates and validate a field"
@@ -99,8 +85,6 @@
                                                :error false}
                                   :name       {:value ""
                                                :error true}
-                                   :symbol     {:value "symbol"
-                                                :error false}
                                   :chain      {:value "mainnet"
                                                :error false}
                                   :network-id {:value nil
@@ -109,8 +93,6 @@
                                                                   :error true}
                                                           :name  {:value ""
                                                                   :error false}
-                                                           :symbol {:value "symbol"
-                                                                    :error false}
                                                           :chain {:value "mainnet"
                                                                   :error false}}}}
                                   :url "http://valid.com")))))
@@ -128,13 +110,11 @@
    (let [fx (network.core/save {:random-id-generator  (constantly "random-id")
                                 :db {:networks/manage {:url {:value "http://valid.com"}
                                                        :chain {:value :mainnet}
-                                                        :symbol {:value "symbol"}
                                                        :name {:value "valid"}}
                                      :multiaccount {}
                                      :networks/networks {"random2"
                                                          {:id     "random2"
                                                           :name   "network-name"
-                                                           :symbol "symbol"
                                                           :config {:NetworkId      1
                                                                    :DataDir        "/ethereum/mainnet_rpc"
                                                                    :UpstreamConfig {:Enabled true
@@ -167,13 +147,11 @@
                                 :db {:networks/manage {:url {:value "http://valid.com"}
                                                        :chain {:value :mainnet}
                                                        :name {:value "valid"}
-                                                        :symbol {:value "symbol"}
                                                        :network-id {:value 5}}
                                      :multiaccount {}
                                      :networks/networks {"randomid"
                                                          {:id     "randomid"
                                                           :name   "network-name"
-                                                           :symbol "symbol"
                                                           :config {:NetworkId      3
                                                                    :DataDir        "/ethereum/mainnet_rpc"
                                                                    :UpstreamConfig {:Enabled true
@@ -92,13 +92,6 @@
   (when platform/android?
     (pn-android/clear-message-notifications chat-id))))

-(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)))))
-
 (fx/defn handle-enable-notifications-event
  {:events [::registered-for-push-notifications]}
  [cofx token]
@@ -1,6 +1,5 @@
 (ns status-im.notifications.local
-  (:require [status-im.async-storage.core :as async-storage]
-            [status-im.utils.fx :as fx]
+  (:require [status-im.utils.fx :as fx]
            [status-im.ethereum.decode :as decode]
            ["@react-native-community/push-notification-ios" :default pn-ios]
            [status-im.notifications.android :as pn-android]
@@ -41,7 +40,6 @@

 (defn handle-notification-press [{{deep-link :deepLink} :userInfo
                                  interaction           :userInteraction}]
-  (async-storage/set-item! (str :chat-id) nil)
  (when (and deep-link
             (or platform/ios?
                 (and platform/android? interaction)))
@@ -68,7 +66,7 @@
                      (get-in tokens/all-tokens-normalized
                              [(keyword chain) (clojure.string/lower-case contract)]
                              default-erc20-token)
-                      (tokens/native-currency network))
+                      (tokens/native-currency (keyword chain)))
        amount      (money/wei->ether (decode/uint value))
        to          (or (:name toAccount) (utils/get-shortened-address to))
        from        (or (:name fromAccount) (utils/get-shortened-address from))
@@ -6,28 +6,15 @@
            [status-im.data-store.activities :as data-store.activities]))

 (fx/defn handle-activities [{:keys [db]} activities]
-  (let [{:keys [unread-count notifications]}
-        (reduce (fn [acc {:keys [read dismissed accepted] :as notification}]
-                  (as-> acc a
-                    (if read
-                      (update a :unread-count dec)
-                      (update a :unread-count inc))
+  {:db (-> db
+           (update-in [:activity.center/notifications :notifications] #(concat activities %))
+           (update :activity.center/notifications-count + (count activities)))
+   :dispatch (cond
+               (= (:view-id db) :notifications-center)
+               [:mark-all-activity-center-notifications-as-read]

-                    (if (or dismissed accepted)
-                      (update a :notifications (fn [items] (remove #(= (:id notification) (:id %)) items)))
-                      (update a :notifications conj notification))))
-                {:unread-count (get db :activity.center/notifications-count 0)
-                 :notifications (get-in db [:activity.center/notifications :notifications])}
-                activities)]
-    {:db (-> db
-             (assoc-in [:activity.center/notifications :notifications] notifications)
-             (assoc :activity.center/notifications-count (max 0 unread-count)))
-     :dispatch (cond
-                 (= (:view-id db) :notifications-center)
-                 [:mark-all-activity-center-notifications-as-read]
-
-                 (= (:view-id db) :chat)
-                 [:accept-all-activity-center-notifications-from-chat (:current-chat-id db)])}))
+               (= (:view-id db) :chat)
+               [:accept-all-activity-center-notifications-from-chat (:current-chat-id db)])})

 (fx/defn get-activity-center-notifications-count
  {:events [:get-activity-center-notifications-count]}
@@ -43,7 +43,7 @@

 (fx/defn handle-private-chat [{:keys [db] :as cofx} {:keys [chat-id]}]
  (if-not (new-chat.db/own-public-key? db chat-id)
-    (chat/start-chat cofx chat-id nil)
+    (chat/start-chat cofx chat-id)
    {:utils/show-popup {:title   (i18n/label :t/unable-to-read-this-code)
                        :content (i18n/label :t/can-not-add-yourself)}}))

@@ -7,7 +7,6 @@
            [status-im.notifications.local :as local-notifications]
            [status-im.chat.models.message :as models.message]
            [status-im.chat.models.link-preview :as link.preview]
-            [status-im.visibility-status-updates.core :as visibility-status-updates]
            [status-im.utils.fx :as fx]
            [taoensso.timbre :as log]))

@@ -42,8 +41,7 @@
              {:db (assoc db
                          :peers-summary peers-summary
                          :peers-count peers-count)}
-              (mailserver/peers-summary-change previous-summary)
-              (visibility-status-updates/peers-summary-change peers-count))))
+              (mailserver/peers-summary-change previous-summary))))

 (fx/defn wakuv2-peer-stats
  [{:keys [db]} peer-stats]
@@ -53,7 +51,7 @@

 (fx/defn process
  {:events [:signals/signal-received]}
-  [{:keys [db] :as cofx} event-str]
+  [cofx event-str]
  ;; We only convert to clojure when strictly necessary or we know it
  ;; won't impact performance, as it is a fairly costly operation on large-ish
  ;; data structures
@@ -62,7 +60,6 @@
        type (.-type data)]
    (case type
      "node.login"         (status-node-started cofx (js->clj event-js :keywordize-keys true))
-      "backup.performed"   {:db (assoc-in db [:multiaccount :last-backup] (.-lastBackup event-js))}
      "envelope.sent"      (transport.message/update-envelopes-status cofx (:ids (js->clj event-js :keywordize-keys true)) :sent)
      "envelope.expired"   (transport.message/update-envelopes-status cofx (:ids (js->clj event-js :keywordize-keys true)) :not-sent)
      "message.delivered"  (let [{:keys [chatID messageID]} (js->clj event-js :keywordize-keys true)]
@@ -197,7 +197,7 @@
                :symbol  :ETH
                :value   value
                :amount  (str eth-amount)
-                :token   (tokens/asset-for (:wallet/all-tokens db) (ethereum/get-current-network db) :ETH)}
+                :token   (tokens/asset-for (:wallet/all-tokens db) (ethereum/chain-keyword db) :ETH)}
               (not (nil? token))
               token
               :else
@@ -234,7 +234,7 @@
                                  :keycard-step (when pinless? :connect)})
        :show-signing-sheet nil}
       #(when-not wallet-set-up-passed?
-          {:dispatch-later [{:dispatch [:show-popover {:view :signing-phrase}] :ms 200}]})
+          {:dispatch-n [[:show-popover {:view :signing-phrase}]]})
       (when pinless?
         (keycard.card/start-nfc {:on-success #(re-frame/dispatch [:keycard.callback/start-nfc-success])
                                  :on-failure #(re-frame/dispatch [:keycard.callback/start-nfc-failure])})
@@ -249,7 +249,7 @@
        :show-signing-sheet nil
        :dismiss-keyboard nil}
       #(when-not wallet-set-up-passed?
-          {:dispatch-later [{:dispatch [:show-popover {:view :signing-phrase}] :ms 200}]})
+          {:dispatch-n [[:show-popover {:view :signing-phrase}]]})
       (prices/update-prices)
       #(when-not gas
          {:db (assoc-in (:db %) [:signing/edit-fee :gas-loading?] true)
@@ -304,13 +304,13 @@

 (fx/defn transaction-result
  [{:keys [db] :as cofx} result tx-obj]
-  (let [{:keys [on-result symbol amount from]} (get db :signing/tx)]
+  (let [{:keys [on-result symbol amount]} (get db :signing/tx)]
    (fx/merge cofx
              {:db (dissoc db :signing/tx :signing/sign)
               :signing/show-transaction-result nil}
              (prepare-unconfirmed-transaction result tx-obj symbol amount)
              (check-queue)
-              (wallet/watch-tx (get from :address) result)
+              (wallet/watch-tx result)
              #(when on-result
                 {:dispatch (conj on-result result)}))))

@@ -323,7 +323,7 @@
    (fx/merge
     cofx
     {:db (dissoc db :signing/tx :signing/sign)}
-     (wallet/watch-tx (get from :address) transaction-hash)
+     (wallet/watch-tx transaction-hash)
     (if (keycard.common/keycard-multiaccount? db)
       (signing.keycard/hash-message
        {:data data
@@ -439,10 +439,9 @@

 (fx/defn eth-transaction-call
  "Prepares tx-obj for contract call and show signing sheet"
-  [cofx {:keys [contract method params on-result on-error from]}]
+  [cofx {:keys [contract method params on-result on-error]}]
  (sign cofx {:tx-obj    {:to   contract
-                          :data (abi-spec/encode method params)
-                          :from from}
+                          :data (abi-spec/encode method params)}
              :on-result on-result
              :on-error  on-error}))

@@ -7,8 +7,7 @@
            [status-im.utils.money :as money]
            [status-im.signing.eip1559 :as eip1559]
            [taoensso.timbre :as log]
-            [status-im.popover.core :as popover]
-            [clojure.string :as string]))
+            [status-im.popover.core :as popover]))

 (def min-gas-price-wei ^js (money/bignumber 1))

@@ -212,7 +211,9 @@
  [{db :db} price]
  (if (eip1559/sync-enabled?)
    (let [{:keys [normal-base-fee max-priority-fee]} price
-          max-priority-fee-bn (money/with-precision (get-suggested-tip max-priority-fee) 0)]
+          max-priority-fee-bn (money/with-precision
+                               (get-suggested-tip max-priority-fee)
+                                0)]
      {:db (-> db
               (assoc-in [:signing/tx :maxFeePerGas]
                         (money/to-hex (money/add max-priority-fee-bn
@@ -278,7 +279,7 @@
  {:events [:signing.nonce/submit]}
  [{db :db :as cofx} nonce]
  (fx/merge cofx
-            {:db (assoc-in db [:signing/tx :nonce] (if (string/blank? nonce) nil nonce))}
+            {:db (assoc-in db [:signing/tx :nonce] nonce)}
            (bottom-sheet/hide-bottom-sheet)))

 (re-frame/reg-fx
@@ -289,9 +290,7 @@
    (fn []
      (json-rpc/call
       {:method "eth_feeHistory"
-        ;; NOTE(rasom): We don't need `reward` atm but if the last parameter is
-        ;; `nil` request fails on some chains (particularly on xDai).
-        :params [101 "latest" [100]]
+        :params [101 "latest" nil]
        :on-success #(re-frame/dispatch [::header-fetched
                                         (assoc params :fee-history %)])}))
    (fn []
@@ -343,44 +342,31 @@

 (defn check-base-fee [{:keys [baseFeePerGas]}]
  (let [all-base-fees    (mapv money/bignumber baseFeePerGas)
-        next-base-fee    (peek all-base-fees)
+        current-base-fee (last all-base-fees)
        previous-fees    (subvec all-base-fees 0 101)
-        current-base-fee (peek previous-fees)
        percentiles      (calc-percentiles previous-fees [10 20 80])]
    {:normal-base-fee  (money/to-hex
                        (recommended-base-fee
-                         next-base-fee
+                         current-base-fee
                         (get percentiles 20)
                         (get percentiles 80)))
     :slow-base-fee    (money/to-hex
                        (slow-base-fee
-                         next-base-fee
+                         current-base-fee
                         (get percentiles 10)))
     :fast-base-fee    (money/to-hex
                        (fast-base-fee
-                         next-base-fee
+                         current-base-fee
                         (get percentiles 80)))
     :current-base-fee (money/to-hex current-base-fee)}))

-(defn max-priority-fee-hex [gas-price base-fee]
-  (money/to-hex
-   (money/sub (money/bignumber gas-price)
-              (money/bignumber base-fee))))
-
 (fx/defn header-fetched
  {:events [::header-fetched]}
  [_ {:keys [error-callback success-callback fee-history] :as params}]
  {::json-rpc/call
-   [;; NOTE(rasom): eth_maxPriorityFeePerGas is not supported by some networks
-    ;; so it is more reliable to calculate maxPriorityFeePerGas using the value
-    ;; returned by eth_gasPrice and current base fee.
-    {:method     "eth_gasPrice"
-     :on-success #(success-callback
-                   (let [{:keys [current-base-fee] :as base-fees}
-                         (check-base-fee fee-history)]
-                     (merge {:max-priority-fee
-                             (max-priority-fee-hex % current-base-fee)}
-                            base-fees)))
+   [{:method     "eth_maxPriorityFeePerGas"
+     :on-success #(success-callback (merge {:max-priority-fee %}
+                                           (check-base-fee fee-history)))
     :on-error   (if error-callback
                   #(error-callback %)
                   #(log/error "Can't fetch header" %))}]})
@@ -40,8 +40,7 @@
            [status-im.notifications.core :as notifications]
            [status-im.utils.currency :as currency]
            [clojure.set :as clojure.set]
-            [quo.design-system.colors :as colors]
-            [status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils]))
+            [quo.design-system.colors :as colors]))

 ;; TOP LEVEL ===========================================================================================================

@@ -87,7 +86,6 @@
 (reg-root-key-sub :app-state :app-state)
 (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)

 ;;NOTE this one is not related to ethereum network
 ;; it is about cellular network/ wifi network
@@ -202,7 +200,6 @@
 (reg-root-key-sub :intro-wizard-state :intro-wizard)

 (reg-root-key-sub :popover/popover :popover/popover)
-(reg-root-key-sub :visibility-status-popover/popover :visibility-status-popover/popover)
 (reg-root-key-sub :add-account :add-account)

 (reg-root-key-sub :keycard :keycard)
@@ -257,11 +254,6 @@
 (reg-root-key-sub :anon-metrics/data-visible? :anon-metrics/data-visible?)
 (reg-root-key-sub :anon-metrics/learn-more-visible? :anon-metrics/learn-more-visible?)

-(reg-root-key-sub :bug-report/description-error :bug-report/description-error)
-(reg-root-key-sub :bug-report/details :bug-report/details)
-
-(reg-root-key-sub :backup/performing-backup :backup/performing-backup)
-
 (re-frame/reg-sub
 :communities
 :<- [:raw-communities]
@@ -300,36 +292,6 @@
 (fn [communities [_ id]]
   (get-in communities [id :chats])))

-(re-frame/reg-sub
- :communities/community-members
- :<- [:communities]
- (fn [communities [_ id]]
-   (get-in communities [id :members])))
-
-(re-frame/reg-sub
- :communities/sorted-community-members
- (fn [[_ community-id]]
-   (let [contacts     (re-frame/subscribe [:contacts/contacts])
-         multiaccount (re-frame/subscribe [:multiaccount])
-         members      (re-frame/subscribe
-                       [:communities/community-members community-id])]
-     [contacts multiaccount members]))
- (fn [[contacts multiaccount members] _]
-   (let [names (reduce
-                (fn [acc identity]
-                  (let [me?     (= (:public-key multiaccount)
-                                   identity)
-                        contact (when-not me?
-                                  (multiaccounts/contact-by-identity
-                                   contacts identity))
-                        name    (first
-                                 (multiaccounts/contact-two-names-by-identity
-                                  contact multiaccount identity))]
-                    (assoc acc identity name))) {} (keys members))]
-     (->> members
-          (sort-by #(get names (get % 0)))
-          (sort-by #(visibility-status-utils/visibility-status-order (get % 0)))))))
-
 (re-frame/reg-sub
 :communities/communities
 :<- [:communities/enabled?]
@@ -393,11 +355,6 @@

 ;;GENERAL ==============================================================================================================

-(re-frame/reg-sub
- :visibility-status-updates/visibility-status-update
- :<- [:visibility-status-updates]
- (fn [visibility-status-updates [_ public-key]]
-   (get visibility-status-updates public-key)))

 (re-frame/reg-sub
 :multiaccount/logged-in?
@@ -509,12 +466,6 @@
 (fn [chain-id]
   (= 1 chain-id)))

-(re-frame/reg-sub
- :ethereum-network?
- :<- [:chain-id]
- (fn [chain-id]
-   (< chain-id 6)))
-
 (re-frame/reg-sub
 :network-name
 :<- [:current-network]
@@ -660,9 +611,9 @@

 (re-frame/reg-sub
 :ethereum/native-currency
- :<- [:current-network]
- (fn [network]
-   (tokens/native-currency network)))
+ :<- [:ethereum/chain-keyword]
+ (fn [chain-keyword]
+   (tokens/native-currency chain-keyword)))

 ;;MULTIACCOUNT ==============================================================================================================

@@ -833,12 +784,6 @@
         (string/blank? (security/safe-unmask-data seed))
         false))))

-(re-frame/reg-sub
- :multiaccount/current-user-visibility-status
- :<- [:multiaccount]
- (fn [{:keys [current-user-visibility-status]}]
-   current-user-visibility-status))
-
 ;;CHAT ==============================================================================================================

 (re-frame/reg-sub
@@ -898,13 +843,6 @@
 (fn [[{:keys [categories]}] _]
   categories))

-(re-frame/reg-sub
- :communities/sorted-categories
- :<- [:communities]
- (fn [communities [_ id]]
-   (->> (get-in communities [id :categories])
-        (sort-by #(:position (get % 1))))))
-
 (re-frame/reg-sub
 :chats/current-chat-ui-props
 :<- [::chat-ui-props]
@@ -1197,6 +1135,19 @@
           (hydrate-messages messages))))))

 ;;we want to keep data unchanged so react doesn't change component when we leave screen
+(def memo-chat-messages-stream (atom nil))
+
+(re-frame/reg-sub
+ :chats/chat-messages-stream
+ (fn [[_ chat-id] _]
+   [(re-frame/subscribe [:chats/raw-chat-messages-stream chat-id])
+    (re-frame/subscribe [:chats/chat-no-messages? chat-id])
+    (re-frame/subscribe [:view-id])])
+ (fn [[messages empty view-id]]
+   (when (or (= view-id :chat) empty)
+     (reset! memo-chat-messages-stream messages))
+   @memo-chat-messages-stream))
+
 (def memo-profile-messages-stream (atom nil))

 (re-frame/reg-sub
@@ -1292,6 +1243,7 @@

 (re-frame/reg-sub
 :chats/chat-toolbar
+ :<- [:disconnected?]
 :<- [:multiaccounts/login]
 :<- [:chats/sending-image]
 :<- [:mainnet?]
@@ -1299,9 +1251,9 @@
 :<- [:current-chat/metadata]
 :<- [:chats/reply-message]
 :<- [:chats/edit-message]
- (fn [[{:keys [processing]} sending-image mainnet? one-to-one-chat? {:keys [public?]} reply edit]]
+ (fn [[disconnected? {:keys [processing]} sending-image mainnet? one-to-one-chat? {:keys [public?]} reply edit]]
   (let [sending-image (seq sending-image)]
-     {:send          (not processing)
+     {:send          (not (or processing disconnected?))
      :stickers      (and mainnet?
                          (not sending-image)
                          (not reply))
@@ -1425,26 +1377,20 @@
 :<- [:chats/mentionable-contacts]
 :<- [:contacts/blocked-set]
 :<- [:multiaccount]
- (fn [[{:keys [chat-id users contacts community-id chat-type] :as chat} mentionable-contacts blocked {:keys [name preferred-name public-key]}]]
-   (let [community-members @(re-frame/subscribe [:communities/community-members
-                                                 community-id])
-         contacts-with-one-to-one (if (= chat-type constants/one-to-one-chat-type)
-                                    (assoc mentionable-contacts chat-id (get mentionable-contacts chat-id (-> chat-id
-                                                                                                              contact.db/public-key->new-contact
-                                                                                                              contact.db/enrich-contact)))
-                                    mentionable-contacts)
-         members-left (into #{} (filter #(group-chat/member-removed? chat %) (keys users)))
-         filtered-contacts (select-keys contacts-with-one-to-one (if (nil? community-id)
-                                                                   (distinct (concat (seq contacts) (keys users) [chat-id]))
-                                                                   (keys community-members)))]
+ (fn [[{:keys [chat-id users chat-type]} contacts blocked {:keys [name preferred-name public-key]}]]
+   (let [contacts-with-one-to-one (if (= chat-type constants/one-to-one-chat-type)
+                                    (assoc contacts chat-id (get contacts chat-id (-> chat-id
+                                                                                      contact.db/public-key->new-contact
+                                                                                      contact.db/enrich-contact)))
+                                    contacts)]
     (apply dissoc
            (-> users
-                (merge filtered-contacts)
+                (merge contacts-with-one-to-one)
                (assoc public-key (mentions/add-searchable-phrases
                                   {:alias      name
                                    :name       (or preferred-name name)
                                    :public-key public-key})))
-            (conj (concat blocked members-left) public-key)))))
+            (conj blocked public-key)))))

 (re-frame/reg-sub
 :chat/mention-suggestions
@@ -1769,11 +1715,11 @@
   (get-in wallet [:fetching address :all-fetched?])))

 (re-frame/reg-sub
- :wallet/chain-explorer-link
+ :wallet/etherscan-link
 (fn [db [_ address]]
   (let [network (:networks/current-network db)
         link    (get-in config/default-networks-by-id
-                         [network :chain-explorer-link])]
+                         [network :etherscan-link])]
     (when link
       (str link address)))))

@@ -1793,12 +1739,12 @@

 (re-frame/reg-sub
 :wallet/visible-assets
- :<- [:current-network]
+ :<- [:ethereum/chain-keyword]
 :<- [:wallet/visible-tokens-symbols]
 :<- [:wallet/sorted-tokens]
- (fn [[network visible-tokens-symbols all-tokens-sorted]]
+ (fn [[chain visible-tokens-symbols all-tokens-sorted]]
   (conj (filter #(contains? visible-tokens-symbols (:symbol %)) all-tokens-sorted)
-         (tokens/native-currency network))))
+         (tokens/native-currency chain))))

 (re-frame/reg-sub
 :wallet/visible-assets-with-amount
@@ -2101,8 +2047,8 @@
 (fn [[_ _ address] _]
   [(re-frame/subscribe [:wallet.transactions/transactions address])
    (re-frame/subscribe [:ethereum/native-currency])
-    (re-frame/subscribe [:chain-id])])
- (fn [[transactions native-currency chain-id] [_ hash _]]
+    (re-frame/subscribe [:ethereum/chain-keyword])])
+ (fn [[transactions native-currency chain-keyword] [_ hash _]]
   (let [{:keys [gas-used gas-price fee-cap tip-cap hash timestamp type]
          :as transaction}
         (get transactions hash)
@@ -2140,7 +2086,7 @@
                                         (money/fee-value gas-used gas-price)
                                         native-currency-text))
                 :url  (transactions/get-transaction-details-url
-                        chain-id
+                        chain-keyword
                        hash)}))))))

 (re-frame/reg-sub
@@ -2189,12 +2135,6 @@
 :<- [:wallet]
 :request-transaction)

-(re-frame/reg-sub
- :wallet/binance-chain?
- :<- [:current-network]
- (fn [network]
-   (ethereum/binance-chain-id? (get-in network [:config :NetworkId]))))
-
 ;;UI ==============================================================================================================

 (re-frame/reg-sub
@@ -2268,15 +2208,6 @@
 (fn [contacts]
   (contact.db/get-active-contacts contacts)))

-(re-frame/reg-sub
- :contacts/sorted-contacts
- :<- [:contacts/active]
- (fn [active-contacts]
-   (->> active-contacts
-        (sort-by :alias)
-        (sort-by
-         #(visibility-status-utils/visibility-status-order (:public-key %))))))
-
 (re-frame/reg-sub
 :contacts/active-count
 :<- [:contacts/active]
@@ -2334,7 +2265,8 @@
 :contacts/contact-by-identity
 :<- [:contacts/contacts]
 (fn [contacts [_ identity]]
-   (multiaccounts/contact-by-identity contacts identity)))
+   (or (get contacts identity)
+       (multiaccounts/contact-with-names {:public-key identity}))))

 (re-frame/reg-sub
 :contacts/contact-added?
@@ -2349,8 +2281,11 @@
   [(re-frame/subscribe [:contacts/contact-by-identity identity])
    (re-frame/subscribe [:multiaccount])])
 (fn [[contact current-multiaccount] [_ identity]]
-   (multiaccounts/contact-two-names-by-identity contact current-multiaccount
-                                                identity)))
+   (let [me? (= (:public-key current-multiaccount) identity)]
+     (if me?
+       [(or (:preferred-name current-multiaccount)
+            (gfycat/generate-gfy identity))]
+       (multiaccounts/contact-two-names contact false)))))

 (re-frame/reg-sub
 :contacts/contact-name-by-identity
@@ -2628,20 +2563,18 @@
 :<- [:multiaccount/default-account]
 :<- [:multiaccount/public-key]
 :<- [:chain-id]
- :<- [:wallet]
- (fn [[{:keys [custom-domain? username address]}
-       chain default-account public-key chain-id wallet]]
-   (let [address (or address (ethereum/normalized-hex (:address default-account)))
-         balance (get-in wallet [:accounts address :balance])]
-     {:address           address
-      :username          username
-      :public-key        public-key
-      :custom-domain?    custom-domain?
-      :chain             chain
-      :amount-label      (ens-amount-label chain-id)
-      :sufficient-funds? (money/sufficient-funds?
-                          (money/formatted->internal (money/bignumber 10) (ethereum/chain-keyword->snt-symbol chain) 18)
-                          (get balance (ethereum/chain-keyword->snt-symbol chain)))})))
+ :<- [:balance-default]
+ (fn [[{:keys [custom-domain? username]}
+       chain default-account public-key chain-id balance]]
+   {:address           (ethereum/normalized-hex (:address default-account))
+    :username          username
+    :public-key        public-key
+    :custom-domain?    custom-domain?
+    :chain             chain
+    :amount-label      (ens-amount-label chain-id)
+    :sufficient-funds? (money/sufficient-funds?
+                        (money/formatted->internal (money/bignumber 10) (ethereum/chain-keyword->snt-symbol chain) 18)
+                        (get balance (ethereum/chain-keyword->snt-symbol chain)))}))

 (re-frame/reg-sub
 :ens/confirmation-screen
@@ -2801,11 +2734,11 @@
 :<- [:wallet]
 :<- [:offline?]
 :<- [:wallet/all-tokens]
- :<- [:current-network]
+ :<- [:ethereum/chain-keyword]
 (fn [[{:keys [symbol from to amount-text] :as transaction}
-       wallet offline? all-tokens current-network]]
+       wallet offline? all-tokens chain]]
   (let [balance (get-in wallet [:accounts (:address from) :balance])
-         {:keys [decimals] :as token} (tokens/asset-for all-tokens current-network symbol)
+         {:keys [decimals] :as token} (tokens/asset-for all-tokens chain symbol)
         {:keys [value error]} (wallet.db/parse-amount amount-text decimals)
         amount  (money/formatted->internal value symbol decimals)
         {:keys [amount-error] :as transaction-new}
@@ -2828,11 +2761,11 @@
 :<- [:wallet]
 :<- [:offline?]
 :<- [:wallet/all-tokens]
- :<- [:current-network]
+ :<- [:ethereum/chain-keyword]
 (fn [[{:keys [symbol from to amount-text] :as transaction}
-       wallet offline? all-tokens current-network]]
+       wallet offline? all-tokens chain]]
   (let [balance (get-in wallet [:accounts (:address from) :balance])
-         {:keys [decimals] :as token} (tokens/asset-for all-tokens current-network symbol)
+         {:keys [decimals] :as token} (tokens/asset-for all-tokens chain symbol)
         {:keys [value error]} (wallet.db/parse-amount amount-text decimals)
         amount  (money/formatted->internal value symbol decimals)
         {:keys [amount-error] :as transaction-new}
@@ -19,7 +19,6 @@
            [status-im.constants :as constants]
            [status-im.multiaccounts.model :as multiaccounts.model]
            [status-im.notifications-center.core :as notifications-center]
-            [status-im.visibility-status-updates.core :as models.visibility-status-updates]
            [clojure.string :as string]))

 (fx/defn process-next
@@ -43,17 +42,36 @@
        ^js activity-notifications     (.-activityCenterNotifications response-js)
        ^js pin-messages               (.-pinMessages response-js)
        ^js removed-messages           (.-removedMessages response-js)
-        ^js visibility-status-updates  (.-statusUpdates response-js)
-        ^js current-visibility-status  (.-currentStatus response-js)
        sync-handler                   (when-not process-async process-response)]
    (cond

      (seq chats)
      (do
+        (when (seq contacts)
+          ;; Note(rasom): in case if response contains contacts entries, some
+          ;; of them might be blocked. That means we might need to recalculate
+          ;; unviewed/mentions counters in chats where blocked users sent
+          ;; messages. Currently we ignore unviewed/mentions values which come
+          ;; from go side (see code few lines below) because it (probably)
+          ;; breaks app-db state. But we still have to apply those values when
+          ;; blocked contact is received from a paired device.
+          ;; In order to do so, we store all affected chats separately so that
+          ;; process loop might continue and then we use those chats on
+          ;; processing contacts update. Currently it causes one bug: for some
+          ;; reason own messages are counted as unviewed in 1-1 chat if they are
+          ;; sent on paired device. Although this change reveals the bug it is
+          ;; not the cause and thus the bug should be fixed separately.
+          (set! (.-chatsForContacts response-js) chats))
        (js-delete response-js "chats")
        (fx/merge cofx
                  (process-next response-js sync-handler)
-                  (models.chat/ensure-chats (map data-store.chats/<-rpc (types/js->clj chats)))))
+                  (models.chat/ensure-chats (map #(-> %
+                                                      (data-store.chats/<-rpc)
+                                                      ;; We dissoc this fields as they are handled by status-react and
+                                                      ;; not status-go, as there might be requests in-flight that change
+                                                      ;; this value
+                                                      (dissoc :unviewed-messages-count :unviewed-mentions-count))
+                                                 (types/js->clj chats)))))

      (seq messages)
      (models.message/receive-many cofx response-js)
@@ -81,7 +99,9 @@
        (fx/merge cofx
                  (process-next response-js sync-handler)
                  (models.contact/ensure-contacts
-                   (map data-store.contacts/<-rpc contacts-clj) chats)))
+                   (map data-store.contacts/<-rpc contacts-clj)
+                   (when chats
+                     (map data-store.chats/<-rpc (types/js->clj chats))))))

      (seq communities)
      (let [communities-clj (types/js->clj communities)]
@@ -129,23 +149,7 @@
        (js-delete response-js "removedMessages")
        (fx/merge cofx
                  (process-next response-js sync-handler)
-                  (models.message/handle-removed-messages removed-messages-clj)))
-
-      (seq visibility-status-updates)
-      (let [visibility-status-updates-clj (types/js->clj visibility-status-updates)]
-        (js-delete response-js "statusUpdates")
-        (fx/merge cofx
-                  (process-next response-js sync-handler)
-                  (models.visibility-status-updates/handle-visibility-status-updates
-                   visibility-status-updates-clj)))
-
-      (some? current-visibility-status)
-      (let [current-visibility-status-clj (types/js->clj current-visibility-status)]
-        (js-delete response-js "currentStatus")
-        (fx/merge cofx
-                  (process-next response-js sync-handler)
-                  (models.visibility-status-updates/sync-visibility-status-update
-                   current-visibility-status-clj))))))
+                  (models.message/handle-removed-messages removed-messages-clj))))))

 (defn group-by-and-update-unviewed-counts
  "group messages by current chat, profile updates, transactions and update unviewed counters in db for not curent chats"
@@ -214,7 +218,7 @@
                                                 [{:ms 100 :dispatch [:process-statuses statuses]}])
                                               (when (seq transactions)
                                                 (for [transaction-hash transactions]
-                                                   {:ms 100 :dispatch [:watch-tx nil transaction-hash]})))}
+                                                   {:ms 100 :dispatch [:watch-tx transaction-hash]})))}
                (process-response response-js process-async)))))

 (fx/defn remove-hash
@@ -255,9 +259,7 @@

 (fx/defn update-envelopes-status
  [{:keys [db] :as cofx} message-id status]
-  (when (or (not= status :not-sent)
-            (= :online (:network db)))
-    (apply fx/merge cofx (map #(update-envelope-status % status) message-id))))
+  (apply fx/merge cofx (map #(update-envelope-status % status) message-id)))

 (fx/defn set-message-envelope-hash
  "message-type is used for tracking"
@@ -17,7 +17,7 @@
 (defn section
  "Render collapsible section"
  [_props]
-  (let [opened? (reagent/atom (get _props :default))]
+  (let [opened? (reagent/atom false)]
    (fn [{:keys [title content icon opened disabled
                 padding-vertical dropdown-margin-left
                 open-container-style
@@ -6,9 +6,7 @@
            [status-im.ui.components.chat-icon.styles :as styles]
            [quo.design-system.colors :as colors]
            [status-im.ui.components.react :as react]
-            [status-im.ui.screens.chat.photos :as photos]
-            [status-im.profile.db :as profile.db]
-            [status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils]))
+            [status-im.ui.screens.chat.photos :as photos]))

 ;;TODO REWORK THIS NAMESPACE

@@ -44,25 +42,6 @@
    [react/view (:default-chat-icon styles)
     [react/text {:style (:default-chat-icon-text styles)} emoji]]))

-(defn profile-photo-plus-dot-view
-  [{:keys [public-key photo-container photo-path community?]}]
-  (let [photo-path             (if (nil? photo-path)
-                                 @(re-frame.core/subscribe [:chats/photo-path public-key])
-                                 photo-path)
-        photo-container        (if (nil? photo-container)
-                                 styles/container-chat-list photo-container)
-        size                    (:width photo-container)
-        identicon?              (when photo-path (profile.db/base64-png? photo-path))
-        dot-styles              (visibility-status-utils/icon-visibility-status-dot
-                                 public-key size identicon?)
-        dot-accessibility-label (:accessibility-label dot-styles)]
-    [react/view {:style               photo-container
-                 :accessibility-label :profile-photo}
-     [photos/photo photo-path {:size size}]
-     (when-not community?
-       [react/view {:style               dot-styles
-                    :accessibility-label dot-accessibility-label}])]))
-
 (defn emoji-chat-icon-view
  [chat-id group-chat name emoji styles]
  [react/view (:container styles)
@@ -70,8 +49,8 @@
     (if (string/blank? emoji)
       [default-chat-icon name styles]
       [emoji-chat-icon emoji styles])
-     [profile-photo-plus-dot-view {:public-key      chat-id
-                                   :photo-container (:default-chat-icon styles)}])])
+     (let [photo-path @(re-frame.core/subscribe [:chats/photo-path chat-id])]
+       [photos/photo photo-path styles]))])

 (defn chat-icon-view-toolbar
  [chat-id group-chat name color emoji]
@@ -152,8 +131,7 @@
      (if-not (string/blank? photo-path)
        [photos/photo photo-path styles]))))

-(defn profile-icon-view
-  [photo-path name color emoji edit? size override-styles public-key community?]
+(defn profile-icon-view [photo-path name color emoji edit? size override-styles]
  (let [styles (merge {:container              {:width size :height size}
                       :size                   size
                       :chat-icon              styles/chat-icon-profile
@@ -163,10 +141,7 @@
                                                 (styles/emoji-chat-icon-text size))} override-styles)]
    [react/view (:container styles)
     (if (and photo-path (seq photo-path))
-       [profile-photo-plus-dot-view {:photo-path      photo-path
-                                     :public-key      public-key
-                                     :photo-container (:container styles)
-                                     :community?      community?}]
+       [photos/photo photo-path styles]
       (if (string/blank? emoji)
         [default-chat-icon name styles]
         [emoji-chat-icon emoji styles]))
@@ -70,6 +70,51 @@
          :height        64
          :border-radius 32}))

+(def online-view-wrapper
+  {:position         :absolute
+   :bottom           -2
+   :right            -2
+   :width            17
+   :height           17
+   :border-radius    11
+   :background-color colors/white})
+
+(def online-view
+  {:position         :absolute
+   :bottom           2
+   :right            2
+   :width            13
+   :height           13
+   :border-radius    9
+   :background-color colors/blue})
+
+(def online-view-profile
+  (merge online-view
+         {:width         24
+          :height        24
+          :border-radius 12}))
+
+(def online-dot
+  {:position         :absolute
+   :top              5
+   :width            3
+   :height           3
+   :border-radius    2
+   :background-color colors/white})
+(def online-dot-left (merge online-dot {:left 2.8}))
+(def online-dot-right (merge online-dot {:left 7.2}))
+
+(def online-dot-profile
+  (merge online-dot
+         {:top    8
+          :width  4
+          :height 4}))
+
+(def online-dot-left-profile
+  (merge online-dot-profile {:left 5}))
+(def online-dot-right-profile
+  (merge online-dot-profile {:left 11}))
+
 (def container-chat-list
  {:width  40
   :height 40})
@@ -13,9 +13,7 @@
   (merge {:style               (merge
                                 styles/wrapper
                                 style)
-           :accessibility-label (str accessibility-label
-                                     "-"
-                                     (if checked? "on" "off"))}
+           :accessibility-label accessibility-label}
          (when on-value-change
            {:on-press #(on-value-change (not checked?))}))
   (if checked?
@@ -1,6 +1,5 @@
 (ns status-im.ui.components.emoji-thumbnail.styles
  (:require [quo.design-system.colors :as colors]
-            [status-im.utils.platform :as platform]
            [status-im.ui.components.emoji-thumbnail.utils :as emoji-utils]))

 (defn emoji-thumbnail-icon [color size]
@@ -25,8 +24,7 @@

 (def emoji-thumbnail-preview-size 60)

-(def emoji-picker-upper-components-size
-  (if platform/android? 350 405))
+(def emoji-picker-upper-components-size 350)

 (defn emoji-picker-gray-color []
  (if (colors/dark?) "#c3c3bc99" "#3C3C4399"))
@@ -37,10 +37,8 @@
         (when-not minimized
           {:padding-top    subtitle-margin})))

-(defn extended-header
-  [{:keys [title photo color subtitle subtitle-icon on-edit on-press monospace
-           bottom-separator emoji public-key community?]
-    :or   {bottom-separator true}}]
+(defn extended-header [{:keys [title photo color subtitle subtitle-icon on-edit on-press monospace bottom-separator emoji]
+                        :or   {bottom-separator true}}]
  (fn [{:keys [animation minimized]}]
    (let [wrapper  (if on-press
                     [rn/touchable-opacity {:on-press on-press}]
@@ -59,7 +57,7 @@
                  [chat-icon.screen/profile-icon-view
                   photo title color emoji (and (not minimized) on-edit)
                   (if minimized avatar-minimized-size avatar-extended-size)
-                   nil public-key community?]]])
+                   nil]]])
          [animated/view {:style          (header-text)
                          :pointer-events :box-none}
           [quo/text {:animated?           true
@@ -12,8 +12,7 @@
             :refer (SafeAreaProvider SafeAreaInsetsContext)]
            ["@react-native-community/clipboard" :default Clipboard]
            ["react-native-linear-gradient" :default LinearGradient]
-            ["react-native-navigation" :refer (Navigation)]
-            ["react-native-fast-image" :as FastImage])
+            ["react-native-navigation" :refer (Navigation)])
  (:require-macros [status-im.utils.views :as views]))

 (def native-modules (.-NativeModules react-native))
@@ -32,8 +31,6 @@

 (def image-class (reagent/adapt-react-class (reactjs/memo (.-Image react-native))))

-(def fast-image (reagent/adapt-react-class FastImage))
-
 (defn image-get-size [uri callback] (.getSize (.-Image react-native) uri callback))
 (defn resolve-asset-source [uri] (js->clj (.resolveAssetSource (.-Image react-native) uri) :keywordize-keys true))

@@ -103,5 +103,4 @@
                             (conj chats lang-topic)
                             chats)]
            (for [chat chats]
-              ^{:key chat}
-              [render-topic chat]))]])]]))
+              (render-topic chat)))]])]]))
@@ -1,52 +0,0 @@
-(ns status-im.ui.screens.backup-settings.view
-  (:require-macros [status-im.utils.views :as views])
-  (:require [status-im.ui.components.react :as react]
-            [quo.design-system.colors :as colors]
-            [status-im.utils.datetime :as datetime]
-            [status-im.i18n.i18n :as i18n]
-            [quo.core :as quo]
-            [re-frame.core :as re-frame]))
-
-(defn perform-backup! []
-  (re-frame/dispatch [:multiaccounts.ui/perform-backup-pressed]))
-
-(defn footer [performing-backup?]
-  [react/touchable-highlight {:on-press (when-not performing-backup?
-                                          perform-backup!)
-                              :style    {:height         52}}
-   [react/view
-    {:style  {:justify-content :center
-              :flex            1
-              :align-items     :center}}
-    [react/text
-     {:color      colors/blue
-      :text-align :center}
-     (if performing-backup?
-       (i18n/label :t/backing-up)
-       (i18n/label :t/perform-backup))]]])
-
-(views/defview backup-settings []
-  (views/letsubs
-    [{:keys [last-backup backup-enabled?]}
-     [:multiaccount]
-     performing-backup? [:backup/performing-backup]]
-    [:<>
-     [react/scroll-view
-      [quo/list-item
-       {:size                   :small
-        :title                   (i18n/label :t/backup-through-waku)
-        :accessibility-label     :backup-enabled
-        :container-margin-bottom 8
-        :on-press
-        #(re-frame/dispatch
-          [:multiaccounts.ui/switch-backup-enabled (not backup-enabled?)])
-        :accessory               :switch
-        :active                  backup-enabled?}]
-      [quo/list-item
-       {:size                   :small
-        :title                  (i18n/label :t/last-backup-performed)
-        :accessory              :text
-        :subtitle                   (if (pos? last-backup)
-                                      (datetime/time-ago-long (datetime/to-date last-backup))
-                                      (i18n/label :t/never))}]]
-     [footer performing-backup?]]))
@@ -1,49 +0,0 @@
-(ns status-im.ui.screens.bug-report
-  (:require [quo.core :as quo]
-            [quo.react-native :as react-native]
-            [re-frame.core :as re-frame]
-            [status-im.i18n.i18n :as i18n]
-            [status-im.ui.components.topbar :as topbar]))
-
-(defn bug-report []
-  (let [{:keys [description steps]} @(re-frame/subscribe [:bug-report/details])]
-    [react-native/view {:style {:flex 1}}
-     [topbar/topbar
-      {:title  (i18n/label :t/bug-report)
-       :modal? true}]
-     [react-native/view {:style {:flex               1
-                                 :padding-top        8
-                                 :padding-horizontal 16}}
-      [quo/text-input
-       {:label               (i18n/label :t/bug-report-description)
-        :default-value               description
-        :placeholder         (i18n/label :t/bug-report-description-placeholder)
-        :style               {:margin-bottom 8}
-        :multiline           true
-        :error               @(re-frame/subscribe [:bug-report/description-error])
-        :accessibility-label :bug-report-description
-        :on-change-text      #(re-frame/dispatch [:logging/report-details :description %])}]
-      [quo/text-input
-       {:label               (i18n/label :t/bug-report-steps)
-        :default-value       steps
-        :placeholder         (i18n/label :t/bug-report-steps-placeholder)
-        :style               {:margin-bottom 16}
-        :multiline           true
-        :accessibility-label :bug-report-steps
-        :on-change-text      #(re-frame/dispatch [:logging/report-details :steps %])}]
-      [quo/button
-       {:type                :primary
-        :accessibility-label :bug-report-submit
-        :theme               :accent
-        :on-press            #(re-frame/dispatch [:logging/submit-report])}
-       (i18n/label :t/bug-report-submit-email)]
-      [react-native/view
-       {:style {:margin-vertical 16
-                :align-items :center}}
-       [quo/text (i18n/label :t/or)]]
-      [quo/button
-       {:type                :primary
-        :accessibility-label :bug-report-submit-gh-issue
-        :theme               :accent
-        :on-press            #(re-frame/dispatch [:logging/submit-gh-issue])}
-       (i18n/label :t/bug-report-submit-gh-issue)]]]))
@@ -181,7 +181,7 @@
                   :message-id @current-player-message-id}))
  nil)

-(defview message-content [{:keys [audio audio-duration-ms message-id outgoing]}]
+(defview message-content [{:keys [audio audio-duration-ms message-id outgoing]} timestamp-view]
  (letsubs [state        (reagent/atom nil)
            progress     (reagent/atom 0)
            progress-anim (anim/create-value 0)
@@ -223,4 +223,5 @@
                        (#{:playing :paused :seeking}  (:general @state)) @progress
                        :else (:duration @state))
                 s (quot time 1000)]
-             (gstring/format "%02d:%02d" (quot s 60) (mod s 60)))]]]))))
+             (gstring/format "%02d:%02d" (quot s 60) (mod s 60)))]
+          timestamp-view]]))))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
andrey	c34b91be4a	[#12731 ] Blank space in place of 1-1 chat with a blocked user on the home screen Signed-off-by: andrey <motor4ik@gmail.com> (cherry picked from commit `cd30a04626`)	2021-10-21 14:32:26 +02:00
Roman Volosovskyi	ae7ccc1cdb	[#12720 ] attempt to fix crash on accepting starter pack	2021-10-21 13:40:56 +03:00
Andrea Maria Piana	161ecce1aa	Hide transaction management Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>	2021-10-20 19:28:32 +01:00
Andrea Maria Piana	ac5b3b1b94	Send profile pictures in private chats Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>	2021-10-20 19:27:12 +01:00
andrey	4b65b59282	[#12718 ] Endless spinner when signing TX with custom nonce (Keycard account only) Signed-off-by: andrey <motor4ik@gmail.com> (cherry picked from commit `760b021b8a`)	2021-10-20 16:12:34 +02:00
andrey	0e5b6c8393	[#12717 ] No preview for transaction messages in 1-1 chat Signed-off-by: andrey <motor4ik@gmail.com> (cherry picked from commit `7a7b365a00`)	2021-10-20 16:12:34 +02:00
Vitaliy Vlasov	77d601047a	Fix field names related to Wakuv2 config Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>	2021-10-20 10:02:29 +01:00
Samuel Hawksby-Robinson	0763978e6a	Bump VERSION to 1.17.0 Signed-off-by: Samuel Hawksby-Robinson <samuel@samyoul.com>	2021-10-15 12:21:11 +01:00
@@ -1 +1 @@
 .18.0
 .17.0