Merge branch 'develop' into 14781

Flat list won't scroll inside photo selector
Disable starting a new chat for non mutual contact (#14726 )
2023-01-14 15:38:50 +02:00 · 2023-01-14 15:37:18 +02:00 · 2023-01-14 12:57:45 +02:00 · 2023-01-13 19:22:51 +01:00 · 2023-01-14 02:14:02 +08:00 · 2023-01-13 17:22:13 +00:00
112 changed files with 2654 additions and 1403 deletions
@@ -1,4 +1,4 @@
-.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-mk _tmpdir-rm _install-hooks
+.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-rm

 help: SHELL := /bin/sh
 help: ##@other Show this help
@@ -118,10 +118,11 @@ _fix-node-perms: ##@prepare Fix permissions so that directory can be cleaned
 	$(shell test -d node_modules && chmod -R 744 node_modules)
 	$(shell test -d node_modules.tmp && chmod -R 744 node_modules.tmp)

-_tmpdir-mk: SHELL := /bin/sh
-_tmpdir-mk: ##@prepare Create a TMPDIR for temporary files
+$(TMPDIR): SHELL := /bin/sh
+$(TMPDIR): ##@prepare Create a TMPDIR for temporary files
 	@mkdir -p "$(TMPDIR)"
 # Make sure TMPDIR exists every time make is called
+_tmpdir-mk: $(TMPDIR)
 -include _tmpdir-mk

 _tmpdir-rm: SHELL := /bin/sh
@@ -154,7 +155,7 @@ pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile

 update-fleets: ##@prepare Download up-to-date JSON file with current fleets state
 	curl -s https://fleets.status.im/ \
-		| jq --indent 4 --sort-keys . \
+		| sed 's/"warning": "/"warning": "DO NOT EDIT! /' \
 		> resources/config/fleets.json

 $(KEYSTORE_PATH): export TARGET := keytool
@@ -285,18 +286,24 @@ endif
 # Tests
 #--------------

+# Get all clojure files, including untracked, excluding removed
+define find_all_clojure_files
+$$(comm -23 <(sort <(git ls-files --cached --others --exclude-standard)) <(sort <(git ls-files --deleted)) | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn)
+endef
+
 lint: export TARGET := default
 lint: ##@test Run code style checks
-	sh scripts/lint-re-frame-in-quo-components.sh && \
+	@sh scripts/lint-re-frame-in-quo-components.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
-	ALL_CLOJURE_FILE=$$(git ls-files | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn$$) && \
-	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILE
+	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
+	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES

+# NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
 lint-fix: export TARGET := default
 lint-fix: ##@test Run code style checks and fix issues
-	ALL_CLOJURE_FILE=$$(git ls-files | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn$$) && \
-	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILE && \
-	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILE
+	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
+	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
+	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES


 shadow-server: export TARGET := clojure
@@ -4,7 +4,7 @@ library 'status-jenkins-lib@v1.6.3'
 def isPRBuild = utils.isPRBuild()

 pipeline {
-  agent { label 'macos && x86_64 && nix-2.11 && xcode-13.4' }
+  agent { label 'macos && arm64 && nix-2.11 && xcode-14.2' }

  parameters {
    string(
@@ -35,20 +35,24 @@ abstract_target 'Status' do
  target 'StatusImPR' do
  end

-  #commented out temporarily
-  #use_flipper!({ 'Flipper' => '0.74.0' })
-  #post_install do |installer|
-  #  flipper_post_install(installer)
-  #end
-
-  # some of libs wouldn't be build for x86_64 otherwise and that is
-  # necessary for ios simulators
-  post_install do |installer_representation|
-    installer_representation.pods_project.targets.each do |target|
+  post_install do |installer|
+    # some of libs wouldn't be build for x86_64 otherwise and that is
+    # necessary for ios simulators
+    installer.pods_project.targets.each do |target|
      target.build_configurations.each do |config|
        config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
      end
    end
+
+    # FIXME: Fix dependency signing broken on Xcode 14 due to lack of Team ID.
+    # https://github.com/CocoaPods/CocoaPods/issues/11402
+    installer.pods_project.targets.each do |target|
+      if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+        target.build_configurations.each do |config|
+          config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
+      end
+    end
  end

  use_native_modules!
@@ -640,7 +640,7 @@ SPEC CHECKSUMS:
  FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
  FBReactNativeSpec: 7dfb84f624136a45727c813ed21d130cd3e61beb
  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 36ce0530c6d2c3a5a4326885ef4069564887a1db
+  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
@@ -10,7 +10,6 @@
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		1DD629CDA66802C7E5575C38 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9674A3ACAC81C20142ABF2DC /* libPods-Status-StatusImPR.a */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
 		3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; };
@@ -45,16 +44,17 @@
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		A0093AB50DA85E1D01818CCA /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E88D313E5D854BE6BC81FC1 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
-		B2A2642817FA09632CAAE2BA /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 011AA4853B13093497B93F8C /* libPods-Status-StatusIm.a */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
 		BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; };
+		BFF6343F5A1F0F5FFFC8D020 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A4B974811E312E44D5BBE9EC /* libPods-Status-StatusIm-StatusImTests.a */; };
 		CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.xcframework */; };
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
+		E9C92E7783C7FB91C9616112 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57CBBEA420F440D344DD99E5 /* libPods-Status-StatusImPR.a */; };
+		F51761A0F4D1FAE41A72435A /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928CC6D1D5BCCF9D3BC60D6A /* libPods-Status-StatusIm.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -102,35 +102,39 @@
 		00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		011AA4853B13093497B93F8C /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = StatusIm/AppDelegate.m; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
-		1E88D313E5D854BE6BC81FC1 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
 		3AAD2ADC24A3A60E0075D594 /* Status PR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Status PR.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
-		45E0DC52E25A332264874B0F /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
+		43341A7CBCE457435677CC51 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		564309A78329EB657677709C /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
+		57CBBEA420F440D344DD99E5 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		5F30F922E4B02AB10F6CB65E /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
+		70ACC04C7CF0A6C6421A805D /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
-		7AFBE28450C0239119FBDBA2 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
+		8B3C115CD813729DE4735219 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+		8D3CFDC9666FBD03D1AA059A /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
-		9674A3ACAC81C20142ABF2DC /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		928CC6D1D5BCCF9D3BC60D6A /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
+		A4B974811E312E44D5BBE9EC /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
@@ -138,13 +142,9 @@
 		B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = "<group>"; };
 		B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = "<group>"; };
 		B321D25F4493470980039457 /* Inter-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BoldItalic.otf"; path = "../resources/fonts/Inter-BoldItalic.otf"; sourceTree = "<group>"; };
-		B650FC314F823A68E7CE11D5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
-		BB42B2C150BA8A2AA109EA43 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
-		BF23313BEFBC84C6BB7E7677 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		FBF6AB84EBC2085D28C3CDEF /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -152,7 +152,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A0093AB50DA85E1D01818CCA /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				BFF6343F5A1F0F5FFFC8D020 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -165,7 +165,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				B2A2642817FA09632CAAE2BA /* libPods-Status-StatusIm.a in Frameworks */,
+				F51761A0F4D1FAE41A72435A /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -179,7 +179,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				1DD629CDA66802C7E5575C38 /* libPods-Status-StatusImPR.a in Frameworks */,
+				E9C92E7783C7FB91C9616112 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -302,9 +302,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				011AA4853B13093497B93F8C /* libPods-Status-StatusIm.a */,
-				1E88D313E5D854BE6BC81FC1 /* libPods-Status-StatusIm-StatusImTests.a */,
-				9674A3ACAC81C20142ABF2DC /* libPods-Status-StatusImPR.a */,
+				928CC6D1D5BCCF9D3BC60D6A /* libPods-Status-StatusIm.a */,
+				A4B974811E312E44D5BBE9EC /* libPods-Status-StatusIm-StatusImTests.a */,
+				57CBBEA420F440D344DD99E5 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -312,12 +312,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				BB42B2C150BA8A2AA109EA43 /* Pods-Status-StatusIm.debug.xcconfig */,
-				45E0DC52E25A332264874B0F /* Pods-Status-StatusIm.release.xcconfig */,
-				7AFBE28450C0239119FBDBA2 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				B650FC314F823A68E7CE11D5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				FBF6AB84EBC2085D28C3CDEF /* Pods-Status-StatusImPR.debug.xcconfig */,
-				BF23313BEFBC84C6BB7E7677 /* Pods-Status-StatusImPR.release.xcconfig */,
+				564309A78329EB657677709C /* Pods-Status-StatusIm.debug.xcconfig */,
+				5F30F922E4B02AB10F6CB65E /* Pods-Status-StatusIm.release.xcconfig */,
+				43341A7CBCE457435677CC51 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				70ACC04C7CF0A6C6421A805D /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				8D3CFDC9666FBD03D1AA059A /* Pods-Status-StatusImPR.debug.xcconfig */,
+				8B3C115CD813729DE4735219 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -329,11 +329,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				9EDBFFDF8534CA0328CECC7B /* [CP] Check Pods Manifest.lock */,
+				0F876BD5356F61BF142A01A0 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				BE7BAE4A16BB2298029AE05C /* [CP] Copy Pods Resources */,
+				6ECED279DE66BA46FFB5EE0D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -349,14 +349,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				3A2B06D667746967CAF851DA /* [CP] Check Pods Manifest.lock */,
+				119C58BA120E4E4D213DA7CD /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				CBFE8A62956C05D561D73D56 /* [CP] Copy Pods Resources */,
+				3C1038075AE5E6FB86AC2319 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -371,14 +371,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				D0BDEAC0595D0C2E7409DBA0 /* [CP] Check Pods Manifest.lock */,
+				50F1BA2DC5224CBE6FDD2998 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				7C4DF7147D0F01A8C9DB77D3 /* [CP] Copy Pods Resources */,
+				E732E3E1B024946173BF6D3D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -528,7 +528,29 @@
 			shellPath = /bin/sh;
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"node\"\nexport NODE_ARGS=\" --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./react-native-xcode.log 2>&1";
 		};
-		3A2B06D667746967CAF851DA /* [CP] Check Pods Manifest.lock */ = {
+		0F876BD5356F61BF142A01A0 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		119C58BA120E4E4D213DA7CD /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -578,73 +600,7 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
 		};
