From c181f46cccc56ec8a092baa7e5e0b311fa8886a0 Mon Sep 17 00:00:00 2001 From: pbca26 Date: Fri, 16 Feb 2018 23:54:24 +0300 Subject: [PATCH 1/2] send from cleanup --- react/src/components/dashboard/sendCoin/sendCoin.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/react/src/components/dashboard/sendCoin/sendCoin.js b/react/src/components/dashboard/sendCoin/sendCoin.js index fa25209..9895367 100644 --- a/react/src/components/dashboard/sendCoin/sendCoin.js +++ b/react/src/components/dashboard/sendCoin/sendCoin.js @@ -441,7 +441,6 @@ class SendCoin extends React.Component { } else { // TODO: fallback to local electrum } - console.warn('btcfees', res); }); } } @@ -677,8 +676,6 @@ class SendCoin extends React.Component { } onSliderChange(value) { - console.warn(value); - console.warn(`btc fee /byte ${this.state.btcFees.electrum[value]}`); this.setState({ btcFeesSize: this.state.btcFees.electrum[value], btcFeesAdvancedStep: value, @@ -686,8 +683,6 @@ class SendCoin extends React.Component { } onSliderChangeTime(value) { - console.warn(value); - console.warn(`btc fee /byte ${_feeLookup[value]}`); this.setState({ btcFeesSize: this.state.btcFees.recommended[_feeLookup[value]], btcFeesTimeBasedStep: value, From 376e48b0642048523e0cab7ff917adaca61114ab Mon Sep 17 00:00:00 2001 From: pbca26 Date: Sat, 17 Feb 2018 00:05:13 +0300 Subject: [PATCH 2/2] btc advanced fee slider init state fix --- react/src/components/dashboard/sendCoin/sendCoin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/react/src/components/dashboard/sendCoin/sendCoin.js b/react/src/components/dashboard/sendCoin/sendCoin.js index 9895367..3bf6b0a 100644 --- a/react/src/components/dashboard/sendCoin/sendCoin.js +++ b/react/src/components/dashboard/sendCoin/sendCoin.js @@ -684,7 +684,7 @@ class SendCoin extends React.Component { onSliderChangeTime(value) { this.setState({ - btcFeesSize: this.state.btcFees.recommended[_feeLookup[value]], + btcFeesSize: _feeLookup[value] === 'advanced' ? this.state.btcFees.electrum[this.state.btcFeesAdvancedStep] : this.state.btcFees.recommended[_feeLookup[value]], btcFeesTimeBasedStep: value, btcFeesType: _feeLookup[value] === 'advanced' ? 'advanced' : null, }); @@ -749,7 +749,7 @@ class SendCoin extends React.Component { 3: 'advanced' }} /> { this.state.btcFeesType === 'advanced' && -
+
Estimated to be included within the next {this.state.btcFeesAdvancedStep + 1} {(this.state.btcFeesAdvancedStep + 1) > 1 ? 'blocks' : 'block'}