Update master branch for 0.9.14 (#540)

* Fix BN error * toEth * Electron Icon (#466) * Add electron icons * Remove leftovers * Update version number * Fix tests on new jest update * Update version * Package-json * Remove win icon * Win icon electron * Wrong name
chronologic · Aug 17, 2018 · 1ac2802 · 1ac2802
1 parent be5131b
commit 1ac2802
Show file tree

Hide file tree

Showing 8 changed files with 4,205 additions and 4,214 deletions.
diff --git a/app/assets/img/electron/icon-osx.icns b/app/assets/img/electron/icon-osx.icns
diff --git a/app/assets/img/electron/icon.ico b/app/assets/img/electron/icon.ico
diff --git a/app/assets/img/electron/icon.png b/app/assets/img/electron/icon.png
diff --git a/app/components/TimeNode/TimeNodeSettings.js b/app/components/TimeNode/TimeNodeSettings.js
@@ -12,21 +12,25 @@ class TimeNodeSettings extends Component {
     super(props);
 
     const { maxDeposit, minProfitability, minBalance } = props.timeNodeStore.economicStrategy;
+
     const toEth = wei => this.props.timeNodeStore._web3Service.fromWei(wei, 'ether');
     const hasPropertyOrNotDefault = strategy => {
       if (!strategy) {
         return false;
       }
       const setStrategy = props.timeNodeStore.economicStrategy[strategy];
-      const defaultStrategy = Config.DEFAULT_ECONOMIC_STRATEGY[strategy];
+      const defaultStrategy = Config.DEFAULT_ECONOMIC_STRATEGY[strategy].toString();
       return setStrategy !== defaultStrategy;
     };
 
     this.state = {
       claiming: props.timeNodeStore.claiming,
       maxDeposit: hasPropertyOrNotDefault('maxDeposit') ? toEth(maxDeposit) : '',
       minProfitability: hasPropertyOrNotDefault('minProfitability') ? toEth(minProfitability) : '',
-      minBalance: hasPropertyOrNotDefault('minBalance') ? toEth(minBalance) : ''
+      minBalance: hasPropertyOrNotDefault('minBalance') ? toEth(minBalance) : '',
+      defaultMaxDeposit: toEth(Config.DEFAULT_ECONOMIC_STRATEGY.maxDeposit),
+      defaultMinProfitability: toEth(Config.DEFAULT_ECONOMIC_STRATEGY.minProfitability),
+      defaultMinBalance: toEth(Config.DEFAULT_ECONOMIC_STRATEGY.minBalance)
     };
     this.handleChange = this.handleChange.bind(this);
     this.toggleClaiming = this.toggleClaiming.bind(this);
@@ -99,9 +103,7 @@ class TimeNodeSettings extends Component {
                       id="maxDeposit"
                       className="form-control"
                       type="number"
-                      placeholder={
-                        'Default: ' + Config.DEFAULT_ECONOMIC_STRATEGY.maxDeposit + ' ETH'
-                      }
+                      placeholder={`Default: ${this.state.defaultMaxDeposit} ETH`}
                       value={this.state.maxDeposit}
                       onChange={this.handleChange}
                     />
@@ -115,9 +117,7 @@ class TimeNodeSettings extends Component {
                       id="minProfitability"
                       className="form-control"
                       type="number"
-                      placeholder={
-                        'Default: ' + Config.DEFAULT_ECONOMIC_STRATEGY.minProfitability + ' ETH'
-                      }
+                      placeholder={`Default: ${this.state.defaultMinProfitability} ETH`}
                       value={this.state.minProfitability}
                       onChange={this.handleChange}
                     />
@@ -131,9 +131,7 @@ class TimeNodeSettings extends Component {
                       id="minBalance"
                       className="form-control"
                       type="number"
-                      placeholder={
-                        'Default: ' + Config.DEFAULT_ECONOMIC_STRATEGY.minBalance + ' ETH'
-                      }
+                      placeholder={`Default: ${this.state.defaultMinBalance} ETH`}
                       value={this.state.minBalance}
                       onChange={this.handleChange}
                     />

diff --git a/app/stores/KeenStore.js b/app/stores/KeenStore.js
@@ -11,7 +11,8 @@ const COLLECTIONS = {
 const ACTIVE_TIMENODES_POLLING_INTERVAL = 2 * 60 * 1000;
 
 export class KeenStore {
-  @observable activeTimeNodes = null;
+  @observable
+  activeTimeNodes = null;
 
   projectId = '';
   writeKey = '';

diff --git a/app/stores/TimeNodeStore.js b/app/stores/TimeNodeStore.js
@@ -1,7 +1,6 @@
 import { observable, computed } from 'mobx';
 import CryptoJS from 'crypto-js';
 import ethereumJsWallet from 'ethereumjs-wallet';
-import BigNumber from 'bignumber.js';
 import EacWorker from 'worker-loader!../js/eac-worker.js';
 import { EAC_WORKER_MESSAGE_TYPES } from '../js/eac-worker-message-types';
 import { showNotification } from '../services/notification';
@@ -77,9 +76,9 @@ export default class TimeNodeStore {
 
   @computed
   get economicStrategy() {
-    const load = (strategy) => {
+    const load = strategy => {
       const loaded = this._storageService.load(strategy);
-      return loaded ? new BigNumber(loaded) : Config.DEFAULT_ECONOMIC_STRATEGY[strategy];
+      return loaded ? loaded : Config.DEFAULT_ECONOMIC_STRATEGY[strategy].toString();
     };
 
     return {