diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js index c53a8be..56f1015 100644 --- a/react/src/actions/actionCreators.js +++ b/react/src/actions/actionCreators.js @@ -153,7 +153,7 @@ export function basiliskConnection(display) { export function syncingNativeModeState(display, json) { return { - type: SYNCING_FULL_MODE, + type: SYNCING_NATIVE_MODE, syncingNativeMode: display, progress: json, } @@ -161,7 +161,7 @@ export function syncingNativeModeState(display, json) { export function syncingFullModeState(display, json) { return { - type: SYNCING_NATIVE_MODE, + type: SYNCING_FULL_MODE, syncingFullMode: display, progress: json, } diff --git a/react/src/actions/actions/nativeNewAddress.js b/react/src/actions/actions/nativeNewAddress.js index 965fb9a..bec0473 100644 --- a/react/src/actions/actions/nativeNewAddress.js +++ b/react/src/actions/actions/nativeNewAddress.js @@ -2,7 +2,8 @@ import { translate } from '../../translate/translate'; import { triggerToaster, Config, - getPassthruAgent + getPassthruAgent, + getKMDAddressesNative } from '../actionCreators'; import { logGuiHttp, diff --git a/react/src/actions/actions/nativeSend.js b/react/src/actions/actions/nativeSend.js index 51bd2fd..38b64fd 100644 --- a/react/src/actions/actions/nativeSend.js +++ b/react/src/actions/actions/nativeSend.js @@ -16,7 +16,8 @@ export function sendNativeTx(coin, _payload) { let payload; let _apiMethod; - if (_payload.addressType === 'public') { + if (_payload.addressType === 'public' && + _payload.sendTo.length !== 95) { _apiMethod = 'sendtoaddress'; ajaxDataToHex = `["${_payload.sendTo}", ${Number(_payload.amount) - Number(_payload.fee)}]`; } else { diff --git a/react/src/components/addcoin/addcoin.js b/react/src/components/addcoin/addcoin.js index e3f54b0..75462e6 100644 --- a/react/src/components/addcoin/addcoin.js +++ b/react/src/components/addcoin/addcoin.js @@ -249,13 +249,14 @@ class AddCoin extends React.Component { const _coin = _item.selectedCoin || ''; items.push( -
+
@@ -505,7 +502,6 @@ class Atomic extends React.Component {
@@ -524,7 +519,6 @@ class Atomic extends React.Component {
@@ -537,7 +531,7 @@ class Atomic extends React.Component {
-
{ this.state.output }
+
{ this.state.output }
diff --git a/react/src/components/dashboard/coinTile.js b/react/src/components/dashboard/coinTile.js index bb44c56..41967d3 100755 --- a/react/src/components/dashboard/coinTile.js +++ b/react/src/components/dashboard/coinTile.js @@ -59,8 +59,8 @@ class CoinTile extends React.Component { return (
- - + +
@@ -68,17 +68,17 @@ class CoinTile extends React.Component {
- +

{ translate('INDEX.ACTIVE_COINS') }

-
-
+
+
{ this.renderTiles() }
diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTileItem.js index 5b5a40e..e3445ae 100644 --- a/react/src/components/dashboard/coinTileItem.js +++ b/react/src/components/dashboard/coinTileItem.js @@ -36,10 +36,6 @@ class CoinTileItem extends React.Component { // TODO: 1) cache native/full node data to file // 2) limit amount of req per update e.g. list of addresses don't change too often // 3) limit req in basilisk as much as possible incl. activehandle - // 4) add pending requests store - - // TODO: update all addresses once in 20 min, current address every 10 min - // always fetch main addr data and current selected address dispatchCoinActions(coin, mode) { if (mode === 'native') { @@ -147,14 +143,14 @@ class CoinTileItem extends React.Component {
this.dashboardChangeActiveCoin(item.coin, item.mode) }> - { - { item.modecode } + { item.modecode }
{ item.coinname } ({ item.coinlogo.toUpperCase() })
diff --git a/react/src/components/dashboard/dashboard.scss b/react/src/components/dashboard/dashboard.scss index 4d98327..06d2aa4 100755 --- a/react/src/components/dashboard/dashboard.scss +++ b/react/src/components/dashboard/dashboard.scss @@ -95,11 +95,11 @@ } //walletsData.js -z-index-10 { +.z-index-10 { z-index: 10; } -full-width { +.full-width { width: 100%; } diff --git a/react/src/components/dashboard/edex.js b/react/src/components/dashboard/edex.js index 3949337..6e85de7 100755 --- a/react/src/components/dashboard/edex.js +++ b/react/src/components/dashboard/edex.js @@ -5,7 +5,7 @@ class EDEX extends React.Component { render() { return (
-
+

Coming Soon!

diff --git a/react/src/components/dashboard/jumblr.js b/react/src/components/dashboard/jumblr.js index 6220fc1..41f93fc 100755 --- a/react/src/components/dashboard/jumblr.js +++ b/react/src/components/dashboard/jumblr.js @@ -33,28 +33,28 @@ class Jumblr extends React.Component { return (
-
-
-
-
- - { translate('JUMBLR.NOTICE') } + { translate('JUMBLR.NOTICE') }
{ translate('JUMBLR.DESCRIPTION') }
-
-
- - { translate('JUMBLR.NEED_NATIVE') } + { translate('JUMBLR.NEED_NATIVE') }
{ translate('JUMBLR.TO_USE_JUMBLR') } @@ -68,23 +68,14 @@ class Jumblr extends React.Component {
-
+
-
+
  • { translate('JUMBLR.FEW_SECURITY_NOTES_DESC1') }
  • @@ -99,19 +90,10 @@ class Jumblr extends React.Component {
    -
    +

    { translate('JUMBLR.ADDRESS_ACCESSIBLE_EASILY') }

      @@ -140,17 +122,10 @@ class Jumblr extends React.Component {
    -