diff --git a/plugins/contact-assets/assets/icons.svg b/plugins/contact-assets/assets/icons.svg
index 1878c633f1..f1418ca9cd 100644
--- a/plugins/contact-assets/assets/icons.svg
+++ b/plugins/contact-assets/assets/icons.svg
@@ -69,4 +69,8 @@
+
+
+
+
diff --git a/plugins/contact-assets/src/index.ts b/plugins/contact-assets/src/index.ts
index 4fcbff4529..0119ed3e9b 100644
--- a/plugins/contact-assets/src/index.ts
+++ b/plugins/contact-assets/src/index.ts
@@ -37,6 +37,7 @@ loadMetadata(contact.icon, {
SocialEdit: `${icons}#social-edit`,
Homepage: `${icons}#homepage`,
Whatsapp: `${icons}#whatsapp`,
- Profile: `${icons}#profile`
+ Profile: `${icons}#profile`,
+ ComponentMembers: `${icons}#componentMembers`
})
addStringsLoader(contactId, async (lang: string) => await import(`../lang/${lang}.json`))
diff --git a/plugins/contact-resources/src/components/MembersPresenter.svelte b/plugins/contact-resources/src/components/MembersPresenter.svelte
index f959f12cae..668f558568 100644
--- a/plugins/contact-resources/src/components/MembersPresenter.svelte
+++ b/plugins/contact-resources/src/components/MembersPresenter.svelte
@@ -19,7 +19,6 @@
import contact, { Employee } from '@hcengineering/contact'
import { getClient } from '@hcengineering/presentation'
import { IntlString, translate } from '@hcengineering/platform'
- import tracker from '../../../tracker-resources/src/plugin'
import UsersPopup from './UsersPopup.svelte'
export let value: Doc
@@ -83,6 +82,6 @@
{width}
{justify}
title={buttonTitle}
- icon={tracker.icon.ComponentMembers}
+ icon={contact.icon.ComponentMembers}
on:click={handleMembersEditorOpened}
/>
diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts
index d61c35a1e7..b77d66b247 100644
--- a/plugins/contact/src/index.ts
+++ b/plugins/contact/src/index.ts
@@ -226,6 +226,7 @@ export const contactPlugin = plugin(contactId, {
SocialEdit: '' as Asset,
Homepage: '' as Asset,
Whatsapp: '' as Asset,
+ ComponentMembers: '' as Asset,
Profile: '' as Asset
},
space: {
diff --git a/plugins/gmail-assets/lang/en.json b/plugins/gmail-assets/lang/en.json
index 65c4a55c5d..ea21985af4 100644
--- a/plugins/gmail-assets/lang/en.json
+++ b/plugins/gmail-assets/lang/en.json
@@ -9,7 +9,6 @@
"Copy": "Copy",
"MessagesSelected": "messages selected",
"PublishSelected": "Publish selected",
- "YouAnd": "You and",
"CreateMessage": "Create message",
"ShareMessages": "Share messages",
"Connect": "Connect",
@@ -33,6 +32,6 @@
"WriteEmail": "Write Email",
"Shared": "Shared",
"AvailableTo": "Available to",
- "HaveWrittenEmail": "have written an"
+ "HaveWrittenEmail": "have written an email"
}
}
\ No newline at end of file
diff --git a/plugins/gmail-assets/lang/ru.json b/plugins/gmail-assets/lang/ru.json
index 71e5c25583..295bea3768 100644
--- a/plugins/gmail-assets/lang/ru.json
+++ b/plugins/gmail-assets/lang/ru.json
@@ -9,7 +9,6 @@
"Copy": "Копия",
"MessagesSelected": "сообщений выбрано",
"PublishSelected": "Опубликовать выбранное",
- "YouAnd": "Вы и",
"CreateMessage": "Создать сообщение",
"ShareMessages": "Поделиться сообщениями",
"Connect": "Подключить",
@@ -33,6 +32,6 @@
"WriteEmail": "Написать Email",
"Shared": "Публичный",
"AvailableTo": "Доступен для",
- "HaveWrittenEmail": "написал(а)"
+ "HaveWrittenEmail": "написал(а) сообщение"
}
}
\ No newline at end of file
diff --git a/plugins/gmail-resources/src/components/Main.svelte b/plugins/gmail-resources/src/components/Main.svelte
index 23de0cfc72..ea24234663 100644
--- a/plugins/gmail-resources/src/components/Main.svelte
+++ b/plugins/gmail-resources/src/components/Main.svelte
@@ -123,7 +123,6 @@
Email
-
{getName(object)}
diff --git a/plugins/gmail-resources/src/components/activity/TxWriteMessage.svelte b/plugins/gmail-resources/src/components/activity/TxWriteMessage.svelte
index 74fdedfca2..39301afb4d 100644
--- a/plugins/gmail-resources/src/components/activity/TxWriteMessage.svelte
+++ b/plugins/gmail-resources/src/components/activity/TxWriteMessage.svelte
@@ -15,8 +15,7 @@
-
+{value.subject}
diff --git a/plugins/gmail-resources/src/plugin.ts b/plugins/gmail-resources/src/plugin.ts
index d16f06503a..913eb4c6e7 100644
--- a/plugins/gmail-resources/src/plugin.ts
+++ b/plugins/gmail-resources/src/plugin.ts
@@ -25,7 +25,6 @@ export default mergeIds(gmailId, gmail, {
Copy: '' as IntlString,
MessagesSelected: '' as IntlString,
PublishSelected: '' as IntlString,
- YouAnd: '' as IntlString,
CreateMessage: '' as IntlString,
ShareMessages: '' as IntlString,
Connect: '' as IntlString,
diff --git a/plugins/telegram-assets/lang/en.json b/plugins/telegram-assets/lang/en.json
index eb00a80d11..c7b7ab7c4a 100644
--- a/plugins/telegram-assets/lang/en.json
+++ b/plugins/telegram-assets/lang/en.json
@@ -22,7 +22,6 @@
"Telegram": "Telegram",
"TelegramIntegrationDesc": "Use telegram integration",
"Status": "Status",
- "YouAnd": "You and",
"MessagesSelected": "messages selected"
}
}
\ No newline at end of file
diff --git a/plugins/telegram-assets/lang/ru.json b/plugins/telegram-assets/lang/ru.json
index 90db152526..573774b290 100644
--- a/plugins/telegram-assets/lang/ru.json
+++ b/plugins/telegram-assets/lang/ru.json
@@ -22,7 +22,6 @@
"Telegram": "Telegram",
"TelegramIntegrationDesc": "Подключить Telegram",
"Status": "Статус",
- "YouAnd": "Вы и",
"MessagesSelected": "сообщений выбрано"
}
}
\ No newline at end of file
diff --git a/plugins/telegram-resources/package.json b/plugins/telegram-resources/package.json
index 3aaf8f2537..fcd2136104 100644
--- a/plugins/telegram-resources/package.json
+++ b/plugins/telegram-resources/package.json
@@ -42,6 +42,7 @@
"@hcengineering/chunter": "^0.6.2",
"@hcengineering/login": "^0.6.1",
"@hcengineering/core": "^0.6.21",
+ "@hcengineering/contact-resources": "^0.6.0",
"@hcengineering/notification-resources": "^0.6.0",
"@hcengineering/attachment": "^0.6.1",
"@hcengineering/attachment-resources": "^0.6.0",
diff --git a/plugins/telegram-resources/src/components/Chat.svelte b/plugins/telegram-resources/src/components/Chat.svelte
index 6f1ebd9d3e..4ec0ccc0ca 100644
--- a/plugins/telegram-resources/src/components/Chat.svelte
+++ b/plugins/telegram-resources/src/components/Chat.svelte
@@ -16,15 +16,32 @@
{#if object !== undefined}
@@ -218,11 +255,14 @@
-
Telegram
-
-
- {getContactName(object)}
-
+
+ Telegram
+ {#each participants as participant}
+
+ {/each}
+
diff --git a/plugins/telegram-resources/src/plugin.ts b/plugins/telegram-resources/src/plugin.ts
index bbfb41c0a0..2ccbc48222 100644
--- a/plugins/telegram-resources/src/plugin.ts
+++ b/plugins/telegram-resources/src/plugin.ts
@@ -34,7 +34,6 @@ export default mergeIds(telegramId, telegram, {
Cancel: '' as IntlString,
Share: '' as IntlString,
PublishSelected: '' as IntlString,
- YouAnd: '' as IntlString,
MessagesSelected: '' as IntlString
}
})
diff --git a/plugins/tracker-assets/assets/icons.svg b/plugins/tracker-assets/assets/icons.svg
index 175639daba..25958e8702 100644
--- a/plugins/tracker-assets/assets/icons.svg
+++ b/plugins/tracker-assets/assets/icons.svg
@@ -119,10 +119,6 @@
-
-
-
-
diff --git a/plugins/tracker-assets/src/index.ts b/plugins/tracker-assets/src/index.ts
index f8c9cdbdc2..07481c8413 100644
--- a/plugins/tracker-assets/src/index.ts
+++ b/plugins/tracker-assets/src/index.ts
@@ -54,7 +54,6 @@ loadMetadata(tracker.icon, {
ComponentsList: `${icons}#list`,
ComponentsTimeline: `${icons}#timeline`,
- ComponentMembers: `${icons}#componentMembers`,
ComponentStatusBacklog: `${icons}#component-status-backlog`,
ComponentStatusPlanned: `${icons}#component-status-planned`,
diff --git a/plugins/tracker/src/index.ts b/plugins/tracker/src/index.ts
index 0c299cd3d3..1baffba515 100644
--- a/plugins/tracker/src/index.ts
+++ b/plugins/tracker/src/index.ts
@@ -460,7 +460,6 @@ export default plugin(trackerId, {
ComponentsList: '' as Asset,
ComponentsTimeline: '' as Asset,
- ComponentMembers: '' as Asset,
ComponentStatusBacklog: '' as Asset,
ComponentStatusPlanned: '' as Asset,