From 09ba421eea892365373b4b8908729e1919474016 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 16 Dec 2016 11:00:48 -0300 Subject: [PATCH 1/4] Fix error --- src/js/controllers/walletDetails.js | 4 ++-- src/js/services/walletService.js | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index a00f93184..c9e2b5fbb 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -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) { 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, 'BWS Error'); } $scope.status = null; } else { diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 844db435e..9a4041016 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -144,7 +144,11 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (err instanceof errors.NOT_AUTHORIZED) { return cb('WALLET_NOT_REGISTERED'); } - return cb(err); + if (err instanceof errors.CONNECTION_ERROR) + return cb('CONNECTION_ERROR'); + + if (err instanceof errors.NOT_FOUND) + return cb('NOT_FOUND'); } return cb(null, ret); }); From c6faadd53fcf7c694e6627c469bbcc1138c70dde Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 16 Dec 2016 11:20:56 -0300 Subject: [PATCH 2/4] handle other/default cases --- src/js/services/walletService.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 9a4041016..af217bc3e 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -141,14 +141,16 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim twoStep: true }, function(err, ret) { if (err) { - if (err instanceof errors.NOT_AUTHORIZED) { + if (err instanceof errors.NOT_AUTHORIZED) return cb('WALLET_NOT_REGISTERED'); - } + if (err instanceof errors.CONNECTION_ERROR) return cb('CONNECTION_ERROR'); if (err instanceof errors.NOT_FOUND) return cb('NOT_FOUND'); + + return cb(err); } return cb(null, ret); }); From 1a170467600829160ab23066f27102f822d83733 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 19 Dec 2016 11:25:03 -0300 Subject: [PATCH 3/4] simple return --- src/js/services/walletService.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index af217bc3e..d7d82027e 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -140,18 +140,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim wallet.getStatus({ twoStep: true }, function(err, ret) { - if (err) { - if (err instanceof errors.NOT_AUTHORIZED) - return cb('WALLET_NOT_REGISTERED'); - - if (err instanceof errors.CONNECTION_ERROR) - return cb('CONNECTION_ERROR'); - - if (err instanceof errors.NOT_FOUND) - return cb('NOT_FOUND'); - - return cb(err); - } + if (err) return cb(err); return cb(null, ret); }); }; From 645fc8444aef4cadd8759662f076b96a99527291 Mon Sep 17 00:00:00 2001 From: Javier Date: Mon, 19 Dec 2016 17:07:58 -0300 Subject: [PATCH 4/4] fix bogus bws error --- src/js/controllers/walletDetails.js | 4 ++-- src/js/services/walletService.js | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js index c9e2b5fbb..ed3f1d2bb 100644 --- a/src/js/controllers/walletDetails.js +++ b/src/js/controllers/walletDetails.js @@ -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, bwcError) { +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 = bwcError.msg(err, 'BWS Error'); + $scope.updateStatusError = bwcError.msg(err, gettextCatalog.getString('BWS Error')); } $scope.status = null; } else { diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index d7d82027e..d45bccbe2 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -140,7 +140,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim wallet.getStatus({ twoStep: true }, function(err, ret) { - if (err) return cb(err); + if (err) { + if (err instanceof errors.NOT_AUTHORIZED) { + return cb('WALLET_NOT_REGISTERED'); + } + return cb(err); + } + return cb(null, ret); }); };