updates

https://github.com/status-im/status-go/compare/684e9654...85938668

.babelrc

@@ -1,8 +0,0 @@
-{
-  "presets": [
-    "module:metro-react-native-babel-preset"
-  ],
-  "plugins": [
-    "react-native-reanimated/plugin"
-  ]
-}

.carve_ignore

@@ -200,7 +200,7 @@ status-im.utils.platform/isMacOs?
 status-im.utils.platform/isNix?
 status-im.utils.platform/isWin?
 status-im.utils.platform/android-version>=
-status-im.utils.debounce/clear-all
+utils.debounce/clear-all
 status-im.transport.db/create-chat
 status-im.utils.priority-map/priority-map
 status-im.utils.priority-map/priority-map-by

.clj-kondo/config.edn

@@ -1,14 +1,20 @@
-{:lint-as {status-im.utils.views/defview  clojure.core/defn
-           status-im.utils.views/letsubs  clojure.core/let
-           reagent.core/with-let          clojure.core/let
-           status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
-           utils.re-frame/defn            clj-kondo.lint-as/def-catch-all
-           quo.react/with-deps-check      clojure.core/fn
-           quo.previews.preview/list-comp clojure.core/for
-           status-im.utils.styles/def     clojure.core/def
-           status-im.utils.styles/defn    clojure.core/defn
-           taoensso.tufte/defnp           clojure.core/defn}
- :linters {:invalid-arity     {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
-           ;;TODO remove number when this is fixed
-           ;;https://github.com/borkdude/clj-kondo/issues/867
-           :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY number]}}}
+{:lint-as {status-im.utils.views/defview      clojure.core/defn
+           status-im.utils.views/letsubs      clojure.core/let
+           reagent.core/with-let              clojure.core/let
+           status-im.utils.fx/defn            clj-kondo.lint-as/def-catch-all
+           utils.re-frame/defn                clj-kondo.lint-as/def-catch-all
+           quo.react/with-deps-check          clojure.core/fn
+           quo.previews.preview/list-comp     clojure.core/for
+           status-im.utils.styles/def         clojure.core/def
+           status-im.utils.styles/defn        clojure.core/defn
+           status-im.test-helpers/deftest-sub clojure.core/defn
+           taoensso.tufte/defnp               clojure.core/defn}
+ :linters {:consistent-alias  {:level   :error
+                               :aliases {clojure.string  string
+                                         taoensso.timbre log}}
+           :invalid-arity     {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
+           ;; TODO remove number when this is fixed
+           ;; https://github.com/borkdude/clj-kondo/issues/867
+           :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY
+                                         number
+                                         status-im.test-helpers/restore-app-db]}}}

.env

@@ -4,7 +4,7 @@ DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1

.env.e2e

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.staging
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0

.env.jenkins

@@ -3,7 +3,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1

.env.nightly

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1

.env.release

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1

.gitignore

@@ -7,6 +7,7 @@
 
 # Xcode
 #
+/component-spec
 result/
 build/
 *.pbxuser
@@ -177,4 +178,9 @@ test/appium/tests/users.py
 /lib/
 
 ## visual tests
-/artifacts
+/artifacts
+
+/.calva/
+
+## component-tests
+*.log

Makefile

@@ -307,7 +307,7 @@ test-watch: ##@ Watch tests and re-run no changes to cljs files
 
 test: export TARGET := clojure
 test: ##@test Run tests once in NodeJS
-	# Here we creates the gyp bindings for nodejs
+	# Here we create the gyp bindings for nodejs
 	yarn install
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
@@ -316,14 +316,27 @@ test: ##@test Run tests once in NodeJS
 
 run-visual-test-ios: export TARGET := clojure
 run-visual-test-ios: XCODE_DERIVED_DATA := $(HOME)/Library/Developer/Xcode/DerivedData
-run-visual-test-ios: APPLICATION_NAME := $(shell ls $(XCODE_DERIVED_DATA) | grep -E '\bStatusIm-')
+run-visual-test-ios: APPLICATION_NAME := StatusIm-brfnruzfrkkycpbndmdoeyrigthc
 run-visual-test-ios: export TEST_BINARY_PATH := $(XCODE_DERIVED_DATA)/$(APPLICATION_NAME)/Build/Products/Debug-iphonesimulator/StatusIm.app
 run-visual-test-ios: ##@test Run tests once in NodeJS
+	detox test --configuration ios.sim.debug
+
+component-test-watch: export TARGET := clojure
+component-test-watch: export COMPONENT_TEST := true
+component-test-watch: export BABEL_ENV := test
+component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	yarn install
-	detox build --configuration ios.sim.debug && \
-	detox test --configuration ios.sim.debug 
+	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js' -e cljs
+
+component-test: export TARGET := clojure
+component-test: export COMPONENT_TEST := true
+component-test: export BABEL_ENV := test
+component-test: ##@test Run tests once in NodeJS
+	# Here we create the gyp bindings for nodejs
+	yarn install
+	yarn shadow-cljs compile component-test && \
+	jest --config=test/jest/jest.config.js
 
-#--------------
 # Other
 #--------------
 

babel.config.js

@@ -0,0 +1,24 @@
+module.exports = {
+
+    "presets": [
+        "module:metro-react-native-babel-preset"
+    ],
+    "plugins": [
+        "react-native-reanimated/plugin"
+    ],
+    "env": {
+        "test": {
+            "presets": [
+                '@babel/preset-react',
+                [
+                    '@babel/preset-env',
+                    {
+                        targets: {
+                            node: '14',
+                        },
+                    },
+                ],
+            ],
+        }
+    }
+}

ci/Jenkinsfile.android

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.1'
+library 'status-jenkins-lib@v1.6.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -36,7 +36,7 @@ pipeline {
     LANG     = "en_US.UTF-8"
     LC_ALL   = "en_US.UTF-8"
     LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'android'
+    TARGET   = "android${utils.isE2EBuild() ? "-e2e" : ""}"
     BUILD_ENV = 'prod'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1

ci/Jenkinsfile.combined

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

ci/Jenkinsfile.ios

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.1'
+library 'status-jenkins-lib@v1.6.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.nix-cache

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.1'
+library 'status-jenkins-lib@v1.6.3'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/Jenkinsfile.tests

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.1'
+library 'status-jenkins-lib@v1.6.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-prs

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.1'
+library 'status-jenkins-lib@v1.6.3'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.playstore-meta

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

doc/STARTING_GUIDE.md

@@ -93,6 +93,6 @@ To use a physical iPhone your device UDID must be added to provisioning profiles
   - Invite your Apple account to be Developer in Status team.
 3. Run a build in XCode using the project from `status-mobile/ios` directory.
   - You might see error: `Select a development team in the Signing & Capabilities editor`
-  - Select `STATUS HOLDINGS PTE. LTD.` as the development team and rebuild again.
+  - Select `Status Research & Development GmbH` as the development team and rebuild again.
 
 Once build finishes Status should start on your iPhone with its logs in terminal running `make run-metro`.

doc/new-guidelines.md

@@ -62,6 +62,31 @@ with the source file using it. For a real example, see
     (do-something)]])
 ```
 
+#### Styles def vs defn
+
+Always use `def` over `defn`, unless the style relies on dynamic values, such as
+deref'ed atoms.
+
+```clojure
+;; bad
+(defn title-column []
+  {:height 56})
+
+;; good
+(def title-column
+  {:height 56})
+```
+
+```clojure
+;; bad
+(def community-card
+  {:background-color (colors/theme-colors colors/white colors/neutral-90)})
+
+;; good
+(defn community-card []
+  {:background-color (colors/theme-colors colors/white colors/neutral-90)})
+```
+
 ### Using TODOs comments
 
 _TODO_ comments are used extensively in the codebase, but prefer to use them
@@ -249,6 +274,22 @@ test macros `deftest` and `is`, which are ubiquitous in the Clojure community.
   (:require [cljs-time.coerce :as time.coerce]))
 ```
 
