From a0131517916c374538f069d35d765eb4414eac58 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 16 Jun 2016 21:42:44 -0300 Subject: [PATCH] Ref return walletId after select wallet --- src/js/controllers/buyCoinbase.js | 7 ++++--- src/js/controllers/buyGlidera.js | 7 ++++--- src/js/controllers/modals/wallets.js | 7 +------ src/js/controllers/sellCoinbase.js | 8 ++++---- src/js/controllers/sellGlidera.js | 8 ++++---- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/js/controllers/buyCoinbase.js b/src/js/controllers/buyCoinbase.js index 32521ef93..da1d93533 100644 --- a/src/js/controllers/buyCoinbase.js +++ b/src/js/controllers/buyCoinbase.js @@ -59,10 +59,11 @@ angular.module('copayApp.controllers').controller('buyCoinbaseController', $scope.walletsModal.show(); }); - $scope.$on('walletSelected', function(ev, obj) { + $scope.$on('walletSelected', function(ev, walletId) { $timeout(function() { - self.selectedWalletId = obj.walletId; - self.selectedWalletName = obj.walletName; + var client = profileService.getClient(walletId); + self.selectedWalletId = walletId; + self.selectedWalletName = client.credentials.walletName; $scope.$apply(); }, 100); $scope.walletsModal.hide(); diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index e0c4d5be7..fdced865f 100644 --- a/src/js/controllers/buyGlidera.js +++ b/src/js/controllers/buyGlidera.js @@ -37,10 +37,11 @@ angular.module('copayApp.controllers').controller('buyGlideraController', $scope.walletsModal.show(); }); - $scope.$on('walletSelected', function(ev, obj) { + $scope.$on('walletSelected', function(ev, walletId) { $timeout(function() { - self.selectedWalletId = obj.walletId; - self.selectedWalletName = obj.walletName; + var client = profileService.getClient(walletId); + self.selectedWalletId = walletId; + self.selectedWalletName = client.credentials.walletName; $scope.$apply(); }, 100); $scope.walletsModal.hide(); diff --git a/src/js/controllers/modals/wallets.js b/src/js/controllers/modals/wallets.js index f08581f2b..65fea3891 100644 --- a/src/js/controllers/modals/wallets.js +++ b/src/js/controllers/modals/wallets.js @@ -13,12 +13,7 @@ angular.module('copayApp.controllers').controller('walletsController', function( return; } - var obj = { - 'walletId': walletId, - 'walletName': walletName, - 'client': profileService.getClient(walletId) - } - $scope.$emit('walletSelected', obj); + $scope.$emit('walletSelected', walletId); }); }; diff --git a/src/js/controllers/sellCoinbase.js b/src/js/controllers/sellCoinbase.js index 4055b1725..e6247e665 100644 --- a/src/js/controllers/sellCoinbase.js +++ b/src/js/controllers/sellCoinbase.js @@ -93,11 +93,11 @@ angular.module('copayApp.controllers').controller('sellCoinbaseController', $scope.walletsModal.show(); }); - $scope.$on('walletSelected', function(ev, obj) { + $scope.$on('walletSelected', function(ev, walletId) { $timeout(function() { - self.selectedWalletId = obj.walletId; - self.selectedWalletName = obj.walletName; - client = obj.client; + client = profileService.getClient(walletId); + self.selectedWalletId = walletId; + self.selectedWalletName = client.credentials.walletName; $scope.$apply(); }, 100); $scope.walletsModal.hide(); diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index fb8a106df..795cd047c 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -50,11 +50,11 @@ angular.module('copayApp.controllers').controller('sellGlideraController', $scope.walletsModal.show(); }); - $scope.$on('walletSelected', function(ev, obj) { + $scope.$on('walletSelected', function(ev, walletId) { $timeout(function() { - self.selectedWalletId = obj.walletId; - self.selectedWalletName = obj.walletName; - client = obj.client; + client = profileService.getClient(walletId); + self.selectedWalletId = walletId; + self.selectedWalletName = client.credentials.walletName; $scope.$apply(); }, 100); $scope.walletsModal.hide();