Only show iou.pay, not reimbursed action to avoid duplicate message

Expensify · Jul 24, 2023 · 1158139 · 1158139
1 parent 388d977
commit 1158139
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/src/CONST.js b/src/CONST.js
@@ -495,7 +495,6 @@ const CONST = {
                 TASKCANCELLED: 'TASKCANCELLED',
                 IOU: 'IOU',
                 REIMBURSEMENTQUEUED: 'REIMBURSEMENTQUEUED',
-                REIMBURSED: 'REIMBURSED',
                 RENAMED: 'RENAMED',
                 CHRONOSOOOLIST: 'CHRONOSOOOLIST',
                 TASKCOMPLETED: 'TASKCOMPLETED',

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -247,7 +247,7 @@ function isSettled(reportID) {
  */
 function isCurrentUserSubmitter(reportID) {
     const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
-    return report.ownerEmail === currentUserEmail;
+    return report && report.ownerEmail === currentUserEmail;
 }
 
 /**

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -61,7 +61,6 @@ import * as Session from '../../../libs/actions/Session';
 import MoneyRequestView from '../../../components/ReportActionItem/MoneyRequestView';
 import {hideContextMenu} from './ContextMenu/ReportActionContextMenu';
 import * as PersonalDetailsUtils from '../../../libs/PersonalDetailsUtils';
-import * as CurrencyUtils from '../../../libs/CurrencyUtils';
 import ReportActionItemBasicMessage from './ReportActionItemBasicMessage';
 import * as store from '../../../libs/actions/ReimbursementAccount/store';
 import * as BankAccounts from '../../../libs/actions/BankAccounts';
@@ -308,13 +307,6 @@ function ReportActionItem(props) {
                     ) : null}
                 </ReportActionItemBasicMessage>
             );
-        } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSED) {
-            const amount = CurrencyUtils.convertToDisplayString(ReportUtils.getMoneyRequestTotal(props.report), props.report.currency);
-            const submitterDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(props.personalDetailsList, [props.report.ownerAccountID, 'displayName'], props.report.ownerEmail);
-            const message = props.action.originalMessage.isSubmitterAddingBankAccount
-                ? props.translate('iou.settledAfterAddedBankAccount', {submitterDisplayName, amount})
-                : props.translate('iou.payerSettled', {amount});
-            children = <ReportActionItemBasicMessage message={message} />;
         } else {
             const message = _.last(lodashGet(props.action, 'message', [{}]));
             const hasBeenFlagged = !_.contains([CONST.MODERATION.MODERATOR_DECISION_APPROVED, CONST.MODERATION.MODERATOR_DECISION_PENDING], moderationDecision);