-		7C4DF7147D0F01A8C9DB77D3 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		9EDBFFDF8534CA0328CECC7B /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		BE7BAE4A16BB2298029AE05C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		CBFE8A62956C05D561D73D56 /* [CP] Copy Pods Resources */ = {
+		3C1038075AE5E6FB86AC2319 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -666,7 +622,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D0BDEAC0595D0C2E7409DBA0 /* [CP] Check Pods Manifest.lock */ = {
+		50F1BA2DC5224CBE6FDD2998 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -688,6 +644,28 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		6ECED279DE66BA46FFB5EE0D /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -702,6 +680,28 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
 		};
+		E732E3E1B024946173BF6D3D /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -749,7 +749,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFBE28450C0239119FBDBA2 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = 43341A7CBCE457435677CC51 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -786,7 +786,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = B650FC314F823A68E7CE11D5 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 70ACC04C7CF0A6C6421A805D /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -819,7 +819,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BB42B2C150BA8A2AA109EA43 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = 564309A78329EB657677709C /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -893,7 +893,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 45E0DC52E25A332264874B0F /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 5F30F922E4B02AB10F6CB65E /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -957,7 +957,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FBF6AB84EBC2085D28C3CDEF /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 8D3CFDC9666FBD03D1AA059A /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1026,7 +1026,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BF23313BEFBC84C6BB7E7677 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 8B3C115CD813729DE4735219 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1,165 +1,197 @@
 {
-  "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"
-      }
+    "meta": {
+        "hostname": "node-01.do-ams3.sites.misc",
+        "timestamp": "2023-01-05T10:03:38.657813",
+        "warning": "DO NOT EDIT! Auto generated from Consul. Should only be used at build time."
    },
-    "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"]
+    "fleets": {
+        "eth.prod": {
+            "boot": {
+                "boot-01.do-ams3.eth.prod": "enode://436cc6f674928fdc9a9f7990f2944002b685d1c37f025c1be425185b5b1f0900feaf1ccc2a6130268f9901be4a7d252f37302c8335a2c1a62736e9232691cc3a@178.128.138.128:443",
+                "boot-02.do-ams3.eth.prod": "enode://5395aab7833f1ecb671b59bf0521cf20224fe8162fc3d2675de4ee4d5636a75ec32d13268fc184df8d1ddfa803943906882da62a4df42d4fccf6d17808156a87@178.128.140.188:443",
+                "boot-01.gc-us-central1-a.eth.prod": "enode://32ff6d88760b0947a3dee54ceff4d8d7f0b4c023c6dad34568615fcae89e26cc2753f28f12485a4116c977be937a72665116596265aa0736b53d46b27446296a@34.70.75.208:443",
+                "boot-02.gc-us-central1-a.eth.prod": "enode://5405c509df683c962e7c9470b251bb679dd6978f82d5b469f1f6c64d11d50fbd5dd9f7801c6ad51f3b20a5f6c7ffe248cc9ab223f8bcbaeaf14bb1c0ef295fd0@35.223.215.156:443",
+                "boot-01.ac-cn-hongkong-c.eth.prod": "enode://6e6554fb3034b211398fcd0f0082cbb6bd13619e1a7e76ba66e1809aaa0c5f1ac53c9ae79cf2fd4a7bacb10d12010899b370c75fed19b991d9c0cdd02891abad@47.75.99.169:443",
+                "boot-02.ac-cn-hongkong-c.eth.prod": "enode://23d0740b11919358625d79d4cac7d50a34d79e9c69e16831c5c70573757a1f5d7d884510bc595d7ee4da3c1508adf87bbc9e9260d804ef03f8c1e37f2fb2fc69@47.52.106.107:443"
+            },
+            "mail": {
+                "mail-01.do-ams3.eth.prod": "enode://c42f368a23fa98ee546fd247220759062323249ef657d26d357a777443aec04db1b29a3a22ef3e7c548e18493ddaf51a31b0aed6079bd6ebe5ae838fcfaf3a49@178.128.142.54:443",
+                "mail-02.do-ams3.eth.prod": "enode://7aa648d6e855950b2e3d3bf220c496e0cae4adfddef3e1e6062e6b177aec93bc6cdcf1282cb40d1656932ebfdd565729da440368d7c4da7dbd4d004b1ac02bf8@178.128.142.26:443",
+                "mail-03.do-ams3.eth.prod": "enode://8a64b3c349a2e0ef4a32ea49609ed6eb3364be1110253c20adc17a3cebbc39a219e5d3e13b151c0eee5d8e0f9a8ba2cd026014e67b41a4ab7d1d5dd67ca27427@178.128.142.94:443",
+                "mail-01.gc-us-central1-a.eth.prod": "enode://ee2b53b0ace9692167a410514bca3024695dbf0e1a68e1dff9716da620efb195f04a4b9e873fb9b74ac84de801106c465b8e2b6c4f0d93b8749d1578bfcaf03e@104.197.238.144:443",
+                "mail-02.gc-us-central1-a.eth.prod": "enode://30211cbd81c25f07b03a0196d56e6ce4604bb13db773ff1c0ea2253547fafd6c06eae6ad3533e2ba39d59564cfbdbb5e2ce7c137a5ebb85e99dcfc7a75f99f55@23.236.58.92:443",
+                "mail-03.gc-us-central1-a.eth.prod": "enode://44160e22e8b42bd32a06c1532165fa9e096eebedd7fa6d6e5f8bbef0440bc4a4591fe3651be68193a7ec029021cdb496cfe1d7f9f1dc69eb99226e6f39a7a5d4@35.225.221.245:443",
+                "mail-01.ac-cn-hongkong-c.eth.prod": "enode://606ae04a71e5db868a722c77a21c8244ae38f1bd6e81687cc6cfe88a3063fa1c245692232f64f45bd5408fed5133eab8ed78049332b04f9c110eac7f71c1b429@47.75.247.214:443",
+                "mail-02.ac-cn-hongkong-c.eth.prod": "enode://2c8de3cbb27a3d30cbb5b3e003bc722b126f5aef82e2052aaef032ca94e0c7ad219e533ba88c70585ebd802de206693255335b100307645ab5170e88620d2a81@47.244.221.14:443",
+                "mail-03.ac-cn-hongkong-c.eth.prod": "enode://e85f1d4209f2f99da801af18db8716e584a28ad0bdc47fbdcd8f26af74dbd97fc279144680553ec7cd9092afe683ddea1e0f9fc571ebcb4b1d857c03a088853d@47.244.129.82:443"
+            },
+            "whisper": {
+                "node-01.do-ams3.eth.prod": "enode://66ba15600cda86009689354c3a77bdf1a97f4f4fb3ab50ffe34dbc904fac561040496828397be18d9744c75881ffc6ac53729ddbd2cdbdadc5f45c400e2622f7@178.128.141.87:443",
+                "node-02.do-ams3.eth.prod": "enode://4ea35352702027984a13274f241a56a47854a7fd4b3ba674a596cff917d3c825506431cf149f9f2312a293bb7c2b1cca55db742027090916d01529fe0729643b@134.209.136.79:443",
+                "node-03.do-ams3.eth.prod": "enode://ce559a37a9c344d7109bd4907802dd690008381d51f658c43056ec36ac043338bd92f1ac6043e645b64953b06f27202d679756a9c7cf62fdefa01b2e6ac5098e@134.209.136.123:443",
+                "node-04.do-ams3.eth.prod": "enode://4e0a8db9b73403c9339a2077e911851750fc955db1fc1e09f81a4a56725946884dd5e4d11258eac961f9078a393c45bcab78dd0e3bc74e37ce773b3471d2e29c@134.209.136.101:443",
+                "node-05.do-ams3.eth.prod": "enode://a8bddfa24e1e92a82609b390766faa56cf7a5eef85b22a2b51e79b333c8aaeec84f7b4267e432edd1cf45b63a3ad0fc7d6c3a16f046aa6bc07ebe50e80b63b8c@178.128.141.249:443",
+                "node-06.do-ams3.eth.prod": "enode://887cbd92d95afc2c5f1e227356314a53d3d18855880ac0509e0c0870362aee03939d4074e6ad31365915af41d34320b5094bfcc12a67c381788cd7298d06c875@178.128.141.0:443",
+                "node-07.do-ams3.eth.prod": "enode://2b01955d7e11e29dce07343b456e4e96c081760022d1652b1c4b641eaf320e3747871870fa682e9e9cfb85b819ce94ed2fee1ac458904d54fd0b97d33ba2c4a4@134.209.136.112:443",
+                "node-08.do-ams3.eth.prod": "enode://0d9d65fcd5592df33ed4507ce862b9c748b6dbd1ea3a1deb94e3750052760b4850aa527265bbaf357021d64d5cc53c02b410458e732fafc5b53f257944247760@178.128.141.42:443",
+                "node-01.gc-us-central1-a.eth.prod": "enode://182ed5d658d1a1a4382c9e9f7c9e5d8d9fec9db4c71ae346b9e23e1a589116aeffb3342299bdd00e0ab98dbf804f7b2d8ae564ed18da9f45650b444aed79d509@34.68.132.118:443",
+                "node-02.gc-us-central1-a.eth.prod": "enode://fbeddac99d396b91d59f2c63a3cb5fc7e0f8a9f7ce6fe5f2eed5e787a0154161b7173a6a73124a4275ef338b8966dc70a611e9ae2192f0f2340395661fad81c0@34.67.230.193:443",
+                "node-03.gc-us-central1-a.eth.prod": "enode://c07aa0deea3b7056c5d45a85bca42f0d8d3b1404eeb9577610f386e0a4744a0e7b2845ae328efc4aa4b28075af838b59b5b3985bffddeec0090b3b7669abc1f3@35.226.92.155:443",
+                "node-04.gc-us-central1-a.eth.prod": "enode://0624b4a90063923c5cc27d12624b6a49a86dfb3623fcb106801217fdbab95f7617b83fa2468b9ae3de593ff6c1cf556ccf9bc705bfae9cb4625999765127b423@35.222.158.246:443",
+                "node-05.gc-us-central1-a.eth.prod": "enode://a5fe9c82ad1ffb16ae60cb5d4ffe746b9de4c5fbf20911992b7dd651b1c08ba17dd2c0b27ee6b03162c52d92f219961cc3eb14286aca8a90b75cf425826c3bd8@104.154.230.58:443",
+                "node-06.gc-us-central1-a.eth.prod": "enode://282e009967f9f132a5c2dd366a76319f0d22d60d0c51f7e99795a1e40f213c2705a2c10e4cc6f3890319f59da1a535b8835ed9b9c4b57c3aad342bf312fd7379@35.223.240.17:443",
+                "node-07.gc-us-central1-a.eth.prod": "enode://b706a60572634760f18a27dd407b2b3582f7e065110dae10e3998498f1ae3f29ba04db198460d83ed6d2bfb254bb06b29aab3c91415d75d3b869cd0037f3853c@35.239.5.162:443",
+                "node-08.gc-us-central1-a.eth.prod": "enode://e87f1d8093d304c3a9d6f1165b85d6b374f1c0cc907d39c0879eb67f0a39d779be7a85cbd52920b6f53a94da43099c58837034afa6a7be4b099bfcd79ad13999@35.238.106.101:443",
+                "node-01.ac-cn-hongkong-c.eth.prod": "enode://b957e51f41e4abab8382e1ea7229e88c6e18f34672694c6eae389eac22dab8655622bbd4a08192c321416b9becffaab11c8e2b7a5d0813b922aa128b82990dab@47.75.222.178:443",
+                "node-02.ac-cn-hongkong-c.eth.prod": "enode://8bebe73ddf7cf09e77602c7d04c93a73f455b51f24ae0d572917a4792f1dec0bb4c562759b8830cc3615a658d38c1a4a38597a1d7ae3ba35111479fc42d65dec@47.75.85.212:443",
+                "node-03.ac-cn-hongkong-c.eth.prod": "enode://ac3948b2c0786ada7d17b80cf869cf59b1909ea3accd45944aae35bf864cc069126da8b82dfef4ddf23f1d6d6b44b1565c4cf81c8b98022253c6aea1a89d3ce2@47.75.88.12:443",
+                "node-04.ac-cn-hongkong-c.eth.prod": "enode://385579fc5b14e04d5b04af7eee835d426d3d40ccf11f99dbd95340405f37cf3bbbf830b3eb8f70924be0c2909790120682c9c3e791646e2d5413e7801545d353@47.244.221.249:443",
+                "node-05.ac-cn-hongkong-c.eth.prod": "enode://b77bffc29e2592f30180311dd81204ab845e5f78953b5ba0587c6631be9c0862963dea5eb64c90617cf0efd75308e22a42e30bc4eb3cd1bbddbd1da38ff6483e@47.75.10.177:443",
+                "node-06.ac-cn-hongkong-c.eth.prod": "enode://cf5f7a7e64e3b306d1bc16073fba45be3344cb6695b0b616ccc2da66ea35b9f35b3b231c6cf335fdfaba523519659a440752fc2e061d1e5bc4ef33864aac2f19@47.75.221.196:443",
+                "node-07.ac-cn-hongkong-c.eth.prod": "enode://13d63a1f85ccdcbd2fb6861b9bd9d03f94bdba973608951f7c36e5df5114c91de2b8194d71288f24bfd17908c48468e89dd8f0fb8ccc2b2dedae84acdf65f62a@47.244.210.80:443",
+                "node-08.ac-cn-hongkong-c.eth.prod": "enode://32915c8841faaef21a6b75ab6ed7c2b6f0790eb177ad0f4ea6d731bacc19b938624d220d937ebd95e0f6596b7232bbb672905ee12601747a12ee71a15bfdf31c@47.75.59.11:443"
+            },
+            "rendezvous": {
+                "boot-01.do-ams3.eth.prod": "/ip4/178.128.138.128/tcp/30703/ethv4/16Uiu2HAmRHPzF3rQg55PgYPcQkyvPVH9n2hWsYPhUJBZ6kVjJgdV",
+                "boot-02.do-ams3.eth.prod": "/ip4/178.128.140.188/tcp/30703/ethv4/16Uiu2HAmLqTXuY4Sb6G28HNooaFUXUKzpzKXCcgyJxgaEE2i5vnf",
+                "boot-01.gc-us-central1-a.eth.prod": "/ip4/34.70.75.208/tcp/30703/ethv4/16Uiu2HAm6ZsERLx2BwVD2UM9SVPnnMU6NBycG8XPtu8qKys5awsU",
+                "boot-02.gc-us-central1-a.eth.prod": "/ip4/35.223.215.156/tcp/30703/ethv4/16Uiu2HAmQEUFE2YaJohavWtHxPTEFv3sEGJtDqvtGEv78DFoEWQF",
+                "boot-01.ac-cn-hongkong-c.eth.prod": "/ip4/47.75.99.169/tcp/30703/ethv4/16Uiu2HAmV8Hq9e3zm9TMVP4zrVHo3BjqW5D6bDVV6VQntQd687e4",
+                "boot-02.ac-cn-hongkong-c.eth.prod": "/ip4/47.52.106.107/tcp/30703/ethv4/16Uiu2HAmEHiptiDDd9gqNY8oQqo8hHUWMHJzfwt5aLRdD6W2zcXR"
+            }
+        },
+        "eth.staging": {
+            "boot": {
+                "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",
+                "boot-01.ac-cn-hongkong-c.eth.staging": "enode://630b0342ca4e9552f50714b6c8e28d6955bc0fd14e7950f93bc3b2b8cc8c1f3b6d103df66f51a13d773b5db0f130661fb5c7b8fa21c48890c64c79b41a56a490@47.91.229.44:443"
+            },
+            "mail": {
+                "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",
+                "mail-01.ac-cn-hongkong-c.eth.staging": "enode://b74859176c9751d314aeeffc26ec9f866a412752e7ddec91b19018a18e7cca8d637cfe2cedcb972f8eb64d816fbd5b4e89c7e8c7fd7df8a1329fa43db80b0bfe@47.52.90.156:443"
+            },
+            "whisper": {
+                "node-01.do-ams3.eth.staging": "enode://914c0b30f27bab30c1dfd31dad7652a46fda9370542aee1b062498b1345ee0913614b8b9e3e84622e84a7203c5858ae1d9819f63aece13ee668e4f6668063989@167.99.19.148:443",
+                "node-01.gc-us-central1-a.eth.staging": "enode://2d897c6e846949f9dcf10279f00e9b8325c18fe7fa52d658520ad7be9607c83008b42b06aefd97cfe1fdab571f33a2a9383ff97c5909ed51f63300834913237e@35.192.0.86:443",
+                "node-01.ac-cn-hongkong-c.eth.staging": "enode://00395686f5954662a3796e170b9e87bbaf68a050d57e9987b78a2292502dae44aae2b8803280a017ec9af9be0b3121db9d6b3693ab3a0451a866bcbedd58fdac@47.52.226.137:443"
+            },
+            "rendezvous": {
+                "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",
+                "boot-01.ac-cn-hongkong-c.eth.staging": "/ip4/47.91.229.44/tcp/30703/ethv4/16Uiu2HAmRnt2Eyoknh3auxh4fJwkRgqkH1gqrWGes8Pk1k3MV4xu"
+            }
+        },
+        "wakuv2.prod": {
+            "tcp/p2p/waku": {
+                "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+                "node-01.gc-us-central1-a.wakuv2.prod": "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA",
+                "node-01.ac-cn-hongkong-c.wakuv2.prod": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD"
+            },
+            "enr/p2p/waku": {
+                "node-01.do-ams3.wakuv2.prod": "enr:-M-4QLdAB-KyzT3QEsDoNa4LXT6RGH9BIylvTlDFLQhigWmxKEesulgc8AoKmVEUKj_4St6ThBKwyBc69tBfCe2hVTABgmlkgnY0gmlwhLymh5GKbXVsdGlhZGRyc7EALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi5wcm9kLnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDbl1X_zJIw3EAJGtmHMVn4Z2xhpSoUaP5ElsHKCv7hlWDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-01.gc-us-central1-a.wakuv2.prod": "enr:-Nm4QNgc2L6L-4nk6jgllNDE1QDcn6kv2922rTRYs1wM3My_OmSsTimkMCIMh8fat6enFdYfuJ23KjWdF5whBz3zXgUBgmlkgnY0gmlwhCJ5ZGyKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhA_30kHgQqfXZRioa4J_u5asgXTJ5iw_8w3lEICH4TFu_g3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.ac-cn-hongkong-c.wakuv2.prod": "enr:-Nm4QOdTOKZJKTUUZ4O_W932CXIET-M9NamewDnL78P5u9DOGnZlK0JFZ4k0inkfe6iY-0JAaJVovZXc575VV3njeiABgmlkgnY0gmlwhAjS3ueKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhAo0C-VvfgHiXrxZi3umDiooXMGY9FvYj5_d1Q4EeS7eyg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
+            },
+            "wss/p2p/waku": {
+                "node-01.do-ams3.wakuv2.prod": "/dns4/node-01.do-ams3.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmL5okWopX7NqZWBUKVqW8iUxCEmd5GMHLVPwCgzYzQv3e",
+                "node-01.gc-us-central1-a.wakuv2.prod": "/dns4/node-01.gc-us-central1-a.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmVkKntsECaYfefR1V2yCR79CegLATuTPE6B9TxgxBiiiA",
+                "node-01.ac-cn-hongkong-c.wakuv2.prod": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.prod.statusim.net/tcp/8000/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD"
+            }
+        },
+        "wakuv2.test": {
+            "tcp/p2p/waku": {
+                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS",
+                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/30303/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm"
+            },
+            "enr/p2p/waku": {
+                "node-01.do-ams3.wakuv2.test": "enr:-M-4QCtJKX2WDloRYDT4yjeMGKUCRRcMlsNiZP3cnPO0HZn6IdJ035RPCqsQ5NvTyjqHzKnTM6pc2LoKliV4CeV0WrgBgmlkgnY0gmlwhIbRi9KKbXVsdGlhZGRyc7EALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi50ZXN0LnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDnr03Tuo77930a7sYLikftxnuG3BbC3gCFhA4632ooDaDdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-01.gc-us-central1-a.wakuv2.test": "enr:-Nm4QLHYoJ5WYQoVzyqPR-pwIeQvi3ONWs-EPwk3uUiBiDseN9Dd7fYbCvkMdeXcuZ-8U9IYdGm38VxSDf_Oq3zZ0cEBgmlkgnY0gmlwhGia74CKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS53YWt1djIudGVzdC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhA1giYsmWV9r2yJZYAiMGHJfjLlLeqAuTAokUGPN__pkxg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.ac-cn-hongkong-c.wakuv2.test": "enr:-Nm4QC0_ClHzbsutYzgT3jJm7ZY1D4shylAdd6Ac-L4uwAUha1oHM0zwoEkTORVt94W5Cpa0IiyrTcXAYLgpRXpVNUsBgmlkgnY0gmlwhC_y0kmKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy53YWt1djIudGVzdC5zdGF0dXNpbS5uZXQGH0DeA4lzZWNwMjU2azGhAhAm-P4q6mWONKcGnbLPU8WXZJ4Qs3AxIbrycvc7PVKsg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
+            },
+            "wss/p2p/waku": {
+                "node-01.do-ams3.wakuv2.test": "/dns4/node-01.do-ams3.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmPLe7Mzm8TsYUubgCAW1aJoeFScxrLj8ppHFivPo97bUZ",
+                "node-01.gc-us-central1-a.wakuv2.test": "/dns4/node-01.gc-us-central1-a.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAmJb2e28qLXxT5kZxVUUoJt72EMzNGXB47Rxx5hw3q4YjS",
+                "node-01.ac-cn-hongkong-c.wakuv2.test": "/dns4/node-01.ac-cn-hongkong-c.wakuv2.test.statusim.net/tcp/8000/wss/p2p/16Uiu2HAkvWiyFsgRhuJEb9JfjYxEkoHLgnUQmr1N5mKWnYjxYRVm"
+            }
+        },
+        "status.prod": {
+            "tcp/p2p/waku": {
+                "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
+                "node-02.do-ams3.status.prod": "/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV",
+                "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.gc-us-central1-a.status.prod": "/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg",
+                "node-01.ac-cn-hongkong-c.status.prod": "/dns4/node-01.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkvEZgh3KLwhLwXg95e5ojM8XykJ4Kxi2T7hk22rnA7pJC",
+                "node-02.ac-cn-hongkong-c.status.prod": "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8"
+            },
+            "enr/p2p/waku": {
+                "node-01.do-ams3.status.prod": "enr:-M-4QLOTEs_ZFxCb09FgIezZd5KeTru5CWWyEtMWMN-yUABrerWxckU-pMIh3yO8VjxHpgZ4jU2WSXuK3goW4uYb6c4BgmlkgnY0gmlwhI_G-a6KbXVsdGlhZGRyc7EALzYobm9kZS0wMS5kby1hbXMzLnN0YXR1cy5wcm9kLnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaECoVyonsTGEQvVioM562Q1fjzTb_vKD152PPIdsV7sM6SDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
+                "node-02.do-ams3.status.prod": "enr:-M-4QIhQjPgSnoKXLsJAxbRzF8cZYYjOfdt1ysBkibcriCvXb9lWHDiRghIv11JQltK5KYFs2zrCKoQ-_ZoRXEs5FasBgmlkgnY0gmlwhKEj9HmKbXVsdGlhZGRyc7EALzYobm9kZS0wMi5kby1hbXMzLnN0YXR1cy5wcm9kLnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaED1AYI2Ox27DnSqf2qoih5M2fNpHFq-OzJ3thREEApdiiDdGNwgnZfg3VkcIIjKIV3YWt1MgM",
+                "node-01.gc-us-central1-a.status.prod": "enr:-Nm4QPRAGqCjHCuu3DjbDVoLPqpE35Lfc3mjdCsmGTqdWmxjOF2NAbdYezEnukrz38TkTNXzEdslw_n_H5uUQ3hi-2EBgmlkgnY0gmlwhCPKN5mKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAhoqdPkAZNvNRuzEecDGwnt5UbF98qwM16PZG3JmW6kUg3RjcIJ2X4N1ZHCCIyiFd2FrdTID",
+                "node-02.gc-us-central1-a.status.prod": "enr:-Nm4QEdveBFdGPTVPCmYBikMKtGFlvLnzvXfYLOWDLPtTejBLcV_9e5Ry7dqx5K027rn5zedG-HnNiHP_GBcdCpGnq0BgmlkgnY0gmlwhCKE1emKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDIuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAwtASPpiz5Gq3zuFuWF4MTviQVipi3HaQGytF-4wfbdvg3RjcIJ2X4N1ZHCCIyiFd2FrdTID",
+                "node-01.ac-cn-hongkong-c.status.prod": "enr:-Nm4QOxEmmi5LQo3EwmHCagXOzVXzsLDGDwPDTL6ECmUCoXPYV0ldWvzMVqPOEPzXMCtECdk7xpleiNN85oKQxFiGnYBgmlkgnY0gmlwhC_yyjuKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAgwDLi50TMXqxWTCnR_rjQP3Eeznjs645ZNBoRh5B3jhg3RjcIJ2X4N1ZHCCIyiFd2FrdTID",
+                "node-02.ac-cn-hongkong-c.status.prod": "enr:-Nm4QOqKQ4bi7sYE1ZXAqnryEGeJOnQxIzo9UK5xHY_GeP4healoFVspoG2FaUCSyIg8pa4X2P99BbC15iSh98NIgPYBgmlkgnY0gmlwhC_zgIaKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDIuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAzE4YIBrPK5oT_9MvYEeggmaDd205iU4Nn1MAhU5xqY5g3RjcIJ2X4N1ZHCCIyiFd2FrdTID"
+            },
+            "wss/p2p/waku": {
+                "node-01.do-ams3.status.prod": "/dns4/node-01.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAm6HZZr7aToTvEBPpiys4UxajCTU97zj5v7RNR2gbniy1D",
+                "node-02.do-ams3.status.prod": "/dns4/node-02.do-ams3.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmSve7tR5YZugpskMv2dmJAsMUKmfWYEKRXNUxRaTCnsXV",
+                "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.gc-us-central1-a.status.prod": "/dns4/node-02.gc-us-central1-a.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmDQugwDHM3YeUp86iGjrUvbdw3JPRgikC7YoGBsT2ymMg",
+                "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-02.ac-cn-hongkong-c.status.prod": "/dns4/node-02.ac-cn-hongkong-c.status.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmFy8BrJhCEmCYrUfBdSNkrPw6VHExtv4rRp1DSBnCPgx8"
+            }
+        },
+        "status.test": {
+            "tcp/p2p/waku": {
+                "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",
+                "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi"
+            },
+            "enr/p2p/waku": {
+                "node-01.do-ams3.status.test": "enr:-M-4QI1qCnM3DMuZR2Y86FygFXPtm9fIRc4rFdUaDj0NbEA3Jl4In8mXAjUWgoei7W9Grc7oqtgibmIo-HIHHg7wrhMBgmlkgnY0gmlwhEDhUe2KbXVsdGlhZGRyc7EALzYobm9kZS0wMS5kby1hbXMzLnN0YXR1cy50ZXN0LnN0YXR1c2ltLm5ldAYBu94DiXNlY3AyNTZrMaECBNx5Erw5Jdsw-uI9pBjB_V2R6brvuVWE-MJwYCQKVv6DdGNwgnZfg3VkcIIjKIV3YWt1Mg8",
+                "node-01.gc-us-central1-a.status.test": "enr:-Nm4QFxGf89g3MGnCLYBxBgpXejyB44mvXvJSpNzjlRwNXO6BIn7hl66OJpESPWdH7ipHNemmz0e04wtJHe_wVV5woABgmlkgnY0gmlwhCJ6_HaKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5zdGF0dXMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAzToWxPoQnnubNH_CIu7YHPV0RHadQVIKlpfMJxxC2eFg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.ac-cn-hongkong-c.status.test": "enr:-Nm4QCF2zwCuAZzxTtjjjbo5hn6vx0ICcEJBGRBMdDCfpoX5BGiApbfhEljEjpI4ePhYra_k0o5uI8eTTGYHkr6208gBgmlkgnY0gmlwhC_y6SSKbXVsdGlhZGRyc7g6ADg2MW5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5zdGF0dXMudGVzdC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAmRvsjqPlfX7OOJ4x4F3GAOpBa4y4NQSoNHjX2XIo1lvg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP"
+            },
+            "wss/p2p/waku": {
+                "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",
+                "node-01.ac-cn-hongkong-c.status.test": "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi"
+            }
+        },
+        "go-waku.prod": {
+            "tcp/p2p/waku": {
+                "node-01.do-ams3.go-waku.prod": "/dns4/node-01.do-ams3.go-waku.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkyScd7DiwgMwzfw8CFFhznH3wRzciqEUfjDzn7vyimR8c",
+                "node-01.gc-us-central1-a.go-waku.prod": "/dns4/node-01.gc-us-central1-a.go-waku.prod.statusim.net/tcp/30303/p2p/16Uiu2HAmKTYnoPKebjWy63e1zPKiYRCQvm25W5mNSnCFE8EmzLga",
+                "node-01.ac-cn-hongkong-c.go-waku.prod": "/dns4/node-01.ac-cn-hongkong-c.go-waku.prod.statusim.net/tcp/30303/p2p/16Uiu2HAkwUKwy66nhcSFeW7y5qijNqXC4ZD3TaMMqnoEbh3wK2xU"
+            },
+            "enr/p2p/waku": {
+                "node-01.do-ams3.go-waku.prod": "enr:-NC4QGRYrus1rbuI183CZmxjb1wL4_wdNMcJDKaxaTaRs-RUTXP6KQ0VxL8zGaPNNxLT45ItXS8dmQvcyBWUlTwqXfYBgmlkgnY0gmlwhIbRh8OKbXVsdGlhZGRyc7IAMDYpbm9kZS0wMS5kby1hbXMzLmdvLXdha3UucHJvZC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAjusiHwKZa-rftTSq-KnDnirfCBW-q5ClJf4YEw9N8_Jg3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.gc-us-central1-a.go-waku.prod": "enr:-Nq4QJuKC3qwV704_zzThJiIaV2Jb1YLLjRzSalpgrgAUV7vU0_fMYTQUshz6hcqds0lR3lHFzhCDEdrT6TmP1rBF1IBgmlkgnY0gmlwhCJ6XvOKbXVsdGlhZGRyc7g7ADk2Mm5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5nby13YWt1LnByb2Quc3RhdHVzaW0ubmV0BgG73gOJc2VjcDI1NmsxoQNlE4TEM5FmqnyDaMQ4viBkHpx2FZb9SPVl_XsVCrn5q4N0Y3CCdl-DdWRwgiMohXdha3UyDw",
+                "node-01.ac-cn-hongkong-c.go-waku.prod": "enr:-Nq4QFd-E6Ej3RuGF_-zZWYLfIb4vpfhKNi6RiLWrt30O90oNuJnbhUo8rMvuX_sO95X6QoyHa9RaUYx9N7cywA4WWkBgmlkgnY0gmlwhAjSBH6KbXVsdGlhZGRyc7g7ADk2Mm5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5nby13YWt1LnByb2Quc3RhdHVzaW0ubmV0BgG73gOJc2VjcDI1NmsxoQIeZXd0MFV5YU9q0pWt05cUEc0RnptCtJarNlnxV7OpJYN0Y3CCdl-DdWRwgiMohXdha3UyDw"
+            },
+            "wss/p2p/waku": {
+                "node-01.do-ams3.go-waku.prod": "/dns4/node-01.do-ams3.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkyScd7DiwgMwzfw8CFFhznH3wRzciqEUfjDzn7vyimR8c",
+                "node-01.gc-us-central1-a.go-waku.prod": "/dns4/node-01.gc-us-central1-a.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAmKTYnoPKebjWy63e1zPKiYRCQvm25W5mNSnCFE8EmzLga",
+                "node-01.ac-cn-hongkong-c.go-waku.prod": "/dns4/node-01.ac-cn-hongkong-c.go-waku.prod.statusim.net/tcp/443/wss/p2p/16Uiu2HAkwUKwy66nhcSFeW7y5qijNqXC4ZD3TaMMqnoEbh3wK2xU"
+            }
+        },
+        "go-waku.test": {
+            "tcp/p2p/waku": {
+                "node-01.do-ams3.go-waku.test": "/dns4/node-01.do-ams3.go-waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAm9vnvCQgCDrynDK1h7GJoEZVGvnuzq84RyDQ3DEdXmcX7",
+                "node-01.gc-us-central1-a.go-waku.test": "/dns4/node-01.gc-us-central1-a.go-waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmPz63Xc6AuVkDeujz7YeZta18rcdau3Y1BzaxKAfDrBqz",
+                "node-01.ac-cn-hongkong-c.go-waku.test": "/dns4/node-01.ac-cn-hongkong-c.go-waku.test.statusim.net/tcp/30303/p2p/16Uiu2HAmBDbMWFiG9ki8sDw6fYtraSxo4oHU9HbuN43S2HVyq1FD"
+            },
+            "enr/p2p/waku": {
+                "node-01.do-ams3.go-waku.test": "enr:-NC4QKYOHGKa69sKLLKbRlcR890mmPRIboV0MUSMQtvjiwd7SISpBYqVibOpmTuS0kRlU6KmBQs_MXA9LPOBgMbRB7UBgmlkgnY0gmlwhIbRhj-KbXVsdGlhZGRyc7IAMDYpbm9kZS0wMS5kby1hbXMzLmdvLXdha3UudGVzdC5zdGF0dXNpbS5uZXQGAbveA4lzZWNwMjU2azGhAtd5TiUZInW1nFF7nZtkXrw0iuqOLyV31_f7EhuM_Fs-g3RjcIJ2X4N1ZHCCIyiFd2FrdTIP",
+                "node-01.gc-us-central1-a.go-waku.test": "enr:-Nq4QEb3btlua6_4EdC1SAF0wTl0JqI8Du34Bm7raZoYOAbHPmRzVt4rq-0ItCM3L4MkOpCFn_X26aTq-Q2YEK8DuGEBgmlkgnY0gmlwhCPft1uKbXVsdGlhZGRyc7g7ADk2Mm5vZGUtMDEuZ2MtdXMtY2VudHJhbDEtYS5nby13YWt1LnRlc3Quc3RhdHVzaW0ubmV0BgG73gOJc2VjcDI1NmsxoQOoVQePH5eRqlcCf-0XwZsoJPeZp1Mq59un_jYM9hUc6YN0Y3CCdl-DdWRwgiMohXdha3UyDw",
+                "node-01.ac-cn-hongkong-c.go-waku.test": "enr:-Nq4QCWN6qBpeK_1GiqE_F45k3MmBDxaOJ7X9fAOKO0qu_6xCPAkjOVz6Th_vn8n-CLdEizO5oJ6YOivuAiRHDdJ3q4BgmlkgnY0gmlwhAjaAm6KbXVsdGlhZGRyc7g7ADk2Mm5vZGUtMDEuYWMtY24taG9uZ2tvbmctYy5nby13YWt1LnRlc3Quc3RhdHVzaW0ubmV0BgG73gOJc2VjcDI1NmsxoQLqosp15CMf5c4k-z9MGM7_aiR0DGdmSrpjQ_xWnmsTOIN0Y3CCdl-DdWRwgiMohXdha3UyDw"
+            },
+            "wss/p2p/waku": {
+                "node-01.do-ams3.go-waku.test": "/dns4/node-01.do-ams3.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAm9vnvCQgCDrynDK1h7GJoEZVGvnuzq84RyDQ3DEdXmcX7",
+                "node-01.gc-us-central1-a.go-waku.test": "/dns4/node-01.gc-us-central1-a.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmPz63Xc6AuVkDeujz7YeZta18rcdau3Y1BzaxKAfDrBqz",
+                "node-01.ac-cn-hongkong-c.go-waku.test": "/dns4/node-01.ac-cn-hongkong-c.go-waku.test.statusim.net/tcp/443/wss/p2p/16Uiu2HAmBDbMWFiG9ki8sDw6fYtraSxo4oHU9HbuN43S2HVyq1FD"
+            }
+        }
    }
-  },
-  "meta": {
-    "hostname": "node-01.do-ams3.proxy.misc",
-    "timestamp": "2021-06-07T00:00:09.836740"
-  }
-}
+}
@@ -113,8 +113,8 @@
   :compiler-options {:optimizations :simple
                      :source-map    false}}
  :component-test {:target           :npm-module
-                   :entries          [quo2.core-spec]
-                   :ns-regexp        "-component-spec$"
+                   :entries          [quo2.core-spec status-im2.core-spec]
+                   :ns-regexp        "component-spec$"
                   :output-dir       "component-spec"
                   :compiler-options {:warnings-as-errors false
                                      :static-fns         false
@@ -206,58 +206,60 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (

 (def react-native-reanimated
  #js
-   {:default          #js
-                       {:createAnimatedComponent identity
-                        :eq                      nil
-                        :greaterOrEq             nil
-                        :greaterThan             nil
-                        :lessThan                nil
-                        :lessOrEq                nil
-                        :add                     nil
-                        :diff                    nil
-                        :divide                  nil
-                        :sub                     nil
-                        :multiply                nil
-                        :abs                     nil
-                        :min                     nil
-                        :max                     nil
-                        :neq                     nil
-                        :and                     nil
-                        :or                      nil
-                        :not                     nil
-                        :set                     nil
-                        :startClock              nil
-                        :stopClock               nil
-                        :Value                   nil
-                        :Clock                   nil
-                        :debug                   nil
-                        :log                     nil
-                        :event                   nil
-                        :cond                    nil
-                        :block                   nil
-                        :interpolateNode         nil
-                        :call                    nil
-                        :timing                  nil
-                        :onChange                nil
-                        :View                    #js {}
-                        :Image                   #js {}
-                        :ScrollView              #js {}
-                        :Text                    #js {}
-                        :Extrapolate             #js {:CLAMP nil}
-                        :Code                    #js {}}
-    :EasingNode       #js
-                       {:bezier identity
-                        :linear identity}
-    :clockRunning     nil
-    :useSharedValue   (fn [])
-    :useAnimatedStyle (fn [])
-    :withTiming       (fn [])
-    :withDelay        (fn [])
-    :Easing           #js {:bezier identity}
-    :Keyframe         (fn [])
-    :SlideOutUp       js/__STATUS_MOBILE_JS_IDENTITY_PROXY__
-    :SlideInUp        js/__STATUS_MOBILE_JS_IDENTITY_PROXY__
-    :LinearTransition js/__STATUS_MOBILE_JS_IDENTITY_PROXY__})
+   {:default                #js
+                             {:createAnimatedComponent identity
+                              :eq                      nil
+                              :greaterOrEq             nil
+                              :greaterThan             nil
+                              :lessThan                nil
+                              :lessOrEq                nil
+                              :add                     nil
+                              :diff                    nil
+                              :divide                  nil
+                              :sub                     nil
+                              :multiply                nil
+                              :abs                     nil
+                              :min                     nil
+                              :max                     nil
+                              :neq                     nil
+                              :and                     nil
+                              :or                      nil
+                              :not                     nil
+                              :set                     nil
+                              :startClock              nil
+                              :stopClock               nil
+                              :Value                   nil
+                              :Clock                   nil
+                              :debug                   nil
+                              :log                     nil
+                              :event                   nil
+                              :cond                    nil
+                              :block                   nil
+                              :interpolateNode         nil
+                              :call                    nil
+                              :timing                  nil
+                              :onChange                nil
+                              :View                    #js {}
+                              :Image                   #js {}
+                              :ScrollView              #js {}
+                              :Text                    #js {}
+                              :Extrapolate             #js {:CLAMP nil}
+                              :Code                    #js {}}
+    :EasingNode             #js
+                             {:bezier identity
+                              :linear identity}
+    :clockRunning           nil
+    :useSharedValue         (fn [])
+    :useAnimatedStyle       (fn [])
+    :withTiming             (fn [])
+    :withDelay              (fn [])
+    :Easing                 #js {:bezier identity}
+    :Keyframe               (fn [])
+    :enableLayoutAnimations (fn [])
+    :SlideOutUp             js/__STATUS_MOBILE_JS_IDENTITY_PROXY__
+    :SlideInUp              js/__STATUS_MOBILE_JS_IDENTITY_PROXY__
+    :LinearTransition       js/__STATUS_MOBILE_JS_IDENTITY_PROXY__})
+
 (def react-native-gesture-handler
  #js
   {:default                  #js {}
@@ -1,4 +1,4 @@
-(ns quo2.components.banners.--tests--.banner-component-spec
+(ns quo2.components.banners.banner.component-spec
  (:require ["@testing-library/react-native" :as rtl]
            [quo2.components.banners.banner.view :as banner]
            [reagent.core :as reagent]))
@@ -15,3 +15,13 @@
        (.toBeTruthy))
    (-> (js/expect (rtl/screen.getByText "5"))
        (.toBeTruthy))))
+
+(js/global.test "banner component fires an event when pressed"
+  (let [mock-fn (js/jest.fn)]
+    (fn []
+      (render-banner {:on-press        mock-fn
+                      :pins-count      "5"
+                      :latest-pin-text "this message"})
+      (rtl/fireEvent.press (rtl/screen.getByText "this message"))
+      (-> (js/expect mock-fn)
+          (.toHaveBeenCalledTimes 1)))))
@@ -3,17 +3,26 @@


 (def container
-  {:width              "100%"
-   :height             50
-   :background-color   colors/primary-50-opa-20
-   :flex-direction     :row
-   :align-items        :center
-   :padding-horizontal 20
-   :padding-vertical   10})
+  {:height           40
+   :flex             1
+   :background-color colors/primary-50-opa-20
+   :flex-direction   :row
+   :align-items      :center
+   :padding-right    22
+   :padding-left     20
+   :padding-vertical 10})

 (def counter
-  {:padding-right   22
-   :height          20
-   :width           20
+  {:flex            1
   :justify-content :center
-   :align-items     :center})
+   :align-items     :center})
+
+(def icon
+  {:flex         1
+   :margin-right 10})
+
+(defn text
+  [hide-pin?]
+  {:flex         (if hide-pin? 16 15)
+   :margin-right 10})
+
@@ -3,22 +3,28 @@
            [quo2.components.counter.counter :as counter]
            [quo2.components.icon :as icons]
            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]
            [react-native.core :as rn]))

 (defn banner
-  [{:keys [show-pin? latest-pin-text pins-count on-press]}]
-  [rn/touchable-opacity
-   {:accessibility-label :pinned-banner
-    :style               style/container
-    :active-opacity      1
-    :on-press            on-press}
-   (when show-pin? [icons/icon :i/pin {:size 20}])
-   [text/text
-    {:number-of-lines 1
-     :size            :paragraph-2
-     :style           {:margin-left 10 :margin-right 50}}
-    latest-pin-text]
-   [rn/view
-    {:accessibility-label :pins-count
-     :style               style/counter}
-    (when (pos? pins-count) [counter/counter {:type :secondary} pins-count])]])
+  [{:keys [hide-pin? latest-pin-text pins-count on-press]}]
+  (when (pos? pins-count)
+    [rn/touchable-opacity
+     {:accessibility-label :pinned-banner
+      :style               style/container
+      :active-opacity      1
+      :on-press            on-press}
+     (when-not hide-pin?
+       [rn/view {:style style/icon}
+        [icons/icon :i/pin
+         {:color (colors/theme-colors colors/neutral-100 colors/white)
+          :size  20}]])
+     [rn/view {:style (style/text hide-pin?)}
+      [text/text
+       {:number-of-lines 1
+        :size            :paragraph-2}
+       latest-pin-text]]
+     [rn/view
+      {:accessibility-label :pins-count
+       :style               style/counter}
+      (when (> pins-count 1) [counter/counter {:type :secondary} pins-count])]]))
@@ -5,19 +5,8 @@
            [quo2.components.icon :as icons]
            [quo2.components.markdown.text :as text]
            [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]))
