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
6 changes: 3 additions & 3 deletions src/components/AddressForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ function AddressForm({
<InputWrapper
InputComponent={AddressSearch}
inputID={INPUT_IDS.ADDRESS_LINE_1}
label={translate('common.addressLine', {lineNumber: 1})}
label={translate('common.addressLine', 1)}
onValueChange={(data: unknown, key: unknown) => {
onAddressChanged(data, key);
}}
Expand All @@ -194,8 +194,8 @@ function AddressForm({
<InputWrapper
InputComponent={TextInput}
inputID={INPUT_IDS.ADDRESS_LINE_2}
label={translate('common.addressLine', {lineNumber: 2})}
aria-label={translate('common.addressLine', {lineNumber: 2})}
label={translate('common.addressLine', 2)}
aria-label={translate('common.addressLine', 2)}
role={CONST.ROLE.PRESENTATION}
defaultValue={street2}
spellCheck={false}
Expand Down
2 changes: 1 addition & 1 deletion src/components/DelegateNoAccessModalProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function DelegateNoAccessModalProvider({children}: PropsWithChildren) {

const delegateNoAccessPrompt = (
<View style={[styles.renderHTML, styles.flexRow]}>
<RenderHTML html={translate('delegate.notAllowedMessage', {accountOwnerEmail: delegatorEmail})} />
<RenderHTML html={translate('delegate.notAllowedMessage', delegatorEmail)} />
</View>
);
const contextValue = useMemo(
Expand Down
10 changes: 4 additions & 6 deletions src/components/SettlementButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -515,9 +515,7 @@ function SettlementButton({
if (lastPaymentMethod === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || (hasIntentToPay && (isExpenseReport || isInvoiceReport))) {
if (isInvoiceReport) {
const isBusinessBankAccount = bankAccountToDisplay?.accountData?.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS;
return translate(isBusinessBankAccount ? 'iou.invoiceBusinessBank' : 'iou.invoicePersonalBank', {
lastFour: bankAccountToDisplay?.accountData?.accountNumber?.slice(-4) ?? '',
});
return translate(isBusinessBankAccount ? 'iou.invoiceBusinessBank' : 'iou.invoicePersonalBank', bankAccountToDisplay?.accountData?.accountNumber?.slice(-4) ?? '');
}
if (!personalBankAccountList.length) {
return;
Expand All @@ -528,18 +526,18 @@ function SettlementButton({

if ((lastPaymentMethod === CONST.IOU.PAYMENT_TYPE.VBBA || hasIntentToPay) && !!policy?.achAccount) {
if (policy?.achAccount?.accountNumber) {
return translate('paymentMethodList.bankAccountLastFour', {lastFour: policy?.achAccount?.accountNumber?.slice(-4)});
return translate('paymentMethodList.bankAccountLastFour', policy?.achAccount?.accountNumber?.slice(-4));
}

if (!bankAccountToDisplay?.accountData?.accountNumber) {
return;
}

return translate('paymentMethodList.bankAccountLastFour', {lastFour: bankAccountToDisplay?.accountData?.accountNumber?.slice(-4)});
return translate('paymentMethodList.bankAccountLastFour', bankAccountToDisplay?.accountData?.accountNumber?.slice(-4));
}

if (bankAccount?.accountData?.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS && bankAccount?.methodID === policy?.achAccount?.bankAccountID && isExpenseReportUtil(iouReport)) {
return translate('paymentMethodList.bankAccountLastFour', {lastFour: bankAccount?.accountData?.accountNumber?.slice(-4) ?? ''});
return translate('paymentMethodList.bankAccountLastFour', bankAccount?.accountData?.accountNumber?.slice(-4) ?? '');
}

return undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/components/SubStepForms/RegistrationNumberStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function RegistrationNumberStep<TFormID extends keyof OnyxFormValuesMapping>({
style={[styles.mh5, styles.flexGrow1]}
shouldHideFixErrorsAlert
>
<Text style={[styles.textHeadlineLineHeightXXL]}>{translate('businessInfoStep.whatsTheBusinessRegistrationNumber', {country})}</Text>
<Text style={[styles.textHeadlineLineHeightXXL]}>{translate('businessInfoStep.whatsTheBusinessRegistrationNumber', country)}</Text>
<InputWrapper
InputComponent={TextInput}
label={translate('businessInfoStep.registrationNumber')}
Expand Down
116 changes: 42 additions & 74 deletions src/languages/de.ts

Large diffs are not rendered by default.

115 changes: 42 additions & 73 deletions src/languages/en.ts

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions src/languages/es.ts

Large diffs are not rendered by default.

116 changes: 42 additions & 74 deletions src/languages/fr.ts

Large diffs are not rendered by default.

115 changes: 42 additions & 73 deletions src/languages/it.ts

Large diffs are not rendered by default.

114 changes: 42 additions & 72 deletions src/languages/ja.ts

Large diffs are not rendered by default.

112 changes: 42 additions & 70 deletions src/languages/nl.ts

Large diffs are not rendered by default.

102 changes: 0 additions & 102 deletions src/languages/params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ type TagSelectionParams = {
policyTagListName?: string;
};

type AddressLineParams = {
lineNumber: number;
};

type CharacterLimitParams = {
limit: number | string;
};

type AssigneeParams = {
assignee: string;
};

type CharacterLengthLimitParams = {
limit: number;
length: number;
Expand All @@ -42,10 +30,6 @@ type WelcomeEnterMagicCodeParams = {
login: string;
};

type AlreadySignedInParams = {
email: string;
};

type GoBackMessageParams = {
provider: string;
};
Expand All @@ -67,18 +51,6 @@ type DeleteConfirmationParams = {
action: OnyxInputOrEntry<ReportAction>;
};

type BeginningOfChatHistoryDomainRoomParams = {
domainRoom: string;
};

type BeginningOfChatHistoryAdminRoomParams = {
workspaceName: string;
};

type BeginningOfChatHistoryAnnounceRoomParams = {
workspaceName: string;
};

type BeginningOfChatHistoryPolicyExpenseChatParams = {
workspaceName: string;
submitterDisplayName: string;
Expand Down Expand Up @@ -215,8 +187,6 @@ type CompanyCardFeedNameParams = {feedName: string};

type PayerPaidAmountParams = {payer?: string; amount: number | string};

type ApprovedAmountParams = {amount: number | string};

type ManagerApprovedParams = {manager: string};

type ManagerApprovedAmountParams = {manager: string; amount: number | string};
Expand Down Expand Up @@ -255,8 +225,6 @@ type TransferParams = {amount: string};

type InstantSummaryParams = {rate: string; minAmount: string};

type BankAccountLastFourParams = {lastFour: string};

type NotYouParams = {user: string};

type DateShouldBeBeforeParams = {dateString: string};
Expand Down Expand Up @@ -434,8 +402,6 @@ type UpdatedPolicyReimbursementEnabledParams = {enabled: boolean};

type ChangeTypeParams = {oldType: string; newType: string};

type AccountOwnerParams = {accountOwnerEmail: string};

type ExportedToIntegrationParams = {label: string; markedManually?: boolean; inProgress?: boolean; lastModified?: string};

type IntegrationsMessageParams = {
Expand Down Expand Up @@ -525,8 +491,6 @@ type AmountWithCurrencyParams = {amountWithCurrency: string};

type LowerUpperParams = {lower: string; upper: string};

type CategoryNameParams = {categoryName: string};

type NeedCategoryForExportToIntegrationParams = {connectionName: string};

type TaxAmountParams = {taxAmount: number};
Expand All @@ -541,30 +505,16 @@ type ChangeOwnerSubscriptionParams = {usersCount: number; finalCount: number};

type ChangeOwnerDuplicateSubscriptionParams = {email: string; workspaceName: string};

type ChangeOwnerHasFailedSettlementsParams = {email: string};

type ActionsAreCurrentlyRestricted = {workspaceName: string};

type WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams = {workspaceOwnerName: string};

type RenamedWorkspaceNameActionParams = {oldName: string; newName: string};

type StatementTitleParams = {year: number | string; monthName: string};

type BadgeFreeTrialParams = {numOfDays: number};

type BillingBannerSubtitleWithDateParams = {date: string};

type BillingBannerOwnerAmountOwedOverdueParams = {date?: string; purchaseAmountOwed?: string};

type BillingBannerDisputePendingParams = {amountOwed: number; cardEnding: string};

type BillingBannerCardAuthenticationRequiredParams = {cardEnding: string};

type BillingBannerInsufficientFundsParams = {amountOwed: number};

type BillingBannerCardExpiredParams = {amountOwed: number};

type BillingBannerCardOnDisputeParams = {amountOwed: string; cardEnding: string};

type TrialStartedTitleParams = {numOfDays: number};
Expand All @@ -573,10 +523,6 @@ type EarlyDiscountTitleParams = {discountType: number};

type EarlyDiscountSubtitleParams = {days: number; hours: number; minutes: number; seconds: number};

type CardNextPaymentParams = {nextPaymentDate: string};

type CardEndingParams = {cardNumber: string};

type CardInfoParams = {name: string; expiration: string; currency: string};

type YourPlanPriceParams = {lower: string; upper: string};
Expand Down Expand Up @@ -643,10 +589,6 @@ type FeatureNameParams = {
moreFeaturesLink?: string;
};

type AutoPayApprovedReportsLimitErrorParams = {
currency?: string;
};

type DefaultAmountParams = {
defaultAmount: string;
};
Expand Down Expand Up @@ -700,10 +642,6 @@ type ImportPerDiemRatesSuccessfulDescriptionParams = {
rates: number;
};

type AuthenticationErrorParams = {
connectionName: string;
};

type ImportedTypesParams = {
importedTypes: string[];
};
Expand Down Expand Up @@ -847,14 +785,6 @@ type ContactMethodParams = {
contactMethodRoute: string;
};

type BusinessTaxIDParams = {
country: string;
};

type BusinessRegistrationNumberParams = {
country: string;
};

type QBDSetupErrorBodyParams = {
conciergeLink: string;
};
Expand Down Expand Up @@ -895,19 +825,13 @@ type WorkspaceUpgradeNoteParams = {
subscriptionLink: string;
};

type ChangedApproverMessageParams = {managerID: number};

type WorkflowSettingsParam = {workflowSettingLink: string};

type IndividualExpenseRulesSubtitleParams = {
categoriesPageLink: string;
tagsPageLink: string;
};

type BillableDefaultDescriptionParams = {
tagsPageLink: string;
};

type WorkspaceShareNoteParams = {
adminsRoomLink: string;
};
Expand Down Expand Up @@ -981,7 +905,6 @@ export type {
SplitExpenseEditTitleParams,
SplitExpenseSubtitleParams,
TotalAmountGreaterOrLessThanOriginalParams,
AuthenticationErrorParams,
ImportMembersSuccessfulDescriptionParams,
ImportedTagsMessageParams,
ImportTagsSuccessfulDescriptionParams,
Expand All @@ -993,7 +916,6 @@ export type {
RemovedFromApprovalWorkflowParams,
DemotedFromWorkspaceParams,
DefaultAmountParams,
AutoPayApprovedReportsLimitErrorParams,
FeatureNameParams,
FileLimitParams,
FileTypeParams,
Expand All @@ -1009,26 +931,18 @@ export type {
RequiredFieldParams,
IntacctMappingTitleParams,
ImportFieldParams,
AssigneeParams,
DefaultVendorDescriptionParams,
ExportIntegrationSelectedParams,
UnapproveWithIntegrationWarningParams,
IncorrectZipFormatParams,
CardNextPaymentParams,
CardEndingParams,
CardInfoParams,
YourPlanPriceParams,
SubscriptionSizeParams,
SubscriptionCommitmentParams,
SubscriptionSettingsSaveUpToParams,
SubscriptionSettingsRenewsOnParams,
BadgeFreeTrialParams,
BillingBannerSubtitleWithDateParams,
BillingBannerOwnerAmountOwedOverdueParams,
BillingBannerDisputePendingParams,
BillingBannerCardAuthenticationRequiredParams,
BillingBannerInsufficientFundsParams,
BillingBannerCardExpiredParams,
BillingBannerCardOnDisputeParams,
TrialStartedTitleParams,
EarlyDiscountTitleParams,
Expand All @@ -1037,31 +951,21 @@ export type {
StatementTitleParams,
RenamedWorkspaceNameActionParams,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
ActionsAreCurrentlyRestricted,
ChangeOwnerHasFailedSettlementsParams,
OwnerOwesAmountParams,
ChangeOwnerDuplicateSubscriptionParams,
ChangeOwnerSubscriptionParams,
SecondaryLoginParams,
TaxAmountParams,
CategoryNameParams,
AmountWithCurrencyParams,
LowerUpperParams,
LogSizeAndDateParams,
AddressLineParams,
AlreadySignedInParams,
ApprovedAmountParams,
BeginningOfChatHistoryAdminRoomParams,
BeginningOfChatHistoryAnnounceRoomParams,
BeginningOfChatHistoryPolicyExpenseChatParams,
BeginningOfChatHistoryInvoiceRoomParams,
BeginningOfChatHistoryParams,
BeginningOfArchivedRoomParams,
BeginningOfChatHistoryUserRoomParams,
BeginningOfChatHistoryAnnounceRoomPartTwo,
BeginningOfChatHistoryDomainRoomParams,
CanceledRequestParams,
CharacterLimitParams,
ConfirmThatParams,
CompanyCardFeedNameParams,
DateShouldBeAfterParams,
Expand Down Expand Up @@ -1164,7 +1068,6 @@ export type {
ChangeReportPolicyParams,
ChangeTypeParams,
ExportedToIntegrationParams,
AccountOwnerParams,
IntegrationsMessageParams,
MarkedReimbursedParams,
MarkReimbursedFromIntegrationParams,
Expand Down Expand Up @@ -1246,7 +1149,6 @@ export type {
UpdatedPolicyCategoryExpenseLimitTypeParams,
UpdatedPolicyCategoryMaxAmountNoReceiptParams,
SubscriptionSettingsSummaryParams,
BankAccountLastFourParams,
ReviewParams,
CreateExpensesParams,
WorkspaceMembersCountParams,
Expand All @@ -1259,7 +1161,6 @@ export type {
PhoneErrorRouteParams,
WorkspacesListRouteParams,
WorkspaceRouteParams,
BusinessTaxIDParams,
QBDSetupErrorBodyParams,
EmptyCategoriesSubtitleWithAccountingParams,
EmptyTagsSubtitleWithAccountingParams,
Expand All @@ -1269,18 +1170,15 @@ export type {
MergeFailureDescriptionGenericParams,
EnableContinuousReconciliationParams,
WorkspaceUpgradeNoteParams,
ChangedApproverMessageParams,
WorkflowSettingsParam,
MovedActionParams,
IndividualExpenseRulesSubtitleParams,
BillableDefaultDescriptionParams,
WorkspaceShareNoteParams,
RulesEnableWorkflowsParams,
UpgradeSuccessMessageParams,
DomainPermissionInfoRestrictionParams,
SubmittedWithMemoParams,
SignerInfoMessageParams,
BusinessRegistrationNumberParams,
DependentMultiLevelTagsSubtitleParams,
PayAndDowngradeDescriptionParams,
WalletAgreementParams,
Expand Down
Loading
Loading