From a03aa0164d3c76cab72c9ae9b130f03634897806 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 23 Oct 2014 22:54:23 -0300 Subject: [PATCH] Show on sidebar the latest wallet created/joined/imported --- js/controllers/sidebar.js | 4 +++- js/services/notifications.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 239f127a5..51e2c2362 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -79,10 +79,12 @@ angular.module('copayApp.controllers').controller('SidebarController', function( $rootScope.wallet.keepAlive(); } }); + $rootScope.$watch('wallet.id', function() { + $scope.walletSelection = false; + }); } $scope.switchWallet = function(wid) { - $scope.walletSelection = false; controllerUtils.setFocusedWallet(wid); }; diff --git a/js/services/notifications.js b/js/services/notifications.js index 21040d74c..c8efdbabc 100644 --- a/js/services/notifications.js +++ b/js/services/notifications.js @@ -9,7 +9,7 @@ factory('notification', ['$timeout', var settings = { info: { - duration: 10000, + duration: 6000, enabled: true }, funds: { @@ -25,7 +25,7 @@ factory('notification', ['$timeout', enabled: true }, error: { - duration: 10000, + duration: 7000, enabled: true }, success: {