From e264aa66a2d806c46a76f27d008b0cfea0eae29a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 6 Aug 2014 16:51:45 -0300 Subject: [PATCH] Add delete wallet from the intermediate screen (it was lost in migration to new design) --- css/main.css | 3 ++- js/controllers/copayers.js | 10 +++++++++- js/controllers/home.js | 2 +- views/copayers.html | 6 +++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/css/main.css b/css/main.css index 8b8e10278..a3fac6999 100644 --- a/css/main.css +++ b/css/main.css @@ -1006,7 +1006,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .text-primary {color: #1ABC9C;} .text-secondary {color: #3498DB;} .text-white {color: #fff;} - +.text-warning {color: #CA5649;} .footer-setup a.text-gray:hover {color: #fff;} a.text-gray:hover {color: #2C3E50;} @@ -1014,6 +1014,7 @@ a.text-black:hover {color: #213140;} a.text-primary:hover {color: #50E3C2;} a.text-secondary:hover {color: #4A90E2;} a.text-white:hover {color: #ccc;} +a.text-warning:hover {color: #FD7262;} .box-setup-copayers { background: #2C3E50; diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js index c6a9c2c54..c239beff1 100644 --- a/js/controllers/copayers.js +++ b/js/controllers/copayers.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('CopayersController', - function($scope, $rootScope, $location, backupService) { + function($scope, $rootScope, $location, backupService, walletFactory, controllerUtils) { $scope.backup = function() { var w = $rootScope.wallet; @@ -18,4 +18,12 @@ angular.module('copayApp.controllers').controller('CopayersController', $location.path('/addresses'); }; + $scope.deleteWallet = function() { + var w = $rootScope.wallet; + w.disconnect(); + walletFactory.delete(w.id, function() { + controllerUtils.logout(); + }); + }; + }); diff --git a/js/controllers/home.js b/js/controllers/home.js index 14c5505ad..6e5eb489a 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -6,5 +6,5 @@ angular.module('copayApp.controllers').controller('HomeController', if ($rootScope.pendingPayment) { notification.info('Login Required', 'Please open wallet to complete payment'); } - $scope.hasWallets = walletFactory.getWallets().length > 0 ? true : false; + $scope.hasWallets = (walletFactory.getWallets() && walletFactory.getWallets().length > 0) ? true : false; }); diff --git a/views/copayers.html b/views/copayers.html index e71e2d6c0..8f474566b 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -73,8 +73,12 @@
+ Delete wallet + | Download seed backup + ng-show="!$root.wallet.publicKeyRing.isComplete()">Download seed backup