Skip to content

Commit a1ccf61

Browse files
puneetlathOSBotify
authored andcommitted
Merge pull request #48105 from etCoderDysto/default-label
fix: "Default" label changes to "Workspace currency default" after changing tax code (cherry picked from commit 920edc8) (CP triggered by puneetlath)
1 parent 90aba17 commit a1ccf61

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/libs/actions/TaxRate.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,14 +486,17 @@ function renamePolicyTax(policyID: string, taxID: string, newName: string) {
486486
function setPolicyTaxCode(policyID: string, oldTaxCode: string, newTaxCode: string) {
487487
const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
488488
const originalTaxRate = {...policy?.taxRates?.taxes[oldTaxCode]};
489+
const oldDefaultExternalID = policy?.taxRates?.defaultExternalID;
490+
const oldForeignTaxDefault = policy?.taxRates?.foreignTaxDefault;
489491
const onyxData: OnyxData = {
490492
optimisticData: [
491493
{
492494
onyxMethod: Onyx.METHOD.MERGE,
493495
key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
494496
value: {
495497
taxRates: {
496-
defaultExternalID: oldTaxCode === policy?.taxRates?.defaultExternalID ? newTaxCode : policy?.taxRates?.defaultExternalID,
498+
defaultExternalID: oldTaxCode === oldDefaultExternalID ? newTaxCode : oldDefaultExternalID,
499+
foreignTaxDefault: oldTaxCode === oldForeignTaxDefault ? newTaxCode : oldForeignTaxDefault,
497500
taxes: {
498501
[oldTaxCode]: null,
499502
[newTaxCode]: {
@@ -514,7 +517,8 @@ function setPolicyTaxCode(policyID: string, oldTaxCode: string, newTaxCode: stri
514517
key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
515518
value: {
516519
taxRates: {
517-
defaultExternalID: oldTaxCode === policy?.taxRates?.defaultExternalID ? newTaxCode : policy?.taxRates?.defaultExternalID,
520+
defaultExternalID: oldTaxCode === oldDefaultExternalID ? newTaxCode : oldDefaultExternalID,
521+
foreignTaxDefault: oldTaxCode === oldForeignTaxDefault ? newTaxCode : oldForeignTaxDefault,
518522
taxes: {
519523
[oldTaxCode]: null,
520524
[newTaxCode]: {
@@ -535,7 +539,8 @@ function setPolicyTaxCode(policyID: string, oldTaxCode: string, newTaxCode: stri
535539
key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
536540
value: {
537541
taxRates: {
538-
defaultExternalID: policy?.taxRates?.defaultExternalID,
542+
defaultExternalID: oldDefaultExternalID,
543+
foreignTaxDefault: oldForeignTaxDefault,
539544
taxes: {
540545
[newTaxCode]: null,
541546
[oldTaxCode]: {

src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function WorkspaceEditTaxPage({
3838
const currentTaxID = PolicyUtils.getCurrentTaxID(policy, taxID);
3939
const currentTaxRate = currentTaxID && policy?.taxRates?.taxes?.[currentTaxID];
4040
const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
41-
const canEditTaxRate = policy && PolicyUtils.canEditTaxRate(policy, taxID);
41+
const canEditTaxRate = policy && PolicyUtils.canEditTaxRate(policy, currentTaxID ?? taxID);
4242
const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
4343

4444
const shouldShowDeleteMenuItem = canEditTaxRate && !hasAccountingConnections;

0 commit comments

Comments
 (0)