e2e: add optional chaining and nullish coaelescing fallbacks for `add…

…ressBook[chainId]`
MetaMask · Sep 12, 2024 · 393ff53 · 393ff53
1 parent 982b09d
commit 393ff53
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/app/components/Views/Settings/Contacts/ContactForm/index.js b/app/components/Views/Settings/Contacts/ContactForm/index.js
@@ -181,7 +181,7 @@ class ContactForm extends PureComponent {
       }, 100);
     if (mode === EDIT) {
       const { addressBook, chainId, internalAccounts } = this.props;
-      const networkAddressBook = addressBook[chainId] || {};
+      const networkAddressBook = addressBook?.[chainId] ?? {};
       const address = this.props.route.params?.address ?? '';
       const contact =
         networkAddressBook[address] ||

diff --git a/app/components/Views/Settings/Contacts/index.js b/app/components/Views/Settings/Contacts/index.js
@@ -80,8 +80,8 @@ class Contacts extends PureComponent {
     if (
       prevProps.addressBook &&
       this.props.addressBook &&
-      JSON.stringify(prevProps.addressBook[chainId]) !==
-        JSON.stringify(this.props.addressBook[chainId])
+      JSON.stringify(prevProps.addressBook?.[chainId] ?? {}) !==
+        JSON.stringify(this.props.addressBook?.[chainId] ?? {})
     )
       this.updateAddressList();
   };

diff --git a/app/components/Views/confirmations/Send/index.js b/app/components/Views/confirmations/Send/index.js
@@ -600,8 +600,7 @@ class Send extends PureComponent {
           Logger.log('Error decoding transfer data', transactionMeta.data);
         }
       }
-      const existingContact =
-        addressBook[chainId] && addressBook[chainId][checksummedAddress];
+      const existingContact = addressBook?.[chainId]?.[checksummedAddress];
       if (!existingContact) {
         AddressBookController.set(checksummedAddress, '', chainId);
       }

diff --git a/app/components/Views/confirmations/SendFlow/AddressList/AddressList.tsx b/app/components/Views/confirmations/SendFlow/AddressList/AddressList.tsx
@@ -61,7 +61,7 @@ const AddressList: React.FC<AddressListProps> = ({
   );
 
   const networkAddressBook: { [address: string]: AddressBookEntry } = useMemo(
-    () => addressBook[chainId] || {},
+    () => addressBook?.[chainId] ?? {},
     [addressBook, chainId],
   );
   const parseAddressBook = useCallback(

diff --git a/app/components/Views/confirmations/SendFlow/SendTo/index.js b/app/components/Views/confirmations/SendFlow/SendTo/index.js
@@ -189,7 +189,7 @@ class SendFlow extends PureComponent {
     this.updateNavBar();
     // For analytics
     navigation.setParams({ providerType, isPaymentRequest });
-    const networkAddressBook = addressBook[chainId] || {};
+    const networkAddressBook = addressBook?.[chainId] ?? {};
     if (!Object.keys(networkAddressBook).length) {
       setTimeout(() => {
         this.addressToInputRef &&
@@ -223,7 +223,7 @@ class SendFlow extends PureComponent {
   isAddressSaved = () => {
     const { toAccount } = this.state;
     const { addressBook, chainId, internalAccounts } = this.props;
-    const networkAddressBook = addressBook[chainId] || {};
+    const networkAddressBook = addressBook?.[chainId] ?? {};
     const checksummedAddress = toChecksumAddress(toAccount);
     return !!(
       networkAddressBook[checksummedAddress] ||
@@ -366,7 +366,7 @@ class SendFlow extends PureComponent {
     const { addressBook, internalAccounts, chainId } = this.props;
     if (!toAccount) return;
 
-    const networkAddressBook = addressBook[chainId] || {};
+    const networkAddressBook = addressBook?.[chainId] ?? {};
 
     const checksummedAddress = toChecksumAddress(toAccount);
     const matchingAccount = internalAccounts.find((account) =>
@@ -488,8 +488,7 @@ class SendFlow extends PureComponent {
     );
     const existingContact =
       checksummedAddress &&
-      addressBook[chainId] &&
-      addressBook[chainId][checksummedAddress];
+      addressBook?.[chainId]?.[checksummedAddress];
     const displayConfusableWarning =
       !existingContact && confusableCollection && !!confusableCollection.length;
     const displayAsWarning =

diff --git a/app/components/hooks/useExistingAddress.ts b/app/components/hooks/useExistingAddress.ts
@@ -17,7 +17,7 @@ const useExistingAddress = (address?: string): AccountInfo | undefined => {
 
   if (!address) return;
 
-  const networkAddressBook = addressBook[chainId] || {};
+  const networkAddressBook = addressBook?.[chainId] ?? {};
   const checksummedAddress = toChecksumAddress(address);
 
   const matchingAddressBookEntry: AddressBookEntry | undefined =

diff --git a/app/util/address/index.ts b/app/util/address/index.ts
@@ -380,7 +380,7 @@ function checkIfAddressAlreadySaved(
   internalAccounts: InternalAccount[],
 ) {
   if (address) {
-    const networkAddressBook = addressBook[chainId] || {};
+    const networkAddressBook = addressBook?.[chainId] ?? {};
 
     const checksummedResolvedAddress = toChecksumAddress(address);
     if (

diff --git a/app/util/transactions/index.js b/app/util/transactions/index.js
@@ -534,7 +534,7 @@ export function getTransactionToName({
     return ensRecipient;
   }
 
-  const networkAddressBook = addressBook[chainId];
+  const networkAddressBook = addressBook?.[chainId] ?? {};
   const checksummedToAddress = toChecksumAddress(toAddress);
 
   // Convert internalAccounts array to a map for quick lookup