overlay fix

gomobile_src_override
use static lib
2023-02-10 13:00:12 +02:00 · 2023-02-09 10:56:39 +02:00 · 2023-01-23 16:21:29 +02:00 · 2023-01-20 11:56:15 +02:00 · 2023-01-09 17:58:35 +02:00 · 2022-12-23 20:20:46 +02:00
53 changed files with 1144 additions and 2247 deletions
@@ -640,7 +640,7 @@ SPEC CHECKSUMS:
  FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
  FBReactNativeSpec: 7dfb84f624136a45727c813ed21d130cd3e61beb
  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 36ce0530c6d2c3a5a4326885ef4069564887a1db
+  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
@@ -14,6 +14,7 @@

    status-go = {
      src-override = null;
+      gomobile-src-override = null;
      ipfs-gateway-url = "https://ipfs.status.im/";
    };
  };
@@ -9,17 +9,47 @@ self: super:

 let
  inherit (super) stdenv stdenvNoCC callPackage;
-in {
-  # Fix for MacOS
-  mkShell = super.mkShell.override { stdenv = stdenvNoCC; };
-
-  # Various utilities
-  utils = callPackage ./tools/utils.nix { };
  lib = (super.lib or { }) // (import ./lib {
    inherit (super) lib;
    inherit (self) config;
  });

+  gomobileSrcOverride = "/Users/vvlasov/c/mobile";
+  # Warning message about using local sources
+  localSrcWarn = (path: "Using local gomobile sources from ${path}");
+  localGomobileSrc = rec {
+    owner = "status-im";
+    repo = "mobile";
+    rev = "unknown";
+    shortRev = rev;
+    rawVersion = "develop";
+    cleanVersion = rawVersion;
+    goPackagePath = "github.com/${owner}/${repo}";
+    # We use builtins.path so that we can name the resulting derivation,
+    # Normally the name would not be deterministic, taken from the checkout directory.
+    src = builtins.path rec {
+      path = lib.traceValFn localSrcWarn gomobileSrcOverride;
+      name = "${repo}-source-${shortRev}";
+      # Keep this filter as restrictive as possible in order
+      # to avoid unnecessary rebuilds and limit closure size
+      filter = lib.mkFilter {
+        root = path;
+        include = [ ".*" ];
+        exclude = [
+          ".*/[.]git.*" ".*[.]md" ".*[.]yml" ".*/.*_test.go$"
+          "VERSION" "_assets/.*" "build/.*"
+          ".*/.*LICENSE.*" ".*/CONTRIB.*" ".*/AUTHOR.*"
+        ];
+      };
+    };
+  };
+in {
+  inherit lib;
+  # Fix for MacOS
+  mkShell = super.mkShell.override { stdenv = stdenvNoCC; };
+
+  # Various utilities
+  utils = callPackage ./tools/utils.nix { };
  # Project dependencies
  deps = {
    clojure = callPackage ./deps/clojure { };
@@ -45,11 +75,17 @@ in {
  buildGoPackage = super.buildGo118Package;
  buildGoModule = super.buildGo118Module;
  gomobile = (super.gomobile.overrideAttrs (old: {
-    patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
-      url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
-      sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
-    };
-  })).override {
+    src = "/Users/vvlasov/c/mobile";
+    vendorSha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
+    # patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
+    #   url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
+    #   sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
+    # };
+    })).override rec {
+      buildGoModule = args: super.buildGoModule ( args // {
+        src =  "/Users/vvlasov/c/mobile";
+        vendorSha256 = "sha256-C6GD3NMolRIve1siG8wpcQav7ZWTugjce8K22EQDD7M=";
+    });
    # FIXME: No Android SDK packages for aarch64-darwin.
    withAndroidPkgs = stdenv.system != "aarch64-darwin";
    androidPkgs = self.androidEnvCustom.compose;
@@ -46,6 +46,9 @@ config=''
 if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
    config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
 fi
+if [[ -n "${GOMOBILE_SRC_OVERRIDE}" ]]; then
+    config+="status-im.status-go.gomobile-src-override=\"${GOMOBILE_SRC_OVERRIDE}\";"
+fi
 config+="status-im.build-type=\"${BUILD_TYPE}\";"

 if [[ -n "$config" ]]; then
@@ -12,6 +12,7 @@ let

  # Source can be changed with a local override from config
  source = callPackage ./source.nix { };