-
-(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}}]])
+            [quo2.components.community.icon :as community-icon]
+            [react-native.core :as rn]))

 (defn notification-view
  [{:keys [muted?
@@ -54,27 +43,18 @@
           unread-messages?
           unread-mentions-count
           community-icon
-           tokens
-           background-color]}]
+           tokens]}]
  [rn/view
   {:style (merge (style/community-card 16)
-                  {:margin-bottom     12
-                   :margin-horizontal 20})}
+                  {:margin-bottom 12})}
   [rn/touchable-highlight
    (merge {:style {:height        56
                    :border-radius 16}}
           props)
    [rn/view {:flex 1}
-     [rn/view
-      {:flex-direction     :row
-       :border-radius      16
-       :padding-horizontal 12
-       :align-items        :center
-       :padding-vertical   8
-       :background-color   background-color}
-      [rn/view]
-      (when community-icon
-        [community-icon-view community-icon])
+     [rn/view (style/list-info-container)
+      [community-icon/community-icon
+       {:images community-icon} 32]
      [rn/view
       {:flex              1
        :margin-horizontal 12}
@@ -109,39 +89,36 @@
           community-icon
           tokens
           locked?]}]
-  [rn/view {:margin-bottom 20}
-   [rn/touchable-highlight
-    (merge {:underlay-color colors/primary-50-opa-5
-            :style          {:border-radius 12}}
-           props)
-    [rn/view {:flex 1}
+  [rn/touchable-highlight
+   (merge {:underlay-color (colors/theme-colors
+                            colors/neutral-5
+                            colors/neutral-95)
+           :style          {:border-radius 12}}
+          props)
+   [rn/view {:flex 1}
+    [rn/view (style/membership-info-container)
+     [community-icon/community-icon
+      {:images community-icon} 32]
     [rn/view
-      {:flex-direction :row
-       :border-radius  16
-       :align-items    :center}
+      {:flex            1
+       :margin-left     12
+       :justify-content :center}
+      [text/text
+       {:accessibility-label :chat-name-text
+        :number-of-lines     1
+        :ellipsize-mode      :tail
+        :weight              :semi-bold
+        :size                :paragraph-1}
+       name]]

-      (when community-icon
-        [community-icon-view community-icon])
-      [rn/view
-       {:flex            1
-        :margin-left     12
-        :justify-content :center}
-       [text/text
-        {:accessibility-label :chat-name-text
-         :number-of-lines     1
-         :ellipsize-mode      :tail
-         :weight              :semi-bold
-         :size                :paragraph-1}
-        name]]
-
-      [rn/view
-       {:justify-content :center
-        :margin-right    16}
-       (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?}])]]]]])
+     [rn/view
+      {:justify-content :center
+       :margin-right    16}
+      (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?}])]]]])
@@ -46,12 +46,12 @@
     ^{:key id}
     [rn/view {:margin-right 8}
      [tag/tag
-       {:id       id
-        :size     24
-        :label    tag-label
-        :type     :emoji
-        :labelled true
-        :resource resource}]])])
+       {:id        id
+        :size      24
+        :label     tag-label
+        :type      :emoji
+        :labelled? true
+        :resource  resource}]])])

 (defn community-title
  [{:keys [title description size] :or {size :small}}]
@@ -10,4 +10,4 @@
               :border-width  0
               :border-color  :transparent
               :width         size
-               :height        size}}]))
+               :height        size}}]))
@@ -77,19 +77,20 @@
                      colors/white
                      colors/neutral-90)})

-(defn list-view-content-container
+(defn list-info-container
  []
-  {:flex-direction   :row
-   :border-radius    16
-   :align-items      :center
-   :background-color (colors/theme-colors
-                      colors/white
-                      colors/neutral-90)})
+  {:flex-direction     :row
+   :border-radius      16
+   :padding-horizontal 12
+   :align-items        :center
+   :padding-vertical   8})

-(defn list-view-chat-icon
+(defn membership-info-container
  []
-  {:border-radius 32
-   :padding       12})
+  {:flex-direction :row
+   :border-radius  16
+   :align-items    :center
+   :height         48})

 (defn community-title-description-container
  [margin-top]
@@ -107,4 +108,4 @@
  []
  {:position :absolute
   :top      8
-   :right    8})
+   :right    8})
@@ -8,7 +8,7 @@
            [quo2.components.tags.token-tag :as token-tag]
            [quo2.foundations.colors :as colors]
            [i18n.i18n :as i18n]
-            [status-im.ui.components.fast-image :as fast-image]))
+            [react-native.fast-image :as fast-image]))

 (def ^:private token-tag-horizontal-spacing 7)
 (def token-tag-vertical-spacing 5)
@@ -0,0 +1,13 @@
+(ns quo2.components.drawers.permission-context.--tests--.permission-context-component-spec
+  (:require [quo2.components.drawers.permission-context.view :as permission-context]
+            [react-native.core :as rn]
+            [test-helpers.component :as h]))
+
+(h/describe "permission context"
+  (h/test
+    (h/render [permission-context/view
+               [rn/text
+                {:accessibility-label :accessibility-id}
+                "a sample label"]])
+    (-> (js/expect (h/get-by-label-text :accessibility-id))
+        (.toBeTruthy))))
@@ -0,0 +1,16 @@
+(ns quo2.components.drawers.permission-context.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def radius 20)
+(def container
+  {:padding-top             16
+   :padding-bottom          48
+   :padding-horizontal      20
+   :shadow-offset           {:width  0
+                             :height 2}
+   :shadow-radius           radius
+   :border-top-left-radius  radius
+   :border-top-right-radius radius
+   :elevation               2
+   :shadow-opacity          1
+   :shadow-color            colors/shadow})
@@ -0,0 +1,8 @@
+(ns quo2.components.drawers.permission-context.view
+  (:require [react-native.core :as rn]
+            [quo2.components.drawers.permission-context.style :as style]))
+
+(defn view
+  [children]
+  [rn/view {:style style/container}
+   children])
@@ -4,16 +4,10 @@

 (def icon-path "./resources/images/icons2/")

-(defn combine-path
-  [path el]
-  (if (System/getenv "COMPONENT_TEST")
-    (str "." path el "@2x.png")
-    (str "." path el ".png")))
-
 (defn require-icon
  [size path]
  (fn [el]
-    (let [s (combine-path path el)
+    (let [s (str "." path el ".png")
          k (-> el
                (string/replace "_" "-")
                (string/replace " " "-")
@@ -8,14 +8,14 @@
            [react-native.core :as rn]))

 (def ^:private themes
-  {:container        {:light {:background-color colors/white-opa-70}
-                      :dark  {:background-color colors/neutral-80-opa-70}}
-   :text             {:light {:color colors/neutral-100}
-                      :dark  {:color colors/white}}
-   :icon             {:light {:color colors/neutral-100}
-                      :dark  {:color colors/white}}
-   :action-container {:light {:background-color :colors/neutral-80-opa-5}
-                      :dark  {:background-color :colors/white-opa-5}}})
+  {:container        {:dark  {:background-color colors/white-opa-70}
+                      :light {:background-color colors/neutral-80-opa-70}}
+   :text             {:dark  {:color colors/neutral-100}
+                      :light {:color colors/white}}
+   :icon             {:dark  {:color colors/neutral-100}
+                      :light {:color colors/white}}
+   :action-container {:dark  {:background-color :colors/neutral-80-opa-5}
+                      :light {:background-color :colors/white-opa-5}}})

 (defn- merge-theme-style
  [component-key styles]
@@ -23,7 +23,9 @@

 (defn toast-action-container
  [{:keys [on-press style]} & children]
-  [rn/touchable-highlight {:on-press on-press}
+  [rn/touchable-highlight
+   {:on-press       on-press
+    :underlay-color :transparent}
   [into
    [rn/view
     {:style (merge
@@ -40,7 +42,8 @@

 (defn toast-undo-action
  [duration on-press]
-  [toast-action-container {:on-press on-press}
+  [toast-action-container
+   {:on-press on-press :accessibility-label :toast-undo-action}
   [rn/view {:style {:margin-right 5}}
    [count-down-circle/circle-timer {:duration duration}]]
   [text/text
@@ -63,7 +66,10 @@
    [rn/view {:style {:padding 2}} left]
    [rn/view {:style {:padding 4 :flex 1}}
     [text/text
-      {:size :paragraph-2 :weight :medium :style (merge-theme-style :text {})}
+      {:size                :paragraph-2
+       :weight              :medium
+       :style               (merge-theme-style :text {})
+       :accessibility-label :toast-content}
      middle]]
    (when right right)]])

@@ -28,28 +28,6 @@
                          :background-color (colors/theme-colors colors/neutral-5 colors/neutral-95)}}
   [notification-dot]])

-(defn tabs
-  [{:keys [default-active on-change style]}]
-  (let [active-tab-id (reagent/atom default-active)]
-    (fn [{:keys [data size] :or {size default-tab-size}}]
-      [rn/view (merge {:flex-direction :row} style)
-       (doall
-        (for [{:keys [label id notification-dot? accessibility-label]} data]
-          ^{:key id}
-          [rn/view {:style {:margin-right (if (= size default-tab-size) 12 8)}}
-           (when notification-dot?
-             [indicator])
-           [tab/tab
-            {:id                  id
-             :size                size
-             :accessibility-label accessibility-label
-             :active              (= id @active-tab-id)
-             :on-press            (fn []
-                                    (reset! active-tab-id id)
-                                    (when on-change
-                                      (on-change id)))}
-            label]]))])))
-
 (defn- calculate-fade-end-percentage
  [{:keys [offset-x content-width layout-width max-fade-percentage]}]
  (let [fade-percentage (max max-fade-percentage
@@ -60,30 +38,35 @@
      0.99
      (utils.number/naive-round fade-percentage 2))))

-(defn scrollable-tabs
-  "Just like the component `tabs`, displays horizontally scrollable tabs with
-  extra options to control if/how the end of the scroll view fades.
-
-  Tabs are rendered using ReactNative's FlatList, which offers the convenient
-  `scrollToIndex` method. FlatList accepts VirtualizedList and ScrollView props,
-  and so does this component.
-
-  Usage:
-  [tabs/scrollable-tabs
-    {:scroll-on-press? true
-     :fade-end?        true
-     :on-change        #(...)
-     :default-active   :tab-a
-     :data             [{:id :tab-a :label \"Tab A\"}
-                        {:id :tab-b :label \"Tab B\"}]}]]
-
+(defn tabs
+  "Usage:
+   {:type             :icon/:emoji/:label
+    :component        tag/tab
+    :size             32/24
+    :on-press         fn
+    :blurred?         true/false 
+    :labelled?        true/false
+    :disabled?        true/false
+    :scrollable?      false
+    :scroll-on-press? true
+    :fade-end?        true
+    :on-change        fn
+    :default-active   tag-id
+    :data             [{:id :label \"\" :resource \"url\"}
+                       {:id :label \"\" :resource \"url\"}]}
  Opts:
-  - `size` number
-  - `scroll-on-press?` When non-nil, clicking on a tab centers it the middle
+   - `component` this is to determine which component is to be rendered since the 
+                 logic in this view is shared between tab and tag component
+   - `blurred`   boolean: use to determine border color if the background is blurred
+   - `type`      can be icon or emoji with or without a tag label
+   - `labelled`  boolean: is true if tag has label else false
+   - `size` number
+   - `scroll-on-press?` When non-nil, clicking on a tag centers it the middle
  (with animation enabled).
-  - `fade-end?` When non-nil, causes the end of the scrollable view to fade out.
-  - `fade-end-percentage` Percentage where fading starts relative to the total
+   - `fade-end?` When non-nil, causes the end of the scrollable view to fade out.
+   - `fade-end-percentage` Percentage where fading starts relative to the total
  layout width of the `flat-list` data."
+
  [{:keys [default-active fade-end-percentage]
    :or   {fade-end-percentage 0.8}}]
  (let [active-tab-id (reagent/atom default-active)
@@ -97,99 +80,123 @@
               on-scroll
               scroll-event-throttle
               scroll-on-press?
+               scrollable?
+               style
               size
               blur?
               override-theme]
        :or   {fade-end-percentage   fade-end-percentage
               fade-end?             false
               scroll-event-throttle 64
+               scrollable?           false
               scroll-on-press?      false
               size                  default-tab-size}
        :as   props}]
-      (let [maybe-mask-wrapper (if fade-end?
-                                 [masked-view/masked-view
-                                  {:mask-element
-                                   (reagent/as-element
-                                    [linear-gradient/linear-gradient
-                                     {:colors         [:black :transparent]
-                                      :locations      [(get @fading :fade-end-percentage) 1]
-                                      :start          {:x 0 :y 0}
-                                      :end            {:x 1 :y 0}
-                                      :pointer-events :none
-                                      :style          {:width  "100%"
-                                                       :height "100%"}}])}]
-                                 [:<>])]
-        (conj
-         maybe-mask-wrapper
-         [rn/flat-list
-          (merge
-           (dissoc props
-                   :default-active
-                   :fade-end-percentage
-                   :fade-end?
-                   :on-change
-                   :scroll-on-press?
-                   :size)
-           (when scroll-on-press?
-             {:initial-scroll-index (utils.collection/first-index #(= @active-tab-id (:id %)) data)})
-           {:ref                               #(reset! flat-list-ref %)
-            :extra-data                        (str @active-tab-id)
-            :horizontal                        true
-            :scroll-event-throttle             scroll-event-throttle
-            :shows-horizontal-scroll-indicator false
-            :data                              data
-            :key-fn                            (comp str :id)
-            :on-scroll-to-index-failed         identity
-            :on-scroll                         (fn [^js e]
-                                                 (when fade-end?
-                                                   (let [offset-x       (oget
-                                                                         e
-                                                                         "nativeEvent.contentOffset.x")
-                                                         content-width  (oget
-                                                                         e
-                                                                         "nativeEvent.contentSize.width")
-                                                         layout-width
-                                                         (oget e "nativeEvent.layoutMeasurement.width")
-                                                         new-percentage
-                                                         (calculate-fade-end-percentage
-                                                          {:offset-x            offset-x
-                                                           :content-width       content-width
-                                                           :layout-width        layout-width
-                                                           :max-fade-percentage fade-end-percentage})]
-                                                     ;; Avoid unnecessary re-rendering.
-                                                     (when (not= new-percentage
-                                                                 (get @fading :fade-end-percentage))
-                                                       (swap! fading assoc
-                                                         :fade-end-percentage
-                                                         new-percentage))))
-                                                 (when on-scroll
-                                                   (on-scroll e)))
-            :render-fn                         (fn [{:keys [id label]} index]
-                                                 [rn/view
-                                                  {:style {:margin-right  (if (= size default-tab-size)
-                                                                            12
-                                                                            8)
-                                                           :padding-right (when (= index
-                                                                                   (dec (count data)))
-                                                                            (get-in props
-                                                                                    [:style
-                                                                                     :padding-left]))}}
-                                                  [tab/tab
-                                                   {:id             id
-                                                    :size           size
-                                                    :override-theme override-theme
-                                                    :blur?          blur?
-                                                    :active         (= id @active-tab-id)
-                                                    :on-press       (fn [id]
-                                                                      (reset! active-tab-id id)
-                                                                      (when scroll-on-press?
-                                                                        (.scrollToIndex ^js
-                                                                                        @flat-list-ref
-                                                                                        #js
-                                                                                         {:animated true
-                                                                                          :index index
-                                                                                          :viewPosition
-                                                                                          0.5}))
-                                                                      (when on-change
-                                                                        (on-change id)))}
-                                                   label]])})])))))
+      (if scrollable?
+        (let [maybe-mask-wrapper (if fade-end?
+                                   [masked-view/masked-view
+                                    {:mask-element
+                                     (reagent/as-element
+                                      [linear-gradient/linear-gradient
+                                       {:colors         [:black :transparent]
+                                        :locations      [(get @fading :fade-end-percentage) 1]
+                                        :start          {:x 0 :y 0}
+                                        :end            {:x 1 :y 0}
+                                        :pointer-events :none
+                                        :style          {:width  "100%"
+                                                         :height "100%"}}])}]
+                                   [:<>])]
+          (conj
+           maybe-mask-wrapper
+           [rn/flat-list
+            (merge
+             (dissoc props
+                     :default-active
+                     :fade-end-percentage
+                     :fade-end?
+                     :on-change
+                     :scroll-on-press?
+                     :size)
+             (when scroll-on-press?
+               {:initial-scroll-index (utils.collection/first-index #(= @active-tab-id (:id %)) data)})
+             {:ref                               #(reset! flat-list-ref %)
+              :extra-data                        (str @active-tab-id)
+              :horizontal                        true
+              :scroll-event-throttle             scroll-event-throttle
+              :shows-horizontal-scroll-indicator false
+              :data                              data
+              :key-fn                            (comp str :id)
+              :on-scroll-to-index-failed         identity
+              :on-scroll                         (fn [^js e]
+                                                   (when fade-end?
+                                                     (let [offset-x       (oget
+                                                                           e
+                                                                           "nativeEvent.contentOffset.x")
+                                                           content-width
+                                                           (oget
+                                                            e
+                                                            "nativeEvent.contentSize.width")
+                                                           layout-width
+                                                           (oget e
+                                                                 "nativeEvent.layoutMeasurement.width")
+                                                           new-percentage
+                                                           (calculate-fade-end-percentage
+                                                            {:offset-x            offset-x
+                                                             :content-width       content-width
+                                                             :layout-width        layout-width
+                                                             :max-fade-percentage fade-end-percentage})]
+                                                       ;; Avoid unnecessary re-rendering.
+                                                       (when (not= new-percentage
+                                                                   (get @fading :fade-end-percentage))
+                                                         (swap! fading assoc
+                                                           :fade-end-percentage
+                                                           new-percentage))))
+                                                   (when on-scroll
+                                                     (on-scroll e)))
+              :render-fn                         (fn [{:keys [id label]} index]
+                                                   [rn/view
+                                                    {:style {:margin-right  (if (= size default-tab-size)
+                                                                              12
+                                                                              8)
+                                                             :padding-right (when (= index
+                                                                                     (dec (count data)))
+                                                                              (get-in props
+                                                                                      [:style
+                                                                                       :padding-left]))}}
+                                                    [tab/tab
+                                                     {:id             id
+                                                      :size           size
+                                                      :override-theme override-theme
+                                                      :blur?          blur?
+                                                      :active         (= id @active-tab-id)
+                                                      :on-press       (fn [id]
+                                                                        (reset! active-tab-id id)
+                                                                        (when scroll-on-press?
+                                                                          (.scrollToIndex
+                                                                           ^js
+                                                                           @flat-list-ref
+                                                                           #js
+                                                                            {:animated     true
+                                                                             :index        index
+                                                                             :viewPosition
+                                                                             0.5}))
+                                                                        (when on-change
+                                                                          (on-change id)))}
+                                                     label]])})]))
+        [rn/view (merge {:flex-direction :row} style)
+         (doall
+          (for [{:keys [label id notification-dot? accessibility-label]} data]
+            ^{:key id}
+            [rn/view {:style {:margin-right (if (= size default-tab-size) 12 8)}}
+             (when notification-dot?
+               [indicator])
+             [tab/tab
+              {:id                  id
+               :size                size
+               :accessibility-label accessibility-label
+               :active              (= id @active-tab-id)
+               :on-press            (fn []
+                                      (reset! active-tab-id id)
+                                      (when on-change
+                                        (on-change id)))}
+              label]]))]))))
@@ -16,25 +16,21 @@
           {:width size})))

 (defn base-tag
-  "opts
-   {:type :icon/:emoji/:label/:permission
-    :size 32/24}
-    :labelled true"
  [_]
-  (fn [{:keys [id size disabled border-color border-width background-color on-press
-               accessibility-label label type]
+  (fn [{:keys [id size disabled? border-color border-width background-color on-press
+               accessibility-label labelled? type]
        :or   {size 32}} children]
    [rn/touchable-without-feedback
-     (merge {:disabled            disabled
+     (merge {:disabled            disabled?
             :accessibility-label accessibility-label}
            (when on-press
              {:on-press #(on-press id)}))
     [rn/view
      {:style (merge (style-container size
-                                      disabled
+                                      disabled?
                                      border-color
                                      border-width
                                      background-color
-                                      label
+                                      labelled?
                                      type))}
      children]]))
@@ -68,26 +68,40 @@
      label])])

 (defn tag
+  "opts
+   {:type         :icon/:emoji/:label
+    :size         32/24
+    :on-press     fn
+    :blurred?     true/false 
+    :resource     icon/image
+    :labelled?    true/false
+    :disabled?    true/false}
+  
+   opts
+    - `blurred`  boolean: use to determine border color if the background is blurred
+    - `type`     can be icon or emoji with or without a tag label
+    - `labelled` boolean: is true if tag has label else false"
  [_ _]
-  (fn [{:keys [id on-press disabled size resource active accessibility-label
-               label type labelled blurred icon-color]
+  (fn [{:keys [id on-press disabled? size resource active accessibility-label
+               label type labelled? blurred? icon-color]
        :or   {size 32}}]
-    (let [state                                                  (cond disabled :disabled
-                                                                       active   :active
-                                                                       :else    :default)
+    (let [state                                                  (cond disabled? :disabled
+                                                                       active    :active
+                                                                       :else     :default)
          {:keys [border-color blurred-border-color text-color]}
          (get-in themes [(theme/get-theme) state])]
-      [base-tag/base-tag
-       {:id                  id
-        :size                size
-        :border-width        1
-        :border-color        (if blurred
-                               blurred-border-color
-                               border-color)
-        :on-press            on-press
-        :accessibility-label accessibility-label
-        :disabled            disabled
-        :type                type
-        :label               label}
-       [tag-resources size type resource icon-color label text-color labelled]])))
+      [rn/view {:style {:align-items :center}}
+       [base-tag/base-tag
+        {:id                  id
+         :size                size
+         :border-width        1
+         :border-color        (if blurred?
+                                blurred-border-color
+                                border-color)
+         :on-press            on-press
+         :accessibility-label accessibility-label
+         :disabled?           disabled?
+         :type                type
+         :labelled?           (if (= type :label) true labelled?)}
+        [tag-resources size type resource icon-color label text-color labelled?]]])))

@@ -1,29 +1,171 @@
 (ns quo2.components.tags.tags
-  (:require [quo2.components.tags.tag :as tag]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]))
+  (:require [reagent.core :as reagent]
+            [quo.react-native :as rn]
+            [oops.core :refer [oget]]
+            [status-im.ui.components.react :as react]
+            [status-im.utils.core :as utils]
+            [quo2.components.tags.tag :as tag]
+            [utils.number :as number-utils]))
+
+(def default-tab-size 32)
+
+(defn calculate-fade-end-percentage
+  [{:keys [offset-x content-width layout-width max-fade-percentage]}]
+  (let [fade-percentage (max max-fade-percentage
+                             (/ (+ layout-width offset-x)
+                                content-width))]
+    ;; Truncate to avoid unnecessary rendering.
+    (if (> fade-percentage 0.99)
+      0.99
+      (number-utils/naive-round fade-percentage 2))))

 (defn tags
-  [{:keys [default-active on-change]}]
-  (let [active-tab-id (reagent/atom default-active)]
-    (fn [{:keys [data size type labelled disabled blurred icon-color] :or {size 32}}]
-      (let [active-id @active-tab-id]
-        [rn/view {:flex-direction :row}
-         (for [{:keys [tag-label id resource]} data]
-           ^{:key id}
-           [rn/view {:margin-right 8}
-            [tag/tag
-             (merge {:id         id
-                     :size       size
-                     :type       type
-                     :label      (if labelled tag-label (when (= type :label) tag-label))
-                     :active     (= id active-id)
-                     :disabled   disabled
-                     :blurred    blurred
-                     :icon-color icon-color
-                     :labelled   (if (= type :label) true labelled)
-                     :resource   (if (= type :icon)
-                                   :i/placeholder
-                                   resource)
-                     :on-press   #(do (reset! active-tab-id %)
-                                      (when on-change (on-change %)))})]])]))))
+  "Usage:
+   {:type             :icon/:emoji/:label
+    :component        tag/tab
+    :size             32/24
+    :on-press         fn
+    :blurred?         true/false 
+    :labelled?        true/false
+    :disabled?        true/false
+    :scroll-on-press? true
+    :scrollable?      false
+    :fade-end?        true
+    :on-change        fn
+    :default-active   tag-id
+    :data             [{:id :label \"\" :resource \"url\"}
+                       {:id :label \"\" :resource \"url\"}]}
+  Opts:
+   - `component` this is to determine which component is to be rendered since the 
+                 logic in this view is shared between tab and tag component
+   - `blurred`   boolean: use to determine border color if the background is blurred
+   - `type`      can be icon or emoji with or without a tag label
+   - `labelled`  boolean: is true if tag has label else false
+   - `size` number
+   - `scroll-on-press?` When non-nil, clicking on a tag centers it the middle
+  (with animation enabled).
+   - `fade-end?` When non-nil, causes the end of the scrollable view to fade out.
+   - `fade-end-percentage` Percentage where fading starts relative to the total
+  layout width of the `flat-list` data."
+
+  [{:keys [default-active fade-end-percentage]
+    :or   {fade-end-percentage 0.8}}]
+  (let [active-tab-id (reagent/atom default-active)
+        fading        (reagent/atom {:fade-end-percentage fade-end-percentage})
+        flat-list-ref (atom nil)]
+    (fn
+      [{:keys [data
+               fade-end-percentage
+               fade-end?
+               on-change
+               on-scroll
+               scroll-event-throttle
+               scrollable?
+               scroll-on-press?
+               size
+               type
+               labelled?
+               disabled?
+               blurred?
+               icon-color]
+        :or   {fade-end-percentage   fade-end-percentage
+               fade-end?             false
+               scroll-event-throttle 64
+               scrollable?           false
+               scroll-on-press?      false
+               size                  default-tab-size}
+        :as   props}]
+      (let [maybe-mask-wrapper (if fade-end?
+                                 [react/masked-view
+                                  {:mask-element (reagent/as-element
+                                                  [react/linear-gradient
+                                                   {:colors         [:black :transparent]
+                                                    :locations      [(get @fading :fade-end-percentage)
+                                                                     1]
+                                                    :start          {:x 0 :y 0}
+                                                    :end            {:x 1 :y 0}
+                                                    :pointer-events :none
+                                                    :style          {:width  "100%"
+                                                                     :height "100%"}}])}]
+                                 [:<>])]
+        (if scrollable?
+          (conj
+           maybe-mask-wrapper
+           [rn/flat-list
+            (merge (dissoc props
+                           :default-active
+                           :fade-end-percentage
+                           :fade-end?
+                           :on-change
+                           :scroll-on-press?
+                           :size)
+                   (when scroll-on-press?
+                     {:initial-scroll-index (utils/first-index #(= @active-tab-id (:id %)) data)})
+                   {:ref #(reset! flat-list-ref %)
+                    :extra-data (str @active-tab-id)
+                    :horizontal true
+                    :scroll-event-throttle scroll-event-throttle
+                    :shows-horizontal-scroll-indicator false
+                    :data data
+                    :key-fn (comp str :id)
+                    :on-scroll (fn [^js e]
+                                 (when fade-end?
+                                   (let [offset-x       (oget e "nativeEvent.contentOffset.x")
+                                         content-width  (oget e "nativeEvent.contentSize.width")
+                                         layout-width   (oget e "nativeEvent.layoutMeasurement.width")
+                                         new-percentage (calculate-fade-end-percentage
+                                                         {:offset-x            offset-x
+                                                          :content-width       content-width
+                                                          :layout-width        layout-width
+                                                          :max-fade-percentage fade-end-percentage})]
+                                     ;; Avoid unnecessary re-rendering.
+                                     (when (not= new-percentage (get @fading :fade-end-percentage))
+                                       (swap! fading assoc :fade-end-percentage new-percentage))))
+                                 (when on-scroll
+                                   (on-scroll e)))
+                    :render-fn (fn [{:keys [id label resource]} index]
+                                 [rn/view
+                                  {:style {:margin-right  (if (= size default-tab-size) 12 8)
+                                           :padding-right (when (= index (dec (count data)))
+                                                            (get-in props [:style :padding-left]))}}
+                                  [tag/tag
+                                   {:id         id
+                                    :size       size
+                                    :active     (= id @active-tab-id)
+                                    :resource   resource
+                                    :blurred?   blurred?
+                                    :icon-color icon-color
+                                    :disabled?  disabled?
+                                    :label      label
+                                    :type       type
+                                    :labelled?  labelled?
+                                    :on-press   (fn [id]
+                                                  (reset! active-tab-id id)
+                                                  (when scroll-on-press?
+                                                    (.scrollToIndex @flat-list-ref
+                                                                    #js
+                                                                     {:animated     true
+                                                                      :index        index
+                                                                      :viewPosition 0.5}))
+                                                  (when on-change
+                                                    (on-change id)))}
+                                   label]])})])
+          [rn/view {:style {:flex-direction :row}}
+           (for [{:keys [label id resource]} data]
+             ^{:key id}
+             [rn/view {:style {:margin-right 8}}
+              [tag/tag
+               (merge {:id         id
+                       :size       size
+                       :type       type
+                       :label      (if labelled? label (when (= type :label) label))
+                       :active     (= id active-tab-id)
+                       :disabled?  disabled?
+                       :blurred?   blurred?
+                       :icon-color icon-color
+                       :labelled?  (if (= type :label) true labelled?)
+                       :resource   (if (= type :icon)
+                                     :i/placeholder
+                                     resource)
+                       :on-press   #(do (reset! active-tab-id %)
+                                        (when on-change (on-change %)))})]])])))))
@@ -78,7 +78,6 @@
 (def audio-tag quo2.components.tags.context-tags/audio-tag)
 (def community-tag quo2.components.tags.context-tags/community-tag)
 (def tabs quo2.components.tabs.tabs/tabs)
-(def scrollable-tabs quo2.components.tabs.tabs/scrollable-tabs)
 (def account-selector quo2.components.tabs.account-selector/account-selector)
 (def floating-shell-button quo2.components.navigation.floating-shell-button/floating-shell-button)
 (def status-tag quo2.components.tags.status-tags/status-tag)
@@ -1,9 +1,10 @@
 (ns quo2.core-spec
-  (:require [quo2.components.banners.--tests--.banner-component-spec]
+  (:require [quo2.components.banners.banner.component-spec]
            [quo2.components.buttons.--tests--.buttons-component-spec]
            [quo2.components.counter.--tests--.counter-component-spec]
            [quo2.components.dividers.--tests--.divider-label-component-spec]
            [quo2.components.drawers.--tests--.action-drawers-component-spec]
+            [quo2.components.drawers.permission-context.--tests--.permission-context-component-spec]
            [quo2.components.markdown.--tests--.text-component-spec]
            [quo2.components.selectors.--tests--.selectors-component-spec]
            [quo2.components.selectors.filter.component-spec]))
@@ -25,6 +25,8 @@

 (def flat-list flat-list/flat-list)

+(def flat-list-inside-gesture-handler flat-list/flat-list-inside-gesture-handler)
+
 (def section-list section-list/section-list)

 (def activity-indicator (reagent/adapt-react-class (.-ActivityIndicator ^js react-native)))
@@ -101,4 +103,4 @@
  [f]
  (let [fn-ref (use-ref f)]
    (oops/oset! fn-ref "current" f)
-    (use-effect-once (fn [] #((oops/oget fn-ref "current"))))))
+    (use-effect-once (fn [] (fn [] (oops/ocall! fn-ref "current"))))))
@@ -1,6 +1,7 @@
 (ns react-native.flat-list
  (:require ["react-native" :as react-native]
-            [reagent.core :as reagent]))
+            [reagent.core :as reagent]
+            [quo.gesture-handler :as gesture-handler]))

 (def react-native-flat-list (reagent/adapt-react-class (.-FlatList ^js react-native)))

@@ -39,3 +40,7 @@
 (defn flat-list
  [props]
  [react-native-flat-list (base-list-props props)])
+
+(defn flat-list-inside-gesture-handler
+  [props]
+  [gesture-handler/flat-list (base-list-props props)])
@@ -54,11 +54,13 @@
 ;; Helper functions
 (defn get-shared-value
  [anim]
-  (.-value anim))
+  (when anim
+    (.-value anim)))

 (defn set-shared-value
  [anim val]
-  (set! (.-value anim) val))
+  (when anim
+    (set! (.-value anim) val)))

 (defn kebab-case->camelCase
  [k]
@@ -220,11 +220,17 @@

 (rf/defn close-chat
  {:events [:close-chat]}
-  [{:keys [db] :as cofx}]
+  [{:keys [db] :as cofx} navigate-to-shell?]
  (when-let [chat-id (:current-chat-id db)]
    (chat.state/reset-visible-item)
    (rf/merge cofx
-              {:db (dissoc db :current-chat-id)}
+              (merge
+               {:db (dissoc db :current-chat-id)}
+               (let [community-id (get-in db [:chats chat-id :community-id])]
+                 ;; When navigating back from community chat to community, update switcher card
+                 (when (and community-id (not navigate-to-shell?))
+                   {:dispatch [:shell/add-switcher-card
+                               :community {:community-id community-id}]})))
              (delete-for-me/sync-all)
              (delete-message/send-all)
              (offload-messages chat-id))))
@@ -243,7 +249,8 @@
  [{:keys [db now] :as cofx} chat-id]
  (rf/merge cofx
            {:clear-message-notifications
-             [[chat-id] (get-in db [:multiaccount :remote-push-notifications-enabled?])]}
+             [[chat-id] (get-in db [:multiaccount :remote-push-notifications-enabled?])]
+             :dispatch                    [:shell/close-switcher-card chat-id]}
            (deactivate-chat chat-id)
            (offload-messages chat-id)))

@@ -268,7 +275,7 @@
            (navigation/change-tab :chat)
            (when-not (= (:view-id db) :community)
              (navigation/pop-to-root-tab :chat-stack))
-            (close-chat)
+            (close-chat false)
            (force-close-chat chat-id)
            (fn [{:keys [db]}]
              {:db (assoc db :current-chat-id chat-id)})
@@ -284,7 +291,7 @@
            {:dispatch [:navigate-to-nav2 :chat chat-id from-shell?]}
            (when-not (= (:view-id db) :community)
              (navigation/pop-to-root-tab :shell-stack))
-            (close-chat)
+            (close-chat false)
            (force-close-chat chat-id)
            (fn [{:keys [db]}]
              {:db (assoc db :current-chat-id chat-id)})
@@ -311,7 +318,7 @@
                 (assoc-in [:chats chat-id] chat)
                 :always
                 (update :chats-home-list conj chat-id))
-     :dispatch [:chat.ui/navigate-to-chat chat-id]}))
+     :dispatch [:chat.ui/navigate-to-chat-nav2 chat-id]}))

 (rf/defn navigate-to-user-pinned-messages
  "Takes coeffects map and chat-id, returns effects necessary for navigation and preloading data"
@@ -1,8 +1,8 @@
 (ns status-im.chat.models.message-list
  (:require ["functional-red-black-tree" :as rb-tree]
            [status-im.constants :as constants]
-            [utils.re-frame :as rf]
-            [utils.datetime :as datetime]))
+            [utils.datetime :as datetime]
+            [utils.re-frame :as rf]))

 (defn- add-datemark
  [{:keys [whisper-timestamp] :as msg}]
@@ -20,6 +20,7 @@
           from
           outgoing
           whisper-timestamp
+           deleted?
           deleted-for-me?
           albumize?]}]
  (-> {:whisper-timestamp whisper-timestamp
@@ -29,6 +30,7 @@
                           (or
                            (= constants/message-type-private-group-system-message
                               message-type)
+                            deleted?
                            deleted-for-me?))
       :clock-value       clock-value
       :type              :message
@@ -4,6 +4,7 @@
            [clojure.walk :as walk]
            [quo.design-system.colors :as colors]
            [re-frame.core :as re-frame]
+            [i18n.i18n :as i18n]
            [status-im.async-storage.core :as async-storage]
            [status-im.bottom-sheet.core :as bottom-sheet]
            [status-im.constants :as constants]
@@ -11,6 +12,7 @@
            [utils.re-frame :as rf]
            [status-im.utils.universal-links.core :as universal-links]
            [status-im2.contexts.activity-center.events :as activity-center]
+            [status-im2.common.toasts.events :as toasts]
            [status-im2.navigation.events :as navigation]
            [taoensso.timbre :as log]))

@@ -110,15 +112,28 @@
 (rf/defn left
  {:events [::left]}
  [cofx response-js]
-  (rf/merge cofx
-            (handle-response cofx response-js)
-            (navigation/pop-to-root-tab :chat-stack)
-            (activity-center/notifications-fetch-unread-count)))
+  (let [community-name (aget response-js "communities" 0 "name")]
+    (rf/merge cofx
+              (handle-response cofx response-js)
+              (toasts/upsert {:icon       :placeholder
+                              :icon-color (:positive-01 @colors/theme)
+                              :text       (i18n/label :t/left-community {:community community-name})})
+              (navigation/navigate-back)
+              (activity-center/notifications-fetch-unread-count))))

 (rf/defn joined
  {:events [::joined ::requested-to-join]}
  [cofx response-js]
-  (handle-response cofx response-js))
+  (let [[event-name _] (:event cofx)
+        community-name (aget response-js "communities" 0 "name")]
+    (rf/merge cofx
+              (handle-response cofx response-js)
+              (toasts/upsert {:icon       :placeholder
+                              :icon-color (:positive-01 @colors/theme)
+                              :text       (i18n/label (if (= event-name ::joined)
+                                                        :t/joined-community
+                                                        :t/requested-to-join-community)
+                                                      {:community community-name})}))))

 (rf/defn export
  {:events [::export-pressed]}
@@ -172,6 +187,7 @@
                                (keys (get-in db [:communities community-id :chats])))]
    {:clear-message-notifications [community-chat-ids
                                   (get-in db [:multiaccount :remote-push-notifications-enabled?])]
+     :dispatch                    [:shell/close-switcher-card community-id]
     :json-rpc/call               [{:method      "wakuext_leaveCommunity"
                                    :params      [community-id]
                                    :js-response true
@@ -47,6 +47,7 @@
                                             (update :chats dissoc public-key)
                                             (update :chats-home-list disj public-key)
                                             (assoc-in [:contacts/contacts public-key :added] false))
+            :dispatch                    [:shell/close-switcher-card public-key]
            :clear-message-notifications
            [[public-key] (get-in db [:multiaccount :remote-push-notifications-enabled?])]}
           (activity-center/notifications-fetch-unread-count)
@@ -4,7 +4,6 @@
            [status-im.contact.block :as contact.block]
            [status-im.contact.db :as contact.db]
            [status-im.data-store.contacts :as contacts-store]
-            [status-im.multiaccounts.update.core :as multiaccounts.update]
            [utils.re-frame :as rf]
            [status-im2.navigation.events :as navigation]
            [taoensso.timbre :as log]))
@@ -151,15 +150,6 @@
             #(re-frame/dispatch [:sanitize-messages-and-process-response %]))
            (navigation/navigate-back)))

-(rf/defn switch-mutual-contact-requests-enabled
-  {:events [:multiaccounts.ui/switch-mutual-contact-requests-enabled]}
-  [cofx enabled?]
-  (multiaccounts.update/multiaccount-update
-   cofx
-   :mutual-contact-enabled?
-   enabled?
-   nil))
-
 (rf/defn set-search-query
  {:events [:contacts/set-search-query]}
  [{:keys [db] :as cofx} value]
@@ -86,8 +86,9 @@
  (get-in db [:contacts/contacts public-key]))

 (defn added?
-  ([contact]
-   (:added contact))
+  ([{:keys [contact-request-state]}]
+   (or (= constants/contact-request-state-mutual contact-request-state)
+       (= constants/contact-request-state-sent contact-request-state)))
  ([db public-key]
   (added? (get-in db [:contacts/contacts public-key]))))

@@ -98,27 +99,28 @@
   (blocked? (get-in db [:contacts/contacts public-key]))))

 (defn active?
-  "Checks that the user is added to the contact and not blocked"
+  "Checks that we are mutual contacts"
  ([contact]
-   (and (:added contact)
+   (and (= constants/contact-request-state-mutual
+           (:contact-request-state contact))
        (not (:blocked contact))))
  ([db public-key]
   (active? (get-in db [:contacts/contacts public-key]))))

 (defn enrich-contact
  ([contact] (enrich-contact contact nil nil))
-  ([{:keys [added public-key] :as contact} setting own-public-key]
+  ([{:keys [public-key] :as contact} setting own-public-key]
   (cond-> (-> contact
               (dissoc :ens-verified-at :ens-verification-retries)
               (assoc :blocked? (:blocked contact)
                      :active?  (active? contact)
-                      :added?   added)
+                      :added?   (added? contact))
               (multiaccounts/contact-with-names))
     (and setting
          (not= public-key own-public-key)
          (or (= setting constants/profile-pictures-visibility-none)
              (and (= setting constants/profile-pictures-visibility-contacts-only)
-                   (not added))))
+                   (not (added? contact)))))
     (dissoc :images))))

 (defn enrich-contacts
@@ -40,7 +40,9 @@
      (set/rename-keys {:lastMessage               :last-message
                        :replyMessage              :reply-message
                        :chatId                    :chat-id
-                        :contactVerificationStatus :contact-verification-status})
+                        :contactVerificationStatus :contact-verification-status
+                        :communityId               :community-id
+                        :membershipStatus          :membership-status})
      (update :last-message #(when % (messages/<-rpc %)))
      (update :message #(when % (messages/<-rpc %)))
      (update :reply-message #(when % (messages/<-rpc %)))
@@ -14,7 +14,7 @@
  {:events [:navigate-chat-updated]}
  [cofx chat-id]
  (when (get-in cofx [:db :chats chat-id])
-    (models.chat/navigate-to-chat cofx chat-id)))
+    (models.chat/navigate-to-chat-nav2 cofx chat-id nil)))

 (rf/defn handle-chat-removed
  {:events [:chat-removed]}
@@ -71,7 +71,7 @@
 (rf/defn create-from-link
  [cofx {:keys [chat-id invitation-admin chat-name]}]
  (if (get-in cofx [:db :chats chat-id])
-    {:dispatch [:chat.ui/navigate-to-chat chat-id]}
+    {:dispatch [:chat.ui/navigate-to-chat-nav2 chat-id]}
    {:json-rpc/call [{:method      "wakuext_createGroupChatFromInvitation"
                      :params      [chat-name chat-id invitation-admin]
                      :js-response true
@@ -251,7 +251,7 @@
         (rf/dispatch-sync [:chat.ui/start-chat chat-id]) ;; start a new chat
         (rf-test/wait-for
           [:status-im.chat.models/one-to-one-chat-created]
-           (rf/dispatch-sync [:chat.ui/navigate-to-chat chat-id])
+           (rf/dispatch-sync [:chat.ui/navigate-to-chat-nav2 chat-id])
           (is (= chat-id @(rf/subscribe [:chats/current-chat-id])))
           (logout!)
           (rf-test/wait-for [::logout/logout-method] ; we need to logout to make sure the node is not in
@@ -276,7 +276,7 @@
         (rf/dispatch-sync [:chat.ui/start-chat chat-id]) ;; start a new chat
         (rf-test/wait-for
           [:status-im.chat.models/one-to-one-chat-created]
-           (rf/dispatch-sync [:chat.ui/navigate-to-chat chat-id])
+           (rf/dispatch-sync [:chat.ui/navigate-to-chat-nav2 chat-id])
           (is (= chat-id @(rf/subscribe [:chats/current-chat-id])))
           (is @(rf/subscribe [:chats/chat chat-id]))
           (rf/dispatch-sync [:chat.ui/remove-chat-pressed chat-id])
@@ -307,7 +307,7 @@
         (rf/dispatch-sync [:chat.ui/start-chat chat-id]) ;; start a new chat
         (rf-test/wait-for
           [:status-im.chat.models/one-to-one-chat-created]
-           (rf/dispatch-sync [:chat.ui/navigate-to-chat chat-id])
+           (rf/dispatch-sync [:chat.ui/navigate-to-chat-nav2 chat-id])
           (is (= chat-id @(rf/subscribe [:chats/current-chat-id])))
           (is @(rf/subscribe [:chats/chat chat-id]))
           (rf/dispatch-sync [::chat.models/mute-chat-toggled chat-id true])
@@ -424,7 +424,7 @@
         :key-uid
         (fn [stored-key-uid]
           (when (= stored-key-uid key-uid)
-             (re-frame/dispatch [:chat.ui/navigate-to-chat chat-id])))))))))
+             (re-frame/dispatch [:chat.ui/navigate-to-chat-nav2 chat-id])))))))))

 (rf/defn check-last-chat
  {:events [::check-last-chat]}
@@ -4,7 +4,8 @@
            [status-im.utils.config :as config]
            [utils.re-frame :as rf]
            [status-im.utils.platform :as utils.platform]
-            [status-im.utils.types :as types]))
+            [status-im.utils.types :as types]
+            [clojure.string :as string]))

 (defn- add-custom-bootnodes
  [config network all-bootnodes]
@@ -107,14 +108,19 @@
  (get (fleets db)
       (current-fleet-key db)))