+### Javascript interop
+
+Use [binaryage/oops](https://github.com/binaryage/cljs-oops) macros instead of
+core interop macros.
+
+```clojure
+;; bad
+(fn [^js event]
+  (.-width (.-nativeEvent event)))
+
+;; good
+(require '[oops.core :as  oops])
+(fn [event]
+  (oops/oget event "nativeEvent.width"))
+```
+
 ### Accessibility labels
 
 Use keywords instead of strings. As a bonus, remember keywords are cached in
@@ -296,6 +337,53 @@ keywords and concatenating them into a single string.
 (i18n/label :t/biometric-auth-error {:code error-code})
 ```
 
+### Tests
+#### Subscription tests
+
+Test [layer-3 subscriptions](https://day8.github.io/re-frame/subscriptions/) by
+actually subscribing to them, so reframe's signal graph gets validated too.
+
+```clojure
+;; bad
+(defn user-recipes
+  [[current-user all-recipes location]]
+  ...)
+
+(re-frame/reg-sub
+ :user/recipes
+ :<- [:current-user]
+ :<- [:all-recipes]
+ :<- [:location]
+ user-recipes)
+
+(deftest user-recipes-test
+  (testing "builds list of recipes"
+    (let [current-user {...}
+          all-recipes  {...}
+          location     [...]]
+      (is (= expected (recipes [current-user all-recipes location]))))))
+
+;; good
+(require '[status-im.test-helpers :as h])
+
+(re-frame/reg-sub
+ :user/recipes
+ :<- [:current-user]
+ :<- [:all-recipes]
+ :<- [:location]
+ (fn [[current-user all-recipes location]]
+   ...))
+
+(h/deftest-sub :user/recipes
+  [sub-name]
+  (testing "builds list of recipes"
+    (swap! rf-db/app-db assoc
+           :current-user {...}
+           :all-recipes {...}
+           :location [...])
+    (is (= expected (rf/sub [sub-name])))))
+```
+
 ## Project Structure
 
 First, the bird's-eye view with some example ClojureScript files:

ios/StatusIm.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -319,7 +319,6 @@
 				FBF6AB84EBC2085D28C3CDEF /* Pods-Status-StatusImPR.debug.xcconfig */,
 				BF23313BEFBC84C6BB7E7677 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -401,12 +400,12 @@
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
-						DevelopmentTeam = DTX7Z4U3YA;
+						DevelopmentTeam = 8B5X2M6H2Y;
 						ProvisioningStyle = Manual;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
-						DevelopmentTeam = DTX7Z4U3YA;
+						DevelopmentTeam = 8B5X2M6H2Y;
 						LastSwiftMigration = 1140;
 						ProvisioningStyle = Manual;
 						SystemCapabilities = {
@@ -425,7 +424,7 @@
 						};
 					};
 					3AAD2AB924A3A60E0075D594 = {
-						DevelopmentTeam = DTX7Z4U3YA;
+						DevelopmentTeam = 8B5X2M6H2Y;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -757,7 +756,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = DTX7Z4U3YA;
+				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -768,7 +767,11 @@
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -791,14 +794,18 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = DTX7Z4U3YA;
+				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -818,12 +825,12 @@
 				BUNDLE_ID_SUFFIX = .debug;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = DTX7Z4U3YA;
+				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -857,7 +864,11 @@
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -888,12 +899,12 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = DTX7Z4U3YA;
+				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
@@ -919,7 +930,11 @@
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -953,7 +968,7 @@
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = DTX7Z4U3YA;
+				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -984,7 +999,11 @@
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -996,7 +1015,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
 				PRODUCT_NAME = "Status PR";
-				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum.pr";
+				PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum.pr";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1013,12 +1032,12 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = DTX7Z4U3YA;
+				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
 					"$(inherited)",
@@ -1043,7 +1062,11 @@
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -1096,7 +1119,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = DTX7Z4U3YA;
+				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1179,7 +1202,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
-				DEVELOPMENT_TEAM = DTX7Z4U3YA;
+				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

modules/react-native-status/android/src/main/java/im/status/ethereum/module/RNSelectableTextInputModule.java

@@ -0,0 +1,78 @@
+package im.status.ethereum.module;
+
+import android.view.ActionMode;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.views.textinput.ReactEditText;
+import javax.annotation.Nonnull;
+
+class RNSelectableTextInputModule extends ReactContextBaseJavaModule {
+
+    private ActionMode lastActionMode;
+
+    public RNSelectableTextInputModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    @Nonnull
+    @Override
+    public String getName() {
+        return "RNSelectableTextInputManager";
+    }
+
+    @ReactMethod
+    public void setupMenuItems(final Integer selectableTextViewReactTag, final Integer textInputReactTag) {
+        ReactApplicationContext reactContext = this.getReactApplicationContext();
+        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute (NativeViewHierarchyManager nvhm) {
+                RNSelectableTextInputViewManager rnSelectableTextManager = (RNSelectableTextInputViewManager) nvhm.resolveViewManager(selectableTextViewReactTag);
+                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
+                rnSelectableTextManager.registerSelectionListener(reactTextView);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void startActionMode(final Integer textInputReactTag) {
+        ReactApplicationContext reactContext = this.getReactApplicationContext();
+        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute (NativeViewHierarchyManager nvhm) {
+                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
+                lastActionMode = reactTextView.startActionMode(reactTextView.getCustomSelectionActionModeCallback(), ActionMode.TYPE_FLOATING);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void hideLastActionMode(){
+        ReactApplicationContext reactContext = this.getReactApplicationContext();
+        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute (NativeViewHierarchyManager nvhm) {
+                if(lastActionMode!=null){
+                    lastActionMode.finish();
+                    lastActionMode = null;
+                }
+            }
+        });
+    }
+
+    @ReactMethod
+    public void setSelection(final Integer textInputReactTag, final Integer start, final Integer end){
+        ReactApplicationContext reactContext = this.getReactApplicationContext();
+        UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            public void execute (NativeViewHierarchyManager nvhm) {
+                ReactEditText reactTextView = (ReactEditText) nvhm.resolveView(textInputReactTag);
+                reactTextView.setSelection(start, end);
+            }
+        });
+    }
+ 
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/module/RNSelectableTextInputViewManager.java

@@ -0,0 +1,102 @@
+package im.status.ethereum.module;
+
+import android.view.ActionMode;
+import android.view.ActionMode.Callback;
+import android.view.Menu;
+import android.view.MenuItem;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+import com.facebook.react.views.textinput.ReactEditText;
+import com.facebook.react.views.view.ReactViewGroup;
+import com.facebook.react.views.view.ReactViewManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class RNSelectableTextInputViewManager extends ReactViewManager {
+    public static final String REACT_CLASS = "RNSelectableTextInput";
+    private String[] _menuItems = new String[0];
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public ReactViewGroup createViewInstance(ThemedReactContext context) {
+        return new ReactViewGroup(context);
+    }
+
+    @ReactProp(name = "menuItems")
+    public void setMenuItems(ReactViewGroup reactViewGroup, ReadableArray items) {
+        if(items != null) {
+            List<String> result = new ArrayList<String>(items.size());
+            for (int i = 0; i < items.size(); i++) {
+                result.add(items.getString(i));
+            }
+            this._menuItems = result.toArray(new String[items.size()]);
+        }
+    }
+
+    public void registerSelectionListener(final ReactEditText view) {
+        view.setCustomSelectionActionModeCallback(new Callback() {
+            @Override
+            public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+                menu.clear();
+                for (int i = 0; i < _menuItems.length; i++) {
+                    menu.add(0, i, 0, _menuItems[i]);
+                }
+                return true;
+            }
+
+            @Override
+            public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+                return true;
+            }
+
+            @Override
+            public void onDestroyActionMode(ActionMode mode) {
+            }
+
+            @Override
+            public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+                int selectionStart = view.getSelectionStart();
+                int selectionEnd = view.getSelectionEnd();
+                String selectedText = view.getText().toString().substring(selectionStart, selectionEnd);
+
+                // Dispatch event
+                onSelectNativeEvent(view, item.getItemId(), selectedText, selectionStart, selectionEnd);
+
+                mode.finish();
+
+                return true;
+            }
+
+        });
+    }
+
+    public void onSelectNativeEvent(ReactEditText view, int eventType, String content, int selectionStart, int selectionEnd) {
+        WritableMap event = Arguments.createMap();
+        event.putInt("eventType", eventType);
+        event.putString("content", content);
+        event.putInt("selectionStart", selectionStart);
+        event.putInt("selectionEnd", selectionEnd);
+
+        // Dispatch
+        ReactContext reactContext = (ReactContext) view.getContext();
+        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(view.getId(), "topSelection", event);
+    }
+
+    @Override
+    public Map getExportedCustomDirectEventTypeConstants() {
+        return MapBuilder.builder()
+                         .put("topSelection", MapBuilder.of("registrationName","onSelection"))
+                         .build();
+    }
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusPackage.java

@@ -7,6 +7,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -29,12 +30,15 @@ public class StatusPackage implements ReactPackage {
         List<NativeModule> modules = new ArrayList<>();
 
         modules.add(new StatusModule(reactContext, this.rootedDevice));
+        modules.add(new RNSelectableTextInputModule(reactContext));
 
         return modules;
     }
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Collections.emptyList();
+        return Arrays.<ViewManager>asList(
+                new RNSelectableTextInputViewManager()
+        );
     }
 }

nix/mobile/android/release.nix

@@ -45,8 +45,8 @@ in stdenv.mkDerivation rec {
     filter = lib.mkFilter {
       root = path;
       include = [
-        "package.json" "yarn.lock" "metro.config.js" ".babelrc"
-        "resources/.*" "translations/.*" "src/js/worklet_factory.js"
+        "package.json" "yarn.lock" "metro.config.js" "babel.config.js"
+        "resources/.*" "translations/.*" "src/js/.*"
         "modules/react-native-status/android.*" "android/.*"
         envFileName "VERSION" "status-go-version.json" "react-native.config.js"
       ];

package.json

@@ -74,7 +74,7 @@
     "react-native-touch-id": "^4.4.1",
     "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",
     "react-syntax-highlighter": "^15.5.0",
-    "rn-emoji-keyboard": "git+https://github.com/status-im/rn-emoji-keyboard.git#refs/tags/v0.4.3",
+    "rn-emoji-keyboard": "0.7.0",
     "tdigest": "^0.1.1"
   },
   "devDependencies": {
@@ -82,15 +82,21 @@
     "@babel/helper-builder-react-jsx": "7.0.0",
     "@babel/plugin-transform-block-scoping": "7.0.0",
     "@babel/preset-env": "7.1.0",
+    "@babel/preset-react": "^7.18.6",
     "@babel/register": "7.0.0",
+    "@jest/globals": "^25.1.0",
     "@mapbox/node-pre-gyp": "^1.0.9",
+    "@testing-library/jest-native": "^5.0.0",
+    "@testing-library/react-native": "^11.2.0",
     "@types/jest": "^28.1.6",
     "detox": "^19.9.1",
+    "jest": "^25.1.0",
+    "jest-circus": "^26.0.0",
     "jest-image-snapshot": "^5.1.0",
-    "jest": "^28.1.3",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
     "process": "0.11.10",
+    "react-test-renderer": "16.13.1",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "2.11.16"
   },

shadow-cljs.edn

@@ -64,15 +64,15 @@
            {:closure-defines
             {status-im.utils.config/POKT_TOKEN #shadow/env "POKT_TOKEN"
              status-im.utils.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"}
-                     :compiler-options {:output-feature-set :es6
+            :compiler-options {:output-feature-set :es6
                                         ;;disable for android build as there
                                         ;;is an intermittent warning with deftype
-                                        :warnings-as-errors false
-                                        :infer-externs :auto
-                                        :static-fns true
-                                        :fn-invoke-direct true
-                                        :optimizations :advanced
-                                        :js-options {:js-provider :closure}}}}
+                               :warnings-as-errors false
+                               :infer-externs :auto
+                               :static-fns true
+                               :fn-invoke-direct true
+                               :optimizations :advanced
+                               :js-options {:js-provider :closure}}}}
           ;; the tests are ran with node, react-native dependencies are mocked
           ;; by using node --require override.js, which uses the node-library
           ;; produced by the target :mocks below and redefines node require
@@ -82,6 +82,8 @@
            :output-dir       "target/test"
            :optimizations    :simple
            :target           :node-test
+           ;; When running tests without a REPL you can uncomment the below line to `make test-watch` a specific file
+           ;:ns-regexp        "status-im.chat.models-test$"
            :main             status-im.test-runner/main
            ;; set :ui-driven to true to let shadow-cljs inject node-repl
            :ui-driven        true
@@ -106,4 +108,11 @@
            :output-to "target/mocks/mocks.js"
            :output-dir "target/mocks"
            :compiler-options {:optimizations :simple
-                              :source-map false}}}}
+                              :source-map false}}
+          :component-test {:target :npm-module
+                           :entries [quo2.core-spec]
+                           :ns-regexp "-component-spec$"
+                           :output-dir "component-spec"
+                           :compiler-options {:warnings-as-errors false
+                                              :static-fns    false
+                                              :infer-externs true}}}}

src/js/shell_worklets.js

@@ -0,0 +1,186 @@
+import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
+
+// Shell Worklets
+
+// Home Stack States
+const CLOSE_WITH_ANIMATION = 0;
+const OPEN_WITH_ANIMATION = 1;
+const CLOSE_WITHOUT_ANIMATION = 3;
+const OPEN_WITHOUT_ANIMATION = 4;
+
+// Derived Values
+export function stackOpacity (stackId, selectedStackId) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return selectedStackId.value == stackId ? 1 : 0;
+    }
+  );
+}
+
+export function stackPointer (stackId, selectedStackId) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return selectedStackId.value == stackId ? "auto" : "none";
+    }
+  );
+}
+
+export function bottomTabIconColor (stackId, selectedStackId, homeStackState,
+				    passThrough, selectedTabColor, defaultColor,
+				    passThroughColor) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      var homeStackStateValue = homeStackState.value;
+      if (selectedStackId.value == stackId &&
+	  (homeStackStateValue == OPEN_WITH_ANIMATION ||
+	   homeStackStateValue == OPEN_WITHOUT_ANIMATION)){
+	return selectedTabColor;
+      }
+      else if (passThrough.value){
+	return passThroughColor;
+      }
+      else {
+	return defaultColor;
+      }
+    }
+  );
+}
+
+export function bottomTabsHeight(homeStackState, height, extendedHeight) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      switch (homeStackState.value) {
+      case OPEN_WITH_ANIMATION:
+	return withTiming(extendedHeight, defaultDurationAndEasing);
+	break;
+      case CLOSE_WITH_ANIMATION:
+	return withTiming(height, defaultDurationAndEasing);
+	break;
+      case OPEN_WITHOUT_ANIMATION:
+	return extendedHeight;
+	break;
+      case CLOSE_WITHOUT_ANIMATION:
+	return height;
+	break;
+      }
+    }
+  )
+}
+
+
+// Home Stack
+
+const shellAnimationTime = 200;
+
+const defaultDurationAndEasing = {
+  duration: shellAnimationTime,
+  easing: Easing.bezier(0, 0, 1, 1),
+}
+
+export function homeStackOpacity (homeStackState) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      switch (homeStackState.value) {
+      case OPEN_WITH_ANIMATION:
+	return withTiming(1, defaultDurationAndEasing);
+	break;
+      case CLOSE_WITH_ANIMATION:
+	return withTiming(0, defaultDurationAndEasing);
+	break;
+      case OPEN_WITHOUT_ANIMATION:
+	return 1;
+	break;
+      case CLOSE_WITHOUT_ANIMATION:
+	return 0;
+	break;	
+      }
+    }
+  );
+}
+
+export function homeStackTop (homeStackState, top) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      switch (homeStackState.value) {
+      case OPEN_WITH_ANIMATION:
+	return withTiming(0, defaultDurationAndEasing);
+	break;
+      case CLOSE_WITH_ANIMATION:
+	return withTiming(top, defaultDurationAndEasing);
+	break;
+      case OPEN_WITHOUT_ANIMATION:
+	return 0;
+	break;
+      case CLOSE_WITHOUT_ANIMATION:
+	return top;
+	break;	
+      }
+    }
+  );
+}
+
+export function homeStackLeft (selectedStackId, animateHomeStackLeft, homeStackState, left) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      if (animateHomeStackLeft.value) {
+	var leftValue = left[selectedStackId.value];
+	switch (homeStackState.value) {
+	case OPEN_WITH_ANIMATION:
+	  return withSequence(withTiming(leftValue, {duration: 0}), withTiming(0, defaultDurationAndEasing))
+	  break;
+	case CLOSE_WITH_ANIMATION:
+	  return withTiming(leftValue, defaultDurationAndEasing);
+	  break;
+	case OPEN_WITHOUT_ANIMATION:
+	  return 0;
+	  break;
+	case CLOSE_WITHOUT_ANIMATION:
+	  return leftValue;
+	  break;	
+	}
+      } else {
+	return 0;
+      }
+    }
+  );
+}
+
+export function homeStackPointer (homeStackState) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      var homeStackStateValue = homeStackState.value;
+      return (homeStackStateValue == OPEN_WITH_ANIMATION ||
+	      homeStackStateValue == OPEN_WITHOUT_ANIMATION) ? "auto" : "none";
+    }
+  );
+}
+
+export function homeStackScale (homeStackState, minimizeScale) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      switch (homeStackState.value) {
+      case OPEN_WITH_ANIMATION:
+	return withTiming(1, defaultDurationAndEasing);
+	break;
+      case CLOSE_WITH_ANIMATION:
+	return withTiming(minimizeScale, defaultDurationAndEasing);
+	break;
+      case OPEN_WITHOUT_ANIMATION:
+	return 1;
+	break;
+      case CLOSE_WITHOUT_ANIMATION:
+	return minimizeScale;
+	break;	
+      }
+    }
+  );
+}

src/js/worklet_factory.js

@@ -1,5 +1,3 @@
-import { useDerivedValue, withTiming, withSequence, withDelay, Easing } from 'react-native-reanimated';
-
 // Generic Worklets
 
 export function applyAnimationsToStyle(animations, style) {
@@ -29,106 +27,3 @@ export function applyAnimationsToStyle(animations, style) {
     return Object.assign(animatedStyle, style);
   };
 };
-
-// Switcher Worklets
-
-export function stackOpacity (stackId, selectedStackId) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return selectedStackId.value == stackId ? 1 : 0;
-    }
-  );
-}
-
-export function stackPointer (stackId, selectedStackId) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return selectedStackId.value == stackId ? "auto" : "none";
-    }
-  );
-}
-
-export function bottomTabIconColor (stackId, selectedStackId, homeStackOpen,
-				    passThrough, selectedTabColor, defaultColor,
-				    passThroughColor) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      if (selectedStackId.value == stackId && homeStackOpen.value){
-	return selectedTabColor;
-      }
-      else if (passThrough.value){
-	return passThroughColor;
-      }
-      else {
-	return defaultColor;
-      }
-    }
-  );
-}
-
-
-// Home Stack
-
-const shellAnimationTime = 200;
-
-const defaultDurationAndEasing = {
-  duration: shellAnimationTime,
-  easing: Easing.bezier(0, 0, 1, 1),
-}
-
-export function homeStackOpacity (homeStackOpen) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return withTiming(homeStackOpen.value ? 1 : 0, defaultDurationAndEasing);
-    }
-  );
-}
-
-export function homeStackTop (homeStackOpen, top) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return withTiming(homeStackOpen.value ? 0 : top, defaultDurationAndEasing);
-    }
-  );
-}
-
-export function homeStackLeft (selectedStackId, animateHomeStackLeft, homeStackOpen, left) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      if (animateHomeStackLeft.value) {
-	var leftValue = left[selectedStackId.value];
-	if (homeStackOpen.value) {
-	  return withSequence(withTiming(leftValue, {duration: 0}), withTiming(0, defaultDurationAndEasing))
-	} else {
-	  return withTiming(leftValue, defaultDurationAndEasing);
-	}
-      } else {
-	return 0;
-      }
-    }
-  );
-}
-
-export function homeStackPointer (homeStackOpen) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return homeStackOpen.value ? "auto" : "none";
-    }
-  );
-}
-
-export function homeStackScale (homeStackOpen, minimizeScale) {
-  return useDerivedValue(
-    function () {
-      'worklet'
-      return withTiming(homeStackOpen.value ? 1 : minimizeScale, defaultDurationAndEasing);
-    }
-  );
-}

src/mocks/js_dependencies.cljs

@@ -282,6 +282,8 @@
 (def worklet-factory
   #js {:applyAnimationsToStyle (fn [])})
 
+(def shell-worklets #js {})
+
 ;; Update i18n_resources.cljs
 (defn mock [module]
   (case module
@@ -328,6 +330,7 @@
     "@react-native-async-storage/async-storage" async-storage
     "react-native-svg" react-native-svg
     "../src/js/worklet_factory.js" worklet-factory
+    "../src/js/shell_worklets.js" shell-worklets
     "./fleets.js" default-fleets
     "./chats.js" default-chats
     "@walletconnect/client" wallet-connect-client

src/quo/react_native.cljs

@@ -34,7 +34,7 @@
 (def touchable-opacity (reagent/adapt-react-class (.-TouchableOpacity ^js rn)))
 (def touchable-highlight (reagent/adapt-react-class (.-TouchableHighlight ^js rn)))
 (def touchable-without-feedback (reagent/adapt-react-class (.-TouchableWithoutFeedback ^js rn)))
-(def text-input (reagent/adapt-react-class  (.-TextInput ^js rn)))
+(def text-input (reagent/adapt-react-class (.-TextInput ^js rn)))
 
 (def keyboard-avoiding-view-class (reagent/adapt-react-class (.-KeyboardAvoidingView ^js rn)))
 

src/quo2/components/avatars/group_avatar.cljs

@@ -21,6 +21,6 @@
                 :align-items      :center
                 :justify-content  :center
                 :border-radius    (/ container-size 2)
-                :background-color (colors/theme-alpha color 0.5 0.6)}
-       [icon/icon :i/group {:size  icon-size ; TODO: group icon sizes 12 and 20 (small and large) are missing
+                :background-color (colors/custom-color-by-theme color 50 60)}
+       [icon/icon :i/group {:size  icon-size
                             :color colors/white-opa-70}]])))

src/quo2/components/avatars/wallet_user_avatar.cljs

@@ -2,7 +2,7 @@
   (:require [react-native.core :as rn]
             [quo2.foundations.colors :as colors]
             [quo2.components.markdown.text :as text]
-            [clojure.string :as clojure-string]))
+            [clojure.string :as string]))
 
 (def circle-sizes {:small 20
                    :medium 32
@@ -29,10 +29,10 @@
   (let [circle-size    (size circle-sizes)
         small?         (= size :small)
         f-name-initial (-> f-name
-                           clojure-string/upper-case
+                           string/upper-case
                            (subs 0 1))
         l-name-initial (-> l-name
-                           clojure-string/upper-case
+                           string/upper-case
                            (subs 0 1))
         circle-color   (colors/custom-color color 50 20)
         text-color     (colors/custom-color-by-theme color 50 60)]

src/quo2/components/buttons/button.cljs

@@ -7,147 +7,149 @@
             [quo2.components.icon :as quo2.icons]))
 
 (def themes
-  {:light {:primary         {:icon-color           colors/white
-                             :label                {:style    {:color colors/white}}
-                             :background-color     {:default  colors/primary-50
-                                                    :pressed  colors/primary-60
-                                                    :disabled colors/primary-50}}
-           :secondary       {:icon-color           colors/primary-50
-                             :label                {:style    {:color colors/primary-50}}
-                             :background-color     {:default  colors/primary-50-opa-20
-                                                    :pressed  colors/primary-50-opa-40
-                                                    :disabled colors/primary-50-opa-20}}
-           :grey            {:icon-color           colors/neutral-100
-                             :icon-secondary-color colors/neutral-50
-                             :label                {:style    {:color colors/neutral-100}}
-                             :background-color     {:default  colors/neutral-10
-                                                    :pressed  colors/neutral-20
-                                                    :disabled colors/neutral-10}}
-           :dark-grey       {:icon-color           colors/neutral-100
-                             :icon-secondary-color colors/neutral-50
-                             :label                {:style    {:color colors/neutral-100}}
-                             :background-color     {:default  colors/neutral-20
-                                                    :pressed  colors/neutral-30
-                                                    :disabled colors/neutral-20}}
-           :outline         {:icon-color           colors/neutral-50
-                             :icon-secondary-color colors/neutral-50
-                             :label                {:style    {:color colors/neutral-100}}
-                             :border-color         {:default  colors/neutral-20
-                                                    :pressed  colors/neutral-40
-                                                    :disabled colors/neutral-20}}
-           :ghost           {:icon-color           colors/neutral-50
-                             :icon-secondary-color colors/neutral-50
-                             :label                {:style    {:color colors/neutral-100}}
-                             :background-color     {:pressed colors/neutral-10}}
-           :danger          {:icon-color           colors/white
-                             :label                {:style    {:color colors/white}}
-                             :background-color     {:default  colors/danger-50
-                                                    :pressed  colors/danger-60
-                                                    :disabled colors/danger-50}}
-           :positive        {:icon-color       colors/white
-                             :label            {:style {:color colors/white}}
-                             :background-color {:default  colors/success-50
-                                                :pressed  colors/success-60
-                                                :disabled colors/success-50-opa-30}}
-           :photo-bg        {:icon-color           colors/neutral-100
-                             :icon-secondary-color colors/neutral-80-opa-40
-                             :label                {:style    {:color colors/neutral-100}}
-                             :background-color     {:default  colors/white-opa-40
-                                                    :pressed  colors/white-opa-50
-                                                    :disabled colors/white-opa-40}}
-           :blur-bg         {:icon-color           colors/neutral-100
-                             :icon-secondary-color colors/neutral-80-opa-40
-                             :label                {:style    {:color colors/neutral-100}}
-                             :background-color     {:default  colors/neutral-80-opa-5
-                                                    :pressed  colors/neutral-80-opa-10
-                                                    :disabled colors/neutral-80-opa-5}}
-           :blur-bg-outline {:icon-color           colors/neutral-100
-                             :icon-secondary-color colors/neutral-80-opa-40
-                             :label                {:style    {:color colors/neutral-100}}
-                             :border-color         {:default  colors/neutral-80-opa-10
-                                                    :pressed  colors/neutral-80-opa-20
-                                                    :disabled colors/neutral-80-opa-10}}
+  {:light {:primary         {:icon-color            colors/white
+                             :label-color           colors/white
+                             :background-color      {:default  colors/primary-50
+                                                     :pressed  colors/primary-60
+                                                     :disabled colors/primary-50}}
+           :secondary       {:icon-color            colors/primary-50
+                             :label-color           colors/primary-50
+                             :background-color      {:default  colors/primary-50-opa-20
+                                                     :pressed  colors/primary-50-opa-40
+                                                     :disabled colors/primary-50-opa-20}}
+           :grey            {:icon-color            colors/neutral-100
+                             :icon-secondary-color  colors/neutral-50
+                             :label-color           colors/neutral-100
+                             :background-color      {:default  colors/neutral-10
+                                                     :pressed  colors/neutral-20
+                                                     :disabled colors/neutral-10}}
+           :dark-grey       {:icon-color            colors/neutral-100
+                             :icon-secondary-color  colors/neutral-50
+                             :label-color           colors/neutral-100
+                             :background-color      {:default  colors/neutral-20
+                                                     :pressed  colors/neutral-30
+                                                     :disabled colors/neutral-20}}
+           :outline         {:icon-color            colors/neutral-50
+                             :icon-secondary-color  colors/neutral-50
+                             :label-color           colors/neutral-100
+                             :border-color          {:default  colors/neutral-20
+                                                     :pressed  colors/neutral-40
+                                                     :disabled colors/neutral-20}}
+           :ghost           {:icon-color            colors/neutral-50
+                             :icon-secondary-color  colors/neutral-50
+                             :label-color           colors/neutral-100
+                             :background-color      {:pressed colors/neutral-10}}
+           :danger          {:icon-color            colors/white
+                             :label-color           colors/white
+                             :background-color      {:default  colors/danger-50
+                                                     :pressed  colors/danger-60
+                                                     :disabled colors/danger-50}}
+           :positive        {:icon-color            colors/white
+                             :label-color           colors/white
+                             :background-color      {:default  colors/success-50
+                                                     :pressed  colors/success-60
+                                                     :disabled colors/success-50-opa-30}}
+           :photo-bg        {:icon-color            colors/neutral-100
+                             :icon-secondary-color  colors/neutral-80-opa-40
+                             :label-color           colors/neutral-100
+                             :background-color      {:default  colors/white-opa-40
+                                                     :pressed  colors/white-opa-50
+                                                     :disabled colors/white-opa-40}}
+           :blur-bg         {:icon-color            colors/neutral-100
+                             :icon-secondary-color  colors/neutral-80-opa-40
+                             :label-color           colors/neutral-100
+                             :background-color      {:default  colors/neutral-80-opa-5
+                                                     :pressed  colors/neutral-80-opa-10
+                                                     :disabled colors/neutral-80-opa-5}}
+           :blur-bg-outline {:icon-color            colors/neutral-100
+                             :icon-secondary-color  colors/neutral-80-opa-40
+                             :label-color           colors/neutral-100
+                             :border-color          {:default  colors/neutral-80-opa-10
+                                                     :pressed  colors/neutral-80-opa-20
+                                                     :disabled colors/neutral-80-opa-10}}
            :shell            {:icon-color           colors/white
-                              :label                {:style    {:color colors/white}}
+                              :label-color          colors/white
                               :background-color     {:default  colors/neutral-95
                                                      :pressed  colors/neutral-95
                                                      :disabled colors/neutral-95}}}
-   :dark  {:primary         {:icon-color          colors/white
-                             :label               {:style    {:color colors/white}}
-                             :background-color    {:default  colors/primary-60
-                                                   :pressed  colors/primary-50
-                                                   :disabled colors/primary-60}}
-           :secondary       {:icon-color          colors/primary-50
-                             :label               {:style    {:color colors/primary-50}}
-                             :background-color    {:default  colors/primary-50-opa-20
-                                                   :pressed  colors/primary-50-opa-30
-                                                   :disabled colors/primary-50-opa-20}}
-           :grey            {:icon-color           colors/white
-                             :icon-secondary-color colors/neutral-40
-                             :label                {:style    {:color colors/white}}
-                             :background-color     {:default  colors/neutral-80
-                                                    :pressed  colors/neutral-60
-                                                    :disabled colors/neutral-80}}
-           :dark-grey       {:icon-color           colors/white
-                             :icon-secondary-color colors/neutral-40
-                             :label                {:style    {:color colors/white}}
-                             :background-color     {:default  colors/neutral-70
-                                                    :pressed  colors/neutral-60
-                                                    :disabled colors/neutral-70}}
-           :outline         {:icon-color           colors/neutral-40
-                             :icon-secondary-color colors/neutral-40
-                             :label                {:style    {:color colors/white}}
-                             :border-color         {:default  colors/neutral-70
-                                                    :pressed  colors/neutral-60
-                                                    :disabled colors/neutral-70}}
-           :ghost           {:icon-color           colors/neutral-40
-                             :icon-secondary-color colors/neutral-40
-                             :label                {:style    {:color colors/white}}
-                             :background-color     {:pressed  colors/neutral-80}}
-           :danger          {:icon-color           colors/white
-                             :label                {:style    {:color colors/white}}
-                             :background-color     {:default  colors/danger-60
-                                                    :pressed  colors/danger-50
-                                                    :disabled colors/danger-60}}
-           :positive        {:icon-color       colors/white
-                             :label            {:style {:color colors/white}}
-                             :background-color {:default  colors/success-60
-                                                :pressed  colors/success-50
-                                                :disabled colors/success-60-opa-30}}
-           :photo-bg        {:icon-color           colors/white
-                             :icon-secondary-color colors/neutral-30
-                             :label                {:style    {:color colors/white}}
-                             :background-color     {:default  colors/neutral-80-opa-40
-                                                    :pressed  colors/neutral-80-opa-50
-                                                    :disabled colors/neutral-80-opa-40}}
-           :blur-bg         {:icon-color           colors/white
-                             :icon-secondary-color colors/white-opa-40
-                             :label                {:style    {:color colors/white}}
-                             :background-color     {:default  colors/white-opa-5
-                                                    :pressed  colors/white-opa-10
-                                                    :disabled colors/white-opa-5}}
-           :blur-bg-outline {:icon-color           colors/white
-                             :icon-secondary-color colors/white-opa-40
-                             :label                {:style    {:color colors/white}}
-                             :border-color         {:default  colors/white-opa-10
-                                                    :pressed  colors/white-opa-20
-                                                    :disabled colors/white-opa-5}}
-           :shell            {:icon-color          colors/white
-                              :label               {:style   {:color colors/white}}
-                              :background-color    {:default colors/neutral-95}}}})
+   :dark  {:primary         {:icon-color            colors/white
+                             :label-color           colors/white
+                             :background-color      {:default  colors/primary-60
+                                                     :pressed  colors/primary-50
+                                                     :disabled colors/primary-60}}
+           :secondary       {:icon-color            colors/primary-50
+                             :label-color           colors/primary-50
+                             :background-color      {:default  colors/primary-50-opa-20
+                                                     :pressed  colors/primary-50-opa-30
+                                                     :disabled colors/primary-50-opa-20}}
+           :grey            {:icon-color            colors/white
+                             :icon-secondary-color  colors/neutral-40
+                             :label-color           colors/white
+                             :background-color      {:default  colors/neutral-80
+                                                     :pressed  colors/neutral-60
+                                                     :disabled colors/neutral-80}}
+           :dark-grey       {:icon-color            colors/white
+                             :icon-secondary-color  colors/neutral-40
+                             :label-color           colors/white
+                             :background-color      {:default  colors/neutral-70
+                                                     :pressed  colors/neutral-60
+                                                     :disabled colors/neutral-70}}
+           :outline         {:icon-color            colors/neutral-40
+                             :icon-secondary-color  colors/neutral-40
+                             :label-color           colors/white
+                             :border-color          {:default  colors/neutral-70
+                                                     :pressed  colors/neutral-60
+                                                     :disabled colors/neutral-70}}
+           :ghost           {:icon-color            colors/neutral-40
+                             :icon-secondary-color  colors/neutral-40
+                             :label-color                 colors/white
+                             :background-color      {:pressed  colors/neutral-80}}
+           :danger          {:icon-color            colors/white
+                             :label-color           colors/white
+                             :background-color      {:default  colors/danger-60
+                                                     :pressed  colors/danger-50
+                                                     :disabled colors/danger-60}}
+           :positive        {:icon-color            colors/white
+                             :label-color           colors/white
+                             :background-color      {:default  colors/success-60
+                                                     :pressed  colors/success-50
+                                                     :disabled colors/success-60-opa-30}}
+           :photo-bg        {:icon-color            colors/white
+                             :icon-secondary-color  colors/neutral-30
+                             :label-color           colors/white
+                             :background-color      {:default  colors/neutral-80-opa-40
+                                                     :pressed  colors/neutral-80-opa-50
+                                                     :disabled colors/neutral-80-opa-40}}
+           :blur-bg         {:icon-color            colors/white
+                             :icon-secondary-color  colors/white-opa-40
+                             :label-color           colors/white
+                             :background-color      {:default  colors/white-opa-5
+                                                     :pressed  colors/white-opa-10
+                                                     :disabled colors/white-opa-5}}
+           :blur-bg-outline {:icon-color            colors/white
+                             :icon-secondary-color  colors/white-opa-40
+                             :label-color           colors/white
+                             :border-color          {:default  colors/white-opa-10
+                                                     :pressed  colors/white-opa-20
+                                                     :disabled colors/white-opa-5}}
+           :shell            {:icon-color           colors/white
+                              :label-color          colors/white
+                              :background-color     {:default colors/neutral-95}}}})
+
+(defn shape-style-container [type icon size]
+  {:border-radius (if (and icon (#{:primary :secondary :danger} type))
+                    24
+                    (case size
+                      56 12
+                      40 12
+                      32 10
+                      24 8))})
 
 (defn style-container [type size disabled background-color border-color icon above width before after]
   (merge {:height             size
           :align-items        :center
           :justify-content    :center
           :flex-direction     (if above :column :row)
-          :border-radius      (if (and icon (#{:primary :secondary :danger} type))
-                                24
-                                (case size
-                                  56 12
-                                  40 12
-                                  32 10
-                                  24 8))
           :background-color   background-color
           :padding-horizontal (when-not (or icon before after)
                                 (case size 56 16 40 16 32 12 24 8))
@@ -159,6 +161,7 @@
                                 (case size 56 0 40 9 32 5 24 3))
           :padding-bottom     (when-not (or icon before after)
                                 (case size 56 0 40 9 32 5 24 4))}
+         (shape-style-container type icon size)
          (when width
            {:width width})
          (when icon
@@ -169,14 +172,19 @@
          (when disabled
            {:opacity 0.3})))
 
+(defn community-themed? [type community-color]
+  (and (= type :community) (string? community-color)))
+
 (defn button
   "with label
    [button opts \"label\"]
    opts
    {:type   :primary/:secondary/:grey/:dark-grey/:outline/:ghost/
-            :danger/:photo-bg/:blur-bg/:blur-bg-ouline/:shell
+            :danger/:photo-bg/:blur-bg/:blur-bg-ouline/:shell/:community
     :size   40/32/24
     :icon   true/false
+    :community-color '#FFFFFF'
+    :community-text-color '#000000'
     :before :icon-keyword
     :after  :icon-keyword}
 
@@ -184,13 +192,13 @@
    [button {:icon true} :main-icons/close-circle]"
   [_ _]
   (let [pressed (reagent/atom false)]
-    (fn [{:keys [on-press disabled type size before after above width
+    (fn [{:keys [on-press disabled type size community-color community-text-color before after above width
                  override-theme override-background-color
                  on-long-press accessibility-label icon icon-no-color style test-ID]
           :or   {type :primary
                  size 40}}
          children]
-      (let [{:keys [icon-color icon-secondary-color background-color label border-color]}
+      (let [{:keys [icon-color icon-secondary-color background-color label-color border-color]}
             (get-in themes [(or
                              override-theme
                              (theme/get-theme)) type])
@@ -212,48 +220,65 @@
                                                                (reset! pressed nil))})
 
          [rn/view {:style (merge
-                           (style-container
-                            type
-                            size
-                            disabled
-                            (or override-background-color (get background-color state))
-                            (get border-color state)
-                            icon
-                            above
-                            width
-                            before
-                            after)
+                           (shape-style-container type icon size)
+                           {:background-color
+                            (if (= state :pressed)
+                              (colors/theme-colors colors/neutral-100 colors/white)
+                              :transparent)}
                            style)}
-          (when above
-            [rn/view
-             [quo2.icons/icon above {:container-style {:margin-bottom 2}
-                                     :color           icon-secondary-color
-                                     :size            icon-size}]])
-          (when before
-            [rn/view
-             [quo2.icons/icon before {:container-style {:margin-left  (if (= size 40) 12 8)
-                                                        :margin-right 4}
+          [rn/view {:style (merge
+                            (style-container
+                             type
+                             size
+                             disabled
+                             (or override-background-color (get background-color state))
+                             (get border-color state)
+                             icon
+                             above
+                             width
+                             before
+                             after)
+                            (when
+                             (community-themed? type community-color)
+                              (merge
+                               {:background-color community-color}
+                               (when (= state :pressed) {:opacity 0.9}))))}
+           (when above
+             [rn/view
+              [quo2.icons/icon above {:container-style {:margin-bottom 2}
                                       :color           icon-secondary-color
                                       :size            icon-size}]])
-          [rn/view
-           (cond
-             (or icon icon-no-color)
-             [quo2.icons/icon children {:color icon-color
-                                        :no-color icon-no-color
-                                        :size  icon-size}]
+           (when before
+             [rn/view
+              [quo2.icons/icon before {:container-style {:margin-left  (if (= size 40) 12 8)
+                                                         :margin-right 4}
+                                       :color           icon-secondary-color
+                                       :size            icon-size}]])
+           [rn/view
+            (cond
+              (or icon icon-no-color)
+              [quo2.icons/icon children {:color icon-color
+                                         :no-color icon-no-color
+                                         :size  icon-size}]
 
-             (string? children)
-             [text/text (merge {:size            (when (#{56 24} size) :paragraph-2)
-                                :weight          :medium
-                                :number-of-lines 1}
-                               label)
-              children]
+              (string? children)
+              [text/text {:size            (when (#{56 24} size) :paragraph-2)
+                          :weight          :medium
+                          :number-of-lines 1
+                          :style {:color           (if
+                                                    (and
+                                                     (community-themed? type community-color)
+                                                     (string? community-text-color))
+                                                     community-text-color
+                                                     label-color)}}
 
-             (vector? children)
-             children)]
-          (when after
-            [rn/view
-             [quo2.icons/icon after {:container-style {:margin-left  4
-                                                       :margin-right (if (= size 40) 12 8)}
-                                     :color           icon-secondary-color
-                                     :size            icon-size}]])]]))))
+               children]
+
+              (vector? children)
+              children)]
+           (when after
+             [rn/view
+              [quo2.icons/icon after {:container-style {:margin-left  4
+                                                        :margin-right (if (= size 40) 12 8)}
+                                      :color           icon-secondary-color
+                                      :size            icon-size}]])]]]))))

src/quo2/components/code/snippet.cljs

@@ -1,7 +1,7 @@
 (ns quo2.components.code.snippet
   (:require ["react-native" :as react-native]
             [cljs-bean.core :as bean]
-            [clojure.string :as str]
+            [clojure.string :as string]
             [oops.core :as oops]
             [react-native.core :as rn]
             [quo2.theme :as theme]
@@ -52,7 +52,7 @@
                              :style (text-style (get-in node [:properties :className]))}]
                  (render-nodes children))
            ;; Remove newlines as we already render each line separately.
-           (-> value str/trim-newline)))
+           (-> value string/trim-newline)))
        nodes))
 
 (defn- code-block [{:keys [rows line-number-width]}]

src/quo2/components/community/community_card_view.cljs

@@ -6,15 +6,11 @@
 
 (defn community-card-view-item
   [{:keys [name description locked
-           status tokens cover tags featured]} on-press]
+           status tokens cover tags width]} on-press]
   [rn/touchable-opacity {:on-press on-press}
-   [rn/view {:style (merge (style/community-card 20)
-                           {:margin-bottom 16}
-                           (if featured
-                             {:margin-right 12}
-                             {:flex              1
-                              :margin-horizontal 20}))}
-    [rn/view {:style    {:height        230
+   [rn/view {:style (style/community-card 20)}
+    [rn/view {:style    {:width         width
+                         :height        230
                          :border-radius 20}
               :on-press on-press}
      [rn/view

src/quo2/components/community/community_view.cljs

@@ -28,13 +28,9 @@
      [community-stats {:icon       :i/group
                        :members-count "629.2K" ;;TODO here should be formatted value, use money/format-members from outside this component
                        :icon-color icon-color}]
-     [community-stats {:icon       :i/lightning
+     [community-stats {:icon          :i/lightning
                        :members-count "112.1K"
-                       :icon-color icon-color}]
-     (when (= type :card-view)
-       [community-stats {:icon       :i/placeholder
-                         :count      4
-                         :icon-color icon-color}])]))
+                       :icon-color    icon-color}]]))
 
 (defn community-tags [tags]
   [rn/view (style/community-tags-container)
@@ -69,10 +65,12 @@
        :style               {:margin-top (if (= size :large) 8 2)}}
       description])])
 
-(defn permission-tag-container [{:keys [locked? tokens]}]
+(defn permission-tag-container [{:keys [locked? tokens on-press]}]
   [permission/tag {:background-color (colors/theme-colors
                                       colors/neutral-10
                                       colors/neutral-80)
                    :locked?          locked?
                    :tokens           tokens
-                   :size             24}])
+
+                   :size             24
+                   :on-press         on-press}])

src/quo2/components/community/token_gating.cljs

@@ -0,0 +1,259 @@
+(ns quo2.components.community.token-gating
+  (:require [quo.react-native :as rn]
+            [quo2.components.avatars.channel-avatar :as channel-avatar]
+            [quo2.components.buttons.button :as button]
+            [quo2.components.icon :as icon]
+            [quo2.components.info.information-box :as information-box]
+            [quo2.components.markdown.text :as text]
+            [quo2.components.tags.token-tag :as token-tag]
+            [quo2.foundations.colors :as colors]
+            [status-im.i18n.i18n :as i18n]
+            [status-im.ui.components.fast-image :as fast-image]))
+
+(def ^:private token-tag-horizontal-spacing 7)
+(def token-tag-vertical-spacing 5)
+
+(def styles {:container {:flex 1
+                         :padding-horizontal 20}
+             :header-container {:flex-direction :row
+                                :align-items :center}
+             :header-spacing-community {:margin-bottom 16}
+             :header-spacing-channel {:margin-bottom 24}
+             :header-avatar {:margin-right 8}
+             :header-community-avatar-image {:width 32 :height 32}
+             :header-title-container {:flex 1
+                                      :flex-direction :row
+                                      :align-items :center}
+             :header-title-lock {:margin-left 6}
+             :header-info-button {:margin-left 8}
+             :token-requirement-text-spacing {:margin-vertical 8}
+             :token-requirement-list-spacing {:padding-vertical (- 8 token-tag-vertical-spacing)}
+             :token-row {:flex-direction :row
+                         :flex-wrap :wrap
+                         :align-items :center}
+             :token-row-container {:flex-direction :row
+                                   :align-items :center
+                                   :margin-horizontal (- token-tag-horizontal-spacing)}
+             :token-row-container-no-shift {:margin-left 0}
+             :token-row-or-text {:margin-right 3}
+             :token-tag-spacing {:margin-horizontal token-tag-horizontal-spacing
+                                 :margin-vertical token-tag-vertical-spacing}
+             :divider {:height 1
+                       :margin-horizontal -20
+                       :margin-top (- 12 token-tag-vertical-spacing)
+                       :margin-bottom 8}
+             :membership-request-denied {:margin-top 13}
+             :enter-button {:margin-top 16}
+             :info-text {:margin-top 12
+                         :text-align :center
+                         :padding-horizontal 20}})
+
+(defn multiple-token-requirements? [token-requirement-lists]
+  (when (vector? (first token-requirement-lists))
+    (> (count token-requirement-lists) 1)))
+
+(defn is-token-requirement-met? [token-requirement-list]
+  (and (seq token-requirement-list)
+       (every?
+        (fn [token]
+          (get token :is-sufficient?))
+        token-requirement-list)))
+
+(defn are-multiple-token-requirements-met? [token-requirement-lists]
+  (if (multiple-token-requirements? token-requirement-lists)
+    (some is-token-requirement-met? token-requirement-lists)
+    (is-token-requirement-met? token-requirement-lists)))
+
+(defn token-requirement-list-row [tokens community-color]
+  [rn/view {:style (merge
+                    (get styles :token-row)
+                    (get styles :token-requirement-list-spacing))}
+   (map-indexed (fn [token-index token]
+                  (let [{:keys [token-img-src token amount is-sufficient? is-purchasable?]} token]
+                    ^{:key token-index}
+                    [rn/view {:style (get styles :token-tag-spacing)}
+                     [token-tag/token-tag {:token          token
+                                           :value          amount
+                                           :size           24
+                                           :border-color   community-color
+                                           :is-required    is-sufficient?
+                                           :is-purchasable is-purchasable?
+                                           :token-img-src  token-img-src}]]))
+                tokens)])
+
+(defn token-requirement-list [props community-color]
+  (let [{:keys [gate token-requirements-changed? required-tokens-lost?]} props
+        [gate-type token-requirement-lists] gate
+        multiple-token-requirements? (multiple-token-requirements? token-requirement-lists)
+        is-sufficient? (are-multiple-token-requirements-met? token-requirement-lists)
+        you-must-hold-label (if (= gate-type :join)
+                              (cond
+                                token-requirements-changed? :t/you-must-now-hold
+                                required-tokens-lost? :t/you-must-always-hold
+                                :else :t/you-must-hold)
+                              :t/you-must-hold)
+        message-label (cond
+                        (= gate-type :join)
+                        (cond
+                          token-requirements-changed? :t/community-join-requirements-changed
+                          required-tokens-lost? :t/community-join-requirements-tokens-lost
+                          :else (if is-sufficient? :t/community-join-requirements-met :t/community-join-requirements-not-met))
+                        (= gate-type :read)
+                        (if is-sufficient?
+                          :t/community-channel-read-requirements-met
+                          :t/community-channel-read-requirements-not-met)
+                        (= gate-type :write)
+                        (if is-sufficient?
+                          :t/community-channel-write-requirements-met
+                          :t/community-channel-write-requirements-not-met))]
+    [rn/view
+     [rn/view {:style (get styles :token-requirement-text-spacing)}
+      [text/text {:weight :medium
+                  :number-of-lines 1}
+       (i18n/label
+        message-label)]
+      [text/text {:size :paragraph-2
+                  :number-of-lines 1}
+       (i18n/label
+        you-must-hold-label)]]
+
+     (if multiple-token-requirements?
+       (map-indexed
+        (fn [token-requirement-index tokens]
+          ^{:key token-requirement-index}
+          [rn/view {:style (merge
+                            (get styles :token-row-container)
+                            (when-not (= token-requirement-index 0)
+                              (get styles :token-row-container-no-shift)))}
+           (when-not (= token-requirement-index 0)
+             [text/text {:style (get styles :token-row-or-text)
+                         :size :paragraph-2} "or"])
+           [token-requirement-list-row tokens community-color]])
+        token-requirement-lists)
+       [rn/view {:style (get styles :token-row-container)}
+        [token-requirement-list-row token-requirement-lists community-color]])]))
+
+(defn is-community-locked? [community]
+  (not (are-multiple-token-requirements-met? (get-in community [:gates :join]))))
+
+(defn is-channel-locked? [channel]
+  (not (are-multiple-token-requirements-met?
+        (or (get-in channel [:gates :read])
+            (get-in channel [:gates :write])))))
+
+(defn token-gating
+  "[token-gating opts]
+   opts
+   {
+     :community {
+       :name string
+       :community-avatar-img-src string
+       :community-color string
+       :community-text-color string
+       :token-requirements-changed? boolean
+       :required-tokens-lost? boolean
+     }
+     :channel {
+       :name string
+       :emoji string
+       :emoji-background-color :string
+       :on-enter-channel callback
+       :membership-request-denied? boolean
+     }
+   }"
+  [_ _]
+  (fn [{:keys [community channel]}]
+    (let [type (if (some? community) :community :channel)
+          {:keys [name
+                  emoji
+                  emoji-background-color
+                  on-enter-channel
+                  community-avatar-img-src
+                  community-color
+                  community-text-color
+                  membership-request-denied?
+                  token-requirements-changed?
+                  required-tokens-lost?
+                  gates]} (if (= type :community) community channel)
+          locked? (if
+                   (= type :community)
+                    (is-community-locked? community)
+                    (is-channel-locked? channel))]
+
+      [rn/view {:style (merge (get styles :container) {:background-color (colors/theme-colors colors/white colors/neutral-90)})}
+       [rn/view {:style (merge
+                         (get styles :header-container)
+                         (if
+                          (= type :community)
+                           (get styles :header-spacing-community)
+                           (get styles :header-spacing-channel)))}
+
+        [rn/view {:style (get styles :header-avatar)}
+         (if (= type :community)
+           [fast-image/fast-image {:source              community-avatar-img-src
+                                   :style               (get styles :header-community-avatar-image)}]
+
+           [channel-avatar/channel-avatar {:big? true
+                                           :locked? locked?
+                                           :emoji emoji
+                                           :emoji-background-color emoji-background-color}])]
+
+        [rn/view {:style (get styles :header-title-container)}
+         [text/text {:weight :semi-bold
+                     :number-of-lines 1
+                     :size  :heading-1
+                     :style (get styles :header-text)} (if (= type :community) name (str "# " name))]
+
+         (when (= type :community)
+           [icon/icon (if locked?
+                        :main-icons2/locked
+                        :main-icons2/unlocked)
+            {:container-style (get styles :header-title-lock)
+             :color           (colors/theme-colors
+                               colors/neutral-50
+                               colors/neutral-40)}])]
+
+        [button/button {:type :outline
+                        :size 32
+                        :icon true
+                        :style (get styles :header-info-button)} :main-icons2/info]]
+
+       (map-indexed (fn [gate-index gate]
+                      ^{:key gate-index}
+                      [:<>
+                       (when-not (= gate-index 0)
+                         [rn/view {:style (merge
+                                           (get styles :divider)
+                                           {:background-color (colors/theme-colors
+                                                               colors/neutral-10
+                                                               colors/neutral-80)})}])
+                       [token-requirement-list {:gate gate :token-requirements-changed? token-requirements-changed? :required-tokens-lost? required-tokens-lost?} community-color]])
+                    gates)
+
+       (when (= type :channel)
+         (if membership-request-denied?
+           [information-box/information-box {:type :error
+                                             :icon :main-icons2/untrustworthy
+                                             :no-icon-color? true
+                                             :style (get styles :membership-request-denied)}
+            (i18n/label
+             :t/membership-request-denied)]
+
+           [:<>
+            [button/button {:type :community
+                            :community-color community-color
+                            :community-text-color community-text-color
+                            :style (get styles :enter-button)
+                            :disabled locked?
+                            :on-press on-enter-channel}
+             (str "# " (i18n/label
+                        :t/enter-channel))]
+            [text/text
+             {:size :paragraph-2
+              :style (merge
+                      (get styles :info-text)
+                      {:color (colors/theme-colors
+                               colors/neutral-50
+                               colors/neutral-40)})}
+             (i18n/label
+              :t/community-enter-channel-info)]]))])))

src/quo2/components/counter/__tests__/counter_component_spec.cljs

@@ -0,0 +1,34 @@
+(ns quo2.components.counter.--tests--.counter-component-spec
+  (:require ["@testing-library/react-native" :as rtl]
+            [quo2.components.counter.counter :as counter]
+            [reagent.core :as reagent]))
+
+(defn render-counter
+  ([]
+   (render-counter {} nil))
+  ([opts value]
+   (rtl/render (reagent/as-element  [counter/counter opts value]))))
+
+(js/global.test "default render of counter component"
+                (fn []
+                  (render-counter)
+                  (-> (js/expect  (rtl/screen.getByTestId "counter-component"))
+                      (.toBeTruthy))))
+
+(js/global.test "renders counter with a string value"
+                (fn []
+                  (render-counter {} "1")
+                  (-> (js/expect  (rtl/screen.getByText "1"))
+                      (.toBeTruthy))))
+
+(js/global.test "renders counter with an integer value"
+                (fn []
+                  (render-counter {} 1)
+                  (-> (js/expect  (rtl/screen.getByText "1"))
+                      (.toBeTruthy))))
+
+(js/global.test "renders counter with value 99+ when the value is greater than 99"
+                (fn []
+                  (render-counter {} "100")
+                  (-> (js/expect  (rtl/screen.getByText "99+"))
+                      (.toBeTruthy))))

src/quo2/components/counter/counter.cljs

@@ -20,7 +20,7 @@
 (defn counter
   "type:    default, secondary, grey, outline
    value:   integer"
-  [{:keys [type override-text-color override-bg-color style]} value]
+  [{:keys [type override-text-color override-bg-color style accessibility-label]} value]
   (let [type       (or type :default)
         text-color (or override-text-color
                        (if (or
@@ -38,7 +38,10 @@
                      1     16
                      2     20
                      28)]
-    [rn/view {:style (cond-> (merge
+    [rn/view {:test-ID :counter-component
+              :accessible true
+              :accessibility-label accessibility-label
+              :style (cond-> (merge
                               {:align-items     :center
                                :justify-content :center
                                :border-radius   6

src/quo2/components/dividers/date.cljs

@@ -0,0 +1,18 @@
+(ns quo2.components.dividers.date
+  (:require [react-native.core :as rn]
+            [quo2.components.separator :as separator]
+            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]))
+
+(defn date [value]
+  [rn/view {:margin-vertical 16
+            :padding-right 8
+            :padding-left 62}
+   [text/text {:weight              :medium
+               :accessibility-label :divider-date-text
+               :size :label
+               :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)
+                       :text-transform :capitalize
+                       :margin-bottom 4}}
+    value]
+   [separator/separator]])

src/quo2/components/drawers/__tests__/action_drawers_component_spec.cljs

@@ -0,0 +1,63 @@
+(ns quo2.components.drawers.--tests--.action-drawers-component-spec
+  (:require ["@testing-library/react-native" :as rtl]
+            [quo2.components.drawers.action-drawers :as action-drawer]
+            [reagent.core :as reagent]))
+
+(defn render-action-drawer
+  ([options]
+   (rtl/render (reagent/as-element  [action-drawer/action-drawer options]))))
+
+(js/global.test "action-drawer renders with elements label displaying"
+                (fn []
+                  (render-action-drawer [[{:icon     :i/friend
+                                           :label     "a sample label"}]])
+                  (-> (js/expect  (rtl/screen.getByText  "a sample label"))
+                      (.toBeTruthy))))
+
+(js/global.test "action-drawer renders with elements sub-label displaying"
+                (fn []
+                  (render-action-drawer [[{:icon     :i/friend
+                                           :label    "a sample label"
+                                           :sub-label "a sample sub label"}]])
+                  (-> (js/expect  (rtl/screen.getByText "a sample sub label"))
+                      (.toBeTruthy))))
+
+(js/global.test "action-drawer on click action works on element"
+                (let [event (js/jest.fn)]
+                  (fn []
+                    (render-action-drawer [[{:icon     :i/friend
+                                             :label    "a sample label"
+                                             :on-press event}]])
+                    (rtl/fireEvent.press (rtl/screen.getByText "a sample label"))
+                    (-> (js/expect  event)
+                        (.toHaveBeenCalled)))))
+
+(js/global.test "action-drawer renders two icons when set"
+                (fn []
+                  (render-action-drawer [[{:icon     :i/friend
+                                           :label    "a sample label"
+                                           :right-icon :i/friend
+                                           :accessibility-label :first-element}]])
+                  (-> (js/expect (rtl/screen.getByLabelText "right-icon-for-action"))
+                      (.toBeTruthy))
+                  (-> (js/expect (rtl/screen.queryByLabelText "left-icon-for-action"))
+                      (.toBeTruthy))))
+
+(js/global.test "action-drawer does not render a divider when the add-divider? prop is false"
+                (fn []
+                  (render-action-drawer [[{:icon     :i/friend
+                                           :label    "a sample label"
+                                           :add-divider? false
+                                           :accessibility-label :first-element}]])
+                  (-> (js/expect  (rtl/screen.getAllByLabelText "divider"))
+                      (.not)
+                      (.toBeTruthy))))
+
+(js/global.test "action-drawer renders a divider when the add-divider? prop is true"
+                (fn []
+                  (render-action-drawer [[{:icon     :i/friend
+                                           :label    "a sample label"
+                                           :add-divider? true
+                                           :accessibility-label :first-element}]])
+                  (-> (js/expect  (rtl/screen.getAllByLabelText "divider"))
+                      (.toBeTruthy))))

src/quo2/components/drawers/action_drawers.cljs

@@ -6,16 +6,19 @@
 
 (defn- get-icon-color [danger?]
   (if danger?
-    (colors/theme-colors colors/danger-50 colors/danger-60)
+    colors/danger-50
     (colors/theme-colors colors/neutral-50 colors/neutral-40)))
 
-(defn divider []
+(def divider
   [rn/view {:style {:border-top-width 1
-                    :border-top-color (colors/theme-colors colors/neutral-10 colors/neutral-80)
+                    :border-top-color (colors/theme-colors
+                                       colors/neutral-10 colors/neutral-90)
                     :margin-top       8
                     :margin-bottom    7
                     :align-items      :center
-                    :flex-direction   :row}}])
+                    :flex-direction   :row}
+            :accessible true
+            :accessibility-label :divider}])
 
 (defn action [{:keys [icon
                       label
@@ -23,16 +26,24 @@
                       right-icon
                       danger?
                       on-press
-                      add-divider?] :as action-props}]
+                      add-divider?
+                      accessibility-label] :as action-props}]
   (when action-props
     [:<> {:key label}
-     (when add-divider? [divider])
-     [rn/touchable-opacity {:on-press on-press}
+     (when add-divider? divider)
+     [rn/touchable-highlight {:accessibility-label accessibility-label
+                              :style          {:border-radius     12
+                                               :height (if sub-label 58 50)
+                                               :margin-horizontal 8}
+                              :underlay-color (colors/theme-colors colors/neutral-5 colors/neutral-90)
+                              :on-press       on-press}
       [rn/view {:style
-                {:height            (if sub-label 56 47)
-                 :margin-horizontal 20
+                {:height (if sub-label 58 50)
+                 :margin-horizontal 12
                  :flex-direction    :row}}
-       [rn/view {:style
+       [rn/view {:accessibility-label :left-icon-for-action
+                 :accessible true
+                 :style
                  {:height        20
                   :margin-top    :auto
                   :margin-bottom :auto
@@ -63,7 +74,9 @@
                    {:height        20
                     :margin-top    :auto
                     :margin-bottom :auto
-                    :width         20}}
+                    :width         20}
+                   :accessible true
+                   :accessibility-label :right-icon-for-action}
           [icon/icon right-icon
            {:color (get-icon-color danger?)
             :size  20}]])]]]))

src/quo2/components/icons/icons.clj

@@ -1,24 +1,29 @@
 (ns quo2.components.icons.icons
   (:require [clojure.java.io :as io]
-            [clojure.string :as cstr]))
+            [clojure.string :as string]))
 
 (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 (str "." path el ".png")
+    (let [s (combine-path path el)
           k (-> el
-                (cstr/replace "_" "-")
-                (cstr/replace " " "-")
-                (cstr/lower-case)
+                (string/replace "_" "-")
+                (string/replace " " "-")
+                (string/lower-case)
                 (str size))]
       [k `(js/require ~s)])))
 
 (defn get-files [path]
   (->> (io/file path)
        file-seq
-       (filter #(cstr/ends-with? % "png"))
-       (map #(first (cstr/split (.getName %) #"@")))
+       (filter #(string/ends-with? % "png"))
+       (map #(first (string/split (.getName %) #"@")))
        distinct))
 
 (defn get-icons [size]

src/quo2/components/info/info_message.cljs

@@ -19,19 +19,21 @@
 (defn info-message
   "[info-message opts \"message\"]
   opts
-  {:type       :default/:success/:error
-   :size       :default/:tiny
-   :icon       :main-icons/info ;; info message icon
-   :text-color colors/white     ;; text color override
-   :icon-color colors/white     ;; icon color override"
-  [{:keys [type size icon text-color icon-color]} message]
+  {:type           :default/:success/:error
+   :size           :default/:tiny
+   :icon           :main-icons/info ;; info message icon
+   :text-color     colors/white     ;; text color override
+   :icon-color     colors/white    ;; icon color override
+   :no-icon-color? false       ;; disable tint color for icon"
+  [{:keys [type size icon text-color icon-color no-icon-color?]} message]
   (let [weight      (if (= size :default) :regular :medium)
         size        (if (= size :default) :paragraph-2 :label)
         text-color  (or text-color (get-color type))
         icon-color  (or icon-color text-color)]
     [rn/view {:style {:flex-direction :row
                       :flex           1}}
-     [quo2.icons/icon icon {:color           icon-color
+     [quo2.icons/icon icon {:color icon-color
+                            :no-color no-icon-color?
                             :size            12
                             :container-style {:margin-top 3}}]
      [text/text {:size   size

src/quo2/components/info/information_box.cljs

@@ -49,11 +49,12 @@
     :closed?         true/false          ;; information box's state
     :id              :information-box-id ;; unique id (required for closable? information box)
     :icon            :main-icons/info    ;; information box icon
+    :no-icon-color?  false               ;; disable tint color for icon
     :style           style
     :button-label    \"PressMe\"         ;; add action button with label
     :on-button-press action              ;; (required for information box with button-label)
     :on-close        on-close            ;; (optional on-close call)"
-  [{:keys [type closable? closed? id icon style button-label on-button-press on-close]} message]
+  [{:keys [type closable? closed? id icon style button-label on-button-press on-close no-icon-color?]} message]
   (let [background-color (get-color-by-type type :bg)
         border-color     (get-color-by-type type :border)
         icon-color       (get-color-by-type type :icon)
@@ -73,7 +74,8 @@
         [info-message/info-message {:size        :default
                                     :icon        icon
                                     :text-color  text-color
-                                    :icon-color  icon-color} message]
+                                    :icon-color  icon-color
+                                    :no-icon-color? no-icon-color?} message]
         (when closable?
           [rn/touchable-opacity
            {:on-press            on-close

src/quo2/components/list_items/channel.cljs

@@ -1,56 +1,57 @@
 (ns quo2.components.list-items.channel
-  (:require [react-native.core :as rn]
-            [quo2.foundations.colors :as colors]
+  (:require [quo2.components.avatars.channel-avatar :as channel-avatar]
             [quo2.components.counter.counter :as quo2.counter]
             [quo2.components.icon :as quo2.icons]
-            [quo2.components.avatars.channel-avatar :as channel-avatar]
             [quo2.components.markdown.text :as quo2.text]
-            [quo2.theme :as theme]))
+            [quo2.foundations.colors :as colors]
+            [quo2.theme :as theme]
+            [react-native.core :as rn]))
 
 (defn list-item [{:keys [name locked? mentions-count unread-messages?
-                         muted? is-active-channel? emoji channel-color]
+                         muted? is-active-channel? emoji channel-color on-press]
                   :or   {channel-color colors/primary-50}}]
-  [rn/view {:style (merge {:height          48
-                           :display         :flex
-                           :border-radius   12
-                           :flex-direction  :row
-                           :justify-content :space-between
-                           :align-items     :center
-                           :width           "100%"
-                           :padding-left    12
-                           :padding-right   12}
-                          (when is-active-channel?
-                            {:background-color (colors/theme-alpha channel-color 0.05 0.05)}))}
-   [rn/view {:display         :flex
-             :flex-direction  :row
-             :justify-content :flex-start
-             :align-items     :center}
-    [channel-avatar/channel-avatar
-     {:big?                   true
-      :locked?                locked?
-      :emoji-background-color (colors/theme-alpha channel-color 0.1 0.1)
-      :emoji                  emoji}]
-    [quo2.text/text
-     {:style  (merge {:margin-left 12}
-                     (when (and (not locked?) muted?)
-                       {:color (if (theme/dark?) colors/neutral-60 colors/neutral-40)}))
-      :weight :medium :size :paragraph-1} (str "# " name)]]
-   [rn/view {:style {:height 20}}
-    (when (and (not locked?)
-               muted?)
-      [quo2.icons/icon :i/muted
-       {:size     20
-        :no-color true}])
-    (when (and (not locked?)
-               (not muted?)
-               (pos? (int mentions-count)))
-      [rn/view {:style {:margin-right 2
-                        :margin-top   2}}
-       [quo2.counter/counter {:override-bg-color channel-color} mentions-count]])
-    (when (and (not locked?)
-               (not muted?)
-               (not (pos? (int mentions-count)))
-               unread-messages?)
-      [quo2.icons/icon :i/channel-notification
-       {:size     20
-        :no-color true}])]])
+  [rn/touchable-opacity {:on-press on-press}
+   [rn/view {:style (merge {:height          48
+                            :display         :flex
+                            :border-radius   12
+                            :flex-direction  :row
+                            :justify-content :space-between
+                            :align-items     :center
+                            :width           "100%"
+                            :padding-left    12
+                            :padding-right   12}
+                           (when is-active-channel?
+                             {:background-color (colors/theme-alpha channel-color 0.05 0.05)}))}
+    [rn/view {:display         :flex
+              :flex-direction  :row
+              :justify-content :flex-start
+              :align-items     :center}
+     [channel-avatar/channel-avatar
+      {:big?                   true
+       :locked?                locked?
+       :emoji-background-color (colors/theme-alpha channel-color 0.1 0.1)
+       :emoji                  emoji}]
+     [quo2.text/text
+      {:style  (merge {:margin-left 12}
+                      (when (and (not locked?) muted?)
+                        {:color (if (theme/dark?) colors/neutral-60 colors/neutral-40)}))
+       :weight :medium :size :paragraph-1} (str "# " name)]]
+    [rn/view {:style {:height 20}}
+     (when (and (not locked?)
+                muted?)
+       [quo2.icons/icon :i/muted
+        {:size     20
+         :no-color true}])
+     (when (and (not locked?)
+                (not muted?)
+                (pos? (int mentions-count)))
+       [rn/view {:style {:margin-right 2
+                         :margin-top   2}}
+        [quo2.counter/counter {:override-bg-color channel-color} mentions-count]])
+     (when (and (not locked?)
+                (not muted?)
+                (not (pos? (int mentions-count)))
+                unread-messages?)
+       [quo2.icons/icon :i/channel-notification
+        {:size     20
+         :no-color true}])]]])

src/quo2/components/loaders/skeleton.cljs

@@ -1,6 +1,6 @@
-(ns status-im.ui.screens.chat.components.messages-skeleton
-  (:require [status-im.ui.components.react :as react]
-            [react-native.core :as rn]
+(ns quo2.components.loaders.skeleton
+  (:require [react-native.core :as rn]
+            [react-native.masked-view :as masked-view]
             [reagent.core :as reagent]
             [react-native.reanimated :as reanimated]
             [quo2.foundations.colors :as colors]))
@@ -34,7 +34,7 @@
                                     {:width     window-width
                                      :height    "100%"})]
        (reanimated/animate-shared-value-with-repeat translate-x window-width 1000 :linear (- 1) false)
-       [react/masked-view
+       [masked-view/masked-view
         {:style {:height message-skeleton-height}
          :maskElement (reagent/as-element
                        [rn/view {:style {:height           message-skeleton-height
@@ -67,11 +67,11 @@
                                       :end      {:x 1 :y 0}
                                       :style    animated-gradient-style}]]]))])
 
-(defn messages-skeleton [parent-height]
+(defn skeleton [parent-height]
   (let [number-of-skeletons (int (Math/floor (/ parent-height message-skeleton-height)))]
     [rn/view {:style {:background-color (colors/theme-colors
                                          colors/white
                                          colors/neutral-90)
                       :flex              1}}
      (for [n (range number-of-skeletons)]
-       [message-skeleton {:key n}])]))
+       [message-skeleton {:key n}])]))

src/quo2/components/messages/author/view.cljs

@@ -9,6 +9,28 @@
 
 (def middle-dot "·")
 
+(defn display-name [{:keys [profile-name nickname ens-name text-style]}]
+  (let [ens?      (-> ens-name string/blank? not)
+        nickname? (-> nickname string/blank? not)]
+    (if ens?
+      [text/text (merge {:weight :semi-bold
+                         :size   :paragraph-2
+                         :style  (style/ens-text)}
+                        text-style)
+       ens-name]
+      [:<>
+       (if nickname?
+         [text/text (merge {:weight :semi-bold
+                            :size   :paragraph-2
+                            :style  (style/nickname-text)}
+                           text-style)
+          nickname]
+         [text/text (merge {:weight :semi-bold
+                            :size   :paragraph-2
+                            :style  (style/profile-name-text nickname?)}
+                           text-style)
+          profile-name])])))
+
 (defn author [{:keys [profile-name nickname chat-key ens-name time-str contact? verified? untrustworthy?]}]
   [:f>
    (fn []
@@ -63,4 +85,4 @@
         [text/text {:monospace true
                     :size      :paragraph-2
                     :style     (style/time-text ens?)}
-         time-str]]))])
+         time-str]]))])

src/quo2/components/messages/system_message.cljs

@@ -1,11 +1,11 @@
 (ns quo2.components.messages.system-message
-  (:require [react-native.core :as rn]
-            [react-native.reanimated :as reanimated]
-            [quo2.theme :as theme]
-            [quo2.components.avatars.icon-avatar :as icon-avatar]
+  (:require [quo2.components.avatars.icon-avatar :as icon-avatar]
             [quo2.components.avatars.user-avatar :as user-avatar]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
+            [quo2.theme :as theme]
+            [react-native.core :as rn]
+            [react-native.reanimated :as reanimated]
             [utils.string :as utils]))
 
 (def themes-landed {:pinned  colors/primary-50-opa-5
@@ -60,19 +60,19 @@
             :flex-direction  :row}
    [rn/view {:align-items    :center
              :flex-direction :row}
-    [sm-icon {:icon    :main-icons/delete16
+    [sm-icon {:icon    :main-icons/delete
               :color   :danger
               :opacity 5}]
     [text/text {:size  :paragraph-2
                 :style {:color        (get-color :text)
                         :margin-right 5}}
-     (or label (:message-deleted labels))]
+     (or (get labels label) label (:message-deleted labels))]
     [sm-timestamp timestamp-str]]])
 
 (defmethod sm-render :added [{:keys [state mentions timestamp-str labels]}]
   [rn/view {:align-items    :center
             :flex-direction :row}
-   [sm-icon {:icon    :main-icons/add-user16
+   [sm-icon {:icon    :main-icons/add-user
              :color   :primary
              :opacity (if (= state :landed) 0 5)}]
    [sm-user-avatar (:image (first mentions))]
@@ -94,7 +94,7 @@
   [rn/view {:flex-direction :row
             :flex           1
             :align-items    :center}
-   [sm-icon {:icon    :main-icons/pin16
+   [sm-icon {:icon    :main-icons/pin
              :color   :primary
              :opacity (if (= state :landed) 0 5)}]
    [rn/view {:flex-direction :column

src/quo2/components/navigation/floating_shell_button.cljs

@@ -14,31 +14,35 @@
       :customization-color customization-color}]))
 
 (defn floating-shell-button
-  "[floating-shell-button dynamic-buttons style]
-  dynamic-buttons
-  {:button-type {:on-press on-press :count count}}"
-  [dynamic-buttons style opacity-anim pointer-anim]
-  [:f>
-   (fn []
-     (let [original-style (merge {:flex-direction    :row
-                                  :margin-horizontal 12} style)
-           animated-style (reanimated/apply-animations-to-style
-                           {:opacity        opacity-anim
-                            :pointer-events pointer-anim}
-                           original-style)]
-       [reanimated/view {:style animated-style}
-        ;; Left Section
-        [rn/view {:style {:flex 1}}
-         [dynamic-button-view :search dynamic-buttons {:position :absolute
-                                                       :right    8}]]
-        ;; Mid Section (jump-to)
-        [dynamic-button-view :jump-to dynamic-buttons nil]
+  "[floating-shell-button dynamic-buttons style opacity-anim pointer-anim]
+  dynamic-buttons {:button-type {:on-press on-press :count count}}
+  style           override style
+  opacity-anim    reanimated value (optional)"
+  ([dynamic-button style]
+   (floating-shell-button dynamic-button style nil))
+  ([dynamic-buttons style opacity-anim]
+   [:f>
+    (fn []
+      (let [original-style (merge {:flex-direction    :row
+                                   :margin-horizontal 12
+                                   :pointer-events    :box-none} style)
+            animated-style (reanimated/apply-animations-to-style
+                            (if opacity-anim
+                              {:opacity opacity-anim} {})
+                            original-style)]
+        [reanimated/view {:style animated-style}
+         ;; Left Section
+         [rn/view {:style {:flex 1}}
+          [dynamic-button-view :search dynamic-buttons {:position :absolute
+                                                        :right    8}]]
+         ;; Mid Section (jump-to)
+         [dynamic-button-view :jump-to dynamic-buttons nil]
         ;; Right Section
-        [rn/view {:style {:flex 1}}
-         [rn/view {:style {:position       :absolute
-                           :flex-direction :row
-                           :right          0}}
-          [dynamic-button-view :mention dynamic-buttons {:margin-left 8}]
-          [dynamic-button-view :notification-down dynamic-buttons {:margin-left 8}]
-          [dynamic-button-view :notification-up dynamic-buttons {:margin-left 8}]
-          [dynamic-button-view :bottom dynamic-buttons {:margin-left 8}]]]]))])
+         [rn/view {:style {:flex 1}}
+          [rn/view {:style {:position       :absolute
+                            :flex-direction :row
+                            :right          0}}
+           [dynamic-button-view :mention dynamic-buttons {:margin-left 8}]
+           [dynamic-button-view :notification-down dynamic-buttons {:margin-left 8}]
+           [dynamic-button-view :notification-up dynamic-buttons {:margin-left 8}]
+           [dynamic-button-view :bottom dynamic-buttons {:margin-left 8}]]]]))]))

src/quo2/components/navigation/page_nav.cljs

@@ -3,7 +3,9 @@
             [quo2.foundations.colors :as colors]
             [quo2.components.icon :as icons]
             [quo2.components.markdown.text :as text]
-            [clojure.string :as string]))
+            [clojure.string :as string]
+            [quo2.components.buttons.button :as button]
+            [quo2.components.avatars.user-avatar :as user-avatar]))
 
 (def ^:private centrify-style
   {:display         :flex
@@ -12,12 +14,10 @@
 
 (def ^:private align-left (assoc centrify-style :align-items :flex-start))
 
-(def ^:private icon-styles (assoc centrify-style :width 32 :height 32 :border-radius 10))
-
 (defn- big? [size] (= size :big))
 
 (defn- icon-props [color size]
-  (merge {:size      20
+  (merge {:size            20
           :container-style {:width  (if (big? size)
                                       20
                                       16)
@@ -28,34 +28,35 @@
            {:color color}
            {:no-color true})))
 
-(defn render-left-section [{:keys [on-press icon
-                                   icon-color icon-background-color]}
-                           put-middle-section-on-left?]
-  [rn/view {:style (merge
-                    icon-styles
-                    {:background-color icon-background-color
-                     :width            32
-                     :height           32}
-                    (when put-middle-section-on-left? {:margin-right 5}))}
-   [rn/touchable-opacity {:on-press on-press}
-    [icons/icon icon (icon-props icon-color :big)]]])
+(defn left-section-view [{:keys [on-press icon accessibility-label type] :or {type :grey}}
+                         put-middle-section-on-left?]
+  [rn/view {:style (when put-middle-section-on-left? {:margin-right 5})}
+   [button/button {:on-press            on-press
+                   :icon                true
+                   :type                type
+                   :size                32
+                   :accessibility-label accessibility-label}
+    icon]])
 
 (defn- mid-section-comp
-  [{:keys [description-user-icon horizontal-description? text-secondary-color align-mid? text-color icon main-text type description]}]
-  [rn/view {:style (assoc
-                    centrify-style
-                    :flex-direction    :row
-                    :margin-horizontal 2)}
+  [{:keys [description-img description-user-icon horizontal-description?
+           text-secondary-color align-mid? text-color icon main-text type description]}]
+  [rn/view {:style (assoc centrify-style
+                          :flex-direction :row
+                          :margin-horizontal 2)}
    (when (or (and (not horizontal-description?)
                   align-mid?
                   (not= :text-with-description type))
-             (and description-user-icon
+             (and (or description-img description-user-icon)
                   (not icon)))
-     [rn/image {:source {:uri description-user-icon}
-                :style  {:width         32
-                         :height        32
-                         :border-radius 32
-                         :margin-right  8}}])
+     (if description-img
+       [rn/view {:margin-right 8}
+        [description-img]]
+       [rn/image {:source {:uri description-user-icon}
+                  :style  {:width         32
+                           :height        32
+                           :border-radius 32
+                           :margin-right  8}}]))
    [rn/view {:style {:flex-direction (if horizontal-description?
                                        :row
                                        :column)}}
@@ -73,76 +74,69 @@
                             horizontal-description? (assoc :margin-left 4 :margin-top 2))}
        description])]])
 
-(defn- render-mid-section
+(defn- mid-section-view
   [{:keys [horizontal-description? one-icon-align-left? type left-align?
-           main-text right-icon main-text-icon-color left-icon] :as props}]
-  (let [text-color                (if (colors/dark?) colors/neutral-5 colors/neutral-95)
-        text-secondary-color      (if (colors/dark?) colors/neutral-40 colors/neutral-50)
+           main-text right-icon main-text-icon-color left-icon on-press avatar] :as props}]
+  (let [text-color (if (colors/dark?) colors/neutral-5 colors/neutral-95)
+        text-secondary-color (if (colors/dark?) colors/neutral-40 colors/neutral-50)
         component-instance [mid-section-comp (assoc props :text-secondary-color text-secondary-color)]]
-    [rn/view {:style (merge
-                      (if left-align?
-                        align-left
-                        centrify-style)
-                      {:flex                1
-                       :margin-left         4
-                       :text-align-vertical :center})}
-     (case type
-       :text-only [text/text {:size   :paragraph-1
-                              :weight :semi-bold
-                              :style  {:color text-color}}
-                   main-text]
-       :text-with-two-icons [rn/view {:style (assoc centrify-style :flex-direction :row)}
-                             [icons/icon left-icon
-                              (icon-props main-text-icon-color :big)]
-                             [text/text {:size   :paragraph-1
-                                         :weight :semi-bold
-                                         :style  {:padding-horizontal 4
-                                                  :color              text-color}}
-                              main-text]
+    [rn/touchable-opacity {:on-press on-press}
+     [rn/view {:style (merge
+                       (if left-align?
+                         align-left
+                         centrify-style)
+                       {:flex                1
+                        :margin-left         4
+                        :text-align-vertical :center})}
+      (case type
+        :text-only [text/text {:size   :paragraph-1
+                               :weight :semi-bold
+                               :style  {:color text-color}}
+                    main-text]
+        :user-avatar [rn/view {:style (assoc centrify-style :flex-direction :row)}
+                      [user-avatar/user-avatar avatar]
+                      [text/text {:size   :paragraph-1
+                                  :weight :semi-bold
+                                  :style  {:padding-horizontal 4
+                                           :color              text-color}}
+                       main-text]]
+        :text-with-two-icons [rn/view {:style (assoc centrify-style :flex-direction :row)}
+                              [icons/icon left-icon
+                               (icon-props main-text-icon-color :big)]
+                              [text/text {:size   :paragraph-1
+                                          :weight :semi-bold
+                                          :style  {:padding-horizontal 4
+                                                   :color              text-color}}
+                               main-text]
+                              [icons/icon right-icon
+                               (icon-props main-text-icon-color :big)]]
+        :text-with-one-icon [rn/view {:style {:flex-direction :row}}
+                             (if one-icon-align-left?
+                               [rn/view {:style {:flex-direction :row
+                                                 :align-items    :center}}
+                                (when horizontal-description?
+                                  [icons/icon left-icon
+                                   (icon-props main-text-icon-color :big)])
+                                component-instance]
+                               [rn/view {:style {:flex-direction :row
+                                                 :align-items    :center}}
+                                component-instance
+                                (when horizontal-description?
+                                  [icons/icon left-icon
+                                   (icon-props main-text-icon-color :big)])])]
+        :text-with-description component-instance)]]))
 
-                             [icons/icon right-icon
-                              (icon-props main-text-icon-color :big)]]
-       :text-with-one-icon   [rn/view {:style {:flex-direction :row}}
-                              (if one-icon-align-left?
-                                [rn/view {:style {:flex-direction :row
-                                                  :align-items    :center}}
-                                 (when horizontal-description?
-                                   [icons/icon left-icon
-                                    (icon-props main-text-icon-color :big)])
-                                 component-instance]
-                                [rn/view {:style {:flex-direction :row
-                                                  :align-items :center}}
-                                 component-instance
-                                 (when horizontal-description?
-                                   [icons/icon left-icon
-                                    (icon-props main-text-icon-color :big)])])]
-       :text-with-description component-instance)]))
-
-(defn- right-section-icon
-  [{:keys [background-color icon icon-color push-to-the-left?] :or {push-to-the-left? false}}]
-  [rn/view {:style (assoc
-                    icon-styles
-                    :background-color background-color
-                    :width            32
-                    :height           32
-                    :margin-right (if push-to-the-left? 8 0))}
-   [icons/icon icon (icon-props icon-color :big)]])
-
-(defn- render-right-section [right-section-buttons]
-  [rn/view {:style (assoc
-                    centrify-style
-                    :flex-direction :row
-                    :flex           1
-                    :justify-content :flex-end)}
+(defn- right-section-view [right-section-buttons]
+  [rn/view {:style (assoc centrify-style
+                          :flex-direction :row
+                          :flex 1
+                          :justify-content :flex-end)}
    (let [last-icon-index (-> right-section-buttons count dec)]
-     (map-indexed (fn [index {:keys [icon background-color icon-color on-press]}]
+     (map-indexed (fn [index {:keys [icon on-press type] :or {type :grey}}]
                     ^{:key index}
-                    [rn/touchable-opacity {:on-press on-press}
-                     [right-section-icon
-                      {:icon             icon
-                       :background-color background-color
-                       :icon-color       icon-color
-                       :push-to-the-left? (not= index last-icon-index)}]])
+                    [rn/view {:style {:margin-right (if (not= index last-icon-index) 8 0)}}
+                     [button/button {:on-press on-press :icon true :type type :size 32}
+                      icon]])
                   right-section-buttons))])
 
 (defn page-nav
@@ -154,7 +148,7 @@
      :page-nav-color          color
      :page-nav-background-uri image-uri
      :mid-section 
-     {:type                  one-of :text-only :text-with-two-icons :text-with-one-icon :text-with-description
+     {:type                  one-of :text-only :text-with-two-icons :text-with-one-icon :text-with-description :user-avatar
       :icon                  icon
       :main-text             string
       :left-icon             icon       
@@ -163,16 +157,19 @@
       :description-color     color
       :description-icon      icon
       :description-user-icon icon
+      :description-img a render prop which will be used in place of :description-user-icon
       :main-text-icon-color  color
      }
      :left-section 
-     {:on-press              event
+     {:type                  button-type
+      :on-press              event
       :icon                  icon 
       :icon-color            color
       :icon-background-color color
      }
      :right-section-buttons vector of 
-      {:on-press              event
+      {:type                  button-type
+       :on-press              event
        :icon                  icon
        :icon-color            color 
        :icon-background-color color
@@ -189,32 +186,35 @@
         mid-section-props
         {:type                    (:type mid-section)
          :horizontal-description? horizontal-description?
+         :description-img         (:description-img mid-section)
          :main-text               (:main-text mid-section)
          :main-text-icon-color    (:main-text-icon-color mid-section)
          :one-icon-align-left?    one-icon-align-left?
          :right-icon              (:right-icon mid-section)
          :icon                    (:icon mid-section)
-         :left-icon               (:left-icon mid-section)}]
+         :left-icon               (:left-icon mid-section)
+         :avatar                  (:avatar mid-section)}]
     [rn/view {:style (cond-> {:display            :flex
                               :flex-direction     :row
                               ;;  iPhone 11 Pro's height in Figma divided by Component height 56/1125
                               :align-items        :center
                               :padding-horizontal 20
+                              :height             56
                               :justify-content    :space-between}
                        page-nav-background-uri (assoc :background-color page-nav-color)
                        page-nav-color (assoc :background page-nav-background-uri))}
      [rn/view {:style {:flex           1
                        :flex-direction :row
                        :align-items    :center}}
-      (render-left-section left-section put-middle-section-on-left?)
+      [left-section-view left-section put-middle-section-on-left?]
       (when put-middle-section-on-left?
-        [render-mid-section (assoc mid-section-props
-                                   :left-align?                       true
-                                   :description           (:description mid-section)
-                                   :description-color     (:description-color mid-section)
-                                   :description-icon      (:description-icon mid-section)
-                                   :align-mid?                        align-mid?
-                                   :description-user-icon (:description-user-icon mid-section))])]
+        [mid-section-view (assoc mid-section-props
+                                 :left-align? true
+                                 :description (:description mid-section)
+                                 :description-color (:description-color mid-section)
+                                 :description-icon (:description-icon mid-section)
+                                 :align-mid? align-mid?
+                                 :description-user-icon (:description-user-icon mid-section))])]
      (when-not put-middle-section-on-left?
-       [render-mid-section mid-section-props])
-     (render-right-section right-section-buttons)]))
+       [mid-section-view mid-section-props])
+     [right-section-view right-section-buttons]]))