+  nimbusSource = callPackage ./nimbus_source.nix { };

  # Params to be set at build time, important for About section and metrics
  goBuildParams = {
@@ -31,14 +32,55 @@ let
    "-w" # -w disables DWARF debugging information
  ];
 in rec {
+  inherit nimbusSource;
+
  mobile = callPackage ./mobile {
-    inherit meta source goBuildLdFlags;
+    inherit meta source nimbusSource nimCompiler goBuildLdFlags;
  };

  library = callPackage ./library {
    inherit meta source;
  };

+  nimCompiler = callPackage ./mobile/buildNim.nix {
+    srcRaw = nimbusSource;
+  };
+
+  liblcproxy-android-arm = callPackage ./mobile/buildNimbus.nix {
+    srcRaw = nimbusSource;
+    nimCompiler = nimCompiler;
+    platform = "android";
+    arch = "arm";
+  };
+
+  liblcproxy-android-arm64 = callPackage ./mobile/buildNimbus.nix {
+    srcRaw = nimbusSource;
+    nimCompiler = nimCompiler;
+    platform = "android";
+    arch = "arm64";
+  };
+
+  liblcproxy-android-x86 = callPackage ./mobile/buildNimbus.nix {
+    srcRaw = nimbusSource;
+    nimCompiler = nimCompiler;
+    platform = "android";
+    arch = "x86";
+  };
+
+  liblcproxy-ios-x86 = callPackage ./mobile/buildNimbus.nix {
+    srcRaw = nimbusSource;
+    nimCompiler = nimCompiler;
+    platform = "ios";
+    arch = "x86";
+  };
+
+  liblcproxy-ios-arm64 = callPackage ./mobile/buildNimbus.nix {
+    srcRaw = nimbusSource;
+    nimCompiler = nimCompiler;
+    platform = "ios";
+    arch = "arm64";
+  };
+
  shell = mkShell {
    inputsFrom = [ mobile.android mobile.ios ];
  };
@@ -2,6 +2,7 @@
 , androidPkgs, openjdk, gomobile, xcodeWrapper, removeReferencesTo
 , meta
 , source
+, buildNimbusLc
 , platform ? "android"
 , platformVersion ? "23"
 , targets ? [ "android/arm64" "android/arm" ]
@@ -13,7 +14,14 @@ let
  inherit (lib) concatStringsSep optionalString optional;
  isIOS = platform == "ios";
  isAndroid = platform == "android";
+  lc = buildNimbusLc {inherit platform targets;};
+  cgoCflags = "-I" + (builtins.elemAt lc 0);

+  lcDirs = (builtins.concatStringsSep " " (builtins.map (s: "-L" + s) lc));
+
+  goBuildLdFlagsModified = 
+    goBuildLdFlags ++ [("-extldflags \"-lverifproxy " + lcDirs + "\"")];
+  ldflags = concatStringsSep " " goBuildLdFlagsModified;
 in buildGoPackage {
  pname = source.repo;
  version = "${source.cleanVersion}-${source.shortRev}-${platform}";
@@ -30,8 +38,6 @@ in buildGoPackage {
    ++ optional isAndroid openjdk
    ++ optional isIOS xcodeWrapper;

-  ldflags = concatStringsSep " " goBuildLdFlags;
-
  ANDROID_HOME = optionalString isAndroid androidPkgs.sdk;

  # Ensure XCode is present for iOS, instead of failing at the end of the build.
@@ -40,11 +46,13 @@ in buildGoPackage {
  buildPhase = ''
    runHook preBuild
    echo -e "\nBuilding $pname for: ${concatStringsSep "," targets}"
-
+    echo -e "\n LC dirs: ${lcDirs}"
+    echo -e "\n ldflags: ${ldflags}"
    set -x
+    export CGO_CFLAGS=\"${cgoCflags}\" 
    gomobile bind \
      ${concatStringsSep " " goBuildFlags} \
-      -ldflags="$ldflags" \
+      -ldflags ''\'${ldflags}''\' \
      -target=${concatStringsSep "," targets} \
      ${optionalString isAndroid "-androidapi=${platformVersion}" } \
      ${optionalString isIOS "-iosversion=${platformVersion}" } \
@@ -0,0 +1,67 @@
+{ pkgs, stdenv, lib, fetchFromGitHub
+# Dependencies
+, xcodeWrapper
+, srcRaw
+, writeScript
+, writeTextFile
+, androidPkgs
+, git 
+, platform ? "android"
+, arch ? "386"
+, api ? "29" }:
+
+let
+  osId = builtins.elemAt (builtins.split "\-" stdenv.hostPlatform.system) 2;
+  osArch = builtins.elemAt (builtins.split "\-" stdenv.hostPlatform.system) 0;
+
+  nimHostOs = if osId == "darwin" then "Darwin"
+              else if osId == "linux" then "Linux"
+              else "Windows_NT";
+
+  createNimbleLink = writeTextFile {
+    name = "createNimbleLink.sh";
+    text = ''
+    mkdir -p vendor/.nimble/pkgs
+
+    curdir=`pwd`
+    for dir in vendor/*/;
+    do
+      baseDirName=`basename ''${dir}`
+      dirName=vendor/.nimble/pkgs/$baseDirName-\#head
+      echo $dirName
+      mkdir -p $dirName
+
+      packageDir="''${curdir}/vendor/''${baseDirName}"
+      if [ -d "''${packageDir}/src" ]; then
+        packageDir="''${packageDir}/src"
+      fi
+      echo "''${packageDir}" > ''${dirName}/''${baseDirName}.nimble-link
+      echo "''${packageDir}" >> ''${dirName}/''${baseDirName}.nimble-link
+    done
+    '';
+    executable = true;
+  };
+
+in stdenv.mkDerivation rec {
+  pname = "nimCompiler";
+  name = "nimCompiler";
+  src = srcRaw.src;
+  #version = lib.strings.substring 0 7 src.rev;
+  buildInputs = with pkgs; [ wget git clang which tcl curl];
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+
+  buildPhase = ''
+    ${createNimbleLink}
+    export HOME=$PWD
+    unset SSL_CERT_FILE
+    make V=3 CC=clang build-nim
+   '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r vendor/nimbus-build-system/vendor/Nim/* $out/
+  '';
+}
+
@@ -0,0 +1,231 @@
+{ pkgs, stdenv, lib, fetchFromGitHub
+# Dependencies
+, xcodeWrapper
+, srcRaw
+, writeScript
+, writeTextFile
+, androidPkgs
+, git 
+, nimCompiler 
+, platform ? "android"
+, arch ? "386"
+, api ? "29" }:
+
+let
+  osId = builtins.elemAt (builtins.split "\-" stdenv.hostPlatform.system) 2;
+  osArch = builtins.elemAt (builtins.split "\-" stdenv.hostPlatform.system) 0;
+
+  
+  # Arg arch -> Nim arch
+  nimCpuMap = {
+    "x86" = "i386";
+    "x86-64" = "amd64"; 
+    "arm" = "arm"; 
+    "arm64" = "arm64";
+  };
+
+  iosArchMap = {
+    "x86" = "x86_64";
+    "x86-64" = "x86_64";
+    "arm" = "armv7";
+    "arm64" = "arm64";
+  };
+
+  nimCpu = if platform == "ios" && arch == "x86"
+    then "amd64" else "${lib.getAttr arch nimCpuMap}";
+  nimPlatform = "${(if platform == "ios" then "ios" else "android")}";
+
+  iosSdk = if arch == "x86" then "iphonesimulator" else "iphoneos";
+  iosArch = lib.getAttr arch iosArchMap;
+
+  isAndroid = lib.hasPrefix "android" platform;
+  isIOS = platform == "ios";
+
+
+  buildType = lib.getConfig "build-type" "";
+
+
+  routeHeader = builtins.readFile ./route.h;
+
+  PROJECT_ROOT = srcRaw.src;
+
+  iosIncludes = stdenv.mkDerivation {
+    name = "nim-status-ios-includes";
+    buildInputs = [ pkgs.coreutils ];
+    builder = writeScript "nim-ios-includes.sh"
+    ''
+      export PATH=${pkgs.coreutils}/bin
+      mkdir $out
+      cd $out
+      mkdir net
+      echo "${routeHeader}" > net/route.h
+    '';
+  };
+
+
+  ANDROID_NDK_HOME = "${androidPkgs.sdk}/ndk-bundle";
+  
+  
+  androidToolchain = "${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/${osId}-${osArch}";
+  androidTargetArchMap = {
+    "x86" = "i686-linux-android";
+    "x86-64" = "x86_64-linux-android";
+    "arm" = "armv7a-linux-androideabi";
+    "arm64" = "aarch64-linux-android";
+  };
+
+  androidTargetArch = lib.getAttr arch androidTargetArchMap;
+
+  iosVersion = "9.0";
+
+  sysroot = if isAndroid then "${androidToolchain}/sysroot" else "$(xcrun --sdk ${iosSdk} --show-sdk-path)";  
+  compilerFlags = if isAndroid then
+    "--sysroot ${sysroot} -fPIC -target ${androidTargetArch}${api}"
+    else if isIOS then
+    # TODO The conditional for -miphoneos-version-min=8.0 is required,
+    # otherwise Nim will complain that thread-local storage is not supported for the current target
+    # when expanding 'NIM_THREADVAR' macro
+    "-isysroot ${sysroot} -fembed-bitcode -target ${iosArch}-apple-ios${iosVersion} ${if arch == "arm" then "" else "-miphoneos-version-min=${iosVersion}"} -I${iosIncludes}"
+    else throw "Unsupported platform!";
+
+  linkerFlags = if isAndroid then
+  "--sysroot ${sysroot} -target ${androidTargetArch}${api}"
+  else if isIOS then
+  "--sysroot ${sysroot} -fembed-bitcode -target ${iosArch}-apple-ios${iosVersion} ${if arch == "arm" then "" else "-miphoneos-version-min=${iosVersion}"} -v"
+  else throw "Unsupported platform!";
+  
+  ldDirMap = {
+    "x86" = "i686";
+    "x86-64" = "x86_64";
+    "arm" = "armeabi-v7a"; 
+    "arm64" = "arm64-v8a";
+  };
+
+  cmakeArgs = if isAndroid then
+    "-DCMAKE_SYSTEM_NAME=Android -DCMAKE_SYSTEM_VERSION=${api} -DCMAKE_ANDROID_ARCH_ABI=${lib.getAttr arch ldDirMap} -DCMAKE_ANDROID_NDK=${ANDROID_NDK_HOME}"
+  else if isIOS then "-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=\"$(CMAKE_SYSROOT)\" -DCMAKE_OSX_ARCHITECTURES=${iosArch} -DCMAKE_OSX_DEPLOYMENT_TARGET=9.3 -DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO -DCMAKE_IOS_INSTALL_COMBINED=YES"
+  else throw "Unsupported platform!";
+  #clangPath = if isAndroid then "${androidToolchain}/bin" else "";
+  #clangName = if isAndroid then "${androidTargetArch}${api}-clang" else "";
+
+  compilerVars = if isAndroid then
+    ''
+      export PATH=${androidToolchain}/bin:$PATH
+      export CC=clang
+      export CXX=clang++
+      export AR=${androidToolchain}/bin/llvm-ar
+      export NM=${androidToolchain}/bin/llvm-nm
+      export RANLIB=${androidToolchain}/bin/llvm-ranlib
+      export LD=${androidToolchain}/bin/ld
+      export AS=$CC
+      export CFLAGS="${compilerFlags}"
+      export LDFLAGS="${linkerFlags}"
+
+      mkdir bin
+      touch bin/git
+      chmod +x bin/git
+      export PATH=./bin:$PATH
+    ''
+    else if isIOS then
+    ''
+      export PATH=${xcodeWrapper}/bin:$PATH
+      export CC=clang #$(xcrun --sdk ${iosSdk} --find clang)
+      export CXX=clang++ #$(xcrun --sdk ${iosSdk} --find clang++)
+      export LD=clang
+      export CFLAGS="${compilerFlags}"
+      export LDFLAGS="${linkerFlags}"
+
+      mkdir bin
+      touch bin/git
+      chmod +x bin/git
+      export PATH=./bin:$PATH
+
+      export CMAKE_SYSROOT=${sysroot}
+    ''
+    else throw "Unsupported platform!";
+ 
+  src = srcRaw;
+
+
+  nimHostOs = if osId == "darwin" then "Darwin"
+              else if osId == "linux" then "Linux"
+              else "Windows_NT";
+  createNimbleLink = writeTextFile {
+    name = "createNimbleLink.sh";
+    text = ''
+    mkdir -p vendor/.nimble/pkgs
+
+    curdir=`pwd`
+    for dir in vendor/*/;
+    do
+      baseDirName=`basename ''${dir}`
+      dirName=vendor/.nimble/pkgs/$baseDirName-\#head
+      echo $dirName
+      mkdir -p $dirName
+
+      packageDir="''${curdir}/vendor/''${baseDirName}"
+      if [ -d "''${packageDir}/src" ]; then
+        packageDir="''${packageDir}/src"
+      fi
+      echo "''${packageDir}" > ''${dirName}/''${baseDirName}.nimble-link
+      echo "''${packageDir}" >> ''${dirName}/''${baseDirName}.nimble-link
+    done
+    '';
+    executable = true;
+  };
+
+in stdenv.mkDerivation rec {
+  pname = "libverifproxy";
+  name = "libverifproxy";
+  src = srcRaw.src;
+  #version = lib.strings.substring 0 7 src.rev;
+  buildInputs = with pkgs; [ wget git which tcl cmake libtool binutils];
+
+  phases = [ "unpackPhase" "preBuildPhase" "buildPhase" "installPhase" ];
+
+  preBuildPhase = ''
+
+    sed -E -i 's|^(LIBBACKTRACE_SED := true.*)|\1\nCMAKE_ARGS := ${cmakeArgs}|g' vendor/nim-libbacktrace/Makefile
+
+    sed -E -i 's|^(.*)(useNews\* = )(.*)|\1\2 false|g' vendor/nim-json-rpc/json_rpc/clients/config.nim
+    sed -E -i 's|(.*XOPEN_SOURCE.*)|#\1|g' vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc/Makefile
+
+    export HOME=$PWD
+
+    ${createNimbleLink}
+
+    ${compilerVars}
+    export PATH=${nimCompiler}/bin:$PATH
+    #export PATH=${pkgs.binutils}/bin:$PATH
+    ln -sf ${pkgs.binutils}/bin/ar bin/ar
+  '';
+
+
+  buildPhase = ''
+    which ar
+    make V=3 OS=${nimHostOs} \
+      CC=clang CXX=clang USE_SYSTEM_NIM=1 \
+      NIMFLAGS="\
+      --passC:\"${compilerFlags}\" \
+      --passL:\"${linkerFlags}\" \
+      --debuginfo:off \
+      --cc:clang \
+      --listcmd \
+      --cpu:${nimCpu} \
+      --os:${nimPlatform} \
+      -d:disableMarchNative" \
+    libverifproxy
+
+    echo "### ls build/libverifproxy"
+    ls -l build/libverifproxy/*
+   '';
+
+  installPhase = ''
+    set -x
+    mkdir -p $out
+    cp libverifproxy* $out/
+    cp build/libverifproxy/verifproxy.h $out/
+    cp build/libverifproxy/nimbase.h $out/
+  '';
+}
+
@@ -1,19 +1,44 @@
-{ callPackage, meta, source, goBuildLdFlags }:
+{ stdenv, callPackage, meta, source, nimbusSource, nimCompiler, goBuildLdFlags }:
+
+let 
+  buildNimbusLc = { platform, targets }: builtins.map
+      (target:
+        let
+          arch =
+            if platform == "ios" then
+              (if target == "iossimulator" && stdenv.hostPlatform.isx86
+              then "x86" else "arm64")
+            else builtins.elemAt (builtins.split "\/" target) 2 ;
+        in
+        callPackage ./buildNimbus.nix {
+          inherit nimCompiler platform arch;
+          srcRaw = nimbusSource;
+        }
+      )
+      targets;
+in {
+
+  #ios-x86 = buildNimbusLc {platform = "ios"; targets = ["ios" "iossimulator"];};
+  ios-x86 = buildNimbusLc {platform = "ios"; targets = ["iossimulator"];};
+  ios-arm = buildNimbusLc {platform = "ios"; targets = ["ios"];};
+  android-arm64 = buildNimbusLc {platform = "android"; targets = ["android/arm64"];};
+  android-arm = buildNimbusLc {platform = "android"; targets = ["android/arm"];};
+

-{
  android = callPackage ./build.nix {
    platform = "android";
    platformVersion = "23";
-    targets = [ "android/arm" "android/arm64" "android/386" ];
+    #targets = [ "android/arm" "android/arm64" "android/386" ];
+    targets = [ "android/arm64" ];
    outputFileName = "status-go-${source.shortRev}.aar";
-    inherit meta source goBuildLdFlags;
+    inherit meta source buildNimbusLc goBuildLdFlags;
  };

  ios = callPackage ./build.nix {
    platform = "ios";
    platformVersion = "8.0";
-    targets = [ "ios" "iossimulator" ];
+    targets = [ "iossimulator" ];
    outputFileName = "Statusgo.xcframework";
-    inherit meta source goBuildLdFlags;
+    inherit meta source buildNimbusLc goBuildLdFlags;
  };
 }
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2000-2017 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1980, 1986, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)route.h	8.3 (Berkeley) 4/19/94
+ * $FreeBSD: src/sys/net/route.h,v 1.36.2.1 2000/08/16 06:14:23 jayanth Exp $
+ */
+
+#ifndef _NET_ROUTE_H_
+#define _NET_ROUTE_H_
+#include <sys/appleapiopts.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+/*
+ * These numbers are used by reliable protocols for determining
+ * retransmission behavior and are included in the routing structure.
+ */
+struct rt_metrics {
+	u_int32_t       rmx_locks;      /* Kernel leaves these values alone */
+	u_int32_t       rmx_mtu;        /* MTU for this path */
+	u_int32_t       rmx_hopcount;   /* max hops expected */
+	int32_t         rmx_expire;     /* lifetime for route, e.g. redirect */
+	u_int32_t       rmx_recvpipe;   /* inbound delay-bandwidth product */
+	u_int32_t       rmx_sendpipe;   /* outbound delay-bandwidth product */
+	u_int32_t       rmx_ssthresh;   /* outbound gateway buffer limit */
+	u_int32_t       rmx_rtt;        /* estimated round trip time */
+	u_int32_t       rmx_rttvar;     /* estimated rtt variance */
+	u_int32_t       rmx_pksent;     /* packets sent using this route */
+	u_int32_t       rmx_state;      /* route state */
+	u_int32_t       rmx_filler[3];  /* will be used for T/TCP later */
+};
+
+/*
+ * rmx_rtt and rmx_rttvar are stored as microseconds;
+ */
+#define RTM_RTTUNIT     1000000 /* units for rtt, rttvar, as units per sec */
+
+
+
+#define RTF_UP          0x1             /* route usable */
+#define RTF_GATEWAY     0x2             /* destination is a gateway */
+#define RTF_HOST        0x4             /* host entry (net otherwise) */
+#define RTF_REJECT      0x8             /* host or net unreachable */
+#define RTF_DYNAMIC     0x10            /* created dynamically (by redirect) */
+#define RTF_MODIFIED    0x20            /* modified dynamically (by redirect) */
+#define RTF_DONE        0x40            /* message confirmed */
+#define RTF_DELCLONE    0x80            /* delete cloned route */
+#define RTF_CLONING     0x100           /* generate new routes on use */
+#define RTF_XRESOLVE    0x200           /* external daemon resolves name */
+#define RTF_LLINFO      0x400           /* DEPRECATED - exists ONLY for backward
+	                                 *  compatibility */
+#define RTF_LLDATA      0x400           /* used by apps to add/del L2 entries */
+#define RTF_STATIC      0x800           /* manually added */
+#define RTF_BLACKHOLE   0x1000          /* just discard pkts (during updates) */
+#define RTF_NOIFREF     0x2000          /* not eligible for RTF_IFREF */
+#define RTF_PROTO2      0x4000          /* protocol specific routing flag */
+#define RTF_PROTO1      0x8000          /* protocol specific routing flag */
+
+#define RTF_PRCLONING   0x10000         /* protocol requires cloning */
+#define RTF_WASCLONED   0x20000         /* route generated through cloning */
+#define RTF_PROTO3      0x40000         /* protocol specific routing flag */
+                                        /* 0x80000 unused */
+#define RTF_PINNED      0x100000        /* future use */
+#define RTF_LOCAL       0x200000        /* route represents a local address */
+#define RTF_BROADCAST   0x400000        /* route represents a bcast address */
+#define RTF_MULTICAST   0x800000        /* route represents a mcast address */
+#define RTF_IFSCOPE     0x1000000       /* has valid interface scope */
+#define RTF_CONDEMNED   0x2000000       /* defunct; no longer modifiable */
+#define RTF_IFREF       0x4000000       /* route holds a ref to interface */
+#define RTF_PROXY       0x8000000       /* proxying, no interface scope */
+#define RTF_ROUTER      0x10000000      /* host is a router */
+#define RTF_DEAD        0x20000000      /* Route entry is being freed */
+                                        /* 0x40000000 and up unassigned */
+
+#define RTPRF_OURS      RTF_PROTO3      /* set on routes we manage */
+#define RTF_BITS \
+	"\020\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE" \
+	"\10DELCLONE\11CLONING\12XRESOLVE\13LLINFO\14STATIC\15BLACKHOLE" \
+	"\16NOIFREF\17PROTO2\20PROTO1\21PRCLONING\22WASCLONED\23PROTO3" \
+	"\25PINNED\26LOCAL\27BROADCAST\30MULTICAST\31IFSCOPE\32CONDEMNED" \
+	"\33IFREF\34PROXY\35ROUTER"
+
+#define IS_DIRECT_HOSTROUTE(rt) \
+	(((rt)->rt_flags & (RTF_HOST | RTF_GATEWAY)) == RTF_HOST)
+/*
+ * Routing statistics.
+ */
+struct  rtstat {
+	short   rts_badredirect;        /* bogus redirect calls */
+	short   rts_dynamic;            /* routes created by redirects */
+	short   rts_newgateway;         /* routes modified by redirects */
+	short   rts_unreach;            /* lookups which failed */
+	short   rts_wildcard;           /* lookups satisfied by a wildcard */
+	short   rts_badrtgwroute;       /* route to gateway is not direct */
+};
+
+/*
+ * Structures for routing messages.
+ */
+struct rt_msghdr {
+	u_short rtm_msglen;     /* to skip over non-understood messages */
+	u_char  rtm_version;    /* future binary compatibility */
+	u_char  rtm_type;       /* message type */
+	u_short rtm_index;      /* index for associated ifp */
+	int     rtm_flags;      /* flags, incl. kern & message, e.g. DONE */
+	int     rtm_addrs;      /* bitmask identifying sockaddrs in msg */
+	pid_t   rtm_pid;        /* identify sender */
+	int     rtm_seq;        /* for sender to identify action */
+	int     rtm_errno;      /* why failed */
+	int     rtm_use;        /* from rtentry */
+	u_int32_t rtm_inits;    /* which metrics we are initializing */
+	struct rt_metrics rtm_rmx; /* metrics themselves */
+};
+
+struct rt_msghdr2 {
+	u_short rtm_msglen;     /* to skip over non-understood messages */
+	u_char  rtm_version;    /* future binary compatibility */
+	u_char  rtm_type;       /* message type */
+	u_short rtm_index;      /* index for associated ifp */
+	int     rtm_flags;      /* flags, incl. kern & message, e.g. DONE */
+	int     rtm_addrs;      /* bitmask identifying sockaddrs in msg */
+	int32_t rtm_refcnt;     /* reference count */
+	int     rtm_parentflags; /* flags of the parent route */
+	int     rtm_reserved;   /* reserved field set to 0 */
+	int     rtm_use;        /* from rtentry */
+	u_int32_t rtm_inits;    /* which metrics we are initializing */
+	struct rt_metrics rtm_rmx; /* metrics themselves */
+};
+
+
+#define RTM_VERSION     5       /* Up the ante and ignore older versions */
+
+/*
+ * Message types.
+ */
+#define RTM_ADD         0x1     /* Add Route */
+#define RTM_DELETE      0x2     /* Delete Route */
+#define RTM_CHANGE      0x3     /* Change Metrics or flags */
+#define RTM_GET         0x4     /* Report Metrics */
+#define RTM_LOSING      0x5     /* RTM_LOSING is no longer generated by xnu
+	                         *  and is deprecated */
+#define RTM_REDIRECT    0x6     /* Told to use different route */
+#define RTM_MISS        0x7     /* Lookup failed on this address */
+#define RTM_LOCK        0x8     /* fix specified metrics */
+#define RTM_OLDADD      0x9     /* caused by SIOCADDRT */
+#define RTM_OLDDEL      0xa     /* caused by SIOCDELRT */
+#define RTM_RESOLVE     0xb     /* req to resolve dst to LL addr */
+#define RTM_NEWADDR     0xc     /* address being added to iface */
+#define RTM_DELADDR     0xd     /* address being removed from iface */
+#define RTM_IFINFO      0xe     /* iface going up/down etc. */
+#define RTM_NEWMADDR    0xf     /* mcast group membership being added to if */
+#define RTM_DELMADDR    0x10    /* mcast group membership being deleted */
+#define RTM_IFINFO2     0x12    /* */
+#define RTM_NEWMADDR2   0x13    /* */
+#define RTM_GET2        0x14    /* */
+
+/*
+ * Bitmask values for rtm_inits and rmx_locks.
+ */
+#define RTV_MTU         0x1     /* init or lock _mtu */
+#define RTV_HOPCOUNT    0x2     /* init or lock _hopcount */
+#define RTV_EXPIRE      0x4     /* init or lock _expire */
+#define RTV_RPIPE       0x8     /* init or lock _recvpipe */
+#define RTV_SPIPE       0x10    /* init or lock _sendpipe */
+#define RTV_SSTHRESH    0x20    /* init or lock _ssthresh */
+#define RTV_RTT         0x40    /* init or lock _rtt */
+#define RTV_RTTVAR      0x80    /* init or lock _rttvar */
+
+/*
+ * Bitmask values for rtm_addrs.
+ */
+#define RTA_DST         0x1     /* destination sockaddr present */
+#define RTA_GATEWAY     0x2     /* gateway sockaddr present */
+#define RTA_NETMASK     0x4     /* netmask sockaddr present */
+#define RTA_GENMASK     0x8     /* cloning mask sockaddr present */
+#define RTA_IFP         0x10    /* interface name sockaddr present */
+#define RTA_IFA         0x20    /* interface addr sockaddr present */
+#define RTA_AUTHOR      0x40    /* sockaddr for author of redirect */
+#define RTA_BRD         0x80    /* for NEWADDR, broadcast or p-p dest addr */
+
+/*
+ * Index offsets for sockaddr array for alternate internal encoding.
+ */
+#define RTAX_DST        0       /* destination sockaddr present */
+#define RTAX_GATEWAY    1       /* gateway sockaddr present */
+#define RTAX_NETMASK    2       /* netmask sockaddr present */
+#define RTAX_GENMASK    3       /* cloning mask sockaddr present */
+#define RTAX_IFP        4       /* interface name sockaddr present */
+#define RTAX_IFA        5       /* interface addr sockaddr present */
+#define RTAX_AUTHOR     6       /* sockaddr for author of redirect */
+#define RTAX_BRD        7       /* for NEWADDR, broadcast or p-p dest addr */
+#define RTAX_MAX        8       /* size of array to allocate */
+
+struct rt_addrinfo {
+	int     rti_addrs;
+	struct  sockaddr *rti_info[RTAX_MAX];
+};
+
+
+#endif /* _NET_ROUTE_H_ */
+
+
@@ -0,0 +1,64 @@
+{ utils, lib, fetchFromGitHub }:
+
+let
+  inherit (lib) strings traceValFn importJSON getConfig;
+
+  srcOverride = getConfig "nimbus-eth1.src-override" null;
+  # Warning message about using local sources
+  localSrcWarn = (path: "Using local nimbus-eth1 sources from ${path}");
+
+  localSrc = rec {
+    owner = "status-im";
+    repo = "nimbus-eth1";
+    rev = "unknown";
+    shortRev = rev;
+    rawVersion = "develop";
+    cleanVersion = rawVersion;
+    goPackagePath = "github.com/${owner}/${repo}";
+    # We use builtins.path so that we can name the resulting derivation,
+    # Normally the name would not be deterministic, taken from the checkout directory.
+    src = builtins.path rec {
+      path = traceValFn localSrcWarn srcOverride;
+      name = "${repo}-source-${shortRev}";
+      # Keep this filter as restrictive as possible in order
+      # to avoid unnecessary rebuilds and limit closure size
+      filter = lib.mkFilter {
+        root = path;
+        include = [ ".*" ];
+        exclude = [
+          ".*/[.]git.*" ".*[.]md" ".*[.]yml" ".*/.*_test.go$"
+          "VERSION" "_assets/.*" "build/.*"
+          ".*/.*LICENSE.*" ".*/CONTRIB.*" ".*/AUTHOR.*"
+        ];
+      };
+    };
+  };
+
+  githubSrc = let
+    owner = "status-im";
+    repo = "nimbus-eth1";
+    # Static lib
+    # rev = "211a0ed1e89bc836a79759e35db4a45f23a79b14";
+    # sha256 = "sha256-Z+PoQMoYJK9ort2ZiXE1oLeoNu2H44HHNnL4pbp+uI8=";
+    # Dynamic lib
+    rev = "1199e476397e271b889e54680dc632e47bc01dd6";
+    sha256 = "sha256-egx+I4h/V/56QRBtlaZffc3hrq7IaZCqL2Lm5XNqH1c=";
+    version = "0.1";
+  in rec {
+    inherit owner repo rev sha256 version;
+    shortRev = strings.substring 0 7 rev;
+    rawVersion = version;
+    cleanVersion = utils.sanitizeVersion version;
+    src = fetchFromGitHub {
+      inherit rev owner repo sha256;
+      name = "${repo}-${shortRev}-source-with-submodules";
+      fetchSubmodules = true;
+    };
+  };
+in
+  if srcOverride != null
+  # If config.status-im.status-go.src-override is defined,
+  # instruct Nix to use that path to build status-go
+  then localSrc
+  # Otherwise grab it from the location defined by status-go-version.json
+  else githubSrc
@@ -1,165 +1,131 @@
 {
-  "fleets": {
-    "eth.prod": {
-      "boot": {
-        "boot-01.ac-cn-hongkong-c.eth.prod": "enode://6e6554fb3034b211398fcd0f0082cbb6bd13619e1a7e76ba66e1809aaa0c5f1ac53c9ae79cf2fd4a7bacb10d12010899b370c75fed19b991d9c0cdd02891abad@47.75.99.169:443",
-        "boot-01.do-ams3.eth.prod": "enode://436cc6f674928fdc9a9f7990f2944002b685d1c37f025c1be425185b5b1f0900feaf1ccc2a6130268f9901be4a7d252f37302c8335a2c1a62736e9232691cc3a@178.128.138.128:443",
-        "boot-01.gc-us-central1-a.eth.prod": "enode://32ff6d88760b0947a3dee54ceff4d8d7f0b4c023c6dad34568615fcae89e26cc2753f28f12485a4116c977be937a72665116596265aa0736b53d46b27446296a@34.70.75.208:443",
-        "boot-02.ac-cn-hongkong-c.eth.prod": "enode://23d0740b11919358625d79d4cac7d50a34d79e9c69e16831c5c70573757a1f5d7d884510bc595d7ee4da3c1508adf87bbc9e9260d804ef03f8c1e37f2fb2fc69@47.52.106.107:443",
-        "boot-02.do-ams3.eth.prod": "enode://5395aab7833f1ecb671b59bf0521cf20224fe8162fc3d2675de4ee4d5636a75ec32d13268fc184df8d1ddfa803943906882da62a4df42d4fccf6d17808156a87@178.128.140.188:443",
-        "boot-02.gc-us-central1-a.eth.prod": "enode://5405c509df683c962e7c9470b251bb679dd6978f82d5b469f1f6c64d11d50fbd5dd9f7801c6ad51f3b20a5f6c7ffe248cc9ab223f8bcbaeaf14bb1c0ef295fd0@35.223.215.156:443"
-      },
-      "mail": {
-        "mail-01.ac-cn-hongkong-c.eth.prod": "enode://606ae04a71e5db868a722c77a21c8244ae38f1bd6e81687cc6cfe88a3063fa1c245692232f64f45bd5408fed5133eab8ed78049332b04f9c110eac7f71c1b429@47.75.247.214:443",
-        "mail-01.do-ams3.eth.prod": "enode://c42f368a23fa98ee546fd247220759062323249ef657d26d357a777443aec04db1b29a3a22ef3e7c548e18493ddaf51a31b0aed6079bd6ebe5ae838fcfaf3a49@178.128.142.54:443",
-        "mail-01.gc-us-central1-a.eth.prod": "enode://ee2b53b0ace9692167a410514bca3024695dbf0e1a68e1dff9716da620efb195f04a4b9e873fb9b74ac84de801106c465b8e2b6c4f0d93b8749d1578bfcaf03e@104.197.238.144:443",
-        "mail-02.ac-cn-hongkong-c.eth.prod": "enode://2c8de3cbb27a3d30cbb5b3e003bc722b126f5aef82e2052aaef032ca94e0c7ad219e533ba88c70585ebd802de206693255335b100307645ab5170e88620d2a81@47.244.221.14:443",
-        "mail-02.do-ams3.eth.prod": "enode://7aa648d6e855950b2e3d3bf220c496e0cae4adfddef3e1e6062e6b177aec93bc6cdcf1282cb40d1656932ebfdd565729da440368d7c4da7dbd4d004b1ac02bf8@178.128.142.26:443",
-        "mail-02.gc-us-central1-a.eth.prod": "enode://30211cbd81c25f07b03a0196d56e6ce4604bb13db773ff1c0ea2253547fafd6c06eae6ad3533e2ba39d59564cfbdbb5e2ce7c137a5ebb85e99dcfc7a75f99f55@23.236.58.92:443",
-        "mail-03.ac-cn-hongkong-c.eth.prod": "enode://e85f1d4209f2f99da801af18db8716e584a28ad0bdc47fbdcd8f26af74dbd97fc279144680553ec7cd9092afe683ddea1e0f9fc571ebcb4b1d857c03a088853d@47.244.129.82:443",
-        "mail-03.do-ams3.eth.prod": "enode://8a64b3c349a2e0ef4a32ea49609ed6eb3364be1110253c20adc17a3cebbc39a219e5d3e13b151c0eee5d8e0f9a8ba2cd026014e67b41a4ab7d1d5dd67ca27427@178.128.142.94:443",
-        "mail-03.gc-us-central1-a.eth.prod": "enode://44160e22e8b42bd32a06c1532165fa9e096eebedd7fa6d6e5f8bbef0440bc4a4591fe3651be68193a7ec029021cdb496cfe1d7f9f1dc69eb99226e6f39a7a5d4@35.225.221.245:443"
-      },
-      "rendezvous": {
-        "boot-01.ac-cn-hongkong-c.eth.prod": "/ip4/47.75.99.169/tcp/30703/ethv4/16Uiu2HAmV8Hq9e3zm9TMVP4zrVHo3BjqW5D6bDVV6VQntQd687e4",
-        "boot-01.do-ams3.eth.prod": "/ip4/178.128.138.128/tcp/30703/ethv4/16Uiu2HAmRHPzF3rQg55PgYPcQkyvPVH9n2hWsYPhUJBZ6kVjJgdV",
-        "boot-01.gc-us-central1-a.eth.prod": "/ip4/34.70.75.208/tcp/30703/ethv4/16Uiu2HAm6ZsERLx2BwVD2UM9SVPnnMU6NBycG8XPtu8qKys5awsU",
-        "boot-02.ac-cn-hongkong-c.eth.prod": "/ip4/47.52.106.107/tcp/30703/ethv4/16Uiu2HAmEHiptiDDd9gqNY8oQqo8hHUWMHJzfwt5aLRdD6W2zcXR",
-        "boot-02.do-ams3.eth.prod": "/ip4/178.128.140.188/tcp/30703/ethv4/16Uiu2HAmLqTXuY4Sb6G28HNooaFUXUKzpzKXCcgyJxgaEE2i5vnf",
-        "boot-02.gc-us-central1-a.eth.prod": "/ip4/35.223.215.156/tcp/30703/ethv4/16Uiu2HAmQEUFE2YaJohavWtHxPTEFv3sEGJtDqvtGEv78DFoEWQF"
-      },
-      "whisper": {
-        "node-01.ac-cn-hongkong-c.eth.prod": "enode://b957e51f41e4abab8382e1ea7229e88c6e18f34672694c6eae389eac22dab8655622bbd4a08192c321416b9becffaab11c8e2b7a5d0813b922aa128b82990dab@47.75.222.178:443",
-        "node-01.do-ams3.eth.prod": "enode://66ba15600cda86009689354c3a77bdf1a97f4f4fb3ab50ffe34dbc904fac561040496828397be18d9744c75881ffc6ac53729ddbd2cdbdadc5f45c400e2622f7@178.128.141.87:443",
-        "node-01.gc-us-central1-a.eth.prod": "enode://182ed5d658d1a1a4382c9e9f7c9e5d8d9fec9db4c71ae346b9e23e1a589116aeffb3342299bdd00e0ab98dbf804f7b2d8ae564ed18da9f45650b444aed79d509@34.68.132.118:443",
-        "node-02.ac-cn-hongkong-c.eth.prod": "enode://8bebe73ddf7cf09e77602c7d04c93a73f455b51f24ae0d572917a4792f1dec0bb4c562759b8830cc3615a658d38c1a4a38597a1d7ae3ba35111479fc42d65dec@47.75.85.212:443",
-        "node-02.do-ams3.eth.prod": "enode://4ea35352702027984a13274f241a56a47854a7fd4b3ba674a596cff917d3c825506431cf149f9f2312a293bb7c2b1cca55db742027090916d01529fe0729643b@134.209.136.79:443",
-        "node-02.gc-us-central1-a.eth.prod": "enode://fbeddac99d396b91d59f2c63a3cb5fc7e0f8a9f7ce6fe5f2eed5e787a0154161b7173a6a73124a4275ef338b8966dc70a611e9ae2192f0f2340395661fad81c0@34.67.230.193:443",
-        "node-03.ac-cn-hongkong-c.eth.prod": "enode://ac3948b2c0786ada7d17b80cf869cf59b1909ea3accd45944aae35bf864cc069126da8b82dfef4ddf23f1d6d6b44b1565c4cf81c8b98022253c6aea1a89d3ce2@47.75.88.12:443",
-        "node-03.do-ams3.eth.prod": "enode://ce559a37a9c344d7109bd4907802dd690008381d51f658c43056ec36ac043338bd92f1ac6043e645b64953b06f27202d679756a9c7cf62fdefa01b2e6ac5098e@134.209.136.123:443",
-        "node-03.gc-us-central1-a.eth.prod": "enode://c07aa0deea3b7056c5d45a85bca42f0d8d3b1404eeb9577610f386e0a4744a0e7b2845ae328efc4aa4b28075af838b59b5b3985bffddeec0090b3b7669abc1f3@35.226.92.155:443",
-        "node-04.ac-cn-hongkong-c.eth.prod": "enode://385579fc5b14e04d5b04af7eee835d426d3d40ccf11f99dbd95340405f37cf3bbbf830b3eb8f70924be0c2909790120682c9c3e791646e2d5413e7801545d353@47.244.221.249:443",
-        "node-04.do-ams3.eth.prod": "enode://4e0a8db9b73403c9339a2077e911851750fc955db1fc1e09f81a4a56725946884dd5e4d11258eac961f9078a393c45bcab78dd0e3bc74e37ce773b3471d2e29c@134.209.136.101:443",
-        "node-04.gc-us-central1-a.eth.prod": "enode://0624b4a90063923c5cc27d12624b6a49a86dfb3623fcb106801217fdbab95f7617b83fa2468b9ae3de593ff6c1cf556ccf9bc705bfae9cb4625999765127b423@35.222.158.246:443",
-        "node-05.ac-cn-hongkong-c.eth.prod": "enode://b77bffc29e2592f30180311dd81204ab845e5f78953b5ba0587c6631be9c0862963dea5eb64c90617cf0efd75308e22a42e30bc4eb3cd1bbddbd1da38ff6483e@47.75.10.177:443",
-        "node-05.do-ams3.eth.prod": "enode://a8bddfa24e1e92a82609b390766faa56cf7a5eef85b22a2b51e79b333c8aaeec84f7b4267e432edd1cf45b63a3ad0fc7d6c3a16f046aa6bc07ebe50e80b63b8c@178.128.141.249:443",
-        "node-05.gc-us-central1-a.eth.prod": "enode://a5fe9c82ad1ffb16ae60cb5d4ffe746b9de4c5fbf20911992b7dd651b1c08ba17dd2c0b27ee6b03162c52d92f219961cc3eb14286aca8a90b75cf425826c3bd8@104.154.230.58:443",
-        "node-06.ac-cn-hongkong-c.eth.prod": "enode://cf5f7a7e64e3b306d1bc16073fba45be3344cb6695b0b616ccc2da66ea35b9f35b3b231c6cf335fdfaba523519659a440752fc2e061d1e5bc4ef33864aac2f19@47.75.221.196:443",
-        "node-06.do-ams3.eth.prod": "enode://887cbd92d95afc2c5f1e227356314a53d3d18855880ac0509e0c0870362aee03939d4074e6ad31365915af41d34320b5094bfcc12a67c381788cd7298d06c875@178.128.141.0:443",
-        "node-06.gc-us-central1-a.eth.prod": "enode://282e009967f9f132a5c2dd366a76319f0d22d60d0c51f7e99795a1e40f213c2705a2c10e4cc6f3890319f59da1a535b8835ed9b9c4b57c3aad342bf312fd7379@35.223.240.17:443",
-        "node-07.ac-cn-hongkong-c.eth.prod": "enode://13d63a1f85ccdcbd2fb6861b9bd9d03f94bdba973608951f7c36e5df5114c91de2b8194d71288f24bfd17908c48468e89dd8f0fb8ccc2b2dedae84acdf65f62a@47.244.210.80:443",
-        "node-07.do-ams3.eth.prod": "enode://2b01955d7e11e29dce07343b456e4e96c081760022d1652b1c4b641eaf320e3747871870fa682e9e9cfb85b819ce94ed2fee1ac458904d54fd0b97d33ba2c4a4@134.209.136.112:443",
-        "node-07.gc-us-central1-a.eth.prod": "enode://b706a60572634760f18a27dd407b2b3582f7e065110dae10e3998498f1ae3f29ba04db198460d83ed6d2bfb254bb06b29aab3c91415d75d3b869cd0037f3853c@35.239.5.162:443",
-        "node-08.ac-cn-hongkong-c.eth.prod": "enode://32915c8841faaef21a6b75ab6ed7c2b6f0790eb177ad0f4ea6d731bacc19b938624d220d937ebd95e0f6596b7232bbb672905ee12601747a12ee71a15bfdf31c@47.75.59.11:443",
-        "node-08.do-ams3.eth.prod": "enode://0d9d65fcd5592df33ed4507ce862b9c748b6dbd1ea3a1deb94e3750052760b4850aa527265bbaf357021d64d5cc53c02b410458e732fafc5b53f257944247760@178.128.141.42:443",
-        "node-08.gc-us-central1-a.eth.prod": "enode://e87f1d8093d304c3a9d6f1165b85d6b374f1c0cc907d39c0879eb67f0a39d779be7a85cbd52920b6f53a94da43099c58837034afa6a7be4b099bfcd79ad13999@35.238.106.101:443"
-      }
+    "fleets": {
+        "eth.prod": {
+            "boot": {
+                "boot-01.ac-cn-hongkong-c.eth.prod": "enode://6e6554fb3034b211398fcd0f0082cbb6bd13619e1a7e76ba66e1809aaa0c5f1ac53c9ae79cf2fd4a7bacb10d12010899b370c75fed19b991d9c0cdd02891abad@47.75.99.169:443",
+                "boot-01.do-ams3.eth.prod": "enode://436cc6f674928fdc9a9f7990f2944002b685d1c37f025c1be425185b5b1f0900feaf1ccc2a6130268f9901be4a7d252f37302c8335a2c1a62736e9232691cc3a@178.128.138.128:443",
+                "boot-01.gc-us-central1-a.eth.prod": "enode://32ff6d88760b0947a3dee54ceff4d8d7f0b4c023c6dad34568615fcae89e26cc2753f28f12485a4116c977be937a72665116596265aa0736b53d46b27446296a@34.70.75.208:443",
+                "boot-02.ac-cn-hongkong-c.eth.prod": "enode://23d0740b11919358625d79d4cac7d50a34d79e9c69e16831c5c70573757a1f5d7d884510bc595d7ee4da3c1508adf87bbc9e9260d804ef03f8c1e37f2fb2fc69@47.52.106.107:443",
+                "boot-02.do-ams3.eth.prod": "enode://5395aab7833f1ecb671b59bf0521cf20224fe8162fc3d2675de4ee4d5636a75ec32d13268fc184df8d1ddfa803943906882da62a4df42d4fccf6d17808156a87@178.128.140.188:443",
+                "boot-02.gc-us-central1-a.eth.prod": "enode://5405c509df683c962e7c9470b251bb679dd6978f82d5b469f1f6c64d11d50fbd5dd9f7801c6ad51f3b20a5f6c7ffe248cc9ab223f8bcbaeaf14bb1c0ef295fd0@35.223.215.156:443"
+            },
+            "mail": {
+                "mail-01.ac-cn-hongkong-c.eth.prod": "enode://606ae04a71e5db868a722c77a21c8244ae38f1bd6e81687cc6cfe88a3063fa1c245692232f64f45bd5408fed5133eab8ed78049332b04f9c110eac7f71c1b429@47.75.247.214:443",
+                "mail-01.do-ams3.eth.prod": "enode://c42f368a23fa98ee546fd247220759062323249ef657d26d357a777443aec04db1b29a3a22ef3e7c548e18493ddaf51a31b0aed6079bd6ebe5ae838fcfaf3a49@178.128.142.54:443",
+                "mail-01.gc-us-central1-a.eth.prod": "enode://ee2b53b0ace9692167a410514bca3024695dbf0e1a68e1dff9716da620efb195f04a4b9e873fb9b74ac84de801106c465b8e2b6c4f0d93b8749d1578bfcaf03e@104.197.238.144:443",
+                "mail-02.ac-cn-hongkong-c.eth.prod": "enode://2c8de3cbb27a3d30cbb5b3e003bc722b126f5aef82e2052aaef032ca94e0c7ad219e533ba88c70585ebd802de206693255335b100307645ab5170e88620d2a81@47.244.221.14:443",
+                "mail-02.do-ams3.eth.prod": "enode://7aa648d6e855950b2e3d3bf220c496e0cae4adfddef3e1e6062e6b177aec93bc6cdcf1282cb40d1656932ebfdd565729da440368d7c4da7dbd4d004b1ac02bf8@178.128.142.26:443",
+                "mail-02.gc-us-central1-a.eth.prod": "enode://30211cbd81c25f07b03a0196d56e6ce4604bb13db773ff1c0ea2253547fafd6c06eae6ad3533e2ba39d59564cfbdbb5e2ce7c137a5ebb85e99dcfc7a75f99f55@23.236.58.92:443",
+                "mail-03.ac-cn-hongkong-c.eth.prod": "enode://e85f1d4209f2f99da801af18db8716e584a28ad0bdc47fbdcd8f26af74dbd97fc279144680553ec7cd9092afe683ddea1e0f9fc571ebcb4b1d857c03a088853d@47.244.129.82:443",
+                "mail-03.do-ams3.eth.prod": "enode://8a64b3c349a2e0ef4a32ea49609ed6eb3364be1110253c20adc17a3cebbc39a219e5d3e13b151c0eee5d8e0f9a8ba2cd026014e67b41a4ab7d1d5dd67ca27427@178.128.142.94:443",
+                "mail-03.gc-us-central1-a.eth.prod": "enode://44160e22e8b42bd32a06c1532165fa9e096eebedd7fa6d6e5f8bbef0440bc4a4591fe3651be68193a7ec029021cdb496cfe1d7f9f1dc69eb99226e6f39a7a5d4@35.225.221.245:443"
+            },
+            "rendezvous": {
+                "boot-01.ac-cn-hongkong-c.eth.prod": "/ip4/47.75.99.169/tcp/30703/ethv4/16Uiu2HAmV8Hq9e3zm9TMVP4zrVHo3BjqW5D6bDVV6VQntQd687e4",
+                "boot-01.do-ams3.eth.prod": "/ip4/178.128.138.128/tcp/30703/ethv4/16Uiu2HAmRHPzF3rQg55PgYPcQkyvPVH9n2hWsYPhUJBZ6kVjJgdV",
+                "boot-01.gc-us-central1-a.eth.prod": "/ip4/34.70.75.208/tcp/30703/ethv4/16Uiu2HAm6ZsERLx2BwVD2UM9SVPnnMU6NBycG8XPtu8qKys5awsU",
+                "boot-02.ac-cn-hongkong-c.eth.prod": "/ip4/47.52.106.107/tcp/30703/ethv4/16Uiu2HAmEHiptiDDd9gqNY8oQqo8hHUWMHJzfwt5aLRdD6W2zcXR",
+                "boot-02.do-ams3.eth.prod": "/ip4/178.128.140.188/tcp/30703/ethv4/16Uiu2HAmLqTXuY4Sb6G28HNooaFUXUKzpzKXCcgyJxgaEE2i5vnf",
+                "boot-02.gc-us-central1-a.eth.prod": "/ip4/35.223.215.156/tcp/30703/ethv4/16Uiu2HAmQEUFE2YaJohavWtHxPTEFv3sEGJtDqvtGEv78DFoEWQF"
+            },
+            "whisper": {
+                "node-01.ac-cn-hongkong-c.eth.prod": "enode://b957e51f41e4abab8382e1ea7229e88c6e18f34672694c6eae389eac22dab8655622bbd4a08192c321416b9becffaab11c8e2b7a5d0813b922aa128b82990dab@47.75.222.178:443",
+                "node-01.do-ams3.eth.prod": "enode://66ba15600cda86009689354c3a77bdf1a97f4f4fb3ab50ffe34dbc904fac561040496828397be18d9744c75881ffc6ac53729ddbd2cdbdadc5f45c400e2622f7@178.128.141.87:443",
+                "node-01.gc-us-central1-a.eth.prod": "enode://182ed5d658d1a1a4382c9e9f7c9e5d8d9fec9db4c71ae346b9e23e1a589116aeffb3342299bdd00e0ab98dbf804f7b2d8ae564ed18da9f45650b444aed79d509@34.68.132.118:443",
+                "node-02.ac-cn-hongkong-c.eth.prod": "enode://8bebe73ddf7cf09e77602c7d04c93a73f455b51f24ae0d572917a4792f1dec0bb4c562759b8830cc3615a658d38c1a4a38597a1d7ae3ba35111479fc42d65dec@47.75.85.212:443",
+                "node-02.do-ams3.eth.prod": "enode://4ea35352702027984a13274f241a56a47854a7fd4b3ba674a596cff917d3c825506431cf149f9f2312a293bb7c2b1cca55db742027090916d01529fe0729643b@134.209.136.79:443",
+                "node-02.gc-us-central1-a.eth.prod": "enode://fbeddac99d396b91d59f2c63a3cb5fc7e0f8a9f7ce6fe5f2eed5e787a0154161b7173a6a73124a4275ef338b8966dc70a611e9ae2192f0f2340395661fad81c0@34.67.230.193:443",
+                "node-03.ac-cn-hongkong-c.eth.prod": "enode://ac3948b2c0786ada7d17b80cf869cf59b1909ea3accd45944aae35bf864cc069126da8b82dfef4ddf23f1d6d6b44b1565c4cf81c8b98022253c6aea1a89d3ce2@47.75.88.12:443",
+                "node-03.do-ams3.eth.prod": "enode://ce559a37a9c344d7109bd4907802dd690008381d51f658c43056ec36ac043338bd92f1ac6043e645b64953b06f27202d679756a9c7cf62fdefa01b2e6ac5098e@134.209.136.123:443",
+                "node-03.gc-us-central1-a.eth.prod": "enode://c07aa0deea3b7056c5d45a85bca42f0d8d3b1404eeb9577610f386e0a4744a0e7b2845ae328efc4aa4b28075af838b59b5b3985bffddeec0090b3b7669abc1f3@35.226.92.155:443",
+                "node-04.ac-cn-hongkong-c.eth.prod": "enode://385579fc5b14e04d5b04af7eee835d426d3d40ccf11f99dbd95340405f37cf3bbbf830b3eb8f70924be0c2909790120682c9c3e791646e2d5413e7801545d353@47.244.221.249:443",
+                "node-04.do-ams3.eth.prod": "enode://4e0a8db9b73403c9339a2077e911851750fc955db1fc1e09f81a4a56725946884dd5e4d11258eac961f9078a393c45bcab78dd0e3bc74e37ce773b3471d2e29c@134.209.136.101:443",
+                "node-04.gc-us-central1-a.eth.prod": "enode://0624b4a90063923c5cc27d12624b6a49a86dfb3623fcb106801217fdbab95f7617b83fa2468b9ae3de593ff6c1cf556ccf9bc705bfae9cb4625999765127b423@35.222.158.246:443",
+                "node-05.ac-cn-hongkong-c.eth.prod": "enode://b77bffc29e2592f30180311dd81204ab845e5f78953b5ba0587c6631be9c0862963dea5eb64c90617cf0efd75308e22a42e30bc4eb3cd1bbddbd1da38ff6483e@47.75.10.177:443",
+                "node-05.do-ams3.eth.prod": "enode://a8bddfa24e1e92a82609b390766faa56cf7a5eef85b22a2b51e79b333c8aaeec84f7b4267e432edd1cf45b63a3ad0fc7d6c3a16f046aa6bc07ebe50e80b63b8c@178.128.141.249:443",
+                "node-05.gc-us-central1-a.eth.prod": "enode://a5fe9c82ad1ffb16ae60cb5d4ffe746b9de4c5fbf20911992b7dd651b1c08ba17dd2c0b27ee6b03162c52d92f219961cc3eb14286aca8a90b75cf425826c3bd8@104.154.230.58:443",
+                "node-06.ac-cn-hongkong-c.eth.prod": "enode://cf5f7a7e64e3b306d1bc16073fba45be3344cb6695b0b616ccc2da66ea35b9f35b3b231c6cf335fdfaba523519659a440752fc2e061d1e5bc4ef33864aac2f19@47.75.221.196:443",
+                "node-06.do-ams3.eth.prod": "enode://887cbd92d95afc2c5f1e227356314a53d3d18855880ac0509e0c0870362aee03939d4074e6ad31365915af41d34320b5094bfcc12a67c381788cd7298d06c875@178.128.141.0:443",
+                "node-06.gc-us-central1-a.eth.prod": "enode://282e009967f9f132a5c2dd366a76319f0d22d60d0c51f7e99795a1e40f213c2705a2c10e4cc6f3890319f59da1a535b8835ed9b9c4b57c3aad342bf312fd7379@35.223.240.17:443",
+                "node-07.ac-cn-hongkong-c.eth.prod": "enode://13d63a1f85ccdcbd2fb6861b9bd9d03f94bdba973608951f7c36e5df5114c91de2b8194d71288f24bfd17908c48468e89dd8f0fb8ccc2b2dedae84acdf65f62a@47.244.210.80:443",
+                "node-07.do-ams3.eth.prod": "enode://2b01955d7e11e29dce07343b456e4e96c081760022d1652b1c4b641eaf320e3747871870fa682e9e9cfb85b819ce94ed2fee1ac458904d54fd0b97d33ba2c4a4@134.209.136.112:443",
+                "node-07.gc-us-central1-a.eth.prod": "enode://b706a60572634760f18a27dd407b2b3582f7e065110dae10e3998498f1ae3f29ba04db198460d83ed6d2bfb254bb06b29aab3c91415d75d3b869cd0037f3853c@35.239.5.162:443",
+                "node-08.ac-cn-hongkong-c.eth.prod": "enode://32915c8841faaef21a6b75ab6ed7c2b6f0790eb177ad0f4ea6d731bacc19b938624d220d937ebd95e0f6596b7232bbb672905ee12601747a12ee71a15bfdf31c@47.75.59.11:443",
+                "node-08.do-ams3.eth.prod": "enode://0d9d65fcd5592df33ed4507ce862b9c748b6dbd1ea3a1deb94e3750052760b4850aa527265bbaf357021d64d5cc53c02b410458e732fafc5b53f257944247760@178.128.141.42:443",
+                "node-08.gc-us-central1-a.eth.prod": "enode://e87f1d8093d304c3a9d6f1165b85d6b374f1c0cc907d39c0879eb67f0a39d779be7a85cbd52920b6f53a94da43099c58837034afa6a7be4b099bfcd79ad13999@35.238.106.101:443"
+            }
+        },
+        "eth.staging": {
+            "boot": {
+                "boot-01.ac-cn-hongkong-c.eth.staging": "enode://630b0342ca4e9552f50714b6c8e28d6955bc0fd14e7950f93bc3b2b8cc8c1f3b6d103df66f51a13d773b5db0f130661fb5c7b8fa21c48890c64c79b41a56a490@47.91.229.44:443",
+                "boot-01.do-ams3.eth.staging": "enode://f79fb3919f72ca560ad0434dcc387abfe41e0666201ebdada8ede0462454a13deb05cda15f287d2c4bd85da81f0eb25d0a486bbbc8df427b971ac51533bd00fe@174.138.107.239:443",
+                "boot-01.gc-us-central1-a.eth.staging": "enode://10a78c17929a7019ef4aa2249d7302f76ae8a06f40b2dc88b7b31ebff4a623fbb44b4a627acba296c1ced3775d91fbe18463c15097a6a36fdb2c804ff3fc5b35@35.238.97.234:443"
+            },
+            "mail": {
+                "mail-01.ac-cn-hongkong-c.eth.staging": "enode://b74859176c9751d314aeeffc26ec9f866a412752e7ddec91b19018a18e7cca8d637cfe2cedcb972f8eb64d816fbd5b4e89c7e8c7fd7df8a1329fa43db80b0bfe@47.52.90.156:443",
+                "mail-01.do-ams3.eth.staging": "enode://69f72baa7f1722d111a8c9c68c39a31430e9d567695f6108f31ccb6cd8f0adff4991e7fdca8fa770e75bc8a511a87d24690cbc80e008175f40c157d6f6788d48@206.189.240.16:443",
+                "mail-01.gc-us-central1-a.eth.staging": "enode://e4fc10c1f65c8aed83ac26bc1bfb21a45cc1a8550a58077c8d2de2a0e0cd18e40fd40f7e6f7d02dc6cd06982b014ce88d6e468725ffe2c138e958788d0002a7f@35.239.193.41:443"
+            },
+            "rendezvous": {
+                "boot-01.ac-cn-hongkong-c.eth.staging": "/ip4/47.91.229.44/tcp/30703/ethv4/16Uiu2HAmRnt2Eyoknh3auxh4fJwkRgqkH1gqrWGes8Pk1k3MV4xu",
+                "boot-01.do-ams3.eth.staging": "/ip4/174.138.107.239/tcp/30703/ethv4/16Uiu2HAm8UZXUHEPZrpJbcQ3yVFH6UtKrwsG6jH4ai72PsbLfVFb",
+                "boot-01.gc-us-central1-a.eth.staging": "/ip4/35.238.97.234/tcp/30703/ethv4/16Uiu2HAm6G9sDMkrB4Xa5EH3Zx2dysCxFgBTSRzghic3Z9tRFRNE"
+            },
+            "whisper": {
+                "node-01.ac-cn-hongkong-c.eth.staging": "enode://088cf5a93c576fae52f6f075178467b8ff98bacf72f59e88efb16dfba5b30f80a4db78f8e3cb3d87f2f6521746ef4a8768465ef2896c6af24fd77a425e95b6dd@47.52.226.137:443",
+                "node-01.do-ams3.eth.staging": "enode://914c0b30f27bab30c1dfd31dad7652a46fda9370542aee1b062498b1345ee0913614b8b9e3e84622e84a7203c5858ae1d9819f63aece13ee668e4f6668063989@167.99.19.148:443",
+                "node-01.gc-us-central1-a.eth.staging": "enode://d3878441652f010326889f28360e69f2d09d06540f934fada0e17b374ce5319de64279aba3c44a5bf807d9967c6d705b3b4c6b03fa70763240e2ee6af01a539e@35.192.0.86:443"
+            }
+        },
+        "eth.test": {
+            "boot": {
+                "boot-01.ac-cn-hongkong-c.eth.test": "enode://daae2e72820e86e942fa2a8aa7d6e9954d4043a753483d8bd338e16be82cf962392d5c0e1ae57c3d793c3d3dddd8fd58339262e4234dc966f953cd73b535f5fa@47.52.188.149:443",
+                "boot-01.do-ams3.eth.test": "enode://9e0988575eb7717c25dea72fd11c7b37767dc09c1a7686f7c2ec577d308d24b377ceb675de4317474a1a870e47882732967f4fa785b02ba95d669b31d464dec0@206.189.243.164:443",
+                "boot-01.gc-us-central1-a.eth.test": "enode://c1e5018887c863d64e431b69bf617561087825430e4401733f5ba77c70db14236df381fefb0ebe1ac42294b9e261bbe233dbdb83e32c586c66ae26c8de70cb4c@35.188.168.137:443"
+            },
+            "mail": {
+                "mail-01.ac-cn-hongkong-c.eth.test": "enode://619dbb5dda12e85bf0eb5db40fb3de625609043242737c0e975f7dfd659d85dc6d9a84f9461a728c5ab68c072fed38ca6a53917ca24b8e93cc27bdef3a1e79ac@47.52.188.196:443",
+                "mail-01.do-ams3.eth.test": "enode://e4865fe6c2a9c1a563a6447990d8e9ce672644ae3e08277ce38ec1f1b690eef6320c07a5d60c3b629f5d4494f93d6b86a745a0bf64ab295bbf6579017adc6ed8@206.189.243.161:443",
+                "mail-01.gc-us-central1-a.eth.test": "enode://707e57453acd3e488c44b9d0e17975371e2f8fb67525eae5baca9b9c8e06c86cde7c794a6c2e36203bf9f56cae8b0e50f3b33c4c2b694a7baeea1754464ce4e3@35.192.229.172:443"
+            },
+            "rendezvous": {
+                "boot-01.ac-cn-hongkong-c.eth.test": "/ip4/47.52.188.149/tcp/30703/ethv4/16Uiu2HAm9Vatqr4GfVCqnyeaPtCF3q8fz8kDDUgqXVfFG7ZfSA7w",
+                "boot-01.do-ams3.eth.test": "/ip4/206.189.243.164/tcp/30703/ethv4/16Uiu2HAmBCh5bgYr6V3fDuLqUzvtSAsFTQJCQ3TVHT8ta8bTu2Jm",
+                "boot-01.gc-us-central1-a.eth.test": "/ip4/35.188.168.137/tcp/30703/ethv4/16Uiu2HAm3MUqtGjmetyZ9L4SN2R8oHDWvACUcec25LjtDD5euiRH"
+            },
+            "whisper": {
+                "node-01.ac-cn-hongkong-c.eth.test": "enode://ad38f94030a846cc7005b7a1f3b6b01bf4ef59d34e8d3d6f4d12df23d14ba8656702a435d34cf4df3b412c0c1923df5adcce8461321a0d8ffb9435b26e572c2a@47.52.255.194:443",
+                "node-01.do-ams3.eth.test": "enode://1d193635e015918fb85bbaf774863d12f65d70c6977506187ef04420d74ec06c9e8f0dcb57ea042f85df87433dab17a1260ed8dde1bdf9d6d5d2de4b7bf8e993@206.189.243.163:443",
+                "node-01.gc-us-central1-a.eth.test": "enode://f593a27731bc0f8eb088e2d39222c2d59dfb9bf0b3950d7a828d51e8ab9e08fffbd9916a82fd993c1a080c57c2bd70ed6c36f489a969de697aff93088dbee1a9@35.194.31.108:443"
+            }
+        },
+        "wakuv2.prod": {
+            "waku": {
+                "node-01.ac-cn-hongkong-c.wakuv2.prod": "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
+                "node-01.do-ams3.wakuv2.prod": "/ip4/188.166.135.145/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+                "node-01.gc-us-central1-a.wakuv2.prod": "/ip4/34.121.100.108/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
+            },
+            "waku-websocket": {
+                "node-01.ac-cn-hongkong-c.wakuv2.prod": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
+                "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+                "node-01.gc-us-central1-a.wakuv2.prod": "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
+            }
+        },
+        "wakuv2.test": {
+            "waku": {
+                "node-01.ac-cn-hongkong-c.wakuv2.test": "/ip4/47.242.210.73/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
+                "node-01.do-ams3.wakuv2.test": "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+                "node-01.gc-us-central1-a.wakuv2.test": "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
+            },
+            "waku-websocket": {
+                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
+                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
+            }
+        }
    },
-    "eth.staging": {
-      "boot": {
-        "boot-01.ac-cn-hongkong-c.eth.staging": "enode://630b0342ca4e9552f50714b6c8e28d6955bc0fd14e7950f93bc3b2b8cc8c1f3b6d103df66f51a13d773b5db0f130661fb5c7b8fa21c48890c64c79b41a56a490@47.91.229.44:443",
-        "boot-01.do-ams3.eth.staging": "enode://f79fb3919f72ca560ad0434dcc387abfe41e0666201ebdada8ede0462454a13deb05cda15f287d2c4bd85da81f0eb25d0a486bbbc8df427b971ac51533bd00fe@174.138.107.239:443",
-        "boot-01.gc-us-central1-a.eth.staging": "enode://10a78c17929a7019ef4aa2249d7302f76ae8a06f40b2dc88b7b31ebff4a623fbb44b4a627acba296c1ced3775d91fbe18463c15097a6a36fdb2c804ff3fc5b35@35.238.97.234:443"
-      },
-      "mail": {
-        "mail-01.ac-cn-hongkong-c.eth.staging": "enode://b74859176c9751d314aeeffc26ec9f866a412752e7ddec91b19018a18e7cca8d637cfe2cedcb972f8eb64d816fbd5b4e89c7e8c7fd7df8a1329fa43db80b0bfe@47.52.90.156:443",
-        "mail-01.do-ams3.eth.staging": "enode://69f72baa7f1722d111a8c9c68c39a31430e9d567695f6108f31ccb6cd8f0adff4991e7fdca8fa770e75bc8a511a87d24690cbc80e008175f40c157d6f6788d48@206.189.240.16:443",
-        "mail-01.gc-us-central1-a.eth.staging": "enode://e4fc10c1f65c8aed83ac26bc1bfb21a45cc1a8550a58077c8d2de2a0e0cd18e40fd40f7e6f7d02dc6cd06982b014ce88d6e468725ffe2c138e958788d0002a7f@35.239.193.41:443"
-      },
-      "rendezvous": {
-        "boot-01.ac-cn-hongkong-c.eth.staging": "/ip4/47.91.229.44/tcp/30703/ethv4/16Uiu2HAmRnt2Eyoknh3auxh4fJwkRgqkH1gqrWGes8Pk1k3MV4xu",
-        "boot-01.do-ams3.eth.staging": "/ip4/174.138.107.239/tcp/30703/ethv4/16Uiu2HAm8UZXUHEPZrpJbcQ3yVFH6UtKrwsG6jH4ai72PsbLfVFb",
-        "boot-01.gc-us-central1-a.eth.staging": "/ip4/35.238.97.234/tcp/30703/ethv4/16Uiu2HAm6G9sDMkrB4Xa5EH3Zx2dysCxFgBTSRzghic3Z9tRFRNE"
-      },
-      "whisper": {
-        "node-01.ac-cn-hongkong-c.eth.staging": "enode://088cf5a93c576fae52f6f075178467b8ff98bacf72f59e88efb16dfba5b30f80a4db78f8e3cb3d87f2f6521746ef4a8768465ef2896c6af24fd77a425e95b6dd@47.52.226.137:443",
-        "node-01.do-ams3.eth.staging": "enode://914c0b30f27bab30c1dfd31dad7652a46fda9370542aee1b062498b1345ee0913614b8b9e3e84622e84a7203c5858ae1d9819f63aece13ee668e4f6668063989@167.99.19.148:443",
-        "node-01.gc-us-central1-a.eth.staging": "enode://d3878441652f010326889f28360e69f2d09d06540f934fada0e17b374ce5319de64279aba3c44a5bf807d9967c6d705b3b4c6b03fa70763240e2ee6af01a539e@35.192.0.86:443"
-      }
-    },
-    "eth.test": {
-      "boot": {
-        "boot-01.ac-cn-hongkong-c.eth.test": "enode://daae2e72820e86e942fa2a8aa7d6e9954d4043a753483d8bd338e16be82cf962392d5c0e1ae57c3d793c3d3dddd8fd58339262e4234dc966f953cd73b535f5fa@47.52.188.149:443",
-        "boot-01.do-ams3.eth.test": "enode://9e0988575eb7717c25dea72fd11c7b37767dc09c1a7686f7c2ec577d308d24b377ceb675de4317474a1a870e47882732967f4fa785b02ba95d669b31d464dec0@206.189.243.164:443",
-        "boot-01.gc-us-central1-a.eth.test": "enode://c1e5018887c863d64e431b69bf617561087825430e4401733f5ba77c70db14236df381fefb0ebe1ac42294b9e261bbe233dbdb83e32c586c66ae26c8de70cb4c@35.188.168.137:443"
-      },
-      "mail": {
-        "mail-01.ac-cn-hongkong-c.eth.test": "enode://619dbb5dda12e85bf0eb5db40fb3de625609043242737c0e975f7dfd659d85dc6d9a84f9461a728c5ab68c072fed38ca6a53917ca24b8e93cc27bdef3a1e79ac@47.52.188.196:443",
-        "mail-01.do-ams3.eth.test": "enode://e4865fe6c2a9c1a563a6447990d8e9ce672644ae3e08277ce38ec1f1b690eef6320c07a5d60c3b629f5d4494f93d6b86a745a0bf64ab295bbf6579017adc6ed8@206.189.243.161:443",
-        "mail-01.gc-us-central1-a.eth.test": "enode://707e57453acd3e488c44b9d0e17975371e2f8fb67525eae5baca9b9c8e06c86cde7c794a6c2e36203bf9f56cae8b0e50f3b33c4c2b694a7baeea1754464ce4e3@35.192.229.172:443"
-      },
-      "rendezvous": {
-        "boot-01.ac-cn-hongkong-c.eth.test": "/ip4/47.52.188.149/tcp/30703/ethv4/16Uiu2HAm9Vatqr4GfVCqnyeaPtCF3q8fz8kDDUgqXVfFG7ZfSA7w",
-        "boot-01.do-ams3.eth.test": "/ip4/206.189.243.164/tcp/30703/ethv4/16Uiu2HAmBCh5bgYr6V3fDuLqUzvtSAsFTQJCQ3TVHT8ta8bTu2Jm",
-        "boot-01.gc-us-central1-a.eth.test": "/ip4/35.188.168.137/tcp/30703/ethv4/16Uiu2HAm3MUqtGjmetyZ9L4SN2R8oHDWvACUcec25LjtDD5euiRH"
-      },
-      "whisper": {
-        "node-01.ac-cn-hongkong-c.eth.test": "enode://ad38f94030a846cc7005b7a1f3b6b01bf4ef59d34e8d3d6f4d12df23d14ba8656702a435d34cf4df3b412c0c1923df5adcce8461321a0d8ffb9435b26e572c2a@47.52.255.194:443",
-        "node-01.do-ams3.eth.test": "enode://1d193635e015918fb85bbaf774863d12f65d70c6977506187ef04420d74ec06c9e8f0dcb57ea042f85df87433dab17a1260ed8dde1bdf9d6d5d2de4b7bf8e993@206.189.243.163:443",
-        "node-01.gc-us-central1-a.eth.test": "enode://f593a27731bc0f8eb088e2d39222c2d59dfb9bf0b3950d7a828d51e8ab9e08fffbd9916a82fd993c1a080c57c2bd70ed6c36f489a969de697aff93088dbee1a9@35.194.31.108:443"
-      }
-    },
-    "status.prod": {
-      "waku": {
-        "node-01.ac-cn-hongkong-c.status.prod": "/dns4/node-01.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkvEZgh3KLwhLwXg95e5ojM8XykJ4Kxi2T7hk22rnA7pJC",
-        "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
-        "node-01.gc-us-central1-a.status.prod": "/dns4/node-01.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkwBp8T6G77kQXSNMnxgaMky1JeyML5yqoTHRM8dbeCBNb",
-        "node-02.ac-cn-hongkong-c.status.prod": "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8",
-        "node-02.do-ams3.status.prod": "/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV",
-        "node-02.gc-us-central1-a.status.prod": "/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg"
-      },
-      "waku-websocket": {
-        "node-01.ac-cn-hongkong-c.status.prod": "/dns4/node-01.ac-cn-hongkong-c.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvEZgh3KLwhLwXg95e5ojM8XykJ4Kxi2T7hk22rnA7pJC",
-        "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
-        "node-01.gc-us-central1-a.status.prod": "/dns4/node-01.gc-us-central1-a.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkwBp8T6G77kQXSNMnxgaMky1JeyML5yqoTHRM8dbeCBNb",
-        "node-02.ac-cn-hongkong-c.status.prod": "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8",
-        "node-02.do-ams3.status.prod": "/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV",
-        "node-02.gc-us-central1-a.status.prod": "/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg"
-      },
-      "waku-nodes": ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.nodes.status.im"]
-    },
-    "status.test": {
-      "waku": {
-        "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi",
-        "node-01.do-ams3.status.test": "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
-        "node-01.gc-us-central1-a.status.test": "/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76"
-      },
-      "waku-websocket": {
-        "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi",
-        "node-01.do-ams3.status.test": "/dns4/node-01.do-ams3.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkukebeXjTQ9QDBeNDWuGfbaSg79wkkhK4vPocLgR6QFDf",
-        "node-01.gc-us-central1-a.status.test": "/dns4/node-01.gc-us-central1-a.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmGDX3iAFox93PupVYaHa88kULGqMpJ7AEHGwj3jbMtt76"
-      },
-      "waku-nodes": ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.nodes.status.im"]
-    },
-    "wakuv2.prod": {
-      "waku": {
-        "node-01.ac-cn-hongkong-c.wakuv2.prod": "/ip4/8.210.222.231/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
-        "node-01.do-ams3.wakuv2.prod": "/ip4/188.166.135.145/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-        "node-01.gc-us-central1-a.wakuv2.prod": "/ip4/34.121.100.108/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
-      },
-      "waku-websocket": {
-        "node-01.ac-cn-hongkong-c.wakuv2.prod": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
-        "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
-        "node-01.gc-us-central1-a.wakuv2.prod": "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA"
-      },
-      "waku-nodes": ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.waku.nodes.status.im"]
-    },
-    "wakuv2.test": {
-      "waku": {
-        "node-01.ac-cn-hongkong-c.wakuv2.test": "/ip4/47.242.210.73/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-        "node-01.do-ams3.wakuv2.test": "/ip4/134.209.139.210/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-        "node-01.gc-us-central1-a.wakuv2.test": "/ip4/104.154.239.128/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
-      },
-      "waku-websocket": {
-        "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm",
-        "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
-        "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS"
-      },
-      "waku-nodes": ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.waku.nodes.status.im"]
+    "meta": {
+        "hostname": "node-01.do-ams3.proxy.misc",
+        "timestamp": "2021-06-07T00:00:09.836740"
    }
-  },
-  "meta": {
-    "hostname": "node-01.do-ams3.proxy.misc",
-    "timestamp": "2021-06-07T00:00:09.836740"
-  }
 }
@@ -4,29 +4,25 @@
            [react-native.core :as rn]))

 (def sizes
-  {:icon      {:small  12
-               :medium 16
-               :large  20}
-   :container {:small  20
+  {:icon {:small 12
+          :medium 16
+          :large 20}
+   :container {:small 20
               :medium 32
-               :large  48}})
+               :large 48}})

-;; TODO: this implementation does not support group display picture (can only display default group icon).
 (defn group-avatar [_]
-  (fn [{:keys [color size]}]
-    (let [container-size (get-in sizes [:container size])
-          icon-size      (get-in sizes [:icon size])
-          ;; theme          (or override-theme (if (colors/dark?) :dark :light))
-          ]
+  (fn [{:keys [color size override-theme]}]
+    (let [theme          (or override-theme (if (colors/dark?) :dark :light))
+          container-size (get-in sizes [:container size])
+          icon-size      (get-in sizes [:icon size])]
      [rn/view {:width            container-size
                :height           container-size
                :align-items      :center
                :justify-content  :center
                :border-radius    (/ container-size 2)
-                :background-color color
-                ;; :background-color (if (= theme :light) TODO: colors/custom-color method here is not working for some reason.
-                ;;                    (colors/custom-color color 50)
-                ;;                    (colors/custom-color color 60))
-                }
-       [icon/icon :i/group {:size  icon-size ; TODO: group icon sizes 12 and 20 (small and large) are missing
-                            :color colors/white-opa-70}]])))
+                :background-color (if (= theme :light)
+                                    (colors/custom-color color 50)
+                                    (colors/custom-color color 60))}
+       [icon/icon :total-members {:size icon-size
+                                  :color colors/white-opa-70}]])))
@@ -6,49 +6,10 @@
   [quo2.components.counter.counter :as counter]
   [quo2.components.icon :as icons]
   [quo2.components.community.style :as style]
-   [react-native.fast-image :as fast-image]
   [react-native.core :as rn]))

