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..3295820 100644 --- a/react/src/actions/actions/nativeSend.js +++ b/react/src/actions/actions/nativeSend.js @@ -16,7 +16,7 @@ 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 4309a62..abb3f4f 100644 --- a/react/src/components/addcoin/addcoin.js +++ b/react/src/components/addcoin/addcoin.js @@ -245,7 +245,9 @@ class AddCoin extends React.Component { const _coin = _item.selectedCoin || ''; items.push( -
1 ? 'multi' : 'single' } key={ `add-coin-${i}` }> +
1 ? 'multi' : 'single' } + key={ `add-coin-${i}` }>
@@ -77,8 +77,8 @@ class CoinTile extends React.Component {
-
-
+
+
{ this.renderTiles() }
diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTileItem.js index 5b5a40e..9dc6901 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') { diff --git a/react/src/components/dashboard/jumblr.js b/react/src/components/dashboard/jumblr.js index 6220fc1..5632a18 100755 --- a/react/src/components/dashboard/jumblr.js +++ b/react/src/components/dashboard/jumblr.js @@ -36,9 +36,9 @@ class Jumblr extends React.Component {
-
- { translate('JUMBLR.NOTICE') } @@ -50,11 +50,11 @@ class Jumblr extends React.Component {
- - { translate('JUMBLR.NEED_NATIVE') } + { translate('JUMBLR.NEED_NATIVE') }
{ translate('JUMBLR.TO_USE_JUMBLR') } @@ -68,23 +68,17 @@ class Jumblr extends React.Component {
-
+
+ id="jumblr_security_notes_1">
  • { translate('JUMBLR.FEW_SECURITY_NOTES_DESC1') }
    • @@ -100,18 +94,12 @@ class Jumblr extends React.Component {
    + id="jumblr_access_funds_2">

    { translate('JUMBLR.ADDRESS_ACCESSIBLE_EASILY') }

      @@ -140,17 +128,12 @@ class Jumblr extends React.Component {
    -