Merge pull request #5875 from JDonadio/feat/low-fee-warning

Feat/Add warning for low fee
This commit is contained in:
Matias Alejo Garcia 2017-04-14 20:54:50 +02:00 committed by GitHub
commit c9bad23b20
5 changed files with 34 additions and 1 deletions

View file

@ -89,6 +89,17 @@
flex-grow: 1;
}
}
&.low-fees {
border-top: none;
display: flex;
font-size: 14px;
color: #aaa;
align-items: center;
margin-top: -20px;
i {
padding-right: 20px;
}
}
}
.item-divider {
padding-top: 1.2rem;

View file

@ -209,6 +209,20 @@
font-size: 13px;
color: $v-mid-gray;
}
.low-fees {
.comment {
color: $v-mid-gray;
font-size: 12.5px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-left: 25px;
}
img {
position: absolute;
margin-top: 3px;
}
}
}
.wallet-details-wallet-info {
@ -238,7 +252,7 @@ a.item {
.recent svg {
margin-left:5px;
width:0.7em;
width:0.7em;
height:0.7em;
stroke: #eee;
}

BIN
www/img/icon-warning.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

View file

@ -84,6 +84,10 @@
<span ng-if="toggleFeeFiat">{{feeFiatStr}}</span>
</span>
</div>
<div class="item low-fees" ng-if="btx.action == 'received' && btx.lowFees">
<i class="icon"><img src="img/icon-warning.png" width="20px"></i>
<span translate>This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender</span>
</div>
<div class="item single-line">
<span class="label" translate>Confirmations</span>
<span class="item-note">

View file

@ -238,6 +238,10 @@
<div ng-show="btx.action == 'received'" class="ellipsis">
<div ng-if="btx.note.body" class="wallet-details__tx-message ellipsis">{{btx.note.body}}</div>
<div ng-if="!btx.note.body" class="wallet-details__tx-message ellipsis" translate>Received</div>
<div class="low-fees" ng-if="btx.lowFees">
<i class="icon"><img src="img/icon-warning.png" width="20px"></i>
<span class="comment" translate>Low fees</span>
</div>
</div>
<div ng-show="btx.action == 'sent'" class="ellipsis">