Merge branch 'master' into feat/bitpay-accounts

This commit is contained in:
Andy Phillipson 2017-02-09 13:13:20 -05:00
commit 7a2d386f34
6 changed files with 19 additions and 36 deletions

View file

@ -22,7 +22,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController', functio
var showError = function(msg, err) {
$scope.sendStatus = '';
$log.error(err);
err = err && err.errors ? err.errors[0].message : err;
err = err && err.errors ? err.errors[0].message : (err || '');
popupService.showAlert(msg, err);
};