Merge pull request #8187 from thesahindia/thesahindia/update-icon

update Avatars
Expensify · Mar 17, 2022 · 31492d7 · 31492d7
2 parents 6bbda7e + 47edb6f
commit 31492d7
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 4 deletions.
diff --git a/assets/images/avatars/admin-room.svg b/assets/images/avatars/admin-room.svg
diff --git a/assets/images/avatars/announce-room.svg b/assets/images/avatars/announce-room.svg
diff --git a/assets/images/avatars/deleted-room.svg b/assets/images/avatars/deleted-room.svg
diff --git a/assets/images/avatars/room.svg b/assets/images/avatars/room.svg
diff --git 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 AdminRoomAvatar from '../../../assets/images/avatars/admin-room.svg';
+import AnnounceRoomAvatar from '../../../assets/images/avatars/announce-room.svg';
 
 export {
     ActiveRoomAvatar,
+    AdminRoomAvatar,
     Android,
+    AnnounceRoomAvatar,
     Apple,
     ArrowRight,
     BackArrow,

diff --git 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.isAdminRoom(report)) {
+            return Expensicons.AdminRoomAvatar;
+        }
+        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
@@ -92,6 +92,26 @@ function isDefaultRoom(report) {
     ], lodashGet(report, ['chatType'], ''));
 }
 
+/**
+ * Whether the provided report is an Admin room
+ * @param {Object} report
+ * @param {String} report.chatType
+ * @returns {Boolean}
+ */
+function isAdminRoom(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,
+    isAdminRoom,
+    isAnnounceRoom,
     isUserCreatedPolicyRoom,
     isChatRoom,
     getChatRoomSubtitle,