Skip to content

Remove TranslateLocal from TaxRate action #79688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
parasharrajat wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −23
Open

Remove TranslateLocal from TaxRate action #79688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 9 additions & 16 deletions src/libs/actions/TaxRate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type {NullishDeep, OnyxEntry} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import type {FormOnyxValues} from '@components/Form/types';
import type {LocaleContextProps} from '@components/LocaleContextProvider';
import type {LocaleContextProps, LocalizedTranslate} from '@components/LocaleContextProvider';
import * as API from '@libs/API';
import type {
CreatePolicyTaxParams,
Expand All @@ -12,8 +12,6 @@ import type {
UpdatePolicyTaxValueParams,
} from '@libs/API/parameters';
import {WRITE_COMMANDS} from '@libs/API/types';
// eslint-disable-next-line @typescript-eslint/no-deprecated
import {translateLocal} from '@libs/Localize';
import {getDistanceRateCustomUnit} from '@libs/PolicyUtils';
import {getFieldRequiredErrors, isExistingTaxCode, isExistingTaxName, isValidPercentage} from '@libs/ValidationUtils';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -41,31 +39,27 @@ function covertTaxNameToID(name: string) {
/**
* Function to validate tax name
*/
const validateTaxName = (policy: Policy, values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_NAME_FORM>) => {
const validateTaxName = (policy: Policy, values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_NAME_FORM>, translate: LocalizedTranslate) => {
const errors = getFieldRequiredErrors(values, [INPUT_IDS.NAME]);

const name = values[INPUT_IDS.NAME];
if (name.length > CONST.TAX_RATES.NAME_MAX_LENGTH) {
// eslint-disable-next-line @typescript-eslint/no-deprecated
errors[INPUT_IDS.NAME] = translateLocal('common.error.characterLimitExceedCounter', name.length, CONST.TAX_RATES.NAME_MAX_LENGTH);
errors[INPUT_IDS.NAME] = translate('common.error.characterLimitExceedCounter', name.length, CONST.TAX_RATES.NAME_MAX_LENGTH);
} else if (policy?.taxRates?.taxes && isExistingTaxName(name, policy.taxRates.taxes)) {
// eslint-disable-next-line @typescript-eslint/no-deprecated
errors[INPUT_IDS.NAME] = translateLocal('workspace.taxes.error.taxRateAlreadyExists');
errors[INPUT_IDS.NAME] = translate('workspace.taxes.error.taxRateAlreadyExists');
}

return errors;
};

const validateTaxCode = (policy: Policy, values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CODE_FORM>) => {
const validateTaxCode = (policy: Policy, values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CODE_FORM>, translate: LocalizedTranslate) => {
const errors = getFieldRequiredErrors(values, [INPUT_IDS_TAX_CODE.TAX_CODE]);

const taxCode = values[INPUT_IDS_TAX_CODE.TAX_CODE];
if (taxCode.length > CONST.TAX_RATES.NAME_MAX_LENGTH) {
// eslint-disable-next-line @typescript-eslint/no-deprecated
errors[INPUT_IDS_TAX_CODE.TAX_CODE] = translateLocal('common.error.characterLimitExceedCounter', taxCode.length, CONST.TAX_RATES.NAME_MAX_LENGTH);
errors[INPUT_IDS_TAX_CODE.TAX_CODE] = translate('common.error.characterLimitExceedCounter', taxCode.length, CONST.TAX_RATES.NAME_MAX_LENGTH);
} else if (policy?.taxRates?.taxes && isExistingTaxCode(taxCode, policy.taxRates.taxes)) {
// eslint-disable-next-line @typescript-eslint/no-deprecated
errors[INPUT_IDS_TAX_CODE.TAX_CODE] = translateLocal('workspace.taxes.error.taxCodeAlreadyExists');
errors[INPUT_IDS_TAX_CODE.TAX_CODE] = translate('workspace.taxes.error.taxCodeAlreadyExists');
}

return errors;
Expand All @@ -74,13 +68,12 @@ const validateTaxCode = (policy: Policy, values: FormOnyxValues<typeof ONYXKEYS.
/**
* Function to validate tax value
*/
const validateTaxValue = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM>) => {
const validateTaxValue = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM>, translate: LocalizedTranslate) => {
const errors = getFieldRequiredErrors(values, [INPUT_IDS.VALUE]);

const value = values[INPUT_IDS.VALUE];
if (!isValidPercentage(value)) {
// eslint-disable-next-line @typescript-eslint/no-deprecated
errors[INPUT_IDS.VALUE] = translateLocal('workspace.taxes.error.valuePercentageRange');
errors[INPUT_IDS.VALUE] = translate('workspace.taxes.error.valuePercentageRange');
}

return errors;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/workspace/taxes/NamePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ function NamePage({
if (values[INPUT_IDS.NAME] === currentTaxRate?.name) {
return {};
}
return validateTaxName(policy, values);
return validateTaxName(policy, values, translate);
},
[currentTaxRate?.name, policy],
[currentTaxRate?.name, policy, translate],
);

if (!currentTaxRate) {
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ function WorkspaceCreateTaxPage({
return {};
}
return {
...validateTaxName(policy, values),
...validateTaxValue(values),
...validateTaxName(policy, values, translate),
...validateTaxValue(values, translate),
};
},
[policy],
[policy, translate],
);

return (
Expand Down
4 changes: 2 additions & 2 deletions src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ function WorkspaceTaxCodePage({route}: WorkspaceTaxCodePageProps) {
return {};
}

return validateTaxCode(policy, values);
return validateTaxCode(policy, values, translate);
},
[currentTaxCode, policy],
[currentTaxCode, policy, translate],
);

return (
Expand Down
Loading