Browse Source

fixed received ui position issue in native

all-modes
pbca26 8 years ago
parent
commit
a4faf935db
  1. 2
      react/src/components/dashboard/main/dashboard.render.js
  2. 11
      react/src/components/dashboard/receiveCoin/receiveCoin.render.js
  3. 2
      react/src/components/dashboard/walletsNative/walletsNative.render.js

2
react/src/components/dashboard/main/dashboard.render.js

@ -29,7 +29,7 @@ const DashboardRender = function() {
{ !this.isNativeMode() && <WalletsProgress {...this.props} /> }
{ !this.isNativeMode() && <WalletsBalance {...this.props} />}
<SendCoin {...this.props} />
<ReceiveCoin {...this.props.ActiveCoin} />
{ !this.isNativeMode() && <ReceiveCoin {...this.props.ActiveCoin} /> }
<WalletsData {...this.props} />
<WalletsTxInfo {...this.props} />
<WalletsNative {...this.props} />

11
react/src/components/dashboard/receiveCoin/receiveCoin.render.js

@ -73,8 +73,7 @@ export const ReceiveCoinRender = function() {
onClick={ this.openDropMenu }>
<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>
<span className="caret"></span>
</a>
<ul
className="dropdown-menu dropdown-menu-right">
@ -97,7 +96,7 @@ export const ReceiveCoinRender = function() {
<div className="panel-body">
<table className="table table-hover dataTable table-striped">
<thead>
{this.isNativeMode() ?
{ this.isNativeMode() ?
<tr>
<th>{ translate('INDEX.TYPE') }</th>
<th>{ translate('INDEX.ADDRESS') }</th>
@ -113,11 +112,11 @@ export const ReceiveCoinRender = function() {
}
</thead>
<tbody>
{this.renderAddressList('public')}
{this.isNativeMode() && this.renderAddressList('private')}
{ this.renderAddressList('public') }
{ this.isNativeMode() && this.renderAddressList('private') }
</tbody>
<tfoot>
{this.isNativeMode() ?
{ this.isNativeMode() ?
<tr>
<th>{ translate('INDEX.TYPE') }</th>
<th>{ translate('INDEX.ADDRESS') }</th>

2
react/src/components/dashboard/walletsNative/walletsNative.render.js

@ -4,6 +4,7 @@ import WalletsNativeInfo from '../walletsNativeInfo/walletsNativeInfo';
import WalletsNativeSend from '../walletsNativeSend/walletsNativeSend';
import WalletsProgress from '../walletsProgress/walletsProgress';
import WalletsNativeTxHistory from '../walletsNativeTxHistory/walletsNativeTxHistory';
import ReceiveCoin from '../receiveCoin/receiveCoin';
const WalletsNativeRender = function() {
return (
@ -28,6 +29,7 @@ const WalletsNativeRender = function() {
<WalletsProgress {...this.props} />
<div className="row">
<WalletsBalance {...this.props} />
<ReceiveCoin {...this.props.ActiveCoin} />
<WalletsNativeTxHistory {...this.props} />
<WalletsNativeSend {...this.props} />
<WalletsNativeInfo {...this.props} />

Loading…
Cancel
Save