Browse Source

basilisk send btn lift balance gt 0 condition

all-modes
pbca26 8 years ago
parent
commit
dacdab347c
  1. 17
      assets/mainWindow/js/loading.js
  2. 4
      react/src/actions/actions/jumblr.js
  3. 2
      react/src/components/dashboard/walletsNav/walletsNav.render.js

17
assets/mainWindow/js/loading.js

@ -191,10 +191,8 @@ function startKMDPassive() {
window.startKMDNative('KMD', true); window.startKMDNative('KMD', true);
setTimeout(function() { window.createWindow('open');
window.createWindow('open'); window.hide();
window.hide();
}, 1000);
} }
function closeMainWindow(isKmdOnly, isCustom) { function closeMainWindow(isKmdOnly, isCustom) {
@ -206,12 +204,15 @@ function closeMainWindow(isKmdOnly, isCustom) {
if (!isCustom) { if (!isCustom) {
window.startKMDNative(isKmdOnly ? 'KMD' : null); window.startKMDNative(isKmdOnly ? 'KMD' : null);
setTimeout(function() {
window.createWindow('open');
window.hide();
}, 3000);
} }
setTimeout(function() { window.createWindow('open');
window.createWindow('open'); window.hide();
window.hide();
}, 3000);
} }
function quitApp() { function quitApp() {

4
react/src/actions/actions/jumblr.js

@ -117,7 +117,7 @@ function dumpPrivkey(coin, key) {
}); });
} }
export function importPrivkey(coin, key) { export function importPrivkey(coin, key, rescan = false) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const payload = { const payload = {
mode: null, mode: null,
@ -126,7 +126,7 @@ export function importPrivkey(coin, key) {
params: [ params: [
key, key,
'', '',
false rescan
], ],
}; };

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

@ -52,7 +52,7 @@ export const WalletsNavWithWalletRender = function() {
onClick={ this.props.ActiveCoin.mode !== 'native' ? this.toggleSendReceiveCoinForms : this.toggleNativeWalletTransactions }> onClick={ this.props.ActiveCoin.mode !== 'native' ? this.toggleSendReceiveCoinForms : this.toggleNativeWalletTransactions }>
<i className="icon md-view-dashboard"></i> { translate('INDEX.TRANSACTIONS') } <i className="icon md-view-dashboard"></i> { translate('INDEX.TRANSACTIONS') }
</button> </button>
{ this.checkTotalBalance() > 0 && { ((this.props.ActiveCoin.mode === 'full' && this.checkTotalBalance() > 0) || this.props.ActiveCoin.mode === 'basilisk') &&
<button <button
type="button" type="button"
className="btn btn-primary waves-effect waves-light" className="btn btn-primary waves-effect waves-light"

Loading…
Cancel
Save