anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Matched amount formatting on Confirm screen, to previous formatting.

Browse source
This commit is contained in:
Brendon Duncan 2018-06-15 10:14:21 +12:00
commit fffbda2458
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/confirm.js
View file

@ -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];
});
}

4
src/sass/views/includes/txp-details.scss
View file

@ -43,6 +43,10 @@
}
.alternative {
font-size: 38px;
> .unit {
font-family: "Roboto-Light";
}
}
}
}

2
www/views/confirm.html
View file

@ -16,7 +16,7 @@
<span translate ng-if="tx.sendMax">Sending maximum amount</span>
</div>
<div class="amount-label">
<div class="alternative">{{tx.alternativeAmountStr || '...'}}</div>
<div class="alternative">{{tx.alternativeAmountValueStr || '...'}} <span class="unit">{{tx.alternativeAmountUnitStr}}</span></div>
<div class="amount">{{tx.amountValueStr || '...'}} <span class="unit">{{tx.amountUnitStr}}</span></div>
</div>
</div>