From 7433b1b863d71f1610bd71553e1348a76d5ac02e Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 19 Jun 2015 22:01:38 -0300 Subject: [PATCH] wallet selection popup, link to open it --- public/views/modals/wallets.html | 31 +++++++++++++++++++++++++++++++ public/views/walletHome.html | 5 +++++ src/css/mobile.css | 2 +- src/js/controllers/index.js | 1 + src/js/controllers/walletHome.js | 22 ++++++++++++++++++++++ 5 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 public/views/modals/wallets.html diff --git a/public/views/modals/wallets.html b/public/views/modals/wallets.html new file mode 100644 index 000000000..163d5ec70 --- /dev/null +++ b/public/views/modals/wallets.html @@ -0,0 +1,31 @@ + + + + diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 674153eaa..11f66f4a9 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -327,6 +327,11 @@
+
+ send to my wallets +
+ + diff --git a/src/css/mobile.css b/src/css/mobile.css index 352972395..165843b02 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -285,7 +285,7 @@ a.missing-copayers { background-color: #122232; } -.sidebar .avatar-wallet, .payment-uri .avatar-wallet { +.sidebar .avatar-wallet, .payment-uri .avatar-wallet, .modal-content .avatar-wallet { background-color: #2C3E50; color: #fff; font-size: 20px; diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index f6ec8aea5..6e25753b6 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -237,6 +237,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.copayers = walletStatus.wallet.copayers; self.preferences = walletStatus.preferences; self.setBalance(walletStatus.balance); + self.otherWallets = profileService.getWallets(self.network); $rootScope.$apply(); }); }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 3c7e0206e..8c9347733 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -125,6 +125,28 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); }; + + $scope.openWalletsModal = function(wallets) { + var fc = profileService.focusedClient; + + var ModalInstanceCtrl = function($scope, $modalInstance) { + $scope.wallets = wallets; + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + }; + var modalInstance = $modal.open({ + templateUrl: 'views/modals/wallets.html', + windowClass: 'full animated slideInUp', + controller: ModalInstanceCtrl, + }); + + modalInstance.result.finally(function() { + var m = angular.element(document.getElementsByClassName('reveal-modal')); + m.addClass('slideOutDown'); + }); + }; + this.openTxpModal = function(tx, copayers) { var fc = profileService.focusedClient; var refreshUntilItChanges = false;