src/quo2/components/navigation/top_nav.cljs

@@ -1,99 +0,0 @@
-(ns quo2.components.navigation.top-nav
-  (:require [react-native.core :as rn]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.counter.counter :as counter]
-            [quo2.components.buttons.button :as quo2.button]
-            [quo2.components.avatars.user-avatar :as user-avatar]
-            [react-native.hole-view :as hole-view]))
-
-(defn- get-button-common-props [type]
-  (let [default? (= type :default)
-        dark?    (colors/dark?)]
-    {:icon                      true
-     :size                      32
-     :style                     {:margin-left 12}
-     :type                      (if default?
-                                  (if dark? :grey :dark-grey)
-                                  type)
-     :override-background-color (when (and dark? default?)
-                                  colors/neutral-90)}))
-
-(defn- base-button [icon on-press accessibility-label button-common-props]
-  [quo2.button/button
-   (merge
-    {:on-press            on-press
-     :accessibility-label accessibility-label}
-    button-common-props)
-   icon])
-
-(defn top-nav
-  "[top-nav opts]
-  opts
-  {:type                   :default/:blurred/:shell
-   :new-notifications?     true/false
-   :notification-indicator :unread-dot/:counter
-   :open-profile           fn
-   :open-search            fn
-   :open-scanner           fn
-   :show-qr                fn
-   :open-activity-center   fn
-   :style                  override-style
-   :avatar                 user-avatar
-   :counter-label          number}
-  "
-  [{:keys [type new-notifications? notification-indicator open-profile open-search
-           open-scanner show-qr open-activity-center style avatar counter-label]}]
-  (let [button-common-props (get-button-common-props type)]
-    [rn/view {:style (merge
-                      {:height 56}
-                      style)}
-   ;; Left Section
-     [rn/touchable-without-feedback {:on-press open-profile}
-      [rn/view {:style {:position :absolute
-                        :left     20
-                        :top      12}}
-       [user-avatar/user-avatar
-        (merge
-         {:ring?             true
-          :status-indicator? true
-          :size              :small}
-         avatar)]]]
-   ;; Right Section
-     [rn/view {:style {:position :absolute
-                       :right    20
-                       :top      12
-                       :flex-direction :row}}
-      ;; TODO component shouldn't know anything about parent system, we should pass buttons as parameters
-      [base-button :i/search open-search :open-search-button button-common-props]
-      [base-button :i/scan open-scanner :open-scanner-button button-common-props]
-      [base-button :i/qr-code show-qr :show-qr-button button-common-props]
-      [rn/view ;; Keep view instead of "[:<>" to make sure relative
-               ;; position is calculated from this view instead of its parent
-       [hole-view/hole-view {:key   new-notifications? ;; Key is required to force removal of holes
-                             :holes (cond
-                                      (not new-notifications?) ;; No new notifications, remove holes
-                                      []
-
-                                      (= notification-indicator :unread-dot)
-                                      [{:x 37 :y -3 :width 10 :height 10 :borderRadius 5}]
-
-                                      :else
-                                      [{:x 33 :y -7 :width 18 :height 18 :borderRadius 7}])}
-        [base-button :i/activity-center open-activity-center
-         :open-activity-center-button button-common-props]]
-       (when new-notifications?
-         (if (= notification-indicator :counter)
-           [counter/counter {:outline             false
-                             :override-text-color colors/white
-                             :override-bg-color   colors/primary-50
-                             :style               {:position :absolute
-                                                   :left     34
-                                                   :top      -6}}
-            counter-label]
-           [rn/view {:style {:width            8
-                             :height           8
-                             :border-radius    4
-                             :top             -2
-                             :left             38
-                             :position         :absolute
-                             :background-color colors/primary-50}}]))]]]))

