diff --git a/models/notification/src/index.ts b/models/notification/src/index.ts
index c32af3d5a4..266dbf10dc 100644
--- a/models/notification/src/index.ts
+++ b/models/notification/src/index.ts
@@ -499,7 +499,7 @@ export function createModel (builder: Builder): void {
{
action: notification.actionImpl.ReadNotifyContext,
label: notification.string.MarkAsRead,
- icon: notification.icon.Notifications,
+ icon: view.icon.Eye,
input: 'focus',
visibilityTester: notification.function.CanReadNotifyContext,
category: notification.category.Notification,
@@ -514,7 +514,7 @@ export function createModel (builder: Builder): void {
{
action: notification.actionImpl.UnReadNotifyContext,
label: notification.string.MarkAsUnread,
- icon: notification.icon.Notifications,
+ icon: view.icon.EyeCrossed,
input: 'focus',
visibilityTester: notification.function.CanUnReadNotifyContext,
category: notification.category.Notification,
@@ -529,7 +529,7 @@ export function createModel (builder: Builder): void {
{
action: notification.actionImpl.DeleteContextNotifications,
label: notification.string.Archive,
- icon: view.icon.Archive,
+ icon: view.icon.CheckCircle,
input: 'focus',
category: notification.category.Notification,
target: notification.class.DocNotifyContext,
@@ -543,7 +543,7 @@ export function createModel (builder: Builder): void {
{
action: notification.actionImpl.Unsubscribe,
label: notification.string.Unsubscribe,
- icon: view.icon.EyeCrossed,
+ icon: notification.icon.BellCrossed,
input: 'focus',
category: notification.category.Notification,
target: notification.class.DocNotifyContext,
@@ -594,7 +594,7 @@ export function createModel (builder: Builder): void {
{
action: notification.actionImpl.ArchiveAll,
label: notification.string.ArchiveAll,
- icon: view.icon.Archive,
+ icon: view.icon.CheckCircle,
keyBinding: [],
input: 'none',
category: notification.category.Notification,
@@ -612,7 +612,7 @@ export function createModel (builder: Builder): void {
{
action: notification.actionImpl.ReadAll,
label: notification.string.MarkReadAll,
- icon: notification.icon.ReadAll,
+ icon: view.icon.Eye,
keyBinding: [],
input: 'none',
category: notification.category.Notification,
@@ -630,7 +630,7 @@ export function createModel (builder: Builder): void {
{
action: notification.actionImpl.UnreadAll,
label: notification.string.MarkUnreadAll,
- icon: notification.icon.UnreadAll,
+ icon: view.icon.EyeCrossed,
keyBinding: [],
input: 'none',
category: notification.category.Notification,
diff --git a/plugins/chunter-resources/src/components/chat/utils.ts b/plugins/chunter-resources/src/components/chat/utils.ts
index d61bcfdfab..80ce011326 100644
--- a/plugins/chunter-resources/src/components/chat/utils.ts
+++ b/plugins/chunter-resources/src/components/chat/utils.ts
@@ -210,14 +210,14 @@ function getDirectActions (): Action[] {
function getActivityActions (contexts: DocNotifyContext[]): Action[] {
return [
{
- icon: notification.icon.ReadAll,
+ icon: view.icon.Eye,
label: notification.string.MarkReadAll,
action: async () => {
await readActivityChannels(contexts)
}
},
{
- icon: view.icon.Archive,
+ icon: view.icon.CheckCircle,
label: notification.string.ArchiveAll,
action: async () => {
archiveActivityChannels(contexts)
diff --git a/plugins/notification-assets/assets/icons.svg b/plugins/notification-assets/assets/icons.svg
index 1bb20ca57f..b95e677ca2 100644
--- a/plugins/notification-assets/assets/icons.svg
+++ b/plugins/notification-assets/assets/icons.svg
@@ -2,29 +2,11 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/notification-assets/src/index.ts b/plugins/notification-assets/src/index.ts
index 0e5fc478a6..d8422d170b 100644
--- a/plugins/notification-assets/src/index.ts
+++ b/plugins/notification-assets/src/index.ts
@@ -20,9 +20,5 @@ const icons = require('../assets/icons.svg') as string // eslint-disable-line
loadMetadata(notification.icon, {
Notifications: `${icons}#notifications`,
Inbox: `${icons}#inbox`,
- Track: `${icons}#track`,
- Hide: `${icons}#hide`,
- DontTrack: `${icons}#donttrack`,
- ReadAll: `${icons}#readAll`,
- UnreadAll: `${icons}#unreadAll`
+ BellCrossed: `${icons}#bell-crossed`
})
diff --git a/plugins/notification-resources/src/components/inbox/Inbox.svelte b/plugins/notification-resources/src/components/inbox/Inbox.svelte
index 2287010743..33918d26f1 100644
--- a/plugins/notification-resources/src/components/inbox/Inbox.svelte
+++ b/plugins/notification-resources/src/components/inbox/Inbox.svelte
@@ -31,7 +31,7 @@
TabList
} from '@hcengineering/ui'
import chunter, { ThreadMessage } from '@hcengineering/chunter'
- import { Account, getCurrentAccount, IdMap, Ref } from '@hcengineering/core'
+ import { IdMap, Ref } from '@hcengineering/core'
import activity, { ActivityMessage } from '@hcengineering/activity'
import { isReactionMessage } from '@hcengineering/activity-resources'
import { get } from 'svelte/store'
@@ -318,22 +318,22 @@
justify="left"
kind="regular"
label={notification.string.MarkReadAll}
- icon={notification.icon.ReadAll}
+ icon={view.icon.Eye}
on:click={readAll}
dropdownItems={[
{
id: 'read',
- icon: notification.icon.ReadAll,
+ icon: view.icon.Eye,
label: notification.string.MarkReadAll
},
{
id: 'unread',
- icon: notification.icon.UnreadAll,
+ icon: view.icon.EyeCrossed,
label: notification.string.MarkUnreadAll
},
{
id: 'archive',
- icon: view.icon.Archive,
+ icon: view.icon.CheckCircle,
label: notification.string.ArchiveAll
}
]}
diff --git a/plugins/notification/src/index.ts b/plugins/notification/src/index.ts
index e8c788920d..a6d68512c9 100644
--- a/plugins/notification/src/index.ts
+++ b/plugins/notification/src/index.ts
@@ -382,11 +382,7 @@ const notification = plugin(notificationId, {
icon: {
Notifications: '' as Asset,
Inbox: '' as Asset,
- Track: '' as Asset,
- DontTrack: '' as Asset,
- Hide: '' as Asset,
- ReadAll: '' as Asset,
- UnreadAll: '' as Asset
+ BellCrossed: '' as Asset
},
space: {
Notifications: '' as Ref
diff --git a/plugins/view-assets/assets/icons.svg b/plugins/view-assets/assets/icons.svg
index c6debd2bb4..85b88570dd 100644
--- a/plugins/view-assets/assets/icons.svg
+++ b/plugins/view-assets/assets/icons.svg
@@ -110,10 +110,13 @@
-
+
+
+
+
diff --git a/plugins/view-assets/src/index.ts b/plugins/view-assets/src/index.ts
index fae8f60e3c..c30893732f 100644
--- a/plugins/view-assets/src/index.ts
+++ b/plugins/view-assets/src/index.ts
@@ -43,5 +43,6 @@ loadMetadata(view.icon, {
Database: `${icons}#database`,
Star: `${icons}#star`,
Eye: `${icons}#eye`,
- EyeCrossed: `${icons}#eye-crossed`
+ EyeCrossed: `${icons}#eye-crossed`,
+ CheckCircle: `${icons}#check-circle`
})
diff --git a/plugins/view/src/index.ts b/plugins/view/src/index.ts
index 64bafda2af..27f258dc0a 100644
--- a/plugins/view/src/index.ts
+++ b/plugins/view/src/index.ts
@@ -221,7 +221,8 @@ const view = plugin(viewId, {
Database: '' as Asset,
Star: '' as Asset,
Eye: '' as Asset,
- EyeCrossed: '' as Asset
+ EyeCrossed: '' as Asset,
+ CheckCircle: '' as Asset
},
category: {
General: '' as Ref,