Sort crowdsales list

poanetwork · Aug 29, 2018 · 173d03a · 173d03a
1 parent 7ba48d5
commit 173d03a
Showing 1 changed file with 19 additions and 23 deletions.
diff --git a/src/utils/blockchainHelpers.js b/src/utils/blockchainHelpers.js
@@ -347,33 +347,29 @@ async function getOwnerApplicationsInstancesForProxy() {
   const proxiesRegistryContract = await attachToSpecificCrowdsaleContract('ProxiesRegistry')
   const accounts = await web3.eth.getAccounts()
 
-  const promises = []
-  const crowdsales = []
-  const proxyAddrs = await proxiesRegistryContract.methods.getCrowdsalesForUser(accounts[0]).call()
+  const proxyAddress = await proxiesRegistryContract.methods.getCrowdsalesForUser(accounts[0]).call()
   const mintedCapped = process.env[`${REACT_PREFIX}MINTED_CAPPED_APP_NAME`].toLowerCase()
   const dutchAuction = process.env[`${REACT_PREFIX}DUTCH_APP_NAME`].toLowerCase()
-  proxyAddrs.forEach(proxyAddr => {
-    let promise = new Promise(async (resolve, reject) => {
-      const abi = contractStore.MintedCappedProxy.abi // we can use minted caped proxy ABI for minted capped and Dutch acution
-      try {
-        const contractInstance = await attachToContract(abi, proxyAddr)
-        const contractAppName = await contractInstance.methods.app_name().call()
-        const appName = removeTrailingNUL(web3.utils.toAscii(contractAppName))
-        const appNameLowerCase = appName.toLowerCase()
-        if (appNameLowerCase.includes(mintedCapped) || appNameLowerCase.includes(dutchAuction)) {
-          crowdsales.push({ appName, execID: proxyAddr })
-        }
-        resolve()
-      } catch (error) {
-        logger.error(error)
-        resolve()
+
+  const whenCrowdsales = proxyAddress.map(async proxyAddr => {
+    const abi = contractStore.MintedCappedProxy.abi // we can use minted caped proxy ABI for minted capped and Dutch auction
+    try {
+      const contractInstance = await attachToContract(abi, proxyAddr)
+      const contractAppName = await contractInstance.methods.app_name().call()
+      const appName = removeTrailingNUL(web3.utils.toAscii(contractAppName))
+      const appNameLowerCase = appName.toLowerCase()
+      if (appNameLowerCase.includes(mintedCapped) || appNameLowerCase.includes(dutchAuction)) {
+        return { appName, execID: proxyAddr }
       }
-    })
-    promises.push(promise)
-  })
-  return Promise.all(promises).then(() => {
-    return Promise.all(crowdsales)
+    } catch (error) {
+      logger.error(error)
+    }
+    return null
   })
+
+  const crowdsales = await Promise.all(whenCrowdsales)
+
+  return crowdsales.filter(crowdsale => crowdsale).reverse()
 }
 
 // eslint-disable-next-line no-unused-vars