+(defn- wakuv2-enabled?
+  [fleet]
+  (let [ks (keys fleet)]
+    (some #(string/includes? (str %) "waku") ks)))
+
 (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)
+        wakuv2-enabled (wakuv2-enabled? current-fleet)
+        waku-nodes (get config/waku-nodes-config current-fleet-key)
        rendezvous-nodes (pick-nodes 3 (vals (:rendezvous current-fleet)))
        {:keys [installation-id log-level
                waku-bloom-filter-mode
@@ -14,8 +14,7 @@
           transactions-management-enabled?
           wakuv2-flag
           current-fleet
-           webview-debug
-           mutual-contact-requests-enabled?]}]
+           webview-debug]}]
  (keep
   identity
   [{:size                 :small
@@ -115,17 +114,7 @@
     #(re-frame/dispatch
       [:multiaccounts.ui/waku-bloom-filter-mode-switched (not waku-bloom-filter-mode)])
     :accessory               :switch
-     :active                  waku-bloom-filter-mode}
-    {:size                    :small
-     :title                   (i18n/label :t/mutual-contact-requests)
-     :accessibility-label     :mutual-contact-requests-switch
-     :container-margin-bottom 8
-     :on-press
-     #(re-frame/dispatch
-       [:multiaccounts.ui/switch-mutual-contact-requests-enabled
-        (not mutual-contact-requests-enabled?)])
-     :accessory               :switch
-     :active                  mutual-contact-requests-enabled?}]))
+     :active                  waku-bloom-filter-mode}]))

 (defn- flat-list-data
  [options]
@@ -146,8 +135,7 @@
                  communities-enabled?             [:communities/enabled?]
                  transactions-management-enabled? [:wallet/transactions-management-enabled?]
                  current-log-level                [:log-level/current-log-level]
-                  current-fleet                    [:fleets/current-fleet]
-                  mutual-contact-requests-enabled? [:mutual-contact-requests/enabled?]]
+                  current-fleet                    [:fleets/current-fleet]]
    [list/flat-list
     {:data      (flat-list-data
                  {:network-name                     network-name
@@ -158,7 +146,6 @@
                   :dev-mode?                        false
                   :wakuv2-flag                      wakuv2-flag
                   :waku-bloom-filter-mode           waku-bloom-filter-mode
-                   :webview-debug                    webview-debug
-                   :mutual-contact-requests-enabled? mutual-contact-requests-enabled?})
+                   :webview-debug                    webview-debug})
      :key-fn    (fn [_ i] (str i))
      :render-fn render-item}]))
@@ -6,7 +6,7 @@
   [quo.design-system.colors :as colors]
   [quo.react :as quo.react]
   [quo.react-native :as rn]
-   [re-frame.core :as re-frame]
+   [re-frame.core :as rf]
   re-frame.db
   [reagent.core :as reagent]
   [status-im.constants :as constants]