-(defn community-icon-view [community-icon]
-  [rn/view {:width  32
-            :height 32}
-   [fast-image/fast-image {:source {:uri community-icon}
-                           :style  {:height        32
-                                    :border-radius 16
-                                    :width         32}}]])
-
-(defn notification-view [{:keys [muted?
-                                 unread-messages?
-                                 unread-mentions-count]}]
-  (cond
-    muted?
-    [icons/icon :i/muted {:container-style {:align-items     :center
-                                            :justify-content :center}
-                          :resize-mode     :center
-                          :size            20
-                          :color           (colors/theme-colors
-                                            colors/neutral-40
-                                            colors/neutral-50)}]
-    (pos? unread-mentions-count)
-    [counter/counter {:type :default} unread-mentions-count]
-
-    unread-messages?
-    [rn/view {:style {:width            8
-                      :height           8
-                      :border-radius    4
-                      :background-color (colors/theme-colors
-                                         colors/neutral-40
-                                         colors/neutral-60)}}]))
-
-(defn communities-list-view-item [props {:keys [name
-                                                locked?
-                                                status
-                                                muted?
-                                                unread-messages?
-                                                unread-mentions-count
-                                                community-icon
-                                                tokens
-                                                background-color]}]
+(defn communities-list-view-item [props {:keys [name locked? status notifications
+                                                tokens background-color]}]
  [rn/view {:style (merge (style/community-card 16)
                          {:margin-bottom     12
                           :margin-horizontal 20})}
@@ -63,8 +24,8 @@
               :padding-vertical   8
               :background-color   background-color}
      [rn/view]
-      (when community-icon
-        [community-icon-view community-icon])
+       ;;TODO new pure component based on quo2 should be implemented without status-im usage
+       ;[communities.icon/community-icon-redesign community 32]]
      [rn/view {:flex              1
                :margin-horizontal 12}
       [text/text {:weight              :semi-bold
@@ -72,7 +33,7 @@
                   :accessibility-label :community-name-text
                   :number-of-lines     1
                   :ellipsize-mode      :tail
-                   :style               {:color (when muted?
+                   :style               {:color (when (= notifications :muted)
                                                  (colors/theme-colors
                                                   colors/neutral-40
                                                   colors/neutral-60))}}
@@ -81,18 +42,28 @@
      (if (= status :gated)
        [community-view/permission-tag-container {:locked? locked?
                                                  :tokens  tokens}]
-        [notification-view {:muted?                muted?
-                            :unread-mentions-count unread-mentions-count
-                            :unread-messages?      unread-messages?}])]]]])
+        (cond
+          (= notifications :unread-messages-count)
+          [rn/view {:style {:width            8
+                            :height           8
+                            :border-radius    4
+                            :background-color (colors/theme-colors
+                                               colors/neutral-40
+                                               colors/neutral-60)}}]

-(defn communities-membership-list-item [props {:keys [name
-                                                      muted?
-                                                      unread-messages?
-                                                      unread-mentions-count
-                                                      status
-                                                      community-icon
-                                                      tokens
-                                                      locked?]}]
+          (= notifications :unread-mentions-count)
+          [counter/counter {:type :default} 5]
+
+          (= notifications :muted)
+          [icons/icon :i/muted {:container-style {:align-items     :center
+                                                  :justify-content :center}
+                                :resize-mode     :center
+                                :size            20
+                                :color           (colors/theme-colors
+                                                  colors/neutral-40
+                                                  colors/neutral-50)}]))]]]])
+
+(defn communities-membership-list-item [props {:keys [name status tokens locked?]}]
  [rn/view {:margin-bottom 20}
   [rn/touchable-highlight (merge {:underlay-color colors/primary-50-opa-5
                                   :style          {:border-radius 12}}
@@ -101,9 +72,8 @@
     [rn/view {:flex-direction :row
               :border-radius  16
               :align-items    :center}
-
-      (when community-icon
-        [community-icon-view community-icon])
+      ;;TODO new pure component based on quo2 should be implemented without status-im usage
+      ;[communities.icon/community-icon-redesign community 32]
      [rn/view {:flex            1
                :margin-left     12
                :justify-content :center}
@@ -114,12 +84,8 @@
         :weight              :semi-bold
         :size                :paragraph-1}
        name]]
-
-      [rn/view {:justify-content :center
-                :margin-right    16}
-       (if (= status :gated)
+      (when (= status :gated)
+        [rn/view {:justify-content :center
+                  :margin-right    12}
         [community-view/permission-tag-container {:locked? locked?
-                                                   :tokens  tokens}]
-         [notification-view {:muted?                muted?
-                             :unread-mentions-count unread-mentions-count
-                             :unread-messages?      unread-messages?}])]]]]])
+                                                   :tokens  tokens}]])]]]])
@@ -138,14 +138,13 @@
    (fn [{:keys [left-accessories left-component border-bottom
                 right-accessories right-component insets get-layout
                 title subtitle title-component style title-align
-                 background header-style]
+                 background]
          :or   {title-align   :center
                 border-bottom false}}]
      (let [status-bar-height (get insets :top 0)
            height            (+ header-height status-bar-height)]
        [reanimated/view {:style (header-wrapper-style {:height        height
                                                        :background    background
-                                                        :header-style  header-style
                                                        :border-bottom border-bottom})}
         [rn/view {:pointer-events :box-none
                   :height         status-bar-height}]
@@ -1,15 +0,0 @@
-(ns quo2.components.list-items.index
-  (:require [quo.react-native :as rn]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
-
-(defn index [{:keys [title]}]
-  [rn/view
-   [rn/view {:style {:border-top-width           1
-                     :border-color               (colors/theme-colors colors/neutral-10 colors/neutral-80)
-                     :padding-vertical           8
-                     :padding-horizontal         16}}
-    [text/text {:weight          :medium
-                :size            :paragraph-2
-                :secondary-color (colors/theme-colors colors/neutral-50 colors/neutral-40)}
-     title]]])
@@ -1,276 +0,0 @@
-(ns quo2.components.list-items.list-item
-  (:require [quo.react-native :as rn]
-            [quo.platform :as platform]
-            [quo.haptic :as haptic]
-            [quo.gesture-handler :as gh]
-            [quo.design-system.spacing :as spacing]
-            [quo.design-system.colors :as quo.colors]
-            [quo.components.controls.view :as controls]
-            [quo.components.tooltip :as tooltip]
-            [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.icon :as quo2.icons]
-            [quo.components.animated.pressable :as animated]))
-
-(defn themes [theme]
-  (case theme
-    :main {:icon-color         (:icon-04 @quo.colors/theme)
-           :icon-bg-color      (:interactive-02 @quo.colors/theme)
-           :active-background  (:interactive-02 @quo.colors/theme)
-           :passive-background (:ui-background @quo.colors/theme)
-           :text-color         (:text-01 @quo.colors/theme)}
-    :accent {:icon-color         (:icon-04 @quo.colors/theme)
-             :icon-bg-color      (:interactive-02 @quo.colors/theme)
-             :active-background  (:interactive-02 @quo.colors/theme)
-             :passive-background (:ui-background @quo.colors/theme)
-             :text-color         (:text-04 @quo.colors/theme)}
-    :negative {:icon-color         (:negative-01 @quo.colors/theme)
-               :icon-bg-color      (:negative-02 @quo.colors/theme)
-               :active-background  (:negative-02 @quo.colors/theme)
-               :passive-background (:ui-background @quo.colors/theme)
-               :text-color         (:negative-01 @quo.colors/theme)}
-    :positive {:icon-color         (:positive-01 @quo.colors/theme)
-               :icon-bg-color      (:positive-02 @quo.colors/theme)
-               :active-background  (:positive-02 @quo.colors/theme)
-               :passive-background (:ui-background @quo.colors/theme)
-               :text-color         (:positive-01 @quo.colors/theme)}
-    :disabled {:icon-color         (:icon-02 @quo.colors/theme)
-               :icon-bg-color      (:ui-01 @quo.colors/theme)
-               :active-background  (:ui-01 @quo.colors/theme)
-               :passive-background (:ui-background @quo.colors/theme)
-               :text-color         (:text-02 @quo.colors/theme)}))
-
-(defn size->icon-size [size]
-  (case size
-    :small 36
-    40))
-
-(defn size->container-size [size]
-  (case size
-    :small 52
-    64))
-
-(defn size->single-title-size [size]
-  (case size
-    :small :paragraph-1
-    :paragraph-1))
-
-(defn container [{:keys [size container-style container-padding-horizontal container-padding-vertical]} & children]
-  (into [rn/view {:style (merge (or container-padding-horizontal (:tiny spacing/padding-horizontal))
-                                {:min-height       (size->container-size size)
-                                 :padding-vertical (or container-padding-vertical 8)
-                                 :flex-direction   :row
-                                 :align-items      :center
-                                 :justify-content  :space-between} container-style)}]
-        children))
-
-(defn icon-column
-  [{:keys [icon icon-bg-color icon-color size icon-container-style]}]
-  (when icon
-    (let [icon-size (size->icon-size size)]
-      [rn/view {:style (or icon-container-style (:tiny spacing/padding-horizontal))}
-       (cond
-         (vector? icon)
-         icon
-         (keyword? icon)
-         [rn/view {:style {:width            icon-size
-                           :height           icon-size
-                           :align-items      :center
-                           :justify-content  :center
-                           :border-radius    (/ icon-size 2)
-                           :background-color icon-bg-color}}
-          (quo2.icons/icon icon {:color icon-color})])])))
-
-(defn title-column
-  [{:keys [title text-color subtitle subtitle-max-lines subtitle-secondary
-           title-accessibility-label size text-size title-text-weight
-           right-side-present? title-column-style]}]
-  [rn/view {:style (or title-column-style
-                       (merge (:tiny spacing/padding-horizontal)
-                          ;; make left-side title grow if nothing is present on right-side
-                              (when-not right-side-present?
-                                {:flex            1
-                                 :justify-content :center})))}
-   (cond
-
-     (and title subtitle)
-     [:<>
-      ;; FIXME(Ferossgp): ReactNative 63 will support view inside text on andrid, remove thess if when migrating
-      (if (string? title)
-        [text/text {:weight              (or title-text-weight :medium)
-                    :style               {:color text-color}
-                    :accessibility-label title-accessibility-label
-                    :ellipsize-mode      :tail
-                    :number-of-lines     1
-                    :size                text-size}
-         title]
-        title)
-      (if (string? subtitle-secondary)
-        [rn/view {:flex-direction :row}
-         [text/text {:style {:max-width "56.5%"}
-                     :weight          :regular
-                     :color           :secondary
-                     :ellipsize-mode  :tail
-                     :secondary-color colors/neutral-50
-                     :number-of-lines subtitle-max-lines
-                     :size            text-size}
-          subtitle]
-         [text/text {:style {:width "7%" :text-align :center}
-                     :weight          :regular
-                     :color           :secondary
-                     :ellipsize-mode  :middle
-                     :secondary-color colors/neutral-50
-                     :number-of-lines subtitle-max-lines
-                     :size            text-size}
-          "•"]
-         [text/text {:style {:max-width "36.5%"}
-                     :weight          :regular
-                     :color           :secondary
-                     :ellipsize-mode  :middle
-                     :secondary-color colors/neutral-50
-                     :number-of-lines subtitle-max-lines
-                     :size            text-size}
-          subtitle-secondary]]
-        (if (string? subtitle)
-          [text/text {:weight          :regular
-                      :color           :secondary
-                      :ellipsize-mode  :tail
-                      :secondary-color colors/neutral-50
-                      :number-of-lines subtitle-max-lines
-                      :size            text-size}
-           subtitle]
-          subtitle))]
-
-     title
-     (if (string? title)
-       [text/text {:weight                    (or title-text-weight :regular)
-                   :number-of-lines           1
-                   :style                     {:color text-color}
-                   :title-accessibility-label title-accessibility-label
-                   :ellipsize-mode            :tail
-                   :size                      (or text-size (size->single-title-size size))}
-        title]
-       title))])
-
-(defn left-side [props]
-  [rn/view {:style {:flex-direction :row
-                    ;; Occupy only content width, never grow, but shrink if need be
-                    :flex-grow      0
-                    :flex-shrink    1
-                    :padding-right  16
-                    :align-items    (or (:left-side-alignment props) :center)}}
-   [icon-column props]
-   [title-column props]])
-
-(defn right-side [{:keys [chevron active disabled accessory accessory-text accessory-style animated-accessory?]}]
-  (when (or chevron accessory)
-    [rn/view {:style (merge {:align-items     :center
-                             :justify-content :flex-end
-                             :flex-direction  :row
-                             ;; Grow to occupy full space, shrink when need be, but always maitaining 16px left gutter
-                             :flex-grow       1
-                             :flex-shrink     0
-                             :margin-left     16
-                             ;; When the left-side leaves no room for right-side, the rendered element is pushed out. A flex-basis ensures that there is some room reserved.
-                             ;; The number 80px was determined by trial and error.
-                             :flex-basis      80}
-                            accessory-style)}
-     [rn/view {:style (:tiny spacing/padding-horizontal)}
-      (case accessory
-        :radio    [controls/radio {:value active :disabled disabled}]
-        :checkbox [(if animated-accessory?
-                     controls/animated-checkbox
-                     controls/checkbox)
-                   {:value active :disabled disabled}]
-        :switch   [controls/switch {:value active :disabled disabled}]
-        :text     [text/text {:color           :secondary
-                              :ellipsize-mode  :middle
-                              :number-of-lines 1}
-                   accessory-text]
-        accessory)]
-     (when (and chevron platform/ios?)
-       [rn/view {:style {:padding-right (:tiny spacing/spacing)}}
-        (quo2.icons/icon :main-icons/next {:container-style {:opacity         0.4
-                                                       :align-items     :center
-                                                       :justify-content :center}
-                                     :resize-mode     :center
-                                     :color           (:icon-02 @quo.colors/theme)})])]))
-
-(defn list-item
-  [{:keys [theme accessory disabled subtitle-max-lines icon icon-container-style
-           left-side-alignment icon-color icon-bg-color title-column-style
-           title subtitle subtitle-secondary active on-press on-long-press chevron size text-size
-           accessory-text accessibility-label title-accessibility-label accessory-style
-           haptic-feedback text-color active-background passive-background haptic-type error animated animated-accessory? title-text-weight container-style
-           active-background-enabled background-color container-padding-horizontal container-padding-vertical]
-    :or   {subtitle-max-lines        1
-           theme                     :main
-           haptic-feedback           true
-           animated                  platform/ios?
-           active-background-enabled true
-           haptic-type               :selection}}]
-  (let [theme           (if disabled :disabled theme)
-        icon-color      (or icon-color (:icon-color (themes theme)))
-        icon-bg-color   (or icon-bg-color (:icon-bg-color (themes theme)))
-        optional-haptic (fn []
-                          (when haptic-feedback
-                            (haptic/trigger haptic-type)))
-        component       (cond
-                          (and (not on-press)
-                               (not on-long-press))
-                          rn/view
-                          animated animated/pressable
-                          :else    gh/touchable-highlight)]
-    [rn/view {:background-color (cond (not= background-color nil)
-                                      background-color
-                                      (and (= accessory :radio) active)
-                                      active-background
-                                      :else
-                                      passive-background)}
-     [component
-      (merge {:type                :list-item
-              :disabled            disabled
-              :bg-color            (when active-background-enabled active-background)
-              :accessibility-label accessibility-label}
-             (when on-press
-               {:on-press (fn []
-                            (optional-haptic)
-                            (on-press))})
-             (when on-long-press
-               {:on-long-press (fn []
-                                 (optional-haptic)
-                                 (on-long-press))}))
-      [container {:size size :container-style container-style :container-padding-vertical container-padding-vertical :container-padding-horizontal container-padding-horizontal}
-       [left-side {:icon-color                icon-color
-                   :text-color                (if on-press
-                                                text-color
-                                                (:text-color (themes :main)))
-                   :left-side-alignment       left-side-alignment
-                   :icon-bg-color             icon-bg-color
-                   :title-accessibility-label title-accessibility-label
-                   :icon                      icon
-                   :icon-container-style      icon-container-style
-                   :title                     title
-                   :title-text-weight         title-text-weight
-                   :size                      size
-                   :text-size                 text-size
-                   :subtitle                  subtitle
-                   :subtitle-max-lines        subtitle-max-lines
-                   :subtitle-secondary        subtitle-secondary
-                   :right-side-present?       (or accessory chevron)
-                   :title-column-style        title-column-style}]
-       [right-side {:chevron             chevron
-                    :active              active
-                    :disabled            disabled
-                    :on-press            on-press
-                    :accessory-text      accessory-text
-                    :animated-accessory? animated-accessory?
-                    :accessory-style     accessory-style
-                    :accessory           accessory}]]]
-     (when error
-       [tooltip/tooltip (merge {:bottom-value 0}
-                               (when accessibility-label
-                                 {:accessibility-label (str (name accessibility-label) "-error")}))
-        [text/text {:color :negative
-                    :size  :small}
-         error]])]))
@@ -1,10 +1,11 @@
 (ns quo2.components.markdown.text
  (:require [react-native.core :as rn]
+            [quo2.theme :as theme]
            [quo2.foundations.colors :as colors]
            [quo2.foundations.typography :as typography]
            [reagent.core :as reagent]))

-(defn text-style [{:keys [size align weight style secondary-color]}]
+(defn text-style [{:keys [size align weight style]}]
  (merge (case (or weight :regular)
           :regular   typography/font-regular
           :medium    typography/font-medium
@@ -23,8 +24,7 @@
         {:text-align (or align :auto)}
         (if (:color style)
           style
-           (assoc style :color (or secondary-color
-                                   (colors/theme-colors colors/neutral-100 colors/white))))))
+           (assoc style :color (if (= (theme/get-theme) :dark) colors/white colors/neutral-100)))))

 (defn text []
  (let [this  (reagent/current-component)
@@ -1,270 +0,0 @@
-(ns quo2.components.markdown.text-input
-  (:require [clojure.spec.alpha :as s]
-            [reagent.core :as reagent]
-            [oops.core :refer [ocall]]
-            [quo.react-native :as rn]
-            ;; TODO(Ferossgp): Move icon component to lib
-            [status-im.ui.components.icons.icons :as icons]
-            [quo.components.tooltip :as tooltip]
-            [quo.platform :as platform]
-            [quo.design-system.typography :as typography]
-            [quo.design-system.spacing :as spacing]
-            [quo.design-system.colors :as colors]
-            [quo.components.text :as text]))
-
-;; NOTE(Ferossgp): Refactor with hooks when available
-;; We track all currently mounted text input refs
-;; in a ref-to-defaultValue map
-;; so that we can clear them (restore their default values)
-;; when global react-navigation's onWillBlur event is invoked
-(defonce text-input-refs (atom {}))
-
-(s/def ::multiline boolean?)
-(s/def ::secure-text-entry boolean?)
-(s/def ::show-cancel boolean?)
-(s/def ::label (s/nilable (s/or :string string? :component vector?)))
-(s/def ::cancel-label (s/nilable string?))
-(s/def ::default-value (s/nilable string?))
-(s/def ::placeholder (s/nilable string?))
-(s/def ::keyboard-type (s/nilable (s/or :string string? :keyword keyword?))) ; TODO: make set
-(s/def ::accessibility-label (s/nilable (s/or :string string? :keyword keyword?)))
-(s/def ::on-focus fn?)
-(s/def ::on-blur fn?)
-(s/def ::on-press fn?)
-
-(s/def ::accessory (s/keys :opt-un [::on-press
-                                    ::icon
-                                    ::component]))
-(s/def ::after (s/nilable ::accessory))
-(s/def ::before (s/nilable ::accessory))
-
-(s/def ::style (s/nilable map?))
-(s/def ::input-style ::style)
-(s/def ::container-style ::style)
-
-(s/def ::text-input (s/keys :opt-un
-                            [::label
-                             ::multiline
-                             ::error
-                             ::style
-                             ::input-style
-                             ::keyboard-type
-                             ::before
-                             ::after
-                             ::cancel-label
-                             ::on-focus
-                             ::on-blur
-                             ::container-style
-                             ::show-cancel
-                             ::accessibility-label
-                             ::bottom-value
-                             ::secure-text-entry]))
-
-(defn check-spec [spec prop]
-  (if (s/valid? spec prop)
-    true
-    (do
-      (s/explain spec prop)
-      false)))
-
-(def height 44)                         ; 22 line-height + 11*2 vertical padding
-(def multiline-height 88)               ; 3 * 22 three line-height + 11* vertical padding
-
-(defn label-style []
-  {:margin-bottom (:tiny spacing/spacing)})
-
-(defn text-input-row-style []
-  {:flex-direction :row
-   :align-items    :center})
-
-(defn text-input-view-style [style]
-  (merge {:border-radius    8
-          :flex-direction   :row
-          :flex             1
-          :align-items      :center
-          :background-color (:ui-01 @colors/theme)}
-         style))
-
-(defn text-input-style [multiline input-style monospace before after]
-  (merge (if monospace
-           typography/monospace
-           typography/font-regular)
-         {:padding-top         11
-          :padding-bottom      11
-          :font-size           15
-          :margin              0
-          :text-align-vertical :center
-          :flex                1
-          :color               (:text-01 @colors/theme)
-          :height              height}
-         (when-not before
-           {:padding-left (:base spacing/spacing)})
-         (when-not after
-           {:padding-right (:base spacing/spacing)})
-         (when multiline
-           {:text-align-vertical :top
-            :line-height         22
-            :height              multiline-height})
-         input-style))
-
-(defn cancel-style []
-  {:margin-left     (:tiny spacing/spacing)
-   :padding-left    (:tiny spacing/spacing)
-   :justify-content :center
-   :align-self      :stretch})
-
-(defn accessory-style []
-  (merge (:base spacing/padding-horizontal)
-         {:flex            1
-          :justify-content :center}))
-
-(defn accessory-element [{:keys [icon component icon-opts style accessibility-label on-press]}]
-  (let [el (if on-press
-             rn/touchable-opacity
-             rn/view)]
-    [el (merge {:style {:align-self :stretch}}
-               (when on-press
-                 {:on-press on-press}))
-     [rn/view (merge {:style (merge (accessory-style)
-                                    style)}
-                     (when accessibility-label
-                       {:accessibility-label accessibility-label}))
-      (cond
-        icon
-        [icons/icon icon (merge {:color (:icon-01 @colors/theme)}
-                                icon-opts)]
-        component
-        component
-
-        :else
-        nil)]]))
-
-(defn text-input-raw []
-  (let [focused (reagent/atom nil)
-        visible (reagent/atom false)
-        ref     (atom nil)
-        blur    (fn []
-                  (some-> @ref (ocall "blur")))]
-    (fn [{:keys [label multiline error style input-style keyboard-type before after
-                 cancel-label on-focus on-blur show-cancel accessibility-label
-                 bottom-value secure-text-entry container-style get-ref on-cancel
-                 monospace auto-complete-type auto-correct]
-          :or  {cancel-label "Cancel"}
-          :as  props}]
-      {:pre [(check-spec ::text-input props)]}
-      (let [show-cancel (if (nil? show-cancel)
-                          ;; Enabled by default on iOs and disabled on Android
-                          platform/ios?
-                          show-cancel)
-            after       (cond
-                          (and secure-text-entry @visible)
-                          {:icon     :main-icons/hide
-                           :on-press #(reset! visible false)}
-
-                          (and secure-text-entry (not @visible))
-                          {:icon     :main-icons/show
-                           :on-press #(reset! visible true)}
-
-                          :else after)
-            secure        (boolean (and secure-text-entry (not @visible))) ; must be a boolean to work on iOS
-            auto-complete (cond
-                            (= keyboard-type :visible-password)
-                            :off
-
-                            secure-text-entry
-                            :password
-
-                            :else
-                            auto-complete-type)
-            auto-correct  (and (not= keyboard-type :visible-password) (not secure-text-entry) auto-correct)
-            on-cancel     (fn []
-                            (when on-cancel
-                              (on-cancel))
-                            (blur))
-            keyboard-type (cond
-                            (and platform/ios? (= keyboard-type :visible-password))
-                            :default
-
-                            ; the correct approach on Android would be keep secure-text-entry on set keyboard type
-                            ; to visible-password. But until https://github.com/facebook/react-native/issues/27946
-                            ; is solved that's the second best way.
-                            (and platform/android? secure-text-entry)
-                            :default
-
-                            :else
-                            keyboard-type)]
-        [rn/view {:style container-style}
-         (when label
-           [text/text {:style (label-style)}
-            label])
-         [rn/view {:style (text-input-row-style)}
-          [rn/view {:style                       (text-input-view-style style)
-                    :important-for-accessibility (if secure-text-entry
-                                                   :no-hide-descendants
-                                                   :auto)}
-           (when before
-             [accessory-element before])
-           [rn/text-input
-            (merge {:style                   (text-input-style multiline input-style monospace before after)
-                    :ref                     (fn [r]
-                                               (reset! ref r)
-                                               (when get-ref (get-ref r)))
-                    :placeholder-text-color  (:text-02 @colors/theme)
-                    :underline-color-android :transparent
-                    :auto-capitalize         :none
-                    :secure-text-entry       secure
-                    :auto-correct            auto-correct
-                    :auto-complete-type      auto-complete
-                    :on-focus                (fn [evt]
-                                               (when on-focus (on-focus evt))
-                                               (when show-cancel
-                                                 (rn/configure-next (:ease-in-ease-out rn/layout-animation-presets)))
-                                               (reset! focused true))
-                    :on-blur                 (fn [evt]
-                                               (when on-blur (on-blur evt))
-                                               (when show-cancel
-                                                 (rn/configure-next (:ease-in-ease-out rn/layout-animation-presets)))
-                                               (reset! focused false))
-                    :keyboard-type           keyboard-type}
-                   (when (and platform/ios? (not after))
-                     {:clear-button-mode :while-editing})
-                   (dissoc props
-                           :style :keyboard-type :on-focus :on-blur
-                           :secure-text-entry :ref :get-ref :auto-correct :auto-complete-type))]
-           (when after
-             [accessory-element after])]
-          (when (and show-cancel
-                     (not multiline)
-                     @focused)
-            [rn/touchable-opacity {:style    (cancel-style)
-                                   :on-press on-cancel}
-             [text/text {:color :link} cancel-label]])
-          (when error
-            [tooltip/tooltip (merge {:bottom-value (if bottom-value bottom-value 0)}
-                                    (when accessibility-label
-                                      {:accessibility-label (str (name accessibility-label) "-error")}))
-             [text/text {:color :negative
-                         :align :center
-                         :size  :small}
-              error]])]]))))
-
-;; TODO(Ferossgp): Refactor me when hooks available
-(defn text-input [{:keys [preserve-input?]
-                   :as   props}]
-  (if preserve-input?
-    [text-input-raw props]
-    (let [id (random-uuid)]
-      (reagent/create-class
-       {:component-will-unmount
-        (fn []
-          (swap! text-input-refs dissoc id))
-        :reagent-render
-        (fn [{:keys [get-ref default-value]
-              :as   props}]
-          [text-input-raw (merge props
-                                 {:get-ref (fn [r]
-                                             ;; Store input and its defaultValue
-                                             ;; one we receive a non-nil ref
-                                             (when r
-                                               (swap! text-input-refs assoc id  {:ref r :value default-value}))
-                                             (when get-ref (get-ref r)))})])}))))
@@ -33,9 +33,7 @@
            quo2.components.notifications.notification-dot
            quo2.components.tags.tags
            quo2.components.tabs.tabs
-            quo2.components.tabs.account-selector
-            quo2.components.list-items.index
-            quo2.components.list-items.list-item))
+            quo2.components.tabs.account-selector))

 (def button quo2.components.buttons.button/button)
 (def dynamic-button quo2.components.buttons.dynamic-button/dynamic-button)
@@ -82,8 +80,6 @@
 (def channel-list-item quo2.components.list-items.channel/list-item)
 (def menu-item quo2.components.list-items.menu-item/menu-item)
 (def preview-list quo2.components.list-items.preview-list/preview-list)
-(def index quo2.components.list-items.index/index)
-(def list-item quo2.components.list-items.list-item/list-item)

 ;;;; NOTIFICATIONS
 (def activity-log quo2.components.notifications.activity-logs/activity-log)
@@ -91,11 +91,6 @@
 (def white-opa-90 (alpha white 0.9))
 (def white-opa-95 (alpha white 0.95))

-;;;;Black
-
-;;Solid
-(def black "#000000")
-
 ;;;;Primary

 ;;Solid
@@ -110,7 +110,7 @@
    :blank-keycard-title
    :block
    :block-contact
-    :block-user-confirmation
+    :block-contact-details
    :blocked-users
    :bootnode-address
    :bootnode-details
@@ -22,7 +22,7 @@
               ::logout                              nil
               ::multiaccounts/webview-debug-changed false
               :keychain/clear-user-password         key-uid
-               :setup/open-multiaccounts             #(re-frame/dispatch [:setup/initialize-multiaccounts % {:logout? logout?}])}
+               ::init/open-multiaccounts             #(re-frame/dispatch [::init/initialize-multiaccounts % {:logout? logout?}])}
              (keychain/save-auth-method key-uid auth-method)
              (wallet/clear-timeouts)
              (init/initialize-app-db))))
@@ -1,444 +0,0 @@
-(ns status-im.navigation.core
-  (:require
-   ["react-native" :as rn]
-   ["react-native-gesture-handler" :refer (gestureHandlerRootHOC)]
-   ["react-native-navigation" :refer (Navigation)]
-   [clojure.set :as clojure.set]
-   [quo.components.text-input :as quo.text-input]
-   [quo.design-system.colors :as quo.colors]
-   [re-frame.core :as re-frame]
-   [status-im.multiaccounts.login.core :as login-core]
-   [status-im.navigation.roots :as roots]
-   [status-im.navigation.state :as state]
-   [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.encore :as enc]
-   [taoensso.timbre :as log]))
-
-(def debug? ^boolean js/goog.DEBUG)
-
-(def splash-screen (-> rn .-NativeModules .-SplashScreen))
-
-(defonce set-navigation-default-options
-  (.setDefaultOptions Navigation (clj->js {:layout {:orientation "portrait"}})))
-
-;; 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)]
-      (.registerComponent Navigation key (fn [] (gestureHandlerRootHOC screen)) (fn [] screen)))))
-
-(defonce rset-lazy-reg
-  (.setLazyComponentRegistrator Navigation reg-comp))
-
-(defn dismiss-all-modals []
-  (log/debug "dissmiss-all-modals")
-  (when @state/curr-modal
-    (reset! state/curr-modal false)
-    (reset! state/dissmissing true)
-    (doseq [modal @state/modals]
-      (.dismissModal Navigation (name modal)))
-    (reset! state/modals [])))
-
-;; PUSH SCREEN
-(defn navigate [comp]
-  (log/debug "NAVIGATE" comp)
-  (let [{:keys [options]} (get views/screens comp)]
-    (.push Navigation
-           (name @state/root-comp-id)
-           (clj->js {:component {:id      comp
-                                 :name    comp
-                                 :options (merge options
-                                                 (roots/status-bar-options)
-                                                 (roots/merge-top-bar (roots/topbar-options) options))}}))
-    ;;if we push the screen from modal, we want to dismiss all modals
-    (dismiss-all-modals)))
-
-;; 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
-                               :title           {:color quo.colors/black}
-                               :background      {:color quo.colors/white}
-                               :leftButtonColor quo.colors/black
-                               :leftButtons     {:id   "dismiss-modal"
-                                                 :icon (icons/icon-source :main-icons/close)}}
-                              options)))
-
-(defn open-modal [comp]
-  (log/debug "open-modal" comp)
-  (let [{:keys [options]} (get views/screens comp)]
-    (if @state/dissmissing
-      (reset! state/dissmissing comp)
-      (do
-        (reset! state/curr-modal true)
-        (swap! state/modals conj comp)
-        (.showModal Navigation
-                    (clj->js {:stack {:children
-                                      [{:component
-                                        {:name    comp
-                                         :id      comp
-                                         :options (update-modal-topbar-options
-                                                   (merge (roots/status-bar-options)
-                                                          (roots/default-root)
-                                                          options))}}]}}))))))
-
-(re-frame/reg-fx :open-modal-fx open-modal)
-
-;; DISSMISS MODAL
-(defn dissmissModal []
-  (log/debug "dissmissModal")
-  (reset! state/dissmissing true)
-  (.dismissModal Navigation (name (last @state/modals))))
-
-(defonce register-nav-button-reg
-  (.registerNavigationButtonPressedListener
-   (.events Navigation)
-   (fn [^js evn]
-     (let [id (.-buttonId evn)]
-       (if (= "dismiss-modal" id)
-         (do
-           (when-let [event (get-in views/screens [(last @state/modals) :on-dissmiss])]
-             (re-frame/dispatch event))
-           (dissmissModal))
-         (when-let [handler (get-in views/screens [(keyword id) :right-handler])]
-           (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])
-    (when on-focus
-      (re-frame/dispatch on-focus))))
-
-(defonce register-modal-reg
-  (.registerModalDismissedListener
-   (.events Navigation)
-   (fn [_]
-     (if (> (count @state/modals) 1)
-       (let [new-modals (butlast @state/modals)]
-         (reset! state/modals (vec new-modals))
-         (set-view-id (last new-modals)))
-       (do
-         (reset! state/modals [])
-         (reset! state/curr-modal false)
-         (set-view-id @state/pushed-screen-id)))
-
-     (let [comp @state/dissmissing]
-       (reset! state/dissmissing false)
-       (when (keyword? comp)
-         (open-modal comp))))))
-
-;; SCREEN DID APPEAR
-(defonce screen-appear-reg
-  (.registerComponentDidAppearListener
-   (.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))
-           (set-view-id view-id)
-           (when-not @state/curr-modal
-             (reset! state/pushed-screen-id view-id))))))))
-
-;; SCREEN DID DISAPPEAR
-(defonce screen-disappear-reg
-  (.registerComponentDidDisappearListener
-   (.events Navigation)
-   (fn [^js evn]
-     (let [view-id (keyword (.-componentName evn))]
-       (when-not (#{"popover" "bottom-sheet" "signing-sheet" "visibility-status-popover" "wallet-connect-sheet" "wallet-connect-success-sheet" "wallet-connect-app-management-sheet"}
-                  (.-componentName evn))
-         (re-frame/dispatch [::view-disappeared view-id])
-         (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]
-           (.setNativeProps text-input (clj->js {:text default-value}))))))))
-
-;; SET ROOT
-(re-frame/reg-fx
- :init-root-fx
- (fn [new-root-id]
-   (log/debug :init-root-fx new-root-id)
-   (reset! state/root-comp-id new-root-id)
-   (reset! state/root-id @state/root-comp-id)
-   (.setRoot Navigation (clj->js (get (roots/roots) new-root-id)))))
-
-(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! state/root-comp-id new-root-comp-id)
-   (reset! state/root-id @state/root-comp-id)
-   (.setRoot Navigation (clj->js (get (roots/roots) new-root-id)))))
-
-(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
-                                              :keycard-pairing]))]
-    {:init-root-fx (if keycard-account? :multiaccounts-keycard :multiaccounts)}))
-
-(defonce rset-app-launched
-  (.registerAppLaunchedListener (.events Navigation)
-                                (fn []
-                                  (reset! state/curr-modal false)
-                                  (reset! state/dissmissing false)
-                                  (if (or (= @state/root-id :multiaccounts)
-                                          (= @state/root-id :multiaccounts-keycard))
-                                    (re-frame/dispatch-sync [::set-multiaccount-root])
-                                    (when @state/root-id
-                                      (reset! state/root-comp-id @state/root-id)
-                                      (.setRoot Navigation (clj->js (get (roots/roots) @state/root-id)))
-                                      (re-frame/dispatch [::login-core/check-last-chat])))
-                                  (.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
-                 :options (merge options
-                                 (roots/status-bar-options)
-                                 (roots/merge-top-bar (roots/topbar-options) options))}}))
-
-;; SET STACK ROOT
-(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)
-                             (mapv get-screen-component comp)
-                             (get-screen-component comp))))))
-
-;; BOTTOM TABS
-(def tab-root-ids {0 :chat-stack
-                   1 :browser-stack
-                   2 :wallet-stack
-                   3 :status-stack
-                   4 :profile-stack})
-
-(def tab-key-idx {:chat    0
-                  :browser 1
-                  :wallet  2
-                  :status  3
-                  :profile 4})
-
-(re-frame/reg-fx
- :change-tab-fx
- (fn [tab]
-   (log/debug :change-tab-fx)
-   (reset! state/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
-   (dismiss-all-modals)))
-
-;issue on ios https://github.com/wix/react-native-navigation/issues/7146
-(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
-                                         (or (pos? cnt) (pos? (:other cnt)))
-                                         (if (and (= :chat tab) platform/ios?)
-                                           {:dotIndicator {:visible true}}
-                                           {:badge (str (or (:other cnt) cnt)) :dotIndicator {:visible false}})
-                                         (pos? (:public cnt))
-                                         (if platform/ios?
-                                           {:dotIndicator {:visible true}}
-                                           {:badge nil :dotIndicator {:visible true}})
-                                         :else
-                                         (if (and (= :chat tab) platform/ios?)
-                                           {:dotIndicator {:visible false}}
-                                           {:dotIndicator {:visible false} :badge ""}))}))))
-
-(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))))
-
-(defonce register-bottom-tab-reg
-  (.registerBottomTabSelectedListener
-   (.events Navigation)
-   (fn [^js evn]
-     (let [selected-tab-index (.-selectedTabIndex evn)
-           comp               (get tab-root-ids selected-tab-index)
-           tab-key            (get (clojure.set/map-invert tab-key-idx) selected-tab-index)]
-       (re-frame/dispatch [:set :current-tab tab-key])
-       (when (= @state/root-comp-id comp)
-         (when (= :chat tab-key)
-           (re-frame/dispatch [:close-chat]))
-         (when platform/android?
-           (.popToRoot Navigation (name comp))))
-       (reset! state/root-comp-id comp)))))
-
-;; OVERLAY (Popover and bottom sheets)
-(defn dissmiss-overlay [comp]
-  (.catch (.dismissOverlay Navigation comp) #()))
-
-(defn show-overlay [comp]
-  (dissmiss-overlay comp)
-  (.showOverlay Navigation
-                (clj->js
-                 {:component {:name    comp
-                              :id      comp
-                              :options (merge (cond-> (roots/status-bar-options)
-                                                (and platform/android? (not (quo.colors/dark?)))
-                                                (assoc-in [:statusBar :backgroundColor] "#99999A"))
-                                              {:layout  {:componentBackgroundColor (if platform/android?
-                                                                                     (:backdrop @quo.colors/theme)
-                                                                                     "transparent")}
-                                               :overlay {:interceptTouchOutside true}})}})))
-
-;; POPOVER
-(defonce popover-reg
-  (.registerComponent Navigation
-                      "popover"
-                      (fn [] (gestureHandlerRootHOC views/popover-comp))
-                      (fn [] views/popover-comp)))
-
-(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
-                      "bottom-sheet"
-                      (fn [] (gestureHandlerRootHOC views/sheet-comp))
-                      (fn [] views/sheet-comp)))
-
-(re-frame/reg-fx :show-bottom-sheet (fn [] (show-overlay "bottom-sheet")))
-(re-frame/reg-fx :hide-bottom-sheet (fn [] (dissmiss-overlay "bottom-sheet")))
-
-;; WALLET CONNECT
-
-(defonce wallet-connect-sheet-reg
-  (.registerComponent Navigation
-                      "wallet-connect-sheet"
-                      (fn [] (gestureHandlerRootHOC views/wallet-connect-comp))
-                      (fn [] views/wallet-connect-comp)))
-
-(defonce wallet-connect-success-sheet-reg
-  (.registerComponent Navigation
-                      "wallet-connect-success-sheet"
-                      (fn [] (gestureHandlerRootHOC views/wallet-connect-success-comp))
-                      (fn [] views/wallet-connect-success-comp)))
-
-(defonce wallet-connect-app-management-sheet-reg
-  (.registerComponent Navigation
-                      "wallet-connect-app-management-sheet"
-                      (fn [] (gestureHandlerRootHOC views/wallet-connect-app-management-comp))
-                      (fn [] views/wallet-connect-app-management-comp)))
-
-(re-frame/reg-fx :show-wallet-connect-sheet (fn [] (show-overlay "wallet-connect-sheet")))
-(re-frame/reg-fx :hide-wallet-connect-sheet (fn [] (dissmiss-overlay "wallet-connect-sheet")))
-(re-frame/reg-fx :show-wallet-connect-success-sheet (fn [] (show-overlay "wallet-connect-success-sheet")))
-(re-frame/reg-fx :hide-wallet-connect-success-sheet (fn [] (dissmiss-overlay "wallet-connect-success-sheet")))
-(re-frame/reg-fx :show-wallet-connect-app-management-sheet (fn [] (show-overlay "wallet-connect-app-management-sheet")))
-(re-frame/reg-fx :hide-wallet-connect-app-management-sheet (fn [] (dissmiss-overlay "wallet-connect-app-management-sheet")))
-
-;; SIGNING
-
-(defonce signing-sheet-reg
-  (.registerComponent Navigation
-                      "signing-sheet"
-                      (fn [] (gestureHandlerRootHOC views/signing-comp))
-                      (fn [] views/signing-comp)))
-
-(re-frame/reg-fx :show-signing-sheet (fn [] (show-overlay "signing-sheet")))
-(re-frame/reg-fx :hide-signing-sheet (fn [] (dissmiss-overlay "signing-sheet")))
-
-;; Select account
-;; TODO why is this not a regular bottom sheet ?
-
-(defonce select-acc-sheet-reg
-  (.registerComponent Navigation
-                      "select-acc-sheet"
-                      (fn [] (gestureHandlerRootHOC views/select-acc-comp))
-                      (fn [] views/select-acc-comp)))
-
-(re-frame/reg-fx :show-select-acc-sheet (fn [] (show-overlay "select-acc-sheet")))
-(re-frame/reg-fx :hide-select-acc-sheet (fn [] (dissmiss-overlay "select-acc-sheet")))
-
-;; NAVIGATION
-
-(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 @state/curr-modal
-     (dissmissModal)
-     (.pop Navigation (name @state/root-comp-id)))))
-
-(re-frame/reg-fx
- :navigate-replace-fx
- (fn [view-id]
-   (log/debug :navigate-replace-fx view-id)
-   (.pop Navigation (name @state/root-comp-id))
-   (navigate view-id)))
-
-(def community-screens '(:community-management
-                         :community-members
-                         :community-requests-to-join
-                         :create-community-channel
-                         :community-emoji-thumbnail-picker
-                         :create-community-category
-                         :community-edit-chats
-                         :community-edit
-                         :community-reorder-categories))
-
-;; change view-id if it is still same after component is disappeared
-;; https://github.com/wix/react-native-navigation/issues/5744#issuecomment-563226820
-(fx/defn view-disappeared
-  {:events [::view-disappeared]}
-  [{:keys [db]} view-id]
-  (when (= view-id (:view-id db))
-    {:db (assoc db :view-id (cond
-                              (= view-id :community-emoji-thumbnail-picker)
-                              :create-community-channel
-
-                              (some #(= view-id %) community-screens)
-                              :community
-
-                              :else
-                              :home))
-     :dispatch-n (enc/conj-when []
-                                (and (= view-id :chat) [:chat.ui/sync-all-deleted-for-me-messages]))}))
@@ -43,7 +43,7 @@
  "returns discovery v5 topic derived from genesis of the provided network"
  [network]
  (let [les-discovery-identifier "LES2@"
-        hash-prefix              (get-network-genesis-hash-prefix network)]
+        hash-prefix (get-network-genesis-hash-prefix network)]
    (when hash-prefix
      (str les-discovery-identifier hash-prefix))))

