Merge pull request austintgriffith#181 from leapdao/fix/network-detec…

…tion Remove mainnet network check and fix exchange DAI => ETH
iamonuwa · Jul 5, 2019 · 2418f18 · 2418f18
2 parents 8a3931e + 55c5fe7
commit 2418f18
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/src/components/Exchange.js b/src/components/Exchange.js
@@ -1071,18 +1071,7 @@ export default class Exchange extends React.Component {
       }
 
     }else if(ethToDaiMode==="withdraw"){
-      if(!this.state.mainnetMetaAccount && this.props.network!=="Mainnet"){
-        ethToDaiDisplay = (
-          <div className="content ops row" style={{textAlign:'center'}}>
-            <div className="col-12 p-1">
-              Error: MetaMask network must be: <span style={{fontWeight:"bold",marginLeft:5}}>Mainnet</span>
-              <a href="#" onClick={()=>{this.setState({ethToDaiMode:false})}} style={{marginLeft:40,color:"#666666"}}>
-                <i className="fas fa-times"/> dismiss
-              </a>
-            </div>
-          </div>
-        )
-      }else if(this.props.ethBalance<=0){
+      if(this.props.ethBalance<=0){
         ethToDaiDisplay = (
           <div className="content ops row" style={{textAlign:'center'}}>
             <div className="col-12 p-1">
@@ -1139,7 +1128,7 @@ export default class Exchange extends React.Component {
               console.log("timestamp",timestamp)
 
               let deadline = timestamp+600
-              let mineth = output
+              let mineth = parseInt(output);
               console.log("tokenToEthSwapInput",amountOfDai,mineth,deadline)