@@ -42,13 +42,13 @@

 (defn invitation-requests
  [chat-id admins]
-  (let [current-pk @(re-frame/subscribe [:multiaccount/public-key])
+  (let [current-pk @(rf/subscribe [:multiaccount/public-key])
        admin?     (get admins current-pk)]
    (when admin?
-      (let [invitations @(re-frame/subscribe [:group-chat/pending-invitations-by-chat-id chat-id])]
+      (let [invitations @(rf/subscribe [:group-chat/pending-invitations-by-chat-id chat-id])]
        (when (seq invitations)
          [react/touchable-highlight
-           {:on-press            #(re-frame/dispatch [:navigate-to :group-chat-invite])
+           {:on-press            #(rf/dispatch [:navigate-to :group-chat-invite])
            :accessibility-label :invitation-requests-button}
           [react/view {:style (style/add-contact)}
            [react/text {:style style/add-contact-text}
@@ -56,11 +56,11 @@

 (defn add-contact-bar
  [public-key]
-  (when-not (or @(re-frame/subscribe [:contacts/contact-added? public-key])
-                @(re-frame/subscribe [:contacts/contact-blocked? public-key]))
+  (when-not (or @(rf/subscribe [:contacts/contact-added? public-key])
+                @(rf/subscribe [:contacts/contact-blocked? public-key]))
    [react/touchable-highlight
     {:on-press
-      #(re-frame/dispatch [:contact.ui/add-to-contact-pressed public-key])
+      #(rf/dispatch [:contact.ui/add-to-contact-pressed public-key])
      :accessibility-label :add-to-contacts-button}
     [react/view {:style (style/add-contact)}
      [icons/icon :main-icons/add
@@ -69,7 +69,7 @@

 (defn contact-request
  []
-  (let [contact-request @(re-frame/subscribe [:chats/sending-contact-request])]
+  (let [contact-request @(rf/subscribe [:chats/sending-contact-request])]
    [react/view {:style style/contact-request}
     [react/image
      {:source (resources/get-image :hand-wave)
@@ -92,7 +92,7 @@
        [quo/button
         {:style               {:width "100%"}
          :accessibility-label :contact-request--button
-          :on-press            #(re-frame/dispatch [:chat.ui/send-contact-request])}
+          :on-press            #(rf/dispatch [:chat.ui/send-contact-request])}
         (i18n/label :t/contact-request)]])]))

 (defn chat-intro
@@ -101,7 +101,6 @@
           chat-type
           group-chat
           invitation-admin
-           mutual-contact-requests-enabled?
           contact-name
           color
           loading-messages?
@@ -136,25 +135,23 @@
       :no-messages?      no-messages?}]
     [react/text {:style (assoc style/intro-header-description :margin-bottom 32)}
      (str (i18n/label :t/empty-chat-description-one-to-one) contact-name)])
-   (when (and mutual-contact-requests-enabled?
-              (= chat-type constants/one-to-one-chat-type)
-              (or (= contact-request-state constants/contact-request-state-none)
-                  (= contact-request-state constants/contact-request-state-received)
-                  (= contact-request-state constants/contact-request-state-dismissed)))
-     [contact-request])])
+   (when
+     (= chat-type constants/one-to-one-chat-type)
+     (or (= contact-request-state constants/contact-request-state-none)
+         (= contact-request-state constants/contact-request-state-received)
+         (= contact-request-state constants/contact-request-state-dismissed)))
+   [contact-request]])

 (defn chat-intro-one-to-one
  [{:keys [chat-id] :as opts}]
-  (let [contact                          @(re-frame/subscribe [:contacts/contact-by-identity chat-id])
-        mutual-contact-requests-enabled? @(re-frame/subscribe [:mutual-contact-requests/enabled?])
-        contact-names                    @(re-frame/subscribe [:contacts/contact-two-names-by-identity
-                                                               chat-id])]
+  (let [contact       @(rf/subscribe [:contacts/contact-by-identity chat-id])
+        contact-names @(rf/subscribe [:contacts/contact-two-names-by-identity
+                                      chat-id])]
    [chat-intro
     (assoc opts
-            :mutual-contact-requests-enabled? mutual-contact-requests-enabled?
-            :contact-name                     (first contact-names)
-            :contact-request-state            (or (:contact-request-state contact)
-                                                  constants/contact-request-state-none))]))
+            :contact-name          (first contact-names)
+            :contact-request-state (or (:contact-request-state contact)
+                                       constants/contact-request-state-none))]))

 (defn chat-intro-header-container
  [{:keys [group-chat invitation-admin
@@ -217,8 +214,8 @@
 (defn invitation-bar
  [chat-id]
  (let [{:keys [state chat-id] :as invitation}
-        (first @(re-frame/subscribe [:group-chat/invitations-by-chat-id chat-id]))
-        {:keys [retry? message]}               @(re-frame/subscribe [:chats/current-chat-membership])
+        (first @(rf/subscribe [:group-chat/invitations-by-chat-id chat-id]))
+        {:keys [retry? message]}               @(rf/subscribe [:chats/current-chat-membership])
        message-length                         (count message)]
    [react/view {:margin-horizontal 16 :margin-top 10}
     (cond
@@ -238,13 +235,13 @@
         [quo/button
          {:type                :secondary
           :accessibility-label :retry-button
-           :on-press            #(re-frame/dispatch [:group-chats.ui/membership-retry])}
+           :on-press            #(rf/dispatch [:group-chats.ui/membership-retry])}
          (i18n/label :t/mailserver-retry)]
         :left
         [quo/button
          {:type                :secondary
           :accessibility-label :remove-group-button
-           :on-press            #(re-frame/dispatch [:group-chats.ui/remove-chat-confirmed chat-id])}
+           :on-press            #(rf/dispatch [:group-chats.ui/remove-chat-confirmed chat-id])}
          (i18n/label :t/remove-group)]}]
       :else
       [toolbar/toolbar
@@ -255,7 +252,7 @@
           :accessibility-label :introduce-yourself-button
           :disabled            (or (string/blank? message)
                                    (> message-length chat.group/message-max-length))
-           :on-press            #(re-frame/dispatch [:send-group-chat-membership-request])}
+           :on-press            #(rf/dispatch [:send-group-chat-membership-request])}
          (i18n/label :t/request-membership)]}])]))

 (defn get-space-keeper-ios
@@ -289,9 +286,9 @@

 (defn list-footer
  [{:keys [chat-id] :as chat}]
-  (let [loading-messages? @(re-frame/subscribe [:chats/loading-messages? chat-id])
-        no-messages?      @(re-frame/subscribe [:chats/chat-no-messages? chat-id])
-        all-loaded?       @(re-frame/subscribe [:chats/all-loaded? chat-id])]
+  (let [loading-messages? @(rf/subscribe [:chats/loading-messages? chat-id])
+        no-messages?      @(rf/subscribe [:chats/chat-no-messages? chat-id])
+        all-loaded?       @(rf/subscribe [:chats/all-loaded? chat-id])]
    [react/view {:style (when platform/android? {:scaleY -1})}
     (if (or loading-messages? (not chat-id) (not all-loaded?))
       [react/view {:height 324 :align-items :center :justify-content :center}
@@ -340,15 +337,15 @@
 (defn list-on-end-reached
  []
  (if @state/scrolling
-    (re-frame/dispatch [:chat.ui/load-more-messages-for-current-chat])
-    (utils/set-timeout #(re-frame/dispatch [:chat.ui/load-more-messages-for-current-chat])
+    (rf/dispatch [:chat.ui/load-more-messages-for-current-chat])
+    (utils/set-timeout #(rf/dispatch [:chat.ui/load-more-messages-for-current-chat])
                       (if platform/low-device? 700 200))))

 (defn get-render-data
  [{:keys [group-chat chat-id public? community-id admins space-keeper show-input? edit-enabled
           in-pinned-view?]}]
-  (let [current-public-key  @(re-frame/subscribe [:multiaccount/public-key])
-        community           @(re-frame/subscribe [:communities/community community-id])
+  (let [current-public-key  @(rf/subscribe [:multiaccount/public-key])
+        community           @(rf/subscribe [:communities/community community-id])
        group-admin?        (get admins current-public-key)
        community-admin?    (when community (community :admin))
        message-pin-enabled (and (not public?)
@@ -371,17 +368,15 @@
  [{:keys [chat
           bottom-space
           pan-responder
-           mutual-contact-requests-enabled?
           space-keeper
           show-input?]}]
  (let [{:keys [group-chat chat-type chat-id public? community-id admins]} chat

-        messages @(re-frame/subscribe [:chats/raw-chat-messages-stream chat-id])
+        messages @(rf/subscribe [:chats/raw-chat-messages-stream chat-id])
        one-to-one? (= chat-type constants/one-to-one-chat-type)
-        contact-added? (when one-to-one? @(re-frame/subscribe [:contacts/contact-added? chat-id]))
+        contact-added? (when one-to-one? @(rf/subscribe [:contacts/contact-added? chat-id]))
        should-send-contact-request?
        (and
-         mutual-contact-requests-enabled?
         one-to-one?
         (not contact-added?))]

@@ -423,13 +418,13 @@
  []
  (when (and (not @navigation.state/curr-modal) (= (get @re-frame.db/app-db :view-id) :chat))
    (react/hw-back-remove-listener navigate-back-handler)
-    (re-frame/dispatch [:close-chat])
-    (re-frame/dispatch [:navigate-back])))
+    (rf/dispatch [:close-chat])
+    (rf/dispatch [:navigate-back])))

 (defn topbar-content
  []
-  (let [window-width                               @(re-frame/subscribe [:dimensions/window-width])
-        {:keys [group-chat chat-id] :as chat-info} @(re-frame/subscribe [:chats/current-chat])]
+  (let [window-width                               @(rf/subscribe [:dimensions/window-width])
+        {:keys [group-chat chat-id] :as chat-info} @(rf/subscribe [:chats/current-chat])]
    [react/touchable-highlight
     {:on-press #(when-not group-chat
                   (debounce/dispatch-and-chill [:chat.ui/show-profile chat-id] 1000))
@@ -452,9 +447,9 @@
   [react/view {:flex 1 :left 52 :right 52 :top 0 :bottom 0 :position :absolute}
    [topbar-content]]
   [react/touchable-highlight
-    {:on-press-in         #(re-frame/dispatch [:bottom-sheet/show-sheet
-                                               {:content (fn [] [sheets/current-chat-actions])
-                                                :height  256}])
+    {:on-press-in         #(rf/dispatch [:bottom-sheet/show-sheet
+                                         {:content (fn [] [sheets/current-chat-actions])
+                                          :height  256}])
     :accessibility-label :chat-menu-button
     :style               {:right           0
                           :top             0
@@ -481,26 +476,28 @@
        set-active-panel (get-set-active-panel active-panel)
        on-close         #(set-active-panel nil)]
    (fn []
-      (let [{:keys [chat-id show-input? group-chat admins invitation-admin] :as chat}
-            ;;we want to react only on these fields, do not use full chat map here
-            @(re-frame/subscribe [:chats/current-chat-chat-view])
-            mutual-contact-requests-enabled? @(re-frame/subscribe [:mutual-contact-requests/enabled?])
-            max-bottom-space (max @bottom-space @panel-space)]
+      (let [{:keys [chat-id
+                    show-input?
+                    group-chat
+                    admins
+                    invitation-admin]
+             :as   chat}
+            @(rf/subscribe [:chats/current-chat-chat-view])
+            max-bottom-space (max @bottom-space
+                                  @panel-space)]
        [:<>
         [topbar]
         [connectivity/loading-indicator]
         (when chat-id
-           (if group-chat
-             [invitation-requests chat-id admins]
-             (when-not mutual-contact-requests-enabled? [add-contact-bar chat-id])))
+           (when group-chat
+             [invitation-requests chat-id admins]))
         ;;MESSAGES LIST
         [messages-view
-          {:chat                             chat
-           :bottom-space                     max-bottom-space
-           :pan-responder                    pan-responder
-           :mutual-contact-requests-enabled? mutual-contact-requests-enabled?
-           :space-keeper                     space-keeper
-           :show-input?                      show-input?}]
+          {:chat          chat
+           :bottom-space  max-bottom-space
+           :pan-responder pan-responder
+           :space-keeper  space-keeper
+           :show-input?   show-input?}]
         (when (and group-chat invitation-admin)
           [accessory/view
            {:y               position-y
@@ -48,7 +48,7 @@
    :on-press      (fn []
                     (rf/dispatch [:communities/load-category-states id])
                     (rf/dispatch [:dismiss-keyboard])
-                     (rf/dispatch [:navigate-to :community {:community-id id}]))
+                     (rf/dispatch [:navigate-to-nav2 :community {:community-id id}]))
    :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet
                                  {:content (fn []
                                              [community/community-actions community])}])}
@@ -111,7 +111,7 @@
                                     (i18n/label :t/open-membership))]]
      :on-press                  #(do
                                    (rf/dispatch [:dismiss-keyboard])
-                                    (rf/dispatch [:navigate-to :community {:community-id id}]))}]))
+                                    (rf/dispatch [:navigate-to-nav2 :community {:community-id id}]))}]))

 (defn communities-actions
  []
@@ -73,8 +73,18 @@
     :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])}]
+     :on-press                   (fn [] ;; Note: currently the bottom button is overlapping with
+                                        ;; safe-area
+                                        ;; because it is using old bottom-sheet
+                                   (rf/dispatch [:bottom-sheet/hide])
+                                   ;; A one second delay is needed because there are 2 bottom-sheets here
+                                   ;; It would better to migrate contact-selection-list component to use
+                                   ;; a screen
+                                   (js/setTimeout #(rf/dispatch [:bottom-sheet/show-sheet
+                                                                 {:content
+                                                                  new-chat-aio/contact-selection-list}])
+                                                  1000))
+    }]
   [quo2/menu-item
    {:theme                        :main
     :title                        (i18n/label :t/add-a-contact)
@@ -27,7 +27,6 @@
   [status-im.ui.screens.home.styles :as styles]
   [status-im.ui.screens.home.views.inner-item :as inner-item]
   [status-im.utils.utils :as utils]
-   [status-im2.setup.config :as config]
   [utils.debounce :as debounce])
  (:require-macros [status-im.utils.views :as views]))

@@ -152,9 +151,7 @@
     home-item
     {:on-press      (fn []
                       (re-frame/dispatch [:dismiss-keyboard])
-                       (if config/new-ui-enabled?
-                         (re-frame/dispatch [:chat.ui/navigate-to-chat-nav2 chat-id])
-                         (re-frame/dispatch [:chat.ui/navigate-to-chat chat-id]))
+                       (re-frame/dispatch [:chat.ui/navigate-to-chat-nav2 chat-id])
                       (re-frame/dispatch [:search/home-filter-changed nil]))
      :on-long-press #(re-frame/dispatch [:bottom-sheet/show-sheet
                                          {:content (fn []
@@ -169,9 +166,7 @@
     home-item
     {:on-press      (fn []
                       (re-frame/dispatch [:dismiss-keyboard])
-                       (if config/new-ui-enabled?
-                         (re-frame/dispatch [:chat.ui/navigate-to-chat-nav2 chat-id])
-                         (re-frame/dispatch [:chat.ui/navigate-to-chat chat-id]))
+                       (re-frame/dispatch [:chat.ui/navigate-to-chat-nav2 chat-id])
                       (re-frame/dispatch [:search/home-filter-changed nil]))
      :on-long-press #(re-frame/dispatch [:bottom-sheet/show-sheet
                                          {:content (fn []
@@ -23,9 +23,10 @@
  (:require-macros [status-im.utils.views :as views]))

 (defn actions
-  [{:keys [public-key added? blocked? ens-name] :as contact} muted?]
+  [{:keys [public-key added? blocked? ens-name mutual?] :as contact} muted?]
  (concat [{:label               (i18n/label :t/chat)
            :icon                :main-icons/message
+            :disabled            (not mutual?)
            :action              #(re-frame/dispatch [:contact.ui/send-message-pressed
                                                      {:public-key public-key
                                                       :ens-name   ens-name}])
@@ -177,6 +178,7 @@
  [{:keys [icon label action selected disabled negative]}]
  [react/touchable-highlight
   {:on-press            action
+    :disabled            disabled
    :style               {:flex 1}
    :accessibility-label (str label "-item-button")}
   [react/view {:flex 1 :align-items :center}
@@ -58,9 +58,8 @@
 (defn contact-selection-list
  []
  (let [contacts                                     (rf/sub
-                                                      [:contacts/sorted-and-grouped-by-first-letter])
+                                                      [:contacts/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)
        contacts-selected?                           (pos? selected-contacts-count)
        {:keys [names public-key]}                   (-> contacts first :data first)
@@ -68,7 +67,7 @@
        {:keys [nickname ens-name three-words-name]} names
        first-username                               (or ens-name nickname three-words-name)
        no-contacts?                                 (empty? contacts)]
-    [react/view {:style {:height (* window-height 0.95)}}
+    [react/view {:style {:flex 1}}
     [quo2/button
      {:type                      :grey
       :icon                      true
@@ -450,7 +450,7 @@
   [quo/text
    {:style  {:margin-top 6}
     :weight :bold
-     :size   :large}
+     :size   :heading-2}
    (i18n/label :t/contact-request)]
   [rn/view {:style {:padding-horizontal 16}}
    [quo/text
@@ -3,9 +3,8 @@

 (defn pin-popover
  [width]
-  {:position         :absolute
-   :width            (- width 16)
-   :left             8
+  {:width            (- width 16)
+   :margin-left      8
   :background-color (colors/theme-colors colors/neutral-80-opa-90 colors/white-opa-90)
   :flex-direction   :row
   :border-radius    16
@@ -24,38 +24,40 @@
                                        (reanimated/with-timing (if show-pin-limit-modal? 1 0)))
           (reanimated/set-shared-value z-index-animation
                                        (reanimated/with-timing (if show-pin-limit-modal? 10 -1)))))
-       [reanimated/view
-        {:style               (reanimated/apply-animations-to-style
-                               {:opacity opacity-animation
-                                :z-index z-index-animation}
-                               (style/pin-popover width))
-         :accessibility-label :pin-limit-popover}
-        [rn/view {:style (style/pin-alert-container)}
-         [rn/view {:style style/pin-alert-circle}
-          [rn/text {:style {:color colors/danger-50}} "!"]]]
-        [rn/view {:style {:margin-left 8}}
-         [quo/text {:weight :semi-bold :color (colors/theme-colors colors/white colors/neutral-100)}
-          (i18n/label :t/cannot-pin-title)]
-         [quo/text {:size :paragraph-2 :color (colors/theme-colors colors/white colors/neutral-100)}
-          (i18n/label :t/cannot-pin-desc)]
-         [rn/touchable-opacity
-          {:accessibility-label :view-pinned-messages
-           :active-opacity      1
-           :on-press            (fn []
-                                  (rf/dispatch [:pin-message/hide-pin-limit-modal chat-id])
-                                  (rf/dispatch [:bottom-sheet/show-sheet :pinned-messages-list chat-id]))
-           :style               style/view-pinned-messages}
-          [quo/text {:size :paragraph-2 :weight :medium :color colors/white}
-           (i18n/label :t/view-pinned-messages)]]]
-        [rn/touchable-opacity
-         {:accessibility-label :close-pin-limit-popover
-          :active-opacity      1
-          :on-press            #(rf/dispatch [:pin-message/hide-pin-limit-modal chat-id])
-          :style               {:position :absolute
-                                :top      16
-                                :right    16}}
-         [quo/icon :i/close
-          {:color (colors/theme-colors colors/white colors/neutral-100)
-           :size  12}]]]))])
+       (when show-pin-limit-modal?
+         [reanimated/view
+          {:style               (reanimated/apply-animations-to-style
+                                 {:opacity opacity-animation
+                                  :z-index z-index-animation}
+                                 (style/pin-popover width))
+           :accessibility-label :pin-limit-popover}
+          [rn/view {:style (style/pin-alert-container)}
+           [rn/view {:style style/pin-alert-circle}
+            [rn/text {:style {:color colors/danger-50}} "!"]]]
+          [rn/view {:style {:margin-left 8}}
+           [quo/text {:weight :semi-bold :color (colors/theme-colors colors/white colors/neutral-100)}
+            (i18n/label :t/cannot-pin-title)]
+           [quo/text {:size :paragraph-2 :color (colors/theme-colors colors/white colors/neutral-100)}
+            (i18n/label :t/cannot-pin-desc)]
+           [rn/touchable-opacity
+            {:accessibility-label :view-pinned-messages
+             :active-opacity      1
+             :on-press            (fn []
+                                    (rf/dispatch [:pin-message/hide-pin-limit-modal chat-id])
+                                    (rf/dispatch [:bottom-sheet/show-sheet :pinned-messages-list
+                                                  chat-id]))
+             :style               style/view-pinned-messages}
+            [quo/text {:size :paragraph-2 :weight :medium :color colors/white}
+             (i18n/label :t/view-pinned-messages)]]]
+          [rn/touchable-opacity
+           {:accessibility-label :close-pin-limit-popover
+            :active-opacity      1
+            :on-press            #(rf/dispatch [:pin-message/hide-pin-limit-modal chat-id])
+            :style               {:position :absolute
+                                  :top      16
+                                  :right    16}}
+           [quo/icon :i/close
+            {:color (colors/theme-colors colors/white colors/neutral-100)
+             :size  12}]]])))])


@@ -1,36 +0,0 @@
-(ns status-im.ui2.screens.chat.pinned-banner.view
-  (:require [quo2.core :as quo]
-            [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]))
-
-;; TODO (flexsurfer) this should be a banner component in quo2
-;; https://github.com/status-im/status-mobile/issues/14528
-(defn pinned-banner
-  [{:keys [latest-pin-text pins-count on-press]}]
-  [rn/touchable-opacity
-   {:accessibility-label :pinned-banner
-    :style               {:height             50
-                          :background-color   colors/primary-50-opa-20
-                          :flex-direction     :row
-                          :align-items        :center
-                          :padding-horizontal 20
-                          :padding-vertical   10}
-    :active-opacity      1
-    :on-press            on-press}
-   [quo/icon :i/pin {:size 20}]
-   [quo/text
-    {:number-of-lines 1
-     :size            :paragraph-2
-     :style           {:margin-left 10 :margin-right 50}}
-    latest-pin-text]
-   [rn/view
-    {:accessibility-label :pins-count
-     :style               {:position         :absolute
-                           :right            22
-                           :height           20
-                           :width            20
-                           :border-radius    8
-                           :justify-content  :center
-                           :align-items      :center
-                           :background-color colors/neutral-80-opa-5}}
-    [quo/text {:size :label :weight :medium} pins-count]]])
@@ -11,7 +11,7 @@
 (defn contact-list
  [data]
  (let [contacts (if (:group data)
-                   (rf/sub [:contacts/add-members-sections])
+                   (rf/sub [:contacts/grouped-by-first-letter])
                   (rf/sub [:contacts/filtered-active-sections]))]
    [rn/section-list
     {:key-fn                         :title
@@ -158,3 +158,11 @@

 ;; NOTE for development only should be removed in status 2.0
 (def new-ui-enabled? true)
+
+(def waku-nodes-config
+  {:status.prod ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.nodes.status.im"]
+   :status.test ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.nodes.status.im"]
+   :wakuv2.prod
+   ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.waku.nodes.status.im"]
+   :wakuv2.test
+   ["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@test.waku.nodes.status.im"]})
@@ -96,7 +96,7 @@
 (rf/defn handle-community-chat
  [cofx {:keys [chat-id]}]
  (log/info "universal-links: handling community chat" chat-id)
-  {:dispatch [:chat.ui/navigate-to-chat chat-id]})
+  {:dispatch [:chat.ui/navigate-to-chat-nav2 chat-id]})

 (rf/defn handle-public-chat
  [cofx {:keys [topic]}]
@@ -22,14 +22,35 @@
   :top              0
   :background-color colors/neutral-100})

+(def container
+  {:position :absolute
+   :left     0
+   :right    0
+   :top      0
+   :bottom   0
+   :overflow :hidden})
+
+(defn content-style
+  [insets]
+  {:position       :absolute
+   :left           0
+   :right          0
+   :top            0
+   :padding-top    border-radius
+   :padding-bottom (:bottom insets)})
+
+(defn selected-background
+  []
+  {:border-radius     12
+   :padding-left      12
+   :margin-horizontal 8
+   :margin-bottom     10
+   :height            48
+   :background-color  (colors/theme-colors colors/white colors/neutral-90)})
+
 (defn background
  []
-  {:position                :absolute
-   :left                    0
-   :right                   0
-   :top                     0
-   :bottom                  0
+  {:background-color        (colors/theme-colors colors/white colors/neutral-95)
+   :flex                    1
   :border-top-left-radius  border-radius
-   :border-top-right-radius border-radius
-   :overflow                :hidden
-   :background-color        (colors/theme-colors colors/white colors/neutral-95)})
+   :border-top-right-radius border-radius})
@@ -91,6 +91,7 @@
         visible?          :visible?
         backdrop-dismiss? :backdrop-dismiss?
         expandable?       :expandable?
+         selected-item     :selected-item
         :or               {show-handle?      true
                            backdrop-dismiss? true
                            expandable?       false}}
@@ -107,9 +108,10 @@
     (fn [insets]
       [:f>
        (fn []
-          (let [{window-height :height
-                 window-width  :width}
+          (let [{height       :height
+                 window-width :width}
                (rn/use-window-dimensions)
+                window-height (if selected-item (- height 72) height)
                {:keys [keyboard-shown]} (hooks/use-keyboard)
                bg-height-expanded (- window-height (:top insets))
                bg-height (max (min @content-height bg-height-expanded) 200)
@@ -205,22 +207,21 @@
                        {:transform [{:translateY translate-y}]}
                        {:width  window-width
                         :height window-height})}
-               [rn/view {:style (styles/background)}
-                [rn/keyboard-avoiding-view
-                 {:behaviour (if platform/ios? :padding :height)
-                  :style     {:flex 1}}
-                 [rn/view
-                  {:style     {:position       :absolute
-                               :left           0
-                               :right          0
-                               :top            0
-                               :padding-top    styles/border-radius
-                               :padding-bottom (:bottom insets)}
-                   :on-layout (when-not (and
-                                         (some? @content-height)
-                                         (> @content-height 0))
-                                on-content-layout)}
-                  children]]
+               [rn/view {:style styles/container}
+                (when selected-item
+                  [rn/view {:style (styles/selected-background)}
+                   [selected-item]])
+                [rn/view {:style (styles/background)}
+                 [rn/keyboard-avoiding-view
+                  {:behaviour (if platform/ios? :padding :height)
+                   :style     {:flex 1}}
+                  [rn/view
+                   {:style     (styles/content-style insets)
+                    :on-layout (when-not (and
+                                          (some? @content-height)
+                                          (> @content-height 0))
+                                 on-content-layout)}
+                   children]]

-                (when show-handle?
-                  [rn/view {:style (styles/handle)}])]]]]))])]))
+                 (when show-handle?
+                   [rn/view {:style (styles/handle)}])]]]]]))])]))
@@ -31,6 +31,11 @@
 (def ^:const contact-verification-status-trusted 5)
 (def ^:const contact-verification-status-untrustworthy 6)

+(def ^:const activity-center-membership-status-idle 0)
+(def ^:const activity-center-membership-status-pending 1)
+(def ^:const activity-center-membership-status-accepted 2)
+(def ^:const activity-center-membership-status-declined 3)
+
 (def ^:const emoji-reaction-love 1)
 (def ^:const emoji-reaction-thumbs-up 2)
 (def ^:const emoji-reaction-thumbs-down 3)
@@ -2,7 +2,6 @@
  (:require [quo2.core :as quo]
            [quo2.foundations.colors :as colors]
            [react-native.core :as rn]
-            [react-native.platform :as platform]
            [status-im2.common.home.actions.view :as actions]
            [status-im2.contexts.chat.home.chat-list-item.style :as style]
            [utils.address :as utils.address]
@@ -14,9 +13,7 @@
  (let [view-id (rf/sub [:view-id])]
    (when (= view-id :shell-stack)
      (rf/dispatch [:dismiss-keyboard])
-      (if platform/android?
-        (rf/dispatch [:chat.ui/navigate-to-chat-nav2 chat-id])
-        (rf/dispatch [:chat.ui/navigate-to-chat chat-id]))
+      (rf/dispatch [:chat.ui/show-profile chat-id])
      (rf/dispatch [:search/home-filter-changed nil]))))

 (defn action-icon
@@ -52,7 +49,7 @@
                                      (rf/dispatch [:deselect-member public-key true])))))}])]))

 (defn contact-list-item
-  [item _ _ {:keys [group start-a-new-chat? on-toggle] :as extra-data}]
+  [item _ _ {:keys [start-a-new-chat? on-toggle] :as extra-data}]
  (let [{:keys [public-key ens-verified added? images]} item
        display-name                                    (first (rf/sub
                                                                [:contacts/contact-two-names-by-identity
@@ -71,9 +68,8 @@
       :on-press            #(if start-a-new-chat?
                               (on-toggle true user-selected? public-key)
                               (open-chat public-key))
-       :on-long-press       #(when (some? group)
-                               (rf/dispatch [:bottom-sheet/show-sheet
-                                             {:content (fn [] [actions/actions item extra-data])}]))})
+       :on-long-press       #(rf/dispatch [:bottom-sheet/show-sheet
+                                           {:content (fn [] [actions/actions item extra-data])}])})
     [quo/user-avatar
      {:full-name         display-name
       :profile-picture   photo-path
@@ -3,5 +3,6 @@

 (defn not-implemented
  [content]
-  [rn/view {:border-color :red :border-width 1}
-   content])
+  (when content
+    [rn/view {:border-color :red :border-width 1}
+     content]))
@@ -3,25 +3,25 @@

 (rf/defn upsert
  {:events [:toasts/upsert]}
-  [{:keys [db]} id opts]
-  (let [{:keys [ordered toasts]} (:toasts db)
-        update?                  (some #(= % id) ordered)
-        ordered                  (if (not update?) (conj ordered id) ordered)
-        toasts                   (assoc toasts id opts)
-        db                       (-> db
-                                     (update :toasts assoc :ordered ordered :toasts toasts)
-                                     (update :toasts dissoc :hide-toasts-timer-set))]
-    (if (and (not update?) (= (count ordered) 1))
-      {:show-toasts []
-       :db          db}
-      {:db db})))
-
-(rf/defn create
-  {:events [:toasts/create]}
  [{:keys [db]} opts]
-  (let [next-toast-id (or (get-in [:toasts :next-toast-id] db) 1)]
-    {:db       (assoc-in db [:toasts :next-toast-id] (inc next-toast-id))
-     :dispatch [:toasts/upsert (str "toast-" next-toast-id) opts]}))
+  (let [{:keys [ordered toasts]} (:toasts db)
+        next-toast-number        (get-in db [:toasts :next-toast-number] 1)
+        id                       (or (:id opts)
+                                     (str "toast-" next-toast-number))
+        update?                  (some #(= % id) ordered)
+        ordered                  (if (not update?)
+                                   (conj ordered id)
+                                   ordered)
+        toasts                   (assoc toasts id (dissoc opts :id))]
+    (cond-> {:db (-> db
+                     (update :toasts assoc :ordered ordered :toasts toasts)
+                     (update :toasts dissoc :hide-toasts-timer-set))}
+
+      (and (not update?) (= (count ordered) 1))
+      (assoc :show-toasts [])
+
+      (not (:id opts))
+      (update-in [:db :toasts :next-toast-number] inc))))

 (rf/defn hide-toasts-with-check
  {:events [:toasts/hide-with-check]}
@@ -8,23 +8,28 @@
            [status-im2.common.toasts.style :as style]
            [utils.re-frame :as rf]))

-(def ^:private slide-out-up-animation
-  (-> ^js reanimated/slide-out-up-animation
-      .springify
-      (.damping 20)
-      (.stiffness 300)))
+;; (def ^:private slide-out-up-animation
+;;   (-> ^js reanimated/slide-out-up-animation
+;;       .springify
+;;       (.damping 20)
+;;       (.stiffness 300)))

-(def ^:private slide-in-up-animation
-  (-> ^js reanimated/slide-in-up-animation
-      .springify
-      (.damping 20)
-      (.stiffness 300)))
+;; (def ^:private slide-in-up-animation
+;;   (-> ^js reanimated/slide-in-up-animation
+;;       .springify
+;;       (.damping 20)
+;;       (.stiffness 300)))

-(def ^:private linear-transition
-  (-> ^js reanimated/linear-transition
-      .springify
-      (.damping 20)
-      (.stiffness 300)))
+;; (def ^:private linear-transition
+;;   (-> ^js reanimated/linear-transition
+;;       .springify
+;;       (.damping 20)
+;;       (.stiffness 300)))
+
+(defn toast
+  [id]
+  (let [toast-opts (rf/sub [:toasts/toast id])]
+    [quo/toast toast-opts]))

 (defn container
  [id]
@@ -35,13 +40,11 @@
    (fn []
      [:f>
       (fn []
-         (let [toast-opts   (rf/sub [:toasts/toast id])
-               duration     (get toast-opts :duration 3000)
-               on-dismissed #((get toast-opts :on-dismissed identity) id)
-               translate-y  (reanimated/use-shared-value 0)
+         (let [duration     (or (rf/sub [:toasts/toast-cursor id :duration]) 3000)
+               on-dismissed #((or (rf/sub [:toasts/toast-cursor id :on-dismissed]) identity) id)
               create-timer (fn []
-                              (reset! timer (utils.utils/set-timeout #(do (close!) (on-dismissed))
-                                                                     duration)))
+                              (reset! timer (utils.utils/set-timeout close! duration)))
+               translate-y  (reanimated/use-shared-value 0)
               pan
               (->
                 (gesture/gesture-pan)
@@ -78,13 +81,16 @@
           (rn/use-unmount on-dismissed)
           [gesture/gesture-detector {:gesture pan}
            [reanimated/view
-             {:entering slide-in-up-animation
-              :exiting  slide-out-up-animation
-              :layout   reanimated/linear-transition
-              :style    (reanimated/apply-animations-to-style
-                         {:transform [{:translateY translate-y}]}
-                         style/each-toast-container)}
-             [quo/toast toast-opts]]]))])))
+             {;; TODO: this will eanble layout animation at runtime and causing flicker on android
+              ;; we need to resolve this and re-enable layout animation
+              ;; issue at https://github.com/status-im/status-mobile/issues/14752
+              ;; :entering slide-in-up-animation
+              ;; :exiting  slide-out-up-animation
+              ;; :layout   reanimated/linear-transition
+              :style (reanimated/apply-animations-to-style
+                      {:transform [{:translateY translate-y}]}
+                      style/each-toast-container)}
+             [toast id]]]))])))

 (defn toasts
  []
@@ -92,6 +98,4 @@
    [into
     [rn/view
      {:style style/outmost-transparent-container}]
-     (->> toasts-ordered
-          reverse
-          (map (fn [id] ^{:key id} [container id])))]))
+     (map (fn [id] ^{:key id} [container id]) toasts-ordered)]))
@@ -0,0 +1,55 @@
+(ns status-im2.contexts.activity-center.notification.admin.view
+  (:require [i18n.i18n :as i18n]
+            [quo2.core :as quo]
+            [quo2.foundations.colors :as colors]
+            [status-im2.common.constants :as constants]
+            [status-im2.contexts.activity-center.notification.common.style :as style]
+            [status-im2.contexts.activity-center.notification.common.view :as common]
+            [utils.datetime :as datetime]
+            [utils.re-frame :as rf]))
+
+(defn view
+  [{:keys [author community-id id membership-status read timestamp]}]
+  (let [community       (rf/sub [:communities/community community-id])
+        community-name  (:name community)
+        community-image (get-in community [:images :thumbnail :uri])]
+    [quo/activity-log
+     (merge
+      {:title     (i18n/label :t/join-request)
+       :icon      :i/add-user
+       :timestamp (datetime/timestamp->relative timestamp)
+       :unread?   (not read)
+       :context   [[common/user-avatar-tag author]
+                   (i18n/label :t/wants-to-join)
+                   [quo/context-tag
+                    {:size           :small
+                     :override-theme :dark
+                     :color          colors/primary-50
+                     :style          style/user-avatar-tag
+                     :text-style     style/user-avatar-tag-text}
+                    {:uri community-image} community-name]]
+       :status    (case membership-status
+                    constants/activity-center-membership-status-accepted
+                    {:type :positive :label (i18n/label :t/accepted)}
+                    constants/activity-center-membership-status-declined
+                    {:type :negative :label (i18n/label :t/declined)}
+                    nil)}
+      (case membership-status
+        constants/activity-center-membership-status-pending
+        {:button-1 {:label               (i18n/label :t/decline)
+                    :accessibility-label :decline-join-request
+                    :type                :danger
+                    :on-press            (fn []
+                                           (rf/dispatch [:communities.ui/decline-request-to-join-pressed
+                                                         community-id id])
+                                           (rf/dispatch [:activity-center.notifications/mark-as-read
+                                                         id]))}
+         :button-2 {:label               (i18n/label :t/accept)
+                    :accessibility-label :accept-join-request
+                    :type                :positive
+                    :on-press            (fn []
+                                           (rf/dispatch [:communities.ui/accept-request-to-join-pressed
+                                                         community-id id])
+                                           (rf/dispatch [:activity-center.notifications/mark-as-read
+                                                         id]))}}
+        nil))]))
@@ -46,7 +46,7 @@
    [rn/touchable-opacity
     {:on-press (fn []
                  (rf/dispatch [:hide-popover])
-                  (rf/dispatch [:chat.ui/navigate-to-chat chat-id]))}
+                  (rf/dispatch [:chat.ui/navigate-to-chat-nav2 chat-id]))}
     [quo/activity-log
      {:title     (i18n/label :t/mention)
       :icon      :i/mention
@@ -38,7 +38,7 @@
    [rn/touchable-opacity
     {:on-press (fn []
                  (rf/dispatch [:hide-popover])
-                  (rf/dispatch [:chat.ui/navigate-to-chat chat-id]))}
+                  (rf/dispatch [:chat.ui/navigate-to-chat-nav2 chat-id]))}
     [quo/activity-log
      {:title     (i18n/label :t/message-reply)
       :icon      :i/reply
@@ -6,10 +6,10 @@
 (def ^:const mention 3)
 (def ^:const reply 4)
 (def ^:const contact-request 5)
+(def ^:const admin 8)
 (def ^:const contact-verification 10)

 ;; TODO: Replace with correct enum values once status-go implements them.
-(def ^:const admin 66610)
 (def ^:const tx 66612)
 (def ^:const membership 66613)
 (def ^:const system 66614)
@@ -5,6 +5,7 @@
            [react-native.core :as rn]
            [react-native.safe-area :as safe-area]
            [status-im2.contexts.activity-center.notification-types :as types]
+            [status-im2.contexts.activity-center.notification.admin.view :as admin]
            [status-im2.contexts.activity-center.notification.contact-request.view :as contact-request]
            [status-im2.contexts.activity-center.notification.contact-verification.view :as
             contact-verification]
@@ -42,8 +43,9 @@
 (defn tabs
  []
  (let [filter-type (rf/sub [:activity-center/filter-type])]
-    [quo/scrollable-tabs
+    [quo/tabs
     {:size                32
+      :scrollable?         true
      :blur?               true
      :override-theme      :dark
      :style               style/tabs
@@ -111,6 +113,9 @@
     types/reply
     [reply/view notification]

+     types/admin
+     [admin/view notification]
+
     nil)])

 (defn view
@@ -0,0 +1,26 @@
+(ns status-im2.contexts.chat.messages.contact-requests.bottom-drawer
+  (:require
+   [i18n.i18n :as i18n]
+   [utils.re-frame :as rf]
+   [quo2.core :as quo]
+   [quo2.components.drawers.permission-context.view :as permission-context]
+   [status-im2.common.constants :as constants]))
+
+(defn view
+  [contact-id contact-request-state]
+  (let [names (rf/sub [:contacts/contact-two-names-by-identity contact-id])]
+    [permission-context/view
+     [quo/button
+      {:type     :ghost
+       :on-press #(rf/dispatch [:chat.ui/show-profile contact-id])
+       :before   :i/communities}
+      (cond
+        (or (= contact-request-state
+               constants/contact-request-state-none)
+            (= contact-request-state
+               constants/contact-request-state-received))
+        (i18n/label :t/contact-request-chat-add {:name (first names)})
+        (= contact-request-state
+           constants/contact-request-state-sent)
+
+        (i18n/label :t/contact-request-chat-pending))]]))
@@ -1,6 +1,6 @@
 (ns status-im2.contexts.chat.messages.content.deleted.view
-  (:require [quo2.core :as quo]
-            [i18n.i18n :as i18n]))
+  (:require [i18n.i18n :as i18n]
+            [quo2.core :as quo]))

 (defn deleted-message
  [{:keys [deleted? deleted-undoable-till timestamp-str deleted-for-me-undoable-till]}]
@@ -1,8 +1,11 @@
 (ns status-im2.contexts.chat.messages.delete-message.events
-  (:require [status-im.chat.models.message-list :as message-list]
-            [utils.datetime :as datetime]
-            [taoensso.timbre :as log]
-            [utils.re-frame :as rf]))
+  (:require
+   [i18n.i18n :as i18n]
+   [quo2.foundations.colors :as colors]
+   [status-im.chat.models.message-list :as message-list]
+   [taoensso.timbre :as log]
+   [utils.datetime :as datetime]
+   [utils.re-frame :as rf]))

 (defn- update-db-clear-undo-timer
  [db chat-id message-id]
@@ -20,8 +23,7 @@
               [:messages chat-id message-id]
               assoc
               :deleted?              true
-               :deleted-undoable-till (+ (datetime/timestamp)
-                                         undo-time-limit-ms))))
+               :deleted-undoable-till (+ (datetime/timestamp) undo-time-limit-ms))))

 (defn- update-db-undo-locally
  "Restore deleted message if called within timelimit"
@@ -48,15 +50,44 @@
  {:events [:chat.ui/delete-message]}
  [{:keys [db]} {:keys [chat-id message-id]} undo-time-limit-ms]
  (when (get-in db [:messages chat-id message-id])
-    (assoc
-     (message-list/rebuild-message-list
-      {:db (update-db-delete-locally db chat-id message-id undo-time-limit-ms)}
-      chat-id)
-     :utils/dispatch-later
-     [{:dispatch [:chat.ui/delete-message-and-send
-                  {:chat-id    chat-id
-                   :message-id message-id}]
-       :ms       undo-time-limit-ms}])))
+    ;; all delete message toast are the same toast with id :delete-message-for-everyone
+    ;; new delete operation will reset prev pending deletes' undo timelimit
+    ;; undo will undo all pending deletes
+    ;; all pending deletes are stored in toast
+    (let [existing-undo-toast (get-in db [:toasts :toasts :delete-message-for-everyone])
+          toast-count         (inc (get existing-undo-toast :message-deleted-for-everyone-count 0))
+          existing-undos      (-> existing-undo-toast
+                                  (get :message-deleted-for-everyone-undos [])
+                                  (conj {:message-id message-id :chat-id chat-id}))]
+      (assoc
+       (message-list/rebuild-message-list
+        {:db (reduce
+              ;; sync all pending deletes' undo timelimit, extend to the latest one
+              (fn [db-acc {:keys [chat-id message-id]}]
+                (update-db-delete-locally db-acc chat-id message-id undo-time-limit-ms))
+              db
+              existing-undos)}
+        chat-id)
+
+       :dispatch-n
+       [[:toasts/close :delete-message-for-everyone]
+        [:toasts/upsert
+         {:id                                 :delete-message-for-everyone
+          :icon                               :info
+          :icon-color                         colors/danger-50-opa-40
+          :message-deleted-for-everyone-count toast-count
+          :message-deleted-for-everyone-undos existing-undos
+          :text                               (i18n/label-pluralize
+                                               toast-count
+                                               :t/message-deleted-for-everyone-count)
+          :duration                           undo-time-limit-ms
+          :undo-duration                      (/ undo-time-limit-ms 1000)
+          :undo-on-press                      #(do (rf/dispatch [:chat.ui/undo-all-delete-message])
+                                                   (rf/dispatch [:toasts/close
+                                                                 :delete-message-for-everyone]))}]]
+       :utils/dispatch-later [{:dispatch [:chat.ui/delete-message-and-send
+                                          {:chat-id chat-id :message-id message-id}]
+                               :ms       undo-time-limit-ms}]))))

 (rf/defn undo
  {:events [:chat.ui/undo-delete-message]}
@@ -66,22 +97,41 @@
     {:db (update-db-undo-locally db chat-id message-id)}
     chat-id)))

