Merge pull request #39707 from Expensify/monil-fixCrashWhenTaxRateDel…

…eted [CP Staging] Fix crash when tax rate is deleted (cherry picked from commit 09bcd1e)
Expensify · Apr 5, 2024 · 2b8dc25 · 2b8dc25
1 parent fc9b9f8
commit 2b8dc25
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -2778,7 +2778,7 @@ function getModifiedExpenseOriginalMessage(
     }
 
     if ('taxCode' in transactionChanges) {
-        originalMessage.oldTaxRate = policy?.taxRates?.taxes[TransactionUtils.getTaxCode(oldTransaction)].value;
+        originalMessage.oldTaxRate = policy?.taxRates?.taxes[TransactionUtils.getTaxCode(oldTransaction)]?.value;
         originalMessage.taxRate = transactionChanges?.taxCode && policy?.taxRates?.taxes[transactionChanges?.taxCode].value;
     }
 

diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
@@ -625,17 +625,17 @@ function getEnabledTaxRateCount(options: TaxRates) {
  */
 function getDefaultTaxName(taxRates: TaxRatesWithDefault, transaction?: Transaction) {
     const defaultTaxKey = taxRates.defaultExternalID;
-    const defaultTaxName = (defaultTaxKey && `${taxRates.taxes[defaultTaxKey].name} (${taxRates.taxes[defaultTaxKey].value}) • ${Localize.translateLocal('common.default')}`) || '';
+    const defaultTaxName = (defaultTaxKey && `${taxRates.taxes[defaultTaxKey]?.name} (${taxRates.taxes[defaultTaxKey]?.value}) • ${Localize.translateLocal('common.default')}`) || '';
     return transaction?.taxRate?.text ?? defaultTaxName;
 }
 
 /**
  * Gets the tax name
  */
 function getTaxName(taxes: TaxRates, transactionTaxCode: string) {
-    const taxName = `${taxes[transactionTaxCode].name}`;
-    const taxValue = `${taxes[transactionTaxCode].value}`;
-    return transactionTaxCode ? `${taxName} (${taxValue})` : '';
+    const taxName = taxes[transactionTaxCode]?.name ?? '';
+    const taxValue = taxes[transactionTaxCode]?.value ?? '';
+    return transactionTaxCode && taxName && taxValue ? `${taxName} (${taxValue})` : '';
 }
 
 export {

diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
@@ -73,7 +73,7 @@ const defaultProps = {
 };
 
 const getTaxAmount = (transactionAmount, transactionTaxCode, taxRates) => {
-    const percentage = (transactionTaxCode ? taxRates.taxes[transactionTaxCode].value : taxRates.defaultValue) || '';
+    const percentage = (transactionTaxCode && taxRates.taxes[transactionTaxCode] ? taxRates.taxes[transactionTaxCode].value : taxRates.defaultValue) || '';
     return CurrencyUtils.convertToBackendAmount(Number.parseFloat(TransactionUtils.calculateTaxAmount(percentage, transactionAmount)));
 };