Skip to content

Commit c5c47f2

Browse files
heekinhoheekinho
committed
Adjust spelling
1 parent 1a33e22 commit c5c47f2

9 files changed

+35
-35
lines changed

‎src/CONST.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ const CONST = {
12051205
OUTDATED_BANK_ACCOUNT: 'OUTDATEDBANKACCOUNT', // OldDot Action
12061206
REIMBURSED: 'REIMBURSED',
12071207
REIMBURSEMENT_ACH_BOUNCE: 'REIMBURSEMENTACHBOUNCE', // OldDot Action
1208-
REIMBURSEMENT_ACH_CANCELLED: 'REIMBURSEMENTACHCANCELED', // OldDot Action
1208+
REIMBURSEMENT_ACH_CANCELED: 'REIMBURSEMENTACHCANCELED', // OldDot Action
12091209
REIMBURSEMENT_ACCOUNT_CHANGED: 'REIMBURSEMENTACCOUNTCHANGED', // OldDot Action
12101210
REIMBURSEMENT_DELAYED: 'REIMBURSEMENTDELAYED', // OldDot Action
12111211
REIMBURSEMENT_QUEUED: 'REIMBURSEMENTQUEUED',

‎src/libs/OptionsListUtils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import {
6161
isMoneyRequestAction,
6262
isOldDotReportAction,
6363
isPendingRemove,
64-
isReimbursementDeQueuedOrCancelledAction,
64+
isReimbursementDeQueuedOrCanceledAction,
6565
isReimbursementQueuedAction,
6666
isReportPreviewAction,
6767
isTaskAction,
@@ -86,7 +86,7 @@ import {
8686
getMoneyRequestSpendBreakdown,
8787
getParticipantsAccountIDsForDisplay,
8888
getPolicyName,
89-
getReimbursementDeQueuedOrCancelledActionMessage,
89+
getReimbursementDeQueuedOrCanceledActionMessage,
9090
getReimbursementQueuedActionMessage,
9191
getRejectedReportMessage,
9292
getReportAutomaticallyApprovedMessage,
@@ -705,8 +705,8 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
705705
lastMessageTextFromReport = formatReportLastMessageText(reportPreviewMessage);
706706
} else if (isReimbursementQueuedAction(lastReportAction)) {
707707
lastMessageTextFromReport = getReimbursementQueuedActionMessage({reportAction: lastReportAction, reportOrID: report});
708-
} else if (isReimbursementDeQueuedOrCancelledAction(lastReportAction)) {
709-
lastMessageTextFromReport = getReimbursementDeQueuedOrCancelledActionMessage(lastReportAction, report, true);
708+
} else if (isReimbursementDeQueuedOrCanceledAction(lastReportAction)) {
709+
lastMessageTextFromReport = getReimbursementDeQueuedOrCanceledActionMessage(lastReportAction, report, true);
710710
} else if (isDeletedParentAction(lastReportAction) && reportUtilsIsChatReport(report)) {
711711
lastMessageTextFromReport = getDeletedParentActionMessageForChatReport(lastReportAction);
712712
} else if (isPendingRemove(lastReportAction) && report?.reportID && isThreadParentMessage(lastReportAction, report.reportID)) {

‎src/libs/ReportActionsUtils.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,18 @@ function isLeavePolicyAction(reportAction: OnyxEntry<ReportAction>): reportActio
349349
return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY);
350350
}
351351

352-
function isReimbursementCancelledAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED> {
353-
return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED);
352+
function isReimbursementCanceledAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED> {
353+
return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED);
354354
}
355355

356356
function isReimbursementDeQueuedAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED> {
357357
return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED);
358358
}
359359

