Fix testate check and balance warning

7858f41e · Callil Capuozzo · 93c627be · 7858f41e · 7858f41e · 7858f41e
Commit 7858f41e authored Jan 22, 2018 by Callil Capuozzo
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 7 deletions

App.js src/App.js +3 -2

ConnectionHelper.js src/components/ConnectionHelper.js +9 -4

NetworkStatus.js src/components/NetworkStatus.js +1 -1

No files found.
--- a/src/App.js
+++ b/src/App.js
@@ -588,7 +588,7 @@ class App extends Component {

  render() {
    return (
-      <div className={this.state.connected && !this.state.locked ? "App" : "App dim"}>
+      <div className={this.state.connected && !this.state.locked && this.state.interaction !== 'disconnected' ? "App" : "App dim"}>
        <Head />
        <section className="title">
          <div className="logo border pa2">
@@ -598,6 +598,7 @@ class App extends Component {
            network={this.state.networkMessage}
            connected={this.state.connected}
            metamask={this.props.metamask}
+            interaction={this.state.interaction}
            address={this.state.currentMaskAddress}
            locked={this.state.locked}
            balance={this.state.inputBalance}/>
@@ -691,7 +692,7 @@ class App extends Component {
          </a>
        </section>

-        {this.state.transactions.length > 0 ?
+        {this.state.transactions.length > 0 && this.state.interaction !== 'disconnected' ?
        <section className="transaction border pa2">
          <p className="underline">Past Transactions:</p>
          <Transactions transactions={this.state.transactions}/>

--- a/src/components/ConnectionHelper.js
+++ b/src/components/ConnectionHelper.js
@@ -53,17 +53,22 @@ function ConnectionHelper(props) {
        <p>You can't swap a token for itself! 😂</p>
      </div>
    )
-  }
-  else if (props.interaction === "submitted") {
+  } else if (props.interaction === "submitted") {
    return (
      <div className="grey-bg connection border pa2">
        <p>{"Transaction submitted! Click on the transaction hash below to check its status?"}</p>
      </div>
    )
-  }  else if (props.input > props.balance/10**18) {
+  } else if (props.input > props.balance/10**18 && props.inputToken.value === 'ETH') {
+    return (
+      <div className="grey-bg red connection border pa2">
+        <p>This account doesn't have enough balance to make this transaction! Get more {props.inputToken.value} with the <a target="_blank" href="https://faucet.rinkeby.io/">Rinkeby Faucet.</a></p>
+      </div>
+    )
+  } else if (props.input > props.balance/10**18) {
    return (
      <div className="grey-bg red connection border pa2">
-        <p>This account doesn't have enough balance to make this transaction! Get more ETH with the <a target="_blank" href="https://faucet.rinkeby.io/">Rinkeby Faucet.</a></p>
+        <p>{"This account doesn't have enough balance to make this transaction! You'll need to swap some ETH for " + props.inputToken.value + "."}</p>
      </div>
    )
  } else {

--- a/src/components/NetworkStatus.js
+++ b/src/components/NetworkStatus.js
@@ -5,7 +5,7 @@ function NetworkStatus(props) {
  let metamask = props.metamask
  let locked = props.locked

-  if (isConnected){
+  if (isConnected && props.interaction !== 'disconnected'){
    return (
      <div className="connection border pa2 green">
        <a target="_blank" href={'https://rinkeby.etherscan.io/search?q=' + props.address}>{props.address}</a>