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

Merge pull request #4417 from cmgustavo/bug/qr-scan-notification 

Not show error when fetching paypro after qr scan
This commit is contained in:
Matias Alejo Garcia 2016-06-15 15:10:06 -03:00 committed by GitHub
parent 1d592e6299 07909b5075
commit 1415bffe94
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/controllers/walletHome.js
View File

@ -36,7 +36,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$rootScope.$emit('Local/SetTab', 'send'); $rootScope.$emit('Local/SetTab', 'send');
var form = $scope.sendForm; var form = $scope.sendForm;
if (form.address.$invalid && !self.blockUx) { if (form.address.$invalid && !ongoingProcess.get('fetchingPayPro')) {
self.resetForm(); self.resetForm();
self.error = gettext('Could not recognize a valid Bitcoin QR Code'); self.error = gettext('Could not recognize a valid Bitcoin QR Code');
} }

4
src/js/services/onGoingProcess.js
View File

@ -34,6 +34,10 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
ongoingProcess = {}; ongoingProcess = {};
}; };
root.get = function(processName) {
return ongoingProcess[processName];
};
root.set = function(processName, isOn) { root.set = function(processName, isOn) {
$log.debug('ongoingProcess', processName, isOn); $log.debug('ongoingProcess', processName, isOn);
root[processName] = isOn; root[processName] = isOn;