Suggested by merchant.

This commit is contained in:
Brendon Duncan 2018-08-07 11:27:05 +12:00
commit 09f627ea51
3 changed files with 27 additions and 14 deletions

View file

@ -1,7 +1,7 @@
.fee-summary { .fee-summary {
position: relative; position: relative;
display: flex; display: flex;
justify-content: space-between; flex-direction: column;
width: 100%; width: 100%;
padding: 5px 12px 15px; padding: 5px 12px 15px;
box-sizing: border-box; box-sizing: border-box;
@ -17,6 +17,11 @@
background: linear-gradient(to bottom, rgba(242,242,242,0) 0%,rgba(242,242,242,1) 100%); background: linear-gradient(to bottom, rgba(242,242,242,0) 0%,rgba(242,242,242,1) 100%);
} }
.amount {
display: flex;
flex-direction: row;
justify-content: space-between;
.fee-fiat { .fee-fiat {
&.positive { &.positive {
color: #70955F; color: #70955F;
@ -30,4 +35,5 @@
.fee-crypto { .fee-crypto {
color: #A7A7A7; color: #A7A7A7;
} }
}
} }

View file

@ -14,4 +14,8 @@
.shapeshift-banner, .bitpay-banner { .shapeshift-banner, .bitpay-banner {
box-shadow: none; box-shadow: none;
} }
.warning {
color: $v-warning-color-2;
}
} }

View file

@ -82,12 +82,15 @@
</ion-content> </ion-content>
<div class="fee-summary"> <div class="fee-summary">
<div ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70'" translate="">Suggested by merchant:</div>
<div class="amount">
<div class="fee-fiat positive" ng-if="vm.feeLessThanACent">Fee: Less than 1 cent</div> <div class="fee-fiat positive" ng-if="vm.feeLessThanACent">Fee: Less than 1 cent</div>
<div class="fee-fiat" ng-class="vm.feeIsHigh ? 'negative' : 'positive'" ng-if="!vm.feeLessThanACent">Fee: {{vm.feeFiat}} {{vm.feeCurrency}}</div> <div class="fee-fiat" ng-class="vm.feeIsHigh ? 'negative' : 'positive'" ng-if="!vm.feeLessThanACent">Fee: {{vm.feeFiat}} {{vm.feeCurrency}}</div>
<div class="fee-crypto" ng-if="vm.feeCrypto"> <div class="fee-crypto" ng-if="vm.feeCrypto">
{{vm.feeCrypto}} {{vm.origin.currency}} {{vm.feeCrypto}} {{vm.origin.currency}}
</div> </div>
</div> </div>
</div>
<click-to-accept <click-to-accept
ng-click="vm.approve()" ng-click="vm.approve()"