test discv5 restart

Fix all type hint warnings (#14810 )
[Fixes: #14777 ] Set dns nameserver to cloudflare
2023-01-18 10:47:42 +01:00 · 2023-01-17 19:52:12 -03:00 · 2023-01-17 09:22:48 +00:00 · 2023-01-16 17:20:10 +01:00 · 2023-01-16 16:34:15 +05:30 · 2023-01-14 12:57:45 +02:00
86 changed files with 1605 additions and 1218 deletions
@@ -155,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
@@ -286,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
@@ -134,7 +134,7 @@
      :style               {:width         outer-dimensions
                            :height        outer-dimensions
                            :border-radius outer-dimensions}}
-     (when (and ring? identicon?)
+     (when (and false (and ring? identicon?)) ;;TODO not implemented yet
       [icons/icon :i/identicon-ring
        {:size     outer-dimensions
         :no-color true}])
@@ -4,7 +4,6 @@

 (def container
  {:height           40
-   :flex             1
   :background-color colors/primary-50-opa-20
   :flex-direction   :row
   :align-items      :center
@@ -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)
@@ -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 " " "-")
@@ -25,7 +25,7 @@
    :component        tag/tab
    :size             32/24
    :on-press         fn
-    :blurred?         true/false 
+    :blurred?         true/false
    :labelled?        true/false
    :disabled?        true/false
    :scroll-on-press? true
@@ -36,7 +36,7 @@
    :data             [{:id :label \"\" :resource \"url\"}
                       {:id :label \"\" :resource \"url\"}]}
  Opts:
-   - `component` this is to determine which component is to be rendered since the 
+   - `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
@@ -142,7 +142,7 @@
                                    :on-press   (fn [id]
                                                  (reset! active-tab-id id)
                                                  (when scroll-on-press?
-                                                    (.scrollToIndex @flat-list-ref
+                                                    (.scrollToIndex ^js @flat-list-ref
                                                                    #js
                                                                     {:animated     true
                                                                      :index        index
@@ -0,0 +1,5 @@
+(ns react-native.blur
+  (:require ["@react-native-community/blur" :as blur]
+            [reagent.core :as reagent]))
+
+(def view (reagent/adapt-react-class (.-BlurView blur)))
@@ -1,6 +1,5 @@
 (ns react-native.core
-  (:require ["@react-native-community/blur" :as blur]
-            ["react" :as react]
+  (:require ["react" :as react]
            ["react-native" :as react-native]
            [cljs-bean.core :as bean]
            [oops.core :as oops]
@@ -10,7 +9,6 @@
            [reagent.core :as reagent]))

 (def app-state ^js (.-AppState ^js react-native))
-(def blur-view (reagent/adapt-react-class (.-BlurView blur)))

 (def view (reagent/adapt-react-class (.-View ^js react-native)))
 (def scroll-view (reagent/adapt-react-class (.-ScrollView ^js react-native)))
@@ -90,13 +88,22 @@
                props)]
        children))

-(defn use-effect
-  ([effect] (use-effect effect []))
-  ([effect deps]
-   (react/useEffect effect (bean/->js deps))))
+(def create-ref react/createRef)

 (def use-ref react/useRef)
-(defn use-effect-once [effect] (use-effect effect))
+
+(defn use-effect
+  ([effect-fn]
+   (react/useEffect
+    #(let [ret (effect-fn)]
+       (if (fn? ret) ret js/undefined))))
+  ([effect-fn deps]
+   (react/useEffect effect-fn (bean/->js deps))))
+
+(defn use-effect-once
+  [effect-fn]
+  (use-effect effect-fn))
+
 (defn use-unmount
  [f]
  (let [fn-ref (use-ref f)]
@@ -5,12 +5,11 @@

 (def ^:private consumer-raw (reagent/adapt-react-class (.-Consumer ^js SafeAreaInsetsContext)))

+(def provider (reagent/adapt-react-class SafeAreaProvider))
+
 (defn consumer
  [component]
  [consumer-raw
   (fn [^js insets]
     (reagent/as-element
      [component (js->clj insets :keywordize-keys true)]))])
-
-(def safe-area-provider (reagent/adapt-react-class SafeAreaProvider))
-(def safe-area-consumer consumer-raw)
@@ -46,15 +46,16 @@
  [player on-prepared on-error]
  (when (and player (.-canPrepare ^js player))
    (.prepare ^js player
-              #(if %
-                 (on-error {:error (.-err %) :message (.-message %)})
-                 (on-prepared)))))
+              (fn [^js err]
+                (if err
+                  (on-error {:error (.-err err) :message (.-message err)})
+                  (on-prepared))))))

 (defn prepare-recorder
  [recorder on-prepared on-error]
  (when (and recorder (.-canPrepare ^js recorder))
    (.prepare ^js recorder
-              (fn [err _]
+              (fn [^js err]
                (if err
                  (on-error {:error (.-err err) :message (.-message err)})
                  (on-prepared))))))
@@ -66,42 +67,47 @@
              (.-canRecord ^js recorder)
              (.-canPrepare ^js recorder)))
    (.record ^js recorder
-             #(if %
-                (on-error {:error (.-err %) :message (.-message %)})
-                (on-start)))))
+             (fn [^js err]
+               (if err
+                 (on-error {:error (.-err err) :message (.-message err)})
+                 (on-start))))))

 (defn stop-recording
  [recorder on-stop on-error]
  (if (and recorder (#{RECORDING PAUSED} (get-state recorder)))
    (.stop ^js recorder
-           #(if %
-              (on-error {:error (.-err %) :message (.-message %)})
-              (on-stop)))
+           (fn [^js err]
+             (if err
+               (on-error {:error (.-err err) :message (.-message err)})
+               (on-stop))))
    (on-stop)))

 (defn pause-recording
  [recorder on-pause on-error]
  (when (and recorder (.-isRecording ^js recorder))
    (.pause ^js recorder
-            #(if %
-               (on-error {:error (.-err %) :message (.-message %)})
-               (on-pause)))))
+            (fn [^js err]
+              (if err
+                (on-error {:error (.-err err) :message (.-message err)})
+                (on-pause))))))

 (defn start-playing
  [player on-start on-error]
  (when (and player (.-canPlay ^js player))
    (.play ^js player
-           #(if %
-              (on-error {:error (.-err %) :message (.-message %)})
-              (on-start)))))
+           (fn [^js err]
+             (if err
+               (on-error {:error (.-err err) :message (.-message err)})
+               (on-start))))))

 (defn stop-playing
  [player on-stop on-error]
  (if (and player (.-isPlaying ^js player))
    (.stop ^js player
-           #(if %
-              (on-error {:error (.-err %) :message (.-message %)})
-              (on-stop)))
+           (fn [^js err]
+             (if err
+               (on-error {:error (.-err err) :message (.-message err)})
+               (on-stop))))
    (on-stop)))

 (defn get-recorder-file-path
@@ -123,7 +129,7 @@
  [player on-play on-pause on-error]
  (when (and player (.-canPlay ^js player))
    (.playPause ^js player
-                (fn [error pause?]
+                (fn [^js error pause?]
                  (if error
                    (on-error {:error (.-err error) :message (.-message error)})
                    (if pause?
@@ -135,9 +141,10 @@
  (when (and player (.-canPlay ^js player))
    (.seek ^js player
           value
-           #(if %
-              (on-error {:error (.-err %) :message (.-message %)})
-              (on-seek)))))
+           (fn [^js err]
+             (if err
+               (on-error {:error (.-err err) :message (.-message err)})
+               (on-seek))))))

 (defn can-play?
  [player]
@@ -155,4 +162,4 @@
  (stop-playing player
                #(when (and player (not= (get-state player) IDLE))
                   (.destroy ^js player))
-                #()))
+                #()))
@@ -13,7 +13,8 @@
            [i18n.i18n :as i18n]
            [utils.datetime :as datetime]
            [status-im.utils.utils :as utils]
-            [taoensso.timbre :as log]))
+            [taoensso.timbre :as log]
+            [status-im.ui.screens.chat.components.input :as input]))

 (defn text->emoji
  "Replaces emojis in a specified `text`"
@@ -117,37 +118,36 @@
 (rf/defn reply-to-message
  "Sets reference to previous chat message and focuses on input"
  {:events [:chat.ui/reply-to-message]}
-  [{:keys [db] :as cofx} message]
+  [{:keys [db]} message]
  (let [current-chat-id (:current-chat-id db)]
-    (rf/merge cofx
-              {:db (-> db
-                       (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message]
-                                 message)
-                       (assoc-in [:chat/inputs current-chat-id :metadata :editing-message] nil)
-                       (update-in [:chat/inputs current-chat-id :metadata]
-                                  dissoc
-                                  :sending-image))})))
+    {:db (-> db
+             (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message]
+                       message)
+             (assoc-in [:chat/inputs current-chat-id :metadata :editing-message] nil)
+             (update-in [:chat/inputs current-chat-id :metadata]
+                        dissoc
+                        :sending-image))}))

 (rf/defn edit-message
  "Sets reference to previous chat message and focuses on input"
  {:events [:chat.ui/edit-message]}
  [{:keys [db] :as cofx} message]
  (let [current-chat-id (:current-chat-id db)
-
        text            (get-in message [:content :text])]
-    {:dispatch [:chat.ui.input/set-chat-input-text text current-chat-id]
-     :db       (-> db
-                   (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
-                             message)
-                   (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
-                   (update-in [:chat/inputs current-chat-id :metadata]
-                              dissoc
-                              :sending-image))}))
+    (rf/merge cofx
+              {:db (-> db
+                       (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
+                                 message)
+                       (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
+                       (update-in [:chat/inputs current-chat-id :metadata]
+                                  dissoc
+                                  :sending-image))}
+              (input/set-input-text text current-chat-id))))

 (rf/defn show-contact-request-input
  "Sets reference to previous chat message and focuses on input"
  {:events [:chat.ui/send-contact-request]}
-  [{:keys [db] :as cofx}]
+  [{:keys [db]}]
  (let [current-chat-id (:current-chat-id db)]
    {:db (-> db
             (assoc-in [:chat/inputs current-chat-id :metadata :sending-contact-request]
@@ -70,9 +70,10 @@
                       (assoc-in [:contacts/contacts public-key] contact))}
              (contacts-store/block
               public-key
-               #(do (re-frame/dispatch [::contact-blocked contact (.-chats %)])
-                    (re-frame/dispatch [:sanitize-messages-and-process-response %])
-                    (re-frame/dispatch [:hide-popover])))
+               (fn [^js block-contact]
+                 (re-frame/dispatch [::contact-blocked contact (.-chats block-contact)])
+                 (re-frame/dispatch [:sanitize-messages-and-process-response block-contact])
+                 (re-frame/dispatch [:hide-popover])))
              ;; reset navigation to avoid going back to non existing one to one chat
              (if from-one-to-one-chat?
                (navigation/pop-to-root-tab :chat-stack)
@@ -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 %)))
@@ -2,13 +2,14 @@
  (:refer-clojure :exclude [remove])
  (:require [clojure.spec.alpha :as spec]
            [clojure.string :as string]
+            [i18n.i18n :as i18n]
+            [oops.core :as oops]
            [re-frame.core :as re-frame]
            [status-im.chat.models :as models.chat]
            [status-im.constants :as constants]
-            [utils.re-frame :as rf]
-            [i18n.i18n :as i18n]
            [status-im2.contexts.activity-center.events :as activity-center]
-            [status-im2.navigation.events :as navigation]))
+            [status-im2.navigation.events :as navigation]
+            [utils.re-frame :as rf]))

 (rf/defn navigate-chat-updated
  {:events [:navigate-chat-updated]}
@@ -30,7 +31,11 @@
  [_ response do-not-navigate?]
  {:dispatch-n [[:sanitize-messages-and-process-response response]
                (when-not do-not-navigate?
-                  [:navigate-chat-updated (.-id (aget (.-chats response) 0))])]})
+                  [:navigate-chat-updated
+                   (-> response
+                       (oops/oget :chats)
+                       first
+                       (oops/oget :id))])]})

 (rf/defn remove-member
  "Format group update message and sign membership"
@@ -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]
@@ -68,6 +69,8 @@
   :EnableDiscV5   true
   :Host           "0.0.0.0"
   :AutoUpdate     true
+   ;; Temporary fix until https://github.com/status-im/status-go/issues/3024 is resolved
+   :Nameserver     "1.1.1.1"
   :PeerExchange   true
   :Port           0
   :UDPPort        0})
@@ -107,14 +110,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
@@ -235,11 +235,11 @@

 (defn sort-js-messages!
  "sort messages, so we can start process latest first,in that case we only need to process frist 20 and drop others"
-  [response-js messages]
+  [^js response-js messages]
  (if (seq messages)
    (set! (.-messages response-js)
      (.sort (to-array messages)
-             (fn [a b]
+             (fn [^js a ^js b]
               (- (.-clock b) (.-clock a)))))
    (js-delete response-js "messages")))

@@ -334,7 +334,7 @@

 (rf/defn transport-message-sent
  {:events [:transport/message-sent]}
-  [cofx response-js]
+  [cofx ^js response-js]
  (let [set-hash-fxs (map (fn [{:keys [localChatId id messageType]}]
                            (set-message-envelope-hash localChatId id messageType))
                          (types/js->clj (.-messages response-js)))]
@@ -57,7 +57,7 @@
        update?           (atom nil)
        current-obj       (reagent/atom nil)]
    (reagent/create-class
-     {:UNSAFE_componentWillMount  (fn [args]
+     {:UNSAFE_componentWillMount  (fn [^js args]
                                    (let [[_ obj _ _] (.-argv (.-props args))]
                                      (when @clear-timeout (js/clearTimeout @clear-timeout))
                                      (when (or (not= obj @current-obj) @update?)
@@ -53,7 +53,7 @@

 (defn contact-request-message
  [their-public-key]
-  (let [{:keys [input-text]} @(re-frame/subscribe [:chats/current-chat-inputs])]
+  (let [{:keys [input-text]} @(re-frame/subscribe [:chats/current-chat-input])]
    [rn/view {:style {:flex-direction :row}}
     [rn/view {:style (styles/contact-request-content)}
      [quo/button
@@ -212,7 +212,7 @@
  "Set input text for current-chat. Takes db and input text and cofx
  as arguments and returns new fx. Always clear all validation messages."
  {:events [:chat.ui.input/set-chat-input-text]}
-  [{:keys [db] :as cofx} text chat-id]
+  [{:keys [db]} text chat-id]
  (let [text-with-mentions   (mentions/->input-field text)
        all-contacts         (:contacts/contacts db)
        chat                 (get-in db [:chats chat-id])
@@ -404,7 +404,7 @@

 (defn image-set-size
  [dimensions]
-  (fn [evt]
+  (fn [^js evt]
    (let [width  (.-width (.-nativeEvent evt))
          height (.-height (.-nativeEvent evt))]
      (if (< width height)
@@ -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}
@@ -26,7 +26,7 @@

 (defn image-set-size
  [width]
-  (fn [evt]
+  (fn [^js evt]
    (reset! width (/ (.-width (.-nativeEvent evt))
                     (/ (.-height (.-nativeEvent evt)) image-max-dimension)))))

@@ -8,7 +8,7 @@
            [status-im.ui2.screens.chat.components.edit.style :as style]))

 (defn edit-message
-  [reset-composer-callback]
+  [on-cancel]
  [rn/view
   {:style               style/container
    :accessibility-label :edit-message}
@@ -24,7 +24,7 @@
      (i18n/label :t/editing-message)]]]
   [gesture-handler/touchable-without-feedback
    {:accessibility-label :reply-cancel-button
-     :on-press            #(do (reset-composer-callback true)
+     :on-press            #(do (on-cancel)
                               (rf/dispatch [:chat.ui/cancel-message-edit]))}
    [quo/button
     {:width 24
@@ -10,7 +10,7 @@
            [utils.re-frame :as rf]
            [status-im.ui.screens.chat.sheets :refer [hide-sheet-and-dispatch]]
            [status-im.ui.components.toolbar :as toolbar]
-            [status-im.ui2.screens.common.contact-list.view :as contact-list]
+            [status-im2.common.contact-list.view :as contact-list]
            [quo2.components.markdown.text :as text]
            [status-im.ui.components.invite.events :as invite.events]
            [status-im.ui2.screens.chat.components.new-chat.styles :as style]))
@@ -0,0 +1,17 @@
+(ns status-im.ui2.screens.chat.components.reply.style)
+
+(defn reply-content
+  [pin?]
+  {:padding-horizontal (when-not pin? 10)
+   :flex               1
+   :flex-direction     :row})
+
+(defn quoted-message
+  [pin?]
+  (merge {:flex-direction :row
+          :align-items    :center
+          :width          "45%"}
+         (when-not pin?
+           {:position :absolute
+            :left     34
+            :top      3})))
@@ -1,4 +1,4 @@
-(ns status-im.ui2.screens.chat.components.reply
+(ns status-im.ui2.screens.chat.components.reply.view
  (:require [clojure.string :as string]
            [i18n.i18n :as i18n]
            [quo.react-native :as rn]
@@ -10,8 +10,8 @@
            [status-im.ethereum.stateofus :as stateofus]
            [status-im.ui.components.icons.icons :as icons]
            [status-im.ui.screens.chat.photos :as photos]
-            [status-im.ui2.screens.chat.composer.style :as styles]
-            [utils.re-frame :as rf]))
+            [utils.re-frame :as rf]
+            [status-im.ui2.screens.chat.components.reply.style :as style]))

 (defn get-quoted-text-with-mentions
  [parsed-text]
@@ -73,16 +73,16 @@
     {:style {:flex-direction      :row
              :height              (when-not pin? 24)
              :accessibility-label :reply-message}}
-     [rn/view {:style (styles/reply-content pin?)}
+     [rn/view {:style (style/reply-content pin?)}
      (when-not pin?
        ;;TODO quo2 icon should be used
        [icons/icon :main-icons/connector
         {:color           (colors/theme-colors colors/neutral-40 colors/neutral-60)
          :container-style {:position :absolute :left 10 :bottom -4 :width 16 :height 16}}])
      (if (or deleted? deleted-for-me?)
-        [rn/view {:style (styles/quoted-message pin?)}
+        [rn/view {:style (style/quoted-message pin?)}
         [reply-deleted-message]]
-        [rn/view {:style (styles/quoted-message pin?)}
+        [rn/view {:style (style/quoted-message pin?)}
         [photos/member-photo from identicon 16]
         [quo2.text/text
          {:weight          :semi-bold
@@ -16,8 +16,8 @@
 (defn edit-message-auto-focus-wrapper
  [text-input-ref _]
  (let [had-edit (atom nil)]
-    (fn [_ edit cleanup-composer-callback]
+    (fn [_ edit on-cancel]
      (focus-input-on-edit edit had-edit text-input-ref)
      (when edit
        [rn/view {:style style/container}
-         [edit/edit-message cleanup-composer-callback]]))))
+         [edit/edit-message on-cancel]]))))
@@ -0,0 +1,18 @@
+(ns status-im.ui2.screens.chat.composer.images.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def remove-photo-container
+  {:width            14
+   :height           14
+   :border-radius    7
+   :background-color colors/neutral-50
+   :position         :absolute
+   :top              5
+   :right            5
+   :justify-content  :center
+   :align-items      :center})
+
+(def small-image
+  {:width         56
+   :height        56
+   :border-radius 8})
@@ -1,32 +1,33 @@
 (ns status-im.ui2.screens.chat.composer.images.view
-  (:require [quo2.core :as quo2]
+  (:require [quo2.core :as quo]
            [quo2.foundations.colors :as colors]
            [re-frame.core :as rf]
            [react-native.core :as rn]
-            [status-im.ui2.screens.chat.composer.style :as style]))
+            [status-im.ui2.screens.chat.composer.images.style :as style]))

 (defn image
  [item]
-  [rn/view
+  ;; there is a bug on Android https://github.com/facebook/react-native/issues/12534
+  ;; so we need some magic here with paddings so close button isn't cut
+  [rn/view {:padding-top 12 :padding-bottom 8 :padding-right 12}
   [rn/image
    {:source {:uri (first item)}
     :style  style/small-image}]
   [rn/touchable-opacity
-    {:on-press (fn [] (rf/dispatch [:chat.ui/image-unselected (first item)]))
+    {:on-press #(rf/dispatch [:chat.ui/image-unselected (first item)])
     :style    style/remove-photo-container
     :hit-slop {:right  5
                :left   5
                :top    10
                :bottom 10}}
-    [quo2/icon :i/close {:color colors/white :size 12}]]])
+    [quo/icon :i/close {:color colors/white :size 12}]]])

 (defn images-list
  [images]
-  [rn/flat-list
-   {:key-fn                  first
-    :render-fn               image
-    :data                    images
-    :horizontal              true
-    :style                   {:bottom 50 :position :absolute :z-index 5 :elevation 5}
-    :content-container-style {:padding-horizontal 20 :margin-top 12 :padding-top 8}
-    :separator               [rn/view {:style {:width 12}}]}])
+  (when (seq images)
+    [rn/flat-list
+     {:key-fn                       first
+      :render-fn                    image
+      :data                         images
+      :horizontal                   true
+      :keyboard-should-persist-taps :handled}]))
@@ -12,13 +12,14 @@
            [status-im.chat.models.mentions :as mentions]
            [i18n.i18n :as i18n]
            [status-im.ui.components.react :as react]
-            [status-im.ui2.screens.chat.composer.style :as style]
            [utils.re-frame :as rf]
            [status-im.utils.platform :as platform]
            [status-im.utils.utils :as utils.utils]
-            [utils.transforms :as transforms]))
+            [utils.transforms :as transforms]
+            [quo2.foundations.typography :as typography]))

 (defonce input-texts (atom {}))
+(defonce input-text-content-heights (atom {}))
 (defonce mentions-enabled? (reagent/atom {}))
 (defonce chat-input-key (reagent/atom 1))
 (defonce text-input-ref (reagent/atom nil))
@@ -29,6 +30,7 @@
 :chat.ui/clear-inputs
 (fn []
   (reset! input-texts {})
+   (reset! input-text-content-heights {})
   (reset! mentions-enabled? {})
   (reset! chat-input-key 1)))

@@ -58,7 +60,8 @@
  (some-> ^js (quo.react/current-ref (:text-input-ref refs))
          .clear)
  (swap! mentions-enabled? update :render not)
-  (swap! input-texts dissoc chat-id))
+  (swap! input-texts dissoc chat-id)
+  (swap! input-text-content-heights dissoc chat-id))

 (defn clear-input
  [chat-id refs]
@@ -75,6 +78,7 @@

 (defn on-text-change
  [val chat-id]
+  (println "on=text-change" val)
  (swap! input-texts assoc chat-id val)
  ;;we still store it in app-db for mentions, we don't have reactions in views
  (rf/dispatch [:chat.ui/set-chat-input-text val]))
@@ -157,16 +161,31 @@
    (when platform/android?
      (rf/dispatch [::mentions/calculate-suggestions mentionable-users]))))

+(defn text-input-style
+  []
+  (merge typography/font-regular
+         typography/paragraph-1
+         {:flex              1
+          :min-height        34
+          :margin            0
+          :flex-shrink       1
+          :color             (:text-01 @quo.colors/theme)
+          :margin-horizontal 20}
+         (if platform/android?
+           {:padding-vertical    8
+            :text-align-vertical :top}
+           {:margin-top    8
+            :margin-bottom 8})))
+
 (defn text-input
-  [{:keys [set-active-panel refs chat-id sending-image on-content-size-change initial-value]}]
-  (let [_ (reset! text-input-ref (:text-input-ref refs))
-        cooldown-enabled?   (rf/sub [:chats/current-chat-cooldown-enabled?])
+  [{:keys [refs chat-id sending-image on-content-size-change]}]
+  (let [cooldown-enabled?   (rf/sub [:chats/current-chat-cooldown-enabled?])
        mentionable-users   (rf/sub [:chats/mentionable-users])
        timeout-id          (reagent/atom nil)
        last-text-change    (reagent/atom nil)
        mentions-enabled?   (get @mentions-enabled? chat-id)
        props
-        {:style                    (style/text-input)
+        {:style                    (text-input-style)
         :ref                      (:text-input-ref refs)
         :max-font-size-multiplier 1
         :accessibility-label      :chat-message-input
@@ -175,13 +194,12 @@
         :editable                 (not cooldown-enabled?)
         :blur-on-submit           false
         :auto-focus               false
-         :default-value            initial-value
-         :on-focus                 #(set-active-panel nil)
         :max-length               chat.constants/max-text-size
         :placeholder-text-color   (:text-02 @quo.colors/theme)
         :placeholder              (if cooldown-enabled?
                                     (i18n/label :cooldown/text-input-disabled)
                                     (i18n/label :t/type-a-message))
+         :default-value            (get @input-texts chat-id)
         :underline-color-android  :transparent
         :auto-capitalize          :sentences
         :auto-correct             false
@@ -232,13 +250,12 @@
 (fn [[chat-id text local-text-input-ref]]
   (when local-text-input-ref
     (reset! text-input-ref local-text-input-ref))
+   (on-text-change text chat-id)
   (if platform/ios?
     (.setNativeProps ^js (quo.react/current-ref @text-input-ref) (clj->js {:text text}))
-     (do
-       (on-text-change text chat-id)
-       (if (string/blank? text)
-         (.clear ^js (quo.react/current-ref @text-input-ref))
-         (.setNativeProps ^js (quo.react/current-ref @text-input-ref) (clj->js {:text text})))))))
+     (if (string/blank? text)
+       (.clear ^js (quo.react/current-ref @text-input-ref))
+       (.setNativeProps ^js (quo.react/current-ref @text-input-ref) (clj->js {:text text}))))))

 (defn calculate-input-text
  [{:keys [full-text selection-start selection-end]} content]
@@ -318,7 +335,7 @@
    (action params)))

 (defn selectable-text-input
-  [chat-id {:keys [style ref on-selection-change] :as props} children]
+  [_ _ _]
  (let [text-input-ref  (reagent/atom nil)
        menu-items      (reagent/atom first-level-menu-items)
        first-level     (reagent/atom true)
@@ -338,7 +355,7 @@
                                  (oops/ocall manager :startActionMode text-input-handle))))

      :reagent-render
-      (fn [_]
+      (fn [chat-id {:keys [style ref on-selection-change] :as props} children]
        (let [ref                 #(do (reset! text-input-ref %)
                                       (when ref
                                         (quo.react/set-ref-val! ref %)))
@@ -357,11 +374,11 @@
                                        (update-selection text-input-handle start end)
                                        (reset! selection-event nil))))
              on-selection
-              (fn [event]
+              (fn [^js event]
                (let [native-event (.-nativeEvent event)
                      native-event (transforms/js->clj native-event)
                      {:keys [eventType content selectionStart selectionEnd]} native-event
-                      full-text (:input-text (rf/sub [:chats/current-chat-inputs]))]
+                      full-text (:input-text (rf/sub [:chats/current-chat-input]))]
                  (on-menu-item-touched {:first-level       first-level
                                         :event-type        eventType
                                         :content           content
@@ -3,7 +3,6 @@
            [quo.components.text :as text]
            [quo.react]
            [quo.react-native :as rn]
-            [react-native.reanimated :as reanimated]
            [status-im.ui.components.list.views :as list]
            [status-im.ui.screens.chat.photos :as photos]
            [utils.re-frame :as rf]))
@@ -42,20 +41,11 @@

 (defn autocomplete-mentions
  [suggestions text-input-ref]
-  [:f>
-   (fn []
-     (let [animation (reanimated/use-shared-value 0)]
-       (quo.react/effect!
-        #(reanimated/set-shared-value animation (reanimated/with-timing (if (seq suggestions) 0 200))))
-       [reanimated/view
-        {:style (reanimated/apply-animations-to-style
-                 {:transform [{:translateY animation}]}
-                 {:bottom 0 :position :absolute :z-index 5 :elevation 5 :max-height 180})}
-        [list/flat-list
-         {:keyboardShouldPersistTaps :always
-          :data                      suggestions
-          :key-fn                    first
-          :render-fn                 mention-item
-          :render-data               text-input-ref
-          :content-container-style   {:padding-bottom 12}
-          :accessibility-label       :mentions-list}]]))])
+  [list/flat-list
+   {:keyboardShouldPersistTaps :always
+    :data                      suggestions
+    :key-fn                    first
+    :render-fn                 mention-item
+    :render-data               text-input-ref
+    :content-container-style   {:padding-bottom 12}
+    :accessibility-label       :mentions-list}])
@@ -1,6 +1,6 @@
 (ns status-im.ui2.screens.chat.composer.reply
  (:require [quo.react-native :as rn]
-            [status-im.ui2.screens.chat.components.reply :as reply]
+            [status-im.ui2.screens.chat.components.reply.view :as reply]
            [status-im.ui2.screens.chat.composer.input :as input]))

 (defn focus-input-on-reply
@@ -21,4 +21,4 @@
        [rn/view
         {:style {:padding-horizontal 15
                  :padding-vertical   8}}
-         [reply/reply-message reply true]]))))
+         [reply/reply-message reply true]]))))
@@ -1,106 +0,0 @@
-(ns status-im.ui2.screens.chat.composer.style
-  (:require [quo.design-system.colors :as quo.colors]
-            [quo2.foundations.colors :as colors]
-            [quo2.foundations.typography :as quo2.typography]
-            [status-im.utils.platform :as platform]))
-
-(defn text-input
-  []
-  (merge quo2.typography/font-regular
-         quo2.typography/paragraph-1
-         {:flex              1
-          :min-height        34
-          :margin            0
-          :flex-shrink       1
-          :color             (:text-01 @quo.colors/theme)
-          :margin-horizontal 20}
-         (if platform/android?
-           {:padding-vertical    8
-            :text-align-vertical :top}
-           {:margin-top    8
-            :margin-bottom 8})))
-
-(defn input-bottom-sheet
-  [window-height]
-  (merge {:border-top-left-radius  20
-          :border-top-right-radius 20
-          :position                :absolute
-          :left                    0
-          :right                   0
-          :bottom                  (- window-height)
-          :height                  window-height
-          :flex                    1
-          :background-color        (colors/theme-colors colors/white colors/neutral-90)
-          :z-index                 2}
-         (if platform/ios?
-           {:shadow-radius  16
-            :shadow-opacity 1
-            :shadow-color   "rgba(9, 16, 28, 0.04)"
-            :shadow-offset  {:width 0 :height -2}}
-           {:elevation 2})))
-
-(defn bottom-sheet-handle
-  []
-  {:width            32
-   :height           4
-   :background-color (colors/theme-colors colors/neutral-100 colors/white)
-   :opacity          0.05
-   :border-radius    100
-   :align-self       :center
-   :margin-top       8})
-
-(defn bottom-sheet-controls
-  [insets]
-  {:flex-direction     :row
-   :padding-horizontal 20
-   :elevation          2
-   :z-index            3
-   :position           :absolute
-   :background-color   (colors/theme-colors colors/white colors/neutral-90)
-   ;these 3 props play together, we need this magic to hide message text in the safe area
-   :padding-top        10
-   :padding-bottom     (+ 12 (:bottom insets))
-   :bottom             (- 2 (:bottom insets))})
-
-(defn bottom-sheet-background
-  [window-height]
-  {:position         :absolute
-   :left             0
-   :right            0
-   :bottom           0
-   :height           window-height
-   :background-color colors/neutral-95-opa-70
-   :z-index          1})
-
-(defn reply-content
-  [pin?]
-  {:padding-horizontal (when-not pin? 10)
-   :flex               1
-   :flex-direction     :row})
-
-(defn quoted-message
-  [pin?]
-  (merge {:flex-direction :row
-          :align-items    :center
-          :width          "45%"}
-         (when-not pin?
-           {:position :absolute
-            :left     34
-            :top      3})))
-
-(def remove-photo-container
-  {:width            14
-   :height           14
-   :border-radius    7
-   :background-color colors/neutral-50
-   :position         :absolute
-   :top              -7
-   :right            -7
-   :justify-content  :center
-   :align-items      :center})
-
-(def small-image
-  {:width         56
-   :height        56
-   :border-radius 8
-   :margin-bottom 20})
@@ -1,345 +0,0 @@
-(ns status-im.ui2.screens.chat.composer.view
-  (:require [clojure.string :as string]
-            [i18n.i18n :as i18n]
-            [oops.core :refer [oget]]
-            [quo.components.safe-area :as safe-area]
-            [quo.react]
-            [quo.react-native :as rn :refer [navigation-const]]
-            [quo2.components.buttons.button :as quo2.button]
-            [react-native.gesture :as gesture]
-            [react-native.reanimated :as reanimated]
-            [status-im.ui.components.permissions :as permissions]
-            [status-im.ui2.screens.chat.composer.edit.view :as edit]
-            [status-im.ui2.screens.chat.composer.images.view :as composer-images]
-            [status-im.ui2.screens.chat.composer.input :as input]
-            [status-im.ui2.screens.chat.composer.mentions :as mentions]
-            [status-im.ui2.screens.chat.composer.reply :as reply]
-            [status-im.ui2.screens.chat.composer.style :as style]
-            [status-im2.contexts.chat.photo-selector.view :as photo-selector]
-            [utils.re-frame :as rf]
-            [status-im.utils.utils :as utils]
-            [status-im2.contexts.chat.messages.list.view :refer [scroll-to-bottom]]
-            [status-im.utils.platform :as platform]
-            [status-im2.common.not-implemented :as not-implemented]))
-
-(defn calculate-y
-  [context min-y max-y added-value chat-id set-bg-opacity]
-  (let [input-text (:input-text (get (rf/sub [:chat/inputs]) chat-id))
-        num-lines  (count (string/split input-text "\n"))]
-    (if (<= 5 num-lines)
-      (do (when-not (:minimized-from-handlebar? @context)
-            (swap! context assoc :state :max)
-            (set-bg-opacity 1))
-          max-y)
-      (when (:minimized-from-handlebar? @context)
-        (swap! context assoc :state :min :minimized-from-handlebar? false)
-        (set-bg-opacity 0)
-        min-y))
-    (if (= (:state @context) :max)
-      (do
-        (set-bg-opacity 1)
-        max-y)
-      (when (< (:y @context) max-y)
-        (+ (:y @context) added-value)))))
-
-(defn calculate-y-with-mentions
-  [y max-y max-height chat-id suggestions reply]
-  (let [input-text               (:input-text (get (rf/sub [:chat/inputs]) chat-id))
-        num-lines                (count (string/split input-text "\n"))
-        text-height              (* num-lines 22)
-        mentions-height          (min 132 (+ 16 (* 46 (- (count suggestions) 1))))
-        should-translate?        (if (< (- max-height text-height) mentions-height) true false)
-        min-value                (if-not reply mentions-height (+ mentions-height 44))
-        ; translate value when mentions list appear while at bottom of expanded input sheet
-        mentions-translate-value (if should-translate?
-                                   (min min-value (- mentions-height (- max-height text-height)))
-                                   mentions-height)]
-    (when (or (< y max-y) should-translate?) mentions-translate-value)))
-
-(defn get-y-value
-  [context min-y max-y added-value max-height chat-id suggestions reply edit images set-bg-opacity]
-  (let [y               (calculate-y context min-y max-y added-value chat-id set-bg-opacity)
-        y-with-mentions (calculate-y-with-mentions y max-y max-height chat-id suggestions reply)]
-    (+ y (when (seq suggestions) y-with-mentions) (when (seq images) 80) (when edit 38))))
-
-(defn- clean-and-minimize-composer
-  ([context chat-id refs min-y]
-   (clean-and-minimize-composer context chat-id refs min-y false))
-  ([context chat-id refs min-y edit?]
-   (input/clear-input chat-id refs)
-   (swap! context assoc
-     :y
-     (if edit?
-       (- min-y 38)
-       min-y))
-   (swap! context assoc :clear true :state :min)))
-
-(defn get-bottom-sheet-gesture
-  [context translate-y text-input-ref keyboard-shown min-y max-y shared-height max-height set-bg-opacity]
-  (-> (gesture/gesture-pan)
-      (gesture/on-start
-       (fn [_]
-         (if keyboard-shown
-           (swap! context assoc :pan-y (reanimated/get-shared-value translate-y))
-           (input/input-focus text-input-ref))))
-      (gesture/on-update
-       (fn [evt]
-         (when keyboard-shown
-           (swap! context assoc :dy (- (.-translationY evt) (:pdy @context)))
-           (swap! context assoc :pdy (.-translationY evt))
-           (reanimated/set-shared-value
-            translate-y
-            (max (min (+ (.-translationY evt) (:pan-y @context)) (- min-y)) (- max-y))))))
-      (gesture/on-end
-       (fn [_]
-         (when keyboard-shown
-           (if (< (:dy @context) 0)
-             (do
-               (swap! context assoc :minimized-from-handlebar? false)
-               (swap! context assoc :state :max)
-               (input/input-focus text-input-ref)
-               (reanimated/set-shared-value translate-y (reanimated/with-timing (- max-y)))
-               (reanimated/set-shared-value shared-height (reanimated/with-timing max-height))
-               (set-bg-opacity 1))
-             (do
-               (swap! context assoc :minimized-from-handlebar? true)
-               (reanimated/set-shared-value translate-y (reanimated/with-timing (- min-y)))
-               (reanimated/set-shared-value shared-height (reanimated/with-timing min-y))
-               (set-bg-opacity 0)
-               (rf/dispatch [:dismiss-keyboard]))))))))
-
-(defn get-input-content-change
-  [context translate-y shared-height max-height set-bg-opacity keyboard-shown min-y max-y blank-composer?
-   initial-value]
-  (fn [evt]
-    (when-not (or blank-composer? (some? initial-value))
-      (swap! context assoc :clear false))
-    (if (:clear @context)
-      (do
-        (swap! context dissoc :clear)
-        (swap! context assoc :state :min)
-        (swap! context assoc :y min-y)
-        (reanimated/set-shared-value translate-y (reanimated/with-timing (- min-y)))
-        (reanimated/set-shared-value shared-height (reanimated/with-timing min-y))
-        (set-bg-opacity 0))
-      (when (not= (:state @context) :max)
-        (let [offset-value (if platform/ios? 22 40)
-              new-y        (+ min-y
-                              (- (max (oget evt "nativeEvent" "contentSize" "height") offset-value)
-                                 offset-value))]
-          (if (< new-y max-y)
-            (do
-              (if (> (- max-y new-y) 120)
-                (do
-                  (swap! context assoc :state :custom-chat-available)
-                  (set-bg-opacity 0))
-                (do
-                  (set-bg-opacity 1)
-                  (swap! context assoc :state :custom-chat-unavailable)))
-              (swap! context assoc :y new-y)
-              (when keyboard-shown
-                (reanimated/set-shared-value
-                 translate-y
-                 (reanimated/with-timing (- new-y)))
-                (reanimated/set-shared-value
-                 shared-height
-                 (reanimated/with-timing (min new-y max-height)))))
-            (do
-              (swap! context assoc :state :max)
-              (swap! context assoc :y max-y)
-              (if keyboard-shown
-                (do (set-bg-opacity 1)
-                    (reanimated/set-shared-value
-                     translate-y
-                     (reanimated/with-timing (- max-y))))
-                (set-bg-opacity 0)))))))))
-
-(defn composer
-  [chat-id]
-  [safe-area/consumer
-   (fn [insets]
-     (let [min-y               112
-           context             (atom {:y                         min-y ;current y value
-                                      :min-y                     min-y ;minimum y value
-                                      :dy                        0     ;used for gesture
-                                      :pdy                       0     ;used for gesture
-                                      :state                     :min  ;:min, :custom-chat-available,
-                                      ;:custom-chat-unavailable, :max
-                                      :clear                     false
-                                      :minimized-from-handlebar? false})
-           keyboard-was-shown? (atom false)
-           text-input-ref      (quo.react/create-ref)
-           send-ref            (quo.react/create-ref)
-           refs                {:send-ref       send-ref
-                                :text-input-ref text-input-ref}]
-       (fn []
-         [:f>
-          (fn []
-            (let [reply                                    (rf/sub [:chats/reply-message])
-                  edit                                     (rf/sub [:chats/edit-message])
-                  suggestions                              (rf/sub [:chat/mention-suggestions])
-                  images                                   (get-in (rf/sub [:chat/inputs])
-                                                                   [chat-id :metadata :sending-image])
-                  {window-height :height}                  (rn/use-window-dimensions)
-                  {:keys [keyboard-shown keyboard-height]} (rn/use-keyboard)
-                  max-y                                    (- window-height
-                                                              (if (> keyboard-height 0)
-                                                                keyboard-height
-                                                                360)
-                                                              (:top insets)
-                                                              (:status-bar-height @navigation-const)) ; 360
-                  ; -
-                  ; default
-                  ; height
-                  max-height                               (Math/abs (- max-y 56 (:bottom insets))) ; 56
-                  ; -
-                  ; top-bar
-                  ; height
-                  added-value                              (if (and (not (seq suggestions))
-                                                                    (or edit reply))
-                                                             38
-                                                             0) ; increased height
-                  ; of input box
-                  ; needed when reply
-                  min-y                                    (+ min-y (when (or edit reply) 38))
-                  bg-opacity                               (reanimated/use-shared-value 0)
-                  bg-bottom                                (reanimated/use-shared-value (-
-                                                                                         window-height))
-                  set-bg-opacity
-                  (fn [value]
-                    (reanimated/set-shared-value bg-bottom (if (= value 1) 0 (- window-height)))
-                    (reanimated/set-shared-value bg-opacity (reanimated/with-timing value)))
-                  y                                        (get-y-value
-                                                            context
-                                                            min-y
-                                                            max-y
-                                                            added-value
-                                                            max-height
-                                                            chat-id
-                                                            suggestions
-                                                            reply
-                                                            edit
-                                                            images
-                                                            set-bg-opacity)
-                  translate-y                              (reanimated/use-shared-value 0)
-                  shared-height                            (reanimated/use-shared-value min-y)
-                  clean-and-minimize-composer-fn
-                  #(clean-and-minimize-composer context chat-id refs min-y %)
-                  blank-composer?                          (string/blank? (get @input/input-texts
-                                                                               chat-id))
-                  initial-value                            (or (get @input/input-texts chat-id) nil)
-                  input-content-change                     (get-input-content-change
-                                                            context
-                                                            translate-y
-                                                            shared-height
-                                                            max-height
-                                                            set-bg-opacity
-                                                            keyboard-shown
-                                                            min-y
-                                                            max-y
-                                                            blank-composer?
-                                                            initial-value)
-                  bottom-sheet-gesture                     (get-bottom-sheet-gesture
-                                                            context
-                                                            translate-y
-                                                            text-input-ref
-                                                            keyboard-shown
-                                                            min-y
-                                                            max-y
-                                                            shared-height
-                                                            max-height
-                                                            set-bg-opacity)]
-              (quo.react/effect!
-               (fn []
-                 (let [input-text (-> [:chat/inputs]
-                                      rf/sub
-                                      (get chat-id)
-                                      :input-text)
-                       edited?    (not= input-text (-> edit :content :text))]
-                   (when (and @keyboard-was-shown? (not keyboard-shown))
-                     (swap! context assoc :state :min)
-                     (set-bg-opacity 0))
-                   (when (and blank-composer? (empty? images) (not edit))
-                     (clean-and-minimize-composer-fn false))
-                   (if (or (seq images) (and (not blank-composer?) edited?))
-                     (input/show-send refs)
-                     (input/hide-send refs))
-                   (reset! keyboard-was-shown? keyboard-shown)
-                   (if (#{:max :custom-chat-unavailable} (:state @context))
-                     (set-bg-opacity 1)
-                     (set-bg-opacity 0))
-                   (reanimated/set-shared-value translate-y (reanimated/with-timing (- y)))
-                   (reanimated/set-shared-value shared-height
-                                                (reanimated/with-timing (min y max-height))))))
-              [reanimated/view
-               {:style (reanimated/apply-animations-to-style
-                        {:height shared-height}
-                        {:z-index 2})}
-               ;;INPUT MESSAGE bottom sheet
-               [gesture/gesture-detector {:gesture bottom-sheet-gesture}
-                [reanimated/view
-                 {:style (reanimated/apply-animations-to-style
-                          {:transform [{:translateY translate-y}]}
-                          (style/input-bottom-sheet window-height))}
-                 ;handle
-                 [rn/view {:style (style/bottom-sheet-handle)}]
-                 [edit/edit-message-auto-focus-wrapper text-input-ref edit
-                  clean-and-minimize-composer-fn]
-                 [reply/reply-message-auto-focus-wrapper text-input-ref reply]
-                 [rn/view {:style {:height (- max-y 80 added-value)}}
-                  [input/text-input
-                   {:chat-id                chat-id
-                    :on-content-size-change input-content-change
-                    :sending-image          (seq images)
-                    :initial-value          initial-value
-                    :refs                   refs
-                    :set-active-panel       #()}]]]]
-               ;CONTROLS
-               (when-not (seq suggestions)
-                 [rn/view {:style (style/bottom-sheet-controls insets)}
-                  [quo2.button/button
-                   {:on-press (fn []
-                                (permissions/request-permissions
-                                 {:permissions [:read-external-storage :write-external-storage]
-                                  :on-allowed  #(rf/dispatch
-                                                 [:bottom-sheet/show-sheet
-                                                  {:content (fn []
-                                                              (photo-selector/photo-selector chat-id))}])
-                                  :on-denied   (fn []
-                                                 (utils/set-timeout
-                                                  #(utils/show-popup (i18n/label :t/error)
-                                                                     (i18n/label
-                                                                      :t/external-storage-denied))
-                                                  50))}))
-                    :icon     true
-                    :type     :outline
-                    :size     32} :i/image]
-                  [rn/view {:width 12}]
-                  [not-implemented/not-implemented
-                   [quo2.button/button
-                    {:icon true
-                     :type :outline
-                     :size 32} :i/reaction]]
-                  [rn/view {:flex 1}]
-                  ;;SEND button
-                  [rn/view
-                   {:ref   send-ref
-                    :style (when (seq images)
-                             {:width 0
-                              :right -100})}
-                   [quo2.button/button
-                    {:icon                true
-                     :size                32
-                     :accessibility-label :send-message-button
-                     :on-press            #(do (clean-and-minimize-composer-fn (some? edit))
-                                               (scroll-to-bottom)
-                                               (rf/dispatch [:chat.ui/send-current-message]))}
-                    :i/arrow-up]]])
-               ;black background
-               [reanimated/view
-                {:style (reanimated/apply-animations-to-style
-                         {:opacity   bg-opacity
-                          :transform [{:translateY bg-bottom}]}
-                         (style/bottom-sheet-background window-height))}]
-               [composer-images/images-list images]
-               [mentions/autocomplete-mentions suggestions text-input-ref]]))])))])
@@ -23,7 +23,7 @@
   [status-im.ui.screens.chat.styles.message.message :as style]
   [status-im.ui.screens.chat.utils :as chat.utils]
   [status-im.ui.screens.communities.icon :as communities.icon]
-   [status-im.ui2.screens.chat.components.reply :as components.reply]
+   [status-im.ui2.screens.chat.components.reply.view :as components.reply]
   [status-im.utils.config :as config]
   [utils.datetime :as datetime]
   [status-im.utils.utils :as utils]
@@ -253,7 +253,7 @@

 (defn image-set-size
  [dimensions]
-  (fn [evt]
+  (fn [^js evt]
    (let [width  (.-width (.-nativeEvent evt))
          height (.-height (.-nativeEvent evt))]
      (if (< width height)
@@ -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"]})
@@ -36,7 +36,7 @@
      (catch :default _ nil))))

 (defn greater-than-or-equals
-  [bn1 bn2]
+  [^js bn1 ^js bn2]
  (.greaterThanOrEqualTo bn1 bn2))

 (defn greater-than
@@ -63,7 +63,7 @@
  {:show-wallet-connect-sheet nil})

 (defn subscribe-to-events
-  [wallet-connect-client]
+  [^js wallet-connect-client]
  (.on wallet-connect-client
       (wallet-connect/session-request-event)
       #(re-frame/dispatch [:wallet-connect/request %]))
@@ -209,7 +209,7 @@

 (rf/defn wallet-connect-client-initate
  {:events [:wallet-connect/client-init]}
-  [{:keys [db] :as cofx} client]
+  [{:keys [db] :as cofx} ^js client]
  {:db                       (assoc db
                                    :wallet-connect/client   client
                                    :wallet-connect/sessions (types/js->clj (.-values (.-session
@@ -127,7 +127,7 @@
 (fn [^js connectors]
   (log/debug "Kill wc sessions")
   (doseq [connector connectors]
-     (.killSession connector))))
+     (.killSession ^js connector))))

 (re-frame/reg-fx
 :wc-1-approve-request
@@ -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)
@@ -1,4 +1,4 @@
-(ns status-im.ui2.screens.common.contact-list.view
+(ns status-im2.common.contact-list.view
  (:require [quo2.core :as quo]
            [react-native.core :as rn]
            [status-im2.common.contact-list-item.view :as contact-list-item]
@@ -3,6 +3,7 @@
            [quo2.core :as quo]
            [quo2.foundations.colors :as colors]
            [react-native.core :as rn]
+            [react-native.blur :as blur]
            [react-native.platform :as platform]
            [reagent.core :as reagent]
            [status-im2.common.scroll-page.style :as style]
@@ -68,7 +69,7 @@
         {:source   cover
          :position :absolute
          :style    (style/image-slider (get-header-size @scroll-height))}]
-        [rn/blur-view (style/blur-slider (get-header-size @scroll-height))]]
+        [blur/view (style/blur-slider (get-header-size @scroll-height))]]
       [rn/view {:style {:z-index 6 :margin-top (if platform/ios? 44 0)}}
        [quo/page-nav
         {:horizontal-description? true
@@ -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))]))
@@ -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]
@@ -112,6 +113,9 @@
     types/reply
     [reply/view notification]

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

 (defn view
@@ -6,7 +6,7 @@
            [react-native.core :as rn]
            [status-im.chat.models :as chat.models]
            [status-im2.contexts.chat.group-details.style :as style]
-            [status-im.ui2.screens.common.contact-list.view :as contact-list]
+            [status-im2.common.contact-list.view :as contact-list]
            [status-im2.common.contact-list-item.view :as contact-list-item]
            [status-im2.common.home.actions.view :as actions]
            [utils.re-frame :as rf]))
@@ -4,7 +4,7 @@
            [re-frame.core :as re-frame]
            [react-native.core :as rn]
            [reagent.core :as reagent]
-            [status-im.ui2.screens.common.contact-list.view :as contact-list]
+            [status-im2.common.contact-list.view :as contact-list]
            [status-im2.common.home.view :as common.home]
            [status-im2.contexts.chat.home.chat-list-item.view :as chat-list-item]
            [status-im2.contexts.chat.home.contact-request.view :as contact-request]
@@ -0,0 +1,14 @@
+(ns status-im2.contexts.chat.messages.composer.controls.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(defn controls
+  [insets]
+  {:padding-horizontal 20
+   :elevation          4
+   :z-index            3
+   :position           :absolute
+   :background-color   (colors/theme-colors colors/white colors/neutral-90)
+   :padding-bottom     (+ 12 (:bottom insets))
+   :bottom             0
+   :left               0
+   :right              0})
@@ -0,0 +1,71 @@
+(ns status-im2.contexts.chat.messages.composer.controls.view
+  (:require [react-native.core :as rn]
+            [react-native.background-timer :as background-timer]
+            [utils.re-frame :as rf]
+            [i18n.i18n :as i18n]
+            [quo2.core :as quo]
+            [status-im2.common.not-implemented :as not-implemented]
+            [status-im2.contexts.chat.photo-selector.view :as photo-selector]
+            [status-im2.contexts.chat.messages.composer.controls.style :as style]
+            [status-im2.contexts.chat.messages.list.view :as messages.list]
+            [status-im.ui.components.permissions :as permissions]
+            [status-im.ui2.screens.chat.composer.images.view :as composer-images]
+            [status-im.utils.utils :as utils-old]
+            [status-im.ui2.screens.chat.composer.input :as input]))
+
+(defn send-button
+  [send-ref {:keys [chat-id images]} on-send]
+  [rn/view
+   {:ref   send-ref
+    :style (when-not (or (seq (get @input/input-texts chat-id)) (seq images))
+             {:width 0
+              :right -100})}
+   [quo/button
+    {:icon                true
+     :size                32
+     :accessibility-label :send-message-button
+     :on-press            (fn []
+                            (on-send)
+                            (messages.list/scroll-to-bottom)
+                            (rf/dispatch [:chat.ui/send-current-message]))}
+    :i/arrow-up]])
+
+(defn reactions-button
+  []
+  [not-implemented/not-implemented
+   [quo/button
+    {:icon true
+     :type :outline
+     :size 32} :i/reaction]])
+
+(defn image-button
+  [chat-id]
+  [quo/button
+   {:on-press (fn []
+                (permissions/request-permissions
+                 {:permissions [:read-external-storage :write-external-storage]
+                  :on-allowed  #(rf/dispatch
+                                 [:bottom-sheet/show-sheet
+                                  {:content (fn []
+                                              (photo-selector/photo-selector chat-id))}])
+                  :on-denied   (fn []
+                                 (background-timer/set-timeout
+                                  #(utils-old/show-popup (i18n/label :t/error)
+                                                         (i18n/label
+                                                          :t/external-storage-denied))
+                                  50))}))
+    :icon     true
+    :type     :outline
+    :size     32}
+   :i/image])
+
+(defn view
+  [send-ref params insets chat-id images on-send]
+  [rn/view {:style (style/controls insets)}
+   [composer-images/images-list images]
+   [rn/view {:style {:flex-direction :row :margin-top 12}}
+    [image-button chat-id]
+    [rn/view {:width 12}]
+    [reactions-button]
+    [rn/view {:flex 1}]
+    [send-button send-ref params on-send]]])
@@ -0,0 +1,42 @@
+(ns status-im2.contexts.chat.messages.composer.style
+  (:require [quo2.foundations.colors :as colors]
+            [status-im.utils.platform :as platform]))
+
+(defn input-bottom-sheet
+  [window-height]
+  (merge {:border-top-left-radius  20
+          :border-top-right-radius 20
+          :position                :absolute
+          :left                    0
+          :right                   0
+          :bottom                  (- window-height)
+          :height                  window-height
+          :flex                    1
+          :background-color        (colors/theme-colors colors/white colors/neutral-90)
+          :z-index                 2}
+         (if platform/ios?
+           {:shadow-radius  16
+            :shadow-opacity 1
+            :shadow-color   "rgba(9, 16, 28, 0.04)"
+            :shadow-offset  {:width 0 :height -2}}
+           {:elevation 4})))
+
+(defn bottom-sheet-handle
+  []
+  {:width            32
+   :height           4
+   :background-color (colors/theme-colors colors/neutral-100 colors/white)
+   :opacity          0.05
+   :border-radius    100
+   :align-self       :center
+   :margin-top       8})
+
+(defn bottom-sheet-background
+  [window-height]
+  {:position         :absolute
+   :left             0
+   :right            0
+   :bottom           0
+   :height           window-height
+   :background-color colors/neutral-95-opa-70
+   :z-index          1})
@@ -0,0 +1,250 @@
+(ns status-im2.contexts.chat.messages.composer.view
+  (:require [clojure.string :as string]
+            [oops.core :refer [oget]]
+            [react-native.core :as rn]
+            [react-native.hooks :as hooks]
+            [react-native.gesture :as gesture]
+            [react-native.reanimated :as reanimated]
+            [react-native.background-timer :as background-timer]
+            [utils.re-frame :as rf]
+            [status-im2.contexts.chat.messages.composer.style :as style]
+            [status-im2.contexts.chat.messages.composer.controls.view :as controls]
+            [status-im.ui2.screens.chat.composer.edit.view :as edit]
+            [status-im.ui2.screens.chat.composer.input :as input]
+            [status-im.ui2.screens.chat.composer.mentions :as mentions]
+            [status-im.ui2.screens.chat.composer.reply :as reply]))
+
+(def initial-content-height (atom nil))
+(def keyboard-hiding? (atom false))
+
+(defn minimize
+  [{:keys [min-y set-bg-opacity set-translate-y set-parent-height]}]
+  (set-bg-opacity 0)
+  (set-translate-y (- min-y))
+  (set-parent-height min-y))
+
+(defn maximize
+  [{:keys [max-y set-bg-opacity set-translate-y set-parent-height max-parent-height]}]
+  (set-bg-opacity 1)
+  (set-translate-y (- max-y))
+  (set-parent-height max-parent-height))
+
+(defn clean-and-minimize
+  [{:keys [chat-id refs] :as params}]
+  (input/clear-input chat-id refs)
+  (minimize params))
+
+(def gesture-values (atom {}))
+
+(defn get-bottom-sheet-gesture
+  [{:keys [translate-y refs keyboard-shown min-y max-y] :as params}]
+  (let [{:keys [text-input-ref]} refs]
+    (-> (gesture/gesture-pan)
+        (gesture/on-start
+         (fn [_]
+           (if keyboard-shown
+             (swap! gesture-values assoc :pan-y (reanimated/get-shared-value translate-y))
+             (input/input-focus text-input-ref))))
+        (gesture/on-update
+         (fn [evt]
+           (when keyboard-shown
+             (let [tY (oget evt "translationY")]
+               (swap! gesture-values assoc :dy (- tY (:pdy @gesture-values)))
+               (swap! gesture-values assoc :pdy tY)
+               (reanimated/set-shared-value
+                translate-y
+                (max (min (+ tY (:pan-y @gesture-values)) (- min-y)) (- max-y)))))))
+        (gesture/on-end
+         (fn [_]
+           (when keyboard-shown
+             (if (< (:dy @gesture-values) 0)
+               (maximize params)
+               (do
+                 (reset! keyboard-hiding? true)
+                 (minimize params)
+                 (background-timer/set-timeout #(rf/dispatch [:dismiss-keyboard]) 200)))))))))
+
+(defn update-y
+  [{:keys [max-parent-height set-bg-opacity keyboard-shown max-y set-translate-y set-parent-height
+           min-y chat-id]
+    :as   params}]
+  (let [content-height (get @input/input-text-content-heights chat-id)
+        new-y          (+ min-y
+                          (if (and content-height @initial-content-height)
+                            (- content-height
+                               @initial-content-height)
+                            0))]
+    (if (< new-y max-y)
+      (when keyboard-shown
+        (if (> new-y max-parent-height)
+          (set-bg-opacity 1)
+          (set-bg-opacity 0))
+        (set-translate-y (- new-y))
+        (set-parent-height (min new-y max-parent-height)))
+      (if keyboard-shown
+        (maximize params)
+        (set-bg-opacity 0)))))
+
+(defn get-input-content-change
+  [{:keys [chat-id] :as params}]
+  (fn [evt]
+    (let [new-height (oget evt "nativeEvent.contentSize.height")]
+      (swap! input/input-text-content-heights assoc chat-id new-height)
+      (if @initial-content-height
+        (do
+          ;;on Android when last symbol removed, height value is wrong, like 300px
+          (when (string/blank? (get @input/input-texts chat-id))
+            (swap! input/input-text-content-heights assoc chat-id @initial-content-height))
+          (update-y params))
+        (reset! initial-content-height new-height)))))
+
+(defn mentions
+  [{:keys [refs suggestions max-y]} insets]
+  [:f>
+   (fn []
+     (let [translate-y (reanimated/use-shared-value 0)]
+       (rn/use-effect
+        (fn []
+          (reanimated/set-shared-value translate-y
+                                       (reanimated/with-timing (if (seq suggestions) 0 200)))))
+       [reanimated/view
+        {:style (reanimated/apply-animations-to-style
+                 {:transform [{:translateY translate-y}]}
+                 {:bottom     (or (:bottom insets) 0)
+                  :position   :absolute
+                  :z-index    5
+                  :elevation  5
+                  :max-height (/ max-y 2)})}
+        [mentions/autocomplete-mentions suggestions (:text-input-ref refs)]]))])
+
+(defn effect!
+  [{:keys [keyboard-shown] :as params}]
+  (rn/use-effect
+   (fn []
+     (when (or (not @keyboard-hiding?)
+               (and @keyboard-hiding? (not keyboard-shown)))
+       (reset! keyboard-hiding? false)
+       (if (not keyboard-shown)
+         (minimize params)
+         (update-y params))))))
+
+(defn prepare-params
+  [[refs window-height translate-y bg-opacity bg-bottom min-y max-y parent-height
+    max-parent-height chat-id suggestions reply edit images keyboard-shown]]
+  {:chat-id           chat-id
+   :translate-y       translate-y
+   :min-y             min-y
+   :max-y             max-y
+   :max-parent-height max-parent-height
+   :parent-height     parent-height
+   :suggestions       suggestions
+   :reply             reply
+   :edit              edit
+   :images            images
+   :refs              refs
+   :keyboard-shown    keyboard-shown
+   :bg-opacity        bg-opacity
+   :bg-bottom         bg-bottom
+   :window-height     window-height
+   :set-bg-opacity    (fn [value]
+                        (reanimated/set-shared-value bg-bottom (if (= value 1) 0 (- window-height)))
+                        (reanimated/set-shared-value bg-opacity (reanimated/with-timing value)))
+   :set-translate-y   (fn [value]
+                        (reanimated/set-shared-value translate-y (reanimated/with-timing value)))
+   :set-parent-height (fn [value]
+                        (reanimated/set-shared-value parent-height (reanimated/with-timing value)))})
+
+;; IMPORTANT! PLEASE READ BEFORE MAKING CHANGES
+
+;; 1) insets are not stable so we can't rely on the first values and we have to use it from render
+;; function, so effect will be triggered a few times, for example first time it will be 0 and second
+;; time 38 on ios, and 400 and 0 on Android
+;; 2) for keyboard we use hooks, for some reason it triggers effect a few times with the same values,
+;; also it changes value only when keyboard completely closed or opened, that's why its not visually
+;; smooth, there is a small visible delay between keyboard and sheet animations
+;; 3) when we minimize sheet and hide keyboard in `sheet-gesture` function, keyboard hook triggers
+;; effect and there is a visual glitch when we have more than one line of text, so we use
+;; `keyboard-hiding?` flag
+;; 4) we store input content height in `input/input-text-content-heights` atom , we need it when chat
+;; screen is reopened
+(defn composer
+  [_ _]
+  (let [text-input-ref (rn/create-ref)
+        send-ref       (rn/create-ref)
+        refs           {:send-ref       send-ref
+                        :text-input-ref text-input-ref}]
+    (fn [chat-id insets]
+      [:f>
+       (fn []
+         (let [reply                                    (rf/sub [:chats/reply-message])
+               edit                                     (rf/sub [:chats/edit-message])
+               suggestions                              (rf/sub [:chat/mention-suggestions])
+               images                                   (rf/sub [:chats/sending-image])
+
+               {window-height :height}                  (rn/use-window-dimensions)
+               {:keys [keyboard-shown keyboard-height]} (hooks/use-keyboard)
+               translate-y                              (reanimated/use-shared-value 0)
+               bg-opacity                               (reanimated/use-shared-value 0)
+               bg-bottom                                (reanimated/use-shared-value (- window-height))
+
+               suggestions?                             (and (seq suggestions)
+                                                             keyboard-shown
+                                                             (not @keyboard-hiding?))
+
+               max-y                                    (- window-height
+                                                           (- (if (> keyboard-height 0)
+                                                                keyboard-height
+                                                                360)
+                                                              (:bottom insets))
+                                                           46)
+
+               min-y                                    (+ 108
+                                                           (:bottom insets)
+                                                           (if suggestions?
+                                                             (min (/ max-y 2)
+                                                                  (+ 16
+                                                                     (* 46 (dec (count suggestions)))))
+                                                             (+ 0
+                                                                (when (or edit reply) 38)
+                                                                (when (seq images) 80))))
+
+               parent-height                            (reanimated/use-shared-value min-y)
+               max-parent-height                        (Math/abs (- max-y 110 (:bottom insets)))
+
+               params
+               (prepare-params
+                [refs window-height translate-y bg-opacity bg-bottom min-y max-y parent-height
+                 max-parent-height chat-id suggestions reply edit images keyboard-shown])
+
+               input-content-change                     (get-input-content-change params)
+               bottom-sheet-gesture                     (get-bottom-sheet-gesture params)]
+           (effect! params)
+           [reanimated/view
+            {:style (reanimated/apply-animations-to-style
+                     {:height parent-height}
+                     {})}
+            ;;;;input
+            [gesture/gesture-detector {:gesture bottom-sheet-gesture}
+             [reanimated/view
+              {:style (reanimated/apply-animations-to-style
+                       {:transform [{:translateY translate-y}]}
+                       (style/input-bottom-sheet window-height))}
+              [rn/view {:style (style/bottom-sheet-handle)}]
+              [edit/edit-message-auto-focus-wrapper text-input-ref edit #(clean-and-minimize params)]
+              [reply/reply-message-auto-focus-wrapper text-input-ref reply]
+              [rn/view
+               {:style {:height (- max-y (- min-y 38))}}
+               [input/text-input
+                {:chat-id                chat-id
+                 :on-content-size-change input-content-change
+                 :sending-image          (seq images)
+                 :refs                   refs}]]]]
+            (if suggestions?
+              [mentions params insets]
+              [controls/view send-ref params insets chat-id images #(clean-and-minimize params)])
+            ;;;;black background
+            [reanimated/view
+             {:style (reanimated/apply-animations-to-style
+                      {:opacity   bg-opacity
+                       :transform [{:translateY bg-bottom}]}
+                      (style/bottom-sheet-background window-height))}]]))])))
@@ -6,7 +6,7 @@
            [i18n.i18n :as i18n]
            [status-im2.setup.config :as config]
            [status-im.ui.components.react :as react]
-            [status-im.ui2.screens.chat.components.reply :as components.reply]
+            [status-im.ui2.screens.chat.components.reply.view :as components.reply]
            [status-im2.common.not-implemented :as not-implemented]))

 (defn pin-message
@@ -2,19 +2,19 @@
  (:require [quo2.core :as quo]
            [re-frame.db]
            [react-native.core :as rn]
+            [react-native.safe-area :as safe-area]
            [reagent.core :as reagent]
-            [status-im.ui2.screens.chat.composer.view :as composer]
-            [status-im.ui2.screens.chat.pin-limit-popover.view :as pin-limit-popover]
+            [status-im2.contexts.chat.messages.composer.view :as composer]
            [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.contexts.chat.messages.pin.banner.view :as pin.banner]
            [status-im2.navigation.state :as navigation.state]
+            [status-im2.common.not-implemented :as not-implemented]
            [utils.debounce :as debounce]
            [utils.re-frame :as rf]
-            [status-im2.common.not-implemented :as not-implemented]
-            [quo2.foundations.colors :as colors]))
+            [status-im.ui2.screens.chat.pin-limit-popover.view :as pin-limit-popover]))

 (defn navigate-back-handler
  []
@@ -64,30 +64,25 @@

 (defn chat-render
  []
-  (let [{:keys [chat-id
-                contact-request-state
-                show-input?]
-         :as   chat}
+  (let [;;NOTE: we want to react only on these fields, do not use full chat map here
+        {: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%"}}
+    [safe-area/consumer
+     (fn [insets]
+       [rn/keyboard-avoiding-view
+        {:style                  {:position :relative :flex 1}
+         :keyboardVerticalOffset (- (:bottom insets))}
+        [page-nav]
+        [pin.banner/banner chat-id]
+        [not-implemented/not-implemented
+         [pin-limit-popover/pin-limit-popover chat-id]]
+        [messages.list/messages-list {:chat chat :show-input? show-input?}]
+        (cond (and (not show-input?)
+                   contact-request-state)
+              [contact-requests.bottom-drawer/view chat-id contact-request-state]

-      [pin.banner/banner chat-id]
-      [not-implemented/not-implemented
-       [pin-limit-popover/pin-limit-popover chat-id]]]
-     [page-nav]
-     [messages.list/messages-list {:chat chat :show-input? show-input?}]
-     (cond (and (not show-input?)
-                contact-request-state)
-           [contact-requests.bottom-drawer/view chat-id contact-request-state]
-
-           show-input?
-           [composer/composer chat-id])]))
+              show-input?
+              [composer/composer chat-id insets])])]))

 (defn chat
  []
@@ -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,113 +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
-  [id]
-  (let [community (rf/sub [:communities/community id])]
-    [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
@@ -19,7 +18,7 @@
      :on-long-press #(rf/dispatch
                       [:bottom-sheet/show-sheet
                        {:content       (fn []
-                                          [home.actions/actions id])
+                                          [options/community-options-bottom-sheet id])
                         :selected-item (fn []
                                          [quo/communities-membership-list-item {} community-item])}])}
     community-item]))
@@ -86,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))
@@ -4,13 +4,14 @@
            [quo2.core :as quo]
            [quo2.foundations.colors :as colors]
            [react-native.core :as rn]
+            [react-native.blur :as blur]
            [react-native.platform :as platform]
            [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 +189,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
@@ -307,7 +308,7 @@
  [channel-heights first-channel-height]
  (fn [scroll-height]
    (when (> scroll-height @first-channel-height)
-      [rn/blur-view
+      [blur/view
       {:blur-amount   32
        :blur-type     :xlight
        :overlay-color (if platform/ios? colors/white-opa-70 :transparent)
@@ -319,7 +320,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 +330,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))
@@ -4,8 +4,8 @@
            [react-native.reanimated :as reanimated]
            [reagent.core :as reagent]
            [status-im.async-storage.core :as async-storage]
-            [status-im2.contexts.shell.constants :as shell.constants] ;;TODO remove when not used anymore
-  ))
+            [status-im2.contexts.shell.constants :as shell.constants])) ;;TODO remove when not used anymore
+

 ;; Atoms
 (def selected-stack-id (atom nil))
@@ -0,0 +1,3 @@
+(ns status-im2.core-spec
+  (:require
+   [status-im2.contexts.communities.menus.community-options.component-spec]))
@@ -1,6 +1,5 @@
 (ns status-im2.navigation.view
-  (:require [oops.core :refer [oget]]
-            [quo2.foundations.colors :as colors]
+  (:require [quo2.foundations.colors :as colors]
            [re-frame.core :as re-frame]
            [react-native.core :as rn]
            [react-native.safe-area :as safe-area]
@@ -38,19 +37,14 @@
   (concat screens/components)))

 (defn wrapped-screen-style
-  [{:keys [insets style]} insets-obj]
+  [screen-insets safe-insets]
  (merge
   {:flex             1
    :background-color (colors/theme-colors colors/white colors/neutral-100)}
-   style
-   (when (get insets :bottom)
-     {:padding-bottom (+ (oget insets-obj "bottom")
-                         (get style :padding-bottom)
-                         (get style :padding-vertical))})
-   (when (get insets :top true)
-     {:padding-top (+ (oget insets-obj "top")
-                      (get style :padding-top)
-                      (get style :padding-vertical))})))
+   (when (get screen-insets :bottom)
+     {:padding-bottom (:bottom safe-insets)})
+   (when (get screen-insets :top true)
+     {:padding-top (:top safe-insets)})))

 (defn inactive
  []
@@ -75,16 +69,13 @@
                                         screens)
                                       (keyword key))]
       ^{:key (str "root" key @reloader/cnt)}
-       [safe-area/safe-area-provider
-        [safe-area/safe-area-consumer
+       [safe-area/provider
+        [safe-area/consumer
         (fn [safe-insets]
-           (reagent/as-element
-            [rn/view
-             {:style (wrapped-screen-style
-                      {:insets insets}
-                      safe-insets)}
-             [inactive]
-             [component]]))]
+           [rn/view
+            {:style (wrapped-screen-style insets safe-insets)}
+            [inactive]
+            [component]])]
        (when js/goog.DEBUG
          [reloader/reload-view])]))))

@@ -99,7 +90,7 @@
  (reagent/reactify-component
   (fn []
     ^{:key (str "popover" @reloader/cnt)}
-     [safe-area/safe-area-provider
+     [safe-area/provider
      [inactive]
      [popover/popover]
      (when js/goog.DEBUG
@@ -116,7 +107,7 @@
  (reagent/reactify-component
   (fn []
     ^{:key (str "visibility-status-popover" @reloader/cnt)}
-     [safe-area/safe-area-provider
+     [safe-area/provider
      [inactive]
      [visibility-status-views/visibility-status-popover]
      (when js/goog.DEBUG
@@ -126,7 +117,7 @@
  (reagent/reactify-component
   (fn []
     ^{:key (str "sheet" @reloader/cnt)}
-     [safe-area/safe-area-provider
+     [safe-area/provider
      [inactive]
      [bottom-sheets/bottom-sheet]
      (when js/goog.DEBUG
@@ -138,7 +129,7 @@
  (reagent/reactify-component
   (fn []
     ^{:key (str "signing-sheet" @reloader/cnt)}
-     [safe-area/safe-area-provider
+     [safe-area/provider
      [inactive]
      [signing/signing]
      (when js/goog.DEBUG
@@ -148,7 +139,7 @@
  (reagent/reactify-component
   (fn []
     ^{:key (str "select-acc-sheet" @reloader/cnt)}
-     [safe-area/safe-area-provider
+     [safe-area/provider
      [inactive]
      [wallet.send.views/select-account]
      (when js/goog.DEBUG
@@ -158,7 +149,7 @@
  (reagent/reactify-component
   (fn []
     ^{:key (str "wallet-connect-sheet" @reloader/cnt)}
-     [safe-area/safe-area-provider
+     [safe-area/provider
      [inactive]
      [wallet-connect/wallet-connect-proposal-sheet]
      (when js/goog.DEBUG
@@ -168,7 +159,7 @@
  (reagent/reactify-component
   (fn []
     ^{:key (str "wallet-connect-success-sheet" @reloader/cnt)}
-     [safe-area/safe-area-provider
+     [safe-area/provider
      [inactive]
      [wallet-connect/wallet-connect-success-sheet-view]
      (when js/goog.DEBUG
@@ -178,7 +169,7 @@
  (reagent/reactify-component
   (fn []
     ^{:key (str "wallet-connect-app-management-sheet" @reloader/cnt)}
-     [safe-area/safe-area-provider
+     [safe-area/provider
      [inactive]
      [wallet-connect/wallet-connect-app-management-sheet-view]
      (when js/goog.DEBUG
@@ -132,7 +132,7 @@
   (get chats current-chat-id)))

 (re-frame/reg-sub
- :chats/current-chat-inputs
+ :chats/current-chat-input
 :<- [:chats/current-chat-id]
 :<- [:chat/inputs]
 (fn [[chat-id inputs]]
@@ -285,19 +285,19 @@

 (re-frame/reg-sub
 :chats/reply-message
- :<- [:chats/current-chat-inputs]
+ :<- [:chats/current-chat-input]
 (fn [{:keys [metadata]}]
   (:responding-to-message metadata)))

 (re-frame/reg-sub
 :chats/edit-message
- :<- [:chats/current-chat-inputs]
+ :<- [:chats/current-chat-input]
 (fn [{:keys [metadata]}]
   (:editing-message metadata)))

 (re-frame/reg-sub
 :chats/sending-contact-request
- :<- [:chats/current-chat-inputs]
+ :<- [:chats/current-chat-input]
 (fn [{:keys [metadata]}]
   (:sending-contact-request metadata)))

@@ -21,6 +21,12 @@
  [test-id]
  (rtl/screen.getByTestId (name test-id)))

+(defn get-by-text
+  [text]
+  (rtl/screen.getByText text))
+
 (defn get-by-label-text
  [label]
  (rtl/screen.getByLabelText (name label)))
+
+(defn expect [match] (js/expect match))
@@ -3,7 +3,7 @@
    "_comment": "Instead use: scripts/update-status-go.sh <rev>",
    "owner": "status-im",
    "repo": "status-go",
-    "version": "v0.117.3",
-    "commit-sha1": "d40290a649133eb7b7f450b5c5b74eec28ba232d",
-    "src-sha256": "140j0gbp8nxzncya9mcpvlxnax5ajfl8c32ih20b29n8j525gw66"
+    "version": "gowaku-discv5",
+    "commit-sha1": "131c55610d555c777caad71d8732e4cbcc5136ca",
+    "src-sha256": "0akvabk322rdwi7s7063qf9q60nsc9wfqj3j7pxasnmy5brpmplz"
 }
@@ -1,5 +1,6 @@
 var Mocks = require('../target/mocks/mocks.js');
 var Module = require('module');
+process.env.TZ = 'Etc/UTC'

 const originalLoader = Module._load;

@@ -84,18 +84,10 @@ class BaseTestReport:
        tests = self.get_all_tests()
        failed = list()
        for test in tests:
-            if not self.is_test_successful(test) and not self.is_test_xfailed(test):
+            if not self.is_test_successful(test):
                failed.append(test)
        return failed

-    def get_xfailed_tests(self):
-        tests = self.get_all_tests()
-        xfailed = list()
-        for test in tests:
-            if self.is_test_xfailed(test) and not self.is_test_successful(test):
-                xfailed.append(test)
-        return xfailed
-
    def get_passed_tests(self):
        tests = self.get_all_tests()
        passed = list()
@@ -134,11 +126,6 @@ class BaseTestReport:
        # Test passed if last testrun has passed
        return test.testruns[-1].error is None

-    @staticmethod
-    def is_test_xfailed(test):
-    # Test failed if xfail is defined
-        return test.testruns[-1].xfail != ""
-
    @staticmethod
    def separate_xfail_error(error):
        issue_id_list = re.findall(r'#\d+', error)
@@ -21,7 +21,6 @@ class GithubHtmlReport(BaseTestReport):
        tests = self.get_all_tests()
        passed_tests = self.get_passed_tests()
        failed_tests = self.get_failed_tests()
-        xfailed_tests = self.get_xfailed_tests()
        not_executed_tests = TestrailReport().get_not_executed_tests(run_id)

        if len(tests) > 0:
@@ -33,7 +32,9 @@ class GithubHtmlReport(BaseTestReport):
            if not_executed_tests:
                summary_html += "Not executed tests: %d\n" % len(not_executed_tests)
            summary_html += "```\n"
-            failed_tests_html, xfailed_tests_html, passed_tests_html, not_executed_tests_html = str(), str(), str(), str()
+            not_executed_tests_html = str()
+            failed_tests_html = str()
+            passed_tests_html = str()
            if not_executed_tests:
                not_executed_tests_html = self.build_tests_table_html(not_executed_tests, run_id,
                                                                      not_executed_tests=True)
@@ -43,26 +44,19 @@ class GithubHtmlReport(BaseTestReport):
            if failed_tests:
                failed_tests_html = self.build_tests_table_html(failed_tests, run_id, failed_tests=True)
                summary_html += "```\n"
-                summary_html += 'IDs of failed tests(should be reviewed): %s \n' % self.list_of_failed_testrail_ids(failed_tests)
-                summary_html += "```\n"
-            if xfailed_tests:
-                xfailed_tests_html = self.build_tests_table_html(xfailed_tests, run_id, failed_tests=False, xfailed_tests=True)
-                summary_html += "```\n"
-                summary_html += 'IDs of failed tests(existing issues): %s \n' % self.list_of_failed_testrail_ids(xfailed_tests)
+                summary_html += 'IDs of failed tests: %s \n' % self.list_of_failed_testrail_ids(failed_tests)
                summary_html += "```\n"
            if passed_tests:
                passed_tests_html = self.build_tests_table_html(passed_tests, run_id, failed_tests=False)
-            return title_html + summary_html + not_executed_tests_html + failed_tests_html + passed_tests_html + xfailed_tests_html
+            return title_html + summary_html + not_executed_tests_html + failed_tests_html + passed_tests_html
        else:
            return None

-    def build_tests_table_html(self, tests, run_id, failed_tests=False, not_executed_tests=False, xfailed_tests=False):
+    def build_tests_table_html(self, tests, run_id, failed_tests=False, not_executed_tests=False):
        if failed_tests:
-            tests_type = "Failed tests (for review)"
+            tests_type = "Failed tests"
        elif not_executed_tests:
            tests_type = "Not executed tests"
-        elif xfailed_tests:
-            tests_type = "Failed tests (known)"
        else:
            tests_type = "Passed tests"
        html = "<h3>%s (%d)</h3>" % (tests_type, len(tests))
@@ -28,8 +28,7 @@ class TestrailReport(BaseTestReport):

        self.outcomes = {
            'passed': 1,
-            'undefined_fail': 10,
-            'fail': 5}
+            'undefined_fail': 10}

        self.headers = dict()
        self.headers['Authorization'] = 'Basic %s' % str(
@@ -182,7 +181,6 @@ class TestrailReport(BaseTestReport):
            test_steps = "# Steps: \n"
            devices = str()
            last_testrun = test.testruns[-1]
-            status = self.outcomes['passed']
            for step in last_testrun.steps:
                test_steps += step + "\n"
            for i, device in enumerate(last_testrun.jobs):
@@ -194,12 +192,7 @@ class TestrailReport(BaseTestReport):
            comment = str()
            if test.group_name:
                comment += "# Class: %s \n" % test.group_name
-            if last_testrun.error and not last_testrun.xfail:
-                status = self.outcomes['fail']
-                error = last_testrun.error
-                comment += '%s' % ('# Error: \n %s \n' % emoji.demojize(error)) + devices + test_steps
-            elif last_testrun.error and last_testrun.xfail:
-                status = self.outcomes['undefined_fail']
+            if last_testrun.error:
                full_error = last_testrun.error
                (code_error, no_code_error_str, issue_id) = self.separate_xfail_error(full_error)
                if issue_id:
@@ -213,7 +206,7 @@ class TestrailReport(BaseTestReport):
                comment += devices + test_steps
            data.append(
                {'case_id': test.testrail_case_id,
-                 'status_id': status,
+                 'status_id': self.outcomes['undefined_fail'] if last_testrun.error else self.outcomes['passed'],
                 'comment': comment})

        results = self.post('add_results_for_cases/%s' % self.run_id, data={"results": data})
@@ -246,77 +239,58 @@ class TestrailReport(BaseTestReport):

        self.change_test_run_description()

-    def make_single_group_report(self, tests, xfailed=False):
-        single_devices_block, group_blocks, case_info, test_ids = str(), dict(), str(), []
-        for test in tests:
-            if test.group_name:
-                group_blocks[test.group_name] = "\n-------\n## Class: %s:\n" % test.group_name
-        for test in tests:
-            last_testrun = test.testruns[-1]
-            test_rail_link = self.get_test_result_link(self.run_id, test.testrail_case_id)
-            test_ids.append(test.testrail_case_id)
-            case_title = '\n'
-            case_title += '-------\n'
-            case_title += "### ID %s: [%s](%s) \n" % (test.testrail_case_id, test.name, test_rail_link)
-            if xfailed:
-                full_error = last_testrun.error[-255:]
-                (code_error, no_code_error_str, issue_id) = self.separate_xfail_error(full_error)
-                if issue_id:
-                    test_rail_xfail = self.make_error_with_gh_issue_link(no_code_error_str, issue_id)
-                    error = "```%s```\n **%s**  \n" % (code_error, test_rail_xfail)
-                else:
-                    error = "```%s```\n **%s**  \n" % (code_error, no_code_error_str)
-            else:
-                error = last_testrun.error[-255:]
-            for job_id, f in last_testrun.jobs.items():
-                if last_testrun.first_commands:
-                    job_url = self.get_sauce_job_url(job_id=job_id,
-                                                     first_command=last_testrun.first_commands[job_id])
-                else:
-                    job_url = self.get_sauce_job_url(job_id=job_id)
-                case_info = "Logs for device %d: [steps](%s), [failure screenshot](%s)" \
-                            % (f, job_url, self.get_sauce_final_screenshot_url(job_id))
-
-            if test.group_name:
-                group_blocks[test.group_name] += case_title + error + case_info
-            else:
-                single_devices_block += case_title + error + case_info
-        description = single_devices_block + ''.join([i for i in group_blocks.values()])
-        return description, test_ids
-
    def change_test_run_description(self):
        tests = self.get_all_tests()
        passed_tests = self.get_passed_tests()
        failed_tests = self.get_failed_tests()
-        xfailed_tests = self.get_xfailed_tests()
        not_executed_tests = self.get_not_executed_tests(self.run_id)
        final_description = "Nothing to report this time..."
        if len(tests) > 0:
-            description = ""
            description_title = "# %.0f%% of end-end tests have passed\n" % (len(passed_tests) / len(tests) * 100)
            description_title += "\n"
            description_title += "Total executed tests: %d\n" % len(tests)
-            description_title += "Undefined failed tests: %d\n" % len(failed_tests)
-            description_title += "Failed tests: %d\n" % len(xfailed_tests)
+            description_title += "Failed tests: %d\n" % len(failed_tests)
            description_title += "Passed tests: %d\n" % len(passed_tests)
            if not_executed_tests:
                description_title += "Not executed tests: %d\n" % len(not_executed_tests)
            description_title += "\n"
+            ids_failed_test = []
+            single_devices_block, group_blocks, case_info = str(), dict(), str()
            if failed_tests:
-                description += "\n"
-                description += "## Undefined failed tests:"
-                failed_description, ids_failed_test = self.make_single_group_report(failed_tests)
-                description += failed_description
-                description_title += "## Undefined failed tests: %s\n" % ','.join([str(i) for i in ids_failed_test])
-            if xfailed_tests:
-                description += "\n"
-                description += "## Failed tests (due to known issues):"
-                xfailed_description, id_xfailed_tests = self.make_single_group_report(xfailed_tests, xfailed=True)
-                description += xfailed_description
-                description_title += "## Failed tests: %s\n" % ','.join([str(i) for i in id_xfailed_tests])
+                for test in failed_tests:
+                    if test.group_name:
+                        group_blocks[test.group_name] = "\n-------\n## Class: %s:\n" % test.group_name
+                for test in failed_tests:
+                    last_testrun = test.testruns[-1]
+                    test_rail_link = self.get_test_result_link(self.run_id, test.testrail_case_id)
+                    ids_failed_test.append(test.testrail_case_id)
+                    case_title = '\n'
+                    case_title += '-------\n'
+                    case_title += "### ID %s: [%s](%s) \n" % (test.testrail_case_id, test.name, test_rail_link)
+                    full_error = last_testrun.error[-255:]
+                    (code_error, no_code_error_str, issue_id) = self.separate_xfail_error(full_error)
+                    if issue_id:
+                        test_rail_xfail = self.make_error_with_gh_issue_link(no_code_error_str, issue_id)
+                        error = "```%s```\n **%s**  \n" % (code_error, test_rail_xfail)
+                    else:
+                        error = "```%s```\n **%s**  \n" % (code_error, no_code_error_str)
+                    for job_id, f in last_testrun.jobs.items():
+                        if last_testrun.first_commands:
+                            job_url = self.get_sauce_job_url(job_id=job_id,
+                                                             first_command=last_testrun.first_commands[job_id])
+                        else:
+                            job_url = self.get_sauce_job_url(job_id=job_id)
+                        case_info = "Logs for device %d: [steps](%s), [failure screenshot](%s)" \
+                                    % (f, job_url, self.get_sauce_final_screenshot_url(job_id))
+
+                    if test.group_name:
+                        group_blocks[test.group_name] += case_title + error + case_info
+                    else:
+                        single_devices_block += case_title + error + case_info
+                description_title += '## Failed tests: %s \n' % ','.join(map(str, ids_failed_test))
            if not_executed_tests:
                description_title += "## Not executed tests: %s\n" % ','.join([str(i) for i in not_executed_tests])
-            final_description = description_title + description
+            final_description = description_title + single_devices_block + ''.join([i for i in group_blocks.values()])

        request_body = {'description': final_description}
        return self.post('update_run/%s' % self.run_id, request_body)
@@ -230,7 +230,6 @@ def pytest_runtest_makereport(item, call):

    is_sauce_env = item.config.getoption('env') == 'sauce'
    case_ids_set = item.config.getoption("run_testrail_ids")
-    in_run = str([mark.args[0] for mark in item.iter_markers(name='testrail_id')][0]) in str(case_ids_set)

    def catch_error():
        error = report.longreprtext
@@ -244,7 +243,7 @@ def pytest_runtest_makereport(item, call):
        is_group = "xdist_group" in item.keywords._markers or "xdist_group" in item.parent.keywords._markers
        error_intro, error = 'Test setup failed:', ''
        final_error = '%s %s' % (error_intro, error)
-        if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and in_run):
+        if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and (str([mark.args[0] for mark in item.iter_markers(name='testrail_id')][0]) in str(case_ids_set))):
            if '[NOTRUN]' in report.wasxfail:
                test_suite_data.set_current_test(item.name, testrail_case_id=get_testrail_case_id(item))
                test_suite_data.current_test.create_new_testrun()
@@ -276,7 +275,7 @@ def pytest_runtest_makereport(item, call):
        error = catch_error()
        if report.failed:
            current_test.testruns[-1].error = error
-        if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and in_run):
+        if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and (str([mark.args[0] for mark in item.iter_markers(name='testrail_id')][0]) in str(case_ids_set))):
            current_test.testruns[-1].xfail = report.wasxfail
            if error:
                current_test.testruns[-1].error = '%s [[%s]]' % (error, report.wasxfail)
@@ -1245,14 +1245,14 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
        self.profile_1.just_fyi("Sending contact request via Profile > Contacts")
        self.profile_1.click_system_back_button_until_element_is_shown(self.profile_1.contacts_button)
        self.profile_1.add_contact_via_contacts_list(self.public_key_2)
-        self.chat_1 = self.profile_1.open_contact_from_profile(self.default_username_2)

        self.home_2.just_fyi("Accepting contact request from activity centre")
        self.home_2.chats_tab.click()
        self.home_2.handle_contact_request(self.default_username_1)

        self.profile_1.just_fyi("Sending message to contact via Profile > Contacts > Send message")
-        self.chat_1.profile_send_message.click()
+        self.home_1.chats_tab.click()
+        self.chat_1 = self.home_1.get_chat(self.default_username_2).click()
        self.chat_1.send_message('hey')
        self.home_2.click_system_back_button_until_element_is_shown()
        self.chat_2 = self.home_2.get_chat(self.default_username_1).click()
@@ -232,12 +232,6 @@ class TestActivityCenterMultipleDevicePR(MultipleSharedDeviceTestCase):
            if indicator.is_element_displayed():
                self.errors.append("Unread indicator on contacts tab or on activity center is shown after declining contact request!")

-        self.device_1.just_fyi("Device 2: remove device1 from Contact list")
-        self.home_2.contacts_tab.click()
-        self.home_2.contact_details(self.default_username_1).click()
-        self.home_2.element_by_translation_id("remove-from-contacts").click()
-        if not self.home_2.element_by_translation_id("no-contacts").is_element_displayed(30):
-            self.errors.append("Contact was not removed from contact list")
        self.errors.verify_no_errors()

    @marks.testrail_id(702851)
@@ -316,4 +310,5 @@ class TestActivityCenterMultipleDevicePR(MultipleSharedDeviceTestCase):
        #     self.home_1.driver.fail("No PN for mention in community!")
        # if not self.channel_1.chat_element_by_text(group_chat_message).is_element_displayed(20):
        #     self.errors.append("No redirect to channel after tap on PN with mention!")
+
        self.errors.verify_no_errors()
@@ -7,9 +7,12 @@ module.exports = {
    ],
    "testPathIgnorePatterns": [
    ],
+    "moduleNameMapper": {
+        '^[@./a-zA-Z0-9$_-]+\\.(png|jpg|jpeg|gif)$': '<rootDir>/../node_modules/react-native/Libraries/Image/RelativeImageStub'
+      },
    "testTimeout": 60000,
    "transformIgnorePatterns": [
-        "/node_modules/(?!(@react-native|react-native-image-crop-picker|@react-native-community|react-native-linear-gradient|react-native-background-timer|react-native|rn-emoji-keyboard|react-native-languages|react-native-shake|react-native-reanimated)/).*/"
+        "/node_modules/(?!(@react-native|react-native-haptic-feedback|react-native-redash|react-native-image-crop-picker|@react-native-community|react-native-linear-gradient|react-native-background-timer|react-native|rn-emoji-keyboard|react-native-languages|react-native-shake|react-native-reanimated)/).*/"
    ],
    "globals": {
        "__TEST__": true
@@ -17,6 +20,7 @@ module.exports = {
    "testEnvironment": "node",
    rootDir: "../../component-spec",
    testMatch: [
-        "**/*__tests__*"
+        "**/*__tests__*",
+         "**/*.component_spec.js"
    ]
-}
+}
@@ -29,7 +29,10 @@ jest.mock('react-native-languages', () => ({
        language: 'en',
        languages: ['en'],
    },
-    default: {},
+    default: {
+        language: 'en',
+        locale: 'en'
+    },
 }));

 NativeModules.ReactLocalization = {
@@ -124,6 +124,7 @@
    "can-not-add-yourself": "That's you, to start a chat choose someone else",
    "cancel": "Cancel",
    "cancel-keycard-setup": "Cancel Keycard setup",
+    "cancel-request-to-join": "Cancel request to join",
    "cannot-read-card": "Can't read card.\nPlease hold it to the back of your phone",
    "cannot-use-default-pin": "Passcode 000000 is not allowed.\nPlease use another number",
    "card-is-blank": "This card is blank",
@@ -1372,6 +1373,7 @@
    "view-details": "View Details",
    "view-signing": "View signing phrase",
    "view-superrare": "View in SuperRare",
+    "view-token-gating": "View token gating",
    "vote-to-feature": "Vote to feature this community",
    "waiting-for-wifi": "No Wi-fi, message syncing disabled.",
    "waiting-for-wifi-change": "Settings",
@@ -1937,5 +1939,7 @@
    "selected-count-from-max": "{{selected}}/{{max}}",
    "online": "Online",
    "contact-request-chat-pending": "Your contact request is pending",
-    "contact-request-chat-add": "Add {{name}} to send a message"
+    "contact-request-chat-add": "Add {{name}} to send a message",
+    "join-request": "Join request",
+    "wants-to-join": "wants to join"
 }
Author	SHA1	Message	Date
Roman Volosovskyi	17cf116993	test discv5 restart	2023-01-18 10:47:42 +01:00
Icaro Motta	9a60fc1600	Fix all type hint warnings (#14810 )	2023-01-17 19:52:12 -03:00
Andrea Maria Piana	14c9a7c6ac	[Fixes: #14777 ] Set dns nameserver to cloudflare	2023-01-17 09:22:48 +00:00
flexsurfer	685c95591c	refactor and move composer to status-im2 (#14758 ) refactor and move composer to status-im2	2023-01-16 17:20:10 +01:00
Siddarth Kumar	d6c899be3d	make sure nodejs uses a fixed timezone (#14793 ) * make sure node uses the UTC timezone we have a few timebomb tests in the codebase that would break and making sure node specifies a timezone fixes them.	2023-01-16 16:34:15 +05:30
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