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/dashboard/about.js b/react/src/components/dashboard/about.js index 3d8eb59..7e1bf9b 100755 --- a/react/src/components/dashboard/about.js +++ b/react/src/components/dashboard/about.js @@ -4,7 +4,7 @@ class About extends React.Component { render() { return (
-
+

About Iguana

Page content goes here

diff --git a/react/src/components/dashboard/atomic.js b/react/src/components/dashboard/atomic.js index efa19ea..4708966 100755 --- a/react/src/components/dashboard/atomic.js +++ b/react/src/components/dashboard/atomic.js @@ -340,8 +340,7 @@ class Atomic extends React.Component { } if (props.Atomic.response.error === 'less than required responses') { - console.log('error'); - // toastr.error(_lang[defaultLang].DASHBOARD.LESS_RESPONSES_REQ, _lang[defaultLang].DASHBOARD.BASILISC_NOTIFICATION) + Store.dispatch(triggerToaster(true, 'Basilisk connection error', translate('TOASTR.SERVICE_NOTIFICATION'), 'error')); } } } diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTileItem.js index 8a06514..28640b7 100644 --- a/react/src/components/dashboard/coinTileItem.js +++ b/react/src/components/dashboard/coinTileItem.js @@ -37,10 +37,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/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 97ef13e..3278612 100755 --- a/react/src/components/dashboard/edex.js +++ b/react/src/components/dashboard/edex.js @@ -4,7 +4,7 @@ class EDEX extends React.Component { render() { return (
-
+

Coming Soon!

diff --git a/react/src/components/dashboard/sendCoin.js b/react/src/components/dashboard/sendCoin.js index 6f1ff91..6f47d28 100644 --- a/react/src/components/dashboard/sendCoin.js +++ b/react/src/components/dashboard/sendCoin.js @@ -49,7 +49,7 @@ class SendCoin extends React.Component { amount: 0, fee: 0.0001, sendSig: false, - sendApiType: false, + sendApiType: true, addressSelectorOpen: false, currentStackLength: 0, totalStackLength: 0, @@ -164,18 +164,18 @@ class SendCoin extends React.Component {
{ translate('SEND.NEXT_UPDATE_IN') } { secondsElapsedToString(600 - timestamp) }s
+ className={ 'full-width margin-bottom-10 margin-top-10 ' + (this.state.currentStackLength === 1 || (this.state.currentStackLength === 0 && this.state.totalStackLength === 0) ? 'hide' : 'progress progress-sm') }>
+ style={{ width: 100 - (this.state.currentStackLength * 100 / this.state.totalStackLength) + '%' }}> { translate('SEND.PROCESSING_REQ') }: { this.state.currentStackLength } / { this.state.totalStackLength }
@@ -218,12 +218,9 @@ class SendCoin extends React.Component { return(
  • - this.updateAddressSelection(mainAddress, type, mainAddressAmount) }> [ { mainAddressAmount } { this.props.ActiveCoin.coin } ]  { mainAddress } + this.updateAddressSelection(mainAddress, type, mainAddressAmount) }> [ { mainAddressAmount } { this.props.ActiveCoin.coin } ]  { mainAddress }
    • ); } else { @@ -242,9 +239,7 @@ class SendCoin extends React.Component {
  • - this.updateAddressSelection(address.address, type, _amount) }> [ { _amount } { this.props.ActiveCoin.coin } ]  { address.address } + this.updateAddressSelection(address.address, type, _amount) }> [ { _amount } { this.props.ActiveCoin.coin } ]  { address.address }
    • ); } @@ -291,12 +286,11 @@ class SendCoin extends React.Component { renderAddressList() { return ( -
    +
    -
      + @@ -366,7 +360,8 @@ class SendCoin extends React.Component { } if (step === 2) { - if (!this.state.sendApiType && this.props.ActiveCoin.mode === 'basilisk') { + if (!this.state.sendApiType && + this.props.ActiveCoin.mode === 'basilisk') { this.handleBasiliskSend(); } else { Store.dispatch(sendToAddress(this.props.ActiveCoin.coin, this.state)); @@ -694,7 +689,8 @@ class SendCoin extends React.Component { .then(function(json) { const reply = json.Answer; - if (reply && reply.length) { + if (reply && + reply.length) { for (let i = 0; i < reply.length; i++) { const _address = reply[i].data.split(' '); const coin = _address[0].replace('"oa1:', ''); @@ -723,13 +719,13 @@ class SendCoin extends React.Component {
      + htmlFor="kmdWalletSendTo">Fetch OpenAlias recipient address @@ -738,7 +734,6 @@ class SendCoin extends React.Component { @@ -775,30 +770,24 @@ class SendCoin extends React.Component { this.props.ActiveCoin.send && this.props.ActiveCoin.mode !== 'native') { return ( -
      +
      -
      +
      1
      { translate('INDEX.FILL_SEND_FORM') }

      { translate('INDEX.FILL_SEND_DETAILS') }

      -
      +
      2
      { translate('INDEX.CONFIRMING') }

      { translate('INDEX.CONFIRM_DETAILS') }

      -
      +
      3
      { translate('INDEX.PROCESSING_TX') } @@ -807,29 +796,29 @@ class SendCoin extends React.Component {
      -
      +

      { translate('INDEX.SEND') } { this.props.ActiveCoin.coin }

      -
      - {this.renderSendApiTypeSelector()} + + { this.renderSendApiTypeSelector() }
      - + { this.renderAddressList() }
      { this.renderOASendUI() }
      - +
      -
      - +
      - - { translate('INDEX.TOTAL') } ({ translate('INDEX.AMOUNT_SM') } - txfee): { Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin } + + { translate('INDEX.TOTAL') } ({ translate('INDEX.AMOUNT_SM') } - txfee): { Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin }
      @@ -881,8 +870,9 @@ class SendCoin extends React.Component {
      @@ -893,19 +883,19 @@ class SendCoin extends React.Component {
      -
      +
      { translate('INDEX.TO') }
      -
      { this.state.sendTo }
      +
      { this.state.sendTo }
      - {this.state.amount} { this.props.ActiveCoin.coin } + { this.state.amount } { this.props.ActiveCoin.coin }
      { translate('INDEX.TX_FEE_REQ') }
      - { this.state.fee } { this.props.ActiveCoin.coin } + { this.state.fee } { this.props.ActiveCoin.coin }

      @@ -914,21 +904,19 @@ class SendCoin extends React.Component {
      { translate('INDEX.FROM') }
      -
      { this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] }
      +
      { this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] }
      - { Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin } + { Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin }
      this.changeSendCoinStep(0) }>{ translate('INDEX.BACK') }
      @@ -937,15 +925,13 @@ class SendCoin extends React.Component {
      -
      +

      { translate('INDEX.TRANSACTION_RESULT') }

      { translate('SEND.YOU_PICKED_OPT') }
      - +
      @@ -961,7 +947,6 @@ class SendCoin extends React.Component { diff --git a/react/src/components/dashboard/settings.js b/react/src/components/dashboard/settings.js index c4e23e7..323d060 100644 --- a/react/src/components/dashboard/settings.js +++ b/react/src/components/dashboard/settings.js @@ -126,16 +126,14 @@ class Settings extends React.Component { if (releaseInfo) { return (
      this.openTab('AppInfo', 8) }> -
      - - { translate('SETTINGS.APP_INFO') } +
      + style={{ height: this.state.activeTab === 8 ? this.state.activeTabHeight + 'px' : '0' }}>
      @@ -346,29 +344,26 @@ class Settings extends React.Component { return (
      -
      +
      -
      +

      { translate('INDEX.WALLET_SETTINGS') }

      -
      +
      this.openTab('WalletInfo', 0) }> -
      +
      + style={{ height: this.state.activeTab === 0 ? this.state.activeTabHeight + 'px' : '0' }}>
      -
      { translate('INDEX.KEY') }
      +
      @@ -378,39 +373,27 @@ class Settings extends React.Component { - + - + - + - + - + - +
      { translate('INDEX.KEY') }
      pubkey -
      { this.props.Main.activeHandle.pubkey }
      -       		{ this.props.Main.activeHandle.pubkey }
      btcpubkey -
      { this.props.Main.activeHandle.btcpubkey }
      -       		{ this.props.Main.activeHandle.btcpubkey }
      rmd160 -
      { this.props.Main.activeHandle.rmd160 }
      -       		{ this.props.Main.activeHandle.rmd160 }
      NXT -
      { this.props.Main.activeHandle.NXT }
      -       		{ this.props.Main.activeHandle.NXT }
      notary -
      { this.props.Main.activeHandle.notary }
      -       		{ this.props.Main.activeHandle.notary }
      status -
      { this.props.Main.activeHandle.status }
      -       		{ this.props.Main.activeHandle.status }
      @@ -422,17 +405,14 @@ class Settings extends React.Component { className="panel" id="AddNodeforCoin" onClick={ () => this.openTab('AddNodeforCoin', 1) }> -
      +
      + style={{ height: this.state.activeTab === 1 ? this.state.activeTabHeight + 'px' : '0' }}>
      @@ -443,7 +423,6 @@ class Settings extends React.Component {
      @@ -493,7 +470,6 @@ class Settings extends React.Component { @@ -503,7 +479,6 @@ class Settings extends React.Component {
      @@ -516,17 +491,14 @@ class Settings extends React.Component { className="panel" id="DumpWallet" onClick={ () => this.openTab('DumpWallet', 2) }> -
      - - { translate('INDEX.WALLET_BACKUP') } +
      + style={{ height: this.state.activeTab === 2 ? this.state.activeTabHeight + 'px' : '0' }}>
      Wallet Backup section to be updated soon.
      @@ -535,17 +507,14 @@ class Settings extends React.Component { className="panel" id="FiatCurrencySettings" onClick={ () => this.openTab('FiatCurrencySettings', 3) }> -
      +
      + style={{ height: this.state.activeTab === 3 ? this.state.activeTabHeight + 'px' : '0' }}>
      Fiat currency settings section to be updated soon.
      @@ -554,17 +523,14 @@ class Settings extends React.Component { className="panel" id="ExportKeys" onClick={ () => this.openTab('ExportKeys', 4) }> -
      +
      + style={{ height: this.state.activeTab === 4 ? this.state.activeTabHeight + 'px' : '0' }}>

      { this.renderLB('INDEX.ONLY_ACTIVE_WIF_KEYS') }

      @@ -579,21 +545,20 @@ class Settings extends React.Component { type="password" className="form-control" name="wifkeysPassphrase" - id="wifkeys_passphrase" + id="wifkeysPassphrase" onChange={ this.updateInput } /> - +
      -
      +
      - + diff --git a/react/src/components/dashboard/walletsNativeReceive.js b/react/src/components/dashboard/walletsNativeReceive.js index 4ae6efd..60d4036 100644 --- a/react/src/components/dashboard/walletsNativeReceive.js +++ b/react/src/components/dashboard/walletsNativeReceive.js @@ -55,8 +55,7 @@ class WalletsNativeReceive extends React.Component { + onClick={ () => this.copyZAddress(address.address) }> { translate('INDEX.COPY') } @@ -77,43 +76,28 @@ class WalletsNativeReceive extends React.Component { this.props.ActiveCoin && this.props.ActiveCoin.nativeActiveSection === 'receive') { return ( -
      @@ -618,17 +583,14 @@ class Settings extends React.Component { className="panel" id="ImportKeys" onClick={ () => this.openTab('ImportKeys', 5) }> -
      +
      + style={{ height: this.state.activeTab === 5 ? this.state.activeTabHeight + 'px' : '0' }}>

      { translate('INDEX.IMPORT_KEYS_DESC_P1') }

      @@ -645,17 +607,16 @@ class Settings extends React.Component { type="text" className="form-control" name="importWifKey" - id="import_wifkey" + id="importWifkey" onChange={ this.updateInput } /> + htmlFor="importWifkey">{ translate('INDEX.INPUT_PRIV_KEY') }
      @@ -667,15 +628,14 @@ class Settings extends React.Component { className="panel" id="DebugLog" onClick={ () => this.openTab('DebugLog', 6) }> -
      +
      + style={{ height: this.state.activeTab === 6 ? this.state.activeTabHeight + 'px' : '0' }}>

      { translate('INDEX.DEBUG_LOG_DESC') }

      @@ -689,31 +649,30 @@ class Settings extends React.Component { type="text" className="form-control" name="debugLinesCount" - id="read_debug_log_lines" + id="readDebugLogLines" value={ this.state.debugLinesCount } onChange={ this.updateInput } /> + htmlFor="readDebugLogLines">{ translate('INDEX.DEBUG_LOG_LINES') }
      + htmlFor="settingsDelectDebugLogOptions">{ translate('INDEX.TARGET') }
      @@ -728,15 +687,14 @@ class Settings extends React.Component { className="panel" id="AppSettings" onClick={ () => this.openTab('AppSettings', 7) }> -
      +
      + style={{ height: this.state.activeTab === 7 ? this.state.activeTabHeight + 'px' : '0' }}>

      { translate('SETTINGS.CONFIG_RESTART_REQUIRED') } @@ -752,7 +710,6 @@ class Settings extends React.Component {

      diff --git a/react/src/components/dashboard/syncOnly.js b/react/src/components/dashboard/syncOnly.js index 21617ca..970e6f9 100644 --- a/react/src/components/dashboard/syncOnly.js +++ b/react/src/components/dashboard/syncOnly.js @@ -97,17 +97,13 @@ class SyncOnly extends React.Component {
      - { translate('INDEX.BUNDLES') } ({ fork.coin }) 100.00% - ( { fork.blocks } / { fork.blocks } ) ==>> RT{ fork.RTheight } + className={'font-size-80-percent full-width ' + (this.isFullySynced(fork) ? 'progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success' : 'hide') }> + { translate('INDEX.BUNDLES') } ({ fork.coin }) 100.00% - ( { fork.blocks } / { fork.blocks } ) ==>> RT{ fork.RTheight }
      - { translate('INDEX.BUNDLES') } { fork.bundles }% + className={ 'font-size-80-percent ' + (this.isFullySynced(fork) ? 'hide' : 'progress-bar progress-bar-info progress-bar-striped active') } + style={{ width: fork.bundles + '%' }}> + { translate('INDEX.BUNDLES') } { fork.bundles }%
      @@ -115,28 +111,22 @@ class SyncOnly extends React.Component {
      - utxo { fork.utxo }% + style={{ width: fork.utxo + '%' }}> + utxo { fork.utxo }%
      - { translate('INDEX.BALANCES') } { fork.balances }% + style={{ width: fork.balances + '%' }}> + { translate('INDEX.BALANCES') } { fork.balances }%
      - { translate('INDEX.VALIDATED') } { fork.validated }% + style={{ width: fork.validated + '%' }}> + { translate('INDEX.VALIDATED') } { fork.validated }%
      @@ -176,7 +166,7 @@ class SyncOnly extends React.Component {
      - {this.renderProgress(forkInfo.getinfo)} + { this.renderProgress(forkInfo.getinfo) }
      ); @@ -197,7 +187,7 @@ class SyncOnly extends React.Component { this.props.SyncOnly.display) { return (
      -
      +
      diff --git a/react/src/components/dashboard/walletsBalance.js b/react/src/components/dashboard/walletsBalance.js index ed2e9f2..1c48218 100755 --- a/react/src/components/dashboard/walletsBalance.js +++ b/react/src/components/dashboard/walletsBalance.js @@ -98,30 +98,29 @@ class WalletsBalance extends React.Component {
      - -
      -
      -
      + +
      +
      @@ -137,10 +136,8 @@ class WalletsBalance extends React.Component {
      -
      -
      +
      +
      @@ -156,10 +153,8 @@ class WalletsBalance extends React.Component {
      -
      -
      +
      +
      diff --git a/react/src/components/dashboard/walletsBasiliskConnection.js b/react/src/components/dashboard/walletsBasiliskConnection.js index f590220..3e9b2d8 100755 --- a/react/src/components/dashboard/walletsBasiliskConnection.js +++ b/react/src/components/dashboard/walletsBasiliskConnection.js @@ -28,15 +28,15 @@ class WalletsBasiliskConnection extends React.Component { if (this.isBasiliskConnection()) { return (
      this.handleKeydown(event) }> -
      		{ translate('INDEX.NOTARIZED') } BTC - -
      { translate('INDEX.BLOCKS') } { type === 'public' ? address.address : address.address.substring(0, 34) + '...' } { address.amount }
      +
      diff --git a/react/src/components/dashboard/walletsNativeSend.js b/react/src/components/dashboard/walletsNativeSend.js index 52e3e00..1d82938 100644 --- a/react/src/components/dashboard/walletsNativeSend.js +++ b/react/src/components/dashboard/walletsNativeSend.js @@ -53,10 +53,8 @@ class WalletsNativeSend extends React.Component { this.props.ActiveCoin.addresses[type] && this.props.ActiveCoin.addresses[type].length) { return this.props.ActiveCoin.addresses[type].map((address) => -
    • - this.updateAddressSelection(address.address, type, address.amount) }> [ { address.amount } { this.props.ActiveCoin.coin } ]  { address.address } +
    • + this.updateAddressSelection(address.address, type, address.amount) }> [ { address.amount } { this.props.ActiveCoin.coin } ]  { address.address }
      • ); } else { @@ -85,7 +83,6 @@ class WalletsNativeSend extends React.Component { type="button" className="btn dropdown-toggle btn-info" title="- { translate('SEND.SELECT_T_OR_Z_ADDR') } -" - aria-expanded="true" onClick={ this.openDropMenu }> { this.renderSelectorCurrentLabel() } @@ -93,9 +90,9 @@ class WalletsNativeSend extends React.Component {
      -
        +
        • - - { translate('SEND.SELECT_T_OR_Z_ADDR') } - + - { translate('SEND.SELECT_T_OR_Z_ADDR') } -
          • { this.renderAddressByType('public') } { this.renderAddressByType('private') } @@ -125,13 +122,11 @@ class WalletsNativeSend extends React.Component { } }; - if (opid.status === 'queued') { - return ( - - { translate(`KMD_NATIVE.${_satatusDef[opid.status].label}`) } - - ); - } + return ( + + { translate(`KMD_NATIVE.${_satatusDef[opid.status].label}`) } + + ); } renderOPIDResult(opid) { @@ -255,13 +250,13 @@ class WalletsNativeSend extends React.Component {
          + htmlFor="kmdWalletSendTo">{ translate('INDEX.SEND_TO') } via Openalias address @@ -270,7 +265,6 @@ class WalletsNativeSend extends React.Component { @@ -296,32 +290,30 @@ class WalletsNativeSend extends React.Component {
          -
          +
          - + { this.renderAddressList() }
          { this.renderOASendUI() }
          - +
          -
          - + @@ -354,8 +346,8 @@ class WalletsNativeSend extends React.Component {
          @@ -368,7 +360,7 @@ class WalletsNativeSend extends React.Component {
          -
          +
          @@ -377,7 +369,6 @@ class WalletsNativeSend extends React.Component {
      { translate('INDEX.TYPE') }
      diff --git a/react/src/components/dashboard/walletsNativeSyncProgress.js b/react/src/components/dashboard/walletsNativeSyncProgress.js index 289f393..15a44e3 100644 --- a/react/src/components/dashboard/walletsNativeSyncProgress.js +++ b/react/src/components/dashboard/walletsNativeSyncProgress.js @@ -6,24 +6,14 @@ class WalletsNativeSyncProgress extends React.Component { if (this.props.Dashboard.progress.blocks > 0 && this.props.Dashboard.progress.longestchain === 0) { return ( -
      - { translate('INDEX.SYNC_ERR_LONGESTCHAIN') } +
      + { translate('INDEX.SYNC_ERR_LONGESTCHAIN') }
      ); } else if (this.props.Dashboard.progress.blocks === 0) { return ( -
      - { translate('INDEX.SYNC_ERR_BLOCKS') } +
      + { translate('INDEX.SYNC_ERR_BLOCKS') }
      ); } else { @@ -32,12 +22,8 @@ class WalletsNativeSyncProgress extends React.Component { return (
      - { syncPercentage } | { this.props.Dashboard.progress.blocks } / { this.props.Dashboard.progress.longestchain } | { translate('INDEX.CONNECTIONS') }: { this.props.Dashboard.progress.connections } + style={{ width: syncPercentage }}> + { syncPercentage } | { this.props.Dashboard.progress.blocks } / { this.props.Dashboard.progress.longestchain } | { translate('INDEX.CONNECTIONS') }: { this.props.Dashboard.progress.connections }
      ); } @@ -60,7 +46,7 @@ class WalletsNativeSyncProgress extends React.Component { return(`: ${Math.floor(currentBestChain * 100 / this.props.Dashboard.progress.remoteKMDNode.blocks)}% (blocks ${currentBestChain} / ${this.props.Dashboard.progress.remoteKMDNode.blocks})`); } else { return ( - ... + ... ); } } @@ -81,17 +67,14 @@ class WalletsNativeSyncProgress extends React.Component { if ((this.props.Dashboard.progress.blocks < this.props.Dashboard.progress.longestchain) || this.props.Dashboard.progress.remoteKMDNode) { return ( - ); } else { @@ -107,7 +90,7 @@ class WalletsNativeSyncProgress extends React.Component {
      { this.renderChainActivationNotification() }
      -
      +
      { this.renderSyncPercentagePlaceholder() }
      diff --git a/react/src/components/dashboard/walletsNativeTxHistory.js b/react/src/components/dashboard/walletsNativeTxHistory.js index dbd62a4..39162f5 100644 --- a/react/src/components/dashboard/walletsNativeTxHistory.js +++ b/react/src/components/dashboard/walletsNativeTxHistory.js @@ -125,8 +125,7 @@ class WalletsNativeTxHistory extends React.Component { items.push(
    • this.updateCurrentPage(i + 1) : null }>{ i + 1 }
      • ); @@ -140,14 +139,13 @@ class WalletsNativeTxHistory extends React.Component { this.props.ActiveCoin.txhistory !== 'loading' && this.props.ActiveCoin.txhistory.length > 10) { return ( -
      +
      +
      { translate('IAPI.PUBLIC_SM') } @@ -258,10 +242,10 @@ class WalletsNativeTxHistory extends React.Component { this.props.ActiveCoin.nativeActiveSection === 'default') { return (
      -
      +
      -
      +
      @@ -273,15 +257,15 @@ class WalletsNativeTxHistory extends React.Component { { this.renderPaginationItemsPerPageSelector() }
      -
      +
      - +
      diff --git a/react/src/components/dashboard/walletsNativeTxInfo.js b/react/src/components/dashboard/walletsNativeTxInfo.js index 33d9ff0..9378453 100644 --- a/react/src/components/dashboard/walletsNativeTxInfo.js +++ b/react/src/components/dashboard/walletsNativeTxInfo.js @@ -38,55 +38,36 @@ class WalletsNativeTxInfo extends React.Component { return (
      { translate('INDEX.TYPE') }
      @@ -152,10 +133,7 @@ class WalletsNativeTxInfo extends React.Component {
      -
      +
      @@ -173,23 +151,15 @@ class WalletsNativeTxInfo extends React.Component {
      -
      +
      -
      +