From 6b891418d33e53c2b25ecd09f2b20b502407623a Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 18 Sep 2014 11:07:07 -0300 Subject: [PATCH 1/4] Added conversion rate to send controller --- js/services/controllerUtils.js | 3 +-- views/send.html | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index 8926fd877..7358cbb65 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -200,8 +200,7 @@ angular.module('copayApp.services') $rootScope.totalBalanceAlternative = rateService.toFiat(balanceSat, w.settings.alternativeIsoCode); $rootScope.alternativeIsoCode = w.settings.alternativeIsoCode; $rootScope.lockedBalanceAlternative = rateService.toFiat(balanceSat - safeBalanceSat, w.settings.alternativeIsoCode); - - + $rootScope.alternativeConversionRate = rateService.toFiat(100000000, w.settings.alternativeIsoCode); return cb ? cb() : null; }); }); diff --git a/views/send.html b/views/send.html index 3208dce3b..16a688196 100644 --- a/views/send.html +++ b/views/send.html @@ -8,6 +8,7 @@

{{title|translate}}

+ 1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}}
From 42ba0701eee44795ef4f9d6900a8b8b9f77b4640 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 18 Sep 2014 11:10:41 -0300 Subject: [PATCH 2/4] Showing only when conversion_rate > 0 --- views/send.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/send.html b/views/send.html index 16a688196..024066fcf 100644 --- a/views/send.html +++ b/views/send.html @@ -8,7 +8,7 @@

{{title|translate}}

- 1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}} + 1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}}
From 80674dc86c6027d45bc877664a7a23c8f3af76a8 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 18 Sep 2014 11:55:58 -0300 Subject: [PATCH 3/4] fix conversion rate --- views/send.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/views/send.html b/views/send.html index 024066fcf..4f95c4c52 100644 --- a/views/send.html +++ b/views/send.html @@ -8,7 +8,6 @@

{{title|translate}}

- 1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}}
@@ -120,7 +119,13 @@
-
+ + + + 1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}} + + +
From 1d6453069a9d344d7213734ec59d83a69f08f98a Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 18 Sep 2014 13:05:41 -0300 Subject: [PATCH 4/4] . --- views/send.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/send.html b/views/send.html index 4f95c4c52..b766b81c5 100644 --- a/views/send.html +++ b/views/send.html @@ -117,7 +117,7 @@
- +