From 19ec45ef35f875c9161a2d0fb980219bd7f9392c Mon Sep 17 00:00:00 2001
From: Brad Decker <git@braddecker.dev>
Date: Mon, 17 May 2021 14:00:59 -0500
Subject: [PATCH] create safer isValidAddress method (#11089)

---
 .../send-content/add-recipient/add-recipient.utils.test.js    | 4 +++-
 .../send/send-content/add-recipient/ens-input.component.js    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/pages/send/send-content/add-recipient/add-recipient.utils.test.js b/ui/pages/send/send-content/add-recipient/add-recipient.utils.test.js
index bd498a7bd..4a9605d32 100644
--- a/ui/pages/send/send-content/add-recipient/add-recipient.utils.test.js
+++ b/ui/pages/send/send-content/add-recipient/add-recipient.utils.test.js
@@ -11,11 +11,13 @@ jest.mock('../../../../helpers/utils/util', () => ({
   isDefaultMetaMaskChain: jest.fn().mockReturnValue(true),
   isEthNetwork: jest.fn().mockReturnValue(true),
   checkExistingAddresses: jest.fn().mockReturnValue(true),
+  isValidDomainName: jest.requireActual('../../../../helpers/utils/util')
+    .isValidDomainName,
   isOriginContractAddress: jest.requireActual('../../../../helpers/utils/util')
     .isOriginContractAddress,
 }));
 
-jest.mock('../../../../../../shared/modules/hexstring-utils', () => ({
+jest.mock('../../../../../shared/modules/hexstring-utils', () => ({
   isValidHexAddress: jest.fn((to) =>
     Boolean(to.match(/^[0xabcdef123456798]+$/u)),
   ),
diff --git a/ui/pages/send/send-content/add-recipient/ens-input.component.js b/ui/pages/send/send-content/add-recipient/ens-input.component.js
index f8899b72f..658ac9bde 100644
--- a/ui/pages/send/send-content/add-recipient/ens-input.component.js
+++ b/ui/pages/send/send-content/add-recipient/ens-input.component.js
@@ -9,12 +9,12 @@ import networkMap from 'ethereum-ens-network-map';
 import log from 'loglevel';
 import { isHexString } from 'ethereumjs-util';
 import { ellipsify } from '../../send.utils';
+import { isValidDomainName } from '../../../../helpers/utils/util';
+import { MAINNET_NETWORK_ID } from '../../../../../shared/constants/network';
 import {
   isBurnAddress,
   isValidHexAddress,
 } from '../../../../../shared/modules/hexstring-utils';
-import { isValidDomainName } from '../../../../helpers/utils/util';
-import { MAINNET_NETWORK_ID } from '../../../../../shared/constants/network';
 
 // Local Constants
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';