Commit 0385ae83 authored by Maxim Bogdanov's avatar Maxim Bogdanov 🙉

Latest transactions fixed, visual aspect improvements.

parent 08c08316
...@@ -101,8 +101,8 @@ export class DashboardComponent implements OnInit { ...@@ -101,8 +101,8 @@ export class DashboardComponent implements OnInit {
response => { response => {
if (response.status >= 200 && response.status < 400) { if (response.status >= 200 && response.status < 400) {
const json = response.json(); const json = response.json();
if (json.transactionsHistory) { if (json && json.history.length) {
historyResponse = json.transactionsHistory; historyResponse = json.history[0].transactionsHistory;
this.getTransactionInfo(historyResponse); this.getTransactionInfo(historyResponse);
} }
} }
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
<div *ngIf="formErrors.address" class="form-control-feedback">{{ formErrors.address }}</div> <div *ngIf="formErrors.address" class="form-control-feedback">{{ formErrors.address }}</div>
</div> </div>
<div class="form-group clearfix"> <div class="form-group clearfix">
<label>Transaction Fee</label> <!--<label>Transaction Fee</label>-->
<!-- fee buttons --> <!-- fee buttons -->
<div class="radioButtons" ngbRadioGroup name="feeButtons" formControlName="fee"> <!--<div class="radioButtons" ngbRadioGroup name="feeButtons" formControlName="fee">
<label ngbButtonLabel class="btn btn-outline-danger"> <label ngbButtonLabel class="btn btn-outline-danger">
<input ngbButton type="radio" value="low">Low/Slow <input ngbButton type="radio" value="low">Low/Slow
</label> </label>
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
<label ngbButtonLabel class="btn btn-outline-success"> <label ngbButtonLabel class="btn btn-outline-success">
<input ngbButton type="radio" value="high">High/Fast <input ngbButton type="radio" value="high">High/Fast
</label> </label>
</div> </div>-->
<!-- /fee buttons --> <!-- /fee buttons -->
<div class="form-group clearfix"> <div class="form-group clearfix">
<div *ngIf="estimatedFee"> <div *ngIf="estimatedFee">
<label>Estimated Fee: </label> <label>Transaction Fee: </label>
<label>{{ estimatedFee | coinNotation }} {{ coinUnit }}</label> <label>{{ estimatedFee | coinNotation }} {{ coinUnit }}</label>
</div> </div>
</div> </div>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- menu--> <!-- menu-->
<ul class="list-unstyled menu"> <ul class="list-unstyled menu">
<li (click)="loadDeStreamWallet()" [class.active]="stratisActive"> <li (click)="loadDeStreamWallet()" [class.active]="stratisActive">
<img src="../../../assets/images/ico_dst.png" alt="Stratis"> <img src="../../../assets/images/ico_dst.png" alt="DeStream">
<span class="bar"></span> <span class="bar"></span>
</li> </li>
</ul> </ul>
......
.bubble .modal-header-logo img {
height: 36px;
margin-top: -17px;
}
<div id="modalDetail" tabindex="-1" role="dialog" aria-labelledby="modal_detail" aria-hidden="true"> <div id="modalDetail" tabindex="-1" role="dialog" aria-labelledby="modal_detail" aria-hidden="true">
<div class="modal-dialog modalBg" role="document"> <div class="modal-dialog modalBg" role="document">
<div> <div>
<div class="modal-header"> <div class="modal-header">
<div class="bubble"><i class="icon-block"></i></div> <div class="bubble">
<i class="modal-header-logo">
<img src="../../../assets/images/ico_dst.png" alt="DeStream">
</i>
</div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<h5 class="modal-title text-uppercase" id="modalDetail">Transaction Details</h5> <h5 class="modal-title text-uppercase" id="modalDetail">Transaction Details</h5>
...@@ -16,8 +20,8 @@ ...@@ -16,8 +20,8 @@
<li *ngIf="transaction.transactionType == 'sent'" class="list-inline-item col-8 blockText text-danger">-{{ transaction.transactionAmount + transaction.transactionFee | coinNotation }} {{ coinUnit }}</li> <li *ngIf="transaction.transactionType == 'sent'" class="list-inline-item col-8 blockText text-danger">-{{ transaction.transactionAmount + transaction.transactionFee | coinNotation }} {{ coinUnit }}</li>
</ul> </ul>
<ul class="list-inline row" *ngIf="transaction.transactionType == 'sent'"> <ul class="list-inline row" *ngIf="transaction.transactionType == 'sent'">
<li class="list-inline-item col blockLabel">Fee</li> <li class="list-inline-item col blockLabel">Fee</li>
<li *ngIf="transaction.transactionType == 'sent'" class="list-inline-item col-8 blockText text-danger">{{ transaction.transactionFee | coinNotation }} {{ coinUnit }}</li> <li *ngIf="transaction.transactionType == 'sent'" class="list-inline-item col-8 blockText text-danger">{{ transaction.transactionFee | coinNotation }} {{ coinUnit }}</li>
</ul> </ul>
<ul class="list-inline row"> <ul class="list-inline row">
<li class="list-inline-item col blockLabel">Date</li> <li class="list-inline-item col blockLabel">Date</li>
...@@ -28,8 +32,8 @@ ...@@ -28,8 +32,8 @@
<li class="list-inline-item col-8 blockText">#{{ transaction.transactionConfirmedInBlock }}</li> <li class="list-inline-item col-8 blockText">#{{ transaction.transactionConfirmedInBlock }}</li>
</ul> </ul>
<ul class="list-inline row"> <ul class="list-inline row">
<li class="list-inline-item col blockLabel">Confirmations</li> <li class="list-inline-item col blockLabel">Confirmations</li>
<li class="list-inline-item col-8 blockText">{{ confirmations }}</li> <li class="list-inline-item col-8 blockText">{{ confirmations }}</li>
</ul> </ul>
<ul class="list-inline row"> <ul class="list-inline row">
<li class="list-inline-item col blockLabel mb-3">Transaction ID</li> <li class="list-inline-item col blockLabel mb-3">Transaction ID</li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment