Merge pull request #38961 from software-mansion-labs/wave8/fix-foreig…

…n-tax-removing [Simplified Collect][Taxes] - Fix for app crashing when opening Foreign currency default row after deleting the selected tax
Expensify · Mar 25, 2024 · b25eb15 · b25eb15
2 parents 8bb301b + a883c05
commit b25eb15
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/components/TaxPicker.tsx b/src/components/TaxPicker.tsx
@@ -37,7 +37,7 @@ function TaxPicker({selectedTaxRate = '', taxRates, insets, onSubmit}: TaxPicker
 
     const shouldShowTextInput = !isTaxRatesCountBelowThreshold;
 
-    const getTaxName = useCallback((key: string) => taxRates?.taxes[key].name, [taxRates?.taxes]);
+    const getTaxName = useCallback((key: string) => taxRates?.taxes[key]?.name, [taxRates?.taxes]);
 
     const selectedOptions = useMemo(() => {
         if (!selectedTaxRate) {

diff --git a/src/libs/actions/TaxRate.ts b/src/libs/actions/TaxRate.ts
@@ -260,19 +260,25 @@ type TaxRateDeleteMap = Record<
 function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
     const policyTaxRates = policy?.taxRates?.taxes;
+    const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
+    const firstTaxID = Object.keys(policyTaxRates ?? {}).sort((a, b) => a.localeCompare(b))[0];
 
     if (!policyTaxRates) {
         console.debug('Policy or tax rates not found');
         return;
     }
 
+    const isForeignTaxRemoved = foreignTaxDefault && taxesToDelete.includes(foreignTaxDefault);
+
     const onyxData: OnyxData = {
         optimisticData: [
             {
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 value: {
                     taxRates: {
+                        pendingFields: {foreignTaxDefault: isForeignTaxRemoved ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : null},
+                        foreignTaxDefault: isForeignTaxRemoved ? firstTaxID : foreignTaxDefault,
                         taxes: taxesToDelete.reduce<TaxRateDeleteMap>((acc, taxID) => {
                             acc[taxID] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, errors: null};
                             return acc;
@@ -287,6 +293,7 @@ function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 value: {
                     taxRates: {
+                        pendingFields: {foreignTaxDefault: null},
                         taxes: taxesToDelete.reduce<TaxRateDeleteMap>((acc, taxID) => {
                             acc[taxID] = null;
                             return acc;
@@ -301,6 +308,7 @@ function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 value: {
                     taxRates: {
+                        pendingFields: {foreignTaxDefault: null},
                         taxes: taxesToDelete.reduce<TaxRateDeleteMap>((acc, taxID) => {
                             acc[taxID] = {
                                 pendingAction: null,