From 46ebb7e5324d5d4003cd73f2c16b79be20c42c07 Mon Sep 17 00:00:00 2001 From: puneet Date: Sat, 7 May 2022 04:04:43 -0700 Subject: [PATCH 1/3] update domain room avatar, welcome-message --- assets/images/avatars/domain-room.svg | 16 ++++++++++++++++ src/components/Icon/Expensicons.js | 2 ++ src/languages/en.js | 2 ++ src/languages/es.js | 2 ++ src/libs/reportUtils.js | 16 ++++++++++++++++ 5 files changed, 38 insertions(+) create mode 100644 assets/images/avatars/domain-room.svg diff --git a/assets/images/avatars/domain-room.svg b/assets/images/avatars/domain-room.svg new file mode 100644 index 000000000000..6dcc6407d880 --- /dev/null +++ b/assets/images/avatars/domain-room.svg @@ -0,0 +1,16 @@ + + + + + + + diff --git a/src/components/Icon/Expensicons.js b/src/components/Icon/Expensicons.js index 4d98f1146930..90c47808b188 100644 --- a/src/components/Icon/Expensicons.js +++ b/src/components/Icon/Expensicons.js @@ -75,6 +75,7 @@ import DeletedRoomAvatar from '../../../assets/images/avatars/deleted-room.svg'; import AdminRoomAvatar from '../../../assets/images/avatars/admin-room.svg'; import AnnounceRoomAvatar from '../../../assets/images/avatars/announce-room.svg'; import Connect from '../../../assets/images/connect.svg'; +import DomainRoomAvatar from '../../../assets/images/avatars/domain-room.svg'; export { ActiveRoomAvatar, @@ -102,6 +103,7 @@ export { Connect, CreditCard, DeletedRoomAvatar, + DomainRoomAvatar, DownArrow, Download, Emoji, diff --git a/src/languages/en.js b/src/languages/en.js index 5bb7ce47b42d..03e50efc4ab3 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -177,6 +177,8 @@ export default { reportActionsView: { begginningOfArchivedRoomPartOne: 'You missed the party in ', begginningOfArchivedRoomPartTwo: ', there\'s nothing to see here.', + beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}) => `Collaboration with everyone at ${domainRoom} starts here! 🎉\nUse `, + beginningOfChatHistoryDomainRoomPartTwo: ' to chat with colleagues, share tips, and ask questions.', beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `, beginningOfChatHistoryAdminRoomPartTwo: ' to chat about topics such as workspace configurations and more.', beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}) => `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `, diff --git a/src/languages/es.js b/src/languages/es.js index 833d71fc08d4..d5099447f689 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -177,6 +177,8 @@ export default { reportActionsView: { begginningOfArchivedRoomPartOne: 'Te perdiste la fiesta en ', begginningOfArchivedRoomPartTwo: ', no hay nada que ver aquí.', + beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}) => `Colabora aquí con todos los participantes de ${domainRoom}! 🎉\nUtiliza `, + beginningOfChatHistoryDomainRoomPartTwo: ' para chatear con compañeros, compartir consejos o hacer una pregunta.', beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}) => `Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `, beginningOfChatHistoryAdminRoomPartTwo: ' para chatear sobre temas como la configuración del espacio de trabajo y mas.', beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}) => `Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `, diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js index 9093d365c6b6..5d1d9eae80bf 100644 --- a/src/libs/reportUtils.js +++ b/src/libs/reportUtils.js @@ -93,6 +93,16 @@ function isDefaultRoom(report) { ], lodashGet(report, ['chatType'], '')); } +/** + * Whether the provided report is a Domain room + * @param {Object} report + * @param {String} report.chatType + * @returns {Boolean} + */ + function isDomainRoom(report) { + return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.DOMAIN_ALL; +} + /** * Whether the provided report is an Admin room * @param {Object} report @@ -226,6 +236,9 @@ function getRoomWelcomeMessage(report, policiesMap) { if (isArchivedRoom(report)) { welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.begginningOfArchivedRoomPartOne'); welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.begginningOfArchivedRoomPartTwo'); + } else if (isDomainRoom(report)) { + welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartOne', {domainRoom: report.reportName}); + welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartTwo'); } else if (isAdminRoom(report)) { welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartOne', {workspaceName}); welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartTwo'); @@ -328,6 +341,9 @@ function getIcons(report, personalDetails, policies, defaultIcon = null) { if (isArchivedRoom(report)) { return [Expensicons.DeletedRoomAvatar]; } + if (isDomainRoom(report)) { + return [Expensicons.DomainRoomAvatar]; + } if (isAdminRoom(report)) { return [Expensicons.AdminRoomAvatar]; } From eaca1a26526c37a1fb76b30921cf8ec9f5282e62 Mon Sep 17 00:00:00 2001 From: puneet Date: Sat, 7 May 2022 04:38:41 -0700 Subject: [PATCH 2/3] remove extra space --- src/libs/reportUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js index 5d1d9eae80bf..f6b65112f90a 100644 --- a/src/libs/reportUtils.js +++ b/src/libs/reportUtils.js @@ -99,7 +99,7 @@ function isDefaultRoom(report) { * @param {String} report.chatType * @returns {Boolean} */ - function isDomainRoom(report) { +function isDomainRoom(report) { return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.DOMAIN_ALL; } From 7c76d2c5a9b5fc74bd183fa58991d3f7aed4622f Mon Sep 17 00:00:00 2001 From: puneet Date: Tue, 10 May 2022 11:47:41 -0700 Subject: [PATCH 3/3] change the function position --- src/libs/reportUtils.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js index f6b65112f90a..705c1bd3a489 100644 --- a/src/libs/reportUtils.js +++ b/src/libs/reportUtils.js @@ -80,47 +80,47 @@ function canDeleteReportAction(reportAction) { } /** - * Whether the provided report is a default room + * Whether the provided report is an Admin room * @param {Object} report * @param {String} report.chatType * @returns {Boolean} */ -function isDefaultRoom(report) { - return _.contains([ - CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, - CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, - CONST.REPORT.CHAT_TYPE.DOMAIN_ALL, - ], lodashGet(report, ['chatType'], '')); +function isAdminRoom(report) { + return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS; } /** - * Whether the provided report is a Domain room + * Whether the provided report is a Announce room * @param {Object} report * @param {String} report.chatType * @returns {Boolean} */ -function isDomainRoom(report) { - return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.DOMAIN_ALL; +function isAnnounceRoom(report) { + return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE; } /** - * Whether the provided report is an Admin room + * Whether the provided report is a default room * @param {Object} report * @param {String} report.chatType * @returns {Boolean} */ -function isAdminRoom(report) { - return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS; +function isDefaultRoom(report) { + return _.contains([ + CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, + CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, + CONST.REPORT.CHAT_TYPE.DOMAIN_ALL, + ], lodashGet(report, ['chatType'], '')); } /** - * Whether the provided report is a Announce room + * Whether the provided report is a Domain room * @param {Object} report * @param {String} report.chatType * @returns {Boolean} */ -function isAnnounceRoom(report) { - return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE; +function isDomainRoom(report) { + return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.DOMAIN_ALL; } /**