Browse Source

removed unused template ids

all-modes
pbca26 7 years ago
parent
commit
7c2dfbb869
  1. 3
      react/src/actions/actions/nativeSend.js
  2. 28
      react/src/components/addcoin/addcoin.js
  3. 2
      react/src/components/dashboard/about.js
  4. 13
      react/src/components/dashboard/atomic.js
  5. 2
      react/src/components/dashboard/coinTile.js
  6. 6
      react/src/components/dashboard/coinTileItem.js
  7. 4
      react/src/components/dashboard/dashboard.scss
  8. 2
      react/src/components/dashboard/edex.js
  9. 82
      react/src/components/dashboard/jumblr.js
  10. 32
      react/src/components/dashboard/navbar.js
  11. 10
      react/src/components/dashboard/receiveCoin.js
  12. 80
      react/src/components/dashboard/sendCoin.js
  13. 93
      react/src/components/dashboard/settings.js
  14. 29
      react/src/components/dashboard/syncOnly.js
  15. 26
      react/src/components/dashboard/walletsBalance.js
  16. 2
      react/src/components/dashboard/walletsBasiliskRefresh.js
  17. 46
      react/src/components/dashboard/walletsData.js
  18. 38
      react/src/components/dashboard/walletsHeader.js
  19. 4
      react/src/components/dashboard/walletsNative.js
  20. 4
      react/src/components/dashboard/walletsNativeAlert.js
  21. 32
      react/src/components/dashboard/walletsNativeBalance.js
  22. 22
      react/src/components/dashboard/walletsNativeInfo.js
  23. 19
      react/src/components/dashboard/walletsNativeReceive.js
  24. 25
      react/src/components/dashboard/walletsNativeSend.js
  25. 33
      react/src/components/dashboard/walletsNativeSyncProgress.js
  26. 24
      react/src/components/dashboard/walletsNativeTxHistory.js
  27. 18
      react/src/components/dashboard/walletsNativeTxInfo.js
  28. 9
      react/src/components/dashboard/walletsNav.js
  29. 26
      react/src/components/dashboard/walletsProgress.js
  30. 9
      react/src/components/dashboard/walletsTxInfo.js
  31. 26
      react/src/components/login/login.js
  32. 4
      react/src/components/overrides.scss

3
react/src/actions/actions/nativeSend.js

