Skip to content

Commit 2cb4f5b

Browse files
parasharrajatparasharrajat
committed
Rename
1 parent 1602b39 commit 2cb4f5b

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎src/CONST.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ const CONST = {
12491249
ACTIONABLE_ADD_PAYMENT_CARD: 'ACTIONABLEADDPAYMENTCARD',
12501250
ACTIONABLE_JOIN_REQUEST: 'ACTIONABLEJOINREQUEST',
12511251
ACTIONABLE_MENTION_WHISPER: 'ACTIONABLEMENTIONWHISPER',
1252-
ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER: 'ACTIONABLEMENTIONINVITETOSUBMITEXPENSESCONFIRMWHISPER',
1252+
ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER: 'ACTIONABLEMENTIONINVITETOSUBMITEXPENSECONFIRMWHISPER',
12531253
ACTIONABLE_REPORT_MENTION_WHISPER: 'ACTIONABLEREPORTMENTIONWHISPER',
12541254
ACTIONABLE_TRACK_EXPENSE_WHISPER: 'ACTIONABLETRACKEXPENSEWHISPER',
12551255
ADD_COMMENT: 'ADDCOMMENT',
@@ -1420,7 +1420,7 @@ const CONST = {
14201420
INVITE_TO_SUBMIT_EXPENSE: 'inviteToSubmitExpense',
14211421
NOTHING: 'nothing',
14221422
},
1423-
ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER: {
1423+
ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER: {
14241424
DONE: 'done',
14251425
},
14261426
ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION: {

‎src/libs/API/parameters/ResolveActionableMentionWhisperParams.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type CONST from '@src/CONST';
33

44
type ResolveActionableMentionWhisperParams = {
55
reportActionID: string;
6-
resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION> | ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER>;
6+
resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION> | ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER>;
77
};
88

99
export default ResolveActionableMentionWhisperParams;

‎src/libs/ReportActionsUtils.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -770,10 +770,10 @@ function isActionableMentionWhisper(reportAction: OnyxEntry<ReportAction>): repo
770770
return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER);
771771
}
772772

773-
function isActionableMentionInviteToSubmitExpensesConfirmWhisper(
773+
function isActionableMentionInviteToSubmitExpenseConfirmWhisper(
774774
reportAction: OnyxEntry<ReportAction>,
775-
): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER> {
776-
return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER);
775+
): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER> {
776+
return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER);
777777
}
778778

