From 1cc8c8bac24cee6f5556afead78b69fe4858c15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Jul 2017 12:24:59 -0300 Subject: [PATCH 1/5] adding translate label --- www/views/customAmount.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/views/customAmount.html b/www/views/customAmount.html index 902671d63..f9d5aafb7 100644 --- a/www/views/customAmount.html +++ b/www/views/customAmount.html @@ -10,9 +10,9 @@ @@ -23,7 +23,7 @@
-
+
Address @@ -43,7 +43,7 @@ {{wallet.name}}
-
Receive in
+
Receive in
From 0b96e2f8da3d0e5c8e555f0d15f43eb7fef069b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Jul 2017 12:28:47 -0300 Subject: [PATCH 2/5] fix error in translation --- src/js/controllers/confirm.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index f688ed3fc..86819abd1 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -60,7 +60,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( function setNoWallet(msg) { $scope.wallet = null; - $scope.noWalletMessage = gettextCatalog.getString(msg); + $scope.noWalletMessage = msg; $log.warn('Not ready to make the payment:' + msg); $timeout(function() { $scope.$apply(); @@ -80,7 +80,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); if (!$scope.wallets || !$scope.wallets.length) { - setNoWallet('No wallets available'); + setNoWallet(gettextCatalog.getString('No wallets available')); return cb(); } @@ -109,7 +109,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( return cb('Could not update any wallet'); if (lodash.isEmpty(filteredWallets)) { - setNoWallet('Insufficent funds'); + setNoWallet(gettextCatalog.getString('Insufficent funds')); } $scope.wallets = lodash.clone(filteredWallets); return cb(); @@ -272,7 +272,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $log.debug('Send max info', sendMaxInfo); if (tx.sendMax && sendMaxInfo.amount == 0) { - setNoWallet('Insufficent funds'); + setNoWallet(gettextCatalog.getString('Insufficent funds')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee')); return cb('no_funds'); } From 972897aa796895d925de5b5f83552f1131b6291e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Jul 2017 12:32:46 -0300 Subject: [PATCH 3/5] hide selector if no wallet --- www/views/confirm.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/confirm.html b/www/views/confirm.html index d638f57bf..e7c126b01 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -61,7 +61,7 @@ {{tx.toAddress}} - + From
From 1720e89aec9b3ad5337db946ba002ec95a07f0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Jul 2017 14:33:50 -0300 Subject: [PATCH 4/5] hide button if no wallet --- www/views/confirm.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/views/confirm.html b/www/views/confirm.html index e7c126b01..a2b85ad88 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -107,7 +107,7 @@ {{buttonText}} From bade41be866034226a7ae1850c294e1dbf61bf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Jul 2017 14:33:50 -0300 Subject: [PATCH 5/5] typo fix --- src/js/controllers/confirm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 86819abd1..d475a4364 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -109,7 +109,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( return cb('Could not update any wallet'); if (lodash.isEmpty(filteredWallets)) { - setNoWallet(gettextCatalog.getString('Insufficent funds')); + setNoWallet(gettextCatalog.getString('Insufficient funds')); } $scope.wallets = lodash.clone(filteredWallets); return cb(); @@ -272,7 +272,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $log.debug('Send max info', sendMaxInfo); if (tx.sendMax && sendMaxInfo.amount == 0) { - setNoWallet(gettextCatalog.getString('Insufficent funds')); + setNoWallet(gettextCatalog.getString('Insufficient funds')); popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee')); return cb('no_funds'); }