getAddressAccountType: throw error if address is undefined

MetaMask · Aug 28, 2023 · 24308d6 · 24308d6
1 parent 1672f0f
commit 24308d6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/app/components/Views/EditAccountName/EditAccountName.tsx b/app/components/Views/EditAccountName/EditAccountName.tsx
@@ -87,9 +87,13 @@ const EditAccountName = () => {
 
     InteractionManager.runAfterInteractions(() => {
       const analyticsProperties = async () => {
-        const accountType = getAddressAccountType(selectedAddress);
-        const account_type = accountType === 'QR' ? 'hardware' : accountType;
-        return { account_type, chain_id: chainId };
+        try {
+          const accountType = getAddressAccountType(selectedAddress);
+          const account_type = accountType === 'QR' ? 'hardware' : accountType;
+          return { account_type, chain_id: chainId };
+        } catch {
+          return { account_type: 'no account selected', chain_id: chainId };
+        }
       };
       Analytics.trackEventWithParameters(
         MetaMetricsEvents.ACCOUNT_RENAMED,

diff --git a/app/util/address/index.js b/app/util/address/index.js
@@ -172,7 +172,9 @@ export function isQRHardwareAccount(address) {
  * @returns {String} - Returns address's account type
  */
 export function getAddressAccountType(address) {
-  if (!address) return false;
+  if (!address) {
+    throw new Error('address is not defined');
+  }
 
   const { KeyringController } = Engine.context;
   const { keyrings } = KeyringController.state;

diff --git a/app/util/address/index.test.ts b/app/util/address/index.test.ts
@@ -238,8 +238,10 @@ describe('isQRHardwareAccount', () => {
   });
 });
 describe('getAddressAccountType', () => {
-  it('should return false if argument address is undefined', () => {
-    expect(getAddressAccountType(undefined as any)).toBeFalsy();
+  it('should throw an error if argument address is undefined', () => {
+    expect(() => getAddressAccountType(undefined as any)).toThrow(
+      'address is not defined',
+    );
   });
   it('should return QR if address is from a keyring type qr', () => {
     expect(getAddressAccountType('account-qr-stub-1')).toBe('QR');