diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index 5bbbf19f3adb..75ebd03fce9c 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -1333,14 +1333,15 @@ function sortTaxRates(taxRates: TaxRates): TaxRate[] { /** * Builds the options for taxRates */ -function getTaxRatesOptions(taxRates: Array>): TaxRatesOption[] { - return taxRates.map((taxRate) => ({ +function getTaxRatesOptions(taxRates: Array>): TaxRatesOption[] { + return taxRates.map(({isSelected, ...taxRate}) => ({ text: taxRate.modifiedName, keyForList: taxRate.modifiedName, searchText: taxRate.modifiedName, tooltipText: taxRate.modifiedName, isDisabled: taxRate.isDisabled, data: taxRate, + isSelected: !!isSelected, })); } @@ -1353,7 +1354,9 @@ function getTaxRatesSection(taxRates: TaxRatesWithDefault | undefined, selectedO const taxes = transformedTaxRates(taxRates); const sortedTaxRates = sortTaxRates(taxes); - const enabledTaxRates = sortedTaxRates.filter((taxRate) => !taxRate.isDisabled); + const enabledTaxRates = sortedTaxRates + .filter((taxRate) => !taxRate.isDisabled) + .map((taxRate) => ({...taxRate, isSelected: selectedOptions.some((option) => option.name === taxRate.modifiedName)})); const numberOfTaxRates = enabledTaxRates.length; // If all tax are disabled but there's a previously selected tag, show only the selected tag @@ -1362,6 +1365,7 @@ function getTaxRatesSection(taxRates: TaxRatesWithDefault | undefined, selectedO modifiedName: option.name, // Should be marked as enabled to be able to be de-selected isDisabled: false, + isSelected: true, })); policyRatesSections.push({ // "Selected" sectiong @@ -1406,6 +1410,7 @@ function getTaxRatesSection(taxRates: TaxRatesWithDefault | undefined, selectedO return { modifiedName: option.name, + isSelected: true, isDisabled: !!taxRateObject?.isDisabled, }; }); diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts index 76b4324f697b..946f818d6b4b 100644 --- a/tests/unit/OptionsListUtilsTest.ts +++ b/tests/unit/OptionsListUtilsTest.ts @@ -2586,6 +2586,7 @@ describe('OptionsListUtils', () => { keyForList: 'Tax exempt 1 (0%) • Default', searchText: 'Tax exempt 1 (0%) • Default', tooltipText: 'Tax exempt 1 (0%) • Default', + isSelected: false, isDisabled: undefined, // creates a data option. data: { @@ -2600,6 +2601,7 @@ describe('OptionsListUtils', () => { keyForList: 'Tax option 3 (5%)', searchText: 'Tax option 3 (5%)', tooltipText: 'Tax option 3 (5%)', + isSelected: false, isDisabled: undefined, data: { name: 'Tax option 3', @@ -2614,6 +2616,7 @@ describe('OptionsListUtils', () => { searchText: 'Tax rate 2 (3%)', tooltipText: 'Tax rate 2 (3%)', isDisabled: undefined, + isSelected: false, data: { name: 'Tax rate 2', code: 'CODE2', @@ -2637,6 +2640,7 @@ describe('OptionsListUtils', () => { searchText: 'Tax rate 2 (3%)', tooltipText: 'Tax rate 2 (3%)', isDisabled: undefined, + isSelected: false, data: { name: 'Tax rate 2', code: 'CODE2',