Skip to content

Commit 16d62f2

Browse files
committed
fixing copy to clipboard mentions
1 parent 6065516 commit 16d62f2

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

src/libs/Parser.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
import {ExpensiMark} from 'expensify-common';
33
import Onyx from 'react-native-onyx';
44
import ONYXKEYS from '@src/ONYXKEYS';
5-
import * as Localize from './Localize';
65
import Log from './Log';
7-
import {getEffectiveDisplayName} from './PersonalDetailsUtils';
86
import * as ReportConnection from './ReportConnection';
97

108
const accountIDToNameMap: Record<string, string> = {};
@@ -17,7 +15,7 @@ Onyx.connect({
1715
return;
1816
}
1917

20-
accountIDToNameMap[personalDetails.accountID] = getEffectiveDisplayName(personalDetails) ?? Localize.translateLocal('common.hidden');
18+
accountIDToNameMap[personalDetails.accountID] = personalDetails.login ?? personalDetails.displayName ?? String(personalDetails.accountID);
2119
});
2220
},
2321
});

src/libs/ReportActionsUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ function getReportActionMessageFragments(action: ReportAction): Message[] {
13031303
}
13041304

13051305
if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION)) {
1306-
const message = `${Localize.translateLocal('roomChangeLog.updateRoomDescription')} ${getOriginalMessage(action)?.description}`;
1306+
const message = getUpdateRoomDescriptionMessage(action);
13071307
return [{text: message, html: `<muted-text>${message}</muted-text>`, type: 'COMMENT'}];
13081308
}
13091309

@@ -1585,7 +1585,7 @@ function getExportIntegrationActionFragments(reportAction: OnyxEntry<ReportActio
15851585
function getUpdateRoomDescriptionMessage(reportAction: ReportAction): string {
15861586
const originalMessage = getOriginalMessage(reportAction) as OriginalMessageChangeLog;
15871587
if (originalMessage?.description) {
1588-
return `${Localize.translateLocal('roomChangeLog.updateRoomDescription')} ${Parser.htmlToText(originalMessage?.description)}`;
1588+
return `${Localize.translateLocal('roomChangeLog.updateRoomDescription')} ${originalMessage?.description}`;
15891589
}
15901590

15911591
return Localize.translateLocal('roomChangeLog.clearRoomDescription');

src/pages/home/report/ReportActionItem.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -645,9 +645,6 @@ function ReportActionItem({
645645
children = <ReportActionItemBasicMessage message={translate('iou.unheldExpense')} />;
646646
} else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION) {
647647
children = <ReportActionItemBasicMessage message={translate('systemMessage.mergedWithCashTransaction')} />;
648-
} else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION) {
649-
const message = ReportActionsUtils.getUpdateRoomDescriptionMessage(action);
650-
children = <ReportActionItemBasicMessage message={message} />;
651648
} else if (ReportActionsUtils.isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION)) {
652649
children = <ReportActionItemBasicMessage message={ReportActionsUtils.getDismissedViolationMessageText(ReportActionsUtils.getOriginalMessage(action))} />;
653650
} else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG) {

0 commit comments

Comments
 (0)