anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7 from cmgustavo/ref/design-05

Browse source 
Fix bitpayCard and buyAmazon
This commit is contained in:
Matias Alejo Garcia 2016-08-29 19:16:52 -03:00 • committed by GitHub
commit 2110b150df
3 changed files with 8 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/modals/tx-status.html
View file

@ -13,7 +13,7 @@
</div> </div>
<div ng-if="type == 'created'" class="popup-txsigned m30tp"> <div ng-if="type == 'created'" class="popup-txsigned text-center m30tp">
<i class="icon ion-checkmark-round"></i> <i class="icon ion-checkmark-round"></i>
<div class="text-center size-18 tu text-bold m20t"> <div class="text-center size-18 tu text-bold m20t">
<span translate>Payment Proposal Created</span> <span translate>Payment Proposal Created</span>
@ -25,7 +25,7 @@
<div ng-if="type == 'accepted'" class="popup-txsigned m30tp"> <div ng-if="type == 'accepted'" class="popup-txsigned text-center m30tp">
<i class="icon ion-checkmark-round"></i> <i class="icon ion-checkmark-round"></i>
<div class="text-center size-18 tu text-bold m20t"> <div class="text-center size-18 tu text-bold m20t">
<span translate>Payment Accepted</span> <span translate>Payment Accepted</span>
@ -35,7 +35,7 @@
</div> </div>
</div> </div>
<div ng-if="type=='rejected'" class="popup-txrejected m30tp"> <div ng-if="type=='rejected'" class="popup-txrejected text-center m30tp">
<i class="icon ion-close-round"></i> <i class="icon ion-close-round"></i>
<div class="text-center size-18 tu text-bold m20t"> <div class="text-center size-18 tu text-bold m20t">
<span translate>Payment Rejected</span> <span translate>Payment Rejected</span>

2
src/js/controllers/bitpayCard.js
View file

@ -184,7 +184,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
}); });
return; return;
} }
walletService.publishAndSign(createdTxp, function(err, tx) { walletService.publishAndSign(wallet, createdTxp, function(err, tx) {
if (err) { if (err) {
self.error = err; self.error = err;
$timeout(function() { $timeout(function() {

57
src/js/controllers/buyAmazon.js
View file

@ -139,10 +139,13 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
}); });
return; return;
} }
self.confirmTx(createdTxp, function(err, tx) { walletService.publishAndSign(wallet, createdTxp, function(err, tx) {
if (err) { if (err) {
ongoingProcess.set('Processing Transaction...', false); ongoingProcess.set('Processing Transaction...', false);
self.error = bwcError.msg(err); self.error = bwcError.msg(err);
walletService.removeTx(wallet, tx, function(err) {
if (err) $log.debug(err);
});
$timeout(function() { $timeout(function() {
$scope.$digest(); $scope.$digest();
}); });
@ -223,56 +226,4 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
}); });
}; };
this.confirmTx = function(txp, cb) {
fingerprintService.check(wallet, function(err) {
if (err) {
$log.debug(err);
return cb(err);
}
walletService.handleEncryptedWallet(wallet, function(err) {
if (err) {
$log.debug(err);
return bwcError.cb(err, null, cb);
}
ongoingProcess.set('Processing Transaction...', true);
walletService.publishTx(wallet, txp, function(err, publishedTxp) {
if (err) {
$log.debug(err);
return bwcError.cb(err, null, cb);
}
walletService.signTx(wallet, publishedTxp, function(err, signedTxp) {
if (err) {
$log.debug(err);
walletService.removeTx(wallet, signedTxp, function(err) {
if (err) $log.debug(err);
});
return bwcError.cb(err, null, cb);
}
if (signedTxp.status == 'accepted') {
walletService.broadcastTx(wallet, signedTxp, function(err, broadcastedTxp) {
if (err) {
$log.debug(err);
walletService.removeTx(wallet, broadcastedTxp, function(err) {
if (err) $log.debug(err);
});
return bwcError.cb(err, null, cb);
}
$timeout(function() {
return cb(null, broadcastedTxp);
}, 5000);
});
} else {
$timeout(function() {
return cb(null, signedTxp);
}, 5000);
}
});
});
});
});
};
}); });