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

Merge pull request #2524 from cmgustavo/bug/wp8-14 

Fixes scanning paypro twice on WP
This commit is contained in:
Matias Alejo Garcia 2015-04-16 09:43:39 -03:00
parent b0778e5f1e dff52e3b88
commit 9457fab3a9
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/js/controllers/send.js
View File

@ -337,27 +337,29 @@ angular.module('copayApp.controllers').controller('sendController',
var self = this; var self = this;
$log.debug('Fetch PayPro Request...', uri); $log.debug('Fetch PayPro Request...', uri);
fc.fetchPayPro({ $timeout(function() {
payProUrl: uri, fc.fetchPayPro({
}, function(err, paypro) { payProUrl: uri,
$log.debug(paypro); }, function(err, paypro) {
self.blockUx = false; $log.debug(paypro);
self.fetchingURL = null; self.blockUx = false;
self.fetchingURL = null;
if (err) { if (err) {
$log.warn(err); $log.warn(err);
self.resetForm(form); self.resetForm(form);
var msg = err.toString(); var msg = err.toString();
if (msg.match('HTTP')) { if (msg.match('HTTP')) {
msg = 'Could not fetch payment information'; msg = 'Could not fetch payment information';
}
self.error = msg;
} else {
self._paypro = paypro;
self.setForm(paypro.toAddress, (paypro.amount * satToUnit).toFixed(self.unitDecimals),
paypro.memo);
} }
self.error = msg; });
} else { }, 1);
self._paypro = paypro;
self.setForm(paypro.toAddress, (paypro.amount * satToUnit).toFixed(self.unitDecimals),
paypro.memo);
}
});
}; };
this.setFromUri = function(uri) { this.setFromUri = function(uri) {