@@ -92,13 +92,13 @@

 (defn- get-multiaccount-node-config
  [{:keys [multiaccount :networks/networks :networks/current-network]
-    :as   db}]
-  (let [wakuv2-config        (get multiaccount :wakuv2-config {})
-        current-fleet-key    (current-fleet-key db)
-        current-fleet        (get-current-fleet db)
-        wakuv2-enabled       (boolean (:waku current-fleet))
-        waku-nodes           (:waku-nodes current-fleet)
-        rendezvous-nodes     (pick-nodes 3 (vals (:rendezvous current-fleet)))
+    :as db}]
+  (let [wakuv2-config (get multiaccount :wakuv2-config {})
+        current-fleet-key (current-fleet-key db)
+        current-fleet (get-current-fleet db)
+        wakuv2-enabled (boolean (:waku current-fleet))
+        wakuv2-nodes (into (vals (:waku current-fleet)) (vals (get wakuv2-config :CustomNodes)))
+        rendezvous-nodes (pick-nodes 3 (vals (:rendezvous current-fleet)))
        {:keys [installation-id log-level
                waku-bloom-filter-mode
                custom-bootnodes custom-bootnodes-enabled?]} multiaccount
@@ -111,10 +111,10 @@
      (get-login-node-config)

      current-fleet
-      (assoc :NoDiscovery wakuv2-enabled
-             :Rendezvous (if wakuv2-enabled false (boolean (seq rendezvous-nodes)))
-             :ClusterConfig {:Enabled         true
-                             :Fleet           (name current-fleet-key)
+      (assoc :NoDiscovery   wakuv2-enabled
+             :Rendezvous    (if wakuv2-enabled false (boolean (seq rendezvous-nodes)))
+             :ClusterConfig {:Enabled true
+                             :Fleet              (name current-fleet-key)
                             :BootNodes
                             (if wakuv2-enabled [] (pick-nodes 4 (vals (:boot current-fleet))))
                             :TrustedMailServers
@@ -124,8 +124,9 @@
                                 (into (pick-nodes 2
                                                   (vals (:whisper current-fleet)))
                                       (vals (:static current-fleet))))
-                             :RendezvousNodes (if wakuv2-enabled [] rendezvous-nodes)
-                             :WakuNodes       (or waku-nodes [])})
+                             :RelayNodes wakuv2-nodes
+                             :StoreNodes wakuv2-nodes
+                             :RendezvousNodes    (if wakuv2-enabled [] rendezvous-nodes)})

      :always
      (assoc :LocalNotificationsConfig {:Enabled true}
@@ -134,10 +135,10 @@
             :MailserversConfig {:Enabled true}
             :EnableNTPSync true
             :WakuConfig
-             {:Enabled         true
+             {:Enabled true
              :BloomFilterMode waku-bloom-filter-mode
-              :LightClient     true
-              :MinimumPoW      0.000001}
+              :LightClient true
+              :MinimumPoW 0.000001}
             :WakuV2Config (assoc wakuv2-config :Enabled wakuv2-enabled :Host "0.0.0.0")
             :ShhextConfig
             {:BackupDisabledDataDir      (utils.platform/no-backup-directory)
@@ -173,8 +174,8 @@
 app-db"
  {:events [::save-new-config]}
  [{:keys [db]} config {:keys [on-success]}]
-  {::json-rpc/call [{:method     "settings_saveSetting"
-                     :params     [:node-config config]
+  {::json-rpc/call [{:method "settings_saveSetting"
+                     :params [:node-config config]
                     :on-success on-success}]})

 (fx/defn prepare-new-config
@@ -8,7 +8,7 @@
 (defn default-navigation [modal? {:keys [on-press label icon]}]
  (cond-> {:icon                (if modal? :main-icons/close :main-icons/arrow-left)
           :accessibility-label :back-button
-           :on-press            #(re-frame/dispatch [:bottom-sheet/hide :navigate-back])}
+           :on-press            #(re-frame/dispatch [:navigate-back])}
    on-press
    (assoc :on-press on-press)

@@ -27,12 +27,6 @@
          (= view :add-new)
          (merge home.sheet/add-new)

-          (= view :add-new-sheet-view)
-          (merge home.sheet/add-new-sheet)
-
-          (= view :start-a-new-chat)
-          (merge home.sheet/start-a-new-chat)
-
          (= view :keycard.login/more)
          (merge keycard/more-sheet)

@@ -1,26 +1,23 @@
 (ns status-im.ui.screens.home.sheet.views
-  (:require [quo.core :as quo]
-            [quo2.foundations.colors :as colors]
-            [status-im.utils.re-frame :as rf]
-            [status-im.i18n.i18n :as i18n]
+  (:require [re-frame.core :as re-frame]
+            [status-im.ui.components.react :as react]
            [status-im.qr-scanner.core :as qr-scanner]
-            [status-im.ui.components.invite.views :as invite]
-            [status-im.ui.components.react :as rn]
-            [status-im.ui2.screens.chat.components.new-chat :as new-chat-aio]
+            [quo.core :as quo]
+            [status-im.i18n.i18n :as i18n]
            [status-im.utils.config :as config]
-            [quo2.components.list-items.list-item :as quo2.list-item]))
+            [status-im.ui.components.invite.views :as invite]))

 (defn hide-sheet-and-dispatch [event]
-  (rf/dispatch [:bottom-sheet/hide])
-  (rf/dispatch event))
+  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch event))

 (defn add-new-view []
-  [rn/view
-   [rn/view {:style {:flex-direction  :row
-                     :padding-left    16
-                     :padding-right   8
-                     :justify-content :space-between
-                     :align-items     :center}}
+  [react/view
+   [react/view {:style {:flex-direction  :row
+                        :padding-left    16
+                        :padding-right   8
+                        :justify-content :space-between
+                        :align-items     :center}}
    [quo/text {:size   :large
               :weight :bold}
     (i18n/label :t/open-home)]
@@ -50,7 +47,7 @@
     :accessibility-label :join-public-chat-button
     :icon                :main-icons/public-chat
     :on-press            #(hide-sheet-and-dispatch [:open-modal :new-public-chat])}]
-   (when (rf/sub [:communities/enabled?])
+   (when @(re-frame/subscribe [:communities/enabled?])
     [quo/list-item
      {:theme               :accent
       :title               (i18n/label :t/communities-alpha)
@@ -60,40 +57,5 @@
   [invite/list-item
    {:accessibility-label :chats-menu-invite-friends-button}]])

-(defn add-new-sheet-view []
-  [rn/view
-   [quo2.list-item/list-item
-    {:theme                        :main
-     :title                        (i18n/label :t/new-chat)
-     :icon-bg-color                :transparent
-     :icon-container-style         {:padding-horizontal 0}
-     :container-padding-horizontal {:padding-horizontal 4}
-     :container-padding-vertical   12
-     :title-column-style           {:margin-left 2}
-     :icon-color                   (colors/theme-colors colors/neutral-50 colors/neutral-40)
-     :accessibility-label          :start-a-new-chat
-     :icon                         :i/new-message
-     :on-press                     #(hide-sheet-and-dispatch [:bottom-sheet/show-sheet :start-a-new-chat])}]
-   [quo2.list-item/list-item
-    {:theme                        :main
-     :title                        (i18n/label :t/add-a-contact)
-     :icon-bg-color                :transparent
-     :icon-container-style         {:padding-horizontal 0}
-     :container-padding-horizontal {:padding-horizontal 4}
-     :container-padding-vertical   12
-     :title-column-style           {:margin-left 2}
-     :icon-color                   (colors/theme-colors colors/neutral-50 colors/neutral-40)
-     :accessibility-label          :add-a-contact
-     :subtitle                     (i18n/label :t/enter-a-chat-key)
-     :icon                         :i/add-user
-     :on-press                     #(hide-sheet-and-dispatch [:open-modal :new-contact])}]])
-
-
-(def add-new-sheet
-  {:content add-new-sheet-view})
-
 (def add-new
  {:content add-new-view})
-
-(def start-a-new-chat
-  {:content (fn [] [new-chat-aio/contact-toggle-list])})
@@ -12,7 +12,7 @@
                  in-progress? (reagent/atom false)]
    [react/view {:style {:padding-top 16 :padding-horizontal 24 :padding-bottom 8}}
     [react/text {:style styles/sheet-text}
-      (i18n/label :t/block-user-confirmation)]
+      (i18n/label :t/block-contact-details)]
     [react/view {:align-items :center :margin-top 16}
      [quo/button {:theme               :negative
                   :disabled            @in-progress?
@@ -115,8 +115,7 @@
            [status-im.ui.screens.wallet.buy-crypto.views :as wallet.buy-crypto]
            [status-im.ui.screens.wallet.recipient.views :as recipient]
            [status-im.ui.screens.wallet.send.views :as wallet.send]
-            [status-im.ui.screens.wallet.manage-connections.views :as manage-all-connections]
-            [status-im.ui2.screens.chat.components.new-chat :as new-chat-aio]))
+            [status-im.ui.screens.wallet.manage-connections.views :as manage-all-connections]))

 (defn right-button-options [id icon]
  {:id   id
@@ -596,17 +595,11 @@
    :options   {:topBar {:visible false}}
    :component contact/nickname}

-   {:name      :new-chat-aio
-    :on-focus  [::new-chat.events/new-chat-focus]
-            ;;TODO accessories
-    :options   {:topBar {:visible false}}
-    :component new-chat-aio/contact-toggle-list}
-
-                                        ;[Chat] New Public chat
-   {:name      :new-public-chat
+                                ;[Group chat] Edit group chat name
+   {:name      :edit-group-chat-name
    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/new-public-group-chat)}}}
-    :component new-public-chat/new-public-chat}
+    :options   {:topBar {:title {:text (i18n/label :t/edit-group)}}}
+    :component group-chat/edit-group-chat-name}

                                ;[Group chat] Add participants
   {:name      :add-participants-toggle-list
@@ -1,50 +0,0 @@
-(ns status-im.ui2.components.search-input
-  (:require [reagent.core :as reagent]
-            [status-im.i18n.i18n :as i18n]
-            [quo.design-system.colors :as colors]
-            [quo2.foundations.colors :as quo2.colors]
-            [quo.components.text-input :as text-input]))
-
-(defn search-input [{:keys [search-active?]}]
-  (let [input-ref        (reagent/atom nil)
-        placeholder-text (reagent/atom :t/search-contacts)
-        search-active?   (or search-active? (reagent/atom nil))]
-    (fn [{:keys [on-focus on-change search-border-width show-cancel? search-border-radius on-blur on-cancel search-filter auto-focus] :or {show-cancel? false}}]
-      [text-input/text-input {:placeholder            (i18n/label @placeholder-text)
-                              :placeholder-text-color (if (= @placeholder-text :t/search-contacts)
-                                                        (quo2.colors/theme-colors quo2.colors/neutral-30 quo2.colors/neutral-50)
-                                                        (quo2.colors/theme-colors quo2.colors/neutral-30 quo2.colors/neutral-60))
-                              :accessibility-label    :search-input
-                              :text-padding-left      0
-                              :blur-on-submit         true
-                              :multiline              false
-                              :get-ref                #(reset! input-ref %)
-                              :default-value          search-filter
-                              :auto-focus             auto-focus
-                              :on-cancel              on-cancel
-                              :show-cancel            show-cancel?
-                              :auto-correct           false
-                              :auto-capitalize        :none
-                              :container-style        {:border-radius    (or search-border-radius 10)
-                                                       :border-width     (or search-border-width 1)
-                                                       :border-color     (:ui-01  @colors/theme)
-                                                       :background-color (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90)
-                                                       :overflow         :hidden}
-                              :input-style            {:height           32
-                                                       :padding-vertical 2
-                                                       :background-color (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90)}
-                              :on-focus               #(do
-                                                         (when on-focus
-                                                           (on-focus search-filter))
-                                                         (swap! search-active? not)
-                                                         (reset! placeholder-text :t/who-are-you-looking-for))
-                              :on-blur                #(do
-                                                         (when on-blur
-                                                           (on-blur))
-                                                         (swap! search-active? not)
-                                                         (reset! placeholder-text :t/search-contacts))
-                              :on-change              (fn [e]
-                                                        (let [^js native-event (.-nativeEvent ^js e)
-                                                              text         (.-text native-event)]
-                                                          (when on-change
-                                                            (on-change text))))}])))
@@ -1,40 +0,0 @@
-(ns status-im.ui2.components.toolbar
-  (:require [status-im.ui.components.react :as react]
-            [quo.design-system.colors :as colors]))
-
-(defn toolbar-container [{:keys [show-border? size center? margin-bottom container-styling]
-                          :or   {size :default}}]
-  (merge {:align-items        :center
-          :padding-horizontal 8
-          :margin-bottom      (or margin-bottom 0)
-          :width              "100%"
-          :flex-direction     :row
-          :justify-content    :space-between}
-         container-styling
-         (when center?
-           {:justify-content :center})
-         (when show-border?
-           {:border-top-width 1
-            :border-top-color colors/gray-lighter})
-         (case size
-           :large {:height 60}
-           {:height 52})))
-
-;; TODO(Ferossgp): Allow components when moving to Quo
-(defn toolbar [{:keys [center left right show-border? size margin-bottom container-styling]}]
-  (if center
-    [react/view {:style (toolbar-container {:show-border?  show-border?
-                                            :center?       true
-                                            :margin-bottom margin-bottom
-                                            :size          size
-                                            :container-styling container-styling})}
-     center]
-    [react/view {:style (toolbar-container {:show-border?  show-border?
-                                            :margin-bottom margin-bottom
-                                            :center?       false
-                                            :size          size
-                                            :container-styling container-styling})}
-     [react/view {:flex-shrink 1}
-      (when left left)]
-     [react/view
-      (when right right)]]))
@@ -3,9 +3,8 @@
   [status-im.chat.models :as chat.models]
   [status-im.chat.models.pin-message :as models.pin-message]
   [status-im.i18n.i18n :as i18n]
-   [status-im.utils.re-frame :as rf]
-   [status-im.ui2.screens.common.core :as common]
   [status-im.constants :as constants]
+   [status-im.utils.re-frame :as rf]
   [quo2.components.drawers.action-drawers :as drawer]))

 (defn- entry [{:keys [icon label on-press danger? sub-label chevron?]}]
@@ -41,40 +40,14 @@
 (defn unmute-chat-action [chat-id]
  (hide-sheet-and-dispatch [::chat.models/mute-chat-toggled chat-id false]))

-(defn clear-history-action [{:keys [chat-id] :as item}]
-  (hide-sheet-and-dispatch [:bottom-sheet/show-sheet
-                            {:content (fn []
-                                        (common/alert {:title       (i18n/label :t/clear-history?)
-                                                       :description (i18n/label :t/clear-history-confirmation-content)
-                                                       :context     item
-                                                       :button-text (i18n/label :t/clear-history)
-                                                       :on-press    #(hide-sheet-and-dispatch [:chat.ui/clear-history chat-id])}))}]))
+(defn clear-history-action [chat-id]
+  (hide-sheet-and-dispatch [:chat.ui/clear-history-pressed chat-id]))

-(defn delete-chat-action [{:keys [chat-id] :as item}]
-  (hide-sheet-and-dispatch [:bottom-sheet/show-sheet
-                            {:content (fn []
-                                        (common/alert {:title       (i18n/label :t/delete-chat?)
-                                                       :description (i18n/label :t/delete-chat-confirmation)
-                                                       :context     item
-                                                       :button-text (i18n/label :t/delete-chat)
-                                                       :on-press    #(hide-sheet-and-dispatch [:chat.ui/remove-chat chat-id])}))}]))
+(defn delete-chat-action [chat-id]
+  (hide-sheet-and-dispatch [:chat.ui/remove-chat-pressed chat-id]))

-(defn leave-group-action [{:keys [chat-id] :as item}]
-  (hide-sheet-and-dispatch [:bottom-sheet/show-sheet
-                            {:content (fn []
-                                        (common/alert {:title       (i18n/label :t/leave-group?)
-                                                       :description (i18n/label :t/leave-chat-confirmation)
-                                                       :context     item
-                                                       :button-text (i18n/label :t/leave-group)
-                                                       :on-press    #(hide-sheet-and-dispatch [:chat.ui/leave-chat chat-id])}))}]))
-
-(defn block-user-action [{:keys [public-key] :as item}]
-  (hide-sheet-and-dispatch [:bottom-sheet/show-sheet
-                            {:content (fn [] (common/alert {:title       (i18n/label :t/block-user?)
-                                                            :description (i18n/label :t/block-user-confirmation)
-                                                            :context     item
-                                                            :button-text (i18n/label :t/block-user)
-                                                            :on-press    #(hide-sheet-and-dispatch [:contact.ui/block-contact-confirmed public-key])}))}]))
+(defn leave-group-action [chat-id]
+  (hide-sheet-and-dispatch [:group-chats.ui/leave-chat-pressed chat-id]))

 (defn mute-chat-entry [chat-id]
  (let [muted? (rf/sub [:chats/muted chat-id])]
@@ -106,18 +79,18 @@
          :sub-label nil
          :chevron?  false}))

-(defn delete-chat-entry [item]
+(defn delete-chat-entry [chat-id]
  (entry {:icon      :i/delete
          :label     (i18n/label :t/delete-chat)
-          :on-press  #(delete-chat-action item)
+          :on-press  #(delete-chat-action chat-id)
          :danger?   true
          :sub-label nil
          :chevron?  false}))

-(defn leave-group-entry [item]
+(defn leave-group-entry [chat-id]
  (entry {:icon      :i/log-out
          :label     (i18n/label :t/leave-group)
-          :on-press  #(leave-group-action item)
+          :on-press  #(leave-group-action chat-id)
          :danger?   true
          :sub-label nil
          :chevron?  false}))
@@ -205,15 +178,15 @@
 (defn mark-untrustworthy-entry []
  (entry {:icon      :i/alert
          :label     (i18n/label :t/mark-untrustworthy)
-          :on-press  #(js/alert "TODO: to be implemented, requires status-go impl.")
+          :on-press  #(js/alert "TODO: to be implemented, probably requires status-go impl. and design input")
          :danger?   true
          :sub-label nil
          :chevron?  false}))

-(defn block-user-entry [item]
+(defn block-user-entry []
  (entry {:icon      :i/block
          :label     (i18n/label :t/block-user)
-          :on-press  #(block-user-action item)
+          :on-press  #(js/alert "TODO: to be implemented, requires design input")
          :danger?   true
          :sub-label nil
          :chevron?  false}))
@@ -258,11 +231,11 @@
          :sub-label nil
          :chevron?  false}))

-(defn destructive-actions [{:keys [chat-id group-chat] :as item}]
+(defn destructive-actions [chat-id group-chat]
  [(clear-history-entry chat-id)
   (if group-chat
-     (leave-group-entry item)
-     (delete-chat-entry item))])
+     (leave-group-entry chat-id)
+     (delete-chat-entry chat-id))])

 (defn notification-actions [{:keys [chat-id group-chat public?]} inside-chat?]
  [(mark-as-read-entry chat-id)
@@ -289,23 +262,23 @@
     (when (and admin? inside-chat?) (edit-group-entry))
     (when (and admin? inside-chat?) (group-privacy-entry))]))

-(defn one-to-one-actions [{:keys [chat-id] :as item} inside-chat?]
+(defn one-to-one-actions [{:keys [chat-id group-chat] :as item} inside-chat?]
  [drawer/action-drawer [[(view-profile-entry chat-id)
                          (edit-nickname-entry chat-id)]
                         (notification-actions item inside-chat?)
-                         (destructive-actions item)]])
+                         (destructive-actions chat-id group-chat)]])

-(defn public-chat-actions [{:keys [chat-id] :as item} inside-chat?]
+(defn public-chat-actions [{:keys [chat-id group-chat] :as item} inside-chat?]
  [drawer/action-drawer [[(group-details-entry chat-id)
                          (when inside-chat?
                            (add-members-entry))]
                         (notification-actions item inside-chat?)
-                         (destructive-actions item)]])
+                         (destructive-actions chat-id group-chat)]])

-(defn private-group-chat-actions [item inside-chat?]
+(defn private-group-chat-actions [{:keys [chat-id group-chat] :as item} inside-chat?]
  [drawer/action-drawer [(group-actions item inside-chat?)
                         (notification-actions item inside-chat?)
-                         (destructive-actions item)]])
+                         (destructive-actions chat-id group-chat)]])

 (defn contact-actions [{:keys [public-key] :as contact}]
  [drawer/action-drawer [[(view-profile-entry public-key)
@@ -314,7 +287,7 @@
                          (show-qr-entry)
                          (share-profile-entry)]
                         [(mark-untrustworthy-entry)
-                          (block-user-entry contact)]]])
+                          (block-user-entry)]]])

 (defn actions [{:keys [chat-type] :as item} inside-chat?]
  (case chat-type
@@ -5,6 +5,7 @@
            [quo2.foundations.typography :as typography]
            [quo2.components.icon :as icons]
            [quo2.foundations.colors :as colors]
+            [quo2.components.avatars.user-avatar :as user-avatar]
            [quo.react-native :as rn]
            [quo.platform :as platform]
            [quo2.core :as quo2]
@@ -89,11 +90,14 @@

 (defn display-pic-view [group-chat color display-name photo-path]
  (if group-chat
-    [quo2/group-avatar {:color color
-                        :size  :medium}]
-    [quo2/user-avatar {:full-name         display-name
-                       :profile-picture   photo-path
-                       :size              :small}]))
+    [rn/view {:style (style/group-chat-icon color)}
+     [icons/icon :i/group {:size 16 :color colors/white-opa-70}]]
+    [user-avatar/user-avatar {:full-name         display-name
+                              :profile-picture   photo-path
+                              :status-indicator? true
+                              :online?           true
+                              :size              :small
+                              :ring?             false}]))

 (defn messages-home-item [item]
  (let [{:keys [chat-id
@@ -1,283 +0,0 @@
-(ns status-im.ui2.screens.chat.components.new-chat
-  (:require [cljs.spec.alpha :as spec]
-            [clojure.string :as string]
-            [re-frame.core :as re-frame]
-            [reagent.core :as reagent]
-            [status-im.constants :as constants]
-            [status-im.i18n.i18n :as i18n]
-            [status-im.ui.components.chat-icon.screen :as chat-icon]
-            [status-im.multiaccounts.core :as multiaccounts]
-            [status-im.ui.components.keyboard-avoid-presentation :as kb-presentation]
-            [status-im.ui.components.invite.views :as invite]
-            [status-im.ui.components.list.views :as list]
-            [status-im.ui.components.react :as react]
-            [status-im.ui2.components.search-input :as search]
-            [status-im.ui2.components.toolbar :as toolbar]
-            [status-im.ui.components.topbar :as topbar]
-            [status-im.ui.screens.group.styles :as styles]
-            [quo.core :as quo]
-            [quo2.core :as quo2]
-            [quo2.components.buttons.button :as button]
-            [status-im.utils.re-frame :as rf]
-            [status-im.utils.debounce :as debounce]
-            [quo2.foundations.colors :as quo2.colors]
-            [status-im.ui2.screens.chat.actions :refer [hide-sheet-and-dispatch]])
-  (:require-macros [status-im.utils.views :as views]))
-
-(defn- render-contact [row]
-  (let [[first-name second-name] (multiaccounts/contact-two-names row false)]
-    [quo2/list-item
-     {:title    first-name
-      :subtitle second-name
-      :icon     [chat-icon/contact-icon-contacts-tab
-                 (multiaccounts/displayed-photo row)]}]))
-
-(defn- on-toggle [allow-new-users? checked? public-key]
-  (cond
-    checked?
-    (rf/dispatch [:deselect-contact public-key allow-new-users?])
-    ;; Only allow new users if not reached the maximum
-    (and (not checked?)
-         allow-new-users?)
-    (rf/dispatch [:select-contact public-key allow-new-users?])))
-
-(defn- on-toggle-participant [allow-new-users? checked? public-key]
-  (cond
-    checked?
-    (rf/dispatch [:deselect-participant public-key allow-new-users?])
-
-   ;; Only allow new users if not reached the maximum
-    (and (not checked?)
-         allow-new-users?)
-    (rf/dispatch [:select-participant public-key allow-new-users?])))
-
-(defn- toggle-item []
-  (fn [allow-new-users? subs-name {:keys [public-key] :as contact} on-toggle]
-    (let [contact-selected? @(re-frame/subscribe [subs-name public-key])
-          [first-name second-name] (multiaccounts/contact-two-names contact true)]
-      [quo2/list-item
-       {:title            first-name
-        :text-color       (quo2.colors/theme-colors quo2.colors/neutral-100 quo2.colors/white)
-        :subtitle         second-name
-        :icon             [chat-icon/contact-icon-contacts-tab
-                           (multiaccounts/displayed-photo contact)]
-        :on-press         #(on-toggle allow-new-users? contact-selected? public-key)
-        :active           contact-selected?
-        :accessory        :checkbox
-        :background-color (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90)}])))
-
-(defn- group-toggle-contact [{:keys [:allow-new-users?] :as contact} _ _]
-  [toggle-item allow-new-users? :is-contact-selected? contact on-toggle])
-
-(defn- group-toggle-participant [{:keys [:allow-new-users?] :as contact} _ _]
-  [toggle-item allow-new-users? :is-participant-selected? contact on-toggle-participant])
-
-(defn toggle-list [{:keys [contacts render-fn]}]
-  [list/section-list
-   {:content-container-style        {:padding-vertical 8}
-    :key-fn                         :id
-    :keyboard-should-persist-taps   :always
-    :sticky-section-headers-enabled false
-    :sections                       contacts
-    :render-section-header-fn       quo2/index
-    :render-fn                      render-fn}])
-
-(defn no-contacts [{:keys [no-contacts]}]
-  [react/view {:style styles/no-contacts}
-   [react/text
-    {:style (styles/no-contact-text)}
-    no-contacts]
-   [invite/button]])
-
-(defn filter-contacts [filter-text contacts]
-  (let [lower-filter-text (string/lower-case (str filter-text))
-        filter-fn         (fn [{:keys [data]}]
-                            (let [{:keys [name alias nickname]} (first data)]
-                              (or
-                               (string/includes? (string/lower-case (str name)) lower-filter-text)
-                               (string/includes? (string/lower-case (str alias)) lower-filter-text)
-                               (when nickname
-                                 (string/includes? (string/lower-case (str nickname)) lower-filter-text)))))]
-    (if filter-text
-      (filter filter-fn contacts)
-      contacts)))
-
-;; Set name of new group-chat
-(defn new-group []
-  (let [contacts          (rf/sub [:selected-group-contacts])
-        group-name        (rf/sub [:new-chat-name])
-        group-name-empty? (not (spec/valid? :global/not-empty-string group-name))]
-    [react/keyboard-avoiding-view  {:style         styles/group-container
-                                    :ignore-offset true}
-     [react/view {:flex 1}
-      [topbar/topbar {:use-insets false
-                      :title      (i18n/label :t/new-group-chat)
-                      :subtitle   (i18n/label :t/group-chat-members-count
-                                              {:selected (inc (count contacts))
-                                               :max      constants/max-group-chat-participants})}]
-      [react/view {:style {:padding-top 16
-                           :flex        1}}
-       [react/view {:style {:padding-horizontal 16}}
-        [quo/text-input
-         {:auto-focus          true
-          :on-change-text      #(rf/dispatch [:set :new-chat-name %])
-          :default-value       group-name
-          :placeholder         (i18n/label :t/set-a-topic)
-          :accessibility-label :chat-name-input}]
-        [react/text {:style (styles/members-title)}
-         (i18n/label :t/members-title)]]
-       [react/view {:style {:margin-top 8
-                            :flex       1}}
-        [list/flat-list {:data                         contacts
-                         :key-fn                       :address
-                         :render-fn                    render-contact
-                         :bounces                      false
-                         :keyboard-should-persist-taps :always
-                         :enable-empty-sections        true}]]]
-      [toolbar/toolbar
-       {:show-border? true
-        :left         [quo/button {:type                :secondary
-                                   :before              :main-icon/back
-                                   :accessibility-label :previous-button
-                                   :on-press            #(rf/dispatch [:navigate-back])}
-                       (i18n/label :t/back)]
-        :right        [quo/button {:type                :secondary
-                                   :accessibility-label :create-group-chat-button
-                                   :disabled            group-name-empty?
-                                   :on-press            #(debounce/dispatch-and-chill [:group-chats.ui/create-pressed group-name]
-                                                                                      300)}
-                       (i18n/label :t/create-group-chat)]}]]]))
-
-(defn searchable-contact-list []
-  (let [search-value (reagent/atom nil)]
-    (fn [{:keys [contacts no-contacts-label toggle-fn allow-new-users? show-cancel?]}]
-      [react/view {:style {:flex 1}}
-       [react/view {:style (styles/search-container)}
-        [search/search-input {:on-cancel            #(reset! search-value nil)
-                              :search-border-radius 0
-                              :show-cancel          show-cancel?
-                              :search-border-width  0
-                              :on-change            #(reset! search-value %)}]]
-       [react/view {:style {:flex             1
-                            :padding-vertical 8
-                            :background-color (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90)}}
-        (if (seq contacts)
-          [toggle-list {:contacts    (filter-contacts @search-value contacts)
-                        :render-data allow-new-users?
-                        :render-fn   toggle-fn}]
-          [no-contacts {:no-contacts no-contacts-label}])]])))
-
-;; Start group chat
-(defn contact-toggle-list []
-  (let [contacts                   (rf/sub [:contacts/sorted-and-grouped-by-first-letter])
-        selected-contacts-count    (rf/sub [:selected-contacts-count])
-        window-height              (rf/sub [:dimensions/window-height])
-        one-contact-selected?      (= selected-contacts-count 1)
-        no-contacts-selected?      (zero? selected-contacts-count)
-        {:keys [alias public-key]} (-> contacts first :data first)]
-    [react/view  {:style {:height (* window-height 0.95)}}
-     [topbar/topbar {:use-insets                 false
-                     :border-bottom              false
-                     :style                      {:top -15}
-                     :close-icon-container-props {:style {:width            32
-                                                          :height           32
-                                                          :border-radius    10
-                                                          :justify-content  :center
-                                                          :align-items      :center
-                                                          :background-color (quo2.colors/theme-colors quo2.colors/neutral-10 quo2.colors/neutral-80)}}
-                     :close-icon-props           {:size  20
-                                                  :color (quo2.colors/theme-colors quo2.colors/black quo2.colors/white)}
-                     :navigation                 {:sheet? true}
-                     :modal?                     true
-                     :background                 (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90)}]
-     [react/view {:style {:flex-direction     :row
-                          :justify-content    :space-between
-                          :align-items        :flex-end
-                          :padding-horizontal 20}}
-      [quo2/text {:weight :semi-bold
-                  :size   :heading-1
-                  :color  (quo2.colors/theme-colors quo2.colors/neutral-40 quo2.colors/neutral-50)}
-       (i18n/label :t/new-chat)]
-      [quo2/text {:size            :paragraph-2
-                  :weight          :regular
-                  :secondary-color (quo2.colors/theme-colors quo2.colors/neutral-40 quo2.colors/neutral-50)}
-       (i18n/label :t/selected-count-from-max
-                   {:selected (inc selected-contacts-count)
-                    :max      constants/max-group-chat-participants})]]
-     [react/view {:style {:height 430}}
-      [searchable-contact-list
-       {:contacts          contacts
-        :show-cancel?      false
-        :no-contacts-label (i18n/label :t/group-chat-no-contacts)
-        :toggle-fn         group-toggle-contact}]]
-     (when-not no-contacts-selected?
-       [toolbar/toolbar
-        {:show-border?  false
-         :margin-bottom 20
-         :center        [button/button {:type                :primary
-                                        :accessibility-label :next-button
-                                        :on-press            #(do
-                                                                (if one-contact-selected?
-                                                                  (hide-sheet-and-dispatch [:chat.ui/start-chat public-key])
-                                                                  (hide-sheet-and-dispatch [:navigate-to :new-group])))}
-                         (if one-contact-selected?
-                           (i18n/label :t/chat-with {:selected-user alias})
-                           (i18n/label :t/setup-group-chat))]}])]))
-
-;; Add participants to existing group chat
-(defn add-participants-toggle-list []
-  (let [contacts                   (rf/sub [:contacts/all-contacts-not-in-current-chat])
-        current-chat               (rf/sub [:chats/current-chat])
-        selected-contacts-count    (rf/sub [:selected-participants-count])
-        current-participants-count (count (:contacts current-chat))]
-    [kb-presentation/keyboard-avoiding-view  {:style styles/group-container}
-     [topbar/topbar {:use-insets    false
-                     :border-bottom false
-                     :title         (i18n/label :t/add-members)
-                     :subtitle      (i18n/label :t/group-chat-members-count
-                                                {:selected (+ current-participants-count selected-contacts-count)
-                                                 :max      constants/max-group-chat-participants})}]
-     [searchable-contact-list
-      {:contacts          contacts
-       :no-contacts-label (i18n/label :t/group-chat-all-contacts-invited)
-       :toggle-fn         group-toggle-participant
-       :allow-new-users?  (< (+ current-participants-count
-                                selected-contacts-count)
-                             constants/max-group-chat-participants)}]
-     [toolbar/toolbar
-      {:show-border? true
-       :center       [quo/button {:type                :secondary
-                                  :accessibility-label :next-button
-                                  :disabled            (zero? selected-contacts-count)
-                                  :on-press            #(rf/dispatch [:group-chats.ui/add-members-pressed])}
-                      (i18n/label :t/add)]}]]))
-
-(defn edit-group-chat-name []
-  (let [{:keys [name chat-id]} (rf/sub [:chats/current-chat])
-        new-group-chat-name (reagent/atom nil)]
-    [kb-presentation/keyboard-avoiding-view  {:style styles/group-container}
-     [react/scroll-view {:style {:padding 16
-                                 :flex    1}}
-      [quo/text-input
-       {:on-change-text      #(reset! new-group-chat-name %)
-        :default-value       name
-        :on-submit-editing   #(when (seq @new-group-chat-name)
-                                (rf/dispatch [:group-chats.ui/name-changed chat-id @new-group-chat-name]))
-        :placeholder         (i18n/label :t/enter-contact-code)
-        :accessibility-label :new-chat-name
-        :return-key-type     :go}]]
-     [react/view {:style {:flex 1}}]
-     [toolbar/toolbar
-      {:show-border? true
-       :center
-       [quo/button {:type                :secondary
-                    :accessibility-label :done
-                    :disabled            (and (<= (count @new-group-chat-name) 1)
-                                              (not (nil? @new-group-chat-name)))
-                    :on-press            #(cond
-                                            (< 1 (count @new-group-chat-name))
-                                            (rf/dispatch [:group-chats.ui/name-changed chat-id @new-group-chat-name])
-
-                                            (nil? @new-group-chat-name)
-                                            (rf/dispatch [:navigate-back]))}
-        (i18n/label :t/done)]}]]))
@@ -15,11 +15,10 @@
            [status-im.add-new.db :as db]
            [status-im.utils.debounce :as debounce]
            [status-im.utils.utils :as utils]
-            [status-im.utils.re-frame :as rf]
            [status-im.ui.components.topbar :as topbar]
            [status-im.ui.components.plus-button :as components.plus-button]
            [status-im.ui.components.invite.views :as invite]
-            [status-im.utils.handlers :refer [>evt]]
+            [status-im.utils.handlers :refer [<sub >evt]]
            [status-im.utils.config :as config]
            [quo2.components.markdown.text :as quo2.text]
            [status-im.qr-scanner.core :as qr-scanner]
@@ -43,38 +42,25 @@

 (defn home-tooltip-view []
  [rn/view (styles/chat-tooltip)
-   [rn/view {:style {:width            66
-                     :position         :absolute
-                     :top              -6
-                     :background-color quo.colors/white
-                     :align-items      :center}}
+   [rn/view {:style {:width       66 :position :absolute :top -6 :background-color quo.colors/white
+                     :align-items :center}}
    [rn/image {:source (resources/get-image :empty-chats-header)
-               :style  {:width  50
-                        :height 50}}]]
+               :style  {:width 50 :height 50}}]]
   [rn/touchable-highlight
-    {:style               {:position        :absolute
-                           :right           0
-                           :top             0
-                           :width           44
-                           :height          44
-                           :align-items     :center
-                           :justify-content :center}
-     :on-press            #(rf/dispatch [:multiaccounts.ui/hide-home-tooltip])
+    {:style               {:position :absolute :right 0 :top 0
+                           :width    44 :height 44 :align-items :center :justify-content :center}
+     :on-press            #(re-frame/dispatch [:multiaccounts.ui/hide-home-tooltip])
     :accessibility-label :hide-home-button}
    [icons/icon :main-icons/close-circle {:color quo.colors/gray}]]
-   [react/i18n-text {:style styles/no-chats-text
-                     :key   :chat-and-transact}]
+   [react/i18n-text {:style styles/no-chats-text :key :chat-and-transact}]
   [rn/view {:align-items   :center
             :margin-top    8
             :margin-bottom 12}
    [invite/button]]])

 (defn welcome-blank-chats []
-  [rn/view {:style {:flex            1
-                    :align-items     :center
-                    :justify-content :center}}
-   [icons/icon :main-icons/placeholder20 {:width  120
-                                          :height 120}]
+  [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
+   [icons/icon :main-icons/placeholder20 {:width 120 :height 120}]
   [rn/text {:style (merge typography/font-semi-bold typography/paragraph-1)} (i18n/label :t/no-messages)]
   [rn/text {:style (merge typography/font-regular typography/paragraph-2)} (i18n/label :t/blank-messages-text)]])

@@ -83,8 +69,7 @@
                    :flex-direction  :row
                    :align-items     :center
                    :justify-content :center}}
-   [react/i18n-text {:style styles/welcome-blank-text
-                     :key   :welcome-blank-message}]])
+   [react/i18n-text {:style styles/welcome-blank-text :key :welcome-blank-message}]])

 (defonce search-active? (reagent/atom false))

@@ -94,24 +79,25 @@
   [search-input/search-input
    {:search-active? search-active?
     :search-filter  search-filter
-     :on-cancel      #(rf/dispatch [:search/home-filter-changed nil])
+     :on-cancel      #(re-frame/dispatch [:search/home-filter-changed nil])
     :on-blur        (fn []
                       (when chats-empty
-                         (rf/dispatch [:search/home-filter-changed nil]))
-                       (rf/dispatch [::new-chat/clear-new-identity]))
+                         (re-frame/dispatch [:search/home-filter-changed nil]))
+                       (re-frame/dispatch [::new-chat/clear-new-identity]))
     :on-focus       (fn [search-filter]
                       (when-not search-filter
-                         (rf/dispatch [:search/home-filter-changed ""])
-                         (rf/dispatch [::new-chat/clear-new-identity])))
+                         (re-frame/dispatch [:search/home-filter-changed ""])
+                         (re-frame/dispatch [::new-chat/clear-new-identity])))
     :on-change      (fn [text]
-                       (rf/dispatch [:search/home-filter-changed text])
-                       (rf/dispatch [:set-in [:contacts/new-identity :state] :searching])
+                       (re-frame/dispatch [:search/home-filter-changed text])
+                       (re-frame/dispatch [:set-in [:contacts/new-identity :state] :searching])
                       (debounce/debounce-and-dispatch [:new-chat/set-new-identity text] 300))}]])

 (defn start-suggestion [search-value]
-  (let [{:keys [state ens-name public-key]} (rf/sub [:contacts/new-identity])
-        valid-private?                      (= state :valid)
-        valid-public?                       (db/valid-topic? search-value)]
+  (let [{:keys [state ens-name public-key]}
+        @(re-frame/subscribe [:contacts/new-identity])
+        valid-private? (= state :valid)
+        valid-public?  (db/valid-topic? search-value)]
    (when (or valid-public? valid-private?)
      [rn/view
       [quo/list-header (i18n/label :t/search-no-chat-found)]
@@ -122,16 +108,16 @@
                         :subtitle (i18n/label :t/join-new-private-chat)
                         :on-press (fn []
                                     (debounce/dispatch-and-chill [:contact.ui/contact-code-submitted false] 3000)
-                                     (rf/dispatch [:search/home-filter-changed nil]))}])
+                                     (re-frame/dispatch [:search/home-filter-changed nil]))}])
       (when valid-public?
         [quo/list-item {:theme    :accent
                         :icon     :main-icons/public-chat
                         :title    (str "#" search-value)
                         :subtitle (i18n/label :t/join-new-public-chat)
                         :on-press (fn []
-                                     (rf/dispatch [:chat.ui/start-public-chat search-value])
-                                     (rf/dispatch [:set :public-group-topic nil])
-                                     (rf/dispatch [:search/home-filter-changed nil]))}])])))
+                                     (re-frame/dispatch [:chat.ui/start-public-chat search-value])
+                                     (re-frame/dispatch [:set :public-group-topic nil])
+                                     (re-frame/dispatch [:search/home-filter-changed nil]))}])])))

 (defn chat-list-key-fn [item]
  (or (:chat-id item) (:public-key item) (:id item)))
@@ -157,11 +143,7 @@
    (vals @data)))

 (defn contacts-section-header [{:keys [title]}]
-  [rn/view {:style {:border-top-width   1
-                    :border-top-color   colors/neutral-20
-                    :padding-vertical   8
-                    :padding-horizontal 20
-                    :margin-top         8}}
+  [rn/view {:style {:border-top-width 1 :border-top-color colors/neutral-20 :padding-vertical 8 :padding-horizontal 20 :margin-top 8}}
   [rn/text {:style (merge typography/font-medium typography/paragraph-2 {:color colors/neutral-50})} title]])

 (defn find-contact-requests [notifications]
@@ -180,22 +162,23 @@
 (defn contact-requests-sheet []
  [:f>
   (fn []
-     (let [{window-height :height}                (rn/use-window-dimensions)
-           safe-area                              (safe-area/use-safe-area)
-           notifications                          (rf/sub [:activity.center/notifications-grouped-by-date])
+     (let [{window-height :height} (rn/use-window-dimensions)
+           safe-area     (safe-area/use-safe-area)
+           notifications (<sub [:activity.center/notifications-grouped-by-date])
           {received-requests :received-requests} (find-contact-requests notifications)
-           sent-requests                          []]
+           sent-requests []]
       [rn/view {:style {:margin-left 20
                         :height      (- window-height (:top safe-area))}}
        [rn/touchable-opacity
         {:on-press #(>evt [:bottom-sheet/hide])
-          :style    {:background-color (colors/theme-colors colors/neutral-10 colors/neutral-80)
-                     :width            32
-                     :height           32
-                     :border-radius    10
-                     :justify-content  :center
-                     :align-items      :center
-                     :margin-bottom    24}}
+          :style
+          {:background-color (colors/theme-colors colors/neutral-10 colors/neutral-80)
+           :width            32
+           :height           32
+           :border-radius    10
+           :justify-content  :center
+           :align-items      :center
+           :margin-bottom    24}}
         [quo2.icons/icon :i/close {:color (colors/theme-colors "#000000" "#ffffff")}]]
        [rn/text {:style (merge
                          typography/heading-1
@@ -203,8 +186,7 @@
                          {:color (colors/theme-colors "#000000" "#ffffff")})}
         (i18n/label :t/pending-requests)]
        [quo2.tabs/tabs
-         {:style          {:margin-top    12
-                           :margin-bottom 20}
+         {:style          {:margin-top 12 :margin-bottom 20}
          :size           32
          :on-change      #(reset! selected-requests-tab %)
          :default-active :received
@@ -218,7 +200,7 @@
          :render-fn received-cr-item/received-cr-item}]]))])

 (defn get-display-name [{:keys [chat-id message]}]
-  (let [name        (first (rf/sub [:contacts/contact-two-names-by-identity chat-id]))
+  (let [name        (first (<sub [:contacts/contact-two-names-by-identity chat-id]))
        no-ens-name (str/blank? (get-in message [:content :ens-name]))]
    (if no-ens-name
      (first (str/split name " "))
@@ -260,12 +242,12 @@
   [info-count (count requests)]])

 (defn chats []
-  (let [{:keys [items search-filter]} (rf/sub [:home-items])
+  (let [{:keys [items search-filter]} (<sub [:home-items])
        current-active-tab @selected-tab
        items              (prepare-items current-active-tab items)
-        contacts           (rf/sub [:contacts/active])
+        contacts           (<sub [:contacts/active])
        contacts           (prepare-contacts contacts)
-        notifications      (rf/sub [:activity.center/notifications-grouped-by-date])
+        notifications      (<sub [:activity.center/notifications-grouped-by-date])
        {requests :received-requests new-info :has-unread?} (find-contact-requests notifications)]
    [rn/view {:style {:flex 1}}
     [discover-card/discover-card {:title       (i18n/label :t/invite-friends-to-status)
@@ -291,7 +273,7 @@
         [list/flat-list
          {:key-fn                       chat-list-key-fn
           :getItemLayout                get-item-layout
-           :on-end-reached               #(rf/dispatch [:chat.ui/show-more-chats])
+           :on-end-reached               #(re-frame/dispatch [:chat.ui/show-more-chats])
           :keyboard-should-persist-taps :always
           :data                         items
           :render-fn                    messages-home-item}]
@@ -304,8 +286,8 @@
            :render-section-header-fn       contacts-section-header
            :render-fn                      contact-item}]]))]))

-(defn chats-list []
-  (let [loading? (rf/sub [:chats/loading?])]
+(views/defview chats-list []
+  (views/letsubs [loading? [:chats/loading?]]
    [:<>
     [connectivity/loading-indicator]
     (if loading?
@@ -313,24 +295,16 @@
        [rn/activity-indicator {:animating true}]]
       [chats])]))

-(defn plus-button []
-  (let [logging-in? (rf/sub [:multiaccounts/login])]
+(views/defview plus-button []
+  (views/letsubs [logging-in? [:multiaccounts/login]]
    [components.plus-button/plus-button
     {:on-press            (when-not logging-in?
-                             #(rf/dispatch [:bottom-sheet/show-sheet :add-new {}]))
+                             #(re-frame/dispatch [:bottom-sheet/show-sheet :add-new {}]))
      :loading             logging-in?
      :accessibility-label :new-chat-button}]))

-(defn plus-button-new-messages []
-  (let [logging-in? (rf/sub [:multiaccounts/login])]
-    [components.plus-button/plus-button
-     {:on-press            (when-not logging-in?
-                             #(rf/dispatch [:bottom-sheet/show-sheet :add-new-sheet-view {}]))
-      :loading             logging-in?
-      :accessibility-label :new-chat-button}]))
-
-(defn notifications-button []
-  (let [notif-count (rf/sub [:activity.center/notifications-count])]
+(views/defview notifications-button []
+  (views/letsubs [notif-count [:activity.center/notifications-count]]
    [rn/view
     [quo2.button/button {:type                :grey
                          :size                32
@@ -338,10 +312,10 @@
                          :style               {:margin-left 12}
                          :accessibility-label :notifications-button
                          :on-press            #(do
-                                                  (rf/dispatch [:mark-all-activity-center-notifications-as-read])
+                                                  (re-frame/dispatch [:mark-all-activity-center-notifications-as-read])
                                                  (if config/new-activity-center-enabled?
-                                                    (rf/dispatch [:navigate-to :activity-center])
-                                                    (rf/dispatch [:navigate-to :notifications-center])))}
+                                                    (re-frame/dispatch [:navigate-to :activity-center])
+                                                    (re-frame/dispatch [:navigate-to :notifications-center])))}
      [icons/icon :main-icons/notification2 {:color (colors/theme-colors colors/neutral-100 colors/white)}]]
     (when (pos? notif-count)
       [rn/view {:style          (merge (styles/counter-public-container) {:top 5 :right 5})
@@ -356,7 +330,7 @@
                       :width               32
                       :style               {:margin-left 12}
                       :on-press            #(do
-                                               (rf/dispatch [::qr-scanner/scan-code
+                                               (re-frame/dispatch [::qr-scanner/scan-code
                                                                   {:handler ::qr-scanner/on-scan-success}]))}
   [icons/icon :main-icons/qr2 {:color (colors/theme-colors colors/neutral-100 colors/white)}]])

@@ -366,12 +340,12 @@
                       :width               32
                       :accessibility-label "scan-button"
                       :on-press            #(do
-                                               (rf/dispatch [::qr-scanner/scan-code
-                                                             {:handler ::qr-scanner/on-scan-success}]))}
+                                               (re-frame/dispatch [::qr-scanner/scan-code
+                                                                   {:handler ::qr-scanner/on-scan-success}]))}
   [icons/icon :main-icons/scan2 {:color (colors/theme-colors colors/neutral-100 colors/white)}]])

-(defn profile-button []
-  (let [{:keys [public-key preferred-name emoji]} (rf/sub [:multiaccount])]
+(views/defview profile-button []
+  (views/letsubs [{:keys [public-key preferred-name emoji]} [:multiaccount]]
    [rn/view
     [chat-icon/emoji-chat-icon-view public-key false preferred-name emoji
      {:size      28
@@ -380,7 +354,7 @@
 (defn home []
  [:f>
   (fn []
-     (quo.react/effect! #(rf/dispatch [:get-activity-center-notifications]))
+     (quo.react/effect! #(re-frame/dispatch [:get-activity-center-notifications]))
     [rn/keyboard-avoiding-view {:style         {:flex             1
                                                 :background-color (colors/theme-colors colors/neutral-5 colors/neutral-95)}
                                 :ignore-offset true}
@@ -401,6 +375,6 @@
                :margin-top        15
                :margin-bottom     20}
       [quo2.text/text {:size :heading-1 :weight :semi-bold} (i18n/label :t/messages)]
-       [plus-button-new-messages]]
+       [plus-button]]
      [chats-list]])])

@@ -505,17 +505,17 @@
                              [{:type     :main
                                :on-press #(re-frame/dispatch [:chat.ui/reply-to-message message])
                                :id       :reply
-                                :icon     :i/reply
+                                :icon     :i/reply-context20
                                :label    (i18n/label :t/message-reply)}
                               {:type     :main
                                :on-press #(react/copy-to-clipboard (get content :text))
                                :id       :copy
-                                :icon     :i/copy
+                                :icon     :i/copy-context20
                                :label    (i18n/label :t/copy-text)}]
                              (when message-pin-enabled [{:type     :main
                                                          :on-press #(pin-message message)
                                                          :id       :pin
-                                                          :icon     :i/pin
+                                                          :icon     :i/pin-context20
                                                          :label    (if pinned (i18n/label :t/unpin) (i18n/label :t/pin))}]))))]
        (reset! ref on-long-press)
        [message-content-wrapper message
@@ -546,7 +546,7 @@
                        (on-long-press
                         (when-not outgoing
                           [{:type     :main
-                             :icon     :i/stickers
+                             :icon     :i/stickers-context20
                             :on-press #(when pack
                                          (re-frame/dispatch [:chat.ui/show-profile from]))
                             :label    (i18n/label :t/see-sticker-set)}])))]
@@ -574,31 +574,31 @@
                         (concat [{:type     :main
                                   :on-press #(re-frame/dispatch [:chat.ui/reply-to-message message])
                                   :id       :reply
-                                   :icon     :i/reply
+                                   :icon     :i/reply-context20
                                   :label    (i18n/label :t/message-reply)}
                                  {:type     :main
                                   :on-press #(re-frame/dispatch [:chat.ui/save-image-to-gallery (:image content)])
                                   :id       :save
-                                   :icon     :i/save
+                                   :icon     :i/save-context20
                                   :label    (i18n/label :t/save-image-library)}
                                  {:type     :main
                                   :on-press #(images/download-image-http
                                               (get-in message [:content :image]) preview/share)
                                   :id       :share
-                                   :icon     :i/share
+                                   :icon     :i/share-context20
                                   :label    (i18n/label :t/share-image)}]
                                 [{:type     :danger
                                   :on-press #(re-frame/dispatch
                                               [:chat.ui/delete-message-for-me message
                                                constants/delete-message-for-me-undo-time-limit-ms])
                                   :label    (i18n/label :t/delete-for-me)
-                                   :icon     :i/delete
+                                   :icon     :i/delete-context20
                                   :id       :delete-for-me}]
                                 (when (and outgoing config/delete-message-enabled?)
                                   [{:type     :danger
                                     :on-press #(re-frame/dispatch [:chat.ui/soft-delete-message message])
                                     :label    (i18n/label :t/delete-for-everyone)
-                                     :icon     :i/delete
+                                     :icon     :i/delete-context20
                                     :id       :delete}]))))]
    (reset! ref on-long-press)
    [message-content-wrapper message
@@ -622,20 +622,20 @@
                                                 {:type     :main
                                                  :on-press #(pin-message message)
                                                  :label    (i18n/label (if pinned :t/unpin-from-chat :t/pin-to-chat))
-                                                  :icon     :i/pin
+                                                  :icon     :i/pin-context20
                                                  :id       (if pinned :unpin :pin)}
                                                 {:type     :danger
                                                  :on-press #(re-frame/dispatch
                                                              [:chat.ui/delete-message-for-me message
                                                               constants/delete-message-for-me-undo-time-limit-ms])
                                                  :label    (i18n/label :t/delete-for-me)
-                                                  :icon     :i/delete
+                                                  :icon     :i/delete-context20
                                                  :id       :delete-for-me}
                                                 (when (and outgoing config/delete-message-enabled?)
                                                   {:type     :danger
                                                    :on-press #(re-frame/dispatch [:chat.ui/soft-delete-message message])
                                                    :label    (i18n/label :t/delete-for-everyone)
-                                                    :icon     :i/delete
+                                                    :icon     :i/delete-context20
                                                    :id       :delete})]))]
        (reset! ref on-long-press)
        [message-content-wrapper message
@@ -1,18 +0,0 @@
-(ns status-im.ui2.screens.common.alert.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(defn context-container []
-  {:flex-direction   :row
-   :background-color (colors/theme-colors colors/neutral-10 colors/neutral-80)
-   :border-radius    20
-   :align-items      :center
-   :align-self       :flex-start
-   :padding          4
-   :margin-top       8
-   :margin-left      -4
-   :margin-bottom    16})
-
-(defn buttons-container []
-  {:flex-direction  :row
-   :justify-content :space-between
-   :margin-top      20})
@@ -1,56 +0,0 @@
-(ns status-im.ui2.screens.common.alert.view
-  (:require
-   [reagent.core :as reagent]
-   [status-im.i18n.i18n :as i18n]
-   [status-im.utils.re-frame :as rf]
-   [quo2.components.markdown.text :as quo2.text]
-   [react-native.core :as rn]
-   [quo2.core :as quo2]
-   [quo2.components.buttons.button :as quo2.button]
-   [status-im.ui2.screens.common.alert.style :as style]
-   [quo2.components.selectors.selectors :as selectors]))
-
-(defn avatar [group-chat color display-name photo-path]
-  (if group-chat
-    [quo2/group-avatar {:color color
-                        :size  :small}]
-    [quo2/user-avatar {:full-name        display-name
-                       :profile-picture  photo-path
-                       :size             :xxs
-                       :status-indicator false}]))
-
-(defn extra-action-view [extra-action extra-text extra-action-selected?]
-  (when extra-action
-    [rn/view {:style {:margin-top 16 :flex-direction :row}}
-     [selectors/checkbox {:on-change (fn [selected?] (reset! extra-action-selected? selected?))}]
-     [quo2.text/text {:style {:margin-left 10}} extra-text]]))
-
-(defn alert [{:keys [title description context button-text on-press extra-action extra-text]}]
-  (let [extra-action-selected? (reagent/atom false)]
-    (fn []
-      (let [{:keys [group-chat chat-id public-key color name]} context
-            id           (or chat-id public-key)
-            display-name (if-not group-chat (first (rf/sub [:contacts/contact-two-names-by-identity id])) name)
-            contact      (when-not group-chat (rf/sub [:contacts/contact-by-address id]))
-            photo-path   (when-not (empty? (:images contact)) (rf/sub [:chats/photo-path id]))]
-        [rn/view {:style {:margin-horizontal 20}}
-         [quo2.text/text {:weight :semi-bold
-                          :size   :heading-1} title]
-         [rn/view {:style (style/context-container)}
-          [avatar group-chat color display-name photo-path]
-          [quo2.text/text {:weight :medium
-                           :size   :paragraph-2
-                           :style  {:margin-left 4}} display-name]]
-         [quo2.text/text description]
-         [extra-action-view extra-action extra-text extra-action-selected?]
-         [rn/view {:style (style/buttons-container)}
-          [quo2.button/button {:type     :grey
-                               :style    {:flex 0.48}
-                               :on-press #(rf/dispatch [:bottom-sheet/hide])}
-           (i18n/label :t/close)]
-          [quo2.button/button {:type     :danger
-                               :style    {:flex 0.48}
-                               :on-press #(do
-                                            (when @extra-action-selected? (extra-action))
-                                            (on-press))}
-           button-text]]]))))
@@ -1,4 +0,0 @@
-(ns status-im.ui2.screens.common.core
-  (:require status-im.ui2.screens.common.alert.view))
-
-(def alert status-im.ui2.screens.common.alert.view/alert)
@@ -8,7 +8,7 @@
            [quo2.foundations.colors :as colors]
            [quo2.components.community.discover-card :as discover-card]
            [quo2.components.navigation.top-nav :as topnav]
-            [status-im.utils.re-frame :as rf]
+            [status-im.utils.handlers :refer [<sub >evt]]
            [status-im.i18n.i18n :as i18n]
            [status-im.ui.components.list.views :as list]
            [status-im.ui.components.react :as rn]
@@ -18,24 +18,26 @@
 (def selected-tab (reagent/atom :joined))

 (defn plus-button []
-  (let [logging-in? (rf/sub [:multiaccounts/login])]
+  (let [logging-in? (<sub [:multiaccounts/login])]
    [components.plus-button/plus-button
     {:on-press (when-not logging-in?
                  #(re-frame/dispatch [:bottom-sheet/show-sheet :add-new {}]))
      :loading logging-in?
      :accessibility-label :new-chat-button}]))

-(defn render-fn [id]
-  (let [community-item  (rf/sub [:communities/home-item id])]
-    [community-list-view/communities-membership-list-item
-     {:on-press      (fn []
-                       (rf/dispatch [:communities/load-category-states id])
-                       (rf/dispatch [:dismiss-keyboard])
-                       (rf/dispatch [:navigate-to :community {:community-id id}]))
-      :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet
-                                    {:content (fn []
-                                                [community/community-actions community-item])}])}
-     community-item]))
+(defn render-fn [community-item]
+  [community-list-view/communities-membership-list-item
+   {:on-press      (fn []
+                     (>evt [:communities/load-category-states (:id community-item)])
+                     (>evt [:dismiss-keyboard])
+                     (>evt [:navigate-to :community {:community-id (:id community-item)}]))
+    :on-long-press #(>evt [:bottom-sheet/show-sheet
+                           {:content (fn []
+                                       [community/community-actions community-item])}])}
+   community-item])
+
+(defn community-list-key-fn [item]
+  (:id item))

 (defn get-item-layout-js [_ index]
  #js {:length 64 :offset (* 64 index) :index index})
@@ -53,19 +55,18 @@
                      {:id :pending  :label (i18n/label :t/pending)    :accessibility-label :pending-tab}
                      {:id :opened   :label (i18n/label :t/opened)     :accessibility-label :opened-tab}]}]])

