Matched amount formatting on Confirm screen, to previous formatting.
This commit is contained in:
parent
e416deec44
commit
fffbda2458
3 changed files with 7 additions and 1 deletions
|
|
@ -288,6 +288,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
tx.amountUnitStr = tx.amountStr.split(' ')[1];
|
tx.amountUnitStr = tx.amountStr.split(' ')[1];
|
||||||
txFormatService.formatAlternativeStr(wallet.coin, tx.toAmount, function(v) {
|
txFormatService.formatAlternativeStr(wallet.coin, tx.toAmount, function(v) {
|
||||||
tx.alternativeAmountStr = v;
|
tx.alternativeAmountStr = v;
|
||||||
|
tx.alternativeAmountValueStr = tx.alternativeAmountStr.split(' ')[0];
|
||||||
|
tx.alternativeAmountUnitStr = tx.alternativeAmountStr.split(' ')[1];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,10 @@
|
||||||
}
|
}
|
||||||
.alternative {
|
.alternative {
|
||||||
font-size: 38px;
|
font-size: 38px;
|
||||||
|
|
||||||
|
> .unit {
|
||||||
|
font-family: "Roboto-Light";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
<span translate ng-if="tx.sendMax">Sending maximum amount</span>
|
<span translate ng-if="tx.sendMax">Sending maximum amount</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="amount-label">
|
<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 class="amount">{{tx.amountValueStr || '...'}} <span class="unit">{{tx.amountUnitStr}}</span></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue