Skip to content

Commit

Permalink
Merge pull request #46862 from bernhardoj/fix/46657-disable-foreign-d…
Browse files Browse the repository at this point in the history
…efault-tax

Disable selecting foreign tax default
  • Loading branch information
Julesssss committed Aug 7, 2024
2 parents 7e61db9 + 23bdb92 commit 7b18ac5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/libs/PolicyUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ function getTaxByID(policy: OnyxEntry<Policy>, taxID: string): TaxRate | undefin
* Whether the tax rate can be deleted and disabled
*/
function canEditTaxRate(policy: Policy, taxID: string): boolean {
return policy.taxRates?.defaultExternalID !== taxID;
return policy.taxRates?.defaultExternalID !== taxID && policy.taxRates?.foreignTaxDefault !== taxID;
}

function isPolicyFeatureEnabled(policy: OnyxEntry<Policy>, featureName: PolicyFeatureName): boolean {
Expand Down
4 changes: 3 additions & 1 deletion src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ function WorkspaceTaxesPage({
};

const toggleAllTaxes = () => {
const taxesToSelect = taxesList.filter((tax) => tax.keyForList !== defaultExternalID && tax.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
const taxesToSelect = taxesList.filter(
(tax) => tax.keyForList !== defaultExternalID && tax.keyForList !== foreignTaxDefault && tax.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
);
setSelectedTaxesIDs((prev) => {
if (prev.length === taxesToSelect.length) {
return [];
Expand Down

0 comments on commit 7b18ac5

Please sign in to comment.