fix issue with multisend ether

rstormsf · Aug 22, 2018 · 227e9d4 · 227e9d4
1 parent e7df12b
commit 227e9d4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/App.js b/src/App.js
@@ -29,7 +29,7 @@ export class App extends React.Component {
   }
   render(){
     let startedUrl = this.web3Store.startedUrl
-    console.log('fix tx queue')
+    console.log('fix eth multisend')
     return (
       <div>
         <Header />

diff --git a/src/stores/txStore.js b/src/stores/txStore.js
@@ -68,11 +68,22 @@ class TxStore {
     const token_address = this.tokenStore.tokenAddress
     let {addresses_to_send, balances_to_send, proxyMultiSenderAddress, currentFee, totalBalance} =  this.tokenStore;
     
-    let ethValue = token_address === "0x000000000000000000000000000000000000bEEF" ? new BN(currentFee).plus(new BN(totalBalance)) : new BN(currentFee)
+    
     const start = (slice - 1) * addPerTx;
     const end = slice * addPerTx;
     addresses_to_send = addresses_to_send.slice(start, end);
     balances_to_send = balances_to_send.slice(start, end);
+    let ethValue;
+    if(token_address === "0x000000000000000000000000000000000000bEEF"){
+      
+      const totalInWei = balances_to_send.reduce((total, num) => {
+        return (new BN(total).plus(new BN(num)))
+      })
+      const totalInEth = Web3Utils.fromWei(totalInWei.toString())
+      ethValue = new BN(currentFee).plus(totalInEth)
+    } else {
+      ethValue = new BN(currentFee)
+    }
     console.log('slice', slice, addresses_to_send[0], balances_to_send[0], addPerTx)
     const web3 = this.web3Store.web3;
     const multisender = new web3.eth.Contract(MultiSenderAbi, proxyMultiSenderAddress);