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

Merge pull request #5261 from JDonadio/andy/bug/wallet-service-errors 

Wallet service errors
This commit is contained in:
Gabriel Edgardo Bazán 2016-12-19 22:50:08 +02:00 committed by GitHub
parent e572b80ee1 645fc8444a
commit 595272bb45
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/controllers/walletDetails.js
View File

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window) {
angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window, bwcError, gettextCatalog) {
var HISTORY_SHOW_LIMIT = 10;
var currentTxHistoryPage = 0;
@ -60,7 +60,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
if (err === 'WALLET_NOT_REGISTERED') {
$scope.walletNotRegistered = true;
} else {
$scope.updateStatusError = err;
$scope.updateStatusError = bwcError.msg(err, gettextCatalog.getString('BWS Error'));
}
$scope.status = null;
} else {

1
src/js/services/walletService.js
View File

@ -146,6 +146,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
}
return cb(err);
}
return cb(null, ret);
});
};