360-
function isReimbursementDeQueuedOrCancelledAction(
360+
function isReimbursementDeQueuedOrCanceledAction(
361361
reportAction: OnyxEntry<ReportAction>,
362-
): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED | typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED> {
363-
return isReimbursementDeQueuedAction(reportAction) || isReimbursementCancelledAction(reportAction);
362+
): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED | typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED> {
363+
return isReimbursementDeQueuedAction(reportAction) || isReimbursementCanceledAction(reportAction);
364364
}
365365

366366
function isClosedAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.CLOSED> {
@@ -1389,7 +1389,7 @@ function isOldDotReportAction(action: ReportAction | OldDotReportAction) {
13891389
CONST.REPORT.ACTIONS.TYPE.MARK_REIMBURSED_FROM_INTEGRATION,
13901390
CONST.REPORT.ACTIONS.TYPE.OUTDATED_BANK_ACCOUNT,
13911391
CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_BOUNCE,
1392-
CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED,
1392+
CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED,
13931393
CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACCOUNT_CHANGED,
13941394
CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DELAYED,
13951395
CONST.REPORT.ACTIONS.TYPE.SELECTED_FOR_RANDOM_AUDIT,
@@ -1459,7 +1459,7 @@ function getMessageOfOldDotReportAction(oldDotAction: PartialReportAction | OldD
14591459
return translateLocal('report.actions.type.outdatedBankAccount');
14601460
case CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_BOUNCE:
14611461
return translateLocal('report.actions.type.reimbursementACHBounce');
1462-
case CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED:
1462+
case CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED:
14631463
return translateLocal('report.actions.type.reimbursementACHCancelled');
14641464
case CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACCOUNT_CHANGED:
14651465
return translateLocal('report.actions.type.reimbursementAccountChanged');
@@ -2406,9 +2406,9 @@ export {
24062406
isPayAction,
24072407
isPendingRemove,
24082408
isPolicyChangeLogAction,
2409-
isReimbursementCancelledAction,
2409+
isReimbursementCanceledAction,
24102410
isReimbursementDeQueuedAction,
2411-
isReimbursementDeQueuedOrCancelledAction,
2411+
isReimbursementDeQueuedOrCanceledAction,
24122412
isReimbursementQueuedAction,
24132413
isRenamedAction,
24142414
isReportActionAttachment,

‎src/libs/ReportUtils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3051,10 +3051,10 @@ function getReimbursementQueuedActionMessage({
30513051
}
30523052

30533053
/**
3054-
* Returns the preview message for `REIMBURSEMENT_DEQUEUED` or `REIMBURSEMENT_ACH_CANCELLED` action
3054+
* Returns the preview message for `REIMBURSEMENT_DEQUEUED` or `REIMBURSEMENT_ACH_CANCELED` action
30553055
*/
3056-
function getReimbursementDeQueuedOrCancelledActionMessage(
3057-
reportAction: OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED | typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED>>,
3056+
function getReimbursementDeQueuedOrCanceledActionMessage(
3057+
reportAction: OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED | typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED>>,
30583058
reportOrID: OnyxEntry<Report> | string | SearchReport,
30593059
isLHNPreview = false,
30603060
): string {
@@ -9612,7 +9612,7 @@ export {
96129612
getPolicyExpenseChatName,
96139613
getPolicyName,
96149614
getPolicyType,
9615-
getReimbursementDeQueuedOrCancelledActionMessage,
9615+
getReimbursementDeQueuedOrCanceledActionMessage,
96169616
getReimbursementQueuedActionMessage,
96179617
getReportActionActorAccountID,
96189618
getReportDescription,

‎src/pages/home/report/ContextMenu/ContextMenuActions.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import {
6161
isModifiedExpenseAction,
6262
isMoneyRequestAction,
6363
isOldDotReportAction,
64-
isReimbursementDeQueuedOrCancelledAction,
64+
isReimbursementDeQueuedOrCanceledAction,
6565
isReimbursementQueuedAction,
6666
isRenamedAction,
6767
isReportActionAttachment,
@@ -87,7 +87,7 @@ import {
8787
getIOUSubmittedMessage,
8888
getIOUUnapprovedMessage,
8989
getOriginalReportID,
90-
getReimbursementDeQueuedOrCancelledActionMessage,
90+
getReimbursementDeQueuedOrCanceledActionMessage,
9191
getReimbursementQueuedActionMessage,
9292
getRejectedReportMessage,
9393
getReportAutomaticallyApprovedMessage,
@@ -490,9 +490,9 @@ const ContextMenuActions: ContextMenuAction[] = [
490490
} else if (isModifiedExpenseAction(reportAction)) {
491491
const modifyExpenseMessage = ModifiedExpenseMessage.getForReportAction({reportOrID: reportID, reportAction});
492492
Clipboard.setString(modifyExpenseMessage);
493-
} else if (isReimbursementDeQueuedOrCancelledAction(reportAction)) {
493+
} else if (isReimbursementDeQueuedOrCanceledAction(reportAction)) {
494494
const {expenseReportID} = getOriginalMessage(reportAction) ?? {};
495-
const displayMessage = getReimbursementDeQueuedOrCancelledActionMessage(reportAction, expenseReportID);
495+
const displayMessage = getReimbursementDeQueuedOrCanceledActionMessage(reportAction, expenseReportID);
496496
Clipboard.setString(displayMessage);
497497
} else if (isMoneyRequestAction(reportAction)) {
498498
const displayMessage = getIOUReportActionDisplayMessage(reportAction, transaction);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ import {
9191
isMessageDeleted,
9292
isMoneyRequestAction,
9393
isPendingRemove,
94-
isReimbursementDeQueuedOrCancelledAction,
94+
isReimbursementDeQueuedOrCanceledAction,
9595
isReimbursementQueuedAction,
9696
isRenamedAction,
9797
isTagModificationAction,
@@ -289,8 +289,8 @@ type PureReportActionItemProps = {
289289
/** What missing payment method does this report action indicate, if any? */
290290
missingPaymentMethod?: MissingPaymentMethod | undefined;
291291

292-
/** Returns the preview message for `REIMBURSEMENT_DEQUEUED` or `REIMBURSEMENT_ACH_CANCELLED` action */
293-
reimbursementDeQueuedOrCancelledActionMessage?: string;
292+
/** Returns the preview message for `REIMBURSEMENT_DEQUEUED` or `REIMBURSEMENT_ACH_CANCELED` action */
293+
reimbursementDeQueuedOrCanceledActionMessage?: string;
294294

295295
/** The report action message when expense has been modified. */
296296
modifiedExpenseMessage?: string;
@@ -360,7 +360,7 @@ function PureReportActionItem({
360360
isClosedExpenseReportWithNoExpenses,
361361
isCurrentUserTheOnlyParticipant = () => false,
362362
missingPaymentMethod,
363-
reimbursementDeQueuedOrCancelledActionMessage = '',
363+
reimbursementDeQueuedOrCanceledActionMessage = '',
364364
modifiedExpenseMessage = '',
365365
getTransactionsWithReceipts = () => [],
366366
clearError = () => {},
@@ -836,8 +836,8 @@ function PureReportActionItem({
836836
</>
837837
</ReportActionItemBasicMessage>
838838
);
839-
} else if (isReimbursementDeQueuedOrCancelledAction(action)) {
840-
children = <ReportActionItemBasicMessage message={reimbursementDeQueuedOrCancelledActionMessage} />;
839+
} else if (isReimbursementDeQueuedOrCanceledAction(action)) {
840+
children = <ReportActionItemBasicMessage message={reimbursementDeQueuedOrCanceledActionMessage} />;
841841
} else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE) {
842842
children = <ReportActionItemBasicMessage message={modifiedExpenseMessage} />;
843843
} else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.SUBMITTED) || isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.SUBMITTED_AND_CLOSED)) {
@@ -1344,7 +1344,7 @@ export default memo(PureReportActionItem, (prevProps, nextProps) => {
13441344
prevProps.isChronosReport === nextProps.isChronosReport &&
13451345
prevProps.isClosedExpenseReportWithNoExpenses === nextProps.isClosedExpenseReportWithNoExpenses &&
13461346
lodashIsEqual(prevProps.missingPaymentMethod, nextProps.missingPaymentMethod) &&
1347-
prevProps.reimbursementDeQueuedOrCancelledActionMessage === nextProps.reimbursementDeQueuedOrCancelledActionMessage &&
1347+
prevProps.reimbursementDeQueuedOrCanceledActionMessage === nextProps.reimbursementDeQueuedOrCanceledActionMessage &&
13481348
prevProps.modifiedExpenseMessage === nextProps.modifiedExpenseMessage &&
13491349
prevProps.userBillingFundID === nextProps.userBillingFundID &&
13501350
prevProps.reportAutomaticallyForwardedMessage === nextProps.reportAutomaticallyForwardedMessage

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
createDraftTransactionAndNavigateToParticipantSelector,
1010
getIndicatedMissingPaymentMethod,
1111
getOriginalReportID,
12-
getReimbursementDeQueuedOrCancelledActionMessage,
12+
getReimbursementDeQueuedOrCanceledActionMessage,
1313
getReportAutomaticallyForwardedMessage,
1414
getTransactionsWithReceipts,
1515
isArchivedNonExpenseReportWithID,
@@ -87,8 +87,8 @@ function ReportActionItem({action, report, ...props}: PureReportActionItemProps)
8787
isClosedExpenseReportWithNoExpenses={isClosedExpenseReportWithNoExpenses(iouReport)}
8888
isCurrentUserTheOnlyParticipant={isCurrentUserTheOnlyParticipant}
8989
missingPaymentMethod={missingPaymentMethod}
90-
reimbursementDeQueuedOrCancelledActionMessage={getReimbursementDeQueuedOrCancelledActionMessage(
91-
action as OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED | typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED>>,
90+
reimbursementDeQueuedOrCanceledActionMessage={getReimbursementDeQueuedOrCanceledActionMessage(
91+
action as OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED | typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED>>,
9292
report,
9393
)}
9494
modifiedExpenseMessage={ModifiedExpenseMessage.getForReportAction({reportOrID: reportID, reportAction: action})}

‎src/types/onyx/OldDotAction.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ type OriginalMessageReimbursementACHCancelled = {
208208
/**
209209
*
210210
*/
211-
actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED;
211+
actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED;
212212
/**
213213
*
214214
*/
@@ -370,7 +370,7 @@ type OldDotOriginalMessageMap = {
370370
/**
371371
*
372372
*/
373-
[CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED]: OriginalMessageReimbursementACHCancelled;
373+
[CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED]: OriginalMessageReimbursementACHCancelled;
374374
/**
375375
*
376376
*/

‎src/types/onyx/OriginalMessage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ type OriginalMessageMap = {
762762
[CONST.REPORT.ACTIONS.TYPE.OUTDATED_BANK_ACCOUNT]: never;
763763
[CONST.REPORT.ACTIONS.TYPE.REIMBURSED]: never;
764764
[CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_BOUNCE]: never;
765-
[CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED]: never;
765+
[CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELED]: never;
766766
[CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACCOUNT_CHANGED]: never;
767767
[CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED]: OriginalMessageReimbursementDequeued;
768768
[CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DELAYED]: never;

0 commit comments

Comments
 (0)