Fix knownMethodData retrieval and data fetching from fourbyte

MetaMask · Jun 17, 2019 · 91be4a9 · 91be4a9
1 parent 919b784
commit 91be4a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ui/app/helpers/utils/transactions.util.js b/ui/app/helpers/utils/transactions.util.js
@@ -38,10 +38,12 @@ async function getMethodFrom4Byte (fourBytePrefix) {
     body: null,
     method: 'GET',
     mode: 'cors',
-  })).json()
+  }))
 
-  if (fourByteResponse.count === 1) {
-    return fourByteResponse.results[0].text_signature
+  const fourByteJSON = await fourByteResponse.json()
+
+  if (fourByteJSON.count === 1) {
+    return fourByteJSON.results[0].text_signature
   } else {
     return null
   }
@@ -62,6 +64,7 @@ export async function getMethodDataAsync (fourBytePrefix) {
     })
 
     let sig = await registry.lookup(fourBytePrefix)
+
     if (!sig) {
       sig = await fourByteSig
     }

diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
@@ -2798,14 +2798,14 @@ function getContractMethodData (data = '') {
   return (dispatch, getState) => {
     const prefixedData = ethUtil.addHexPrefix(data)
     const fourBytePrefix = prefixedData.slice(0, 10)
-    const { knownMethodData } = getState().metamask.knownMethodData
-
+    const { knownMethodData } = getState().metamask
     if (knownMethodData && knownMethodData[fourBytePrefix]) {
       return Promise.resolve(knownMethodData[fourBytePrefix])
     }
 
     dispatch(actions.loadingMethoDataStarted())
     log.debug(`loadingMethodData`)
+
     return getMethodDataAsync(fourBytePrefix)
       .then(({ name, params }) => {
         dispatch(actions.loadingMethoDataFinished())