src/quo2/components/notifications/activity_log/view.cljs

@@ -64,7 +64,8 @@
                       (map (fn [s]
                              [rn/view {:style {:margin-right 4
                                                :margin-top   0}}
-                              [text/text {:size :paragraph-2}
+                              [text/text {:size  :paragraph-2
+                                          :style {:color colors/white}}
                                s]])
                            (string/split detail #"\s+"))
                       [[rn/view {:margin-right 4

src/quo2/components/notifications/info_count.cljs

@@ -10,6 +10,8 @@
                              :position         :absolute
                              :right            22
                              :border-radius    6
+                             :justify-content  :center
+                             :align-items      :center
                              :background-color (colors/theme-colors colors/primary-50 colors/primary-60)}
                             style)}
      [rn/text {:style (merge typography/font-medium typography/label {:color colors/white :text-align :center})} count]]))

src/quo2/components/selectors/__tests__/selectors_component_spec.cljs

@@ -0,0 +1,84 @@
+(ns quo2.components.selectors.--tests--.selectors-component-spec
+  (:require ["@testing-library/react-native" :as rtl]
+            [quo2.components.selectors.selectors :as selectors]
+            [reagent.core :as reagent]))
+
+(defn render-toggle
+  ([]
+   (render-toggle {}))
+  ([opts]
+   (rtl/render (reagent/as-element  [selectors/toggle opts]))))
+
+(defn render-checkbox
+  ([]
+   (render-checkbox {}))
+  ([opts]
+   (rtl/render (reagent/as-element  [selectors/checkbox opts]))))
+
+(defn render-checkbox-prefill
+  ([]
+   (render-checkbox-prefill {}))
+  ([opts]
+   (rtl/render (reagent/as-element  [selectors/checkbox-prefill opts]))))
+
+(defn render-radio
+  ([]
+   (render-radio {}))
+  ([opts]
+   (rtl/render (reagent/as-element  [selectors/radio opts]))))
+
+(js/global.test "default render of toggle component"
+                (fn []
+                  (render-toggle)
+                  (-> (js/expect  (rtl/screen.getByTestId "toggle-component"))
+                      (.toBeTruthy))))
+
+(js/global.test "toggle component on change is working"
+                (let [mock-fn (js/jest.fn)]
+                  (fn []
+                    (render-toggle {:on-change mock-fn})
+                    (rtl/fireEvent.press (rtl/screen.getByTestId "toggle-component"))
+                    (-> (js/expect mock-fn)
+                        (.toHaveBeenCalledTimes 1)))))
+
+(js/global.test "default render of radio component"
+                (fn []
+                  (render-radio)
+                  (-> (js/expect  (rtl/screen.getByTestId "radio-component"))
+                      (.toBeTruthy))))
+
+(js/global.test "radio component on change is working"
+                (let [mock-fn (js/jest.fn)]
+                  (fn []
+                    (render-radio {:on-change mock-fn})
+                    (rtl/fireEvent.press (rtl/screen.getByTestId "radio-component"))
+                    (-> (js/expect mock-fn)
+                        (.toHaveBeenCalledTimes 1)))))
+
+(js/global.test "default render of checkbox component"
+                (fn []
+                  (render-checkbox)
+                  (-> (js/expect  (rtl/screen.getByTestId "checkbox-component"))
+                      (.toBeTruthy))))
+
+(js/global.test "checkbox component on change is working"
+                (let [mock-fn (js/jest.fn)]
+                  (fn []
+                    (render-checkbox {:on-change mock-fn})
+                    (rtl/fireEvent.press (rtl/screen.getByTestId "checkbox-component"))
+                    (-> (js/expect mock-fn)
+                        (.toHaveBeenCalledTimes 1)))))
+
+(js/global.test "default render of checkbox-prefill component"
+                (fn []
+                  (render-checkbox-prefill)
+                  (-> (js/expect  (rtl/screen.getByTestId "checkbox-prefill-component"))
+                      (.toBeTruthy))))
+
+(js/global.test "checkbox-prefill component on change is working"
+                (let [mock-fn (js/jest.fn)]
+                  (fn []
+                    (render-checkbox-prefill {:on-change mock-fn})
+                    (rtl/fireEvent.press (rtl/screen.getByTestId "checkbox-prefill-component"))
+                    (-> (js/expect mock-fn)
+                        (.toHaveBeenCalledTimes 1)))))

src/quo2/components/selectors/selectors.cljs

@@ -43,7 +43,8 @@
                                        (colors/alpha colors/neutral-20 (if disabled? 0.3 1))
                                        (colors/alpha colors/neutral-70 (if disabled? 0.3 1))))})
          :accessibility-label (str "checkbox-" (if @checked? "on" "off"))
