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

Merge pull request #4914 from gabrielbazan7/fix/alertMessage

Browse source 
fix alert messages
This commit is contained in:
Gustavo Maximiliano Cortez 2016-10-27 10:23:11 -03:00 • committed by GitHub
commit 194ff49ef8
11 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/controllers/confirm.js
View file

@ -28,7 +28,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if ($scope.paypro) {
return setFromPayPro($scope.paypro, function(err) {
if (err && !isChromeApp) {
popupService.showAlert(gettext('Could not fetch payment'));
popupService.showAlert(gettextCatalog.getString('Error'), gettext('Could not fetch payment'));
}
});
}
@ -162,7 +162,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (!wallet) return cb();
if (isChromeApp) {
popupService.showAlert(gettextCatalog.getString('Payment Protocol not supported on Chrome App'));
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Payment Protocol not supported on Chrome App'));
return cb(true);
}
@ -181,13 +181,13 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (msg.match('HTTP')) {
msg = gettextCatalog.getString('Could not fetch payment information');
}
popupService.showAlert(msg);
popupService.showAlert(gettextCatalog.getString('Error'), msg);
return cb(true);
}
if (!paypro.verified) {
$log.warn('Failed to verify payment protocol signatures');
popupService.showAlert(gettextCatalog.getString('Payment Protocol Invalid'));
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Payment Protocol Invalid'));
return cb(true);
}
@ -341,7 +341,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.approve = function(onSendStatusChange) {
if ($scope._paypro && $scope.paymentExpired.value) {
popupService.showAlert(null, gettextCatalog.getString('The payment request has expired'));
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('The payment request has expired'));
$scope.sendStatus = '';
$timeout(function() {
$scope.$apply();