+(rf/defn undo-all
+  {:events [:chat.ui/undo-all-delete-message]}
+  [{:keys [db]}]
+  (when-let [pending-undos (get-in db
+                                   [:toasts :toasts :delete-message-for-everyone
+                                    :message-deleted-for-everyone-undos])]
+    {:dispatch-n (mapv #(vector :chat.ui/undo-delete-message %) pending-undos)}))
+
+(defn- check-before-delete-and-send
+  "make sure message alredy deleted? locally and undo timelimit has passed"
+  [db chat-id message-id]
+  (let [message                                  (get-in db [:messages chat-id message-id])
+        {:keys [deleted? deleted-undoable-till]} message]
+    (and deleted?
+         deleted-undoable-till
+         (>= (datetime/timestamp) deleted-undoable-till))))
+
 (rf/defn delete-and-send
  {:events [:chat.ui/delete-message-and-send]}
-  [{:keys [db]} {:keys [message-id chat-id]}]
+  [{:keys [db]} {:keys [message-id chat-id]} force?]
  (when-let [message (get-in db [:messages chat-id message-id])]
-    (cond-> {:db            (update-db-clear-undo-timer db chat-id message-id)
-             :json-rpc/call [{:method      "wakuext_deleteMessageAndSend"
-                              :params      [message-id]
-                              :js-response true
-                              :on-error    #(log/error "failed to delete message "
-                                                       {:message-id message-id :error %})
-                              :on-success  #(rf/dispatch [:sanitize-messages-and-process-response
-                                                          %])}]}
-      (get-in db [:pin-messages chat-id message-id])
-      (assoc :dispatch
-             [:pin-message/send-pin-message
-              {:chat-id chat-id :message-id message-id :pinned false}]))))
+    (when (or force? (check-before-delete-and-send db chat-id message-id))
+      (cond-> {:db            (update-db-clear-undo-timer db chat-id message-id)
+               :json-rpc/call [{:method      "wakuext_deleteMessageAndSend"
+                                :params      [message-id]
+                                :js-response true
+                                :on-error    #(log/error "failed to delete message "
+                                                         {:message-id message-id :error %})
+                                :on-success  #(rf/dispatch
+                                               [:sanitize-messages-and-process-response
+                                                %])}]}
+        (get-in db [:pin-messages chat-id message-id])
+        (assoc :dispatch
+               [:pin-message/send-pin-message
+                {:chat-id chat-id :message-id message-id :pinned false}])))))

 (defn- filter-pending-send-messages
  "traverse all messages find not yet synced deleted? messages"
@@ -96,7 +146,7 @@
  {:events [:chat.ui/send-all-deleted-messages]}
  [{:keys [db] :as cofx}]
  (let [pending-send-messages (reduce-kv filter-pending-send-messages [] (:messages db))]
-    (apply rf/merge cofx (map delete-and-send pending-send-messages))))
+    (apply rf/merge cofx (map #(delete-and-send % true) pending-send-messages))))

 (rf/defn delete-messages-localy
  "Mark messages :deleted? localy in client"
@@ -15,11 +15,46 @@
          (let [result-message (get-in (delete-message/delete {:db db} message 1000)
                                       [:db :messages cid mid])]
            (is (= (:id result-message) mid))
-            (is (true? (:deleted? result-message)))
-            (is (= (:deleted-undoable-till result-message) 1001))))
+            (is (true? (:deleted? result-message)) "mark message :deleted?")
+            (is (= (:deleted-undoable-till result-message) 1001) "set message undo timelimit")))
+        (testing "delete with pending deletes"
+          (let [db      (-> db
+                            (update-in [:messages cid "pending-delete-message"]
+                                       assoc
+                                       :deleted?              true
+                                       :deleted-undoable-till 0
+                                       :whisper-timestamp     0)
+                            (update-in [:toasts :toasts :delete-message-for-everyone]
+                                       assoc
+                                       :message-deleted-for-everyone-count 1
+                                       :message-deleted-for-everyone-undos [{:message-id
+                                                                             "pending-delete-message"
+                                                                             :chat-id    cid}]))
+                effects (delete-message/delete {:db db} message 1000)]
+            (is (= (get-in effects [:db :messages cid mid :deleted-undoable-till])
+                   (get-in effects [:db :messages cid "pending-delete-message" :deleted-undoable-till])
+                   1001)
+                "sync all pending delete undo timelimit")
+            (let [upsert-toast (-> effects :dispatch-n second)]
+              (is (= (-> upsert-toast last :message-deleted-for-everyone-count) 2)
+                  "+1 pending deletes")
+              (is
+               (and
+                (-> upsert-toast
+                    last
+                    :message-deleted-for-everyone-undos
+                    first
+                    :message-id
+                    (= "pending-delete-message"))
+                (-> upsert-toast
+                    last
+                    :message-deleted-for-everyone-undos
+                    second
+                    :message-id
+                    (= mid)))
+               "pending deletes are in order"))))
        (testing "return nil if message not in db"
-          (is (= (delete-message/delete {:db {:messages []}} message 1000)
-                 nil)))))))
+          (is (= (delete-message/delete {:db {:messages []}} message 1000) nil)))))))

 (deftest undo-delete
  (let [db      {:messages {cid {mid {:id mid :whisper-timestamp 1}}}}
@@ -30,14 +65,11 @@
                                        [:messages cid mid]
                                        assoc
                                        :deleted?              true
-                                        :deleted-undoable-till
-                                        (+ (datetime/timestamp) 1000))
-              result-message (get-in (delete-message/undo {:db db} message)
-                                     [:db :messages cid mid])]
+                                        :deleted-undoable-till (+ (datetime/timestamp) 1000))
+              result-message (get-in (delete-message/undo {:db db} message) [:db :messages cid mid])]
          (is (= (:id result-message) mid))
          (is (nil? (:deleted? result-message)))
          (is (nil? (:deleted-undoable-till result-message)))))
-
      (testing "remain deleted when undo after timelimit"
        (let [db             (update-in db
                                        [:messages cid mid]
@@ -48,47 +80,46 @@
          (is (= (:id result-message) mid))
          (is (nil? (:deleted-undoable-till result-message)))
          (is (true? (:deleted? result-message)))))
-
      (testing "return nil if message not in db"
-        (is (= (delete-message/undo {:db {:messages []}} message)
-               nil))))))
+        (is (= (delete-message/undo {:db {:messages []}} message) nil))))))

 (deftest delete-and-send
-  (let [db      {:messages {cid {mid {:id mid}}}}
+  (let [db      {:messages {cid {mid {:id mid :deleted? true :deleted-undoable-till 0}}}}
        message {:message-id mid :chat-id cid}]
    (testing "delete and send"
      (testing "dispatch right rpc call fx"
-        (let [expected-db {:messages {cid {mid {:id mid}}}}
-              effects     (delete-message/delete-and-send {:db db} message)
+        (let [expected-db {:messages {cid {mid {:id mid :deleted? true}}}}
+              effects     (delete-message/delete-and-send {:db db} message false)
              result-db   (:db effects)
              rpc-calls   (:json-rpc/call effects)]
          (is (= result-db expected-db))
          (is (= (count rpc-calls) 1))
-          (is (= (-> rpc-calls
-                     first
-                     :method)
-                 "wakuext_deleteMessageAndSend"))
-          (is (= (-> rpc-calls
-                     first
-                     :params
-                     count)
-                 1))
-          (is (= (-> rpc-calls
-                     first
-                     :params
-                     first)
-                 mid))))
+          (is (= (-> rpc-calls first :method) "wakuext_deleteMessageAndSend"))
+          (is (= (-> rpc-calls first :params count) 1))
+          (is (= (-> rpc-calls first :params first) mid))))
      (testing "clean undo timer"
-        (let [expected-db {:messages {cid {mid {:id mid}}}}
+        (let [expected-db {:messages {cid {mid {:id mid :deleted? true}}}}
              effects     (delete-message/delete-and-send
                           {:db (update-in db
-                                           [:messages cid mid
-                                            :deleted-undoable-till]
+                                           [:messages cid mid :deleted-undoable-till]
                                           (constantly (datetime/timestamp)))}
-                           message)
+                           message
+                           false)
              result-db   (:db effects)]
          (is (= result-db expected-db))))
+      (testing "before deleted locally"
+        (let [effects (delete-message/delete-and-send
+                       {:db (update-in db [:messages cid mid] dissoc :deleted?)}
+                       message
+                       false)]
+          (is (-> effects :db nil?) "not delete and send")))
+      (testing "before undo timelimit"
+        (with-redefs [datetime/timestamp (constantly 1)]
+          (let [effects (delete-message/delete-and-send
+                         {:db (update-in db [:messages cid mid] assoc :deleted-undoable-till 2)}
+                         message
+                         false)]
+            (is (-> effects :db nil?)))))
      (testing "return nil if message not in db"
-        (is (= (delete-message/delete-and-send {:db {:messages []}}
-                                               message)
+        (is (= (delete-message/delete-and-send {:db {:messages []}} message false)
               nil))))))
@@ -1,8 +1,11 @@
 (ns status-im2.contexts.chat.messages.delete-message-for-me.events
-  (:require [status-im.chat.models.message-list :as message-list]
-            [utils.datetime :as datetime]
-            [taoensso.timbre :as log]
-            [utils.re-frame :as rf]))
+  (:require
+   [i18n.i18n :as i18n]
+   [quo2.foundations.colors :as colors]
+   [status-im.chat.models.message-list :as message-list]
+   [taoensso.timbre :as log]
+   [utils.datetime :as datetime]
+   [utils.re-frame :as rf]))

 (defn- update-db-clear-undo-timer
  [db chat-id message-id]
@@ -42,15 +45,38 @@
  {:events [:chat.ui/delete-message-for-me]}
  [{:keys [db]} {:keys [chat-id message-id]} undo-time-limit-ms]
  (when (get-in db [:messages chat-id message-id])
-    (assoc
-     (message-list/rebuild-message-list
-      {:db (update-db-delete-locally db chat-id message-id undo-time-limit-ms)}
-      chat-id)
-     :utils/dispatch-later
-     [{:dispatch [:chat.ui/delete-message-for-me-and-sync
-                  {:chat-id    chat-id
-                   :message-id message-id}]
-       :ms       undo-time-limit-ms}])))
+    (let [existing-undo-toast (get-in db [:toasts :toasts :delete-message-for-me])
+          toast-count         (inc (get existing-undo-toast :message-deleted-for-me-count 0))
+          existing-undos      (-> existing-undo-toast
+                                  (get :message-deleted-for-me-undos [])
+                                  (conj {:message-id message-id :chat-id chat-id}))]
+      (assoc
+       (message-list/rebuild-message-list
+        {:db (reduce
+              ;; sync all pending deletes' undo timelimit, extend to the latest one
+              (fn [db-acc {:keys [message-id chat-id]}]
+                (update-db-delete-locally db-acc chat-id message-id undo-time-limit-ms))
+              db
+              existing-undos)}
+        chat-id)
+       :dispatch-n           [[:toasts/close :delete-message-for-me]
+                              [:toasts/upsert
+                               {:id :delete-message-for-me
+                                :icon :info
+                                :icon-color colors/danger-50-opa-40
+                                :message-deleted-for-me-count toast-count
+                                :message-deleted-for-me-undos existing-undos
+                                :text (i18n/label-pluralize toast-count
+                                                            :t/message-deleted-for-you-count)
+                                :duration undo-time-limit-ms
+                                :undo-duration (/ undo-time-limit-ms 1000)
+                                :undo-on-press #(do (rf/dispatch
+                                                     [:chat.ui/undo-all-delete-message-for-me])
+                                                    (rf/dispatch [:toasts/close
+                                                                  :delete-message-for-me]))}]]
+       :utils/dispatch-later [{:dispatch [:chat.ui/delete-message-for-me-and-sync
+                                          {:chat-id chat-id :message-id message-id}]
+                               :ms       undo-time-limit-ms}]))))

 (rf/defn undo
  {:events [:chat.ui/undo-delete-message-for-me]}
@@ -60,17 +86,37 @@
     {:db (update-db-undo-locally db chat-id message-id)}
     chat-id)))

+(rf/defn undo-all
+  {:events [:chat.ui/undo-all-delete-message-for-me]}
+  [{:keys [db]}]
+  (when-let [pending-undos (get-in db
+                                   [:toasts :toasts :delete-message-for-me
+                                    :message-deleted-for-me-undos])]
+    {:dispatch-n (mapv #(vector :chat.ui/undo-delete-message-for-me %) pending-undos)}))
+
+(defn- check-before-delete-and-sync
+  "Make sure message alredy deleted-for-me? locally and undo timelimit has passed"
+  [db chat-id message-id]
+  (let [message                                                (get-in db [:messages chat-id message-id])
+        {:keys [deleted-for-me? deleted-for-me-undoable-till]} message]
+    (and deleted-for-me?
+         deleted-for-me-undoable-till
+         (>= (datetime/timestamp) deleted-for-me-undoable-till))))
+
 (rf/defn delete-and-sync
  {:events [:chat.ui/delete-message-for-me-and-sync]}
-  [{:keys [db]} {:keys [message-id chat-id]}]
-  (when (get-in db [:messages chat-id message-id])
-    {:db            (update-db-clear-undo-timer db chat-id message-id)
-     :json-rpc/call [{:method      "wakuext_deleteMessageForMeAndSync"
-                      :params      [chat-id message-id]
-                      :js-response true
-                      :on-error    #(log/error "failed to delete message for me, message id: "
-                                               {:message-id message-id :error %})
-                      :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])}]}))
+  [{:keys [db]} {:keys [message-id chat-id]} force?]
+  (when-let [message (get-in db [:messages chat-id message-id])]
+    (when (or force? (check-before-delete-and-sync db chat-id message-id))
+      {:db            (update-db-clear-undo-timer db chat-id message-id)
+       :json-rpc/call [{:method      "wakuext_deleteMessageForMeAndSync"
+                        :params      [chat-id message-id]
+                        :js-response true
+                        :on-error    #(log/error
+                                       "failed to delete message for me, message id: "
+                                       {:message-id message-id :error %})
+                        :on-success  #(rf/dispatch [:sanitize-messages-and-process-response
+                                                    %])}]})))

 (defn- filter-pending-sync-messages
  "traverse all messages find not yet synced deleted-for-me? messages"
@@ -86,4 +132,4 @@
  {:events [:chat.ui/sync-all-deleted-for-me-messages]}
  [{:keys [db] :as cofx}]
  (let [pending-sync-messages (reduce-kv filter-pending-sync-messages [] (:messages db))]
-    (apply rf/merge cofx (map delete-and-sync pending-sync-messages))))
+    (apply rf/merge cofx (map #(delete-and-sync % true) pending-sync-messages))))
@@ -18,6 +18,43 @@
            (is (= (:id result-message) mid))
            (is (true? (:deleted-for-me? result-message)))
            (is (= (:deleted-for-me-undoable-till result-message) 1001))))
+        (testing "delete with pending deletes"
+          (let [db      (-> db
+                            (update-in [:messages cid "pending-delete-message"]
+                                       assoc
+                                       :deleted-for-me?              true
+                                       :deleted-for-me-undoable-till 0
+                                       :whisper-timestamp            0)
+                            (update-in [:toasts :toasts :delete-message-for-me]
+                                       assoc
+                                       :message-deleted-for-me-count 1
+                                       :message-deleted-for-me-undos [{:message-id
+                                                                       "pending-delete-message"
+                                                                       :chat-id    cid}]))
+                effects (delete-message-for-me/delete {:db db} message 1000)]
+            (is (= (get-in effects [:db :messages cid mid :deleted-for-me-undoable-till])
+                   (get-in effects
+                           [:db :messages cid "pending-delete-message" :deleted-for-me-undoable-till])
+                   1001)
+                "sync all pending delete undo timelimit")
+            (let [upsert-toast (-> effects :dispatch-n second)]
+              (is (= (-> upsert-toast last :message-deleted-for-me-count) 2)
+                  "+1 pending deletes")
+              (is
+               (and
+                (-> upsert-toast
+                    last
+                    :message-deleted-for-me-undos
+                    first
+                    :message-id
+                    (= "pending-delete-message"))
+                (-> upsert-toast
+                    last
+                    :message-deleted-for-me-undos
+                    second
+                    :message-id
+                    (= mid)))
+               "pending deletes are in order"))))
        (testing "return nil if message not in db"
          (is (= (delete-message-for-me/delete {:db {:messages []}} message 1000)
                 nil)))))))