-(defn communities-list [community-ids]
+(defn communities-list [communities]
  [list/flat-list
-   {:key-fn                            identity
+   {:key-fn                            community-list-key-fn
    :getItemLayout                     get-item-layout-js
    :keyboard-should-persist-taps      :always
    :shows-horizontal-scroll-indicator false
-    :data                              community-ids
+    :data                              communities
    :render-fn                         render-fn}])

 (defn segments-community-lists [communities]
  (let [tab @selected-tab]
    [rn/view {:style {:padding-left      20
-                      :padding-right     8
                      :padding-vertical  12}}
     (case tab
       :joined
@@ -95,13 +96,13 @@
   [plus-button]])

 (defn discover-card []
-  [discover-card/discover-card {:on-press            #(rf/dispatch [:navigate-to  :discover-communities])
+  [discover-card/discover-card {:on-press            #(>evt [:navigate-to  :discover-communities])
                                :title               (i18n/label :t/discover)
                                :description         (i18n/label :t/whats-trending)
                                :accessibility-label :communities-home-discover-card}])

 (defn communities-home []
-  (let [communities  (rf/sub [:communities/community-ids])]
+  (let [communities  (<sub [:communities/communities])]
    [rn/view  {:flex    1}
     [topnav/top-nav {:type    :default}]
     [title-column]
@@ -118,3 +119,5 @@
                                          colors/neutral-5
                                          colors/neutral-95)}}
      [communities-home]])])
+
+
@@ -1,36 +0,0 @@
-(ns status-im.ui2.screens.group.styles
-  (:require [quo.design-system.colors :as colors]
-            [quo2.foundations.colors :as quo2.colors]))
-
-(def group-container
-  {:flex             1
-   :flex-direction   :column
-   :background-color (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90)})
-
-(defn no-contact-text []
-  {:margin-bottom     20
-   :margin-horizontal 50
-   :text-align        :center
-   :color             colors/gray})
-
-(def toolbar-header-container
-  {:align-items :center})
-
-(defn toolbar-sub-header []
-  {:color colors/gray})
-
-(def no-contacts
-  {:flex 1
-   :justify-content :center
-   :align-items :center})
-
-(defn search-container []
-  {:border-bottom-color colors/gray-lighter
-   :background-color    (quo2.colors/theme-colors quo2.colors/white quo2.colors/neutral-90)
-   :padding-horizontal  20
-   :padding-top         10})
-
-(defn members-title []
-  {:color         colors/gray
-   :margin-top    14
-   :margin-bottom 4})
@@ -2,9 +2,24 @@
  (:require [quo.react-native :as rn]
            [quo.previews.preview :as preview]
            [reagent.core :as reagent]
+            [status-im.constants :as constants]
+            [quo.design-system.colors :as quo.colors]
            [quo2.foundations.colors :as colors]
            [quo2.components.community.community-list-view :as community-list-view]
-            [status-im.ui2.screens.quo2-preview.community.data :as data]))
+            [status-im.i18n.i18n :as i18n]
+            [status-im.react-native.resources :as resources]))
+
+(def community-data
+  {:id             constants/status-community-id
+   :name           "Status"
+   :description    "Status is a secure messaging app, crypto wallet and web3 browser built with the state of the art technology"
+   :cover          (resources/get-image :community-cover)
+   :community-icon (resources/get-image :status-logo)
+   :color          (rand-nth quo.colors/chat-colors)
+   :tokens         [{:id 1 :group [{:id 1 :token-icon (resources/get-image :status-logo)}]}]
+   :tags           [{:id 1 :tag-label (i18n/label :t/music) :resource (resources/get-image :music)}
+                    {:id 2 :tag-label (i18n/label :t/lifestyle) :resource (resources/get-image :lifestyle)}
+                    {:id 3 :tag-label (i18n/label :t/podcasts) :resource (resources/get-image :podcasts)}]})

 (def descriptor [{:label   "Notifications:"
                  :key     :notifications
@@ -41,15 +56,8 @@
         [preview/customizer state descriptor]]
        [rn/view {:padding-vertical 60
                  :justify-content  :center}
-         [community-list-view/communities-list-view-item {} (cond-> (merge @state data/community)
-                                                              (= :muted (:notifications @state))
-                                                              (assoc :muted? true)
-
-                                                              (= :unread-mentions-count (:notifications @state))
-                                                              (assoc :unread-mentions-count 5)
-
-                                                              (= :unread-messages-count (:notifications @state))
-                                                              (assoc :unread-messages? true))]]]])))
+         [community-list-view/communities-list-view-item {} (merge @state
+                                                                   community-data)]]]])))

 (defn preview-community-list-view []
  [rn/view {:background-color (colors/theme-colors colors/neutral-5
@@ -59,3 +67,4 @@
                  :keyboardShouldPersistTaps :always
                  :header                    [cool-preview]
                  :key-fn                    str}]])
