From 380816f2927d9de904453c25a8911e23591408e1 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Fri, 5 Apr 2024 17:44:51 +0530
Subject: [PATCH 1/2] Safely access taxes properties

---
 src/libs/ReportUtils.ts      | 2 +-
 src/libs/TransactionUtils.ts | 8 ++++----
 src/pages/EditRequestPage.js | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index fec64efaac7f..978685a9be2d 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2783,7 +2783,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
index af28133ecf3f..4244f20d0bc3 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -625,7 +625,7 @@ 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;
 }
 
@@ -633,9 +633,9 @@ function getDefaultTaxName(taxRates: TaxRatesWithDefault, transaction?: Transact
  * 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
index ec49e32a5f0f..cfb1c18d76f1 100644
--- 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]?.value : taxRates.defaultValue) || '';
     return CurrencyUtils.convertToBackendAmount(Number.parseFloat(TransactionUtils.calculateTaxAmount(percentage, transactionAmount)));
 };
 

From 17c39e4a026d97c81141bd90bafdd3f14163ba7e Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Fri, 5 Apr 2024 18:14:52 +0530
Subject: [PATCH 2/2] Fix lint: use conditional check

---
 src/pages/EditRequestPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
index cfb1c18d76f1..bef826300af2 100644
--- 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)));
 };