From 78682a90af86968dff4bd44f140cc54b98ce8eae Mon Sep 17 00:00:00 2001
From: fernandomg <fernando.greco@gmail.com>
Date: Wed, 3 Jun 2020 16:30:09 -0300
Subject: [PATCH] add decorator to extract eth address from ENS for contract
 address

---
 .../screens/ContractInteraction/index.tsx     |  4 ++--
 .../ContractInteraction/utils/index.ts        | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/index.tsx
index 833d251d..08fc5267 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/index.tsx
+++ b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/index.tsx
@@ -18,7 +18,7 @@ import Header from './Header'
 import MethodsDropdown from './MethodsDropdown'
 import RenderInputParams from './RenderInputParams'
 import RenderOutputParams from './RenderOutputParams'
-import { abiExtractor, createTxObject, formMutators, handleSubmitError, isReadMethod } from './utils'
+import { abiExtractor, createTxObject, formMutators, handleSubmitError, isReadMethod, ensResolver } from './utils'
 
 const useStyles = makeStyles(styles)
 
@@ -73,7 +73,7 @@ const ContractInteraction = ({ contractAddress, initialValues, onClose, onNext }
       <Header onClose={onClose} subTitle="1 of 2" title="Contract Interaction" />
       <Hairline />
       <GnoForm
-        decorators={[abiExtractor]}
+        decorators={[abiExtractor, ensResolver]}
         formMutators={formMutators}
         initialValues={initialValues}
         onSubmit={handleSubmit}
diff --git a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/utils/index.ts b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/utils/index.ts
index 4caf1221..19397012 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/utils/index.ts
+++ b/src/routes/safe/components/Balances/SendModal/screens/ContractInteraction/utils/index.ts
@@ -6,8 +6,9 @@ import { mustBeEthereumAddress, mustBeEthereumContractAddress } from 'src/compon
 import { getNetwork } from 'src/config'
 import { getConfiguredSource } from 'src/logic/contractInteraction/sources'
 import { AbiItemExtended } from 'src/logic/contractInteraction/sources/ABIService'
-import { getWeb3 } from 'src/logic/wallets/getWeb3'
+import { getAddressFromENS, getWeb3 } from 'src/logic/wallets/getWeb3'
 import { TransactionReviewType } from '../Review'
+import { isValidEnsName } from 'src/logic/wallets/ethAddresses'
 
 export const NO_CONTRACT = 'no contract'
 
@@ -29,6 +30,26 @@ export const abiExtractor = createDecorator({
   },
 })
 
+export const ensResolver = createDecorator({
+  field: 'contractAddress',
+  updates: {
+    contractAddress: async (contractAddress) => {
+      try {
+        const resolvedAddress = isValidEnsName(contractAddress) && (await getAddressFromENS(contractAddress))
+
+        if (resolvedAddress) {
+          return resolvedAddress
+        }
+      } catch (e) {
+        console.error(e.message)
+        return contractAddress
+      }
+
+      return contractAddress
+    },
+  },
+})
+
 export const formMutators = {
   setMax: (args, state, utils) => {
     utils.changeValue(state, 'value', () => args[0])