-         :accessibility-role  :checkbox}
+         :accessibility-role  :checkbox
+         :testID "checkbox-prefill-component"}
         (when @checked?
           [rn/view {:style
                     {:height 20
@@ -82,7 +83,8 @@
                   :border-color     (if @checked? :none
                                         (get-color @checked? disabled? blurred-background?))}
           :accessibility-label (str "checkbox-" (if @checked? "on" "off"))
-          :accessibility-role  :checkbox}
+          :accessibility-role  :checkbox
+          :testID "checkbox-component"}
          (when @checked?
            [rn/view {:style
                      {:height 20
@@ -108,7 +110,8 @@
                                       (colors/theme-colors colors/white
                                                            (colors/alpha colors/neutral-80 0.4)))})
          :accessibility-label (str "radio-" (if @checked? "on" "off"))
-         :accessibility-role  :checkbox}
+         :accessibility-role  :checkbox
+         :testID "radio-component"}
 
         [rn/view {:style
                   {:margin-left :auto
@@ -133,7 +136,8 @@
                   :border-radius 20
                   :background-color (get-color @checked? disabled? blurred-background?)})
          :accessibility-label (str "toggle-" (if @checked? "on" "off"))
-         :accessibility-role  :checkbox}
+         :accessibility-role  :checkbox
+         :testID "toggle-component"}
         [rn/view {:style
                   {:margin-left (if @checked? 12 2)
                    :height 16

src/quo2/components/tabs/tabs.cljs

@@ -12,26 +12,29 @@
 
 (def default-tab-size 32)
 
+(defn indicator []
+  [rn/view {:position         :absolute
+            :z-index          1
+            :right            -2
+            :top              -2
+            :width            10
+            :height           10
+            :border-radius    5
+            :justify-content  :center
+            :align-items      :center
+            :background-color (colors/theme-colors colors/neutral-5 colors/neutral-95)}
+   [notification-dot]])
+
 (defn tabs [{:keys [default-active on-change style]}]
   (let [active-tab-id (reagent/atom default-active)]
     (fn [{:keys [data size] :or {size default-tab-size}}]
       [rn/view (merge {:flex-direction :row} style)
        (doall
-        (for [{:keys [label id new-info accessibility-label]} data]
+        (for [{:keys [label id notification-dot? accessibility-label]} data]
           ^{:key id}
           [rn/view {:style {:margin-right (if (= size default-tab-size) 12 8)}}
-           (when new-info
-             [rn/view {:position         :absolute
-                       :z-index          1
-                       :right            -2
-                       :top              -2
-                       :width            10
-                       :height           10
-                       :border-radius    5
-                       :justify-content  :center
-                       :align-items      :center
-                       :background-color (colors/theme-colors colors/neutral-5 colors/neutral-95)}
-              [notification-dot]])
+           (when notification-dot?
+             [indicator])
            [tab/tab
             {:id                  id
              :size                size
@@ -155,7 +158,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
                                                                                                                 :viewPosition 0.5}))

src/quo2/components/tags/permission_tag.cljs

@@ -104,11 +104,12 @@
 
 (defn tag
   [_ _]
-  (fn [{:keys [locked tokens size background-color]
+  (fn [{:keys [locked tokens size background-color on-press]
         :or {size 24}}]
     [base-tag/base-tag {:background-color  background-color
                         :size              size
-                        :type              :permission}
+                        :type              :permission
+                        :on-press          on-press}
      [rn/view  {:flex-direction   :row
                 :align-items      :center
                 :justify-content  :flex-end}

src/quo2/core.cljs

@@ -15,8 +15,10 @@
             quo2.components.community.community-list-view
             quo2.components.community.community-view
             quo2.components.community.discover-card
+            quo2.components.community.token-gating
             quo2.components.counter.counter
             quo2.components.dividers.divider-label
+            quo2.components.dividers.date
             quo2.components.dividers.new-messages
             quo2.components.drawers.action-drawers
             quo2.components.dropdowns.dropdown
@@ -35,11 +37,12 @@
             quo2.components.tags.context-tags
             quo2.components.tabs.tabs
             quo2.components.tabs.account-selector
-            quo2.components.navigation.top-nav
             quo2.components.navigation.floating-shell-button
             quo2.components.tags.status-tags
             quo2.components.navigation.page-nav
-            quo2.components.selectors.disclaimer))
+            quo2.components.selectors.disclaimer
+            quo2.components.selectors.selectors
+            quo2.components.loaders.skeleton))
 
 (def button quo2.components.buttons.button/button)
 (def dynamic-button quo2.components.buttons.dynamic-button/dynamic-button)
@@ -58,14 +61,16 @@
 (def tags quo2.components.tags.tags/tags)
 (def user-avatar-tag quo2.components.tags.context-tags/user-avatar-tag)
 (def context-tag quo2.components.tags.context-tags/context-tag)
+(def group-avatar-tag quo2.components.tags.context-tags/group-avatar-tag)
 (def tabs quo2.components.tabs.tabs/tabs)
 (def scrollable-tabs quo2.components.tabs.tabs/scrollable-tabs)
 (def account-selector quo2.components.tabs.account-selector/account-selector)
-(def top-nav quo2.components.navigation.top-nav/top-nav)
 (def floating-shell-button quo2.components.navigation.floating-shell-button/floating-shell-button)
 (def status-tag quo2.components.tags.status-tags/status-tag)
 (def page-nav quo2.components.navigation.page-nav/page-nav)
 (def disclaimer quo2.components.selectors.disclaimer/disclaimer)
+(def checkbox quo2.components.selectors.selectors/checkbox)
+(def skeleton quo2.components.loaders.skeleton/skeleton)
 
 ;;;; AVATAR
 (def account-avatar quo2.components.avatars.account-avatar/account-avatar)
@@ -85,10 +90,12 @@
 (def community-title quo2.components.community.community-view/community-title)
 (def permission-tag-container quo2.components.community.community-view/permission-tag-container)
 (def discover-card quo2.components.community.discover-card/discover-card)
+(def token-gating quo2.components.community.token-gating/token-gating)
 
 ;;;; DIVIDERS
 (def divider-label quo2.components.dividers.divider-label/divider-label)
 (def new-messages quo2.components.dividers.new-messages/new-messages)
+(def divider-date quo2.components.dividers.date/date)
 
 ;;;; LIST ITEMS
 (def channel-list-item quo2.components.list-items.channel/list-item)

src/quo2/core_spec.cljs

@@ -0,0 +1,4 @@
+(ns quo2.core-spec
+  (:require [quo2.components.selectors.--tests--.selectors-component-spec]
+            [quo2.components.counter.--tests--.counter-component-spec]
+            [quo2.components.drawers.--tests--.action-drawers-component-spec]))

src/react_native/core.cljs

@@ -1,10 +1,13 @@
 (ns react-native.core
   (:require [reagent.core :as reagent]
             ["react-native" :as react-native]
+            ["@react-native-community/blur" :as blur]
             [react-native.flat-list :as flat-list]
-            [react-native.section-list :as section-list]))
+            [react-native.section-list :as section-list]
+            [react-native.platform :as platform]))
 
 (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)))
@@ -53,3 +56,17 @@
   (js->clj (.get (.-Dimensions ^js react-native) "window") :keywordize-keys true))
 
 (def status-bar (.-StatusBar ^js react-native))
+
+(defn hw-back-add-listener [callback]
+  (.addEventListener (.-BackHandler ^js react-native) "hardwareBackPress" callback))
+
+(defn hw-back-remove-listener [callback]
+  (.removeEventListener (.-BackHandler ^js react-native) "hardwareBackPress" callback))
+
+(def keyboard-avoiding-view-class (reagent/adapt-react-class (.-KeyboardAvoidingView react-native)))
+
+(defn keyboard-avoiding-view [props & children]
+  (into [keyboard-avoiding-view-class
+         (merge (when platform/ios? {:behavior :padding})
+                props)]
+        children))

src/react_native/platform.cljs

@@ -5,5 +5,9 @@
 
 (def os (when platform (.-OS ^js platform)))
 
+(def version (when platform (.-Version ^js platform)))
+
 (def android? (= os "android"))
 (def ios? (= os "ios"))
+
+(def low-device? (and android? (< version 29)))

src/status_im/activity_center/core.cljs

@@ -6,6 +6,14 @@
             [status-im.utils.fx :as fx]
             [taoensso.timbre :as log]))
 
+(def defaults
+  {:filter-status          :unread
+   :filter-type            types/no-type
+   ;; Choose the maximum number of notifications that *usually/safely* fit on
+   ;; most screens, so that the UI doesn't have to needlessly render
+   ;; notifications.
+   :notifications-per-page 8})
+
 ;;;; Navigation
 
 (fx/defn open-activity-center
@@ -75,6 +83,35 @@
        (map data-store.activities/<-rpc)
        (notifications-reconcile cofx)))
 
+;;;; Mark notifications as read
+
+(defn- get-notification
+  [db notification-id]
+  (->> (get-in db [:activity-center
+                   :notifications
+                   (get-in db [:activity-center :filter :type])
+                   (get-in db [:activity-center :filter :status])
+                   :data])
+       (filter #(= notification-id (:id %)))
+       first))
+
+(fx/defn mark-as-read
+  {:events [:activity-center.notifications/mark-as-read]}
+  [{:keys [db]} notification-id]
+  (when-let [notification (get-notification db notification-id)]
+    {::json-rpc/call [{:method     "wakuext_markActivityCenterNotificationsRead"
+                       :params     [[notification-id]]
+                       :on-success #(rf/dispatch [:activity-center.notifications/mark-as-read-success notification])
+                       :on-error   #(rf/dispatch [:activity-center/process-notification-failure
+                                                  notification-id
+                                                  :notification/mark-as-read
+                                                  %])}]}))
+
+(fx/defn mark-as-read-success
+  {:events [:activity-center.notifications/mark-as-read-success]}
+  [cofx notification]
+  (notifications-reconcile cofx [(assoc notification :read true)]))
+
 ;;;; Contact verification
 
 (fx/defn contact-verification-decline
@@ -123,14 +160,6 @@
 
 ;;;; Notifications fetching and pagination
 
-(def defaults
-  {:filter-status          :unread
-   :filter-type            types/no-type
-   ;; Choose the maximum number of notifications that *usually/safely* fit on
-   ;; most screens, so that the UI doesn't have to needlessly render
-   ;; notifications.
-   :notifications-per-page 8})
-
 (def start-or-end-cursor
   "")
 
@@ -149,13 +178,14 @@
     99))
 
 (fx/defn notifications-fetch
-  [{:keys [db]} {:keys [cursor filter-type filter-status reset-data?]}]
+  [{:keys [db]} {:keys [cursor per-page filter-type filter-status reset-data?]}]
   (when-not (get-in db [:activity-center :notifications filter-type filter-status :loading?])
-    {:db             (assoc-in db [:activity-center :notifications filter-type filter-status :loading?] true)
-     ::json-rpc/call [{:method     "wakuext_activityCenterNotificationsBy"
-                       :params     [cursor (defaults :notifications-per-page) filter-type (status filter-status)]
-                       :on-success #(rf/dispatch [:activity-center.notifications/fetch-success filter-type filter-status reset-data? %])
-                       :on-error   #(rf/dispatch [:activity-center.notifications/fetch-error filter-type filter-status %])}]}))
+    (let [per-page (or per-page (defaults :notifications-per-page))]
+      {:db             (assoc-in db [:activity-center :notifications filter-type filter-status :loading?] true)
+       ::json-rpc/call [{:method     "wakuext_activityCenterNotificationsBy"
+                         :params     [cursor per-page filter-type (status filter-status)]
+                         :on-success #(rf/dispatch [:activity-center.notifications/fetch-success filter-type filter-status reset-data? %])
+                         :on-error   #(rf/dispatch [:activity-center.notifications/fetch-error filter-type filter-status %])}]})))
 
 (fx/defn notifications-fetch-first-page
   {:events [:activity-center.notifications/fetch-first-page]}
@@ -202,6 +232,35 @@
                           (constantly processed)
                           #(concat %1 processed))))}))
 
+(fx/defn notifications-fetch-unread-contact-requests
+  "Unread contact requests are, in practical terms, the same as pending contact
+  requests in the new Activity Center, because pending contact requests are
+  always marked as unread, and once the user declines/accepts the request, they
+  are marked as read.
+
+  If this relationship ever changes, we will probably need to change the backend
+  to explicitly support fetching notifications for 'pending' contact requests."
+  {:events [:activity-center.notifications/fetch-unread-contact-requests]}
+  [cofx]
+  (notifications-fetch cofx {:cursor        start-or-end-cursor
+                             :filter-status :unread
+                             :filter-type   types/contact-request
+                             :per-page      20
+                             :reset-data?   true}))
+
+(fx/defn notifications-fetch-unread-count
+  {:events [:activity-center.notifications/fetch-unread-count]}
+  [_]
+  {::json-rpc/call [{:method     "wakuext_unreadActivityCenterNotificationsCount"
+                     :params     []
+                     :on-success #(rf/dispatch [:activity-center.notifications/fetch-unread-count-success %])
+                     :on-error   #()}]})
+
+(fx/defn notifications-fetch-unread-count-success
+  {:events [:activity-center.notifications/fetch-unread-count-success]}
+  [{:keys [db]} result]
+  {:db (assoc-in db [:activity-center :unread-count] result)})
+
 (fx/defn notifications-fetch-error
   {:events [:activity-center.notifications/fetch-error]}
   [{:keys [db]} filter-type filter-status error]

src/status_im/activity_center/core_test.cljs

@@ -2,20 +2,112 @@
   (:require [cljs.test :refer [deftest is testing]]
             [day8.re-frame.test :as rf-test]
             [re-frame.core :as rf]
+            [status-im.activity-center.core :as activity-center]
             [status-im.activity-center.notification-types :as types]
             [status-im.constants :as constants]
             [status-im.ethereum.json-rpc :as json-rpc]
             status-im.events
-            [status-im.test-helpers :as h]
-            [status-im2.setup.config :as config]))
+            [status-im.test-helpers :as h]))
+
+(def notification-id "0x1")
 
 (defn setup []
   (h/register-helper-events)
   (rf/dispatch [:setup/app-started]))
 
-;;;; Contact verification
+(defn test-log-on-failure
+  [{:keys [before-test notification-id event action]}]
+  (rf-test/run-test-sync
+   (setup)
+   (h/using-log-test-appender
+    (fn [logs]
+      (when before-test
+        (before-test))
+      (h/stub-fx-with-callbacks ::json-rpc/call :on-error (constantly :fake-error))
 
-(def notification-id 24)
+      (rf/dispatch event)
+
+      (is (= {:args  [(str "Failed to " action)
+                      {:notification-id notification-id
+                       :error           :fake-error}]
+              :level :warn}
+             (last @logs)))))))
+
+;;;; Misc
+
+(deftest mark-as-read-test
+  (testing "does nothing if the notification ID cannot be found in the app db"
+    (rf-test/run-test-sync
+     (setup)
+     (let [spy-queue (atom [])]
+       (h/spy-fx spy-queue ::json-rpc/call)
+       (let [notifications {types/one-to-one-chat
+                            {:all    {:cursor "" :data [{:id   notification-id
+                                                         :read false
+                                                         :type types/one-to-one-chat}]}
+                             :unread {:cursor "" :data []}}}]
+         (rf/dispatch [:test/assoc-in [:activity-center]
+                       {:notifications notifications
+                        :filter        {:type   types/one-to-one-chat
+                                        :status :all}}])
+
+         (rf/dispatch [:activity-center.notifications/mark-as-read "0x666"])
+
+         (is (= [] @spy-queue))
+         (is (= notifications (get-in (h/db) [:activity-center :notifications])))))))
+
+  (testing "marks notifications as read and updates app db"
+    (rf-test/run-test-sync
+     (setup)
+     (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat}
+           notif-2     {:id "0x2" :read false :type types/one-to-one-chat}
+           notif-3     {:id "0x3" :read false :type types/one-to-one-chat}
+           new-notif-3 (assoc notif-3 :read true)
+           new-notif-2 (assoc notif-2 :read true)]
+       (h/stub-fx-with-callbacks ::json-rpc/call :on-success (constantly nil))
+       (rf/dispatch [:test/assoc-in [:activity-center]
+                     {:notifications {types/one-to-one-chat
+                                      {:all    {:cursor "" :data [notif-3 notif-2 notif-1]}
+                                       :unread {:cursor "" :data [notif-3 notif-2]}}}
+                      :filter        {:type   types/one-to-one-chat
+                                      :status :unread}}])
+
+       (rf/dispatch [:activity-center.notifications/mark-as-read (:id notif-2)])
+       (is (= {types/one-to-one-chat
+               {:all    {:cursor "" :data [notif-3 new-notif-2 notif-1]}
+                :unread {:cursor "" :data [notif-3]}}
+
+               types/no-type
+               {:all    {:data [new-notif-2]}
+                :unread {:data []}}}
+              (get-in (h/db) [:activity-center :notifications])))
+
+       (rf/dispatch [:activity-center.notifications/mark-as-read (:id notif-3)])
+       (is (= {types/one-to-one-chat
+               {:all    {:cursor "" :data [new-notif-3 new-notif-2 notif-1]}
+                :unread {:cursor "" :data []}}
+
+               types/no-type
+               {:all    {:data [new-notif-3 new-notif-2]}
+                :unread {:data []}}}
+              (get-in (h/db) [:activity-center :notifications]))))))
+
+  (testing "logs on failure"
+    (test-log-on-failure
+     {:notification-id notification-id
+      :event           [:activity-center.notifications/mark-as-read notification-id]
+      :action          :notification/mark-as-read
+      :before-test     (fn []
+                         (rf/dispatch [:test/assoc-in [:activity-center]
+                                       {:notifications {types/one-to-one-chat
+                                                        {:all    {:cursor "" :data [{:id   notification-id
+                                                                                     :read false
+                                                                                     :type types/one-to-one-chat}]}
+                                                         :unread {:cursor "" :data []}}}
+                                        :filter        {:type   types/one-to-one-chat
+                                                        :status :all}}]))})))
+
+;;;; Contact verification
 
 (def contact-verification-rpc-response
   {:activityCenterNotifications
@@ -59,22 +151,6 @@
    :timestamp                   1666647286000
    :type                        types/contact-verification})
 
-(defn test-log-on-failure
-  [{:keys [notification-id event action]}]
-  (rf-test/run-test-sync
-   (setup)
-   (h/using-log-test-appender
-    (fn [logs]
-      (h/stub-fx-with-callbacks ::json-rpc/call :on-error (constantly :fake-error))
-
-      (rf/dispatch event)
-
-      (is (= {:args  [(str "Failed to " action)
-                      {:notification-id notification-id
-                       :error           :fake-error}]
-              :level :warn}
-             (last @logs)))))))
-
 (defn test-contact-verification-event
   [{:keys [event expected-rpc-call]}]
   (rf-test/run-test-sync
@@ -98,345 +174,370 @@
                 (select-keys [:method :params])))))))
 
 (deftest contact-verification-decline-test
-  (with-redefs [config/new-activity-center-enabled? true]
-    (testing "declines notification and reconciles"
-      (test-contact-verification-event
-       {:event             [:activity-center.contact-verification/decline notification-id]
-        :expected-rpc-call {:method "wakuext_declineContactVerificationRequest"
-                            :params [notification-id]}}))
-    (testing "logs on failure"
-      (test-log-on-failure
-       {:notification-id notification-id
-        :event           [:activity-center.contact-verification/decline notification-id]
-        :action          :contact-verification/decline}))))
+  (testing "declines notification and reconciles"
+    (test-contact-verification-event
+     {:event             [:activity-center.contact-verification/decline notification-id]
+      :expected-rpc-call {:method "wakuext_declineContactVerificationRequest"
+                          :params [notification-id]}}))
+  (testing "logs on failure"
+    (test-log-on-failure
+     {:notification-id notification-id
+      :event           [:activity-center.contact-verification/decline notification-id]
+      :action          :contact-verification/decline})))
 
 (deftest contact-verification-reply-test
-  (with-redefs [config/new-activity-center-enabled? true]
-    (testing "sends reply and reconciles"
-      (let [reply "any answer"]
-        (test-contact-verification-event
-         {:event             [:activity-center.contact-verification/reply notification-id reply]
-          :expected-rpc-call {:method "wakuext_acceptContactVerificationRequest"
-                              :params [notification-id reply]}})))
-    (testing "logs on failure"
-      (test-log-on-failure
-       {:notification-id notification-id
-        :event           [:activity-center.contact-verification/reply notification-id "any answer"]
-        :action          :contact-verification/reply}))))
+  (testing "sends reply and reconciles"
+    (let [reply "any answer"]
+      (test-contact-verification-event
+       {:event             [:activity-center.contact-verification/reply notification-id reply]
+        :expected-rpc-call {:method "wakuext_acceptContactVerificationRequest"
+                            :params [notification-id reply]}})))
+  (testing "logs on failure"
+    (test-log-on-failure
+     {:notification-id notification-id
+      :event           [:activity-center.contact-verification/reply notification-id "any answer"]
+      :action          :contact-verification/reply})))
 
 (deftest contact-verification-mark-as-trusted-test
-  (with-redefs [config/new-activity-center-enabled? true]
-    (testing "marks notification as trusted and reconciles"
-      (test-contact-verification-event
-       {:event             [:activity-center.contact-verification/mark-as-trusted notification-id]
-        :expected-rpc-call {:method "wakuext_verifiedTrusted"
-                            :params [{:id notification-id}]}}))
-    (testing "logs on failure"
-      (test-log-on-failure
-       {:notification-id notification-id
-        :event           [:activity-center.contact-verification/mark-as-trusted notification-id]
-        :action          :contact-verification/mark-as-trusted}))))
+  (testing "marks notification as trusted and reconciles"
+    (test-contact-verification-event
+     {:event             [:activity-center.contact-verification/mark-as-trusted notification-id]
+      :expected-rpc-call {:method "wakuext_verifiedTrusted"
+                          :params [{:id notification-id}]}}))
+  (testing "logs on failure"
+    (test-log-on-failure
+     {:notification-id notification-id
+      :event           [:activity-center.contact-verification/mark-as-trusted notification-id]
+      :action          :contact-verification/mark-as-trusted})))
 
 (deftest contact-verification-mark-as-untrustworthy-test
-  (with-redefs [config/new-activity-center-enabled? true]
-    (testing "marks notification as untrustworthy and reconciles"
-      (test-contact-verification-event
-       {:event             [:activity-center.contact-verification/mark-as-untrustworthy notification-id]
-        :expected-rpc-call {:method "wakuext_verifiedUntrustworthy"
-                            :params [{:id notification-id}]}}))
-    (testing "logs on failure"
-      (test-log-on-failure
-       {:notification-id notification-id
-        :event           [:activity-center.contact-verification/mark-as-untrustworthy notification-id]
-        :action          :contact-verification/mark-as-untrustworthy}))))
+  (testing "marks notification as untrustworthy and reconciles"
+    (test-contact-verification-event
+     {:event             [:activity-center.contact-verification/mark-as-untrustworthy notification-id]
+      :expected-rpc-call {:method "wakuext_verifiedUntrustworthy"
+                          :params [{:id notification-id}]}}))
+  (testing "logs on failure"
+    (test-log-on-failure
+     {:notification-id notification-id
+      :event           [:activity-center.contact-verification/mark-as-untrustworthy notification-id]
+      :action          :contact-verification/mark-as-untrustworthy})))
 
 ;;;; Notification reconciliation
 
 (deftest notifications-reconcile-test
-  (with-redefs [config/new-activity-center-enabled? true]
-    (testing "does nothing when there are no new notifications"
-      (rf-test/run-test-sync
-       (setup)
-       (let [notifications {types/one-to-one-chat
-                            {:all    {:cursor ""
-                                      :data   [{:id   "0x1"
-                                                :read true
-                                                :type types/one-to-one-chat}
-                                               {:id   "0x2"
-                                                :read false
-                                                :type types/one-to-one-chat}]}
-                             :unread {:cursor ""
-                                      :data   [{:id   "0x3"
-                                                :read false
-                                                :type types/one-to-one-chat}]}}
-                            types/private-group-chat
-                            {:unread {:cursor ""
-                                      :data   [{:id   "0x4"
-                                                :read false
-                                                :type types/private-group-chat}]}}}]
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications] notifications])
+  (testing "does nothing when there are no new notifications"
+    (rf-test/run-test-sync
+     (setup)
+     (let [notifications {types/one-to-one-chat
+                          {:all    {:cursor ""
+                                    :data   [{:id   "0x1"
+                                              :read true
+                                              :type types/one-to-one-chat}
+                                             {:id   "0x2"
+                                              :read false
+                                              :type types/one-to-one-chat}]}
+                           :unread {:cursor ""
+                                    :data   [{:id   "0x3"
+                                              :read false
+                                              :type types/one-to-one-chat}]}}
+                          types/private-group-chat
+                          {:unread {:cursor ""
+                                    :data   [{:id   "0x4"
+                                              :read false
+                                              :type types/private-group-chat}]}}}]
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications] notifications])
 
-         (rf/dispatch [:activity-center.notifications/reconcile nil])
+       (rf/dispatch [:activity-center.notifications/reconcile nil])
 
-         (is (= notifications (get-in (h/db) [:activity-center :notifications]))))))
+       (is (= notifications (get-in (h/db) [:activity-center :notifications]))))))
 
-    (testing "removes dismissed or accepted notifications"
-      (rf-test/run-test-sync
-       (setup)
-       (let [notif-1 {:id "0x1" :read true :type types/one-to-one-chat}
-             notif-2 {:id "0x2" :read false :type types/one-to-one-chat}
-             notif-3 {:id "0x3" :read false :type types/one-to-one-chat}
-             notif-4 {:id "0x4" :read false :type types/private-group-chat}
-             notif-5 {:id "0x5" :read true :type types/private-group-chat}
-             notif-6 {:id "0x6" :read false :type types/private-group-chat}]
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications]
-                       {types/one-to-one-chat
-                        {:all    {:cursor "" :data [notif-1 notif-2]}
-                         :unread {:cursor "" :data [notif-3]}}
-                        types/private-group-chat
-                        {:unread {:cursor "" :data [notif-4 notif-6]}}}])
+  (testing "removes dismissed or accepted notifications"
+    (rf-test/run-test-sync
+     (setup)
+     (let [notif-1 {:id "0x1" :read true :type types/one-to-one-chat}
+           notif-2 {:id "0x2" :read false :type types/one-to-one-chat}
+           notif-3 {:id "0x3" :read false :type types/one-to-one-chat}
+           notif-4 {:id "0x4" :read false :type types/private-group-chat}
+           notif-5 {:id "0x5" :read true :type types/private-group-chat}
+           notif-6 {:id "0x6" :read false :type types/private-group-chat}]
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications]
+                     {types/one-to-one-chat
+                      {:all    {:cursor "" :data [notif-1 notif-2]}
+                       :unread {:cursor "" :data [notif-3]}}
+                      types/private-group-chat
+                      {:unread {:cursor "" :data [notif-4 notif-6]}}}])
 
-         (rf/dispatch [:activity-center.notifications/reconcile
-                       [(assoc notif-1 :dismissed true)
-                        (assoc notif-3 :accepted true)
-                        (assoc notif-4 :dismissed true)
-                        notif-5]])
+       (rf/dispatch [:activity-center.notifications/reconcile
+                     [(assoc notif-1 :dismissed true)
+                      (assoc notif-3 :accepted true)
+                      (assoc notif-4 :dismissed true)
+                      notif-5]])
 
-         (is (= {types/no-type
-                 {:all    {:data [notif-5]}
-                  :unread {:data []}}
-                 types/one-to-one-chat
-                 {:all    {:cursor "" :data [notif-2]}
-                  :unread {:cursor "" :data []}}
-                 types/private-group-chat
-                 {:all    {:data [notif-5]}
-                  :unread {:cursor "" :data [notif-6]}}}
-                (get-in (h/db) [:activity-center :notifications]))))))
+       (is (= {types/no-type
+               {:all    {:data [notif-5]}
+                :unread {:data []}}
+               types/one-to-one-chat
+               {:all    {:cursor "" :data [notif-2]}
+                :unread {:cursor "" :data []}}
+               types/private-group-chat
+               {:all    {:data [notif-5]}
+                :unread {:cursor "" :data [notif-6]}}}
+              (get-in (h/db) [:activity-center :notifications]))))))
 
-    (testing "replaces old notifications with newly arrived ones"
-      (rf-test/run-test-sync
-       (setup)
-       (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat}
-             notif-4     {:id "0x4" :read false :type types/private-group-chat}
-             notif-6     {:id "0x6" :read false :type types/private-group-chat}
-             new-notif-1 (assoc notif-1 :last-message {})
-             new-notif-4 (assoc notif-4 :author "0xabc")]
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications]
-                       {types/no-type
-                        {:all    {:cursor "" :data [notif-1]}
-                         :unread {:cursor "" :data [notif-4 notif-6]}}
-                        types/one-to-one-chat
-                        {:all {:cursor "" :data [notif-1]}}
-                        types/private-group-chat
-                        {:unread {:cursor "" :data [notif-4 notif-6]}}}])
+  (testing "replaces old notifications with newly arrived ones"
+    (rf-test/run-test-sync
+     (setup)
+     (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat}
+           notif-4     {:id "0x4" :read false :type types/private-group-chat}
+           notif-6     {:id "0x6" :read false :type types/private-group-chat}
+           new-notif-1 (assoc notif-1 :last-message {})
+           new-notif-4 (assoc notif-4 :author "0xabc")]
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications]
+                     {types/no-type
+                      {:all    {:cursor "" :data [notif-1]}
+                       :unread {:cursor "" :data [notif-4 notif-6]}}
+                      types/one-to-one-chat
+                      {:all {:cursor "" :data [notif-1]}}
+                      types/private-group-chat
+                      {:unread {:cursor "" :data [notif-4 notif-6]}}}])
 
-         (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1 new-notif-4 notif-6]])
+       (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1 new-notif-4 notif-6]])
 
-         (is (= {types/no-type
-                 {:all    {:cursor "" :data [notif-6 new-notif-4 new-notif-1]}
-                  :unread {:cursor "" :data [notif-6 new-notif-4]}}
-                 types/one-to-one-chat
-                 {:all    {:cursor "" :data [new-notif-1]}
-                  :unread {:data []}}
-                 types/private-group-chat
-                 {:all    {:data [notif-6 new-notif-4]}
-                  :unread {:cursor "" :data [notif-6 new-notif-4]}}}
-                (get-in (h/db) [:activity-center :notifications]))))))
+       (is (= {types/no-type
+               {:all    {:cursor "" :data [notif-6 new-notif-4 new-notif-1]}
+                :unread {:cursor "" :data [notif-6 new-notif-4]}}
+               types/one-to-one-chat
+               {:all    {:cursor "" :data [new-notif-1]}
+                :unread {:data []}}
+               types/private-group-chat
+               {:all    {:data [notif-6 new-notif-4]}
+                :unread {:cursor "" :data [notif-6 new-notif-4]}}}
+              (get-in (h/db) [:activity-center :notifications]))))))
 
-    (testing "reconciles notifications that switched their read/unread status"
-      (rf-test/run-test-sync
-       (setup)
-       (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat}
-             new-notif-1 (assoc notif-1 :read false)]
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications]
-                       {types/one-to-one-chat
-                        {:all {:cursor "" :data [notif-1]}}}])
+  (testing "reconciles notifications that switched their read/unread status"
+    (rf-test/run-test-sync
+     (setup)
+     (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat}
+           new-notif-1 (assoc notif-1 :read false)]
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications]
+                     {types/one-to-one-chat
+                      {:all {:cursor "" :data [notif-1]}}}])
 
-         (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1]])
+       (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1]])
 
-         (is (= {types/no-type
-                 {:all    {:data [new-notif-1]}
-                  :unread {:data [new-notif-1]}}
+       (is (= {types/no-type
+               {:all    {:data [new-notif-1]}
+                :unread {:data [new-notif-1]}}
 
-                 types/one-to-one-chat
-                 {:all    {:cursor "" :data [new-notif-1]}
-                  :unread {:data [new-notif-1]}}}
-                (get-in (h/db) [:activity-center :notifications]))))))
+               types/one-to-one-chat
+               {:all    {:cursor "" :data [new-notif-1]}
+                :unread {:data [new-notif-1]}}}
+              (get-in (h/db) [:activity-center :notifications]))))))
 
-    ;; Sorting by timestamp and ID is compatible with what the backend does when
-    ;; returning paginated results.
-    (testing "sorts notifications by timestamp and id in descending order"
-      (rf-test/run-test-sync
-       (setup)
-       (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat :timestamp 1}
-             notif-2     {:id "0x2" :read true :type types/one-to-one-chat :timestamp 1}
-             notif-3     {:id "0x3" :read false :type types/one-to-one-chat :timestamp 50}
-             notif-4     {:id "0x4" :read false :type types/one-to-one-chat :timestamp 100}
-             notif-5     {:id "0x5" :read false :type types/one-to-one-chat :timestamp 100}
-             new-notif-1 (assoc notif-1 :last-message {})
-             new-notif-4 (assoc notif-4 :last-message {})]
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications]
-                       {types/one-to-one-chat
-                        {:all    {:cursor "" :data [notif-1 notif-2]}
-                         :unread {:cursor "" :data [notif-3 notif-4 notif-5]}}}])
+  ;; Sorting by timestamp and ID is compatible with what the backend does when
+  ;; returning paginated results.
+  (testing "sorts notifications by timestamp and id in descending order"
+    (rf-test/run-test-sync
+     (setup)
+     (let [notif-1     {:id "0x1" :read true :type types/one-to-one-chat :timestamp 1}
+           notif-2     {:id "0x2" :read true :type types/one-to-one-chat :timestamp 1}
+           notif-3     {:id "0x3" :read false :type types/one-to-one-chat :timestamp 50}
+           notif-4     {:id "0x4" :read false :type types/one-to-one-chat :timestamp 100}
+           notif-5     {:id "0x5" :read false :type types/one-to-one-chat :timestamp 100}
+           new-notif-1 (assoc notif-1 :last-message {})
+           new-notif-4 (assoc notif-4 :last-message {})]
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications]
+                     {types/one-to-one-chat
+                      {:all    {:cursor "" :data [notif-1 notif-2]}
+                       :unread {:cursor "" :data [notif-3 notif-4 notif-5]}}}])
 
-         (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1 new-notif-4]])
+       (rf/dispatch [:activity-center.notifications/reconcile [new-notif-1 new-notif-4]])
 
-         (is (= {types/no-type
-                 {:all    {:data [new-notif-4 new-notif-1]}
-                  :unread {:data [new-notif-4]}}
-                 types/one-to-one-chat
-                 {:all    {:cursor "" :data [new-notif-4 notif-2 new-notif-1]}
-                  :unread {:cursor "" :data [notif-5 new-notif-4 notif-3]}}}
-                (get-in (h/db) [:activity-center :notifications]))))))))
+       (is (= {types/no-type
+               {:all    {:data [new-notif-4 new-notif-1]}
+                :unread {:data [new-notif-4]}}
+               types/one-to-one-chat
+               {:all    {:cursor "" :data [new-notif-4 notif-2 new-notif-1]}
+                :unread {:cursor "" :data [notif-5 new-notif-4 notif-3]}}}
+              (get-in (h/db) [:activity-center :notifications])))))))
 
 ;;;; Notifications fetching and pagination
 
 (deftest notifications-fetch-test
-  (with-redefs [config/new-activity-center-enabled? true]
-    (testing "fetches first page"
-      (rf-test/run-test-sync
-       (setup)
-       (let [spy-queue (atom [])]
-         (h/stub-fx-with-callbacks
-          ::json-rpc/call
-          :on-success (constantly {:cursor        "10"
-                                   :notifications [{:id     "0x1"
-                                                    :type   types/one-to-one-chat
-                                                    :read   false
-                                                    :chatId "0x9"}]}))
-         (h/spy-fx spy-queue ::json-rpc/call)
+  (testing "fetches first page"
+    (rf-test/run-test-sync
+     (setup)
+     (let [spy-queue (atom [])]
+       (h/stub-fx-with-callbacks
+        ::json-rpc/call
+        :on-success (constantly {:cursor        "10"
+                                 :notifications [{:id     "0x1"
+                                                  :type   types/one-to-one-chat
+                                                  :read   false
+                                                  :chatId "0x9"}]}))
+       (h/spy-fx spy-queue ::json-rpc/call)
 
-         (rf/dispatch [:activity-center.notifications/fetch-first-page
-                       {:filter-type types/one-to-one-chat}])
+       (rf/dispatch [:activity-center.notifications/fetch-first-page
+                     {:filter-type types/one-to-one-chat}])
 
-         (is (= :unread (get-in (h/db) [:activity-center :filter :status])))
-         (is (= "" (get-in @spy-queue [0 :args 0 :params 0]))
-             "Should be called with empty cursor when fetching first page")
-         (is (= {types/one-to-one-chat
-                 {:unread {:cursor "10"
-                           :data   [{:chat-id       "0x9"
-                                     :chat-name     nil
-                                     :chat-type     types/one-to-one-chat
-                                     :group-chat    false
-                                     :id            "0x1"
-                                     :public?       false
-                                     :last-message  nil
-                                     :message       nil
-                                     :read          false
-                                     :reply-message nil
-                                     :type          types/one-to-one-chat}]}}}
-                (get-in (h/db) [:activity-center :notifications]))))))
+       (is (= :unread (get-in (h/db) [:activity-center :filter :status])))
+       (is (= "" (get-in @spy-queue [0 :args 0 :params 0]))
+           "Should be called with empty cursor when fetching first page")
+       (is (= {types/one-to-one-chat
+               {:unread {:cursor "10"
+                         :data   [{:chat-id       "0x9"
+                                   :chat-name     nil
+                                   :chat-type     types/one-to-one-chat
+                                   :group-chat    false
+                                   :id            "0x1"
+                                   :public?       false
+                                   :last-message  nil
+                                   :message       nil
+                                   :read          false
+                                   :reply-message nil
+                                   :type          types/one-to-one-chat}]}}}
+              (get-in (h/db) [:activity-center :notifications]))))))
 
-    (testing "does not fetch next page when pagination cursor reached the end"
-      (rf-test/run-test-sync
-       (setup)
-       (let [spy-queue (atom [])]
-         (h/spy-fx spy-queue ::json-rpc/call)
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
-                       :unread])
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
-                       types/one-to-one-chat])
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
-                       ""])
+  (testing "does not fetch next page when pagination cursor reached the end"
+    (rf-test/run-test-sync
+     (setup)
+     (let [spy-queue (atom [])]
+       (h/spy-fx spy-queue ::json-rpc/call)
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                     :unread])
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                     types/one-to-one-chat])
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
+                     ""])
 
-         (rf/dispatch [:activity-center.notifications/fetch-next-page])
+       (rf/dispatch [:activity-center.notifications/fetch-next-page])
 
-         (is (= [] @spy-queue)))))
+       (is (= [] @spy-queue)))))
 
