More cleanup & adding consts

Expensify · Jun 15, 2023 · 320bcca · 320bcca
1 parent b30a6dd
commit 320bcca
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 27 deletions.
diff --git a/src/CONST.js b/src/CONST.js
@@ -619,6 +619,7 @@ const CONST = {
         MAX_ROOM_NAME_LENGTH: 79,
         LAST_MESSAGE_TEXT_MAX_LENGTH: 200,
         OWNER_EMAIL_FAKE: '__FAKE__',
+        OWNER_ACCOUNT_ID_FAKE: 0,
         DEFAULT_REPORT_NAME: 'Chat Report',
     },
     COMPOSER: {
@@ -1078,6 +1079,7 @@ const CONST = {
         ROOM_PREFIX: '#',
         CUSTOM_UNIT_RATE_BASE_OFFSET: 100,
         OWNER_EMAIL_FAKE: '_FAKE_',
+        OWNER_ACCOUNT_ID_FAKE: 0,
     },
 
     CUSTOM_UNITS: {

diff --git a/src/components/ReportActionItem/MoneyRequestAction.js b/src/components/ReportActionItem/MoneyRequestAction.js
@@ -113,7 +113,7 @@ function MoneyRequestAction(props) {
                 '',
                 CONST.POLICY.OWNER_EMAIL_FAKE,
                 CONST.POLICY.OWNER_EMAIL_FAKE,
-                0,
+                CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
                 false,
                 '',
                 undefined,

diff --git a/src/components/participantPropTypes.js b/src/components/participantPropTypes.js
@@ -5,7 +5,7 @@ export default PropTypes.shape({
     login: PropTypes.string,
 
     // Account ID of participant
-    accountID: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+    accountID: PropTypes.number,
 
     // Display Name of participant
     displayName: PropTypes.string,

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
@@ -176,27 +176,22 @@ function getPersonalDetailsForAccountIDs(accountIDs, personalDetails) {
     if (!personalDetails) {
         return personalDetailsForAccountIDs;
     }
-    _.chain(accountIDs)
-        // NOTE: this comment is possibly legacy, we need to verify if it's still true
-        // Somehow it's possible for the accountIDs coming from report.participantAccountIDs to contain undefined values so we use compact to remove them.
-        .compact()
-        .each((accountID) => {
-            const cleanAccountID = Number(accountID);
-            let personalDetail = personalDetails[accountID];
-            if (!personalDetail) {
-                // NOTE: this can possibly be changed to 'hidden'
-                personalDetail = {
-                    accountID: cleanAccountID,
-                    avatar: UserUtils.getDefaultAvatar(cleanAccountID),
-                };
-            }
+    _.each(accountIDs, (accountID) => {
+        const cleanAccountID = Number(accountID);
+        let personalDetail = personalDetails[accountID];
+        if (!personalDetail) {
+            personalDetail = {
+                accountID: cleanAccountID,
+                avatar: UserUtils.getDefaultAvatar(cleanAccountID),
+            };
+        }
 
-            if (cleanAccountID === CONST.ACCOUNT_ID.CONCIERGE) {
-                personalDetail.avatar = CONST.CONCIERGE_ICON_URL;
-            }
+        if (cleanAccountID === CONST.ACCOUNT_ID.CONCIERGE) {
+            personalDetail.avatar = CONST.CONCIERGE_ICON_URL;
+        }
 
-            personalDetailsForAccountIDs[cleanAccountID] = personalDetail;
-        });
+        personalDetailsForAccountIDs[cleanAccountID] = personalDetail;
+    });
     return personalDetailsForAccountIDs;
 }
 
@@ -373,7 +368,7 @@ function getAllReportErrors(report, reportActions) {
 /**
  * Creates a report list option
  *
- * @param {Array<String>} accountIDs
+ * @param {Array<Number>} accountIDs
  * @param {Object} personalDetails
  * @param {Object} report
  * @param {Object} reportActions

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -1510,7 +1510,7 @@ function buildOptimisticChatReport(
     chatType = '',
     policyID = CONST.POLICY.OWNER_EMAIL_FAKE,
     ownerEmail = CONST.REPORT.OWNER_EMAIL_FAKE,
-    ownerAccountID = 0,
+    ownerAccountID = CONST.REPORT.OWNER_ACCOUNT_ID_FAKE,
     isOwnPolicyExpenseChat = false,
     oldPolicyName = '',
     visibility = undefined,
@@ -1534,7 +1534,7 @@ function buildOptimisticChatReport(
         notificationPreference,
         oldPolicyName,
         ownerEmail: ownerEmail || CONST.REPORT.OWNER_EMAIL_FAKE,
-        ownerAccountID: ownerAccountID || 0,
+        ownerAccountID: ownerAccountID || CONST.REPORT.OWNER_ACCOUNT_ID_FAKE,
         parentReportActionID,
         parentReportID,
         participantAccountIDs: participantList,

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -502,7 +502,7 @@ function navigateToAndOpenChildReport(childReportID = '0', parentReportAction =
             lodashGet(parentReport, 'chatType', ''),
             lodashGet(parentReport, 'policyID', CONST.POLICY.OWNER_EMAIL_FAKE),
             CONST.POLICY.OWNER_EMAIL_FAKE,
-            0,
+            CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
             false,
             '',
             undefined,
@@ -1159,7 +1159,7 @@ function addPolicyReport(policy, reportName, visibility) {
         CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
         policy.id,
         CONST.REPORT.OWNER_EMAIL_FAKE,
-        0,
+        CONST.REPORT.OWNER_ACCOUNT_ID_FAKE,
         false,
         '',
         visibility,

diff --git a/src/pages/personalDetailsPropType.js b/src/pages/personalDetailsPropType.js
@@ -17,7 +17,7 @@ export default PropTypes.shape({
     avatarUploading: PropTypes.bool,
 
     // accountID of the current user from their personal details
-    accountID: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+    accountID: PropTypes.number,
 
     // login of the current user from their personal details
     login: PropTypes.string,