+
@@ -1,61 +0,0 @@
-(ns status-im.ui2.screens.quo2-preview.community.community-membership-list-view
-  (:require [quo.react-native :as rn]
-            [quo.previews.preview :as preview]
-            [reagent.core :as reagent]
-            [quo2.foundations.colors :as colors]
-            [status-im.ui2.screens.quo2-preview.community.data :as data]
-            [quo2.components.community.community-list-view :as community-list-view]))
-
-(def descriptor [{:label   "Notifications:"
-                  :key     :notifications
-                  :type    :select
-                  :options [{:key   :muted
-                             :value "Muted"}
-                            {:key   :unread-mentions-count
-                             :value "Mention counts"}
-                            {:key   :unread-messages-count
-                             :value "Unread messages"}]}
-                 {:label   "Status:"
-                  :key     :status
-                  :type    :select
-                  :options [{:key   :gated
-                             :value "Gated"}
-                            {:key   :open
-                             :value "Open"}]}
-                 {:label   "Locked:"
-                  :key     :locked?
-                  :type    :boolean}])
-
-(defn cool-preview []
-  (let [notifications  (reagent/atom  (:notifications nil))
-        state          (reagent/atom {:locked?       true
-                                      :notifications nil
-                                      :status        (if notifications
-                                                       :gated
-                                                       :open)})]
-    (fn []
-      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
-       [rn/view {:padding-bottom 150}
-        [rn/view {:flex 1
-                  :padding       16}
-         [preview/customizer state descriptor]]
-        [rn/view {:padding-vertical 60
-                  :justify-content  :center}
-         [community-list-view/communities-membership-list-item {} (cond-> (merge @state data/community)
-                                                                    (= :muted (:notifications @state))
-                                                                    (assoc :muted? true)
-
-                                                                    (= :unread-mentions-count (:notifications @state))
-                                                                    (assoc :unread-mentions-count 5)
-
-                                                                    (= :unread-messages-count (:notifications @state))
-                                                                    (assoc :unread-messages? true))]]]])))
-
-(defn preview-community-list-view []
-  [rn/view {:background-color (colors/theme-colors colors/neutral-5
-                                                   colors/neutral-95)
-            :flex             1}
-   [rn/flat-list {:flex                      1
-                  :keyboardShouldPersistTaps :always
-                  :header                    [cool-preview]
-                  :key-fn                    str}]])
@@ -1,18 +0,0 @@
-(ns status-im.ui2.screens.quo2-preview.community.data
-  (:require
-   [quo.design-system.colors :as quo.colors]
-   [status-im.i18n.i18n :as i18n]
-   [status-im.react-native.resources :as resources]))
-
-(def thumbnail "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII")
-
-(def community
-  {:id             "0xsomeid"
-   :name           "Status"
-   :description    "Status is a secure messaging app, crypto wallet and web3 browser built with the state of the art technology"
-   :community-icon thumbnail
-   :color          (rand-nth quo.colors/chat-colors)
-   :tokens         [{:id 1 :group [{:id 1 :token-icon (resources/get-image :status-logo)}]}]
-   :tags           [{:id 1 :tag-label (i18n/label :t/music) :resource (resources/get-image :music)}
-                    {:id 2 :tag-label (i18n/label :t/lifestyle) :resource (resources/get-image :lifestyle)}
-                    {:id 3 :tag-label (i18n/label :t/podcasts) :resource (resources/get-image :podcasts)}]})
@@ -16,7 +16,6 @@
            [status-im.ui2.screens.quo2-preview.counter.counter :as counter]
            [status-im.ui2.screens.quo2-preview.community.community-card-view :as community-card]
            [status-im.ui2.screens.quo2-preview.community.community-list-view :as community-list-view]