@ -16,7 +16,8 @@ export function sendNativeTx(coin, _payload) {
let payload;
let _apiMethod;
if (_payload.addressType === 'public' && _payload.sendTo.length !== 95) {
if (_payload.addressType === 'public' &&
_payload.sendTo.length !== 95) {
_apiMethod = 'sendtoaddress';
ajaxDataToHex = `["${_payload.sendTo}", ${Number(_payload.amount) - Number(_payload.fee)}]`;
} else {

28
react/src/components/addcoin/addcoin.js

@ -253,7 +253,6 @@ class AddCoin extends React.Component {
<select
className="form-control form-material"
name="selectedCoin"
id="addcoin_select_coin_mdl_options-login"
value={ _coin }
onChange={ (event) => this.updateSelectedCoin(event, i) }
autoFocus>
@ -267,8 +266,7 @@ class AddCoin extends React.Component {
<div className={ this.state.coins.length > 1 ? 'hide' : 'col-sm-4' }>
<button
type="button"
className="btn btn-primary mdl_addcoin_done_btn-login"
id="mdl_addcoin_done_btn-login"
className="btn btn-primary"
onClick={ () => this.activateCoin(i) }
disabled={ _item.mode === -2 }>{ translate('INDEX.ACTIVATE_COIN') }</button>
</div>
@ -355,8 +353,7 @@ class AddCoin extends React.Component {
<div className={ this.state.coins.length > 1 && i !== 0 ? 'col-sm-1' : 'hide' }>
<button
type="button"
className="btn btn-primary mdl_addcoin_done_btn-login"
id="mdl_addcoin_done_btn-login"
className="btn btn-primary"
onClick={ () => this.removeCoin(i) }>
<i className="fa fa-trash-o"></i>
</button>
@ -382,21 +379,15 @@ class AddCoin extends React.Component {
render() {
return (
<div onKeyDown={ (event) => this.handleKeydown(event) }>
<div
className={ 'modal modal-3d-sign add-coin-modal ' + this.state.modalClassName }
id="AddCoinDilogModel-login"
aria-hidden="true"
aria-labelledby="AddCoinDilogModel-login"
role="dialog"
tabIndex="-1">
<div className={ 'modal modal-3d-sign add-coin-modal ' + this.state.modalClassName }>
<div className="modal-dialog modal-center modal-lg">
<div className="modal-content">
<div className="modal-header bg-orange-a400 wallet-send-header">
<button
type="button"
className="close white"
aria-label="Close" onClick={ this.dismiss }>
<span aria-hidden="true">×</span>
onClick={ this.dismiss }>
<span>×</span>
</button>
<h4 className="modal-title white">{ translate('INDEX.SELECT_A_COIN') }</h4>
</div>
@ -419,7 +410,6 @@ class AddCoin extends React.Component {
<button
type="button"
className="btn btn-primary col-sm-4 float-none"
id="mdl_addcoin_done_btn-login"
onClick={ this.activateAllCoins }>{ translate('ADD_COIN.ACTIVATE_ALL') }</button>
</div>
<div className="col-sm-12">
@ -432,11 +422,11 @@ class AddCoin extends React.Component {
<p>
<strong>{ translate('INDEX.NATIVE_MODE') }:</strong> { translate('INDEX.NATIVE_MODE_DESC1') } <strong>Komodo Daemon</strong> { translate('INDEX.NATIVE_MODE_DESC2') } <i>Iguana Daemon</i> { translate('INDEX.NATIVE_MODE_DESC3') }.
</p>
<div className="alert alert-icon alert-primary" role="alert">
<button type="button" className="close" aria-label="Close">
<span aria-hidden="true">×</span>
<div className="alert alert-icon alert-primary">
<button type="button" className="close">
<span>×</span>
</button>
<i className="icon md-info-outline" aria-hidden="true"></i> <strong>{ translate('INDEX.NATIVE_MODE') }</strong> { translate('INDEX.NATIVE_MODE_DESC4') } <strong>{ translate('INDEX.NATIVE_MODE_DESC5') }</strong>, <i>{ translate('INDEX.NATIVE_MODE_DESC5') }</i>.
<i className="icon md-info-outline"></i> <strong>{ translate('INDEX.NATIVE_MODE') }</strong> { translate('INDEX.NATIVE_MODE_DESC4') } <strong>{ translate('INDEX.NATIVE_MODE_DESC5') }</strong>, <i>{ translate('INDEX.NATIVE_MODE_DESC5') }</i>.
</div>
</div>
</div>

2
react/src/components/dashboard/about.js

@ -4,7 +4,7 @@ class About extends React.Component {
render() {
return (
<div className="page margin-left-0">
<div className="page-content" id="section-about-iguana">
<div className="page-content">
<h2>About Iguana</h2>
<p>Page content goes here</p>
</div>

13
react/src/components/dashboard/atomic.js

@ -481,8 +481,8 @@ class Atomic extends React.Component {
render() {
return (
<div className="page margin-left-0">
<div className="page-content" id="section-iguana-atomic-explorer">
<div className="row" id="atomic-explorer">
<div className="page-content">
<div className="row">
<div className="col-xlg-12 col-md-12">
<h4 className="font-size-14 text-uppercase">Atomic Explorer</h4>
<div className="panel panel-bordered">
@ -490,9 +490,7 @@ class Atomic extends React.Component {
<div className="col-sm-4 col-xs-12">
<div className="form-group">
<select
className="form-control
form-material"
id="atomic_explorer_select_coin_options"
className="form-control form-material"
onChange={ this.updateSelectedCoin }>
<option value="-">{ translate('INDEX.SELECT_COIN') }</option>
<AddCoinOptionsCrypto />
@ -504,7 +502,6 @@ class Atomic extends React.Component {
<div className="col-sm-4 col-xs-12 text-align-center">
<select
className="form-control form-material"
id="atomic_explorer_select_command_options"
onChange={ this.updateSelectedAPI }>
<option value="">-{ translate('ATOMIC.SELECT_COMMAND') }-</option>
{ this.renderAtomicOptions() }
@ -514,7 +511,6 @@ class Atomic extends React.Component {
<input
type="text"
className="form-control"
id="atomic_explorer_input_data"
name="atomic_explorer_input_data"
placeholder={ translate('ATOMIC.INPUT_PLACEHOLDER') }
onChange={ this.updateInput } />
@ -523,7 +519,6 @@ class Atomic extends React.Component {
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="atomic_explorer_getcoinpeers_btn"
onClick={ this.getAtomicData }>{ translate('ATOMIC.SUBMIT') }</button>
</div>
</div>
@ -536,7 +531,7 @@ class Atomic extends React.Component {
</div>
<div className="panel-body">
<div className="tab-content">
<pre id="atomic-explorer-commands-output">{ this.state.output }</pre>
<pre>{ this.state.output }</pre>
</div>
</div>
</div>

2
react/src/components/dashboard/coinTile.js

@ -70,7 +70,7 @@ class CoinTile extends React.Component {
<button type="submit" className="input-search-btn">
<i className="icon md-search"></i>
</button>
<input type="text" className="form-control" name="" placeholder="Search..." disabled />
<input type="text" className="form-control" placeholder="Search..." disabled />
</div>
</div>
<h3 className="panel-title">{ translate('INDEX.ACTIVE_COINS') }</h3>

6
react/src/components/dashboard/coinTileItem.js

@ -143,14 +143,14 @@ class CoinTileItem extends React.Component {
<div className="list-group-item col-xlg-6 col-lg-12 wallet-widgets-info pointer">
<div className={ this.props.ActiveCoin.coin === item.coin ? 'widget widget-shadow active' : 'widget widget-shadow' }>
<div
className="widget-content text-center bg-white padding-20 edexcoin-logo"
className="widget-content text-center bg-white padding-20"
onClick={ () => this.dashboardChangeActiveCoin(item.coin, item.mode) }>
<a className="avatar margin-bottom-5" id="edexcoin-logo">
<a className="avatar margin-bottom-5">
<img
className="img-responsive"
src={ `assets/images/cryptologo/${item.coinlogo}.png` }
alt={ item.coinname }/>
<span className={ `badge up badge-${item.modecolor}` } id="basfull">{ item.modecode }</span>
<span className={ `badge up badge-${item.modecolor}` }>{ item.modecode }</span>
</a>
<div className="coin-name">{ item.coinname } ({ item.coinlogo.toUpperCase() })</div>
</div>

4
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%;
}

2
react/src/components/dashboard/edex.js

@ -5,7 +5,7 @@ class EDEX extends React.Component {
render() {
return (
<div className="page margin-left-0">
<div className="page-content" id="section-easydex">
<div className="page-content">
<h2>Coming Soon!</h2>
</div>
</div>

82
react/src/components/dashboard/jumblr.js

@ -33,23 +33,23 @@ class Jumblr extends React.Component {
return (
<div className="page margin-left-0">
<WalletsHeader activeSection="jumblr" />
<div className="page-content margin-top-30" id="section-jumblr">
<div className="row" id="jumblr_dashboard">
<div className="col-xs-12" id="jumblr_testing_alert">
<div className="page-content margin-top-30">
<div className="row">
<div className="col-xs-12">
<div className="alert alert-danger">
<button type="button" className="close">
<span>×</span>
</button>
<span className="jumblr-header">
<i className="icon fa-paw" aria-hidden="true"></i> { translate('JUMBLR.NOTICE') }
<i className="icon fa-paw"></i> { translate('JUMBLR.NOTICE') }
</span>
<br />
{ translate('JUMBLR.DESCRIPTION') }
</div>
</div>
<div className="col-xs-12" id="jumblr_no_native_kmd_alert">
<div className="alert alert-info alert-dismissible" role="alert">
<div className="col-xs-12">
<div className="alert alert-info alert-dismissible">
<button type="button" className="close">
<span>×</span>
</button>
@ -68,17 +68,14 @@ class Jumblr extends React.Component {
</div>
<div className="col-xs-12">
<div className="panel-group" id="jumber_quick_info">
<div className="panel-group">
<div className="panel">
<div
className="panel-heading"
id="jumblr_security_notes"
onClick={ () => this.openTab(0) }>
<a className={ this.state.activeTab === 0 ? 'panel-title' : 'panel-title collapsed' }>{ translate('JUMBLR.FEW_SECURITY_NOTES') }</a>
</div>
<div
className={ this.state.activeTab === 0 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
id="jumblr_security_notes_1">
<div className={ this.state.activeTab === 0 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }>
<div className="panel-body">
<ul>
<li>{ translate('JUMBLR.FEW_SECURITY_NOTES_DESC1') }</li>
@ -93,13 +90,10 @@ class Jumblr extends React.Component {
<div className="panel">
<div
className="panel-heading"
id="jumblr_access_funds"
onClick={ () => this.openTab(1) }>
<a className={ this.state.activeTab === 1 ? 'panel-title' : 'panel-title collapsed' }>{ translate('JUMBLR.ACCESS_JUMBLR_FUNDS') }</a>
</div>
<div
className={ this.state.activeTab === 1 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
id="jumblr_access_funds_2">
<div className={ this.state.activeTab === 1 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }>
<div className="panel-body">
<p>{ translate('JUMBLR.ADDRESS_ACCESSIBLE_EASILY') }</p>
<ul>
@ -128,12 +122,10 @@ class Jumblr extends React.Component {
</div>
</div>
<div className="panel">
<div className="panel-heading" id="jumblr_using_jumblr" onClick={ () => this.openTab(2) }>
<div className="panel-heading" onClick={ () => this.openTab(2) }>
<a className={ this.state.activeTab === 2 ? 'panel-title' : 'panel-title collapsed' }>{ translate('JUMBLR.USING_JUMBLR') }</a>
</div>
<div
className={ this.state.activeTab === 2 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
id="jumblr_using_jumblr_3">
<div className={ this.state.activeTab === 2 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }>
<div className="panel-body">
<ul>
<li>{ translate('JUMBLR.RUN_KMD') }</li>
@ -157,54 +149,46 @@ class Jumblr extends React.Component {
<div className="col-xlg-12 col-md-12">
<h4 className="font-size-14 text-uppercase">{ translate('JUMBLR.JADDR') }</h4>
<div className="panel" id="projects">
<div className="panel">
<div className="table-responsive">
<table className="table table-striped">
<tbody>
<tr>
<td width="20%">{ translate('JUMBLR.BTC_DEPOSIT') }</td>
<td>
<span id="jumblr_BTCdeposit"></span>
<span></span>
</td>
</tr>
<tr>
<td>BTC Jumblr</td>
<td>
<button type="button" className="btn btn-animate btn-animate-side btn-default btn-sm waves-effect waves-light jumblr_show_hide_addr_btc_btn">
<button type="button" className="btn btn-animate btn-animate-side btn-default btn-sm waves-effect waves-light">
<span>
<i className="icon fa-eye"></i> { translate('JUMBLR.SHOW_HIDE') }
</span>
</button>
<span
className="label label-lg label-outline label-success"
id="jumblr_BTCjumblr"
style={{ display: 'none' }}></span>
<span
className="label label-lg label-outline label-default"
id="jumblr_BTCjumblr_showhide">{ translate('JUMBLR.HIDDEN') }</span>
<span className="label label-lg label-outline label-default">{ translate('JUMBLR.HIDDEN') }</span>
</td>
</tr>
<tr>
<td>{ translate('JUMBLR.KMD_DEPOSIT') }</td>
<td>
<span id="jumblr_KMDdeposit"></span>
</td>
<td></td>
</tr>
<tr>
<td>KMD Jumblr</td>
<td>
<button type="button" className="btn btn-animate btn-animate-side btn-default btn-sm waves-effect waves-light jumblr_show_hide_addr_kmd_btn">
<button type="button" className="btn btn-animate btn-animate-side btn-default btn-sm waves-effect waves-light">
<span>
<i className="icon fa-eye" aria-hidden="true"></i> { translate('JUMBLR.SHOW_HIDE') }
<i className="icon fa-eye"></i> { translate('JUMBLR.SHOW_HIDE') }
</span>
</button>
<span
className="label label-lg label-outline label-success"
id="jumblr_KMDjumblr"
style={{ display: 'none' }}></span>
<span
className="label label-lg label-outline label-default"
id="jumblr_KMDjumblr_showhide">{ translate('JUMBLR.HIDDEN') }</span>
<span className="label label-lg label-outline label-default">{ translate('JUMBLR.HIDDEN') }</span>
</td>
</tr>
</tbody>
@ -215,51 +199,39 @@ class Jumblr extends React.Component {
<div className="col-xlg-12 col-md-12">
<h4 className="font-size-14 text-uppercase">{ translate('JUMBLR.JSTATUS') }</h4>
<div className="panel" id="projects">
<div className="panel">
<div className="table-responsive">
<table className="table table-striped">
<tbody>
<tr>
<td width="20%">{ translate('JUMBLR.RESULT') }</td>
<td>
<span id="jumblr_status_result" className="label label-success"></span>
<span className="label label-success"></span>
</td>
</tr>
<tr>
<td>{ translate('JUMBLR.DEPOSITED') }</td>
<td>
<span id="jumblr_status_deposited"></span>
</td>
<td></td>
</tr>
<tr>
<td>{ translate('JUMBLR.PUB_TO_PRIV') }</td>
<td>
<span id="jumblr_status_t_to_z"></span>
</td>
<td></td>
</tr>
<tr>
<td>{ translate('JUMBLR.PRIV_TO_PRIV') }</td>
<td>
<span id="jumblr_status_z_to_z"></span>
</td>
<td></td>
</tr>
<tr>
<td>{ translate('JUMBLR.PRIV_TO_PUB') }</td>
<td>
<span id="jumblr_status_z_to_t"></span>
</td>
<td></td>
</tr>
<tr>
<td>{ translate('JUMBLR.FINISHED') }</td>
<td>
<span id="jumblr_status_finished"></span>
</td>
<td></td>
</tr>
<tr>
<td>{ translate('JUMBLR.PENDING') }</td>
<td>
<span id="jumblr_status_pending"></span>
</td>
<td></td>
</tr>
</tbody>
</table>

32
react/src/components/dashboard/navbar.js

@ -100,9 +100,9 @@ class Navbar extends React.Component {
</button>
</div>
<div className="navbar-container container-fluid">
<div className="collapse navbar-collapse navbar-collapse-toolbar" id="site-navbar-collapse">
<div className="collapse navbar-collapse navbar-collapse-toolbar">
<ul className="nav navbar-toolbar">
<li className="hidden-float display-none" id="toggleMenubar">
<li className="hidden-float display-none">
<a>
<i className="icon hamburger hamburger-arrow-left">
<span className="sr-only">{ translate('INDEX.TOGGLE_MENUBAR') }</span>
@ -111,31 +111,29 @@ class Navbar extends React.Component {
</a>
</li>
<li className={ this.props.Dashboard.activeSection === 'wallets' ? 'active nav-top-menu' : 'nav-top-menu' }>
<a id="nav-dashboard" onClick={ () => this.dashboardChangeSection('wallets') }>
<a onClick={ () => this.dashboardChangeSection('wallets') }>
<i className="site-menu-icon"></i> { translate('INDEX.WALLETS') }
</a>
</li>
<li className={ this.props.Dashboard.activeSection === 'edex' ? 'active nav-top-menu' : 'nav-top-menu' }>
<a id="nav-easydex" onClick={ () => this.dashboardChangeSection('edex') }>
<a onClick={ () => this.dashboardChangeSection('edex') }>
<i className="site-menu-icon" aria-hidden="true"></i> EasyDEX
</a>
</li>
<li
className={'display-none ' + (this.props.Dashboard.activeSection === 'jumblr' ? 'active nav-top-menu' : 'nav-top-menu') }>
<a id="nav-jumblr" onClick={ () => this.dashboardChangeSection('jumblr') }>
<li className={ 'display-none ' + (this.props.Dashboard.activeSection === 'jumblr' ? 'active nav-top-menu' : 'nav-top-menu') }>
<a onClick={ () => this.dashboardChangeSection('jumblr') }>
<i className="site-menu-icon"></i> Jumblr
</a>
</li>
<li className={ this.props.Dashboard.activeSection === 'atomic' ? 'active nav-top-menu' : 'nav-top-menu' }>
<a id="nav-iguana-atomic-explorer" onClick={ () => this.dashboardChangeSection('atomic') }>
<a onClick={ () => this.dashboardChangeSection('atomic') }>
<i className="site-menu-icon"></i> Atomic Explorer
</a>
</li>
</ul>
<ul className="nav navbar-toolbar navbar-right navbar-toolbar-right">
<li role="presentation">
<li>
<a
id="btn_edexcoin_addcoin"
className="pointer padding-bottom-10 padding-top-16"
onClick={ this.toggleAddCoinModal }>
<span>
@ -154,29 +152,23 @@ class Navbar extends React.Component {
</a>
<ul className="dropdown-menu">
<li>
<a
id="nav-iguana-wallet-settings"
onClick={ () => this.dashboardChangeSection('settings') }>
<a onClick={ () => this.dashboardChangeSection('settings') }>
<i className="icon md-settings"></i> { translate('INDEX.SETTINGS') }
</a>
</li>
<li>
<a
id="nav-iguana-sync-only"
onClick={ () => this.openSyncOnlyModal() }>
<a onClick={ () => this.openSyncOnlyModal() }>
<i className="icon fa-cubes"></i> { translate('ADD_COIN.SYNC_ONLY') }
</a>
</li>
<li>
<a
id="nav-about-iguana"
onClick={ () => this.dashboardChangeSection('about') }>
<a onClick={ () => this.dashboardChangeSection('about') }>
<i className="icon fa-users"></i> { translate('INDEX.ABOUT_IGUANA') }
</a>
</li>
<li className="divider"></li>
<li>
<a id="logout-account" onClick={ this.logout }>
<a onClick={ this.logout }>
<i className="icon md-power"></i> { translate('INDEX.LOGOUT') }
</a>
</li>

10
react/src/components/dashboard/receiveCoin.js

@ -36,7 +36,6 @@ class ReceiveCoin extends React.Component {
</span>
<button
className="btn btn-default btn-xs clipboard-edexaddr margin-left-10"
id="edexcoin_active_addr_clipboard"
title={ translate('INDEX.COPY_TO_CLIPBOARD') }
onClick={ () => this._copyCoinAddress(address) }><i className="icon wb-copy"></i> { translate('INDEX.COPY') }</button>
<span
@ -61,8 +60,7 @@ class ReceiveCoin extends React.Component {
</span>
<button
className="btn btn-default btn-xs clipboard-edexaddr margin-left-10"
id="edexcoin_active_addr_clipboard"
onClick={ () => this._copyCoinAddress(address) }><i className="icon wb-copy" aria-hidden="true"></i> { translate('INDEX.COPY') }</button>
onClick={ () => this._copyCoinAddress(address) }><i className="icon wb-copy"></i> { translate('INDEX.COPY') }</button>
</td>
);
}
@ -107,10 +105,10 @@ class ReceiveCoin extends React.Component {
this.props.receive &&
this.props.mode !== 'native') {
return (
<div id="edexcoin_recieve">
<div>
<div className="col-xs-12 margin-top-20">
<div className="panel nav-tabs-horizontal">
<div id="edexcoin_recieve_section">
<div>
<div className="col-xlg-12 col-lg-12 col-sm-12 col-xs-12">
<div className="panel">
<header className="panel-heading">
@ -118,7 +116,7 @@ class ReceiveCoin extends React.Component {
<h4 className="panel-title">{ translate('INDEX.RECEIVING_ADDRESS') }</h4>
</header>
<div className="panel-body">
<table className="table table-hover dataTable table-striped" id="edexcoin-recieve-addr-tbl">
<table className="table table-hover dataTable table-striped">
<thead>
<tr>
<th>{ translate('INDEX.TYPE') }</th>

80
react/src/components/dashboard/sendCoin.js

@ -164,18 +164,18 @@ class SendCoin extends React.Component {
</div>
<div className={ isReadyToUpdate ? 'hide' : '' }>{ translate('SEND.NEXT_UPDATE_IN') } { secondsElapsedToString(600 - timestamp) }s</div>
<div
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') }>
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') }>
<div
className="progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success font-size-80-percent"
style={{ width: 100 - (this.state.currentStackLength * 100 / this.state.totalStackLength) + '%' }}
role="progressbar">
style={{ width: 100 - (this.state.currentStackLength * 100 / this.state.totalStackLength) + '%' }}>
{ translate('SEND.PROCESSING_REQ') }: { this.state.currentStackLength } / { this.state.totalStackLength }
</div>
</div>
<button
type="button"
className={'margin-top-10 ' + (isReadyToUpdate ? 'btn btn-primary waves-effect waves-light' : 'hide') }
onClick={ this._fetchNewUTXOData } disabled={ waitUntilCallIsFinished }>
className={ 'margin-top-10 ' + (isReadyToUpdate ? 'btn btn-primary waves-effect waves-light' : 'hide') }
onClick={ this._fetchNewUTXOData }
disabled={ waitUntilCallIsFinished }>
{ waitUntilCallIsFinished ? translate('SEND.LOCKED_PLEASE_WAIT') + '...' : translate('SEND.UPDATE') }
</button>
</div>
@ -286,9 +286,7 @@ class SendCoin extends React.Component {
renderAddressList() {
return (
<div
id="showkmdwalletaddrs"
className={ `btn-group bootstrap-select form-control form-material showkmdwalletaddrs show-tick ${(this.state.addressSelectorOpen ? 'open' : '')}` }>
<div className={ `btn-group bootstrap-select form-control form-material showkmdwalletaddrs show-tick ${(this.state.addressSelectorOpen ? 'open' : '')}` }>
<button
type="button"
className="btn dropdown-toggle btn-info"
@ -362,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));
@ -690,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:', '');
@ -719,13 +719,13 @@ class SendCoin extends React.Component {
<div className="col-lg-6 form-group form-material">
<label
className="control-label"
htmlFor="kmd_wallet_sendto">Fetch OpenAlias recipient address</label>
htmlFor="kmdWalletSendTo">Fetch OpenAlias recipient address</label>
<input
type="text"
className="form-control"
name="sendToOA"
onChange={ this.updateInput }
id="kmd_wallet_sendto"
id="kmdWalletSendTo"
placeholder="Enter an alias as address@site.com"
autoComplete="off"
required />
@ -734,7 +734,6 @@ class SendCoin extends React.Component {
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="kmd_wallet_send_coins_btn"
onClick={ this.getOAdress }>
Get address
</button>
@ -771,30 +770,24 @@ class SendCoin extends React.Component {
this.props.ActiveCoin.send &&
this.props.ActiveCoin.mode !== 'native') {
return (
<div className="col-sm-12 padding-top-10" id="edexcoin_send">
<div className="col-sm-12 padding-top-10">
<div className="col-xlg-12 col-md-12 col-sm-12 col-xs-12">
<div className="steps row margin-top-10">
<div
className={ this.state.currentStep === 0 ? 'step col-md-4 current' : 'step col-md-4' }
id="edexcoin_send_step_1">
<div className={ this.state.currentStep === 0 ? 'step col-md-4 current' : 'step col-md-4' }>
<span className="step-number">1</span>
<div className="step-desc">
<span className="step-title">{ translate('INDEX.FILL_SEND_FORM') }</span>
<p>{ translate('INDEX.FILL_SEND_DETAILS') }</p>
</div>
</div>
<div
className={ this.state.currentStep === 1 ? 'step col-md-4 current' : 'step col-md-4' }
id="edexcoin_send_step_2">
<div className={ this.state.currentStep === 1 ? 'step col-md-4 current' : 'step col-md-4' }>
<span className="step-number">2</span>
<div className="step-desc">
<span className="step-title">{ translate('INDEX.CONFIRMING') }</span>
<p>{ translate('INDEX.CONFIRM_DETAILS') }</p>
</div>
</div>
<div
className={ this.state.currentStep === 2 ? 'step col-md-4 current' : 'step col-md-4' }
id="edexcoin_send_step_3">
<div className={ this.state.currentStep === 2 ? 'step col-md-4 current' : 'step col-md-4' }>
<span className="step-number">3</span>
<div className="step-desc">
<span className="step-title">{ translate('INDEX.PROCESSING_TX') }</span>
@ -803,7 +796,7 @@ class SendCoin extends React.Component {
</div>
</div>
<div className={ this.state.currentStep === 0 ? 'panel' : 'panel hide' } id="edexcoin-send-screen">
<div className={ this.state.currentStep === 0 ? 'panel' : 'panel hide' }>
<div className="panel-heading">
<h3 className="panel-title">
{ translate('INDEX.SEND') } { this.props.ActiveCoin.coin }
@ -814,18 +807,18 @@ class SendCoin extends React.Component {
{ this.renderSendApiTypeSelector() }
<div className="row">
<div className={ this.props.ActiveCoin.mode === 'basilisk' ? 'col-xlg-12 form-group form-material' : 'hide' }>
<label className="control-label" htmlFor="edexcoin_send_from">{ translate('INDEX.SEND_FROM') }</label>
<label className="control-label" htmlFor="edexcoinSendFrom">{ translate('INDEX.SEND_FROM') }</label>
{ this.renderAddressList() }
</div>
</div>
{ this.renderOASendUI() }
<div className="row">
<div className="col-xlg-12 form-group form-material">
<label className="control-label" htmlFor="edexcoin_sendto">{ translate('INDEX.SEND_TO') }</label>
<label className="control-label" htmlFor="edexcoinSendTo">{ translate('INDEX.SEND_TO') }</label>
<input
type="text"
className="form-control"
id="edexcoin_sendto"
id="edexcoinSendTo"
name="sendTo"
placeholder={ translate('SEND.ENTER_AN_ADDRESS') }
autoComplete="off"
@ -834,24 +827,24 @@ class SendCoin extends React.Component {
required />
</div>
<div className="col-lg-6 form-group form-material">
<label className="control-label" htmlFor="edexcoin_amount" id="edexcoin_amount_label">
<label className="control-label" htmlFor="edexcoinAmount">
{ this.props.ActiveCoin.coin }
</label>
<input
type="text"
className="form-control"
id="edexcoin_amount"
id="edexcoinAmount"
name="amount"
placeholder="0.000"
autoComplete="off"
onChange={ this.updateInput } />
</div>
<div className="col-lg-6 form-group form-material">
<label className="control-label" htmlFor="edexcoin_fee">{ translate('INDEX.FEE') }</label>
<label className="control-label" htmlFor="edexcoinFee">{ translate('INDEX.FEE') }</label>
<input
type="text"
className="form-control"
id="edexcoin_fee"
id="edexcoinFee"
name="fee"
defaultValue={ this.state.fee }
value={ this.state.fee }
@ -861,7 +854,7 @@ class SendCoin extends React.Component {
</div>
<div className="col-lg-12">
<span>
<strong>{ translate('INDEX.TOTAL') } ({ translate('INDEX.AMOUNT_SM') } - txfee):</strong> <span id="edexcoin_total_value">{ Number(this.state.amount) - Number(this.state.fee) }</span> { this.props.ActiveCoin.coin }
<strong>{ translate('INDEX.TOTAL') } ({ translate('INDEX.AMOUNT_SM') } - txfee):</strong> { Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin }
</span>
</div>
<div className={ this.state.sendApiType ? 'hide' : 'col-lg-10 margin-top-30' }>
@ -877,7 +870,7 @@ class SendCoin extends React.Component {
<div className="col-lg-12">
<button
type="button"
className="btn btn-primary waves-effect waves-light pull-right edexcoin_send_coins_btn_step1"
className="btn btn-primary waves-effect waves-light pull-right"
onClick={ () => this.changeSendCoinStep(1) }
disabled={ !this.state.sendFrom || !this.state.sendTo || !this.state.amount }>
{ translate('INDEX.SEND') } { Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin }
@ -890,19 +883,19 @@ class SendCoin extends React.Component {
</div>
<div className={ this.state.currentStep === 1 ? 'col-xlg-12 col-md-12 col-sm-12 col-xs-12' : 'col-xlg-12 col-md-12 col-sm-12 col-xs-12 hide' }>
<div className="panel" id="edexcoin-send-confirm-screen">
<div className="panel">
<div className="panel-body">
<div className="row">
<div className="col-xs-12">
<strong>{ translate('INDEX.TO') }</strong>
</div>
<div className="col-lg-6 col-sm-6 col-xs-12" id="mdl_confirm_currency_sendto_addr">{ this.state.sendTo }</div>
<div className="col-lg-6 col-sm-6 col-xs-12">{ this.state.sendTo }</div>
<div className="col-lg-6 col-sm-6 col-xs-6">
<span id="mdl_confirm_currency_send_amount">{this.state.amount}</span> { this.props.ActiveCoin.coin }
{ this.state.amount } { this.props.ActiveCoin.coin }
</div>
<div className="col-lg-6 col-sm-6 col-xs-12">{ translate('INDEX.TX_FEE_REQ') }</div>
<div className="col-lg-6 col-sm-6 col-xs-6">
<span id="mdl_confirm_currency_send_fee">{ this.state.fee }</span> { this.props.ActiveCoin.coin }
{ this.state.fee } { this.props.ActiveCoin.coin }
</div>
</div>
<br />
@ -911,21 +904,19 @@ class SendCoin extends React.Component {
<div className="col-xs-12">
<strong>{ translate('INDEX.FROM') }</strong>
</div>
<div className="col-lg-6 col-sm-6 col-xs-12" id="mdl_confirm_currency_sendfrom_addr">{ this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] }</div>
<div className="col-lg-6 col-sm-6 col-xs-12">{ this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] }</div>
<div className="col-lg-6 col-sm-6 col-xs-6 confirm-currency-send-container">
<span id="mdl_confirm_currency_sendfrom_total_dedcut">{ Number(this.state.amount) - Number(this.state.fee) }</span> { this.props.ActiveCoin.coin }
{ Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin }
</div>
</div>
<div className="widget-body-footer">
<a
className="btn btn-default waves-effect waves-light"
id="edexcoin_send_coins_back_btn"
onClick={ () => this.changeSendCoinStep(0) }>{ translate('INDEX.BACK') }</a>
<div className="widget-actions pull-right">
<button
type="button"
className="btn btn-primary"
id="edexcoin_send_coins_btn"
onClick={ () => this.changeSendCoinStep(2) }>{ translate('INDEX.CONFIRM') }</button>
</div>
</div>
@ -934,15 +925,13 @@ class SendCoin extends React.Component {
</div>
<div className={ this.state.currentStep === 2 ? 'col-xlg-12 col-md-12 col-sm-12 col-xs-12' : 'col-xlg-12 col-md-12 col-sm-12 col-xs-12 hide' }>
<div className="panel" id="edexcoin-send-txdetails-screen">
<div className="panel">
<div className="panel-heading">
<h4 className="panel-title">{ translate('INDEX.TRANSACTION_RESULT') }</h4>
<div className={ !this.state.sendSig ? 'hide' : 'center' }>
{ translate('SEND.YOU_PICKED_OPT') }
</div>
<table
className="table table-hover table-striped edexcoin_sendto_result"
id="edexcoin_sendto_result">
<table className="table table-hover table-striped">
<thead>
<tr>
<th>{ translate('INDEX.KEY') }</th>
@ -958,7 +947,6 @@ class SendCoin extends React.Component {
<button
type="button"
className="btn btn-primary"
id="edexcoin_send_coins_anothertx_btn"
onClick={ () => this.changeSendCoinStep(0) }
disabled={ this.state.utxoMethodInProgress }>{ !this.state.utxoMethodInProgress ? translate('INDEX.MAKE_ANOTHER_TX') : translate('SEND.PLEASE_WAIT') + '...' }</button>
</div>

93
react/src/components/dashboard/settings.js

@ -127,7 +127,7 @@ class Settings extends React.Component {
return (
<div className="panel" id="AppInfo" onClick={ () => this.openTab('AppInfo', 8) }>
<div className="panel-heading">
<a className={this.state.activeTab === 8 ? 'panel-title' : 'panel-title collapsed'}>
<a className={ this.state.activeTab === 8 ? 'panel-title' : 'panel-title collapsed' }>
<i className="icon md-info"></i>{ translate('SETTINGS.APP_INFO') }
</a>
</div>
@ -344,9 +344,9 @@ class Settings extends React.Component {
return (
<div className="margin-left-0">
<div className="page-content" id="section-iguana-wallet-settings">
<div className="row" id="iguana-wallet-settings">
<div className="row">
<div className="col-xlg-12 col-md-12">
<div className="row" id="iguana-wallet-settings">
<div className="row">
<div className="col-xlg-12 col-md-12">
<h4 className="font-size-14 text-uppercase">{ translate('INDEX.WALLET_SETTINGS') }</h4>
<div className="panel-group" id="SettingsAccordion">
@ -361,10 +361,9 @@ class Settings extends React.Component {
</div>
<div
className={ this.state.activeTab === 0 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
style={{ height: this.state.activeTab === 0 ? this.state.activeTabHeight + 'px' : '0' }}
id="WalletInfoTab">
style={{ height: this.state.activeTab === 0 ? this.state.activeTabHeight + 'px' : '0' }}>
<div className="panel-body">
<table className="table" id="wallet-info-table">
<table className="table">
<thead>
<tr>
<th width="10%">{ translate('INDEX.KEY') }</th>
@ -374,39 +373,27 @@ class Settings extends React.Component {
<tbody>
<tr>
<td className="wallet-info-key">pubkey</td>
<td>
<div id="winfo_pubkey_value">{ this.props.Main.activeHandle.pubkey }</div>
</td>
<td>{ this.props.Main.activeHandle.pubkey }</td>
</tr>
<tr>
<td className="wallet-info-key">btcpubkey</td>
<td>
<div id="winfo_btcpubkey_value">{ this.props.Main.activeHandle.btcpubkey }</div>
</td>
<td>{ this.props.Main.activeHandle.btcpubkey }</td>
</tr>
<tr>
<td className="wallet-info-key">rmd160</td>
<td>
<div id="winfo_rmd160_value">{ this.props.Main.activeHandle.rmd160 }</div>
</td>
<td>{ this.props.Main.activeHandle.rmd160 }</td>
</tr>
<tr>
<td className="wallet-info-key">NXT</td>
<td>
<div id="winfo_NXT_value">{ this.props.Main.activeHandle.NXT }</div>
</td>
<td>{ this.props.Main.activeHandle.NXT }</td>
</tr>
<tr>
<td className="wallet-info-key">notary</td>
<td>
<div id="winfo_notary_value">{ this.props.Main.activeHandle.notary }</div>
</td>
<td>{ this.props.Main.activeHandle.notary }</td>
</tr>
<tr>
<td className="wallet-info-key">status</td>
<td>
<div id="winfo_status_value">{ this.props.Main.activeHandle.status }</div>
</td>
<td>{ this.props.Main.activeHandle.status }</td>
</tr>
</tbody>
</table>
@ -425,8 +412,7 @@ class Settings extends React.Component {
</div>
<div
className={ this.state.activeTab === 1 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
style={{ height: this.state.activeTab === 1 ? this.state.activeTabHeight + 'px' : '0' }}
id="AddNodeforCoinTab">
style={{ height: this.state.activeTab === 1 ? this.state.activeTabHeight + 'px' : '0' }}>
<div className="panel-body">
<div className="row">
<div className="col-sm-6">
@ -437,7 +423,6 @@ class Settings extends React.Component {
<div className="form-group">
<select
className="form-control form-material"
id="settings_select_coin_options"
name="getPeersCoin"
onChange={ this.updateInput }>
<option>{ translate('INDEX.SELECT_COIN') }</option>
@ -451,18 +436,17 @@ class Settings extends React.Component {
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="settings_getcoinpeers_btn"
onClick={ this.checkNodes }>{ translate('INDEX.CHECK_NODES') }</button>
</div>
<div className="col-sm-12">
<h5>
SuperNET Peers: <span id="coin_supernetpeers_h"></span>
SuperNET Peers:
</h5>
<p id="coin_supernetpeers">{ this.renderSNPeersList() }</p>
<p>{ this.renderSNPeersList() }</p>
<h5>
Raw Peers: <span id="coin_rawpeers_h"></span>
Raw Peers:
</h5>
<p id="coin_rawpeers">{ this.renderPeersList() }</p>
<p>{ this.renderPeersList() }</p>
</div>
</div>
@ -474,7 +458,6 @@ class Settings extends React.Component {
<div className="form-group">
<select
className="form-control form-material"
id="settings_select_coin_addpeer_options"
name="addNodeCoin"
onChange={ this.updateInput }>
<option>{ translate('INDEX.SELECT_COIN') }</option>
@ -487,7 +470,6 @@ class Settings extends React.Component {
<input
type="text"
className="form-control"
id="settings_add_peer_ip"
name="addPeerIP"
placeholder={ translate('SETTINGS.ADD_PEER_IP') }
onChange={ this.updateInput } />
@ -497,7 +479,6 @@ class Settings extends React.Component {
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="settings_addcoinpeers_btn"
onClick={ this.addNode }>{ translate('INDEX.ADD_NODE') }</button>
</div>
</div>
@ -511,14 +492,13 @@ class Settings extends React.Component {
id="DumpWallet"
onClick={ () => this.openTab('DumpWallet', 2) }>
<div className="panel-heading">
<a className={this.state.activeTab === 2 ? 'panel-title' : 'panel-title collapsed'}>
<a className={ this.state.activeTab === 2 ? 'panel-title' : 'panel-title collapsed' }>
<i className="icon wb-briefcase"></i>{ translate('INDEX.WALLET_BACKUP') }
</a>
</div>
<div
className={ this.state.activeTab === 2 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
style={{ height: this.state.activeTab === 2 ? this.state.activeTabHeight + 'px' : '0' }}
id="DumpWalletTab">
style={{ height: this.state.activeTab === 2 ? this.state.activeTabHeight + 'px' : '0' }}>
<div className="panel-body">Wallet Backup section to be updated soon.</div>
</div>
</div>
@ -534,8 +514,7 @@ class Settings extends React.Component {
</div>
<div
className={ this.state.activeTab === 3 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
style={{ height: this.state.activeTab === 3 ? this.state.activeTabHeight + 'px' : '0' }}
id="FiatCurrencySettingsTab">
style={{ height: this.state.activeTab === 3 ? this.state.activeTabHeight + 'px' : '0' }}>
<div className="panel-body">Fiat currency settings section to be updated soon.</div>
</div>
</div>
@ -551,8 +530,7 @@ class Settings extends React.Component {
</div>
<div
className={ this.state.activeTab === 4 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
style={{ height: this.state.activeTab === 4 ? this.state.activeTabHeight + 'px' : '0' }}
id="ExportKeysTab">
style={{ height: this.state.activeTab === 4 ? this.state.activeTabHeight + 'px' : '0' }}>
<div className="panel-body">
<p>
<div>{ this.renderLB('INDEX.ONLY_ACTIVE_WIF_KEYS') }</div><br/>
@ -567,21 +545,20 @@ class Settings extends React.Component {
type="password"
className="form-control"
name="wifkeysPassphrase"
id="wifkeys_passphrase"
id="wifkeysPassphrase"
onChange={ this.updateInput } />
<label className="floating-label" htmlFor="wifkeys_passphrase">{ translate('INDEX.PASSPHRASE') }</label>
<label className="floating-label" htmlFor="wifkeysPassphrase">{ translate('INDEX.PASSPHRASE') }</label>
</div>
<div className="col-sm-12 col-xs-12 text-align-center">
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="wifkeys_passphrase_btn"
onClick={ this.exportWifKeys }>{ translate('INDEX.GET_WIF_KEYS') }</button>
</div>
</form>
<div className="col-sm-12 padding-top-15">
<div className="row" id="wif-priv-keys">
<div className="row">
<table className={ this.props.Settings && this.props.Settings.address ? 'table show' : 'table hide' }>
<tr>
<td className="width-5-percent">
@ -613,8 +590,7 @@ class Settings extends React.Component {
</div>
<div
className={ this.state.activeTab === 5 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
style={{ height: this.state.activeTab === 5 ? this.state.activeTabHeight + 'px' : '0' }}
id="ImportKeysTab">
style={{ height: this.state.activeTab === 5 ? this.state.activeTabHeight + 'px' : '0' }}>
<div className="panel-body">
<p>
<div>{ translate('INDEX.IMPORT_KEYS_DESC_P1') }</div><br/>
@ -631,17 +607,16 @@ class Settings extends React.Component {
type="text"
className="form-control"
name="importWifKey"
id="import_wifkey"
id="importWifkey"
onChange={ this.updateInput } />
<label
className="floating-label"
htmlFor="import_wifkey">{ translate('INDEX.INPUT_PRIV_KEY') }</label>
htmlFor="importWifkey">{ translate('INDEX.INPUT_PRIV_KEY') }</label>
</div>
<div className="col-sm-12 col-xs-12 text-align-center">
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="import_wifkey_btn"
onClick={ this.importWifKey }>{ translate('INDEX.IMPORT_PRIV_KEY') }</button>
</div>
</form>
@ -660,8 +635,7 @@ class Settings extends React.Component {
</div>
<div
className={ this.state.activeTab === 6 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
style={{ height: this.state.activeTab === 6 ? this.state.activeTabHeight + 'px' : '0' }}
id="DebugLogTab">
style={{ height: this.state.activeTab === 6 ? this.state.activeTabHeight + 'px' : '0' }}>
<div className="panel-body">
<p>{ translate('INDEX.DEBUG_LOG_DESC') }</p>
<div className="col-sm-12"></div>
@ -675,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 } />
<label
className="floating-label"
htmlFor="read_debug_log_lines">{ translate('INDEX.DEBUG_LOG_LINES') }</label>
htmlFor="readDebugLogLines">{ translate('INDEX.DEBUG_LOG_LINES') }</label>
</div>
<div className="form-group form-material floating">
<select
className="form-control form-material"
name="debugTarget"
id="settings_select_debuglog_options"
id="settingsDelectDebugLogOptions"
onChange={ this.updateInput }>
<option value="iguana">Iguana</option>
<option value="komodo">Komodo</option>
</select>
<label
className="floating-label"
htmlFor="settings_select_debuglog_options">{ translate('INDEX.TARGET') }</label>
htmlFor="settingsDelectDebugLogOptions">{ translate('INDEX.TARGET') }</label>
</div>
<div className="col-sm-12 col-xs-12 text-align-center">
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="read_debug_log_btn"
onClick={ this.readDebugLog }>{ translate('INDEX.LOAD_DEBUG_LOG') }</button>
</div>
<div className="col-sm-12 col-xs-12 text-align-left">
@ -721,8 +694,7 @@ class Settings extends React.Component {
</div>
<div
className={ this.state.activeTab === 7 ? 'panel-collapse collapse in' : 'panel-collapse collapse' }
style={{ height: this.state.activeTab === 7 ? this.state.activeTabHeight + 'px' : '0' }}
id="DebugLogTab">
style={{ height: this.state.activeTab === 7 ? this.state.activeTabHeight + 'px' : '0' }}>
<div className="panel-body">
<p>
<strong>{ translate('SETTINGS.CONFIG_RESTART_REQUIRED') }</strong>
@ -738,7 +710,6 @@ class Settings extends React.Component {
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="read_debug_log_btn"
onClick={ this._saveAppConfig }>{ translate('SETTINGS.SAVE_APP_CONFIG') }</button>
</div>
</div>

29
react/src/components/dashboard/syncOnly.js

@ -97,15 +97,13 @@ class SyncOnly extends React.Component {
<div>
<div className="progress progress-sm">
<div
className={'font-size-80-percent full-width ' + (this.isFullySynced(fork) ? 'progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success' : 'hide') }
id="currency-bundles">
{ translate('INDEX.BUNDLES') } <span id="currency-bundles-percent">({ fork.coin }) 100.00% - ( { fork.blocks } / { fork.blocks } ) ==&gt;&gt; RT{ fork.RTheight }</span>
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 } ) ==&gt;&gt; RT{ fork.RTheight }
</div>
<div
className={'font-size-80-percent ' + (this.isFullySynced(fork) ? 'hide' : 'progress-bar progress-bar-info progress-bar-striped active') }
style={{ width: fork.bundles + '%' }}
id="currency-bundles">
{ translate('INDEX.BUNDLES') } <span id="currency-bundles-percent">{ fork.bundles }%</span>
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 }%
</div>
</div>
</div>
@ -113,25 +111,22 @@ class SyncOnly extends React.Component {
<div className="progress progress-sm">
<div
className="progress-bar progress-bar-warning progress-bar-striped active font-size-80-percent"
style={{ width: fork.utxo + '%' }}
id="currency-utxo">
utxo <span id="currency-utxo-percent">{ fork.utxo }%</span>
style={{ width: fork.utxo + '%' }}>
utxo { fork.utxo }%
</div>
</div>
<div className="progress progress-sm">
<div
className="progress-bar progress-bar-danger progress-bar-striped active font-size-80-percent"
style={{ width: fork.balances + '%' }}
id="currency-balances">
{ translate('INDEX.BALANCES') } <span id="currency-balances-percent">{ fork.balances }%</span>
style={{ width: fork.balances + '%' }}>
{ translate('INDEX.BALANCES') } { fork.balances }%
</div>
</div>
<div className="progress progress-sm">
<div
className="progress-bar progress-bar-success progress-bar-striped active font-size-80-percent"
style={{ width: fork.validated + '%' }}
id="currency-validated">
{ translate('INDEX.VALIDATED') } <span id="currency-validated-percent">{ fork.validated }%</span>
style={{ width: fork.validated + '%' }}>
{ translate('INDEX.VALIDATED') } { fork.validated }%
</div>
</div>
</div>
@ -171,7 +166,7 @@ class SyncOnly extends React.Component {
</div>
</div>
<div className="progress-bars">
{this.renderProgress(forkInfo.getinfo)}
{ this.renderProgress(forkInfo.getinfo) }
</div>
</div>
);

26
react/src/components/dashboard/walletsBalance.js

@ -90,30 +90,28 @@ class WalletsBalance extends React.Component {
<div id="wallet-widgets">
<div className="col-xs-12">
<div className={ this.props.ActiveCoin.mode === 'native' || (this.props.ActiveCoin.mode === 'full' && !this.isFullySynced()) ? 'col-xs-12' : 'col-xs-12 hide' }>
<div className="alert alert-info alert-dismissible" id="edexcoin-wallet-waitingrt-alert">
<div className="alert alert-info alert-dismissible">
<button className="close" type="button">
<span>×</span>
</button>
<h4>{ translate('INDEX.ACTIVATING_WALLET_RT') }</h4>
<p id="edexcoin-wallet-waitingrt-alert-text">{ translate('INDEX.IGUANA_FULL_MODE_SYNC_P1') }</p>
<p>{ translate('INDEX.IGUANA_FULL_MODE_SYNC_P1') }</p>
<p>{ translate('INDEX.IGUANA_FULL_MODE_SYNC_P2') }</p>
<p className="font-weight-600">{ this.renderLB('INDEX.IGUANA_FULL_MODE_SYNC_P3') }</p>
</div>
<div className="alert alert-info alert-dismissible" id="edexcoin-wallet-waitingcache-alert">
<div className="alert alert-info alert-dismissible">
<button className="close" type="button">
<span>×</span>
</button>
<h4>{ translate('INDEX.FETCHING_COIN_DATA') }</h4>
<p id="edexcoin-wallet-waitingcache-alert-text">{ translate('INDEX.IGUANA_FULL_MODE_SYNC_P1') }</p>
<p>{ translate('INDEX.IGUANA_FULL_MODE_SYNC_P1') }</p>
<p>{ translate('INDEX.IGUANA_FULL_MODE_SYNC_P2') }</p>
<p className="font-weight-600">{ this.renderLB('INDEX.IGUANA_FULL_MODE_SYNC_P3') }</p>
</div>
</div>
<div
className={ this.props.ActiveCoin.mode === 'native' || this.props.ActiveCoin.mode === 'basilisk' ? 'col-lg-4 col-xs-12' : 'col-lg-12 col-xs-12' }
id="edexcoin_getbalance_t">
<div className="widget widget-shadow" id="widgetLineareaOne">
<div className={ this.props.ActiveCoin.mode === 'native' || this.props.ActiveCoin.mode === 'basilisk' ? 'col-lg-4 col-xs-12' : 'col-lg-12 col-xs-12' }>
<div className="widget widget-shadow">
<div className="widget-content">
<div className="padding-20 padding-top-10">
<div className="clearfix">
@ -129,10 +127,8 @@ class WalletsBalance extends React.Component {
</div>
</div>
<div
className={ this.props.ActiveCoin.mode === 'native' || this.props.ActiveCoin.mode === 'basilisk' ? 'col-lg-4 col-xs-12' : 'col-lg-4 col-xs-12 hide' }
id="edexcoin_getbalance_interest">
<div className="widget widget-shadow" id="widgetLineareaOne">
<div className={ this.props.ActiveCoin.mode === 'native' || this.props.ActiveCoin.mode === 'basilisk' ? 'col-lg-4 col-xs-12' : 'col-lg-4 col-xs-12 hide' }>
<div className="widget widget-shadow">
<div className="widget-content">
<div className="padding-20 padding-top-10">
<div className="clearfix">
@ -148,10 +144,8 @@ class WalletsBalance extends React.Component {
</div>
</div>
<div
className={ this.props.ActiveCoin.mode === 'native' || this.props.ActiveCoin.mode === 'basilisk' ? 'col-lg-4 col-xs-12' : 'col-lg-4 col-xs-12 hide' }
id="edexcoin_getbalance_total_interest">
<div className="widget widget-shadow" id="widgetLineareaOne">
<div className={ this.props.ActiveCoin.mode === 'native' || this.props.ActiveCoin.mode === 'basilisk' ? 'col-lg-4 col-xs-12' : 'col-lg-4 col-xs-12 hide' }>
<div className="widget widget-shadow">
<div className="widget-content">
<div className="padding-20 padding-top-10">
<div className="clearfix">

2
react/src/components/dashboard/walletsBasiliskRefresh.js

@ -17,7 +17,7 @@ class WalletsBasiliskRefresh extends React.Component {
</div>
</div>
<div className="table-responsive">
<table className="table table-hover table-striped tbl_edexcoin_dashboard_basilisk_refresh_status">
<table className="table table-hover table-striped">
<thead>
<tr>
<th>{ translate('INDEX.ADDRESS') }</th>

46
react/src/components/dashboard/walletsData.js

@ -253,8 +253,7 @@ class WalletsData extends React.Component {
key={ `${i}-pagination-link` }
className={ this.state.activePage === i + 1 ? 'paginate_button active' : 'paginate_button' }>
<a
aria-controls="kmd-tx-history-tbl"
tabIndex="0" key={ `${i}-pagination` }
key={ `${i}-pagination` }
onClick={ this.state.activePage !== (i + 1) ? () => this.updateCurrentPage(i + 1) : null }>{ i + 1 }</a>
</li>
);
@ -268,7 +267,7 @@ class WalletsData extends React.Component {
this.state.itemsList !== 'loading' &&
this.props.ActiveCoin.txhistory.length > 10) {
return (
<div className="dataTables_length" id="kmd-tx-history-tbl_length">
<div className="dataTables_length">
<label>
{ translate('INDEX.SHOW') }&nbsp;
<select
@ -299,22 +298,16 @@ class WalletsData extends React.Component {
return (
<div className="row unselectable">
<div className="col-sm-5">
<div
className="dataTables_info"
id="kmd-tx-history-tbl_info">{ translate('INDEX.SHOWING') } { _paginationFrom } { translate('INDEX.TO_ALT') } { _paginationTo } { translate('INDEX.OF') } { this.props.ActiveCoin.txhistory.length } { translate('INDEX.ENTRIES_SM') }</div>
<div className="dataTables_info">{ translate('INDEX.SHOWING') } { _paginationFrom } { translate('INDEX.TO_ALT') } { _paginationTo } { translate('INDEX.OF') } { this.props.ActiveCoin.txhistory.length } { translate('INDEX.ENTRIES_SM') }</div>
</div>
<div className="col-sm-7">
<div className="dataTables_paginate paging_simple_numbers" id="kmd-tx-history-tbl_paginate">
<div className="dataTables_paginate paging_simple_numbers">
<ul className="pagination">
<li
className={ this.state.activePage === 1 ? 'paginate_button previous disabled' : 'paginate_button previous' }
id="kmd-tx-history-tbl_previous">
<li className={ this.state.activePage === 1 ? 'paginate_button previous disabled' : 'paginate_button previous' }>
<a onClick={ () => this.updateCurrentPage(this.state.activePage - 1) }>{ translate('INDEX.PREVIOUS') }</a>
</li>
{ this.renderPaginationItems() }
<li
className={ this.state.activePage > Math.floor(this.props.ActiveCoin.txhistory.length / this.state.itemsPerPage) ? 'paginate_button next disabled' : 'paginate_button next' }
id="kmd-tx-history-tbl_next">
<li className={ this.state.activePage > Math.floor(this.props.ActiveCoin.txhistory.length / this.state.itemsPerPage) ? 'paginate_button next disabled' : 'paginate_button next' }>
<a onClick={ () => this.updateCurrentPage(this.state.activePage + 1) }>{ translate('INDEX.NEXT') }</a>
</li>
</ul>
@ -411,10 +404,10 @@ class WalletsData extends React.Component {
}));
if (this.props.ActiveCoin.mode === 'basilisk') {
setTimeout(function() {
setTimeout(() => {
Store.dispatch(changeMainBasiliskAddress(address));
Store.dispatch(getBasiliskTransactionsList(this.props.ActiveCoin.coin, address));
}.bind(this), 100);
}, 100);
Store.dispatch(fetchNewCacheData({
'pubkey': this.props.Dashboard.activeHandle.pubkey,
@ -581,13 +574,12 @@ class WalletsData extends React.Component {
<div id="edexcoin_dashboardinfo">
<div className="col-xs-12 margin-top-20">
<div className="panel nav-tabs-horizontal">
<div id="edexcoin_dashoard_section">
<div className="col-xlg-12 col-lg-12 col-sm-12 col-xs-12 edexcoin_dashoard_section_main_div">
<div id="edexcoin_txhistory" className="panel">
<div>
<div className="col-xlg-12 col-lg-12 col-sm-12 col-xs-12">
<div className="panel">
<header className="panel-heading z-index-10">
<div className={ this.props.ActiveCoin.mode === 'basilisk' ? 'panel-actions' : 'panel-actions hide' }>
<div
className={'full-width margin-bottom-3 ' + (this.state.currentStackLength === 1 || (this.state.currentStackLength === 0 && this.state.totalStackLength === 0) ? 'hide' : 'progress progress-sm') }>
<div className={'full-width margin-bottom-3 ' + (this.state.currentStackLength === 1 || (this.state.currentStackLength === 0 && this.state.totalStackLength === 0) ? 'hide' : 'progress progress-sm') }>
<div
className="progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success font-size-80-percent"
style={{ width: 100 - (this.state.currentStackLength * 100 / this.state.totalStackLength) + '%'}}>
@ -597,16 +589,13 @@ class WalletsData extends React.Component {
<div
className={ this.state.basiliskActionsMenu ? 'dropdown open' : 'dropdown' }
onClick={ this.toggleBasiliskActionsMenu }>
<a
className="dropdown-toggle btn-xs btn-default"
id="btn_edexcoin_basilisk">
<a className="dropdown-toggle btn-xs btn-default">
<i className="icon fa-magic margin-right-10"></i> { translate('INDEX.BASILISK_ACTIONS') } <span className="caret"></span>
</a>
<ul className="dropdown-menu dropdown-menu-right">
<li>
<a
className="btn_edexcoin_dashboard_getnotaries"
id="btn_edexcoin_dashboard_getnotaries"
onClick={ this.getDexNotariesAction }>
<i className="icon fa-sitemap"></i> { translate('INDEX.GET_NOTARY_NODES_LIST') }
</a>
@ -614,7 +603,6 @@ class WalletsData extends React.Component {
<li>
<a
className="btn_edexcoin_dashboard_refresh_basilisk_conn"
id="btn_edexcoin_dashboard_refresh_basilisk_conn"
onClick={ this.basiliskConnectionAction }>
<i className="icon wb-refresh"></i> { translate('INDEX.REFRESH_BASILISK_CONNECTIONS') }
</a>
@ -622,7 +610,6 @@ class WalletsData extends React.Component {
<li className={ !this.state.useCache ? 'hide' : '' }>
<a
className="btn_edexcoin_dashboard_fetchdata"
id="btn_edexcoin_dashboard_fetchdata"
onClick={ this.basiliskRefreshActionOne }>
<i className="icon fa-cloud-download"></i> { translate('INDEX.FETCH_WALLET_DATA') } ({ translate('INDEX.ACTIVE_ADDRESS') })
</a>
@ -635,12 +622,11 @@ class WalletsData extends React.Component {
<li className={ !this.state.useCache ? 'hide' : '' }>
<a
className="btn_edexcoin_dashboard_refetchdata"
id="btn_edexcoin_dashboard_refetchdata"
onClick={ this.removeAndFetchNewCache }>
<i className="icon fa-history"></i> { translate('INDEX.REFETCH_WALLET_DATA') }
</a>
</li>
<li className={'display-none ' + (!this.state.useCache ? 'hide' : '') }>
<li className={ 'display-none ' + (!this.state.useCache ? 'hide' : '') }>
<a onClick={ this.restartBasiliskInstance }>
<i className="icon fa-refresh"></i> Restart Basilisk Instance (unsafe!)
</a>
@ -667,7 +653,7 @@ class WalletsData extends React.Component {
{ this.renderPaginationItemsPerPageSelector() }
</div>
<div className="col-sm-6">
<div id="kmd-tx-history-tbl_filter" className="dataTables_filter">
<div className="dataTables_filter">
<label>
{ translate('INDEX.SEARCH') }: <input type="search" className="form-control input-sm" disabled="true" />
</label>
@ -675,7 +661,7 @@ class WalletsData extends React.Component {
</div>
</div>
<div className="row">
<table className="table table-hover dataTable table-striped" id="edex-tx-history-tbl" width="100%">
<table className="table table-hover dataTable table-striped" width="100%">
<thead>
<tr>
<th>{ translate('INDEX.DIRECTION') }</th>

38
react/src/components/dashboard/walletsHeader.js

@ -21,23 +21,22 @@ class WalletsHeader extends React.Component {
<div id="kmd_header_button">
<button
type="button"
id="easydex_kmd_wallet_actions_header"
className="bg-teal-500 btn btn-floating white waves-effect waves-float waves-light">
<i className="icon md-plus"></i>
</button>
<ul className="dropdown-menu animate dropdown-menu-right">
<li>
<a id="btn_kmd_wallet_dashboard">{ translate('INDEX.DASHBOARD') }</a>
<a>{ translate('INDEX.DASHBOARD') }</a>
</li>
<li>
<a id="btn_kmd_wallet_send">{ translate('INDEX.SEND') }</a>
<a>{ translate('INDEX.SEND') }</a>
</li>
<li>
<a id="btn_kmd_wallet_recieve">{ translate('INDEX.RECEIVE') }</a>
<a>{ translate('INDEX.RECEIVE') }</a>
</li>
<li className="divider"></li>
<li>
<a id="btn_kmd_wallet_settings">{ translate('INDEX.SETTINGS') }</a>
<a>{ translate('INDEX.SETTINGS') }</a>
</li>
</ul>
</div>
@ -45,23 +44,22 @@ class WalletsHeader extends React.Component {
<div id="zec_header_button" className="display-none">
<button
type="button"
id="easydex_zec_wallet_actions_header"
className="bg-yellow-600 btn btn-floating white waves-effect waves-float waves-light">
<i className="icon md-plus"></i>
</button>
<ul className="dropdown-menu animate dropdown-menu-right">
<li>
<a id="btn_zec_wallet_dashboard">{ translate('INDEX.DASHBOARD') }</a>
<a>{ translate('INDEX.DASHBOARD') }</a>
</li>
<li>
<a id="btn_zec_wallet_send">{ translate('INDEX.SEND') }</a>
<a>{ translate('INDEX.SEND') }</a>
</li>
<li>
<a id="btn_zec_wallet_recieve">{ translate('INDEX.RECEIVE') }</a>
<a>{ translate('INDEX.RECEIVE') }</a>
</li>
<li className="divider"></li>
<li>
<a id="btn_zec_wallet_settings">{ translate('INDEX.SETTINGS') }</a>
<a>{ translate('INDEX.SETTINGS') }</a>
</li>
</ul>
</div>
@ -69,7 +67,6 @@ class WalletsHeader extends React.Component {
<div id="kmd_header_button">
<button
type="button"
id="jumblr_actions_header"
className="btn white waves-effect waves-light">
<i className="icon fa-refresh"></i>{ translate('INDEX.REFRESH') }
</button>
@ -78,38 +75,37 @@ class WalletsHeader extends React.Component {
<div id="kmd_header_button" className="display-none">
<button
type="button"
id="easydex_acpax_wallet_actions_header"
className="bg-teal-500 btn btn-floating white waves-effect waves-float waves-light">
<i className="icon md-plus"></i>
</button>
<ul className="dropdown-menu animate dropdown-menu-right">
<li>
<a id="btn_acpax_wallet_dashboard">{ translate('INDEX.DASHBOARD') }</a>
<a>{ translate('INDEX.DASHBOARD') }</a>
</li>
<li>
<a id="btn_acpax_wallet_send">{ translate('INDEX.SEND') }</a>
<a>{ translate('INDEX.SEND') }</a>
</li>
<li>
<a id="btn_acpax_wallet_recieve">{ translate('INDEX.RECEIVE') }</a>
<a>{ translate('INDEX.RECEIVE') }</a>
</li>
<li className="divider"></li>
<li>
<a id="btn_acpax_wallet_settings">{ translate('INDEX.SETTINGS') }</a>
<a>{ translate('INDEX.SETTINGS') }</a>
</li>
</ul>
</div>
<div className="row no-space width-350 hidden-xs" id="easydex_btc_btcd_balances_header display-none">
<div className="row no-space width-350 hidden-xs display-none">
<div className="col-xs-6">
<div className="counter">
<span className="font-weight-medium" id="header_coinname_balance"> - BTC</span>
<span className="counter-label small" id="header_coinfiatbalance"> - USD</span>
<span className="font-weight-medium"> - BTC</span>
<span className="counter-label small"> - USD</span>
</div>
</div>
<div className="col-xs-6">
<div className="counter">
<span className="font-weight-medium" id="header_coinname_balance"> - BTCD</span>
<span className="counter-label small" id="header_coinfiatbalance"> - USD</span>
<span className="font-weight-medium"> - BTCD</span>
<span className="counter-label small"> - USD</span>
</div>
</div>
</div>

4
react/src/components/dashboard/walletsNative.js

@ -28,7 +28,7 @@ class WalletsNative extends React.Component {
this.props.ActiveCoin.mode === 'native') {
return (
<div className="page margin-left-0">
<div id="section-extcoin" className="padding-top-0">
<div className="padding-top-0">
<div id="easydex-header-div" className="background-color-white" style={{ 'backgroundImage': `url("assets/images/bg/${this.defaultBG()}_transparent_header_bg.png")` }}>
<ol className="breadcrumb">
<li className="header-easydex-section">
@ -38,7 +38,7 @@ class WalletsNative extends React.Component {
</div>
<div className="page-content">
<WalletsNativeSyncProgress {...this.props} />
<div className="row" id="extcoin-wallet">
<div className="row">
<WalletsNativeBalance {...this.props} />
<WalletsNativeTxHistory {...this.props} />
<WalletsNativeReceive {...this.props} />

4
react/src/components/dashboard/walletsNativeAlert.js

@ -7,12 +7,12 @@ class WalletsNativeAlert extends React.Component {
this.props.Dashboard &&
!this.props.Dashboard.progress) {
return (
<div className="alert alert-danger alert-dismissible" id="extcoin-wallet-connection-alert">
<div className="alert alert-danger alert-dismissible">
<button className="close" type="button">
<span>×</span>
</button>
<h4>{ translate('INDEX.OOPS_ERROR') }</h4>
<p id="extcoin-wallet-connection-alert-text">
<p>
<span>{ translate('INDEX.OOPS_ERROR_DESC') }</span>
<code>server=1</code><br/>
<code>rpcport=</code><br/>

32
react/src/components/dashboard/walletsNativeBalance.js

@ -7,68 +7,60 @@ class WalletsNativeBalance extends React.Component {
this.props.ActiveCoin.nativeActiveSection === 'default') {
return (
<div className="col-xs-12">
<div className="col-lg-3 col-xs-12" id="kmd_widget_get_total_balance_t">
<div className="widget widget-shadow" id="widgetLineareaOne">
<div className="col-lg-3 col-xs-12">
<div className="widget widget-shadow">
<div className="widget-content white bg-yellow-800">
<div className="padding-20 padding-top-10">
<div className="clearfix">
<div className="pull-left padding-vertical-10">
<i className="icon fa-eye font-size-24 vertical-align-bottom margin-right-5"></i>{ translate('INDEX.TRANSPARENT_BALANCE') }
</div>
<span
className="pull-right padding-top-10 font-size-22"
id="kmd_transparent_balance">{ this.props.ActiveCoin.balance.transparent ? this.props.ActiveCoin.balance.transparent : '-' }</span>
<span className="pull-right padding-top-10 font-size-22">{ this.props.ActiveCoin.balance.transparent ? this.props.ActiveCoin.balance.transparent : '-' }</span>
</div>
</div>
</div>
</div>
</div>
<div className="col-lg-3 col-xs-12" id="kmd_widget_get_total_balance_z">
<div className="widget widget-shadow" id="widgetLineareaOne">
<div className="col-lg-3 col-xs-12">
<div className="widget widget-shadow">
<div className="widget-content white bg-blue-grey-800">
<div className="padding-20 padding-top-10">
<div className="clearfix">
<div className="pull-left padding-vertical-10">
<i className="icon fa-eye-slash font-size-24 vertical-align-bottom margin-right-5"></i>{ translate('INDEX.Z_BALANCE') }
</div>
<span
className="pull-right padding-top-10 font-size-22"
id="kmd_private_balance">{ this.props.ActiveCoin.balance.private ? this.props.ActiveCoin.balance.private : '-' }</span>
<span className="pull-right padding-top-10 font-size-22">{ this.props.ActiveCoin.balance.private ? this.props.ActiveCoin.balance.private : '-' }</span>
</div>
</div>
</div>
</div>
</div>
<div className="col-lg-3 col-xs-12" id="kmd_widget_get_total_balance_i">
<div className="widget widget-shadow" id="widgetLineareaOne">
<div className="col-lg-3 col-xs-12">
<div className="widget widget-shadow">
<div className="widget-content white bg-cyan-700">
<div className="padding-20 padding-top-10">
<div className="clearfix">
<div className="pull-left padding-vertical-10">
<i className="icon fa-money font-size-24 vertical-align-bottom margin-right-5"></i>{ translate('INDEX.INTEREST_EARNED') }
</div>
<span
className="pull-right padding-top-10 font-size-22"
id="kmd_total_interest_balance">{ this.props.ActiveCoin.balance.interest ? this.props.ActiveCoin.balance.interest : '-' }</span>
<span className="pull-right padding-top-10 font-size-22">{ this.props.ActiveCoin.balance.interest ? this.props.ActiveCoin.balance.interest : '-' }</span>
</div>
</div>
</div>
</div>
</div>
<div className="col-lg-3 col-xs-12" id="kmd_widget_get_total_balance_tzi">
<div className="widget widget-shadow" id="widgetLineareaOne">
<div className="col-lg-3 col-xs-12">
<div className="widget widget-shadow">
<div className="widget-content white bg-green-600">
<div className="padding-20 padding-top-10">
<div className="clearfix">
<div className="pull-left padding-vertical-10">
<i className="icon fa-bullseye font-size-24 vertical-align-bottom margin-right-5"></i>{ translate('INDEX.ZT_BALANCE') }
</div>
<span
className="pull-right padding-top-10 font-size-22"
id="kmd_total_tz_balance">{ this.props.ActiveCoin.balance.total ? this.props.ActiveCoin.balance.total : '-' }</span>
<span className="pull-right padding-top-10 font-size-22">{ this.props.ActiveCoin.balance.total ? this.props.ActiveCoin.balance.total : '-' }</span>
</div>
</div>
</div>

22
react/src/components/dashboard/walletsNativeInfo.js

@ -12,9 +12,9 @@ class WalletsNativeInfo extends React.Component {
this.props.Dashboard.progress &&
this.props.ActiveCoin.nativeActiveSection === 'settings') {
return (
<div id="kmd_wallet_settings">
<div>
<div className="col-xlg-6 col-md-4">
<div className="panel" id="projects">
<div className="panel">
<div className="panel-heading">
<h3 className="panel-title">{ translate('INDEX.WALLET_INFO') }</h3>
</div>
@ -35,21 +35,15 @@ class WalletsNativeInfo extends React.Component {
</tr>
<tr>
<td>{ translate('INDEX.UNCONFIRMED_BALANCE') }</td>
<td>
<span id="kmd_unconfirmed_balance"></span>
</td>
<td></td>
</tr>
<tr>
<td>{ translate('INDEX.IMMATURE_BALANCE') }</td>
<td>
<span id="kmd_immature_balance"></span>
</td>
<td></td>
</tr>
<tr>
<td>{ translate('INDEX.TOTAL_TX_COUNT') }</td>
<td>
<span id="KMDTotalTransactionsCount"></span>
</td>
<td></td>
</tr>
</tbody>
</table>
@ -58,7 +52,7 @@ class WalletsNativeInfo extends React.Component {
</div>
<div className="col-xlg-6 col-md-8">
<div className="panel" id="projects">
<div className="panel">
<div className="panel-heading">
<h3 className="panel-title">
Komodo { translate('INDEX.INFO') }
@ -102,9 +96,7 @@ class WalletsNativeInfo extends React.Component {
<td>
{ translate('INDEX.NOTARIZED') } BTC
</td>
<td>
<span id="kmd_notarizedbtc"></span>
</td>
<td></td>
</tr>
<tr>
<td>{ translate('INDEX.BLOCKS') }</td>

19
react/src/components/dashboard/walletsNativeReceive.js

@ -55,8 +55,7 @@ class WalletsNativeReceive extends React.Component {
</span>
<button
className="btn btn-default btn-xs clipboard-edexaddr margin-left-10"
id="edexcoin_active_addr_clipboard"
onClick={ () => this.copyZAddress(address.address) }><i className="icon wb-copy" aria-hidden="true"></i> { translate('INDEX.COPY') }</button>
onClick={ () => this.copyZAddress(address.address) }><i className="icon wb-copy"></i> { translate('INDEX.COPY') }</button>
</td>
<td>{ type === 'public' ? address.address : address.address.substring(0, 34) + '...' }</td>
<td>{ address.amount }</td>
@ -77,31 +76,27 @@ class WalletsNativeReceive extends React.Component {
this.props.ActiveCoin &&
this.props.ActiveCoin.nativeActiveSection === 'receive') {
return (
<div id="kmd_wallet_recieve">
<div>
<div className="col-xs-12 margin-top-20">
<div className="panel nav-tabs-horizontal">
<div id="kmd_wallet_recieve_section">
<div>
<div className="col-xlg-12 col-lg-12 col-sm-12 col-xs-12">
<div className="panel">
<header className="panel-heading">
<div className="panel-actions">
<div className={ 'dropdown' + (this.state.openDropMenu ? ' open' : '') } onClick={ this.openDropMenu }>
<a
className="dropdown-toggle white btn btn-warning"
id="GetNewRecievingAddress">
<a className="dropdown-toggle white btn btn-warning">
<i className="icon md-arrows margin-right-10"></i> { translate('INDEX.GET_NEW_ADDRESS') } <span className="caret"></span>
</a>
<ul
className="dropdown-menu dropdown-menu-right">
<li>
<a id="kmd_get_new_taddr"
onClick={ () => this.getNewAddress('public') }>
<a onClick={ () => this.getNewAddress('public') }>
<i className="icon fa-eye"></i> { translate('INDEX.TRANSPARENT_ADDRESS') }
</a>
</li>
<li>
<a id="kmd_get_new_zaddr"
onClick={ () => this.getNewAddress('private') }>
<a onClick={ () => this.getNewAddress('private') }>
<i className="icon fa-eye-slash"></i> { translate('INDEX.PRIVATE_Z_ADDRESS') }
</a>
</li>
@ -111,7 +106,7 @@ class WalletsNativeReceive extends React.Component {
<h3 className="panel-title">{ translate('INDEX.RECEIVING_ADDRESS') }</h3>
</header>
<div className="panel-body">
<table className="table table-hover dataTable table-striped" id="kmd-recieve-addr-tbl">
<table className="table table-hover dataTable table-striped">
<thead>
<tr>
<th>{ translate('INDEX.TYPE') }</th>

25
react/src/components/dashboard/walletsNativeSend.js

@ -250,13 +250,13 @@ class WalletsNativeSend extends React.Component {
<div className="col-lg-6 form-group form-material">
<label
className="control-label"
htmlFor="kmd_wallet_sendto">{ translate('INDEX.SEND_TO') } via Openalias address</label>
htmlFor="kmdWalletSendTo">{ translate('INDEX.SEND_TO') } via Openalias address</label>
<input
type="text"
className="form-control"
name="sendToOA"
onChange={ this.updateInput }
id="kmd_wallet_sendto"
id="kmdWalletSendTo"
placeholder="Enter an alias as address@site.com"
autoComplete="off"
required />
@ -265,7 +265,6 @@ class WalletsNativeSend extends React.Component {
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="kmd_wallet_send_coins_btn"
onClick={ this.getOAdress }>
Get address
</button>
@ -294,29 +293,27 @@ class WalletsNativeSend extends React.Component {
<form className="extcoin-send-form" method="post" autoComplete="off">
<div className="row">
<div className="col-xlg-12 form-group form-material">
<label
className="control-label"
htmlFor="kmd_wallet_send_from">{ translate('INDEX.SEND_FROM') }</label>
<label className="control-label">{ translate('INDEX.SEND_FROM') }</label>
{ this.renderAddressList() }
</div>
</div>
{ this.renderOASendUI() }
<div className="row">
<div className="col-xlg-12 form-group form-material">
<label className="control-label" htmlFor="kmd_wallet_sendto">{ translate('INDEX.SEND_TO') }</label>
<label className="control-label" htmlFor="kmdWalletSendTo">{ translate('INDEX.SEND_TO') }</label>
<input
type="text"
className="form-control"
name="sendTo"
onChange={ this.updateInput }
value={ this.state.sendTo }
id="kmd_wallet_sendto"
id="kmdWalletSendTo"
placeholder={ translate('SEND.ENTER_T_OR_Z_ADDR') }
autoComplete="off"
required />
</div>
<div className="col-lg-6 form-group form-material">
<label className="control-label" htmlFor="kmd_wallet_amount" id="kmd_wallet_amount_label">
<label className="control-label" htmlFor="kmdWalletAmount">
{ this.props.ActiveCoin.coin }
</label>
<input
@ -324,18 +321,18 @@ class WalletsNativeSend extends React.Component {
className="form-control"
name="amount"
onChange={ this.updateInput }
id="kmd_wallet_amount"
id="kmdWalletAmount"
placeholder="0.000"
autoComplete="off" />
</div>
<div className="col-lg-6 form-group form-material">
<label className="control-label" htmlFor="kmd_wallet_fee">{ translate('INDEX.FEE') }</label>
<label className="control-label" htmlFor="kmdWalletFee">{ translate('INDEX.FEE') }</label>
<input
type="text"
className="form-control"
name="fee"
onChange={ this.updateInput }
id="kmd_wallet_fee"
id="kmdWalletFee"
placeholder="0.000"
value={ this.state.fee }
autoComplete="off" />
@ -349,7 +346,6 @@ class WalletsNativeSend extends React.Component {
<button
type="button"
className="btn btn-primary waves-effect waves-light pull-right"
id="kmd_wallet_send_coins_btn"
onClick={ this.handleSubmit }
disabled={ !this.state.sendFrom || !this.state.sendTo || !this.state.amount }>
{ translate('INDEX.SEND') } { this.state.amount } { this.props.ActiveCoin.coin }
@ -364,7 +360,7 @@ class WalletsNativeSend extends React.Component {
<div className="col-xs-12">
<div className="row">
<div className="panel nav-tabs-horizontal">
<div id="kmd_wallet_opids_status_section">
<div>
<div className="col-xlg-12 col-lg-12 col-sm-12 col-xs-12">
<div className="panel">
<header className="panel-heading">
@ -373,7 +369,6 @@ class WalletsNativeSend extends React.Component {
<div className="panel-body">
<table
className="table table-hover dataTable table-striped"
id="kmd-opid-status-tbl"
width="100%">
<thead>
<tr>

33
react/src/components/dashboard/walletsNativeSyncProgress.js

@ -6,22 +6,14 @@ class WalletsNativeSyncProgress extends React.Component {
if (this.props.Dashboard.progress.blocks > 0 &&
this.props.Dashboard.progress.longestchain === 0) {
return (
<div
className="progress-bar progress-bar-info progress-bar-striped active full-width font-size-80-percent"
id="extcoin-sync">
<span
id="extcoin-sync-percent"
className="full-width">{ translate('INDEX.SYNC_ERR_LONGESTCHAIN') }</span>
<div className="progress-bar progress-bar-info progress-bar-striped active full-width font-size-80-percent">
<span className="full-width">{ translate('INDEX.SYNC_ERR_LONGESTCHAIN') }</span>
</div>
);
} else if (this.props.Dashboard.progress.blocks === 0) {
return (
<div
className="progress-bar progress-bar-info progress-bar-striped active full-width font-size-80-percent"
id="extcoin-sync">
<span
id="extcoin-sync-percent"
className="full-width">{ translate('INDEX.SYNC_ERR_BLOCKS') }</span>
<div className="progress-bar progress-bar-info progress-bar-striped active full-width font-size-80-percent">
<span className="full-width">{ translate('INDEX.SYNC_ERR_BLOCKS') }</span>
</div>
);
} else {
@ -30,11 +22,8 @@ class WalletsNativeSyncProgress extends React.Component {
return (
<div
className="progress-bar progress-bar-info progress-bar-striped active font-size-80-percent"
style={{ width: syncPercentage }}
id="extcoin-sync">
<span
id="extcoin-sync-percent"
style={{ width: syncPercentage }}>{ syncPercentage }</span> | <span id="extcoin-synced-blocks">{ this.props.Dashboard.progress.blocks }</span> / <span id="extcoin-longestchain">{ this.props.Dashboard.progress.longestchain }</span> | { translate('INDEX.CONNECTIONS') }: <span id="extcoin-connections">{ this.props.Dashboard.progress.connections }</span>
style={{ width: syncPercentage }}>
<span style={{ width: syncPercentage }}>{ syncPercentage }</span> | { this.props.Dashboard.progress.blocks } / { this.props.Dashboard.progress.longestchain } | { translate('INDEX.CONNECTIONS') }: { this.props.Dashboard.progress.connections }
</div>
);
}
@ -57,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 (
<span id="activating-komodod-tridot">...</span>
<span>...</span>
);
}
}
@ -78,16 +67,14 @@ class WalletsNativeSyncProgress extends React.Component {
if ((this.props.Dashboard.progress.blocks < this.props.Dashboard.progress.longestchain) ||
this.props.Dashboard.progress.remoteKMDNode) {
return (
<div
className="alert alert-info alert-dismissible margin-bottom-40"
id="extcoin-wallet-activating-alert">
<div className="alert alert-info alert-dismissible margin-bottom-40">
<button className="close" type="button">
<span>×</span>
</button>
<h4>
{ translate('INDEX.ACTIVATING_CHAIN') }{ this.renderActivatingBestChainProgress() }
</h4>
<p id="extcoin-wallet-connection-alert-text">{ this.renderLB('INDEX.KMD_STARTED') }</p>
<p>{ this.renderLB('INDEX.KMD_STARTED') }</p>
</div>
);
} else {
@ -103,7 +90,7 @@ class WalletsNativeSyncProgress extends React.Component {
<div>
{ this.renderChainActivationNotification() }
<div className="row sync-progress-container">
<div className="col-xs-12" id="extcoin-progressbars">
<div className="col-xs-12">
<div className="progress">
{ this.renderSyncPercentagePlaceholder() }
</div>

24
react/src/components/dashboard/walletsNativeTxHistory.js

@ -139,7 +139,7 @@ class WalletsNativeTxHistory extends React.Component {
this.props.ActiveCoin.txhistory !== 'loading' &&
this.props.ActiveCoin.txhistory.length > 10) {
return (
<div className="dataTables_length" id="kmd-tx-history-tbl_length">
<div className="dataTables_length">
<label>
{ translate('INDEX.SHOW') }&nbsp;
<select
@ -171,22 +171,16 @@ class WalletsNativeTxHistory extends React.Component {
return (
<div className="row unselectable">
<div className="col-sm-5">
<div
className="dataTables_info"
id="kmd-tx-history-tbl_info">{ translate('INDEX.SHOWING') } { _paginationStart } { translate('INDEX.TO') } { _paginationEnd } { translate('INDEX.OF') } { this.props.ActiveCoin.txhistory.length } { translate('INDEX.ENTRIES_SM') }</div>
<div className="dataTables_info">{ translate('INDEX.SHOWING') } { _paginationStart } { translate('INDEX.TO') } { _paginationEnd } { translate('INDEX.OF') } { this.props.ActiveCoin.txhistory.length } { translate('INDEX.ENTRIES_SM') }</div>
</div>
<div className="col-sm-7">
<div className="dataTables_paginate paging_simple_numbers" id="kmd-tx-history-tbl_paginate">
<div className="dataTables_paginate paging_simple_numbers">
<ul className="pagination">
<li
className={ this.state.activePage === 1 ? 'paginate_button previous disabled' : 'paginate_button previous' }
id="kmd-tx-history-tbl_previous">
<li className={ this.state.activePage === 1 ? 'paginate_button previous disabled' : 'paginate_button previous' }>
<a onClick={ () => this.updateCurrentPage(this.state.activePage - 1) }>{ translate('INDEX.PREVIOUS') }</a>
</li>
{this.renderPaginationItems()}
<li
className={ _paginationNextState ? 'paginate_button next disabled' : 'paginate_button next' }
id="kmd-tx-history-tbl_next">
<li className={ _paginationNextState ? 'paginate_button next disabled' : 'paginate_button next' }>
<a onClick={ () => this.updateCurrentPage(this.state.activePage + 1) }>{ translate('INDEX.NEXT') }</a>
</li>
</ul>
@ -248,10 +242,10 @@ class WalletsNativeTxHistory extends React.Component {
this.props.ActiveCoin.nativeActiveSection === 'default') {
return (
<div className="native-transactions">
<div id="kmd_wallet_dashboardinfo">
<div>
<div className="col-xs-12 margin-top-20">
<div className="panel nav-tabs-horizontal">
<div id="kmd_wallet_dashoard_section">
<div>
<div className="col-xlg-12 col-lg-12 col-sm-12 col-xs-12">
<div className="panel">
<header className="panel-heading">
@ -263,7 +257,7 @@ class WalletsNativeTxHistory extends React.Component {
{ this.renderPaginationItemsPerPageSelector() }
</div>
<div className="col-sm-6">
<div id="kmd-tx-history-tbl_filter" className="dataTables_filter">
<div className="dataTables_filter">
<label>
{ translate('INDEX.SEARCH') }: <input type="search" className="form-control input-sm" disabled="true" />
</label>
@ -271,7 +265,7 @@ class WalletsNativeTxHistory extends React.Component {
</div>
</div>
<div className="row">
<table className="table table-hover dataTable table-striped" id="kmd-tx-history-tbl" width="100%">
<table className="table table-hover dataTable table-striped" width="100%">
<thead>
<tr>
<th>{ translate('INDEX.TYPE') }</th>

18
react/src/components/dashboard/walletsNativeTxInfo.js

@ -67,9 +67,7 @@ class WalletsNativeTxInfo extends React.Component {
</ul>
<div className="panel-body">
<div className="tab-content">
<div
className={ this.state.activeTab === 0 ? 'tab-pane active' : 'tab-pane' }
id="KmdTxIDInfotab1">
<div className={ this.state.activeTab === 0 ? 'tab-pane active' : 'tab-pane' }>
<table className="table table-striped">
<tbody>
<tr>
@ -135,9 +133,7 @@ class WalletsNativeTxInfo extends React.Component {
</tbody>
</table>
</div>
<div
className={ this.state.activeTab === 1 ? 'tab-pane active' : 'tab-pane' }
id="KmdTxIDInfotab2">
<div className={ this.state.activeTab === 1 ? 'tab-pane active' : 'tab-pane' }>
<table className="table table-striped">
<tbody>
<tr>
@ -155,21 +151,15 @@ class WalletsNativeTxInfo extends React.Component {
</tbody>
</table>
</div>
<div
className={ this.state.activeTab === 2 ? 'tab-pane active' : 'tab-pane' }
id="KmdTxIDInfotab3">
<div className={ this.state.activeTab === 2 ? 'tab-pane active' : 'tab-pane' }>
<textarea
id="kmd_txid_info_hex"
className="full-width height-170"
rows="10"
cols="80"
defaultValue={ txInfo.hex } disabled></textarea>
</div>
<div
className={ this.state.activeTab === 3 ? 'tab-pane active' : 'tab-pane' }
id="KmdTxIDInfotab4">
<div className={ this.state.activeTab === 3 ? 'tab-pane active' : 'tab-pane' }>
<textarea
id="kmd_txid_info_hex"
className="full-width height-400"
rows="40"
cols="80"

9
react/src/components/dashboard/walletsNav.js

@ -54,7 +54,7 @@ class WalletsNav extends React.Component {
!this.props.ActiveCoin.coin) {
return (
<div>
<div className="col-xs-12 padding-top-20" id="no_wallet_selected">
<div className="col-xs-12 padding-top-20">
<div className="alert alert-info alert-dismissible">
<button type="button" className="close"></button>
<span className="font-size-24 text-align-center">
@ -74,28 +74,25 @@ class WalletsNav extends React.Component {
id="header-dashboard"
style={{ marginBottom: this.props.ActiveCoin.mode === 'basilisk' ? '30px' : '0' }}>
<ol className="breadcrumb">
<strong>{ translate('INDEX.MY') } <span id="edexcoin-active">{ this.props && this.props.ActiveCoin ? this.props.ActiveCoin.coin : '-' }</span> { translate('INDEX.ADDRESS') }: </strong> <span id="edexcoin_active_addr">{ this.props && this.props.Dashboard && this.props.Dashboard.activeHandle ? this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] : '-' }</span> <button className="btn btn-default btn-xs clipboard-edexaddr" id="edexcoin_active_addr_clipboard" onClick={ () => this.copyMyAddress(this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin]) }><i className="icon wb-copy"></i> { translate('INDEX.COPY') }</button>
<strong>{ translate('INDEX.MY') } { this.props && this.props.ActiveCoin ? this.props.ActiveCoin.coin : '-' } { translate('INDEX.ADDRESS') }: </strong> { this.props && this.props.Dashboard && this.props.Dashboard.activeHandle ? this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] : '-' } <button className="btn btn-default btn-xs clipboard-edexaddr" onClick={ () => this.copyMyAddress(this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin]) }><i className="icon wb-copy"></i> { translate('INDEX.COPY') }</button>
</ol>
<div className="page-header-actions" id="edexcoin-actions">
<div className="page-header-actions">
<div id="kmd_header_button">
<button
type="button"
className="btn btn-dark waves-effect waves-light"
id="btn_edexcoin_dashboard"
onClick={ this.toggleSendReceiveCoinForms }>
<i className="icon md-view-dashboard"></i> { this.props.ActiveCoin.mode !== 'native' ? translate('INDEX.DASHBOARD') : translate('INDEX.WALLET_INFO') }
</button>
<button
type="button"
className="btn btn-primary waves-effect waves-light"
id="btn_edexcoin_send"
onClick={ () => this.toggleSendCoinForm(!this.props.ActiveCoin.send) }>
<i className="icon fa-send"></i> { translate('INDEX.SEND') }
</button>
<button
type="button"
className="btn btn-info waves-effect waves-light"
id="btn_edexcoin_recieve"
onClick={ () => this.toggleReceiveCoinForm(!this.props.ActiveCoin.receive) }>
<i className="icon fa-inbox"></i> { translate('INDEX.RECEIVE') }
</button>

26
react/src/components/dashboard/walletsProgress.js

@ -34,42 +34,36 @@ class WalletsProgress extends React.Component {
<div className="row no-space">
<div id="currency-progressbars">
<div className="progress progress-sm">
<div
className={ 'full-width font-size-80-percent ' + (this.isFullySynced() ? 'progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success' : 'hide') }
id="currency-bundles">
<div className={ 'full-width font-size-80-percent ' + (this.isFullySynced() ? 'progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success' : 'hide') }>
{ translate('INDEX.BUNDLES') } <span id="currency-bundles-percent">({ this.props.ActiveCoin.coin }) 100.00% - ( { this.props.Dashboard.progress.blocks } / { this.props.Dashboard.progress.blocks } ) ==&gt;&gt; RT{ this.props.Dashboard.progress.RTheight }</span>
</div>
<div
className={ 'font-size-80-percent ' + (this.isFullySynced() ? 'hide' : 'progress-bar progress-bar-info progress-bar-striped active') }
style={{ width: this.props.Dashboard.progress.bundles + '%' }}
id="currency-bundles">
{ translate('INDEX.BUNDLES') } <span id="currency-bundles-percent">{ this.props.Dashboard.progress.bundles }%</span>
style={{ width: this.props.Dashboard.progress.bundles + '%' }}>
{ translate('INDEX.BUNDLES') } { this.props.Dashboard.progress.bundles }%
</div>
</div>
</div>
<div id="additional-progress-bars" className={ this.isFullySynced() ? 'hide' : '' }>
<div className={ this.isFullySynced() ? 'hide' : '' }>
<div className="progress progress-sm">
<div
className="progress-bar progress-bar-warning progress-bar-striped active font-size-80-percent"
style={{ width: this.props.Dashboard.progress.utxo + '%' }}
id="currency-utxo">
utxo <span id="currency-utxo-percent">{ this.props.Dashboard.progress.utxo }%</span>
style={{ width: this.props.Dashboard.progress.utxo + '%' }}>
utxo { this.props.Dashboard.progress.utxo }%
</div>
</div>
<div className="progress progress-sm">
<div
className="progress-bar progress-bar-danger progress-bar-striped active font-size-80-percent"
style={{ width: this.props.Dashboard.progress.balances + '%' }}
id="currency-balances">
{ translate('INDEX.BALANCES') } <span id="currency-balances-percent">{ this.props.Dashboard.progress.balances }%</span>
style={{ width: this.props.Dashboard.progress.balances + '%' }}>
{ translate('INDEX.BALANCES') } { this.props.Dashboard.progress.balances }%
</div>
</div>
<div className="progress progress-sm">
<div
className="progress-bar progress-bar-success progress-bar-striped active font-size-80-percent"
style={{ width: this.props.Dashboard.progress.validated + '%' }}
id="currency-validated">
{ translate('INDEX.VALIDATED') } <span id="currency-validated-percent">{ this.props.Dashboard.progress.validated }%</span>
style={{ width: this.props.Dashboard.progress.validated + '%' }}>
{ translate('INDEX.VALIDATED') } { this.props.Dashboard.progress.validated }%
</div>
</div>
</div>

9
react/src/components/dashboard/walletsTxInfo.js

@ -56,9 +56,7 @@ class WalletsTxInfo extends React.Component {
</ul>
<div className="panel-body">
<div className="tab-content">
<div
className={ this.state.activeTab === 0 ? 'tab-pane active' : 'tab-pane' }
id="KmdTxIDInfotab1">
<div className={ this.state.activeTab === 0 ? 'tab-pane active' : 'tab-pane' }>
<table className="table table-striped">
<tbody>
<tr>
@ -106,11 +104,8 @@ class WalletsTxInfo extends React.Component {
</tbody>
</table>
</div>
<div
className={ this.state.activeTab === 1 ? 'tab-pane active' : 'tab-pane' }
id="KmdTxIDInfotab4">
<div className={ this.state.activeTab === 1 ? 'tab-pane active' : 'tab-pane' }>
<textarea
id="kmd_txid_info_hex"
className="full-width height-400"
rows="40"
cols="80"

26
react/src/components/login/login.js

@ -190,7 +190,7 @@ class Login extends React.Component {
render() {
if ((this.state && this.state.display) || !this.props.Main) {
return (
<div id="wallet-login">
<div>
{ this.renderSwallModal() }
<div className="page animsition vertical-align text-center fade-in">
<div className="page-content vertical-align-middle">
@ -204,13 +204,13 @@ class Login extends React.Component {
</span>
</div>
<div id="section-ie-warning" className={ this.state.activeLoginSection === 'ieWarning' ? 'show' : 'hide' }>
<div className={ this.state.activeLoginSection === 'ieWarning' ? 'show' : 'hide' }>
<div className="panel">
<div className="panel-heading">
<h3 className="panel-title">{ translate('INDEX.UNSUPPORTED_BROWSER') }</h3>
</div>
<div className="alert alert-danger alert-dismissible" role="alert">
<button type="button" className="close">
<div className="alert alert-danger alert-dismissible">
<button type="button">
<span>&times;</span>
<span className="sr-only">{ translate('INDEX.CLOSE') }</span>
</button>
@ -230,15 +230,14 @@ class Login extends React.Component {
</div>
</div>
<div id="section-login" className={ this.state.activeLoginSection === 'login' ? 'show' : 'hide' }>
<h4 className="color-white" id="login-welcome">{translate('INDEX.WELCOME_LOGIN')}</h4>
<div className={ this.state.activeLoginSection === 'login' ? 'show' : 'hide' }>
<h4 className="color-white">{translate('INDEX.WELCOME_LOGIN')}</h4>
<div className="login-form">
<div className="form-group form-material floating">
<input
type={ this.state.seedInputVisibility ? 'text' : 'password' }
className="form-control"
name="loginPassphrase"
id="password"
onChange={ this.updateInput }
onKeyDown={ (event) => this.handleKeydown(event) } />
<i
@ -249,7 +248,6 @@ class Login extends React.Component {
<button
type="button"
className="btn btn-primary btn-block"
id="loginbtn"
onClick={ this.loginSeed }
disabled={ !this.state.loginPassphrase || !this.state.loginPassphrase.length }>{ translate('INDEX.SIGN_IN') }</button>
<div className="form-group form-material floating">
@ -271,15 +269,12 @@ class Login extends React.Component {
</div>
</div>
<div
id="section-login-addcoin-btn"
className={ this.state.activeLoginSection === 'activateCoin' ? 'show' : 'hide' }>
<h4 className="color-white" id="login-welcome">{ translate('INDEX.WELCOME_PLEASE_ADD') }</h4>
<div className={ this.state.activeLoginSection === 'activateCoin' ? 'show' : 'hide' }>
<h4 className="color-white">{ translate('INDEX.WELCOME_PLEASE_ADD') }</h4>
<div
className="form-group form-material floating width-540 vertical-margin-30 horizontal-margin-0">
<button
className="btn btn-lg btn-primary btn-block ladda-button"
id="start-coin-login"
onClick={ this.toggleActivateCoinForm }
disabled={ !this.props.Main }>
<span className="ladda-label">{ translate('INDEX.ACTIVATE_COIN') }</span>
@ -287,9 +282,7 @@ class Login extends React.Component {
</div>
</div>
<div
id="section-register"
className={ this.state.activeLoginSection === 'signup' ? 'show' : 'hide' }>
<div className={ this.state.activeLoginSection === 'signup' ? 'show' : 'hide' }>
<div className="register-form">
<h4 className="hint color-white">
{ translate('INDEX.SELECT_SEED_TYPE') }:
@ -344,7 +337,6 @@ class Login extends React.Component {
</div>
<button
type="button"
id="register-submit-btn"
className="btn btn-primary btn-block"
onClick={ this.handleRegisterWallet }>{ translate('INDEX.REGISTER') }</button>
<div className="form-group form-material floating">

4
react/src/components/overrides.scss

@ -549,4 +549,8 @@ input:checked + .slider:before {
.bootstrap-select > .dropdown-toggle {
z-index: 0;
}
select.form-control.form-material {
color: #757575;
}
Loading…
Cancel
Save