1 files changed, 8 insertions, 102 deletions

diff --git a/cmd/web/js/poloniex.jsx b/cmd/web/js/poloniex.jsx
index db6b1c4..76b68d8 100644
--- a/cmd/web/js/poloniex.jsx
+++ b/cmd/web/js/poloniex.jsx
@@ -4,26 +4,7 @@ import React from 'react';
 class PoloniexController extends React.Component {
   constructor(props) {
     super(props);
-    this.state = {'apiKey': '', 'apiSecret': '', 'apiRequested': false, 'flag': 'loading', 'valueCurrency': null, 'balanceValue': null, 'balance': null};
-  }
-
-  handleCredentialsChange = (key, secret) => {
-    this.setState({'apiKey': key, 'apiSecret': secret});
-  }
-
-  handleCredentialsSubmit = () => {
-    if (!this.state.apiKey || !this.state.apiSecret) {
-      return;
-    }
-    Api.Call('UPDATE_MARKET', {'key': this.state.apiKey, 'secret': this.state.apiSecret, 'name': 'poloniex'}, function(err, status, data) {
-      if (err) {
-        console.error(err, data);
-        return;
-      }
-
-      this.setState({'flag': 'loading', 'valueCurrency': null, 'balanceValue': null, 'balance': null});
-      this.loadBalance();
-    }.bind(this));
+    this.state = {'apiRequested': false, 'flag': 'loading', 'valueCurrency': null, 'balanceValue': null, 'balance': null};
   }
 
   loadBalance = () => {
@@ -31,34 +12,19 @@ class PoloniexController extends React.Component {
       if (err) {
         console.error(err, data);
         if (err.code === 'invalid_market_credentials') {
-          this.setState({'flag': 'invalidCredentials', 'valueCurrency': null, 'balanceValue': null, 'balance': null});
+          this.setState({'flag': 'invalidCredentials', 'apiRequested': true, 'valueCurrency': null, 'balanceValue': null, 'balance': null});
         } else if (err.code === 'ip_restricted_api_key') {
-          this.setState({'flag': 'ipRestricted', 'valueCurrency': null, 'balanceValue': null, 'balance': null});
+          this.setState({'flag': 'ipRestricted', 'apiRequested': true, 'valueCurrency': null, 'balanceValue': null, 'balance': null});
         }
         return;
       }
 
-      this.setState({'flag': 'ok', 'valueCurrency': data.valueCurrency, 'balanceValue': data.value, 'balance': data.balance});
+      this.setState({'flag': 'ok', 'apiRequested': true, 'valueCurrency': data.valueCurrency, 'balanceValue': data.value, 'balance': data.balance});
     }.bind(this));
   }
 
   componentDidMount = () => {
-    Api.Call('MARKET', {'name': 'poloniex'}, function(err, status, data) {
-      this.setState({'apiRequested': true});
-      if (err) {
-        console.error(err, data);
-        return;
-      }
-
-      var flag = this.state.flag;
-      if (!data.key || !data.secret) {
-        flag = 'emptyCredentials';
-      } else {
-        this.loadBalance();
-      }
-
-      this.setState({'apiKey': data.key, 'apiSecret': data.secret, 'flag': flag});
-    }.bind(this));
+    this.loadBalance();
   }
 
   render = () => {
@@ -68,13 +34,9 @@ class PoloniexController extends React.Component {
         displayText = 'Loading data from poloniex...';
         break;
       case 'invalidCredentials':
-        displayText = 'Invalid poloniex credentials';
-        break;
       case 'ipRestricted':
-        displayText = 'Your API key is IP restricted. Please whitelist us.';
-        break;
       case 'emptyCredentials':
-        displayText = 'Please provide poloniex credentials';
+        displayText = <div>Please provide poloniex credentials in <a href="/account">Account</a> page.</div>;
         break;
       default:
         displayText = null;
@@ -88,11 +50,6 @@ class PoloniexController extends React.Component {
                           balanceValue={this.state.balanceValue}
                           balance={this.state.balance}
                           displayText={displayText}/>
-        <PoloniexCredentialsForm onLoadCredentials={this.onLoadCredentials}
-                                 onCredentialsSubmit={this.handleCredentialsSubmit}
-                                 onCredentialsChange={this.handleCredentialsChange}
-                                 apiSecret={this.state.apiSecret}
-                                 apiKey={this.state.apiKey}/>
       </div>
     );
   }
@@ -141,14 +98,14 @@ class PoloniexBalance extends React.Component {
             </div>
           </div>
         </div>;
-} else {
+    } else {
       dashboard =
         <div className="row">
           <div className="col-12 text-center">
            <span>{this.props.displayText}</span>
           </div>
         </div>;
-}
+    }
 
     return (
       <div className="row">
@@ -164,55 +121,4 @@ class PoloniexBalance extends React.Component {
   }
 }
 
-class PoloniexCredentialsForm extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {'hideMsg': true, 'msg': '', 'editMode': false, 'msgOk': false};
-  }
-
-  handleSubmit = (e) => {
-    this.props.onCredentialsSubmit();
-    this.setState({'editMode': false});
-    e.preventDefault();
-  }
-
-  handleApiKeyChange = (event) => {
-    this.props.onCredentialsChange(event.target.value, this.props.apiSecret);
-  }
-
-  handleApiSecretChange = (event) => {
-    this.props.onCredentialsChange(this.props.apiKey, event.target.value);
-  }
-
-  onEditClick = () => {
-    this.setState({'editMode': true});
-  }
-
-  render = () => {
-    var submitType      = this.state.editMode === true ? 'submit' : 'hidden';
-    var buttonDisplay   = this.state.editMode === true ? 'none' : 'inline';
-    var secretDisplayed = this.state.editMode === true ? this.props.apiSecret : 'XXXXXXX';
-    var keyDisplayed    = this.state.editMode === true ? this.props.apiKey : 'XXXXXXX';
-
-    return (
-        <div className="row api-credentials-form">
-          <div className="offset-2 col-8 box">
-            <span className="text-center">Poloniex credentials</span>
-            <hr/>
-            <form role="form" onSubmit={this.handleSubmit}>
-              <label className="w-100">Key:
-                <input className="form-control" type="text" placeholder="key" value={keyDisplayed} onChange={this.handleApiKeyChange} disabled={!this.state.editMode}/>
-              </label>
-              <label className="w-100">Secret:
-                <input className="form-control" type="text" placeholder="secret" value={secretDisplayed} onChange={this.handleApiSecretChange} disabled={!this.state.editMode}/>
-              </label>
-              <input className="form-control submit" type={submitType} value="Save" />
-              <button className="form-control submit" style={{display: buttonDisplay}} onSubmit={null} onClick={this.onEditClick} type="button">Show/Edit</button>
-            </form>
-          </div>
-        </div>
-       );
-  }
-}
-
 export default PoloniexController;