@@ -56,46 +93,42 @@
               nil))))))

 (deftest delete-for-me-and-sync
-  (let [db      {:messages {cid {mid {:id mid}}}}
+  (let [db      {:messages {cid {mid {:id mid :deleted-for-me? true :deleted-for-me-undoable-till 0}}}}
        message {:message-id mid :chat-id cid}]
    (testing "delete for me and sync"
      (testing "dispatch right rpc call"
-        (let [expected-db {:messages {cid {mid {:id mid}}}}
-              effects     (delete-message-for-me/delete-and-sync {:db db} message)
+        (let [expected-db {:messages {cid {mid {:id mid :deleted-for-me? true}}}}
+              effects     (delete-message-for-me/delete-and-sync {:db db} message false)
              result-db   (:db effects)
              rpc-calls   (:json-rpc/call effects)]
          (is (= result-db expected-db))
          (is (= (count rpc-calls) 1))
-          (is (= (-> rpc-calls
-                     first
-                     :method)
-                 "wakuext_deleteMessageForMeAndSync"))
-          (is (= (-> rpc-calls
-                     first
-                     :params
-                     count)
-                 2))
-          (is (= (-> rpc-calls
-                     first
-                     :params
-                     first)
-                 cid))
-          (is (= (-> rpc-calls
-                     first
-                     :params
-                     second)
-                 mid))))
+          (is (= (-> rpc-calls first :method) "wakuext_deleteMessageForMeAndSync"))
+          (is (= (-> rpc-calls first :params count) 2))
+          (is (= (-> rpc-calls first :params first) cid))
+          (is (= (-> rpc-calls first :params second) mid))))
      (testing "clean undo timer"
-        (let [expected-db {:messages {cid {mid {:id mid}}}}
+        (let [expected-db {:messages {cid {mid {:id mid :deleted-for-me? true}}}}
              effects     (delete-message-for-me/delete-and-sync
                           {:db (update-in db
-                                           [:messages cid mid
-                                            :deleted-for-me-undoable-till]
+                                           [:messages cid mid :deleted-for-me-undoable-till]
                                           (constantly (datetime/timestamp)))}
-                           message)
+                           message
+                           false)
              result-db   (:db effects)]
          (is (= result-db expected-db))))
+      (testing "before deleted locally"
+        (let [effects (delete-message-for-me/delete-and-sync
+                       {:db (update-in db [:messages cid mid] dissoc :deleted-for-me?)}
+                       message
+                       false)]
+          (is (-> effects :db nil?) "not delete and send")))
+      (testing "before undo timelimit"
+        (with-redefs [datetime/timestamp (constantly 1)]
+          (let [effects (delete-message-for-me/delete-and-sync
+                         {:db (update-in db [:messages cid mid] assoc :deleted-for-me-undoable-till 2)}
+                         message
+                         false)]
+            (is (-> effects :db nil?)))))
      (testing "return nil if message not in db"
-        (is (= (delete-message-for-me/delete-and-sync {:db {:messages []}}
-                                                      message)
-               nil))))))
+        (is (= (delete-message-for-me/delete-and-sync {:db {:messages []}} message false) nil))))))
@@ -131,18 +131,12 @@
  [{:keys [chat
           pan-responder
           show-input?]}]
-  (let [{:keys [group-chat chat-type chat-id public? community-id admins]} chat
-        mutual-contact-requests-enabled? (rf/sub [:mutual-contact-requests/enabled?])
-        messages (rf/sub [:chats/raw-chat-messages-stream chat-id])
-        one-to-one? (= chat-type constants/one-to-one-chat-type)
-        contact-added? (when one-to-one? (rf/sub [:contacts/contact-added? chat-id]))
-        should-send-contact-request?
-        (and
-         mutual-contact-requests-enabled?
-         one-to-one?
-         (not contact-added?))
-        bottom-space 15]
-    [:<>
+  (let [{:keys [group-chat chat-id public? community-id admins]} chat
+        messages                                                 (rf/sub [:chats/raw-chat-messages-stream
+                                                                          chat-id])
+        bottom-space                                             15]
+    [rn/view
+     {:style {:flex 1}}
     ;;DO NOT use anonymous functions for handlers
     [rn/flat-list
      (merge
@@ -151,7 +145,7 @@
        :ref                          list-ref
        :header                       [list-header chat]
        :footer                       [list-footer chat]
-        :data                         (when-not should-send-contact-request? messages)
+        :data                         messages
        :render-data                  (get-render-data {:group-chat      group-chat
                                                        :chat-id         chat-id
                                                        :public?         public?
@@ -164,7 +158,7 @@
        :on-viewable-items-changed    on-viewable-items-changed
        :on-end-reached               list-on-end-reached
        :on-scroll-to-index-failed    identity            ;;don't remove this
-        :content-container-style      {:padding-top    (+ bottom-space 16)
+        :content-container-style      {:padding-top    (+ bottom-space 32)
                                       :padding-bottom 16}
        :scroll-indicator-insets      {:top bottom-space} ;;ios only
        :keyboard-dismiss-mode        :interactive
@@ -180,10 +174,10 @@
     [quo/floating-shell-button
      (merge {:jump-to
              {:on-press #(do
-                            (rf/dispatch [:close-chat])
+                            (rf/dispatch [:close-chat true])
                            (rf/dispatch [:shell/navigate-to-jump-to]))
               :label    (i18n/label :t/jump-to)}}
             (when @show-floating-scroll-down-button
               {:scroll-to-bottom {:on-press scroll-to-bottom}}))
      {:position :absolute
-       :bottom   12}]]))
+       :bottom   6}]]))
@@ -1,5 +1,5 @@
 (ns status-im2.contexts.chat.messages.pin.banner.view
-  (:require [status-im.ui2.screens.chat.pinned-banner.view :as pinned-banner]
+  (:require [quo2.core :as quo]
            [utils.re-frame :as rf]))

 (defn banner
@@ -7,14 +7,14 @@
  (let [pinned-messages (rf/sub [:chats/pinned chat-id])
        latest-pin-id   (-> pinned-messages
                            vals
-                            last
+                            first
                            (get :message-id))
        latest-pin-text (get-in (rf/sub [:chats/chat-messages chat-id])
                                [latest-pin-id :content :text])
        pins-count      (count (seq pinned-messages))]
-    (when (> pins-count 0)
-      ;; TODO (flexsurfer) this should be banner component in quo2
-      [pinned-banner/pinned-banner
-       {:latest-pin-text latest-pin-text
-        :pins-count      pins-count
-        :on-press        #(rf/dispatch [:bottom-sheet/show-sheet :pinned-messages-list chat-id])}])))
+    [quo/banner
+     {:latest-pin-text latest-pin-text
+      :pins-count      pins-count
+      :on-press        #(rf/dispatch [:bottom-sheet/show-sheet :pinned-messages-list chat-id])}]))
+
+
@@ -7,18 +7,24 @@
            [status-im.ui2.screens.chat.pin-limit-popover.view :as pin-limit-popover]
            [status-im2.common.constants :as constants]
            [status-im2.contexts.chat.messages.list.view :as messages.list]
+            [status-im2.contexts.chat.messages.contact-requests.bottom-drawer :as
+             contact-requests.bottom-drawer]
            [status-im2.contexts.chat.messages.pin.banner.view :as pin.banner] ;;TODO move to status-im2
            [status-im2.navigation.state :as navigation.state]
            [utils.debounce :as debounce]
            [utils.re-frame :as rf]
-            [status-im2.common.not-implemented :as not-implemented]))
+            [status-im2.common.not-implemented :as not-implemented]
+            [quo2.foundations.colors :as colors]))

 (defn navigate-back-handler
  []
  (when (and (not @navigation.state/curr-modal) (= (get @re-frame.db/app-db :view-id) :chat))
    (rn/hw-back-remove-listener navigate-back-handler)
    (rf/dispatch [:close-chat])
-    (rf/dispatch [:navigate-back])))
+    (rf/dispatch [:navigate-back])
+    ;; If true is not returned back button event will bubble up,
+    ;; and will call system back button action
+    true))

 (defn page-nav
  []
@@ -32,44 +38,56 @@
    [quo/page-nav
     {:align-mid?            true

-      :mid-section
-      (if group-chat
-        {:type      :text-only
-         :main-text display-name}
-        {:type      :user-avatar
-         :avatar    {:full-name       display-name
-                     :online?         online?
-                     :profile-picture photo-path
-                     :size            :medium}
-         :main-text display-name
-         :on-press  #(debounce/dispatch-and-chill [:chat.ui/show-profile chat-id] 1000)})
+      :mid-section           (if group-chat
+                               {:type      :text-only
+                                :main-text display-name}
+                               {:type      :user-avatar
+                                :avatar    {:full-name       display-name
+                                            :online?         online?
+                                            :profile-picture photo-path
+                                            :size            :medium}
+                                :main-text display-name
+                                :on-press  #(debounce/dispatch-and-chill [:chat.ui/show-profile chat-id]
+                                                                         1000)})

-      :left-section
-      {:on-press            #(do
-                               (rf/dispatch [:close-chat])
-                               (rf/dispatch [:navigate-back]))
-       :icon                :i/arrow-left
-       :accessibility-label :back-button}
+      :left-section          {:on-press            #(do
+                                                      (rf/dispatch [:close-chat])
+                                                      (rf/dispatch [:navigate-back]))
+                              :icon                :i/arrow-left
+                              :accessibility-label :back-button}

-      :right-section-buttons
-      [{:on-press            #()
-        :style               {:border-width 1 :border-color :red}
-        :icon                :i/options
-        :accessibility-label :options-button}]}]))
+      :right-section-buttons [{:on-press            #()
+                               :style               {:border-width 1
+                                                     :border-color :red}
+                               :icon                :i/options
+                               :accessibility-label :options-button}]}]))

 (defn chat-render
  []
-  (let [;;NOTE: we want to react only on these fields, do not use full chat map here
-        {:keys [chat-id show-input?] :as chat} (rf/sub [:chats/current-chat-chat-view])]
-    [rn/keyboard-avoiding-view {:style {:flex 1}}
+  (let [{:keys [chat-id
+                contact-request-state
+                show-input?]
+         :as   chat}
+        (rf/sub [:chats/current-chat-chat-view])]
+    [rn/keyboard-avoiding-view {:style {:position :relative :flex 1}}
+     [rn/view
+      {:style {:position         :absolute
+               :top              56
+               :z-index          2
+               :background-color (colors/theme-colors colors/white colors/neutral-100)
+               :width            "100%"}}
+
+      [pin.banner/banner chat-id]
+      [not-implemented/not-implemented
+       [pin-limit-popover/pin-limit-popover chat-id]]]
     [page-nav]
-     [not-implemented/not-implemented
-      [pin-limit-popover/pin-limit-popover chat-id]]
-     [not-implemented/not-implemented
-      [pin.banner/banner chat-id]]
     [messages.list/messages-list {:chat chat :show-input? show-input?}]
-     (when show-input?
-       [composer/composer chat-id])]))
+     (cond (and (not show-input?)
+                contact-request-state)
+           [contact-requests.bottom-drawer/view chat-id contact-request-state]
+
+           show-input?
+           [composer/composer chat-id])]))

 (defn chat
  []
@@ -98,7 +98,7 @@
           [rn/view {:style (style/chevron-container)}
            [quo/icon :i/chevron-down {:color (colors/theme-colors colors/neutral-100 colors/white)}]]]
          [clear-button]
