From 29cbce6f7fcaccf5ccee71af1e36015b357f1daf Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Fri, 31 Oct 2014 14:57:51 -0300 Subject: [PATCH 1/7] fetch txs & compute balance immediately after switching wallets --- js/controllers/sidebar.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 576618b8f..c0bda7eb9 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -67,7 +67,13 @@ angular.module('copayApp.controllers').controller('SidebarController', function( if (controllerUtils.isFocusedWallet(wid)) return; var w = $rootScope.iden.getWalletById(wid); $scope.wallets.push(w); - controllerUtils.updateTxsAndBalance(w); + controllerUtils.updateTxs({ + wallet: w, + pending: true + }); + controllerUtils.updateBalance(w, function() { + $rootScope.$digest(); + }) }); }; }); From 081f299a5425bebcae300396879712005e6c01bc Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 31 Oct 2014 15:17:39 -0300 Subject: [PATCH 2/7] fix home style --- css/src/main.css | 13 ++++- views/homeWallet.html | 114 +++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 59 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 007944bf6..79ac73219 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -80,7 +80,7 @@ font-family: 'Ubuntu', Helvetica, sans-serif !important; } -h1, h2, h3, h4, h5, h6 { +h1, h2, h3, h4, h5, h6, .panel h2 { color: #2C3E50; } @@ -246,6 +246,17 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu -webkit-box-shadow: 0 0 0px 1000px white inset; } +.home-wallet .avatar-wallet { + background: #1ABC9C; + margin: 0; + width: 45px; + height: 45px; + font-size: 30px; + padding-top: 10px; + margin-right: 15px; + color: #FFF; +} + .side-nav.wallets .avatar-wallet{ background-color: #7A8C9E; color: #213140; diff --git a/views/homeWallet.html b/views/homeWallet.html index d95152be2..c922d691e 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -1,70 +1,68 @@ -
+
-

Home

-
-
+

Home

- -
-
{{$root.wallet.getName() | limitTo: 1}}
-
{{$root.wallet.getName()}}
-
- {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}} - {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}} + +
+
+
+
{{$root.wallet.getName() | limitTo: 1}}
+
+
+

{{$root.wallet.getName()}}

+
+
+ {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}} + {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}
- -
-
-
-
- - - Quick receive -
- - -
-

{{address.addressStr}}

- - - -
-
-
-
-
- -
-
- {{copayer.peerId}} -
- - {{'Me'|translate}} - {{copayer.nick}} + +
+
+

Quick receive

+
+ + +
+

{{address.addressStr}}

+ + + +
+ +
+
-
Ready
-
- +
+ -
+ +
+
+

Copayers

+
+ {{copayer.peerId}} +
+ + {{'Me'|translate}} + {{copayer.nick}} +
+
Ready
+
+
+
From d8cd4240fa7205523dba7d1071d20e9e06bcd5e8 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 31 Oct 2014 15:21:52 -0300 Subject: [PATCH 3/7] fix copayers --- views/copayers.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/copayers.html b/views/copayers.html index 12342f945..3c6b08631 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -18,7 +18,7 @@
-
+
From 1599c59106bb0c5045aa018f6a4f4be7a0461235 Mon Sep 17 00:00:00 2001 From: Esteban Ordano Date: Fri, 31 Oct 2014 15:27:03 -0300 Subject: [PATCH 4/7] Add missing variable declaration --- js/models/Compatibility.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/models/Compatibility.js b/js/models/Compatibility.js index 0a136391b..f003b9f63 100644 --- a/js/models/Compatibility.js +++ b/js/models/Compatibility.js @@ -162,6 +162,7 @@ Compatibility.readWalletPre8 = function(walletId, password, cb) { var self = this; var passphrase = cryptoUtils.kdf(password); var obj = {}; + var key; for (key in localStorage) { if (key.indexOf('wallet::' + walletId) !== -1) { From cfc16b8d6864d987a87126ee7aae1fee7cf9da27 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 31 Oct 2014 15:29:59 -0300 Subject: [PATCH 5/7] fix sidebar mobile --- css/src/mobile.css | 4 ++++ views/includes/sidebar-mobile.html | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/css/src/mobile.css b/css/src/mobile.css index f5c498a42..0795d9a02 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -199,5 +199,9 @@ padding: 0.15rem 0.2rem; } + .line-t { + border-top: 1px solid #3C5269; + } + } diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html index 9f0a8ea89..ce882f4d5 100644 --- a/views/includes/sidebar-mobile.html +++ b/views/includes/sidebar-mobile.html @@ -59,7 +59,7 @@ {{'Add Wallet' | translate }}
-
+
@@ -73,12 +73,13 @@ - {{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} -   + + {{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}} +
-
+