From 022de7d2b59cd1eb640532c1a0570275cc379f7f Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 30 Nov 2014 19:14:22 -0300 Subject: [PATCH] Fix payment intent --- js/controllers/paymentIntent.js | 4 ++-- views/paymentIntent.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/controllers/paymentIntent.js b/js/controllers/paymentIntent.js index a575383f6..c34a867c6 100644 --- a/js/controllers/paymentIntent.js +++ b/js/controllers/paymentIntent.js @@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun $scope.wallets = []; $rootScope.title = 'Payment intent'; - $scope.wallets = rootScope.iden.listWallets(); + $scope.wallets = $rootScope.iden.listAllWallets(); var l = $scope.wallet.length; _.each($scope.wallets, function(w, i) { @@ -39,8 +39,8 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun $scope.cancel = function() { $rootScope.pendingPayment = null; - $location.path('/'); $modalInstance.close(); + $location.path('/homeWallet'); }; }; diff --git a/views/paymentIntent.html b/views/paymentIntent.html index 2246aac4b..cd267745a 100644 --- a/views/paymentIntent.html +++ b/views/paymentIntent.html @@ -17,8 +17,8 @@
- {{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}} - {{item.balanceInfo.totalBalanceAlternative |noFractionNumber:2}} {{item.balanceInfo.alternativeIsoCode}} + {{item.balanceInfo.totalBalance || 0}} {{item.settings.unitName}} + {{item.balanceInfo.totalBalanceAlternative}} {{item.balanceInfo.alternativeIsoCode}}