BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8072 from gabrielbazan7/fix/creatingTxprocess 

FIX: remove on going process if err
This commit is contained in:
Gustavo Maximiliano Cortez 2018-02-19 16:34:58 -03:00 committed by GitHub
parent 1cf98783b0 ae47d51a0b
commit f737164be7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/send/confirm/confirm.ts
View File

@ -573,8 +573,10 @@ export class ConfirmPage {
if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { if (!wallet.canSign() && !wallet.isPrivKeyExternal()) {
this.logger.info('No signing proposal: No private key'); this.logger.info('No signing proposal: No private key');
this.walletProvider.onlyPublish(wallet, txp).then(() => { this.walletProvider.onlyPublish(wallet, txp).then(() => {
this.onGoingProcessProvider.clear();
this.openSuccessModal(true); this.openSuccessModal(true);
}).catch((err: any) => { }).catch((err: any) => {
this.onGoingProcessProvider.clear();
this.setSendError(err); this.setSendError(err);
}); });
return; return;
@ -595,15 +597,13 @@ export class ConfirmPage {
confirmTx().then((nok: boolean) => { confirmTx().then((nok: boolean) => {
if (nok) { if (nok) {
this.onGoingProcessProvider.clear();
return; return;
} }
publishAndSign(); publishAndSign();
}).catch((err: any) => {
this.logger.warn(err);
return;
}); });
}).catch((err: any) => { }).catch((err: any) => {
this.onGoingProcessProvider.set('creatingTx', false); this.onGoingProcessProvider.clear();
this.logger.warn(err); this.logger.warn(err);
return; return;
}); });

4
src/providers/wallet/wallet.ts
View File

@ -1159,11 +1159,9 @@ export class WalletProvider {
this.ongoingProcessProvider.set('sendingTx', true); this.ongoingProcessProvider.set('sendingTx', true);
this.publishTx(wallet, txp).then((publishedTxp) => { this.publishTx(wallet, txp).then((publishedTxp) => {
this.invalidateCache(wallet); this.invalidateCache(wallet);
this.ongoingProcessProvider.set('sendingTx', false);
this.events.publish('Local/TxAction', wallet.id); this.events.publish('Local/TxAction', wallet.id);
return resolve(); return resolve();
}).catch((err) => { }).catch((err) => {
this.ongoingProcessProvider.set('sendingTx', false);
return reject(this.bwcErrorProvider.msg(err)); return reject(this.bwcErrorProvider.msg(err));
}); });
}); });
@ -1225,6 +1223,7 @@ export class WalletProvider {
return reject(err); return reject(err);
}); });
}).catch((err) => { }).catch((err) => {
this.ongoingProcessProvider.clear();
return reject(this.bwcErrorProvider.msg(err)); return reject(this.bwcErrorProvider.msg(err));
}); });
} else { } else {
@ -1241,6 +1240,7 @@ export class WalletProvider {
return reject(this.bwcErrorProvider.msg(err)); return reject(this.bwcErrorProvider.msg(err));
}); });
}).catch((err) => { }).catch((err) => {
this.ongoingProcessProvider.clear();
return reject(this.bwcErrorProvider.msg(err)); return reject(this.bwcErrorProvider.msg(err));
}); });
}; };