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

Merge pull request #4558 from gabrielbazan7/fix/EncryptedWalletHandler

Browse source 
fix wallet encrypted handler and rename BwsError service to BwcError
This commit is contained in:
Gustavo Maximiliano Cortez 2016-07-12 10:18:29 -03:00 • committed by GitHub
commit eb014927a4
14 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/index.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, $ionicSideMenuDelegate, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwsError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, openURLService, ongoingProcess) {
angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, $ionicSideMenuDelegate, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwcError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, openURLService, ongoingProcess) {
var self = this;
var SOFT_CONFIRMATION_LIMIT = 12;
var errors = bwcService.getErrors();
@ -295,7 +295,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
twoStep: true
}, function(err, ret) {
if (err) {
self.updateError = bwsError.msg(err, gettext('Could not update Wallet'));
self.updateError = bwcError.msg(err, gettext('Could not update Wallet'));
} else {
self.isSingleAddress = !!ret.wallet.singleAddress;
if (!opts.quiet)
@ -428,7 +428,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
} else {
var msg = ""
$scope.$emit('Local/ClientError', (err.error ? err.error : err));
var msg = bwsError.msg(err, gettext('Error at Wallet Service'));
var msg = bwcError.msg(err, gettext('Error at Wallet Service'));
self.showErrorPopup(msg);
}
};