-          [rn/flat-list
+          [rn/flat-list-inside-gesture-handler
           {:key-fn                  identity
            :render-fn               image
            :render-data             {:window-width window-width}
@@ -7,7 +7,7 @@
            [react-native.safe-area :as safe-area]
            [reagent.core :as reagent]
            [status-im.react-native.resources :as resources]
-            [status-im.ui.screens.communities.community :as community]
+            [status-im2.contexts.communities.menus.community-options.view :as options]
            [utils.re-frame :as rf]))

 (def mock-community-item-data  ;; TODO: remove once communities are loaded with this data.
@@ -40,12 +40,11 @@
       {:on-press      (fn []
                         (rf/dispatch [:communities/load-category-states (:id item)])
                         (rf/dispatch [:dismiss-keyboard])
-                         (rf/dispatch [:navigate-to :community (:id item)]))
-        :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet
-                                      {:content (fn []
-                                                  ;; TODO implement with quo2
-                                                  [community/community-actions item])}])}
-       item])))
+                         (rf/dispatch [:navigate-to :community {:community-id (:id item)}]))
+        :on-long-press #(rf/dispatch
+                         [:bottom-sheet/show-sheet
+                          {:content (fn []
+                                      [options/community-options-bottom-sheet (:id item)])}])}])))

 (defn screen-title
  []
@@ -1,115 +0,0 @@
-(ns status-im2.contexts.communities.home.actions.view
-  (:require [i18n.i18n :as i18n]
-            [quo2.core :as quo]
-            [react-native.core :as rn]
-            [utils.re-frame :as rf]))
-
-(defn hide-sheet-and-dispatch
-  [event]
-  (rf/dispatch [:bottom-sheet/hide])
-  (rf/dispatch event))
-
-(def not-joined-options
-  {:actions [{:icon  :i/members
-              :label (i18n/label :t/view-members)}
-             {:icon       :i/bullet-list
-              :right-icon :i/chevron-right
-              :label      (i18n/label :t/view-community-rules)}
-             {:icon  :i/add-user
-              :label (i18n/label :t/invite-contacts)}
-             {:icon  :i/qr-code
-              :label (i18n/label :t/show-qr)}
-             {:icon  :i/share
-              :label (i18n/label :t/share-community)}]})
-
-(defn joined-options
-  [id]
-  {:actions
-   [{:icon                :i/members
-     :accessibility-label :i/view-members
-     :label               (i18n/label :t/view-members)
-     :on-press            #(hide-sheet-and-dispatch [:navigate-to :community-members
-                                                     {:community-id id}])}
-    {:icon                :i/bullet-list
-     :right-icon          :i/chevron-right
-     :accessibility-label :view-community-rules
-     :label               (i18n/label :t/view-community-rules)}
-    {:icon                :i/up-to-date
-     :accessibility-label :mark-as-read
-     :label               (i18n/label :t/mark-as-read)
-     :on-press            #(hide-sheet-and-dispatch [:chat.ui/mark-all-read-in-community-pressed id])}
-    {:icon                :i/muted
-     :accessibility-label :mute-community
-     :label               (i18n/label :t/mute-community)
-     :right-icon          :i/chevron-right}
-    {:icon                :i/notifications
-     :accessibility-label :community-notification-settings
-     :label               (i18n/label :t/community-notification-settings)
-     :right-icon          :i/chevron-right}
-    {:icon                :i/add-user
-     :accessibility-label :invite-people-from-contacts
-     :label               (i18n/label :t/invite-people-from-contacts)
-     :on-press            #(hide-sheet-and-dispatch [:communities/invite-people-pressed id])}
-    {:icon                :i/qr-code
-     :accessibility-label :show-qr
-     :label               (i18n/label :t/show-qr)}
-    {:icon                :i/share
-     :accessibility-label :share-community
-     :label               (i18n/label :t/share-community)
-     :on-press            #(hide-sheet-and-dispatch [:communities/share-community-pressed id])}]})
-
-(defn leave-sheet
-  [community]
-  [rn/view {:style {:flex 1 :margin-left 20 :margin-right 20 :margin-bottom 20}}
-   [rn/view {:style {:flex 1 :flex-direction :row :align-items :center :justify-content :space-between}}
-
-    [quo/text
-     {:accessibility-label :communities-join-community
-      :weight              :semi-bold
-      :size                :heading-1}
-     (i18n/label :t/leave-community?)]]
-   ;; TODO get tag image from community data
-   #_[quo/context-tag
-      {:style
-       {:margin-right :auto
-        :margin-top   8}}
-      (resources/get-image :status-logo) (:name community)]
-   [quo/text
-    {:accessibility-label :communities-join-community
-     :size                :paragraph-1
-     :style               {:margin-top 16}}
-    (i18n/label :t/leave-community-message)]
-   [rn/view
-    {:style {:margin-top      16
-             :margin-bottom   16
-             :flex            1
-             :flex-direction  :row
-             :align-items     :center
-             :justify-content :space-evenly}}
-    [quo/button
-     {:on-press #(rf/dispatch [:bottom-sheet/hide])
-      :type     :grey
-      :style    {:flex         1
-                 :margin-right 12}}
-     (i18n/label :t/cancel)]
-    [quo/button
-     {:on-press #(hide-sheet-and-dispatch [:communities/leave (:id community)])
-      :style    {:flex 1}}
-     (i18n/label :t/leave-community)]]])
-
-(defn actions
-  []
-  (let [community-mock (rf/sub [:get-screen-params :community-overview]) ;;TODO stop using mock data and
-                                                                         ;;only pass community id
-        community      (rf/sub [:communities/community (:id community-mock)])]
-    [quo/action-drawer
-     [(get (if (:joined community)
-             (joined-options (:id community))
-             not-joined-options)
-           :actions)
-      (when (:joined community)
-        [{:icon     :i/log-out
-          :label    (i18n/label :t/leave-community)
-          :on-press #(rf/dispatch [:bottom-sheet/show-sheet
-                                   {:content        (constantly [leave-sheet community])
-                                    :content-height 300}])}])]]))
@@ -1,11 +1,10 @@
 (ns status-im2.contexts.communities.home.view
  (:require [i18n.i18n :as i18n]
-            [quo2.components.community.discover-card :as discover-card]
            [quo2.core :as quo]
            [react-native.core :as rn]
            [reagent.core :as reagent]
            [status-im2.common.home.view :as common.home]
-            [status-im2.contexts.communities.home.actions.view :as home.actions]
+            [status-im2.contexts.communities.menus.community-options.view :as options]
            [utils.re-frame :as rf]))

 (defn render-fn
@@ -16,9 +15,12 @@
                       (rf/dispatch [:communities/load-category-states id])
                       (rf/dispatch [:dismiss-keyboard])
                       (rf/dispatch [:navigate-to-nav2 :community {:community-id id}]))
-      :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet
-                                    {:content (fn []
-                                                [home.actions/actions community-item])}])}
+      :on-long-press #(rf/dispatch
+                       [:bottom-sheet/show-sheet
+                        {:content       (fn []
+                                          [options/community-options-bottom-sheet id])
+                         :selected-item (fn []
+                                          [quo/communities-membership-list-item {} community-item])}])}
     community-item]))

 (defn get-item-layout-js
@@ -56,9 +58,8 @@
  (let [ids-by-user-involvement (rf/sub [:communities/community-ids-by-user-involvement])
        tab                     @selected-tab]
    [rn/view
-     {:style {:padding-left     20
-              :padding-right    8
-              :padding-vertical 12}}
+     {:style {:padding-horizontal 20
+              :padding-vertical   12}}
     (case tab
       :joined
       [communities-list (:joined ids-by-user-involvement)]
@@ -84,7 +85,7 @@
        {:label               (i18n/label :t/communities)
         :handler             #(rf/dispatch [:bottom-sheet/show-sheet :add-new {}])
         :accessibility-label :new-chat-button}]
-       [discover-card/discover-card
+       [quo/discover-card
        {:on-press            #(rf/dispatch [:navigate-to :discover-communities])
         :title               (i18n/label :t/discover)
         :description         (i18n/label :t/whats-trending)
@@ -0,0 +1,192 @@
+
+(ns status-im2.contexts.communities.menus.community-options.component-spec
+  (:require [re-frame.core :as re-frame]
+            [test-helpers.component :as h]
+            [i18n.i18n :as i18n]
+            [status-im2.setup.i18n-resources :as i18n-resources]
+            [status-im2.contexts.communities.menus.community-options.view :as options]))
+
+(defn init
+  []
+  (i18n/set-language "en")
+  (i18n-resources/load-language "en"))
+
+(defn setup-sub
+  [opts]
+  (re-frame/reg-sub
+   :communities/community
+   (fn [_] opts)))
+
+(h/describe "community options for bottom sheets"
+  (h/test "joined options - Non token Gated"
+    (setup-sub {:joined true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "View members"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View Community Rules"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Mark as read"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Mute community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Notification settings"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Leave community"))
+        (.toBeTruthy)))
+
+  (h/test "joined options - Token Gated"
+    (setup-sub {:joined       true
+                :token-gated? true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "View members"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View Community Rules"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View token gating"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Mark as read"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Mute community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Notification settings"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Leave community"))
+        (.toBeTruthy)))
+
+  (h/test "admin options - Non token Gated"
+    (setup-sub {:admin true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "View members"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View Community Rules"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Edit community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Mark as read"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Mute community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Notification settings"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy)))
+
+  (h/test "admin options - Token Gated"
+    (setup-sub {:admin        true
+                :token-gated? true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "View members"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View Community Rules"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Edit community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Mark as read"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Mute community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Notification settings"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy)))
+
+  (h/test "request sent options - Non token Gated"
+    (setup-sub {:requested-to-join-at true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "View members"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View Community Rules"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Cancel request to join"))
+        (.toBeTruthy)))
+
+  (h/test "request sent options - Token Gated"
+    (setup-sub {:requested-to-join-at 100
+                :token-gated?         true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View token gating"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Cancel request to join"))
+        (.toBeTruthy)))
+
+  (h/test "banned options - Non token Gated"
+    (setup-sub {:banList true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "View members"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View Community Rules"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy)))
+
+  (h/test "banned options - Token Gated"
+    (setup-sub {:banList      100
+                :token-gated? true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View token gating"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy)))
+
+  (h/test "banned options - Token Gated"
+    (setup-sub {:banList      100
+                :token-gated? true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "Invite people from contact list"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "View token gating"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Show QR code"))
+        (.toBeTruthy))
+    (-> (h/expect (h/get-by-text "Share community"))
+        (.toBeTruthy)))
+
+  (h/test "joined and muted community"
+    (setup-sub {:joined       true
+                :muted        true
+                :token-gated? true})
+    (h/render [options/community-options-bottom-sheet {:id "test"}])
+    (-> (h/expect (h/get-by-text "Unmute community"))
+        (.toBeTruthy))))
+
+
@@ -0,0 +1,169 @@
+(ns status-im2.contexts.communities.menus.community-options.view
+  (:require [i18n.i18n :as i18n]
+            [utils.re-frame :as rf]
+            [quo2.core :as quo]
+            [status-im2.contexts.communities.menus.leave.view :as leave-menu]))
+
+(defn hide-sheet-and-dispatch
+  [event]
+  (rf/dispatch [:bottom-sheet/hide])
+  (rf/dispatch event))
+
+(defn view-members
+  [id]
+  {:icon                :i/members
+   :accessibility-label :view-members
+   :label               (i18n/label :t/view-members)
+   :on-press            #(hide-sheet-and-dispatch [:navigate-to :community-members
+                                                   {:community-id id}])})
+
+(defn view-rules
+  [id]
+  {:icon                :i/bullet-list
+   :right-icon          :i/chevron-right
+   :accessibility-label :view-community-rules
+   :on-press            #(js/alert (str "implement action" id))
+   :label               (i18n/label :t/view-community-rules)})
+
+(defn view-token-gating
+  [id]
+  {:icon                :i/bullet-list
+   :right-icon          :i/token
+   :accessibility-label :view-token-gating
+   :on-press            #(js/alert (str "implement action" id))
+   :label               (i18n/label :t/view-token-gating)})
+
+(defn mark-as-read
+  [id]
+  {:icon                :i/up-to-date
+   :accessibility-label :mark-as-read
+   :label               (i18n/label :t/mark-as-read)
+   :on-press            #(hide-sheet-and-dispatch [:chat.ui/mark-all-read-in-community-pressed id])})
+
+(defn mute-community
+  [_ muted?]
+  {:icon                (if muted? :i/muted :i/activity-center)
+   :accessibility-label (if muted? :unmute-community :mute-community)
+   :label               (i18n/label (if muted? :t/unmute-community :t/mute-community))
+   :sub-label           (when muted? (str "muted for 15 minutes"))
+   :right-icon          :i/chevron-right})
+
+(defn community-notification-settings
+  [id]
+  {:icon                :i/notifications
+   :accessibility-label :community-notification-settings
+   :label               (i18n/label :t/community-notification-settings)
+   :on-press            #(js/alert (str "implement action" id))
+   :right-icon          :i/chevron-right})
+
+(defn invite-contacts
+  [id]
+  {:icon                :i/add-user
+   :accessibility-label :invite-people-from-contacts
+   :label               (i18n/label :t/invite-people-from-contacts)
+   :on-press            #(hide-sheet-and-dispatch [:communities/invite-people-pressed id])})
+
+(defn show-qr
+  [id]
+  {:icon                :i/qr-code
+   :accessibility-label :show-qr
+   :on-press            #(js/alert (str "implement action" id))
+   :label               (i18n/label :t/show-qr)})
+
+(defn share-community
+  [id]
+  {:icon                :i/share
+   :accessibility-label :share-community
+   :label               (i18n/label :t/share-community)
+   :on-press            #(hide-sheet-and-dispatch [:communities/share-community-pressed id])})
+
+(defn leave-community
+  [id]
+  {:icon                :i/log-out
+   :label               (i18n/label :t/leave-community)
+   :accessibility-label :leave-community
+
+   :danger?             true
+   :on-press            #(rf/dispatch [:bottom-sheet/show-sheet
+                                       {:content        (constantly [leave-menu/leave-sheet id])
+                                        :content-height 400}])})
+
+(defn cancel-request-to-join
+  [id]
+  {:icon                :i/block
+   :label               (i18n/label :t/cancel-request-to-join)
+   :accessibility-label :cancel-request-to-join
+   :danger?             true
+   :on-press            #(js/alert (str "implement action" id))})
+
+(defn edit-community
+  [id]
+  {:icon                :i/edit
+   :label               (i18n/label :t/edit-community)
+   :accessibility-label :edit-community
+   :on-press            #(js/alert (str "implement action" id))})
+
+(defn not-joined-options
+  [id token-gated?]
+  [[(when-not token-gated? (view-members id))
+    (when-not token-gated? (view-rules id))
+    (invite-contacts id)
+    (when token-gated? (view-token-gating id))
+    (show-qr id)
+    (share-community id)]])
+
+(defn join-request-sent-options
+  [id token-gated?]
+  [(conj (first (not-joined-options id token-gated?))
+         (assoc (cancel-request-to-join id) :add-divider? true))])
+
+(defn banned-options
+  [id token-gated?]
+  (not-joined-options id token-gated?))
+
+(defn joined-options
+  [id token-gated? muted?]
+  [[(view-members id)
+    (view-rules id)
+    (when token-gated? (view-token-gating id))
+    (mark-as-read id)
+    (mute-community id muted?)
+    (community-notification-settings id)
+    (invite-contacts id)
+    (show-qr id)
+    (share-community id)]
+   [(assoc (leave-community id) :add-divider? true)]])
+
+(defn owner-options
+  [id token-gated? muted?]
+  [[(view-members id)
+    (view-rules id)
+    (when token-gated? (view-token-gating id))
+    (edit-community id)
+    (mark-as-read id)
+    (mute-community id muted?)
+    (community-notification-settings id)
+    (invite-contacts id)
+    (show-qr id)
+    (share-community id)]])
+
+(defn get-context-drawers
+  [{:keys [id]}]
+  (let [community     (rf/sub [:communities/community id])
+        token-gated?  (:token-gated? community)
+        joined?       (:joined community)
+        admin?        (:admin community)
+        request-sent? (pos? (:requested-to-join-at community))
+        muted?        (:muted community)
+        banned?       (:banList community)]
+    (cond
+      joined?       (joined-options id token-gated? muted?)
+      admin?        (owner-options id token-gated? muted?)
+      request-sent? (join-request-sent-options id token-gated?)
+      banned?       (banned-options id token-gated?)
+      :else         (not-joined-options id token-gated?))))
+
+(defn community-options-bottom-sheet
+  [id]
+  [quo/action-drawer
+   (get-context-drawers {:id id})])
@@ -0,0 +1,29 @@
+(ns status-im2.contexts.communities.menus.leave.style)
+
+(def button-container
+  {:margin-top      16
+   :margin-bottom   16
+   :flex            1
+   :flex-direction  :row
+   :align-items     :center
+   :justify-content :space-evenly})
+
+(def cancel-button
+  {:flex         1
+   :margin-right 12})
+
+(def action-button {:flex 1})
+
+(def text {:margin-top 16})
+
+(def container
+  {:height        160
+   :margin-left   20
+   :margin-right  20
+   :margin-bottom 20})
+
+(def inner-container
+  {:flex            1
+   :flex-direction  :row
+   :align-items     :center
+   :justify-content :space-between})
@@ -0,0 +1,43 @@
+(ns status-im2.contexts.communities.menus.leave.view
+  (:require [i18n.i18n :as i18n]
+            [quo2.core :as quo]
+            [status-im2.contexts.communities.menus.leave.style :as style]
+            [react-native.core :as rn]
+            [utils.re-frame :as rf]))
+
+(defn hide-sheet-and-dispatch
+  [event]
+  (rf/dispatch [:bottom-sheet/hide])
+  (rf/dispatch event))
+
+(defn leave-sheet
+  [id]
+  [rn/view {:style style/container}
+   [rn/view {:style style/inner-container}
+    [quo/text
+     {:accessibility-label :communities-join-community
+      :weight              :semi-bold
+      :size                :heading-1}
+     (i18n/label :t/leave-community?)]]
+   ;; TODO get tag image from community data - https://github.com/status-im/status-mobile/issues/14740
+   #_[quo/context-tag
+      {:style
+       {:margin-right :auto
+        :margin-top   8}}
+      (resources/get-image :status-logo) (:name community)]
+   [quo/text
+    {:accessibility-label :communities-join-community
+     :size                :paragraph-1
+     :style               style/text}
+    (i18n/label :t/leave-community-message)]
+   [rn/view
+    {:style style/button-container}
+    [quo/button
+     {:on-press #(rf/dispatch [:bottom-sheet/hide])
+      :type     :grey
+      :style    style/cancel-button}
+     (i18n/label :t/cancel)]
+    [quo/button
+     {:on-press #(hide-sheet-and-dispatch [:communities/leave id])
+      :style    style/action-button}
+     (i18n/label :t/leave-community)]]])
@@ -1,4 +1,4 @@
-(ns status-im2.contexts.communities.requests.actions.style
+(ns status-im2.contexts.communities.menus.request-to-join.style
  (:require [quo2.foundations.colors :as colors]))

 (def community-rule
@@ -1,11 +1,11 @@
-(ns status-im2.contexts.communities.requests.actions.view
+(ns status-im2.contexts.communities.menus.request-to-join.view
  (:require [quo.react-native :as rn]
            [quo2.core :as quo]
            [reagent.core :as reagent]
            [status-im.communities.core :as communities]
            [i18n.i18n :as i18n]
            [status-im.react-native.resources :as resources]
-            [status-im2.contexts.communities.requests.actions.style :as style]
+            [status-im2.contexts.communities.menus.request-to-join.style :as style]
            [utils.re-frame :as rf]
            [utils.requests :as requests]))

@@ -75,7 +75,7 @@
    :render-fn                         community-rule-item}])

 (defn request-to-join
-  [{:keys [permissions name id joined
+  [{:keys [permissions name id
           can-join? can-request-access?
           requested-to-join-at]}]
  (let [agreed-to-rules? (reagent/atom false)
@@ -122,11 +122,10 @@
        [quo/button
         {:accessibility-label :join-community-button
          :on-press            (fn []
-                                 (when-not joined
-                                   (when can-join?
-                                     (rf/dispatch [::communities/join id]))
-                                   (rf/dispatch [:bottom-sheet/hide])
-                                   (when
+                                 (if can-join?
+                                   (do (rf/dispatch [::communities/join id])
+                                       (rf/dispatch [:bottom-sheet/hide]))
+                                   (do
                                     (and can-request-access?
                                          (not (pos? requested-to-join-at))
                                          (requests/can-request-access-again? requested-to-join-at))
@@ -8,9 +8,9 @@
            [reagent.core :as reagent]
            [status-im2.common.constants :as constants]
            [status-im2.common.scroll-page.view :as scroll-page]
-            [status-im2.contexts.communities.home.actions.view :as home.actions]
            [status-im2.contexts.communities.overview.style :as style]
-            [status-im2.contexts.communities.requests.actions.view :as requests.actions]
+            [status-im2.contexts.communities.menus.community-options.view :as options]
+            [status-im2.contexts.communities.menus.request-to-join.view :as join-menu]
            [utils.re-frame :as rf]))

 (def knc-token-img (js/require "../resources/images/tokens/mainnet/KNC.png"))
@@ -188,7 +188,7 @@
       [quo/button
        {:on-press                  #(rf/dispatch
                                      [:bottom-sheet/show-sheet
-                                       {:content        (fn [] [requests.actions/request-to-join
+                                       {:content        (fn [] [join-menu/request-to-join
                                                                community])
                                        :content-height 300}])
         :accessibility-label       :show-request-to-join-screen-button
@@ -319,7 +319,7 @@
         :chevron-position :left}]])))

 (defn community-card-page-view
-  [{:keys [name images] :as community}]
+  [{:keys [name images id] :as community}]
  (let [channel-heights      (reagent/atom [])
        first-channel-height (reagent/atom 0)
        scroll-component     (scroll-page/scroll-page
@@ -329,13 +329,13 @@
                                                        :background-color (scroll-page/icon-color)}
                                                       {:icon             :i/options
                                                        :background-color (scroll-page/icon-color)
-                                                        :on-press         #(rf/dispatch
-                                                                            [:bottom-sheet/show-sheet
-                                                                             {:content
-                                                                              (fn []
-                                                                                [home.actions/actions
-                                                                                 community])
-                                                                              :content-height 400}])}]}
+                                                        :on-press
+                                                        #(rf/dispatch
+                                                          [:bottom-sheet/show-sheet
+                                                           {:content
+                                                            (fn []
+                                                              [options/community-options-bottom-sheet
+                                                               id])}])}]}
                              name)]
    (fn []
      (let [page-component (memoize (render-page-content community channel-heights first-channel-height))
@@ -12,16 +12,17 @@
   {:label "number of messages"
    :key   :pins-count
    :type  :text}
-   {:label "show pin icon?"
-    :key   :show-pin?
+   {:label "hide pin icon?"
+    :key   :hide-pin?
    :type  :boolean}
  ])

 (defn cool-preview
  []
-  (let [state (reagent/atom {:show-pin?       true
-                             :pins-count      2
-                             :latest-pin-text "Be respectful of fellow community member..."})]
+  (let [state (reagent/atom
+               {:hide-pin?       false
+                :pins-count      2
+                :latest-pin-text "Be respectful of fellow community members, even if they"})]
    (fn []
      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
       [rn/view {:padding-bottom 150}
@@ -10,7 +10,7 @@
  ([text id opts]
   (let [toast-opts (rf/sub [:toasts/toast id])
         dismiss!   #(rf/dispatch [:toasts/close id])
-         toast!     #(rf/dispatch [:toasts/upsert id opts])
+         toast!     #(rf/dispatch [:toasts/upsert (assoc opts :id id)])
         dismissed? (not toast-opts)]
     [rn/view {:style {:margin-bottom 10}}
      [button/button
@@ -34,7 +34,7 @@
    :duration      4000
    :undo-duration 4
    :undo-on-press #(do
-                      (rf/dispatch [:toasts/create
+                      (rf/dispatch [:toasts/upsert
                                    {:icon       :placeholder
                                     :icon-color "green"
                                     :text       "Undo pressed"}])
@@ -53,7 +53,7 @@
    :undo-on-press
    #(do
       (rf/dispatch
-        [:toasts/create
+        [:toasts/upsert
         {:icon :placeholder :icon-color "green" :text "Undo pressed"}])
       (rf/dispatch [:toasts/close "Toast: with undo action"]))}])

@@ -78,8 +78,8 @@
             :on-press
             #(rf/dispatch
               [:toasts/upsert
-                "Toast: 30s duration"
-                {:icon       :placeholder
+                {:id         "Toast: 30s duration"
+                 :icon       :placeholder
                 :icon-color "red"
                 :text       (str "This is an updated example toast" " - " (swap! suffix inc))
                 :duration   3000}])}
@@ -12,11 +12,15 @@
    :options [{:key   32
               :value "32"}
              {:key   24
-               :value "24"}]}])
+               :value "24"}]}
+   {:label "Scrollable:"
+    :key   :scrollable?
+    :type  :boolean}])

 (defn cool-preview
  []
-  (let [state (reagent/atom {:size 32})]
+  (let [state (reagent/atom {:size        32
+                             :scrollable? false})]
    (fn []
      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
       [rn/view {:padding-bottom 150}
@@ -33,7 +37,11 @@
                                   {:id 2 :label "Tab 2"}
                                   {:id 3 :label "Tab 3"}
                                   {:id 4 :label "Tab 4"}]
-                  :on-change      #(println "Active tab" %)})]]]])))
+                  :on-change      #(println "Active tab" %)}
+                 (when (:scrollable? @state)
+                   {:scroll-on-press?    true
+                    :fade-end-percentage 0.4
+                    :fade-end?           true}))]]]])))

 (defn preview-tabs
  []
@@ -0,0 +1,98 @@
+(ns status-im2.contexts.quo-preview.tags.tag
+  (:require [quo.react-native :as rn]
+            [quo.previews.preview :as preview]
+            [quo2.foundations.colors :as colors]
+            [quo2.components.tags.tag :as tag]
+            [status-im.ui.components.react :as react]
+            [status-im.react-native.resources :as resources]
+            [reagent.core :as reagent]))
+
+(def descriptor
+  [{:label   "Size:"
+    :key     :size
+    :type    :select
+    :options [{:key   32
+               :value "32"}
+              {:key   24
+               :value "24"}]}
+   {:label   "Type:"
+    :key     :type
+    :type    :select
+    :options [{:key   :emoji
+               :value "Emoji"}
+              {:key   :icon
+               :value "Icons"}
+              {:key   :label
+               :value "Label"}]}
+   {:label "Labelled:"
+    :key   :labelled?
+    :type  :boolean}
+   {:label "Disabled:"
+    :key   :disabled?
+    :type  :boolean}
+   {:label "Blurred background:"
+    :key   :blurred?
+    :type  :boolean}])
+
+(defn cool-preview
+  []
+  (let [state (reagent/atom {:size      32
+                             :labelled? true
+                             :type      :emoji})]
+    (fn []
+      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
+       [rn/view
+        {:style {:padding-bottom 150
+                 :padding-top    60}}
+        [rn/view {:flex 1}
+         [preview/customizer state descriptor]]
+        [rn/view
+         {:style {:flex               1
+                  :justify-content    :center
+                  :top                60
+                  :padding-horizontal 16}}
+         (when (:blurred? @state)
+           [rn/view
+            {:style {:flex   1
+                     :height 100}}
+            [react/image
+             {:source (resources/get-image :community-cover)
+              :style  {:flex          1
+                       :width         "100%"
+                       :border-radius 16}}]
+            [react/blur-view
+             {:flex          1
+              :style         {:border-radius 16
+                              :height        100
+                              :position      :absolute
+                              :left          0
+                              :right         0}
+              :blur-amount   20
+              :overlay-color (colors/theme-colors
+                              colors/white-opa-70
+                              colors/neutral-80-opa-80)}]])
+         [rn/view
+          {:style {:position   :absolute
+                   :align-self :center}}
+          [tag/tag
+           (merge @state
+                  {:id        1
+                   :label     "Tag"
+                   :labelled? (if (= (:type @state) :label)
+                                true
+                                (:labelled? @state))
+                   :resource  (if (= :emoji (:type @state))
+                                (resources/get-image :music)
+                                :main-icons2/placeholder)})]]]]])))
+(defn preview-tag
+  []
+  [rn/view
+   {:flex             1
+    :background-color (colors/theme-colors
+                       colors/white
+                       colors/neutral-90)}
+   [rn/flat-list
+    {:flex                      1
+     :keyboardShouldPersistTaps :always
+     :header                    [cool-preview]
+     :key-fn                    str}]])
@@ -24,70 +24,85 @@
               :value "Icons"}
              {:key   :label
               :value "Label"}]}
+   {:label "Scrollable:"
+    :key   :scrollable?
+    :type  :boolean}
+   {:label   "Fade Out:"
+    :key     :fade-end-percentage
+    :type    :select
+    :options [{:key   1
+               :value "1%"}
+              {:key   0.4
+               :value "0.4%"}]}
   {:label "Labelled:"
-    :key   :labelled
+    :key   :labelled?
    :type  :boolean}
   {:label "Disabled:"
-    :key   :disabled
+    :key   :disabled?
    :type  :boolean}
   {:label "Blurred background:"
-    :key   :blurred
+    :key   :blurred?
    :type  :boolean}])

 (defn cool-preview
  []
-  (let [state (reagent/atom {:size     32
-                             :labelled true
-                             :type     :emoji})]
+  (let [state (reagent/atom {:size                32
+                             :labelled?           true
+                             :type                :emoji
+                             :fade-end-percentage 0.4
+                             :scrollable?         false})]
    (fn []
      [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!}
       [rn/view
-        {:padding-bottom 150
-         :padding-top    60}
-        [rn/view {:flex 1}
+        {:style {:padding-bottom 150
+                 :padding-top    60}}
+        [rn/view {:style {:flex 1}}
         [preview/customizer state descriptor]]
        [rn/view
-         {:flex            1
-          :justify-content :center
-          :top             60}
-         (when (:blurred @state)
-           [rn/view {:flex 1}
-            [react/view
-             {:flex-direction :row
-              :height         100}
-             [react/image
-              {:source (resources/get-image :community-cover)
-               :style  {:flex          1
-                        :height        100
-                        :border-radius 16}}]]
-            [react/view
-             {:flex-direction :row
-              :height         100
-              :position       :absolute
-              :left           0
-              :right          0}
-             [react/blur-view
-              {:flex          1
-               :style         {:border-radius 16
-                               :height        100}
-               :blur-amount   40
-               :overlay-color (colors/theme-colors
-                               colors/white-opa-70
-                               colors/neutral-80-opa-80)}]]])
-         [rn/scroll-view
-          {:justify-content    :center
-           :align-items        :center
-           :position           :absolute
-           :padding-horizontal 10}
+         {:style {:flex               1
+                  :justify-content    :center
+                  :top                60
+                  :padding-horizontal 16}}
+         (when (:blurred? @state)
+           [rn/view
+            {:align-items   :center
+             :height        100
+             :border-radius 16}
+            [react/image
+             {:source (resources/get-image :community-cover)
+              :style  {:flex          1
+                       :width         "100%"
+                       :border-radius 16}}]
+            [react/blur-view
+             {:flex          1
+              :style         {:border-radius 16
+                              :height        100
+                              :position      :absolute
+                              :left          0
+                              :right         0}
+              :blur-amount   20
+              :overlay-color (colors/theme-colors
+                              colors/white-opa-70
+                              colors/neutral-80-opa-80)}]])
+         [rn/view
+          {:style {:position   :absolute
+                   :align-self :center}}
          [tags/tags
           (merge
            @state
            {:default-active 1
-             :data           [{:id 1 :tag-label "Music" :resource (resources/get-image :music)}
-                              {:id 2 :tag-label "Lifestyle" :resource (resources/get-image :lifestyle)}
-                              {:id        3
-                               :tag-label "Podcasts"
-                               :resource  (resources/get-image :podcasts)}]})]]]]])))
+             :component      :tags
+             :labelled?      (if (= :label type) true (:labelled? @state))
+             :resource       (when (= type :icon)
+                               :main-icons2/placeholder)
+             :data           [{:id 1 :label "Music" :resource (resources/get-image :music)}
+                              {:id 2 :label "Lifestyle" :resource (resources/get-image :lifestyle)}
+                              {:id 2 :label "Podcasts" :resource (resources/get-image :podcasts)}
+                              {:id 2 :label "Music" :resource (resources/get-image :music)}
+                              {:id 3 :label "Lifestyle" :resource (resources/get-image :lifestyle)}]}
+            (when (:scrollable? @state)
+              {:scroll-on-press? true
+               :fade-end?        true}))]]]]])))
 (defn preview-tags
  []
  [rn/view
@@ -0,0 +1,3 @@
+(ns status-im2.core-spec
+  (:require
+   [status-im2.contexts.communities.menus.community-options.component-spec]))
@@ -34,6 +34,7 @@
   :chat/spam-messages-frequency       0
   :chats-home-list                    #{}
   :home-items-show-number             20
+   :toasts                             {:ordered '() :toasts {}}
   :tooltips                           {}
   :dimensions/window                  (rn/get-window)
   :registry                           {}
@@ -171,11 +171,10 @@
 :<- [:multiaccount/public-key]
 :<- [:communities/current-community]
 :<- [:contacts/blocked-set]
- :<- [:contacts/contacts]
+ :<- [:contacts/contacts-raw]
 :<- [:chat/inputs]
- :<- [:mutual-contact-requests/enabled?]
 (fn [[{:keys [group-chat chat-id] :as current-chat} my-public-key community blocked-users-set contacts
-       inputs mutual-contact-requests-enabled?]]
+       inputs]]
   (when current-chat
     (cond-> current-chat
       (chat.models/public-chat? current-chat)
@@ -191,23 +190,35 @@
       (assoc :show-input? true)

       (not group-chat)
-       (assoc :show-input?
-              (and
-               (or
-                (not mutual-contact-requests-enabled?)
-                (get-in inputs [chat-id :metadata :sending-contact-request])
-                (and mutual-contact-requests-enabled?
-                     (= constants/contact-request-state-mutual
-                        (get-in contacts [chat-id :contact-request-state]))))
-               (not (contains? blocked-users-set chat-id))))))))
+       (assoc
+        :contact-request-state (get-in contacts [chat-id :contact-request-state])
+        :show-input?
+        (and
+         (or
+          (get-in inputs [chat-id :metadata :sending-contact-request])
+          (= constants/contact-request-state-mutual
+             (get-in contacts [chat-id :contact-request-state])))
+         (not (contains? blocked-users-set chat-id))))))))

 (re-frame/reg-sub
 :chats/current-chat-chat-view
 :<- [:chats/current-chat]
 (fn [current-chat]
   (select-keys current-chat
-                [:chat-id :show-input? :group-chat :admins :invitation-admin :public? :chat-type :color
-                 :chat-name :synced-to :synced-from :community-id :emoji])))
+                [:chat-id
+                 :show-input?
+                 :group-chat
+                 :admins
+                 :invitation-admin
+                 :public?
+                 :chat-type
+                 :color
+                 :contact-request-state
+                 :chat-name
+                 :synced-to
+                 :synced-from
+                 :community-id
+                 :emoji])))

 (re-frame/reg-sub
 :current-chat/metadata
@@ -0,0 +1,57 @@
+(ns status-im2.subs.chat.chats-test
+  (:require [cljs.test :refer [is testing]]
+            [re-frame.db :as rf-db]
+            [test-helpers.unit :as h]
+            [status-im2.common.constants :as constants]
+            [utils.re-frame :as rf]))
+
+(def public-key "0xpk")
+(def multiaccount {:public-key public-key})
+(def chat-id "1")
+(def chat {:chat-id chat-id})
+
+(def private-group-chat
+  (assoc
+   chat
+   :members    #{{:id public-key}}
+   :group-chat true
+   :chat-type  constants/private-group-chat-type))
+
+(def one-to-one-chat
+  (assoc
+   chat
+   :chat-type
+   constants/one-to-one-chat-type))
+
+(h/deftest-sub :chats/current-chat
+  [sub-name]
+  (testing "private group chat, user is a member"
+    (let [chats {chat-id private-group-chat}]
+      (swap! rf-db/app-db assoc
+        :multiaccount    multiaccount
+        :current-chat-id chat-id
+        :chats           chats)
+      (is (true? (:show-input? (rf/sub [sub-name]))))))
+  (testing "private group chat, user is not member"
+    (let [chats {chat-id (dissoc private-group-chat :members)}]
+      (swap! rf-db/app-db assoc
+        :multiaccount    multiaccount
+        :current-chat-id chat-id
+        :chats           chats)
+      (is (not (:show-input? (rf/sub [sub-name]))))))
+  (testing "one to one chat, mutual contacts"
+    (let [chats {chat-id one-to-one-chat}]
+      (swap! rf-db/app-db assoc
+        :contacts/contacts {chat-id {:contact-request-state constants/contact-request-state-mutual}}
+        :multiaccount      multiaccount
+        :current-chat-id   chat-id
+        :chats             chats)
+      (is (:show-input? (rf/sub [sub-name])))))
+  (testing "one to one chat, not a contact"
+    (let [chats {chat-id one-to-one-chat}]
+      (swap! rf-db/app-db assoc
+        :contacts/contacts {chat-id {:contact-request-state constants/contact-request-state-sent}}
+        :multiaccount      multiaccount
+        :current-chat-id   chat-id
+        :chats             chats)
+      (is (not (:show-input? (rf/sub [sub-name])))))))
@@ -137,7 +137,7 @@
   :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])})
+   :community-icon        (:images community)})

 (re-frame/reg-sub
 :communities/home-item
@@ -23,12 +23,6 @@
 (fn [multiaccount]
   (get multiaccount :profile-pictures-show-to)))

-(re-frame/reg-sub
- :mutual-contact-requests/enabled?
- :<- [:multiaccount]
- (fn [settings]
-   (boolean (:mutual-contact-enabled? settings))))
-
 (re-frame/reg-sub
 ::profile-pictures-visibility
 :<- [:multiaccount]
@@ -93,7 +87,7 @@
       vals)))

 (re-frame/reg-sub
- :contacts/add-members-sections
+ :contacts/grouped-by-first-letter
 :<- [:contacts/current-chat-contacts]
 :<- [:contacts/active]
 (fn [[members contacts]]
@@ -102,7 +102,7 @@
   {:content  {:community-channel {:emoji        (:emoji channel)
                                   :channel-name (str "# " (:name channel))}}
    :on-press (fn []
-                (re-frame/dispatch [:navigate-to :community {:community-id community-id}])
+                (re-frame/dispatch [:navigate-to-nav2 :community {:community-id community-id}])
                (js/setTimeout
                 #(re-frame/dispatch [:chat.ui/navigate-to-chat-nav2 channel-id true])
                 100))}))
@@ -6,3 +6,9 @@
 :<- [:toasts]
 (fn [toasts [_ toast-id]]
   (get-in toasts [:toasts toast-id])))
+
+(re-frame/reg-sub
+ :toasts/toast-cursor
+ :<- [:toasts]
+ (fn [toasts [_ toast-id & cursor]]
+   (get-in toasts (into [:toasts toast-id] cursor))))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ibrahem Khalil	4d9f3a4ef5	Merge branch 'develop' into 14781	2023-01-14 15:38:50 +02:00
ibrkhalil	5c49db3a5a	Flat list won't scroll inside photo selector	2023-01-14 15:37:18 +02:00
Ibrahem Khalil	aa8f5b3d48	Disable starting a new chat for non mutual contact (#14726 )	2023-01-14 12:57:45 +02:00
Churikova Tetiana	4960f5a59c	e2e: fixes for mutual contacts	2023-01-13 19:22:51 +01:00
Mohamed Javid	2f52cb1f0c	Show Admin Notifications in Activity Center (#14748 ) * [Feature][#14713] Added Admin Notifications in Activity Center * [Feature][#14713] Admin Notification UI fixes * [Feature][#14713] Admin Notification PR Feedbacks * [Feature][#14713] Admin Notification PR Feedbacks * [Feature][#14713] Admin Notification accessiblity label update	2023-01-14 02:14:02 +08:00
Andrea Maria Piana	64ec49c9c4	Removed removed files and add untracked from linting The linter would fail if there were removed files, as it would try to lint them but would not find them. Similarly, untracked files would not be linted. This commit changes the behavior so that untracked files are linted and removed files are ignored, that way we can run it before committing if there are unstaged changes that include removed/untracked files.	2023-01-13 17:22:13 +00:00
jakub	c9223cd988	ci: use arm64 macos hosts for iOS builds Signed-off-by: Jakub Sokołowski <jakub@status.im>	2023-01-13 13:44:05 +01:00
Churikova Tetiana	c1c9fef7ec	e2e: revert failed tests	2023-01-13 12:12:12 +01:00
Jamie Caprani	73c4be8dee	Communities Join Screens - Implement all permutations of Context Drawer options (#14700 )	2023-01-13 09:35:41 +00:00
Roman Volosovskyi	bfdca0fb38	https://github.com/status-im/status-go/compare/d40290a6...d60c1d00 [#14574] Update chat clock on group event	2023-01-12 18:57:22 +01:00
jakub	f446ab163e	ci: upgrade Xcode from 13.4 to 14.2 Depends on: https://github.com/status-im/infra-role-bootstrap-macos/commit/fefb0081 Signed-off-by: Jakub Sokołowski <jakub@status.im>	2023-01-12 16:55:24 +01:00
jakub	0623355e84	fleets.json: drop decomissioned eth.test fleet The fleet wasn't being used so it has been liquidated: https://github.com/status-im/infra-eth-cluster/commit/de986014 Signed-off-by: Jakub Sokołowski <jakub@status.im> make sure that "waku-nodes" is not pulled from fleets.json	2023-01-12 13:15:13 +01:00
Andrea Maria Piana	7a5871a03f	[Fixes: #14623 ] Enable mutual contacts by default and show banner	2023-01-12 09:16:02 +00:00
Parvesh Monu	5c0bd33697	Improve switcher cards lifecycle (#14751 )	2023-01-12 02:37:55 +05:30
Churikova Tetiana	220341e0be	e2e: introduced failed due to issues tests in results	2023-01-11 13:58:11 +01:00
yqrashawn	ceaa363f08	fix: not using layout animation, causing flickers on android (#14753 )	2023-01-11 18:37:42 +08:00
Jamie Caprani	846d628a9d	chore: use banner from quo library (#14629 )	2023-01-11 00:59:00 -08:00
Alexander	9ed89ac97d	Fix for tapping on new contact from contact list (#14737 ) * Tapping on new contact from Contact list leads to empty chat with skeleton * Code style fix * Small removals of unused stuff	2023-01-10 19:26:23 +01:00
Alexander	43da198c3f	Communities join screens - add toast after joining/leaving (#14735 ) * Add toast after joining/leaving a community * leftover removal * Better code for adding toasts * Fixes * Lint fix	2023-01-10 19:10:26 +01:00
Omar Basem	55d11d1a18	New chat fix (#14739 ) * new chat fix	2023-01-10 20:19:53 +04:00
frank	d2e8c5b52c	fix #14733 (#14734 )	2023-01-10 23:15:12 +08:00
Parvesh Monu	115fb3f590	fix default shell for -include targets (#14738 )	2023-01-10 18:36:38 +05:30
yqrashawn	02a1c3597f	feat: undo delete with toast (#14618 )	2023-01-10 10:02:23 +08:00
Alexander	6f10ff4d3e	Switcher button in chat is back (#14717 )	2023-01-09 18:37:54 +01:00
Churikova Tetiana	e289ad8968	e2e: fixes + workarounds	2023-01-09 14:46:24 +01:00
John Ngei	043e218320	show selected list item context actions view (#14676 ) * show selected list item context actions view * show selected list item context actions view * fixed showing thumnails on communities	2023-01-09 16:36:17 +03:00
John Ngei	1cdcd298b0	Scrollable tags (#14182 ) * refactored scrollable-tags to share the same logic with scrollable-tabs * refactored tabs component to support scrollable-behaviour	2023-01-08 22:40:59 +03:00