-    ;; The cursor can be nil sometimes because the reconciliation doesn't care
-    ;; about updating the cursor value, but we have to make sure the next page is
-    ;; only fetched if the current cursor is valid.
-    (testing "does not fetch next page when cursor is nil"
-      (rf-test/run-test-sync
-       (setup)
-       (let [spy-queue (atom [])]
-         (h/spy-fx spy-queue ::json-rpc/call)
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
-                       :unread])
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
-                       types/one-to-one-chat])
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
-                       nil])
+  ;; The cursor can be nil sometimes because the reconciliation doesn't care
+  ;; about updating the cursor value, but we have to make sure the next page is
+  ;; only fetched if the current cursor is valid.
+  (testing "does not fetch next page when cursor is nil"
+    (rf-test/run-test-sync
+     (setup)
+     (let [spy-queue (atom [])]
+       (h/spy-fx spy-queue ::json-rpc/call)
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                     :unread])
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                     types/one-to-one-chat])
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
+                     nil])
 
-         (rf/dispatch [:activity-center.notifications/fetch-next-page])
+       (rf/dispatch [:activity-center.notifications/fetch-next-page])
 
-         (is (= [] @spy-queue)))))
+       (is (= [] @spy-queue)))))
 
-    (testing "fetches next page when pagination cursor is not empty"
-      (rf-test/run-test-sync
-       (setup)
-       (let [spy-queue (atom [])]
-         (h/stub-fx-with-callbacks
-          ::json-rpc/call
-          :on-success (constantly {:cursor        ""
-                                   :notifications [{:id     "0x1"
-                                                    :type   types/mention
-                                                    :read   false
-                                                    :chatId "0x9"}]}))
-         (h/spy-fx spy-queue ::json-rpc/call)
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
-                       :unread])
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
-                       types/mention])
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/mention :unread :cursor]
-                       "10"])
+  (testing "fetches next page when pagination cursor is not empty"
+    (rf-test/run-test-sync
+     (setup)
+     (let [spy-queue (atom [])]
+       (h/stub-fx-with-callbacks
+        ::json-rpc/call
+        :on-success (constantly {:cursor        ""
+                                 :notifications [{:id     "0x1"
+                                                  :type   types/mention
+                                                  :read   false
+                                                  :chatId "0x9"}]}))
+       (h/spy-fx spy-queue ::json-rpc/call)
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                     :unread])
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                     types/mention])
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications types/mention :unread :cursor]
+                     "10"])
 
-         (rf/dispatch [:activity-center.notifications/fetch-next-page])
+       (rf/dispatch [:activity-center.notifications/fetch-next-page])
 
-         (is (= "wakuext_activityCenterNotificationsBy" (get-in @spy-queue [0 :args 0 :method])))
-         (is (= "10" (get-in @spy-queue [0 :args 0 :params 0]))
-             "Should be called with current cursor")
-         (is (= {types/mention
-                 {:unread {:cursor ""
-                           :data   [{:chat-id       "0x9"
-                                     :chat-name     nil
-                                     :chat-type     3
-                                     :id            "0x1"
-                                     :last-message  nil
-                                     :message       nil
-                                     :read          false
-                                     :reply-message nil
-                                     :type          types/mention}]}}}
-                (get-in (h/db) [:activity-center :notifications]))))))
+       (is (= "wakuext_activityCenterNotificationsBy" (get-in @spy-queue [0 :args 0 :method])))
+       (is (= "10" (get-in @spy-queue [0 :args 0 :params 0]))
+           "Should be called with current cursor")
+       (is (= {types/mention
+               {:unread {:cursor ""
+                         :data   [{:chat-id       "0x9"
+                                   :chat-name     nil
+                                   :chat-type     3
+                                   :id            "0x1"
+                                   :last-message  nil
+                                   :message       nil
+                                   :read          false
+                                   :reply-message nil
+                                   :type          types/mention}]}}}
+              (get-in (h/db) [:activity-center :notifications]))))))
 
-    (testing "does not fetch next page while it is still loading"
-      (rf-test/run-test-sync
-       (setup)
-       (let [spy-queue (atom [])]
-         (h/spy-fx spy-queue ::json-rpc/call)
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
-                       :all])
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
-                       types/one-to-one-chat])
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :all :cursor]
-                       "10"])
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :all :loading?]
-                       true])
+  (testing "does not fetch next page while it is still loading"
+    (rf-test/run-test-sync
+     (setup)
+     (let [spy-queue (atom [])]
+       (h/spy-fx spy-queue ::json-rpc/call)
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                     :all])
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                     types/one-to-one-chat])
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :all :cursor]
+                     "10"])
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :all :loading?]
+                     true])
 
-         (rf/dispatch [:activity-center.notifications/fetch-next-page])
+       (rf/dispatch [:activity-center.notifications/fetch-next-page])
 
-         (is (= [] @spy-queue)))))
+       (is (= [] @spy-queue)))))
 
-    (testing "resets loading flag after an error"
-      (rf-test/run-test-sync
-       (setup)
-       (let [spy-queue (atom [])]
-         (h/stub-fx-with-callbacks ::json-rpc/call :on-error (constantly :fake-error))
-         (h/spy-event-fx spy-queue :activity-center.notifications/fetch-error)
-         (h/spy-fx spy-queue ::json-rpc/call)
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
-                       :unread])
-         (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
-                       types/one-to-one-chat])
-         (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
-                       ""])
+  (testing "resets loading flag after an error"
+    (rf-test/run-test-sync
+     (setup)
+     (let [spy-queue (atom [])]
+       (h/stub-fx-with-callbacks ::json-rpc/call :on-error (constantly :fake-error))
+       (h/spy-event-fx spy-queue :activity-center.notifications/fetch-error)
+       (h/spy-fx spy-queue ::json-rpc/call)
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :status]
+                     :unread])
+       (rf/dispatch [:test/assoc-in [:activity-center :filter :type]
+                     types/one-to-one-chat])
+       (rf/dispatch [:test/assoc-in [:activity-center :notifications types/one-to-one-chat :unread :cursor]
+                     ""])
 
-         (rf/dispatch [:activity-center.notifications/fetch-first-page])
+       (rf/dispatch [:activity-center.notifications/fetch-first-page])
 
-         (is (nil? (get-in (h/db) [:activity-center :notifications types/one-to-one-chat :unread :loading?])))
-         (is (= [:activity-center.notifications/fetch-error
-                 types/one-to-one-chat
-                 :unread
-                 :fake-error]
-                (:args (last @spy-queue)))))))))
+       (is (nil? (get-in (h/db) [:activity-center :notifications types/one-to-one-chat :unread :loading?])))
+       (is (= [:activity-center.notifications/fetch-error
+               types/one-to-one-chat
+               :unread
+               :fake-error]
+              (:args (last @spy-queue))))))))
+
+(deftest notifications-fetch-unread-contact-requests-test
+  (testing "fetches latest unread contact requests"
+    (let [actual   (activity-center/notifications-fetch-unread-contact-requests {:db {}})
+          per-page 20]
+      (is (= {:activity-center
+              {:notifications
+               {types/contact-request
+                {:unread {:loading? true}}}}}
+             (:db actual)))
+
+      (is (= {:method "wakuext_activityCenterNotificationsBy"
+              :params ["" per-page types/contact-request activity-center/status-unread]}
+             (-> actual
+                 ::json-rpc/call
+                 first
+                 (select-keys [:method :params])))))))
+
+(deftest notifications-fetch-unread-count-test
+  (testing "fetches total notification count and store in db"
+    (rf-test/run-test-sync
+     (setup)
+     (let [spy-queue (atom [])]
+       (h/stub-fx-with-callbacks ::json-rpc/call :on-success (constantly 9))
+       (h/spy-fx spy-queue ::json-rpc/call)
+
+       (rf/dispatch [:activity-center.notifications/fetch-unread-count])
+
+       (is (= "wakuext_unreadActivityCenterNotificationsCount"
+              (get-in @spy-queue [0 :args 0 :method])))
+       (is (= 9 (get-in (h/db) [:activity-center :unread-count])))))))

src/status_im/async_storage/transit.cljs

@@ -1,6 +1,6 @@
 (ns status-im.async-storage.transit
   (:require [cognitect.transit :as transit]
-            [taoensso.timbre :as timbre]))
+            [taoensso.timbre :as log]))
 
 (def reader (transit/reader :json))
 (def writer (transit/writer :json))
@@ -8,4 +8,4 @@
 (defn clj->transit [o] (transit/write writer o))
 (defn transit->clj [o] (try (transit/read reader o)
                             (catch :default e
-                              (timbre/error e))))
+                              (log/error e))))

src/status_im/bottom_sheet/core.cljs

@@ -21,4 +21,4 @@
   {:events [:bottom-sheet/hide]}
   [{:keys [db]}]
   {:hide-bottom-sheet nil
-   :db (assoc db :bottom-sheet/show? false)})
+   :db (assoc db :bottom-sheet/show? false)})

src/status_im/browser/core.cljs

@@ -22,7 +22,7 @@
             [status-im.bottom-sheet.core :as bottom-sheet]
             [status-im.browser.webview-ref :as webview-ref]
             ["eth-phishing-detect" :as eth-phishing-detect]
-            [status-im.utils.debounce :as debounce]
+            [utils.debounce :as debounce]
             [status-im.browser.eip3085 :as eip3085]
             [status-im.browser.eip3326 :as eip3326]))
 

src/status_im/chat/models.cljs

@@ -3,6 +3,8 @@
             [taoensso.timbre :as log]
             [status-im.multiaccounts.model :as multiaccounts.model]
             [status-im.chat.models.message-list :as message-list]
+            [status-im.chat.models.delete-message :as delete-message]
+            [status-im.chat.models.delete-message-for-me :as delete-for-me]
             [status-im.data-store.chats :as chats-store]
             [status-im.mailserver.core :as mailserver]
             [status-im.data-store.contacts :as contacts-store]
@@ -213,6 +215,8 @@
     (chat.state/reset-visible-item)
     (fx/merge cofx
               {:db (dissoc db :current-chat-id)}
+              (delete-for-me/sync-all)
+              (delete-message/send-all)
               (offload-messages chat-id))))
 
 (fx/defn force-close-chat
@@ -265,12 +269,18 @@
 (fx/defn navigate-to-chat-nav2
   "Takes coeffects map and chat-id, returns effects necessary for navigation and preloading data"
   {:events [:chat.ui/navigate-to-chat-nav2]}
-  [{db :db :as cofx} chat-id from-switcher?]
+  [{db :db :as cofx} chat-id from-shell?]
   (fx/merge cofx
-            {:db (assoc db :current-chat-id chat-id)}
-            (offload-messages chat-id)
+            {:dispatch [:navigate-to-nav2 :chat chat-id from-shell?]}
+            (when-not (= (:view-id db) :community)
+              (navigation/pop-to-root-tab :shell-stack))
+            (close-chat)
+            (force-close-chat chat-id)
+            (fn [{:keys [db]}]
+              {:db (assoc db :current-chat-id chat-id)})
             (preload-chat-data chat-id)
-            (navigation/navigate-to-nav2 :chat chat-id nil from-switcher?)))
+            #(when (group-chat? cofx chat-id)
+               (loading/load-chat % chat-id))))
 
 (fx/defn handle-clear-history-response
   {:events [::history-cleared]}

src/status_im/chat/models/delete_message.cljs

@@ -0,0 +1,108 @@
+(ns status-im.chat.models.delete-message
+  (:require [re-frame.core :as re-frame]
+            [status-im.chat.models.message-list :as message-list]
+            [status-im.ethereum.json-rpc :as json-rpc]
+            [status-im.utils.datetime :as datetime]
+            [status-im.utils.fx :as fx]
+            [taoensso.encore :as enc]
+            [taoensso.timbre :as log]))
+
+(defn- update-db-clear-undo-timer
+  [db chat-id message-id]
+  (when (get-in db [:messages chat-id message-id])
+    (update-in db
+               [:messages chat-id message-id]
+               dissoc
+               :deleted-undoable-till)))
+
+(defn- update-db-delete-locally
+  "Delete message in re-frame db and set the undo timelimit"
+  [db chat-id message-id undo-time-limit-ms]
+  (when (get-in db [:messages chat-id message-id])
+    (update-in db
+               [:messages chat-id message-id]
+               assoc
+               :deleted? true
+               :deleted-undoable-till (+ (datetime/timestamp)
+                                         undo-time-limit-ms))))
+
+(defn- update-db-undo-locally
+  "Restore deleted message if called within timelimit"
+  [db chat-id message-id]
+  (let [{:keys [deleted? deleted-undoable-till]}
+        (get-in db [:messages chat-id message-id])]
+    (if (and deleted?
+             (> deleted-undoable-till (datetime/timestamp)))
+      (update-in db
+                 [:messages chat-id message-id]
+                 dissoc
+                 :deleted?
+                 :deleted-undoable-till)
+      (update-db-clear-undo-timer db chat-id message-id))))
+
+(defn- update-db-delete-locally-without-time-limit
+  "Delete message in re-frame db, used to handle received removed-messages"
+  [db chat-id message-id]
+  (when (get-in db [:messages chat-id message-id])
+    (update-in db [:messages chat-id message-id] assoc :deleted? true)))
+
+(fx/defn delete
+  "Delete message now locally and broadcast after undo time limit timeout"
+  {:events [:chat.ui/delete-message]}
+  [{:keys [db]} {:keys [chat-id message-id]} undo-time-limit-ms]
+  (when (get-in db [:messages chat-id message-id])
+    (assoc
+     (message-list/rebuild-message-list
+      {:db (update-db-delete-locally db chat-id message-id undo-time-limit-ms)}
+      chat-id)
+     :utils/dispatch-later [{:dispatch [:chat.ui/delete-message-and-send
+                                        {:chat-id    chat-id
+                                         :message-id message-id}]
+                             :ms       undo-time-limit-ms}])))
+
+(fx/defn undo
+  {:events [:chat.ui/undo-delete-message]}
+  [{:keys [db]} {:keys [chat-id message-id]}]
+  (when (get-in db [:messages chat-id message-id])
+    (message-list/rebuild-message-list
+     {:db (update-db-undo-locally db chat-id message-id)}
+     chat-id)))
+
+(fx/defn delete-and-send
+  {:events [:chat.ui/delete-message-and-send]}
+  [{:keys [db]} {:keys [message-id chat-id]}]
+  (when-let [message (get-in db [:messages chat-id message-id])]
+    (enc/assoc-when
+     {:db             (update-db-clear-undo-timer db chat-id message-id)
+      ::json-rpc/call [{:method      "wakuext_deleteMessageAndSend"
+                        :params      [message-id]
+                        :js-response true
+                        :on-error    #(log/error "failed to delete message " {:message-id message-id :error %})
+                        :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])}]}
+     :dispatch (and (get-in db [:pin-messages chat-id message-id])
+                    [:pin-message/send-pin-message {:chat-id chat-id :message-id message-id :pinned false}]))))
+
+(defn- filter-pending-send-messages
+  "traverse all messages find not yet synced deleted? messages"
+  [acc chat-id messages]
+  (->> messages
+       (filter (fn [[_ {:keys [deleted? deleted-undoable-till]}]] (and deleted? deleted-undoable-till)))
+       (map (fn [message] {:chat-id chat-id :message-id (first message)}))
+       (concat acc)))
+
+(fx/defn send-all
+  "Get all deleted messages that not yet synced with status-go and send them"
+  {:events [:chat.ui/send-all-deleted-messages]}
+  [{:keys [db] :as cofx}]
+  (let [pending-send-messages (reduce-kv filter-pending-send-messages [] (:messages db))]
+    (apply fx/merge cofx (map delete-and-send pending-send-messages))))
+
+(fx/defn delete-messages-localy
+  "Mark messages :deleted? localy in client"
+  {:events [:chat.ui/delete-messages-localy]}
+  [{:keys [db]} messages chat-id]
+  (let [new-db (->> messages
+                    (filter #(get-in db [:messages chat-id (:message-id %)]))
+                    (reduce #(update-db-delete-locally-without-time-limit %1 chat-id (:message-id %2)) db))]
+    (when new-db
+      (message-list/rebuild-message-list {:db new-db} chat-id))))

src/status_im/chat/models/delete_message_for_me.cljs

@@ -69,22 +69,20 @@
      ::json-rpc/call [{:method      "wakuext_deleteMessageForMeAndSync"
                        :params      [chat-id message-id]
                        :js-response true
-                       :on-error    #(log/error "failed to delete message for me " %)
-                       :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response
-                                                         %])}]}))
-(defn- chats-reducer
-  "traverse all messages find not yet synced deleted-for-me? messages, generate dispatch vector"
+                       :on-error    #(log/error "failed to delete message for me, message id: " {:message-id message-id :error %})
+                       :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])}]}))
+
+(defn- filter-pending-sync-messages
+  "traverse all messages find not yet synced deleted-for-me? messages"
   [acc chat-id messages]
-  (reduce-kv
-   (fn [inner-acc message-id {:keys [deleted-for-me? deleted-for-me-undoable-till]}]
-     (if (and deleted-for-me? deleted-for-me-undoable-till)
-       (conj inner-acc [:chat.ui/delete-message-for-me-and-sync chat-id message-id])
-       inner-acc))
-   acc
-   messages))
+  (->> messages
+       (filter (fn [[_ {:keys [deleted-for-me? deleted-for-me-undoable-till]}]] (and deleted-for-me? deleted-for-me-undoable-till)))
+       (map (fn [message] {:chat-id chat-id :message-id (first message)}))
+       (concat acc)))
 
 (fx/defn sync-all
   "Get all deleted-for-me messages that not yet synced with status-go and sync them"
   {:events [:chat.ui/sync-all-deleted-for-me-messages]}
-  [{:keys [db]}]
-  {:dispatch-n (reduce-kv chats-reducer [] (:messages db))})
+  [{:keys [db] :as cofx}]
+  (let [pending-sync-messages (reduce-kv filter-pending-sync-messages [] (:messages db))]
+    (apply fx/merge cofx (map delete-and-sync pending-sync-messages))))

src/status_im/chat/models/delete_message_for_me_test.cljs

@@ -4,94 +4,97 @@
              delete-message-for-me]
             [status-im.utils.datetime :as datetime]))
 
-(defonce mid "message-id")
-(defonce cid "chat-id")
+(def mid "message-id")
+(def cid "chat-id")
 
 (deftest delete-for-me
   (with-redefs [datetime/timestamp (constantly 1)]
     (let [db      {:messages {cid {mid {:id mid :whisper-timestamp 1}}}}
           message {:message-id mid :chat-id cid}]
       (testing "delete for me"
-        (let [result-message   (get-in (delete-message-for-me/delete {:db db} message 1000)
+        (testing "dispatch right db fx"
+          (let [result-message (get-in (delete-message-for-me/delete {:db db} message 1000)
                                        [:db :messages cid mid])]
-          (is (= (:id result-message) mid))
-          (is (true? (:deleted-for-me? result-message)))
-          (is (= (:deleted-for-me-undoable-till result-message) 1001))))
-      (testing "should return nil if message not in db"
-        (is (= (delete-message-for-me/delete {:db {:messages []}} message 1000)
-               nil))))))
+            (is (= (:id result-message) mid))
+            (is (true? (:deleted-for-me? result-message)))
+            (is (= (:deleted-for-me-undoable-till result-message) 1001))))
+        (testing "return nil if message not in db"
+          (is (= (delete-message-for-me/delete {:db {:messages []}} message 1000)
+                 nil)))))))
 
 (deftest undo-delete-for-me
   (let [db      {:messages {cid {mid {:id mid :whisper-timestamp 1}}}}
         message {:message-id mid :chat-id cid}]
-    (testing "undo delete for me in time"
-      (let [db             (update-in db
-                                      [:messages cid mid]
-                                      assoc
-                                      :deleted-for-me? true
-                                      :deleted-for-me-undoable-till
-                                      (+ (datetime/timestamp) 1000))
-            result-message (get-in (delete-message-for-me/undo {:db db} message)
-                                   [:db :messages cid mid])]
-        (is (= (:id result-message) mid))
-        (is (nil? (:deleted-for-me? result-message)))
-        (is (nil? (:deleted-for-me-undoable-till result-message)))))
+    (testing "undo delete for me"
+      (testing "in time"
+        (let [db             (update-in db
+                                        [:messages cid mid]
+                                        assoc
+                                        :deleted-for-me? true
+                                        :deleted-for-me-undoable-till
+                                        (+ (datetime/timestamp) 1000))
+              result-message (get-in (delete-message-for-me/undo {:db db} message)
+                                     [:db :messages cid mid])]
+          (is (= (:id result-message) mid))
+          (is (nil? (:deleted-for-me? result-message)))
+          (is (nil? (:deleted-for-me-undoable-till result-message)))))
 
-    (testing "remain deleted for me when undo delete for me late"
-      (let [db (update-in db
-                          [:messages cid mid]
-                          assoc
-                          :deleted-for-me? true
-                          :deleted-for-me-undoable-till (- (datetime/timestamp) 1000))
-            result-message (get-in (delete-message-for-me/undo {:db db} message) [:db :messages cid mid])]
-        (is (= (:id result-message) mid))
-        (is (nil? (:deleted-for-me-undoable-till result-message)))
-        (is (true? (:deleted-for-me? result-message)))))
+      (testing "remain deleted for me when undo after timelimit"
+        (let [db             (update-in db
+                                        [:messages cid mid]
+                                        assoc
+                                        :deleted-for-me? true
+                                        :deleted-for-me-undoable-till (- (datetime/timestamp) 1000))
+              result-message (get-in (delete-message-for-me/undo {:db db} message) [:db :messages cid mid])]
+          (is (= (:id result-message) mid))
+          (is (nil? (:deleted-for-me-undoable-till result-message)))
+          (is (true? (:deleted-for-me? result-message)))))
 
-    (testing "should return nil if message not in db"
-      (is (= (delete-message-for-me/undo {:db {:messages []}} message)
-             nil)))))
+      (testing "return nil if message not in db"
+        (is (= (delete-message-for-me/undo {:db {:messages []}} message)
+               nil))))))
 
 (deftest delete-for-me-and-sync
   (let [db      {:messages {cid {mid {:id mid}}}}
         message {:message-id mid :chat-id cid}]
     (testing "delete for me and sync"
-      (let [expected-db {:messages {cid {mid {:id mid}}}}
-            effects     (delete-message-for-me/delete-and-sync {:db db} message)
-            result-db   (:db effects)
-            rpc-calls   (:status-im.ethereum.json-rpc/call effects)]
-        (is (= result-db expected-db))
-        (is (= (count rpc-calls) 1))
-        (is (= (-> rpc-calls
-                   first
-                   :method)
-               "wakuext_deleteMessageForMeAndSync"))
-        (is (= (-> rpc-calls
-                   first
-                   :params
-                   count)
-               2))
-        (is (= (-> rpc-calls
-                   first
-                   :params
-                   first)
-               cid))
-        (is (= (-> rpc-calls
-                   first
-                   :params
-                   second)
-               mid))))
-    (testing "delete for me and sync, should clean undo timer"
-      (let [expected-db {:messages {cid {mid {:id mid}}}}
-            effects     (delete-message-for-me/delete-and-sync
-                         {:db (update-in db
-                                         [:messages cid mid
-                                          :deleted-for-me-undoable-till]
-                                         (constantly (datetime/timestamp)))}
-                         message)
-            result-db   (:db effects)]
-        (is (= result-db expected-db))))
-    (testing "should return nil if message not in db"
-      (is (= (delete-message-for-me/delete-and-sync {:db {:messages []}}
-                                                    message)
-             nil)))))
+      (testing "dispatch right rpc call"
+        (let [expected-db {:messages {cid {mid {:id mid}}}}
+              effects     (delete-message-for-me/delete-and-sync {:db db} message)
+              result-db   (:db effects)
+              rpc-calls   (:status-im.ethereum.json-rpc/call effects)]
+          (is (= result-db expected-db))
+          (is (= (count rpc-calls) 1))
+          (is (= (-> rpc-calls
+                     first
+                     :method)
+                 "wakuext_deleteMessageForMeAndSync"))
+          (is (= (-> rpc-calls
+                     first
+                     :params
+                     count)
+                 2))
+          (is (= (-> rpc-calls
+                     first
+                     :params
+                     first)
+                 cid))
+          (is (= (-> rpc-calls
+                     first
+                     :params
+                     second)
+                 mid))))
+      (testing "clean undo timer"
+        (let [expected-db {:messages {cid {mid {:id mid}}}}
+              effects     (delete-message-for-me/delete-and-sync
+                           {:db (update-in db
+                                           [:messages cid mid
+                                            :deleted-for-me-undoable-till]
+                                           (constantly (datetime/timestamp)))}
+                           message)
+              result-db   (:db effects)]
+          (is (= result-db expected-db))))
+      (testing "return nil if message not in db"
+        (is (= (delete-message-for-me/delete-and-sync {:db {:messages []}}
+                                                      message)
+               nil))))))

src/status_im/chat/models/delete_message_test.cljs

@@ -0,0 +1,95 @@
+(ns status-im.chat.models.delete-message-test
+  (:require
+   [cljs.test                            :refer-macros [deftest is testing]]
+   [status-im.chat.models.delete-message :as delete-message]
+   [status-im.utils.datetime             :as datetime]))
+
+(def mid "message-id")
+(def cid "chat-id")
+
+(deftest delete
+  (with-redefs [datetime/timestamp (constantly 1)]
+    (let [db      {:messages {cid {mid {:id mid :whisper-timestamp 1}}}}
+          message {:message-id mid :chat-id cid}]
+      (testing "delete"
+        (testing "dispatch right db fx"
+          (let [result-message (get-in (delete-message/delete {:db db} message 1000)
+                                       [:db :messages cid mid])]
+            (is (= (:id result-message) mid))
+            (is (true? (:deleted? result-message)))
+            (is (= (:deleted-undoable-till result-message) 1001))))
+        (testing "return nil if message not in db"
+          (is (= (delete-message/delete {:db {:messages []}} message 1000)
+                 nil)))))))
+
+(deftest undo-delete
+  (let [db      {:messages {cid {mid {:id mid :whisper-timestamp 1}}}}
+        message {:message-id mid :chat-id cid}]
+    (testing "undo delete"
+      (testing "undo in time"
+        (let [db             (update-in db
+                                        [:messages cid mid]
+                                        assoc
+                                        :deleted?              true
+                                        :deleted-undoable-till
+                                        (+ (datetime/timestamp) 1000))
+              result-message (get-in (delete-message/undo {:db db} message)
+                                     [:db :messages cid mid])]
+          (is (= (:id result-message) mid))
+          (is (nil? (:deleted? result-message)))
+          (is (nil? (:deleted-undoable-till result-message)))))
+
+      (testing "remain deleted when undo after timelimit"
+        (let [db             (update-in db
+                                        [:messages cid mid]
+                                        assoc
+                                        :deleted?              true
+                                        :deleted-undoable-till (- (datetime/timestamp) 1000))
+              result-message (get-in (delete-message/undo {:db db} message) [:db :messages cid mid])]
+          (is (= (:id result-message) mid))
+          (is (nil? (:deleted-undoable-till result-message)))
+          (is (true? (:deleted? result-message)))))
+
+      (testing "return nil if message not in db"
+        (is (= (delete-message/undo {:db {:messages []}} message)
+               nil))))))
+
+(deftest delete-and-send
+  (let [db      {:messages {cid {mid {:id mid}}}}
+        message {:message-id mid :chat-id cid}]
+    (testing "delete and send"
+      (testing "dispatch right rpc call fx"
+        (let [expected-db {:messages {cid {mid {:id mid}}}}
+              effects     (delete-message/delete-and-send {:db db} message)
+              result-db   (:db effects)
+              rpc-calls   (:status-im.ethereum.json-rpc/call effects)]
+          (is (= result-db expected-db))
+          (is (= (count rpc-calls) 1))
+          (is (= (-> rpc-calls
+                     first
+                     :method)
+                 "wakuext_deleteMessageAndSend"))
+          (is (= (-> rpc-calls
+                     first
+                     :params
+                     count)
+                 1))
+          (is (= (-> rpc-calls
+                     first
+                     :params
+                     first)
+                 mid))))
+      (testing "clean undo timer"
+        (let [expected-db {:messages {cid {mid {:id mid}}}}
+              effects     (delete-message/delete-and-send
+                           {:db (update-in db
+                                           [:messages cid mid
+                                            :deleted-undoable-till]
+                                           (constantly (datetime/timestamp)))}
+                           message)
+              result-db   (:db effects)]
+          (is (= result-db expected-db))))
+      (testing "return nil if message not in db"
+        (is (= (delete-message/delete-and-send {:db {:messages []}}
+                                               message)
+               nil))))))

src/status_im/chat/models/images.cljs