-            [status-im.ui2.screens.quo2-preview.community.community-membership-list-view :as community-membership-list-view]
            [status-im.ui2.screens.quo2-preview.community.discover-card :as discover-card]
            [status-im.ui2.screens.quo2-preview.dividers.divider-label :as divider-label]
            [status-im.ui2.screens.quo2-preview.dividers.new-messages :as new-messages]
@@ -87,9 +86,6 @@
               {:name      :community-list-view
                :insets    {:top false}
                :component community-list-view/preview-community-list-view}
-               {:name      :community-membership-list-view
-                :insets    {:top false}
-                :component community-membership-list-view/preview-community-list-view}
               {:name      :discover-card
                :insets    {:top false}
                :component discover-card/preview-discoverd-card}]
@@ -9,7 +9,7 @@
            [status-im2.navigation.screens :as screens]
            [status-im2.setup.config :as config]

-    ;; TODO (14/11/22 flexsurfer) move to status-im2 namespace
+            ;; TODO (14/11/22 flexsurfer) move to status-im2 namespace
            [status-im.ui.screens.popover.views :as popover]
            [status-im.ui.screens.profile.visibility-status.views :as visibility-status-views]
            [status-im.ui.screens.bottom-sheets.views :as bottom-sheets]
@@ -41,7 +41,7 @@
    ;:background-color colors/white} ;; TODO ajust color
   (when platform/android?
     {:border-bottom-width 1})
