diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js index 5d9be8376..ee613f574 100644 --- a/src/js/controllers/paperWallet.js +++ b/src/js/controllers/paperWallet.js @@ -101,21 +101,15 @@ angular.module('copayApp.controllers').controller('paperWalletController', $state.go('tabs.home'); }; - $scope.$on('Wallet/Changed', function(event, wallet) { - if (!wallet) { - $log.debug('No wallet provided'); - return; - } - if (wallet == $scope.wallet) { - $log.debug('No change in wallet'); - return; - } + $scope.onWalletSelect = function(wallet) { $scope.wallet = wallet; - $log.debug('Wallet changed: ' + wallet.name); - $timeout(function() { - $scope.$apply(); - }); - }); + }; + + $scope.showWalletSelector = function() { + if ($scope.singleWallet) return; + $scope.walletSelectorTitle = gettextCatalog.getString('Transfer to'); + $scope.showWallets = true; + }; $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.scannedKey = (data.stateParams && data.stateParams.privateKey) ? data.stateParams.privateKey : null; @@ -127,6 +121,7 @@ angular.module('copayApp.controllers').controller('paperWalletController', onlyComplete: true, network: 'livenet', }); + $scope.singleWallet = $scope.wallets.length == 1; if (!$scope.wallets || !$scope.wallets.length) { $scope.noMatchingWallet = true; diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index d86851bf2..b32f2fbef 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -127,7 +127,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.init = function() { $scope.wallet = $scope.wallets[0]; $scope.updateCurrentWallet($scope.wallet); - $scope.showWalletSelector(); }; $scope.$on("$ionicView.leave", function(event, data) { diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index 8e9022236..ed59564b7 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -143,23 +143,4 @@ angular.module('copayApp.directives') }); } } - }) - .directive('wallets', function($log, profileService, walletService, lodash) { - return { - restrict: 'E', - templateUrl: 'views/includes/wallets.html', - scope: { - wallets: '=wallets' - }, - link: function(scope, element, attrs) { - scope.$on("$ionicSlides.sliderInitialized", function(event, data) { - scope.slider = data.slider; - scope.$emit('Wallet/Changed', scope.wallets ? scope.wallets[0] : null); - }); - - scope.$on("$ionicSlides.slideChangeStart", function(event, data) { - scope.$emit('Wallet/Changed', scope.wallets ? scope.wallets[data.slider.activeIndex] : null); - }); - } - } }); diff --git a/www/views/includes/wallets.html b/www/views/includes/wallets.html deleted file mode 100644 index 4fa2cc894..000000000 --- a/www/views/includes/wallets.html +++ /dev/null @@ -1,18 +0,0 @@ -
- - -
-
- - - - {{wallet.name || wallet.id}} - - {{wallet.status.availableBalanceStr}} - - [Balance Hidden] -
-
-
-
-
diff --git a/www/views/paperWallet.html b/www/views/paperWallet.html index ee9393ba7..81b84ba41 100644 --- a/www/views/paperWallet.html +++ b/www/views/paperWallet.html @@ -18,10 +18,29 @@
...
-
Funds will be transferred to: - {{wallet.walletAlias || wallet.name}} +
+
+ + + + + + {{wallet.name || wallet.id}} + +

+ {{wallet.status.totalBalanceStr}} + + [Balance Hidden] + + {{wallet.m}}-of-{{wallet.n}} + + {{wallet.error}} +   +

+ +
@@ -34,4 +53,11 @@ Funds transferred + +