@@ -43,7 +43,7 @@
 
 (defn download-image-http [base64-uri on-success]
   (-> (.config ReactNativeBlobUtil (clj->js {:trusty platform/ios?
-                                             :path temp-image-url}))
+                                             :path   temp-image-url}))
       (.fetch "GET" base64-uri)
       (.then #(on-success (.path %)))
       (.catch #(log/error "could not save image"))))
@@ -77,8 +77,8 @@
  (fn [chat-id]
    (react/show-image-picker
     (fn [^js images]
-      ;; NOTE(Ferossgp): Because we can't highlight the already selected images inside
-      ;; gallery, we just clean previous state and set all newly picked images
+        ;; NOTE(Ferossgp): Because we can't highlight the already selected images inside
+        ;; gallery, we just clean previous state and set all newly picked images
       (when (and platform/ios? (pos? (count images)))
         (re-frame/dispatch [:chat.ui/clear-sending-images chat-id]))
       (doseq [^js result (if platform/ios?
@@ -86,8 +86,8 @@
                            [images])]
         (resize-and-call (.-path result)
                          #(re-frame/dispatch [:chat.ui/image-selected chat-id (result->id result) %]))))
-    ;; NOTE(Ferossgp): On android you cannot set max limit on images, when a user
-    ;; selects too many images the app crashes.
+      ;; NOTE(Ferossgp): On android you cannot set max limit on images, when a user
+      ;; selects too many images the app crashes.
     {:media-type "photo"
      :multiple   platform/ios?})))
 
@@ -100,13 +100,16 @@
 
 (re-frame/reg-fx
  ::camera-roll-get-photos
- (fn [num]
+ (fn [[num end-cursor]]
    (permissions/request-permissions
     {:permissions [:read-external-storage]
      :on-allowed  (fn []
-                    (-> (.getPhotos CameraRoll #js {:first num :assetType "Photos" :groupTypes "All"})
-                        (.then #(re-frame/dispatch [:on-camera-roll-get-photos (:edges (types/js->clj %))]))
-                        (.catch #(log/warn "could not get cameraroll photos"))))})))
+                    (-> (if end-cursor
+                          (.getPhotos CameraRoll #js {:first num :after end-cursor :assetType "Photos" :groupTypes "All"})
+                          (.getPhotos CameraRoll #js {:first num :assetType "Photos" :groupTypes "All"}))
+                        (.then #(let [response (types/js->clj %)]
+                                  (re-frame/dispatch [:on-camera-roll-get-photos (:edges response) (:page_info response) end-cursor])))
+                        (.catch #(log/warn "could not get camera roll photos"))))})))
 
 (fx/defn image-captured
   {:events [:chat.ui/image-captured]}
@@ -119,13 +122,23 @@
 
 (fx/defn camera-roll-get-photos
   {:events [:chat.ui/camera-roll-get-photos]}
-  [_ num]
-  {::camera-roll-get-photos num})
+  [_ num end-cursor]
+  {::camera-roll-get-photos [num end-cursor]})
+
+(fx/defn camera-roll-loading-more
+  {:events [:chat.ui/camera-roll-loading-more]}
+  [{:keys [db]} is-loading]
+  {:db (assoc db :camera-roll/loading-more is-loading)})
 
 (fx/defn on-camera-roll-get-photos
   {:events [:on-camera-roll-get-photos]}
-  [{db :db} photos]
-  {:db (assoc db :camera-roll-photos (mapv #(get-in % [:node :image :uri]) photos))})
+  [{:keys [db] :as cofx} photos page-info end-cursor]
+  (let [photos_x (when end-cursor (:camera-roll/photos db))]
+    {:db (-> db
+             (assoc :camera-roll/photos (concat photos_x (map #(get-in % [:node :image :uri]) photos)))
+             (assoc :camera-roll/end-cursor (:end_cursor page-info))
+             (assoc :camera-roll/has-next-page (:has_next_page page-info))
+             (assoc :camera-roll/loading-more false))}))
 
 (fx/defn clear-sending-images
   {:events [:chat.ui/clear-sending-images]}

src/status_im/chat/models/input.cljs

@@ -1,20 +1,20 @@
 (ns status-im.chat.models.input
-  (:require [clojure.string :as string]
+  (:require ["emojilib" :as emojis]
+            [clojure.string :as string]
             [goog.object :as object]
             [re-frame.core :as re-frame]
-            [taoensso.timbre :as log]
             [status-im.chat.constants :as chat.constants]
-            [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.chat.models :as chat]
+            [status-im.chat.models.mentions :as mentions]
             [status-im.chat.models.message :as chat.message]
             [status-im.chat.models.message-content :as message-content]
             [status-im.constants :as constants]
+            [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.i18n.i18n :as i18n]
             [status-im.utils.datetime :as datetime]
             [status-im.utils.fx :as fx]
-            ["emojilib" :as emojis]
-            [status-im.chat.models.mentions :as mentions]
-            [status-im.utils.utils :as utils]))
+            [status-im.utils.utils :as utils]
+            [taoensso.timbre :as log]))
 
 (defn text->emoji
   "Replaces emojis in a specified `text`"
@@ -49,9 +49,10 @@
         cursor      (+ at-sign-idx (count name) 2)]
     (fx/merge
      cofx
-     {:db (-> db
-              (assoc-in [:chats/cursor chat-id] cursor)
-              (assoc-in [:chats/mention-suggestions chat-id] nil))}
+     {:db             (-> db
+                          (assoc-in [:chats/cursor chat-id] cursor)
+                          (assoc-in [:chats/mention-suggestions chat-id] nil))
+      :set-text-input-value [chat-id new-text text-input-ref]}
      (set-chat-input-text new-text chat-id)
      ;; NOTE(rasom): Some keyboards do not react on selection property passed to
      ;; text input (specifically Samsung keyboard with predictive text set on).
@@ -133,16 +134,6 @@
              (update-in [:chat/inputs current-chat-id :metadata]
                         dissoc :sending-image))}))
 
-(fx/defn soft-delete-message
-  "Does't delete from db, this is a soft delete"
-  {:events [:chat.ui/soft-delete-message]}
-  [{:keys [db] :as cofx} {:keys [message-id chat-id]}]
-  {::json-rpc/call [{:method      "wakuext_deleteMessageAndSend"
-                     :params      [message-id]
-                     :js-response true
-                     :on-error    #(log/error "failed to delete message message " %)
-                     :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])}]})
-
 (fx/defn show-contact-request-input
   "Sets reference to previous chat message and focuses on input"
   {:events [:chat.ui/send-contact-request]}
@@ -182,9 +173,11 @@
 
 (defn build-image-messages
   [{db :db} chat-id]
-  (let [images (get-in db [:chat/inputs chat-id :metadata :sending-image])]
+  (let [images (get-in db [:chat/inputs chat-id :metadata :sending-image])
+        album-id (str (random-uuid))]
     (mapv (fn [[_ {:keys [uri]}]]
             {:chat-id      chat-id
+             :album-id     album-id
              :content-type constants/content-type-image
              :image-path   (utils/safe-replace uri #"file://" "")
              :text         (i18n/label :t/update-to-see-image {"locale" "en"})})
@@ -205,7 +198,7 @@
   [{:keys [db] :as cofx}]
   (let [current-chat-id (:current-chat-id db)]
     (fx/merge cofx
-              {:set-input-text [current-chat-id ""]}
+              {:set-text-input-value [current-chat-id ""]}
               (clean-input current-chat-id)
               (mentions/clear-mentions)
               (mentions/clear-cursor))))

src/status_im/chat/models/loading.cljs

@@ -7,8 +7,7 @@
             [status-im.chat.models.message-list :as message-list]
             [taoensso.timbre :as log]
             [status-im.ethereum.json-rpc :as json-rpc]
-            [status-im.chat.models.pin-message :as models.pin-message]
-            [status-im.notifications-center.core :as notification-center]))
+            [status-im.activity-center.core :as activity-center]))
 
 (defn cursor->clock-value
   [^js cursor]
@@ -68,14 +67,14 @@
 (fx/defn handle-mark-all-read-successful
   {:events [::mark-all-read-successful]}
   [cofx]
-  (notification-center/get-activity-center-notifications-count cofx))
+  (activity-center/notifications-fetch-unread-count cofx))
 
 (fx/defn handle-mark-all-read-in-community-successful
   {:events [::mark-all-read-in-community-successful]}
   [{:keys [db] :as cofx} chat-ids]
   (fx/merge cofx
             {:db (reduce mark-chat-all-read db chat-ids)}
-            (notification-center/get-activity-center-notifications-count)))
+            (activity-center/notifications-fetch-unread-count)))
 
 (fx/defn handle-mark-all-read
   {:events [:chat.ui/mark-all-read-pressed :chat/mark-all-as-read]}
@@ -98,6 +97,24 @@
                        :params     [community-id]
                        :on-success #(re-frame/dispatch [::mark-all-read-in-community-successful %])}]}))
 
+
+
+(defn find-albums [messages]
+  (let [albums-count (atom #{})]
+  (doseq [message messages]
+    (let [album-id (:album-id (:content (val message)))]
+      ;(println "ALBUMID" album-id (get @albums-count album-id))
+    (when album-id
+      (if (get @albums-count album-id)
+        ;(update-in albums-count album-id #(inc 1))
+        ;(assoc albums-count album-id 1)
+        ))
+    (if (> (get @albums-count album-id) 3)
+      ;(println "COMPLETED AN ALBUMXXXX" (get @albums-count album-id))
+      ;(println "NO ALBUMXX" @albums-count)
+      ))))
+  messages)
+
 (fx/defn messages-loaded
   "Loads more messages for current chat"
   {:events [::messages-loaded]}
@@ -109,7 +126,7 @@
           ;; We remove those messages that are already loaded, as we might get some duplicates
           {:keys [all-messages new-messages senders contacts]}
           (reduce (fn [{:keys [all-messages] :as acc}
-                       {:keys [message-id from]
+                       {:keys [message-id from content]
                         :as   message}]
                     (cond-> acc
                       (not (get-in db [:chats chat-id :users from]))
@@ -125,8 +142,10 @@
                    :contacts     {}
                    :new-messages []}
                   messages)
+          ;result (find-albums all-messages)
           current-clock-value (get-in db [:pagination-info chat-id :cursor-clock-value])
           clock-value (when cursor (cursor->clock-value cursor))]
+      ;(println "ccc222" (count all-messages) (count new-messages) (count already-loaded-messages))
       {:dispatch [:chat/add-senders-to-chat-users (vals senders)]
        :db       (-> db
                      (update-in [:pagination-info chat-id :cursor-clock-value]
@@ -176,5 +195,5 @@
               {:db (assoc-in db [:pagination-info chat-id :messages-initialized?] now)
                :utils/dispatch-later [{:ms 50 :dispatch [:chat.ui/mark-all-read-pressed chat-id]}
                                       (when-not (get-in cofx [:db :chats chat-id :public?])
-                                        {:ms 100 :dispatch [::models.pin-message/load-pin-messages chat-id]})]}
+                                        {:ms 100 :dispatch [:pin-message/load-pin-messages chat-id]})]}
               (load-more-messages chat-id true))))

src/status_im/chat/models/message.cljs

@@ -1,20 +1,21 @@
 (ns status-im.chat.models.message
-  (:require [status-im.chat.models :as chat-model]
+  (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
+            [status-im.chat.models :as chat-model]
+            [status-im.chat.models.delete-message :as delete-message]
+            [status-im.chat.models.loading :as chat.loading]
+            [status-im.chat.models.mentions :as mentions]
             [status-im.chat.models.message-list :as message-list]
             [status-im.constants :as constants]
             [status-im.data-store.messages :as data-store.messages]
             [status-im.ethereum.json-rpc :as json-rpc]
             [status-im.transport.message.protocol :as protocol]
-            [status-im.utils.fx :as fx]
-            [taoensso.timbre :as log]
-            [status-im.chat.models.mentions :as mentions]
-            [clojure.string :as string]
-            [status-im.utils.types :as types]
             [status-im.ui.screens.chat.state :as view.state]
-            [status-im.chat.models.loading :as chat.loading]
+            [status-im.utils.fx :as fx]
+            [status-im.utils.gfycat.core :as gfycat]
             [status-im.utils.platform :as platform]
-            [status-im.utils.gfycat.core :as gfycat]))
+            [status-im.utils.types :as types]
+            [taoensso.timbre :as log]))
 
 (defn- message-loaded?
   [db chat-id message-id]
@@ -181,15 +182,6 @@
                                :on-error #(log/error "failed to re-send message" %)}]}
             (update-message-status chat-id message-id :sending)))
 
-(fx/defn delete-message
-  "Deletes chat message, rebuild message-list"
-  {:events [:chat.ui/delete-message]}
-  [{:keys [db] :as cofx} chat-id message-id]
-  (fx/merge cofx
-            {:db            (update-in db [:messages chat-id] dissoc message-id)}
-            (data-store.messages/delete-message message-id)
-            (message-list/rebuild-message-list chat-id)))
-
 (fx/defn send-message
   [cofx message]
   (protocol/send-chat-messages cofx [message]))
@@ -201,19 +193,22 @@
 (fx/defn handle-removed-messages
   {:events [::handle-removed-messages]}
   [{:keys [db] :as cofx} removed-messages]
-  (let [mark-as-seen-fx (mapv (fn [removed-message]
-                                (let [chat-id (:chatId removed-message)
-                                      message-id (:messageId removed-message)]
-                                  (data-store.messages/mark-messages-seen chat-id
-                                                                          [message-id]
-                                                                          #(re-frame/dispatch [:chat/decrease-unviewed-count chat-id %3])))) removed-messages)
+  (let [mark-as-deleted-fx (->> removed-messages
+                                (map #(assoc % :message-id (:messageId %)))
+                                (group-by :chatId)
+                                (mapv (fn [[chat-id messages]] (delete-message/delete-messages-localy messages chat-id))))
+        mark-as-seen-fx    (mapv (fn [removed-message]
+                                   (let [chat-id    (:chatId removed-message)
+                                         message-id (:messageId removed-message)]
+                                     (data-store.messages/mark-messages-seen chat-id
+                                                                             [message-id]
+                                                                             #(re-frame/dispatch [:chat/decrease-unviewed-count chat-id %3]))))
+                                 removed-messages)
         remove-messages-fx (fn [{:keys [db]}]
-                             {:db (reduce (fn [acc current]
-                                            (update-in acc [:messages (:chatId current)] dissoc (:messageId current)))
-                                          db removed-messages)
-                              :dispatch-n [[:get-activity-center-notifications]
-                                           [:get-activity-center-notifications-count]]})]
-    (apply fx/merge cofx (conj mark-as-seen-fx remove-messages-fx))))
+                             {:dispatch [:activity-center.notifications/fetch-unread-count]})]
+    (apply fx/merge cofx (-> mark-as-deleted-fx
+                             (concat mark-as-seen-fx)
+                             (conj remove-messages-fx)))))
 
 (comment
   (handle-removed-messages

src/status_im/chat/models/message_test.cljs

@@ -1,9 +1,7 @@
 (ns status-im.chat.models.message-test
   (:require [cljs.test :refer-macros [deftest is testing]]
             [status-im.chat.models.message :as message]
-            [status-im.chat.models.message-list :as models.message-list]
             [status-im.chat.models.loading :as loading]
-            [status-im.utils.datetime :as time]
             [status-im.ui.screens.chat.state :as view.state]))
 
 (deftest add-received-message-test
@@ -130,54 +128,3 @@
          {:chats {"a" {:deleted-at-clock-value 1}}}
          "a"
          0))))
-
-(deftest delete-message
-  (with-redefs [time/day-relative (constantly "day-relative")
-                time/timestamp->time (constantly "timestamp")]
-    (let [cofx1     {:db {:messages      {"chat-id" {0 {:message-id  0
-                                                        :content     "a"
-                                                        :clock-value 0
-                                                        :whisper-timestamp 0
-                                                        :timestamp   0}
-                                                     1 {:message-id  1
-                                                        :content     "b"
-                                                        :clock-value 1
-                                                        :whisper-timestamp 1
-                                                        :timestamp   1}}}
-                          :message-lists {"chat-id" [{:something :something}]}
-                          :chats {"chat-id" {}}}}
-          cofx2     {:db {:messages   {"chat-id"   {0 {:message-id  0
-                                                       :content     "a"
-                                                       :clock-value 0
-                                                       :whisper-timestamp 1
-                                                       :timestamp   1}}}
-                          :message-list {"chat-id" [{:something :something}]}
-                          :chats {"chat-id" {}}}}
-          fx1       (message/delete-message cofx1 "chat-id" 1)
-          fx2       (message/delete-message cofx2 "chat-id" 0)]
-      (testing "Deleting message deletes it along with all references"
-        (is (= '(0)
-               (keys (get-in fx1 [:db :messages "chat-id"]))))
-        (is (= [{:one-to-one? false
-                 :message-id 0
-                 :whisper-timestamp 0
-                 :type :message
-                 :display-photo? true
-                 :system-message? false
-                 :last-in-group? true
-                 :datemark "day-relative"
-                 :clock-value 0
-                 :first-in-group? true
-                 :from nil
-                 :first-outgoing? false
-                 :outgoing-seen? false
-                 :timestamp-str "timestamp"
-                 :first? true
-                 :display-username? true
-                 :outgoing false}]
-               (models.message-list/->seq
-                (get-in fx1 [:db :message-lists "chat-id"]))))
-        (is (= {}
-               (get-in fx2 [:db :messages "chat-id"])))
-        (is (= nil
-               (get-in fx2 [:db :message-lists "chat-id"])))))))

src/status_im/chat/models_test.cljs

@@ -1,7 +1,8 @@
 (ns status-im.chat.models-test
   (:require [cljs.test :refer-macros [deftest is testing]]
             [status-im.utils.clocks :as utils.clocks]
-            [status-im.chat.models :as chat]))
+            [status-im.chat.models :as chat]
+            [status-im.chat.models.images :as images]))
 
 (deftest clear-history-test
   (let [chat-id "1"
@@ -91,3 +92,8 @@
     (testing "Pagination info should be reset on navigation"
       (let [res (chat/navigate-to-chat-nav2 {:db db} chat-id false)]
         (is (nil? (get-in res [:db :pagination-info chat-id :all-loaded?])))))))
+
+(deftest camera-roll-loading-more-test
+  (let [cofx {:db {:camera-roll/loading-more false}}]
+    (is (= {:db {:camera-roll/loading-more true}}
+           (images/camera-roll-loading-more cofx true)))))

src/status_im/communities/core.cljs

@@ -15,7 +15,7 @@
    [status-im2.navigation.events :as navigation]
    [status-im.utils.handlers :refer [>evt]]
    [status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles]
-   [status-im.notifications-center.core :as notification-center]))
+   [status-im.activity-center.core :as activity-center]))
 
 (def crop-size 1000)
 
@@ -26,12 +26,12 @@
 
 (def featured
   [{:name "Status"
-    :id constants/status-community-id}])
+    :id   constants/status-community-id}])
 
 (defn <-request-to-join-community-rpc [r]
   (clojure.set/rename-keys r {:communityId :community-id
-                              :publicKey :public-key
-                              :chatId :chat-id}))
+                              :publicKey   :public-key
+                              :chatId      :chat-id}))
 
 (defn <-requests-to-join-community-rpc [requests]
   (reduce (fn [acc r]
@@ -60,11 +60,12 @@
 
 (defn <-rpc [c]
   (-> c
-      (clojure.set/rename-keys {:canRequestAccess :can-request-access?
-                                :canManageUsers :can-manage-users?
-                                :canJoin :can-join?
-                                :requestedToJoinAt :requested-to-join-at
-                                :isMember :is-member?})
+      (clojure.set/rename-keys {:canRequestAccess            :can-request-access?
+                                :canManageUsers              :can-manage-users?
+                                :canDeleteMessageForEveryone :can-delete-message-for-everyone?
+                                :canJoin                     :can-join?
+                                :requestedToJoinAt           :requested-to-join-at
+                                :isMember                    :is-member?})
       (update :members walk/stringify-keys)
       (update :chats <-chats-rpc)
       (update :categories <-categories-rpc)))
@@ -104,7 +105,7 @@
   (fx/merge cofx
             (handle-response cofx response-js)
             (navigation/pop-to-root-tab :chat-stack)
-            (notification-center/get-activity-center-notifications-count)))
+            (activity-center/notifications-fetch-unread-count)))
 
 (fx/defn joined
   {:events [::joined ::requested-to-join]}
@@ -125,67 +126,67 @@
 (fx/defn import-community
   {:events [::import]}
   [cofx community-key]
-  {::json-rpc/call [{:method     "wakuext_importCommunity"
-                     :params     [community-key]
+  {::json-rpc/call [{:method      "wakuext_importCommunity"
+                     :params      [community-key]
                      :js-response true
-                     :on-success #(re-frame/dispatch [::community-imported %])
-                     :on-error   #(do
-                                    (log/error "failed to import community" %)
-                                    (re-frame/dispatch [::failed-to-import %]))}]})
+                     :on-success  #(re-frame/dispatch [::community-imported %])
+                     :on-error    #(do
+                                     (log/error "failed to import community" %)
+                                     (re-frame/dispatch [::failed-to-import %]))}]})
 
 (fx/defn join
   {:events [:communities/join]}
   [cofx community-id]
-  {::json-rpc/call [{:method "wakuext_joinCommunity"
-                     :params [community-id]
+  {::json-rpc/call [{:method      "wakuext_joinCommunity"
+                     :params      [community-id]
                      :js-response true
-                     :on-success #(re-frame/dispatch [::joined %])
-                     :on-error #(do
-                                  (log/error "failed to join community" community-id %)
-                                  (re-frame/dispatch [::failed-to-join %]))}]})
+                     :on-success  #(re-frame/dispatch [::joined %])
+                     :on-error    #(do
+                                     (log/error "failed to join community" community-id %)
+                                     (re-frame/dispatch [::failed-to-join %]))}]})
 
 (fx/defn request-to-join
   {:events [::request-to-join]}
   [cofx community-id]
-  {::json-rpc/call [{:method "wakuext_requestToJoinCommunity"
-                     :params [{:communityId community-id}]
+  {::json-rpc/call [{:method      "wakuext_requestToJoinCommunity"
+                     :params      [{:communityId community-id}]
                      :js-response true
-                     :on-success #(re-frame/dispatch [::requested-to-join %])
-                     :on-error #(do
-                                  (log/error "failed to request to join community" community-id %)
-                                  (re-frame/dispatch [::failed-to-request-to-join %]))}]})
+                     :on-success  #(re-frame/dispatch [::requested-to-join %])
+                     :on-error    #(do
+                                     (log/error "failed to request to join community" community-id %)
+                                     (re-frame/dispatch [::failed-to-request-to-join %]))}]})
 
 (fx/defn leave
   {:events [:communities/leave]}
   [{:keys [db]} community-id]
   (let [community-chat-ids (map #(str community-id %)
                                 (keys (get-in db [:communities community-id :chats])))]
-    {:clear-message-notifications  [community-chat-ids
-                                    (get-in db [:multiaccount :remote-push-notifications-enabled?])]
-     ::json-rpc/call [{:method     "wakuext_leaveCommunity"
-                       :params     [community-id]
-                       :js-response true
-                       :on-success #(re-frame/dispatch [::left %])
-                       :on-error   #(do
-                                      (log/error "failed to leave community" community-id %)
-                                      (re-frame/dispatch [::failed-to-leave %]))}]}))
+    {:clear-message-notifications [community-chat-ids
+                                   (get-in db [:multiaccount :remote-push-notifications-enabled?])]
+     ::json-rpc/call              [{:method      "wakuext_leaveCommunity"
+                                    :params      [community-id]
+                                    :js-response true
+                                    :on-success  #(re-frame/dispatch [::left %])
+                                    :on-error    #(do
+                                                    (log/error "failed to leave community" community-id %)
+                                                    (re-frame/dispatch [::failed-to-leave %]))}]}))
 
 (fx/defn fetch [_]
-  {::json-rpc/call [{:method "wakuext_communities"
-                     :params []
+  {::json-rpc/call [{:method     "wakuext_communities"
+                     :params     []
                      :on-success #(re-frame/dispatch [::fetched %])
-                     :on-error #(do
-                                  (log/error "failed to fetch communities" %)
-                                  (re-frame/dispatch [::failed-to-fetch %]))}]})
+                     :on-error   #(do
+                                    (log/error "failed to fetch communities" %)
+                                    (re-frame/dispatch [::failed-to-fetch %]))}]})
 
 (fx/defn chat-created
   {:events [::chat-created]}
   [_ community-id user-pk]
-  {::json-rpc/call [{:method     "wakuext_sendChatMessage"
-                     :params     [{:chatId      user-pk
-                                   :text        "Upgrade here to see an invitation to community"
-                                   :communityId community-id
-                                   :contentType constants/content-type-community}]
+  {::json-rpc/call [{:method      "wakuext_sendChatMessage"
+                     :params      [{:chatId      user-pk
+                                    :text        "Upgrade here to see an invitation to community"
+                                    :communityId community-id
+                                    :contentType constants/content-type-community}]
                      :js-response true
                      :on-success
                      #(re-frame/dispatch [:transport/message-sent %])
@@ -196,56 +197,56 @@
   {:events [::invite-people-confirmation-pressed]}
   [cofx user-pk contacts]
   (let [community-id (fetch-community-id-input cofx)
-        pks (if (seq user-pk)
-              (conj contacts user-pk)
-              contacts)]
+        pks          (if (seq user-pk)
+                       (conj contacts user-pk)
+                       contacts)]
     (when (seq pks)
-      {::json-rpc/call [{:method     "wakuext_inviteUsersToCommunity"
-                         :params     [{:communityId community-id
-                                       :users pks}]
+      {::json-rpc/call [{:method      "wakuext_inviteUsersToCommunity"
+                         :params      [{:communityId community-id
+                                        :users       pks}]
                          :js-response true
-                         :on-success #(re-frame/dispatch [::people-invited %])
-                         :on-error   #(do
-                                        (log/error "failed to invite-user community" %)
-                                        (re-frame/dispatch [::failed-to-invite-people %]))}]})))
+                         :on-success  #(re-frame/dispatch [::people-invited %])
+                         :on-error    #(do
+                                         (log/error "failed to invite-user community" %)
+                                         (re-frame/dispatch [::failed-to-invite-people %]))}]})))
 (fx/defn share-community
   {:events [::share-community-confirmation-pressed]}
   [cofx user-pk contacts]
   (let [community-id (fetch-community-id-input cofx)
-        pks (if (seq user-pk)
-              (conj contacts user-pk)
-              contacts)]
+        pks          (if (seq user-pk)
+                       (conj contacts user-pk)
+                       contacts)]
     (when (seq pks)
-      {::json-rpc/call [{:method     "wakuext_shareCommunity"
-                         :params     [{:communityId community-id
-                                       :users pks}]
+      {::json-rpc/call [{:method      "wakuext_shareCommunity"
+                         :params      [{:communityId community-id
+                                        :users       pks}]
                          :js-response true
-                         :on-success #(re-frame/dispatch [::people-invited %])
-                         :on-error   #(do
-                                        (log/error "failed to invite-user community" %)
-                                        (re-frame/dispatch [::failed-to-share-community %]))}]})))
+                         :on-success  #(re-frame/dispatch [::people-invited %])
+                         :on-error    #(do
+                                         (log/error "failed to invite-user community" %)
+                                         (re-frame/dispatch [::failed-to-share-community %]))}]})))
 
 (fx/defn create
   {:events [::create-confirmation-pressed]}
   [{:keys [db]}]
   (let [{:keys [name description membership image]} (get db :communities/create)]
-    (let [params {:name name
+    (let [params {:name        name
                   :description description
-                  :membership membership
-                  :color (rand-nth colors/chat-colors)
-                  :image (string/replace-first (str image) #"file://" "")
-                  :imageAx 0
-                  :imageAy 0
-                  :imageBx crop-size
-                  :imageBy crop-size}]
+                  :membership  membership
+                  :color       (rand-nth colors/chat-colors)
+                  :image       (string/replace-first (str image) #"file://" "")
+                  :imageAx     0
+                  :imageAy     0
+                  :imageBx     crop-size
+                  :imageBy     crop-size}]
 
-      {::json-rpc/call [{:method     "wakuext_createCommunity"
-                         :params     [params]
+      {::json-rpc/call [{:method      "wakuext_createCommunity"
+                         :params      [params]
                          :js-response true
-                         :on-success #(re-frame/dispatch [::community-created %])
-                         :on-error   #(do
-                                        (log/error "failed to create community" %)
-                                        (re-frame/dispatch [::failed-to-create-community %]))}]})))
+                         :on-success  #(re-frame/dispatch [::community-created %])
+                         :on-error    #(do
+                                         (log/error "failed to create community" %)
+                                         (re-frame/dispatch [::failed-to-create-community %]))}]})))
 
 (fx/defn edit
   {:events [::edit-confirmation-pressed]}
@@ -253,15 +254,15 @@
   (let [{:keys [id name description membership new-image color]} (get db :communities/create)]
     {::json-rpc/call [{:method     "wakuext_editCommunity"
                        :params     [{:communityID id
-                                     :name name
+                                     :name        name
                                      :description description
-                                     :color color
-                                     :image (string/replace-first (str new-image) #"file://" "")
-                                     :imageAx 0
-                                     :imageAy 0
-                                     :imageBx crop-size
-                                     :imageBy crop-size
-                                     :membership membership}]
+                                     :color       color
+                                     :image       (string/replace-first (str new-image) #"file://" "")
+                                     :imageAx     0
+                                     :imageAy     0
+                                     :imageBx     crop-size
+                                     :imageBy     crop-size
+                                     :membership  membership}]
                        :on-success #(re-frame/dispatch [::community-edited %])
                        :on-error   #(do
                                       (log/error "failed to edit community" %)
@@ -272,18 +273,18 @@
   [{:keys [db] :as cofx}]
   (let [community-id (fetch-community-id-input cofx)
         {:keys [name description color emoji]} (get db :communities/create-channel)]
-    {::json-rpc/call [{:method     "wakuext_createCommunityChat"
-                       :params     [community-id
-                                    {:identity    {:display_name name
-                                                   :description  description
-                                                   :color        color
-                                                   :emoji        emoji}
-                                     :permissions {:access constants/community-channel-access-no-membership}}]
+    {::json-rpc/call [{:method      "wakuext_createCommunityChat"
+                       :params      [community-id
+                                     {:identity    {:display_name name
+                                                    :description  description
+                                                    :color        color
+                                                    :emoji        emoji}
+                                      :permissions {:access constants/community-channel-access-no-membership}}]
                        :js-response true
-                       :on-success #(re-frame/dispatch [::community-channel-created %])
-                       :on-error   #(do
-                                      (log/error "failed to create community channel" %)
-                                      (re-frame/dispatch [::failed-to-create-community-channel %]))}]}))
+                       :on-success  #(re-frame/dispatch [::community-channel-created %])
+                       :on-error    #(do
+                                       (log/error "failed to create community channel" %)
+                                       (re-frame/dispatch [::failed-to-create-community-channel %]))}]}))
 
 (def community-chat-id-length 68)
 
