From 9b19f7b4ba85a4bfd0c2d9bc2f88bdcf88f5a714 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Oct 2016 09:57:07 -0300 Subject: [PATCH 1/3] Fix window size for desktop version --- app-template/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-template/package.json b/app-template/package.json index afd2928f4..d0583355a 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -23,6 +23,9 @@ "frame": true, "width": 400, "height": 650, + "min_width": 400, + "max_width": 800, + "min_height": 650, "position": "center", "fullscreen": false }, From dc21ac2a8ccdc8271e3323b0892423b823061518 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Oct 2016 09:57:55 -0300 Subject: [PATCH 2/3] Show contact if exist on tx list --- src/js/directives/directives.js | 13 ++++++++++--- www/views/walletDetails.html | 3 +-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index ecf849b10..5334924f5 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -113,10 +113,13 @@ angular.module('copayApp.directives') } } }) - .directive('contact', ['addressbookService', 'lodash', - function(addressbookService, lodash) { + .directive('contact', ['addressbookService', 'lodash', 'gettextCatalog', + function(addressbookService, lodash, gettextCatalog) { return { restrict: 'E', + scope: { + label: '=' + }, link: function(scope, element, attrs) { var addr = attrs.address; addressbookService.get(addr, function(err, ab) { @@ -124,7 +127,11 @@ angular.module('copayApp.directives') var name = lodash.isObject(ab) ? ab.name : ab; element.append(name); } else { - element.append(addr); + if (scope.label && scope.label == 'Sent') { + element.append(gettextCatalog.getString('Sent')); + } else { + element.append(addr); + } } }); } diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html index ae768eddb..f63f52c19 100644 --- a/www/views/walletDetails.html +++ b/www/views/walletDetails.html @@ -161,8 +161,7 @@
{{btx.message}}
{{btx.note.body}}
-
{{wallet.addressbook[btx.addressTo]}}
-
Sent
+ From fd0edaffb262144f3ffb92186ceb166b26f892e9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 19 Oct 2016 10:20:01 -0300 Subject: [PATCH 3/3] Fixes input amount from Glidera/Amazon views --- src/js/controllers/buyGlidera.js | 1 - www/views/buyAmazon.html | 2 +- www/views/buyGlidera.html | 10 +++++----- www/views/sellGlidera.html | 10 +++++----- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js index e25612418..e15632185 100644 --- a/src/js/controllers/buyGlidera.js +++ b/src/js/controllers/buyGlidera.js @@ -139,7 +139,6 @@ angular.module('copayApp.controllers').controller('buyGlideraController', $scope.wallets = profileService.getWallets({ network: $scope.network, - n: 1, onlyComplete: true }); }); diff --git a/www/views/buyAmazon.html b/www/views/buyAmazon.html index 5be01b13d..88cb917b0 100644 --- a/www/views/buyAmazon.html +++ b/www/views/buyAmazon.html @@ -33,7 +33,7 @@ ng-submit="buy.confirm()" novalidate> -
+