From 4926a6998dc11dc12a61a97e41d01d08412109a9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Nov 2014 15:55:02 -0300 Subject: [PATCH 1/6] fix icons when moving bitcoin to addresses from a same wallet --- views/history.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/history.html b/views/history.html index d67cb1cc2..3ade7c25a 100644 --- a/views/history.html +++ b/views/history.html @@ -43,7 +43,7 @@ ng-class="{ 'fi-arrow-left' : btx.action == 'received', 'fi-arrow-right': btx.action == 'sent', - 'fi-arrow-loop': btx.action == 'moved'}"> + 'fi-loop': btx.action == 'moved'}"> From cea1a1175b1c6d363dfff82d3249b6b7fcf34ed6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Nov 2014 16:02:10 -0300 Subject: [PATCH 2/6] fixes sidebar: if wallet is not complete, show: waiting for copayers --- views/includes/sidebar.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index ef5cafda5..226960a25 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -11,13 +11,15 @@
- - -
- {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}} - {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}} - N/A -
+ Waiting for copayers... +
+ +
+ {{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}} + {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}} + N/A +
+
From 8e2b6c9847dca6e1f11bbca397089b1d4fc19acd Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Nov 2014 16:59:59 -0300 Subject: [PATCH 3/6] fix tooltip sidebar --- css/src/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/src/main.css b/css/src/main.css index d3c20ac28..ca693ca11 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -1101,7 +1101,7 @@ button.gray:focus, } .side-nav.wallets { - z-index: 9999; + z-index: 100; background-color: #213140 ; border-bottom: 1px solid #3A4E61; overflow-y: auto; From c1323469593aad57c96d2a22a10293b9763d652b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Nov 2014 17:01:02 -0300 Subject: [PATCH 4/6] deleted link to test paypro --- js/controllers/home.js | 12 ------------ views/home.html | 5 ----- 2 files changed, 17 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index e2ee99878..1ab45ea4b 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -31,18 +31,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc identityService.open($scope, form); } - //TODO erase this function - $scope.setPayment = function() { - $rootScope.pendingPayment = { - "data": { - "amount": 20.3, - "label": "Luke-Jr", - "message": "Hola chango?" - }, - "address": "175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W" - }; - } - function getParam(sname) { var params = location.search.substr(location.search.indexOf("?") + 1); var sval = ""; diff --git a/views/home.html b/views/home.html index d4b0be4bd..808573bb6 100644 --- a/views/home.html +++ b/views/home.html @@ -10,11 +10,6 @@
- - - Test payment - -
From 73ab099236bbc4268669a02bf46eb43d70ce5d84 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Nov 2014 17:02:28 -0300 Subject: [PATCH 5/6] fix order of transactions list. New format of timestamp. --- views/history.html | 13 ++++++++++--- views/includes/sidebar.html | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/views/history.html b/views/history.html index 3ade7c25a..750292d6f 100644 --- a/views/history.html +++ b/views/history.html @@ -13,12 +13,19 @@ ng-if="blockchain_txs[0].txid">
-
+
- + Unconfirmed diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index 226960a25..fa7961da0 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -43,7 +43,9 @@ + tooltip-placement="left" + data-options="disable_for_touch:true" + tooltip-popup-delay='500'>
From b71bef495a2d2ad929b4b50aa2c0d1cbfa47ae0a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 7 Nov 2014 17:02:54 -0300 Subject: [PATCH 6/6] fix alternativeAmount for list of pending transactions proposals --- js/services/controllerUtils.js | 3 +++ views/includes/transaction.html | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index a351db6cb..02e4179d1 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -349,6 +349,9 @@ angular.module('copayApp.services') var w = $rootScope.wallet; if (!w) return root.onErrorDigest(); var res = w.getPendingTxProposals(); + _.each(res.txs, function(tx) { + root.computeAlternativeAmount(w, tx); + }); $rootScope.txps = res.txs; if ($rootScope.pendingTxCount < res.pendingForUs) { $rootScope.txAlertCount = res.pendingForUs; diff --git a/views/includes/transaction.html b/views/includes/transaction.html index f4847c54b..73e72ecf8 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -10,7 +10,9 @@
{{out.value |noFractionNumber}} {{$root.wallet.settings.unitName}} - {{out.alternativeAmount|noFractionNumber}} {{out.alternativeIsoCode}} + + {{out.alternativeAmount|noFractionNumber}} {{out.alternativeIsoCode}} +