@@ -295,21 +296,21 @@
   [{:keys [db] :as cofx}]
   (let [{:keys [name description color community-id emoji edit-channel-id category-id position]}
         (get db :communities/create-channel)]
-    {::json-rpc/call [{:method     "wakuext_editCommunityChat"
-                       :params     [community-id
-                                    edit-channel-id
-                                    {:identity    {:display_name name
-                                                   :description  description
-                                                   :color        color
-                                                   :emoji        emoji}
-                                     :category_id  category-id
-                                     :position     position
-                                     :permissions {:access constants/community-channel-access-no-membership}}]
+    {::json-rpc/call [{:method      "wakuext_editCommunityChat"
+                       :params      [community-id
+                                     edit-channel-id
+                                     {:identity    {:display_name name
+                                                    :description  description
+                                                    :color        color
+                                                    :emoji        emoji}
+                                      :category_id category-id
+                                      :position    position
+                                      :permissions {:access constants/community-channel-access-no-membership}}]
                        :js-response true
-                       :on-success #(re-frame/dispatch [::community-channel-edited %])
-                       :on-error   #(do
-                                      (log/error "failed to edit community channel" %)
-                                      (re-frame/dispatch [::failed-to-edit-community-channel %]))}]}))
+                       :on-success  #(re-frame/dispatch [::community-channel-edited %])
+                       :on-error    #(do
+                                       (log/error "failed to edit community channel" %)
+                                       (re-frame/dispatch [::failed-to-edit-community-channel %]))}]}))
 
 (defn require-membership? [permissions]
   (not= constants/community-no-membership-access (:access permissions)))
@@ -456,17 +457,17 @@
   (fx/merge cofx
             (bottom-sheet/hide-bottom-sheet)
             (handle-response response-js)
-            (notification-center/get-activity-center-notifications-count)))
+            (activity-center/notifications-fetch-unread-count)))
 
 (fx/defn member-ban
   {:events [::member-ban]}
   [cofx community-id public-key]
-  {::json-rpc/call [{:method     "wakuext_banUserFromCommunity"
-                     :params     [{:communityId community-id
-                                   :user public-key}]
+  {::json-rpc/call [{:method      "wakuext_banUserFromCommunity"
+                     :params      [{:communityId community-id
+                                    :user        public-key}]
                      :js-response true
-                     :on-success #(re-frame/dispatch [::member-banned %])
-                     :on-error   #(log/error "failed to ban user from community" community-id public-key %)}]})
+                     :on-success  #(re-frame/dispatch [::member-banned %])
+                     :on-error    #(log/error "failed to ban user from community" community-id public-key %)}]})
 
 (fx/defn member-kicked
   {:events [::member-kicked]}
@@ -478,11 +479,11 @@
 (fx/defn member-kick
   {:events [::member-kick]}
   [cofx community-id public-key]
-  {::json-rpc/call [{:method     "wakuext_removeUserFromCommunity"
-                     :params     [community-id public-key]
+  {::json-rpc/call [{:method      "wakuext_removeUserFromCommunity"
+                     :params      [community-id public-key]
                      :js-response true
-                     :on-success #(re-frame/dispatch [::member-kicked %])
-                     :on-error   #(log/error "failed to remove user from community" community-id public-key %)}]})
+                     :on-success  #(re-frame/dispatch [::member-kicked %])
+                     :on-error    #(log/error "failed to remove user from community" community-id public-key %)}]})
 
 (fx/defn delete-community
   {:events [::delete-community]}
@@ -522,88 +523,88 @@
 (fx/defn accept-request-to-join-pressed
   {:events [:communities.ui/accept-request-to-join-pressed]}
   [cofx community-id request-id]
-  {::json-rpc/call [{:method     "wakuext_acceptRequestToJoinCommunity"
-                     :params     [{:id request-id}]
+  {::json-rpc/call [{:method      "wakuext_acceptRequestToJoinCommunity"
+                     :params      [{:id request-id}]
                      :js-response true
-                     :on-success #(re-frame/dispatch [::request-to-join-accepted community-id request-id %])
-                     :on-error   #(log/error "failed to accept requests-to-join" community-id request-id %)}]})
+                     :on-success  #(re-frame/dispatch [::request-to-join-accepted community-id request-id %])
+                     :on-error    #(log/error "failed to accept requests-to-join" community-id request-id %)}]})
 
 (fx/defn decline-request-to-join-pressed
   {:events [:communities.ui/decline-request-to-join-pressed]}
   [cofx community-id request-id]
-  {::json-rpc/call [{:method     "wakuext_declineRequestToJoinCommunity"
-                     :params     [{:id request-id}]
+  {::json-rpc/call [{:method      "wakuext_declineRequestToJoinCommunity"
+                     :params      [{:id request-id}]
                      :js-response true
-                     :on-success #(re-frame/dispatch [::request-to-join-declined community-id request-id %])
-                     :on-error   #(log/error "failed to decline requests-to-join" community-id request-id)}]})
+                     :on-success  #(re-frame/dispatch [::request-to-join-declined community-id request-id %])
+                     :on-error    #(log/error "failed to decline requests-to-join" community-id request-id)}]})
 
 (fx/defn switch-communities-enabled
   {:events [:multiaccounts.ui/switch-communities-enabled]}
   [{:keys [db]} enabled?]
   {::async-storage/set! {:communities-enabled? enabled?}
-   :db (assoc db :communities/enabled? enabled?)})
+   :db                  (assoc db :communities/enabled? enabled?)})
 
 (fx/defn create-category
   {:events [::create-category-confirmation-pressed]}
   [_ community-id category-title chat-ids]
-  {::json-rpc/call [{:method     "wakuext_createCommunityCategory"
-                     :params     [{:communityId community-id
-                                   :categoryName category-title
-                                   :chatIds (map #(string/replace % community-id "") chat-ids)}]
+  {::json-rpc/call [{:method      "wakuext_createCommunityCategory"
+                     :params      [{:communityId  community-id
+                                    :categoryName category-title
+                                    :chatIds      (map #(string/replace % community-id "") chat-ids)}]
                      :js-response true
-                     :on-success #(do
-                                    (re-frame/dispatch [:navigate-back])
-                                    (re-frame/dispatch [:sanitize-messages-and-process-response %]))
-                     :on-error   #(log/error "failed to create community category" %)}]})
+                     :on-success  #(do
+                                     (re-frame/dispatch [:navigate-back])
+                                     (re-frame/dispatch [:sanitize-messages-and-process-response %]))
+                     :on-error    #(log/error "failed to create community category" %)}]})
 
 (fx/defn remove-chat-from-category
   {:events [:remove-chat-from-community-category]}
   [{:keys [db]} community-id id categoryID]
-  (let [category (get-in db [:communities community-id :categories categoryID])
+  (let [category       (get-in db [:communities community-id :categories categoryID])
         category-chats (map :id (filter #(and (= (:categoryID %) categoryID) (not= id (:id %)))
                                         (vals (get-in db [:communities community-id :chats]))))]
-    {::json-rpc/call [{:method     "wakuext_editCommunityCategory"
-                       :params     [{:communityId community-id
-                                     :categoryId categoryID
-                                     :categoryName (:name category)
-                                     :chatIds category-chats}]
+    {::json-rpc/call [{:method      "wakuext_editCommunityCategory"
+                       :params      [{:communityId  community-id
+                                      :categoryId   categoryID
+                                      :categoryName (:name category)
+                                      :chatIds      category-chats}]
                        :js-response true
-                       :on-success #(re-frame/dispatch [:sanitize-messages-and-process-response %])
-                       :on-error   #(log/error "failed to remove chat from community" %)}]}))
+                       :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])
+                       :on-error    #(log/error "failed to remove chat from community" %)}]}))
 
 (fx/defn delete-community-chat
   {:events [:delete-community-chat]}
   [_ community-id chat-id]
-  {::json-rpc/call [{:method     "wakuext_deleteCommunityChat"
-                     :params     [community-id chat-id]
+  {::json-rpc/call [{:method      "wakuext_deleteCommunityChat"
+                     :params      [community-id chat-id]
                      :js-response true
-                     :on-success #(re-frame/dispatch [:sanitize-messages-and-process-response %])
-                     :on-error   #(log/error "failed to delete community chat" %)}]})
+                     :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])
+                     :on-error    #(log/error "failed to delete community chat" %)}]})
 
 (fx/defn delete-category
   {:events [:delete-community-category]}
   [_ community-id category-id]
-  {::json-rpc/call [{:method     "wakuext_deleteCommunityCategory"
-                     :params     [{:communityId community-id
-                                   :categoryId category-id}]
+  {::json-rpc/call [{:method      "wakuext_deleteCommunityCategory"
+                     :params      [{:communityId community-id
+                                    :categoryId  category-id}]
                      :js-response true
-                     :on-success #(re-frame/dispatch [:sanitize-messages-and-process-response %])
-                     :on-error   #(log/error "failed to delete community category" %)}]})
+                     :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])
+                     :on-error    #(log/error "failed to delete community category" %)}]})
 
 (fx/defn change-category
   {:events [::change-category-confirmation-pressed]}
   [cofx community-id category-id {:keys [id position categoryID]}]
   (if (not (string/blank? category-id))
-    {::json-rpc/call [{:method     "wakuext_reorderCommunityChat"
-                       :params     [{:communityId community-id
-                                     :categoryId category-id
-                                     :chatId id
-                                     :position position}]
+    {::json-rpc/call [{:method      "wakuext_reorderCommunityChat"
+                       :params      [{:communityId community-id
+                                      :categoryId  category-id
+                                      :chatId      id
+                                      :position    position}]
                        :js-response true
-                       :on-success #(do
-                                      (re-frame/dispatch [:navigate-back])
-                                      (re-frame/dispatch [:sanitize-messages-and-process-response %]))
-                       :on-error   #(log/error "failed to change community category" %)}]}
+                       :on-success  #(do
+                                       (re-frame/dispatch [:navigate-back])
+                                       (re-frame/dispatch [:sanitize-messages-and-process-response %]))
+                       :on-error    #(log/error "failed to change community category" %)}]}
     (fx/merge cofx
               (navigation/navigate-back)
               (remove-chat-from-category community-id id categoryID))))
@@ -611,22 +612,22 @@
 (fx/defn reorder-category-chat
   {:events [::reorder-community-category-chat]}
   [_ community-id category-id chat-id new-position]
-  {::json-rpc/call [{:method     "wakuext_reorderCommunityChat"
-                     :params     [{:communityId community-id
-                                   :categoryId  category-id
-                                   :chatId      chat-id
-                                   :position    new-position}]
+  {::json-rpc/call [{:method      "wakuext_reorderCommunityChat"
+                     :params      [{:communityId community-id
+                                    :categoryId  category-id
+                                    :chatId      chat-id
+                                    :position    new-position}]
                      :js-response true
-                     :on-success #(re-frame/dispatch [:sanitize-messages-and-process-response %])
-                     :on-error   #(log/error "failed to reorder community category chat" %)}]})
+                     :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])
+                     :on-error    #(log/error "failed to reorder community category chat" %)}]})
 
 (fx/defn reorder-category
   {:events [::reorder-community-category]}
   [_ community-id category-id new-position]
-  {::json-rpc/call [{:method     "wakuext_reorderCommunityCategories"
-                     :params     [{:communityId community-id
-                                   :categoryId  category-id
-                                   :position    new-position}]
+  {::json-rpc/call [{:method      "wakuext_reorderCommunityCategories"
+                     :params      [{:communityId community-id
+                                    :categoryId  category-id
+                                    :position    new-position}]
                      :js-response true
                      :on-success  #(re-frame/dispatch [:sanitize-messages-and-process-response %])
                      :on-error    #(log/error "failed to reorder community category" %)}]})
@@ -672,3 +673,45 @@
     {::async-storage/get {:keys keys
                           :cb   #(re-frame/dispatch
                                   [::category-states-loaded community-id hashes %])}}))
+
+(fx/defn navigate-to-community
+  {:events [:communities/navigate-to-community]}
+  [cofx community-id]
+  (fx/merge cofx
+            (navigation/pop-to-root-tab :shell-stack)
+            (navigation/navigate-to-nav2 :community community-id true)))
+
+(fx/defn member-role-updated
+  {:events [:community.member/role-updated]}
+  [cofx response-js]
+  (fx/merge cofx
+            (bottom-sheet/hide-bottom-sheet)
+            (handle-response response-js)))
+
+(fx/defn add-role-to-member
+  {:events [:community.member/add-role]}
+  [cofx community-id public-key role-id]
+  {::json-rpc/call [{:method     "wakuext_addRoleToMember"
+                     :params     [{:communityId community-id
+                                   :user        public-key
+                                   :role        role-id}]
+                     :on-success #(re-frame/dispatch [:community.member/role-updated %])
+                     :on-error   #(log/error "failed to add role to member"
+                                             {:error        %
+                                              :community-id community-id
+                                              :public-key   public-key
+                                              :role-id      role-id})}]})
+
+(fx/defn remove-role-from-member
+  {:events [:community.member/remove-role]}
+  [_ community-id public-key role-id]
+  {::json-rpc/call [{:method "wakuext_removeRoleFromMember"
+                     :params [{:communityId community-id
+                               :user        public-key
+                               :role        role-id}]}
+                    :on-success #(re-frame/dispatch [:community.member/role-updated %])
+                    :on-error #(log/error "failed to remove role from member"
+                                          {:error        %
+                                           :community-id community-id
+                                           :public-key   public-key
+                                           :role-id      role-id})]})

src/status_im/constants.cljs

@@ -197,4 +197,6 @@
 (def ^:const sticker-pack-status-pending 2)
 (def ^:const sticker-pack-status-owned 3)
 
-(def ^:const delete-message-for-me-undo-time-limit-ms 4000)
+(def ^:const community-member-role-all 1)
+(def ^:const community-member-role-manage-users 2)
+(def ^:const community-member-role-moderator 3)

src/status_im/contact/block.cljs

@@ -6,7 +6,7 @@
             [status-im.data-store.contacts :as contacts-store]
             [status-im2.navigation.events :as navigation]
             [status-im.utils.types :as types]
-            [status-im.notifications-center.core :as notification-center]
+            [status-im.activity-center.core :as activity-center]
             [status-im.utils.fx :as fx]))
 
 (fx/defn clean-up-chat
@@ -47,7 +47,7 @@
                     (assoc-in [:contacts/contacts public-key :added] false))
             :clear-message-notifications
             [[public-key] (get-in db [:multiaccount :remote-push-notifications-enabled?])]}
-           (notification-center/get-activity-center-notifications-count)
+           (activity-center/notifications-fetch-unread-count)
            fxs)))
 
 (fx/defn block-contact

src/status_im/contact/chat.cljs

@@ -3,16 +3,13 @@
             [status-im2.navigation.events :as navigation]
             [status-im.utils.fx :as fx]
             [status-im.chat.models :as chat]
-            [status-im.contact.core :as contact]
-            [status-im.notifications-center.core :as notification-center]))
+            [status-im.contact.core :as contact]))
 
 (fx/defn send-message-pressed
   {:events       [:contact.ui/send-message-pressed]
    :interceptors [(re-frame/inject-cofx :random-id-generator)]}
   [cofx {:keys [public-key ens-name]}]
-  (fx/merge cofx
-            (chat/start-chat public-key ens-name)
-            (notification-center/accept-all-activity-center-notifications-from-chat public-key)))
+  (chat/start-chat cofx public-key ens-name))
 
 (fx/defn contact-code-submitted
   {:events       [:contact.ui/contact-code-submitted]

src/status_im/contact/core.cljs

@@ -48,7 +48,7 @@
                (and blocked (not was-blocked))
                (conj [::contact.block/contact-blocked contact chats]))))
          [[:offload-messages constants/timeline-chat-id]
-          [:get-activity-center-notifications-count]]
+          [:activity-center.notifications/fetch-unread-count]]
          contacts)]
     (merge
      {:db (update db :contacts/contacts
@@ -151,3 +151,8 @@
    :mutual-contact-enabled?
    enabled?
    nil))
+
+(fx/defn set-search-query
+  {:events [:contacts/set-search-query]}
+  [{:keys [db] :as cofx} value]
+  {:db (assoc db :contacts/search-query value)})

src/status_im/contact/db.cljs

@@ -1,6 +1,6 @@
 (ns status-im.contact.db
   (:require [clojure.set :as clojure.set]
-            [clojure.string :as clojure.string]
+            [clojure.string :as string]
             [status-im.ethereum.core :as ethereum]
             [status-im.utils.gfycat.core :as gfycat]
             [status-im.utils.identicon :as identicon]
@@ -40,8 +40,8 @@
   (sort (fn [c1 c2]
           (let [name1 (or (:name c1) (:address c1) (:public-key c1))
                 name2 (or (:name c2) (:address c2) (:public-key c2))]
-            (compare (clojure.string/lower-case name1)
-                     (clojure.string/lower-case name2))))
+            (compare (string/lower-case name1)
+                     (string/lower-case name2))))
         (vals contacts)))
 
 (defn filter-dapps
@@ -71,7 +71,7 @@
     (->> members
          (map #(or (get all-contacts %)
                    (public-key->new-contact %)))
-         (sort-by (comp clojure.string/lower-case #(or (:name %) (:alias %))))
+         (sort-by (comp string/lower-case #(or (:name %) (:alias %))))
          (map #(if (get admins (:public-key %))
                  (assoc % :admin? true)
                  %)))))

src/status_im/data_store/activities.cljs

@@ -1,10 +1,8 @@
 (ns status-im.data-store.activities
   (:require [clojure.set :as set]
-            [quo.design-system.colors :as colors]
             [status-im.constants :as constants]
             [status-im.activity-center.notification-types :as notification-types]
-            [status-im.data-store.messages :as messages]
-            [status-im2.setup.config :as config]))
+            [status-im.data-store.messages :as messages]))
 
 (defn- rpc->type [{:keys [type name] :as chat}]
   (case type
@@ -35,15 +33,13 @@
     chat))
 
 (defn <-rpc [item]
-  (cond-> (-> item
-              rpc->type
-              (set/rename-keys {:lastMessage               :last-message
-                                :replyMessage              :reply-message
-                                :chatId                    :chat-id
-                                :contactVerificationStatus :contact-verification-status})
-              (update :last-message #(when % (messages/<-rpc %)))
-              (update :message #(when % (messages/<-rpc %)))
-              (update :reply-message #(when % (messages/<-rpc %)))
-              (dissoc :chatId))
-    (not config/new-activity-center-enabled?)
-    (assoc :color (rand-nth colors/chat-colors))))
+  (-> item
+      rpc->type
+      (set/rename-keys {:lastMessage               :last-message
+                        :replyMessage              :reply-message
+                        :chatId                    :chat-id
+                        :contactVerificationStatus :contact-verification-status})
+      (update :last-message #(when % (messages/<-rpc %)))
+      (update :message #(when % (messages/<-rpc %)))
+      (update :reply-message #(when % (messages/<-rpc %)))
+      (dissoc :chatId)))

src/status_im/data_store/activities_test.cljs

@@ -2,8 +2,7 @@
   (:require [cljs.test :refer [deftest is testing]]
             [status-im.constants :as constants]
             [status-im.activity-center.notification-types :as notification-types]
-            [status-im.data-store.activities :as store]
-            [status-im2.setup.config :as config]))
+            [status-im.data-store.activities :as store]))
 
 (def chat-id
   "0x04c66155")
@@ -19,82 +18,81 @@
    :replyMessage              {}})
 
 (deftest <-rpc-test
-  (with-redefs [config/new-activity-center-enabled? true]
-    (testing "renames keys"
-      (is (= {:name                        chat-name
-              :chat-id                     chat-id
-              :contact-verification-status constants/contact-verification-status-pending}
-             (-> raw-notification
-                 store/<-rpc
-                 (dissoc :last-message :message :reply-message)))))
+  (testing "renames keys"
+    (is (= {:name                        chat-name
+            :chat-id                     chat-id
+            :contact-verification-status constants/contact-verification-status-pending}
+           (-> raw-notification
+               store/<-rpc
+               (dissoc :last-message :message :reply-message)))))
 
-    (testing "transforms messages from RPC response"
-      (is (= {:last-message  {:quoted-message     nil
-                              :outgoing-status    nil
-                              :command-parameters nil
-                              :content            {:sticker     nil
-                                                   :rtl?        nil
-                                                   :ens-name    nil
-                                                   :parsed-text nil
-                                                   :response-to nil
-                                                   :chat-id     nil
-                                                   :image       nil
-                                                   :line-count  nil
-                                                   :links       nil
-                                                   :text        nil}
-                              :outgoing           false}
-              :message       nil
-              :reply-message {:quoted-message     nil
-                              :outgoing-status    nil
-                              :command-parameters nil
-                              :content            {:sticker     nil
-                                                   :rtl?        nil
-                                                   :ens-name    nil
-                                                   :parsed-text nil
-                                                   :response-to nil
-                                                   :chat-id     nil
-                                                   :image       nil
-                                                   :line-count  nil
-                                                   :links       nil
-                                                   :text        nil}
-                              :outgoing           false}}
-             (-> raw-notification
-                 store/<-rpc
-                 (select-keys [:last-message :message :reply-message])))))
+  (testing "transforms messages from RPC response"
+    (is (= {:last-message  {:quoted-message     nil
+                            :outgoing-status    nil
+                            :command-parameters nil
+                            :content            {:sticker     nil
+                                                 :rtl?        nil
+                                                 :ens-name    nil
+                                                 :parsed-text nil
+                                                 :response-to nil
+                                                 :chat-id     nil
+                                                 :image       nil
+                                                 :line-count  nil
+                                                 :links       nil
+                                                 :text        nil}
+                            :outgoing           false}
+            :message       nil
+            :reply-message {:quoted-message     nil
+                            :outgoing-status    nil
+                            :command-parameters nil
+                            :content            {:sticker     nil
+                                                 :rtl?        nil
+                                                 :ens-name    nil
+                                                 :parsed-text nil
+                                                 :response-to nil
+                                                 :chat-id     nil
+                                                 :image       nil
+                                                 :line-count  nil
+                                                 :links       nil
+                                                 :text        nil}
+                            :outgoing           false}}
+           (-> raw-notification
+               store/<-rpc
+               (select-keys [:last-message :message :reply-message])))))
 
-    (testing "augments notification based on its type"
-      (is (= {:chat-name chat-name
-              :chat-type constants/private-group-chat-type
-              :name      chat-name}
-             (-> raw-notification
-                 (assoc :type notification-types/reply)
-                 store/<-rpc
-                 (select-keys [:name :chat-type :chat-name :public? :group-chat]))))
+  (testing "augments notification based on its type"
+    (is (= {:chat-name chat-name
+            :chat-type constants/private-group-chat-type
+            :name      chat-name}
+           (-> raw-notification
+               (assoc :type notification-types/reply)
+               store/<-rpc
+               (select-keys [:name :chat-type :chat-name :public? :group-chat]))))
 
-      (is (= {:chat-name chat-name
-              :chat-type constants/private-group-chat-type
-              :name      chat-name}
-             (-> raw-notification
-                 (assoc :type notification-types/mention)
-                 store/<-rpc
-                 (select-keys [:name :chat-type :chat-name :public? :group-chat]))))
+    (is (= {:chat-name chat-name
+            :chat-type constants/private-group-chat-type
+            :name      chat-name}
+           (-> raw-notification
+               (assoc :type notification-types/mention)
+               store/<-rpc
+               (select-keys [:name :chat-type :chat-name :public? :group-chat]))))
 
-      (is (= {:chat-name  chat-name
-              :chat-type  constants/private-group-chat-type
-              :group-chat true
-              :name       chat-name
-              :public?    false}
-             (-> raw-notification
-                 (assoc :type notification-types/private-group-chat)
-                 store/<-rpc
-                 (select-keys [:name :chat-type :chat-name :public? :group-chat]))))
+    (is (= {:chat-name  chat-name
+            :chat-type  constants/private-group-chat-type
+            :group-chat true
+            :name       chat-name
+            :public?    false}
+           (-> raw-notification
+               (assoc :type notification-types/private-group-chat)
+               store/<-rpc
+               (select-keys [:name :chat-type :chat-name :public? :group-chat]))))
 
-      (is (= {:chat-name  chat-name
-              :chat-type  constants/one-to-one-chat-type
-              :group-chat false
-              :name       chat-name
-              :public?    false}
-             (-> raw-notification
-                 (assoc :type notification-types/one-to-one-chat)
-                 store/<-rpc
-                 (select-keys [:name :chat-type :chat-name :public? :group-chat])))))))
+    (is (= {:chat-name  chat-name
+            :chat-type  constants/one-to-one-chat-type
+            :group-chat false
+            :name       chat-name
+            :public?    false}
+           (-> raw-notification
+               (assoc :type notification-types/one-to-one-chat)
+               store/<-rpc
+               (select-keys [:name :chat-type :chat-name :public? :group-chat]))))))

src/status_im/data_store/messages.cljs

@@ -32,6 +32,7 @@
                                 :quotedMessage :quoted-message
                                 :outgoingStatus :outgoing-status
                                 :audioDurationMs :audio-duration-ms
+                                :deleted :deleted?
                                 :deletedForMe :deleted-for-me?
                                 :new :new?})
 
@@ -42,6 +43,7 @@
       (assoc :content {:chat-id (:chatId message)
                        :text (:text message)
                        :image (:image message)
+                       :album-id (:albumId message)
                        :sticker (:sticker message)
                        :ens-name (:ensName message)
                        :line-count (:lineCount message)

src/status_im/ethereum/macros.clj

@@ -1,10 +1,10 @@
 (ns status-im.ethereum.macros
   (:require [clojure.java.io :as io]
-            [clojure.string :as cstr]))
+            [clojure.string :as string]))
 
 (defn token-icon-path [path]
   (fn [el]
-    (let [el    (cstr/replace el ".png" "")
+    (let [el    (string/replace el ".png" "")
           s     (str path el ".png")
           s-js  (str "." s)]
       (when (.exists (io/file s))
@@ -17,8 +17,8 @@
   (let [path (str "./resources/images/tokens/" (name network) "/")
         files (->> (io/file path)
                    file-seq
-                   (filter #(cstr/ends-with? % "png"))
-                   (map #(first (cstr/split (.getName %) #"@")))
+                   (filter #(string/ends-with? % "png"))
+                   (map #(first (string/split (.getName %) #"@")))
                    distinct)]
     (into {} (map (token-icon-path path) files))))