From b1ccf2688c185bbd3e9887d6e157552351b712b8 Mon Sep 17 00:00:00 2001 From: sahil Date: Thu, 17 Mar 2022 00:54:00 +0530 Subject: [PATCH 1/3] update Avatars --- assets/images/avatars/admins-room.svg | 15 +++++++++++++++ assets/images/avatars/announce-room.svg | 19 +++++++++++++++++++ assets/images/avatars/deleted-room.svg | 4 ++-- assets/images/avatars/room.svg | 4 ++-- src/components/Icon/Expensicons.js | 4 ++++ src/libs/OptionsListUtils.js | 6 ++++++ src/libs/reportUtils.js | 22 ++++++++++++++++++++++ 7 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 assets/images/avatars/admins-room.svg create mode 100644 assets/images/avatars/announce-room.svg diff --git a/assets/images/avatars/admins-room.svg b/assets/images/avatars/admins-room.svg new file mode 100644 index 000000000000..b358608ed994 --- /dev/null +++ b/assets/images/avatars/admins-room.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/assets/images/avatars/announce-room.svg b/assets/images/avatars/announce-room.svg new file mode 100644 index 000000000000..d29ff8c76976 --- /dev/null +++ b/assets/images/avatars/announce-room.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + diff --git a/assets/images/avatars/deleted-room.svg b/assets/images/avatars/deleted-room.svg index cfce5daab440..c68c13a23fef 100644 --- a/assets/images/avatars/deleted-room.svg +++ b/assets/images/avatars/deleted-room.svg @@ -1,9 +1,9 @@ - + diff --git a/assets/images/avatars/room.svg b/assets/images/avatars/room.svg index f138146a65cb..bb677bac3714 100644 --- a/assets/images/avatars/room.svg +++ b/assets/images/avatars/room.svg @@ -1,9 +1,9 @@ - + diff --git a/src/components/Icon/Expensicons.js b/src/components/Icon/Expensicons.js index 40e0342153b6..af3d10133521 100644 --- a/src/components/Icon/Expensicons.js +++ b/src/components/Icon/Expensicons.js @@ -72,10 +72,14 @@ import Wallet from '../../../assets/images/wallet.svg'; import Workspace from '../../../assets/images/workspace-default-avatar.svg'; import ActiveRoomAvatar from '../../../assets/images/avatars/room.svg'; import DeletedRoomAvatar from '../../../assets/images/avatars/deleted-room.svg'; +import AdminsRoomAvatar from '../../../assets/images/avatars/admins-room.svg'; +import AnnounceRoomAvatar from '../../../assets/images/avatars/announce-room.svg'; export { ActiveRoomAvatar, + AdminsRoomAvatar, Android, + AnnounceRoomAvatar, Apple, ArrowRight, BackArrow, diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 3937b60fb342..6a1321bdc829 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -219,6 +219,12 @@ function getAvatarSources(report) { if (ReportUtils.isArchivedRoom(report)) { return Expensicons.DeletedRoomAvatar; } + if (ReportUtils.isAdminsRoom(report)) { + return Expensicons.AdminsRoomAvatar; + } + if (ReportUtils.isAnnounceRoom(report)) { + return Expensicons.AnnounceRoomAvatar; + } if (ReportUtils.isChatRoom(report)) { return Expensicons.ActiveRoomAvatar; } diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js index 59f83ff1db9e..177662e80b7a 100644 --- a/src/libs/reportUtils.js +++ b/src/libs/reportUtils.js @@ -92,6 +92,26 @@ function isDefaultRoom(report) { ], lodashGet(report, ['chatType'], '')); } +/** + * Whether the provided report is a Admins room + * @param {Object} report + * @param {String} report.chatType + * @returns {Boolean} + */ +function isAdminsRoom(report) { + return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS; +} + +/** + * Whether the provided report is a Announce room + * @param {Object} report + * @param {String} report.chatType + * @returns {Boolean} + */ +function isAnnounceRoom(report) { + return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE; +} + /** * Whether the provided report is a user created policy room * @param {Object} report @@ -257,6 +277,8 @@ export { canDeleteReportAction, sortReportsByLastVisited, isDefaultRoom, + isAdminsRoom, + isAnnounceRoom, isUserCreatedPolicyRoom, isChatRoom, getChatRoomSubtitle, From 8df2d22c04d92c3264245a4b77c604e11e74ef7a Mon Sep 17 00:00:00 2001 From: sahil Date: Thu, 17 Mar 2022 11:51:01 +0530 Subject: [PATCH 2/3] rename admins room avatar --- assets/images/avatars/{admins-room.svg => admin-room.svg} | 0 src/components/Icon/Expensicons.js | 4 ++-- src/libs/OptionsListUtils.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename assets/images/avatars/{admins-room.svg => admin-room.svg} (100%) diff --git a/assets/images/avatars/admins-room.svg b/assets/images/avatars/admin-room.svg similarity index 100% rename from assets/images/avatars/admins-room.svg rename to assets/images/avatars/admin-room.svg diff --git a/src/components/Icon/Expensicons.js b/src/components/Icon/Expensicons.js index af3d10133521..4dc6b42dff85 100644 --- a/src/components/Icon/Expensicons.js +++ b/src/components/Icon/Expensicons.js @@ -72,12 +72,12 @@ import Wallet from '../../../assets/images/wallet.svg'; import Workspace from '../../../assets/images/workspace-default-avatar.svg'; import ActiveRoomAvatar from '../../../assets/images/avatars/room.svg'; import DeletedRoomAvatar from '../../../assets/images/avatars/deleted-room.svg'; -import AdminsRoomAvatar from '../../../assets/images/avatars/admins-room.svg'; +import AdminRoomAvatar from '../../../assets/images/avatars/admin-room.svg'; import AnnounceRoomAvatar from '../../../assets/images/avatars/announce-room.svg'; export { ActiveRoomAvatar, - AdminsRoomAvatar, + AdminRoomAvatar, Android, AnnounceRoomAvatar, Apple, diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 6a1321bdc829..81e3ee09e8fb 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -220,7 +220,7 @@ function getAvatarSources(report) { return Expensicons.DeletedRoomAvatar; } if (ReportUtils.isAdminsRoom(report)) { - return Expensicons.AdminsRoomAvatar; + return Expensicons.AdminRoomAvatar; } if (ReportUtils.isAnnounceRoom(report)) { return Expensicons.AnnounceRoomAvatar; From adb80db95e5ab1892f88f7be9d4da9836ca61e57 Mon Sep 17 00:00:00 2001 From: sahil Date: Thu, 17 Mar 2022 15:09:35 +0530 Subject: [PATCH 3/3] rename function --- src/libs/OptionsListUtils.js | 2 +- src/libs/reportUtils.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 81e3ee09e8fb..9401ca7c05ee 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -219,7 +219,7 @@ function getAvatarSources(report) { if (ReportUtils.isArchivedRoom(report)) { return Expensicons.DeletedRoomAvatar; } - if (ReportUtils.isAdminsRoom(report)) { + if (ReportUtils.isAdminRoom(report)) { return Expensicons.AdminRoomAvatar; } if (ReportUtils.isAnnounceRoom(report)) { diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js index 177662e80b7a..aae2e0da77e6 100644 --- a/src/libs/reportUtils.js +++ b/src/libs/reportUtils.js @@ -93,12 +93,12 @@ function isDefaultRoom(report) { } /** - * Whether the provided report is a Admins room + * Whether the provided report is an Admin room * @param {Object} report * @param {String} report.chatType * @returns {Boolean} */ -function isAdminsRoom(report) { +function isAdminRoom(report) { return lodashGet(report, ['chatType'], '') === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS; } @@ -277,7 +277,7 @@ export { canDeleteReportAction, sortReportsByLastVisited, isDefaultRoom, - isAdminsRoom, + isAdminRoom, isAnnounceRoom, isUserCreatedPolicyRoom, isChatRoom,