Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Never show 'You manually marked this report as reimbursed' message on NewDot. #37051

Merged
merged 4 commits into from
Feb 23, 2024
Merged

Never show 'You manually marked this report as reimbursed' message on NewDot. #37051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
338972f
remove 'getMarkedReimbursedMessage'
brunovjk Feb 21, 2024
938eeb3
Merge branch 'Expensify:main' into fix/34003
brunovjk Feb 21, 2024
1cf6ce4
Merge branch 'Expensify:main' into fix/34003
brunovjk Feb 22, 2024
c6a5c7d
Merge branch 'Expensify:main' into fix/34003
brunovjk Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/libs/ReportActionsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,14 +800,6 @@ function getMemberChangeMessageFragment(reportAction: OnyxEntry<ReportAction>):
};
}

/**
* MARKEDREIMBURSED reportActions come from marking a report as reimbursed in OldDot. For now, we just
* concat all of the text elements of the message to create the full message.
*/
function getMarkedReimbursedMessage(reportAction: OnyxEntry<ReportAction>): string {
return reportAction?.message?.map((element) => element.text).join('') ?? '';
}

function getMemberChangeMessagePlainText(reportAction: OnyxEntry<ReportAction>): string {
const messageElements = getMemberChangeMessageElements(reportAction);
return messageElements.map((element) => element.content).join('');
Expand Down Expand Up @@ -935,7 +927,6 @@ export {
hasRequestFromCurrentAccount,
getFirstVisibleReportActionID,
isMemberChangeAction,
getMarkedReimbursedMessage,
getMemberChangeMessageFragment,
getMemberChangeMessagePlainText,
isReimbursementDeQueuedAction,
Expand Down
2 changes: 0 additions & 2 deletions src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,6 @@ function ReportActionItem(props) {
children = <ReportActionItemBasicMessage message={ReportUtils.getReimbursementDeQueuedActionMessage(props.action, props.report)} />;
} else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {
children = <ReportActionItemBasicMessage message={ModifiedExpenseMessage.getForReportAction(props.report.reportID, props.action)} />;
} else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED) {
children = <ReportActionItemBasicMessage message={ReportActionsUtils.getMarkedReimbursedMessage(props.action)} />;
} else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
children = <ReportActionItemBasicMessage message={props.translate('iou.heldRequest', {comment: lodashGet(props, 'action.message[1].text', '')})} />;
} else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
Expand Down
Loading