-    ;:border-bottom-color colors/gray-lighter}) ;; TODO ajust color
+      ;:border-bottom-color colors/gray-lighter}) ;; TODO ajust color
   style
   (when (get insets :bottom)
     {:padding-bottom (+ (oget insets-obj "bottom")
@@ -108,7 +108,7 @@
    :blank-keycard-title
    :block
    :block-contact
-    :block-user-confirmation
+    :block-contact-details
    :blocked-users
    :bootnode-address
    :bootnode-details
@@ -99,29 +99,6 @@
               (string/includes? (string/lower-case (str name)) search-filter))))
    (vals communities))))

-(re-frame/reg-sub
- :communities/community-ids
- :<- [:communities/communities]
- (fn [communities]
-   (map :id communities)))
-
-(defn community->home-item [community counts]
-  {:name                  (:name community)
-   :muted?                (:muted community)
-   :unread-messages?      (pos? (:unviewed-messages-count counts))
-   :unread-mentions-count (:unviewed-mentions-count counts)
-   :community-icon        (get-in community [:images :thumbnail :uri])})
-
-(re-frame/reg-sub
- :communities/home-item
- (fn [[_ community-id]]
-   [(re-frame/subscribe [:raw-communities])
-    (re-frame/subscribe [:communities/unviewed-counts community-id])])
- (fn [[communities counts] [_ identity]]
-   (community->home-item
-    (get communities identity)
-    counts)))
-
 (re-frame/reg-sub
 :communities/edited-community
 :<- [:communities]
@@ -146,20 +123,17 @@
           0
           chats)))

-(defn calculate-unviewed-counts [chats]
-  (reduce (fn [acc {:keys [unviewed-mentions-count unviewed-messages-count]}]
-            {:unviewed-messages-count (+ (:unviewed-messages-count acc) (or unviewed-messages-count 0))
-             :unviewed-mentions-count (+ (:unviewed-mentions-count acc) (or unviewed-mentions-count 0))})
-          {:unviewed-messages-count 0
-           :unviewed-mentions-count 0}
-          chats))
-
 (re-frame/reg-sub
 :communities/unviewed-counts
 (fn [[_ community-id]]
   [(re-frame/subscribe [:chats/by-community-id community-id])])
 (fn [[chats]]
-   (calculate-unviewed-counts chats)))
+   (reduce (fn [acc {:keys [unviewed-mentions-count unviewed-messages-count]}]
+             {:unviewed-messages-count (+ (:unviewed-messages-count acc) (or unviewed-messages-count 0))
+              :unviewed-mentions-count (+ (:unviewed-mentions-count acc) (or unviewed-mentions-count 0))})
+           {:unviewed-messages-count 0
+            :unviewed-mentions-count 0}
+           chats)))

 (re-frame/reg-sub
 :communities/requests-to-join-for-community
@@ -185,4 +159,4 @@
   (->> (get-in communities [id :categories])
        (map #(assoc (get % 1) :community-id id))
        (sort-by :position)
-        (into []))))
+        (into []))))
@@ -1,40 +0,0 @@
-(ns status-im2.subs.communities-test
-  (:require [cljs.test :refer [deftest is testing]]
-            [status-im2.subs.communities :as subs]))
-
-(deftest community->home-item-test
-  (testing "has unread messages"
-    (is (= {:name                  "name-1"
-            :muted?                true
-            :unread-messages?      true
-            :unread-mentions-count 5
-            :community-icon        "icon-1"}
-           (subs/community->home-item
-            {:name "name-1"
-             :muted true
-             :images {:thumbnail {:uri "icon-1"}}}
-            {:unviewed-messages-count 1
-             :unviewed-mentions-count 5}))))
-  (testing "no unread messages"
-    (is (= {:name                  "name-2"
-            :muted?                false
-            :unread-messages?      false
-            :unread-mentions-count 5
-            :community-icon        "icon-2"}
-           (subs/community->home-item
-            {:name "name-2"
-             :muted false
-             :images {:thumbnail {:uri "icon-2"}}}
-            {:unviewed-messages-count 0
-             :unviewed-mentions-count 5})))))
-
-(deftest calculate-unviewed-counts-test
-  (let [chats [{:unviewed-messages-count 1
-                :unviewed-mentions-count 2}
-               {:unviewed-messages-count 3
-                :unviewed-mentions-count 0}
-               {:unviewed-messages-count 2
-                :unviewed-mentions-count 1}]]
-    (is (= {:unviewed-messages-count 6
-            :unviewed-mentions-count 3}
-           (subs/calculate-unviewed-counts chats)))))
@@ -6,8 +6,7 @@
            [clojure.string :as string]
            [status-im.multiaccounts.core :as multiaccounts]
            [status-im.utils.gfycat.core :as gfycat]
-            [status-im.ethereum.core :as ethereum]
-            [status-im.constants :as constants]))
+            [status-im.ethereum.core :as ethereum]))

 (re-frame/reg-sub
 ::query-current-chat-contacts
@@ -69,21 +68,6 @@
 (fn [contacts]
   (contact.db/get-active-contacts contacts)))

-(re-frame/reg-sub
- :contacts/sorted-and-grouped-by-first-letter
- :<- [:contacts/active]
- :<- [:selected-contacts-count]
- (fn [[contacts selected-contacts-count]]
-   (->> contacts
-        (filter :mutual?)
-        (map #(assoc % :allow-new-users? (< selected-contacts-count
-                                            (dec constants/max-group-chat-participants))))
-        (group-by (comp (fnil string/upper-case "") first :alias))
-        (sort-by (fn [[title]] title))
-        (map (fn [[title data]]
-               {:title title
-                :data  data})))))
-
 (re-frame/reg-sub
 :contacts/sorted-contacts
 :<- [:contacts/active]
@@ -3,7 +3,7 @@
    "_comment": "Instead use: scripts/update-status-go.sh <rev>",
    "owner": "status-im",
    "repo": "status-go",
-    "version": "v0.115.0",
-    "commit-sha1": "2341dedfbabfb8e392aaa49ecb9bb7fab6a74b99",
-    "src-sha256": "1x8r3rln2vna82kkvl42q11wh7zn2acr3crzj63pzcawdsr6l990"
+    "version": "lc-proxy",
+    "commit-sha1": "5aad6fa064fedbdfec6e8ae438377999a38b3fec",
+    "src-sha256": "0vgm84a56i5mhgh7ml81dcc6z86a030ihb1fimkrzc7gi34d7ccs"
 }
@@ -90,7 +90,7 @@
    "block": "Block",
    "unblock": "Unblock",
    "block-contact": "Block this user",
-    "block-user-confirmation": "Blocking will delete this user's previous messages and stop new ones from reaching you",
+    "block-contact-details": "Blocking will delete this user's previous messages and stop new ones from reaching you",
    "blocked-users": "Blocked users",
    "bootnode-address": "Bootnode address",
    "bootnode-details": "Bootnode details",
@@ -1457,8 +1457,6 @@
    "set-custom-fee": "Set custom fee",
    "not-enough-snt": "Not enough SNT",
    "add-new-contact": "Add new contact",
-    "add-a-contact": "Add a contact",
-    "enter-a-chat-key": "Enter a chat key or scan a QR",
    "you-dont-have-contacts": "You don’t have any contacts yet.",
    "set-max": "Set max",
    "continue-anyway": "Continue anyway",
@@ -1850,16 +1848,5 @@
    "group-details": "Group details",
    "edit-name-and-image": "Edit name and image",
    "change-group-privacy": "Change group privacy",
-    "manage-members": "Manage members",
-    "delete-chat?": "Delete Chat?",
-    "mark-user-untrustworthy": "Mark {{username}} as untrustworthy",
-    "leave-group?": "Leave Group?",
-    "block-user?": "Block User?",
-    "clear-history?": "Clear History?",
-    "chat-with": "Chat with {{selected-user}}",
-    "setup-group-chat": "Setup group chat",
-    "search-contacts": "Search contacts",
-    "who-are-you-looking-for": "Who are you looking for ?",
-    "close-contact-search": "Close contact search",
-    "selected-count-from-max": "{{selected}}/{{max}}"
+    "manage-members": "Manage members"
 }
Author	SHA1	Message	Date
Vitaliy Vlasov	cdbfc1ed1f	overlay fix	2023-02-10 13:00:12 +02:00
Vitaliy Vlasov	63ead3d588	gomobile_src_override	2023-02-09 10:56:39 +02:00
Vitaliy Vlasov	5d2b0c026e	use static lib	2023-01-23 16:21:29 +02:00
Vitaliy Vlasov	1083547561	Add tag to status-go builds https://github.com/status-im/status-go/compare/7662cd61...5aad6fa0	2023-01-20 11:56:15 +02:00
Vitaliy Vlasov	bf7d71d716	liblcproxy->libverifproxy	2023-01-09 17:58:35 +02:00
Vitaliy Vlasov	922c4d6128	Integrate status-go with nimbus-light-client https://github.com/status-im/status-go/compare/7662cd61...756511d9	2022-12-23 20:20:46 +02:00
Vitaliy Vlasov	9ff1e054c9	Remove commented lines	2022-12-16 21:00:43 +02:00
Vitaliy Vlasov	6c79f158b3	Fix ios builds for x86	2022-12-16 20:41:47 +02:00
Vitaliy Vlasov	ff0d042e60	Fix ios build for arm64	2022-12-16 16:42:09 +02:00
Vitaliy Vlasov	178d65795b	Remove unneeded include flags, add --debuginfo:off to nim compiler invocation	2022-12-14 20:13:40 +02:00
Vitaliy Vlasov	8e1e0a77c9	Use compiler flags directly instead of config.nims changes	2022-12-09 13:37:57 +02:00
Vitaliy Vlasov	7659c43372	Simplify build, fix clang fork issue	2022-12-08 21:47:32 +02:00
Vitaliy Vlasov	92b2f50630	Compilation fixes	2022-11-30 21:29:54 +02:00
Vitaliy Vlasov	f84f0312af	Fix libbacktrace build with seds, make -e	2022-11-28 12:49:19 +02:00
Vitaliy Vlasov	6a8035967f	Separate Nim compiler derivation, miniupnpc fixes for Android	2022-11-22 13:17:00 +02:00
Vitaliy Vlasov	56a5570c20	Nix changes (initial)	2022-11-18 17:45:39 +02:00