779779
/**
@@ -2469,7 +2469,7 @@ export {
24692469
isActionableJoinRequest,
24702470
isActionableJoinRequestPending,
24712471
isActionableMentionWhisper,
2472-
isActionableMentionInviteToSubmitExpensesConfirmWhisper,
2472+
isActionableMentionInviteToSubmitExpenseConfirmWhisper,
24732473
isActionableReportMentionWhisper,
24742474
isActionableTrackExpense,
24752475
isConciergeCategoryOptions,

‎src/libs/actions/Report.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4215,7 +4215,7 @@ function clearNewRoomFormError() {
42154215
function resolveActionableMentionWhisper(
42164216
reportID: string | undefined,
42174217
reportAction: OnyxEntry<ReportAction>,
4218-
resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION> | ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER>,
4218+
resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION> | ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER>,
42194219
policyID: string | undefined,
42204220
) {
42214221
if (!reportAction || !reportID) {
@@ -4322,7 +4322,7 @@ function resolveActionableMentionWhisper(
43224322
function resolveActionableMentionConfirmWhisper(
43234323
reportID: string | undefined,
43244324
reportAction: OnyxEntry<ReportAction>,
4325-
resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER>,
4325+
resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER>,
43264326
) {
43274327
resolveActionableMentionWhisper(reportID, reportAction, resolution, undefined);
43284328
}

‎src/pages/home/report/PureReportActionItem.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ import {
8787
getWorkspaceUpdateFieldMessage,
8888
isActionableAddPaymentCard,
8989
isActionableJoinRequest,
90-
isActionableMentionInviteToSubmitExpensesConfirmWhisper,
90+
isActionableMentionInviteToSubmitExpenseConfirmWhisper,
9191
isActionableMentionWhisper,
9292
isActionableReportMentionWhisper,
9393
isActionableTrackExpense,
@@ -429,7 +429,7 @@ function PureReportActionItem({
429429
const isReportActionLinked = linkedReportActionID && action.reportActionID && linkedReportActionID === action.reportActionID;
430430
const [isReportActionActive, setIsReportActionActive] = useState(!!isReportActionLinked);
431431
const isActionableWhisper =
432-
isActionableMentionWhisper(action) || isActionableMentionInviteToSubmitExpensesConfirmWhisper(action) || isActionableTrackExpense(action) || isActionableReportMentionWhisper(action);
432+
isActionableMentionWhisper(action) || isActionableMentionInviteToSubmitExpenseConfirmWhisper(action) || isActionableTrackExpense(action) || isActionableReportMentionWhisper(action);
433433

434434
const highlightedBackgroundColorIfNeeded = useMemo(
435435
() => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(theme.messageHighlightBG) : {}),
@@ -751,12 +751,12 @@ function PureReportActionItem({
751751
];
752752
}
753753

754-
if (isActionableMentionInviteToSubmitExpensesConfirmWhisper(action)) {
754+
if (isActionableMentionInviteToSubmitExpenseConfirmWhisper(action)) {
755755
return [
756756
{
757757
text: 'common.buttonConfirm',
758-
key: `${action.reportActionID}-actionableReportMentionConfirmWhisper-${CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER.DONE}`,
759-
onPress: () => resolveActionableMentionConfirmWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER.DONE),
758+
key: `${action.reportActionID}-actionableReportMentionConfirmWhisper-${CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER.DONE}`,
759+
onPress: () => resolveActionableMentionConfirmWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER.DONE),
760760
isPrimary: true,
761761
},
762762
];

‎src/types/onyx/OriginalMessage.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ type OriginalMessageActionableMentionWhisper = {
129129
};
130130

131131
/** Model of `actionable mention whisper` report action */
132-
type OriginalMessageActionableMentionInviteToSubmitExpensesWhisper = {
132+
type OriginalMessageActionableMentionInviteToSubmitExpenseConfirmWhisper = {
133133
/** Account IDs of users that aren't members of the room */
134134
inviteeAccountIDs: number[];
135135

136136
/** Decision on whether to invite users that were mentioned but aren't members or do nothing */
137-
resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER> | null;
137+
resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER> | null;
138138

139139
/** Collection of accountIDs of users mentioned in message */
140140
whisperedTo?: number[];
@@ -775,7 +775,7 @@ type OriginalMessageMap = {
775775
[CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_ADD_PAYMENT_CARD]: OriginalMessageAddPaymentCard;
776776
[CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST]: OriginalMessageJoinPolicy;
777777
[CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER]: OriginalMessageActionableMentionWhisper;
778-
[CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER]: OriginalMessageActionableMentionInviteToSubmitExpensesWhisper;
778+
[CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER]: OriginalMessageActionableMentionInviteToSubmitExpenseConfirmWhisper;
779779
[CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_REPORT_MENTION_WHISPER]: OriginalMessageActionableReportMentionWhisper;
780780
[CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER]: OriginalMessageActionableTrackedExpenseWhisper;
781781
[CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT]: OriginalMessageAddComment;

‎src/types/onyx/ReportAction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ type Message = {
7878
/** resolution for actionable mention whisper */
7979
resolution?:
8080
| ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION>
81-
| ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSES_CONFIRM_WHISPER>
81+
| ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER>
8282
| ValueOf<typeof CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION>
8383
| null;
8484

0 commit comments

Comments
 (0)