Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions src/libs/ReportNameUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import Parser from './Parser';
import {getDisplayNameOrDefault} from './PersonalDetailsUtils';
import {getCleanedTagName, isPolicyAdmin, isPolicyFieldListEmpty} from './PolicyUtils';
import {
getActionableCard3DSTransactionApprovalMessage,
getActionableCardFraudAlertResolutionMessage,
getAutoPayApprovedReportsEnabledMessage,
getAutoReimbursementMessage,
Expand Down Expand Up @@ -569,6 +570,10 @@ function computeReportNameBasedOnReportAction(
return getActionableCardFraudAlertResolutionMessage(translate, parentReportAction);
}

if (isActionOfType(parentReportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL)) {
return getActionableCard3DSTransactionApprovalMessage(translate, parentReportAction);
}

if (isActionOfType(parentReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_ADDRESS)) {
return getCompanyAddressUpdateMessage(translate, parentReportAction);
}
Expand Down
6 changes: 6 additions & 0 deletions src/libs/SidebarUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
import Parser from './Parser';
import {getCleanedTagName} from './PolicyUtils';
import {
getActionableCard3DSTransactionApprovalMessage,
getActionableCardFraudAlertResolutionMessage,
getAddedApprovalRuleMessage,
getAddedBudgetMessage,
Expand Down Expand Up @@ -873,6 +874,11 @@ function getOptionData({
// We need to remove sms domain in case the last message text has a phone number mention with sms domain.
let lastMessageText = Str.removeSMSDomain(lastMessageTextFromReport);

// Specifically for concierge chats, which don't meet any of the conditions in the if statement below
if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL)) {
lastMessageText = getActionableCard3DSTransactionApprovalMessage(translate, lastAction) ?? lastMessageText;
}

const isGroupChat = isGroupChatUtil(report) || isDeprecatedGroupDM(report, isReportArchived);

const isThreadMessage = isThread(report) && lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && lastAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
Expand Down
3 changes: 3 additions & 0 deletions src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {getCleanedTagName, isPolicyAdmin} from '@libs/PolicyUtils';
import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
import stripFollowupListFromHtml from '@libs/ReportActionFollowupUtils/stripFollowupListFromHtml';
import {
getActionableCard3DSTransactionApprovalMessage,
getActionableCardFraudAlertMessage,
getActionableMentionWhisperMessage,
getAddedApprovalRuleMessage,
Expand Down Expand Up @@ -1090,6 +1091,8 @@ const ContextMenuActions: ContextMenuAction[] = [
setClipboardMessage(getMovedActionMessage(translate, reportAction, originalReport));
} else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_FRAUD_ALERT)) {
setClipboardMessage(getActionableCardFraudAlertMessage(translate, reportAction, getLocalDateFromDatetime));
} else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL)) {
setClipboardMessage(getActionableCard3DSTransactionApprovalMessage(translate, reportAction));
} else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY) {
const displayMessage = getPolicyChangeMessage(translate, reportAction);
Clipboard.setString(displayMessage);
Expand Down
Loading