From fffbda2458ac9cd860893c31afb97b58a00024a7 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Fri, 15 Jun 2018 10:14:21 +1200 Subject: [PATCH] Matched amount formatting on Confirm screen, to previous formatting. --- src/js/controllers/confirm.js | 2 ++ src/sass/views/includes/txp-details.scss | 4 ++++ www/views/confirm.html | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 53589cf22..cebf9cb3a 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -288,6 +288,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( tx.amountUnitStr = tx.amountStr.split(' ')[1]; txFormatService.formatAlternativeStr(wallet.coin, tx.toAmount, function(v) { tx.alternativeAmountStr = v; + tx.alternativeAmountValueStr = tx.alternativeAmountStr.split(' ')[0]; + tx.alternativeAmountUnitStr = tx.alternativeAmountStr.split(' ')[1]; }); } diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 9da0811e0..ae6c0d218 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -43,6 +43,10 @@ } .alternative { font-size: 38px; + + > .unit { + font-family: "Roboto-Light"; + } } } } diff --git a/www/views/confirm.html b/www/views/confirm.html index 57f3a60e8..ad34e1f08 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -16,7 +16,7 @@ Sending maximum amount
-
{{tx.alternativeAmountStr || '...'}}
+
{{tx.alternativeAmountValueStr || '...'}} {{tx.alternativeAmountUnitStr}}
{{tx.amountValueStr || '...'}} {{tx.amountUnitStr}}