Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Breeze
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DeStream-public
Breeze
Commits
0385ae83
Commit
0385ae83
authored
Nov 13, 2018
by
Maxim Bogdanov
🙉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Latest transactions fixed, visual aspect improvements.
parent
08c08316
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
13 deletions
+21
-13
dashboard.component.ts
Breeze.UI/src/app/wallet/dashboard/dashboard.component.ts
+2
-2
send.component.html
Breeze.UI/src/app/wallet/send/send.component.html
+4
-4
sidebar.component.html
Breeze.UI/src/app/wallet/sidebar/sidebar.component.html
+1
-1
transaction-details.component.css
...let/transaction-details/transaction-details.component.css
+4
-0
transaction-details.component.html
...et/transaction-details/transaction-details.component.html
+10
-6
No files found.
Breeze.UI/src/app/wallet/dashboard/dashboard.component.ts
View file @
0385ae83
...
...
@@ -101,8 +101,8 @@ export class DashboardComponent implements OnInit {
response
=>
{
if
(
response
.
status
>=
200
&&
response
.
status
<
400
)
{
const
json
=
response
.
json
();
if
(
json
.
transactionsHistory
)
{
historyResponse
=
json
.
transactionsHistory
;
if
(
json
&&
json
.
history
.
length
)
{
historyResponse
=
json
.
history
[
0
].
transactionsHistory
;
this
.
getTransactionInfo
(
historyResponse
);
}
}
...
...
Breeze.UI/src/app/wallet/send/send.component.html
View file @
0385ae83
...
...
@@ -21,9 +21,9 @@
<div
*
ngIf=
"formErrors.address"
class=
"form-control-feedback"
>
{{ formErrors.address }}
</div>
</div>
<div
class=
"form-group clearfix"
>
<
label>
Transaction Fee
</label
>
<
!--<label>Transaction Fee</label>--
>
<!-- 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">
<input ngbButton type="radio" value="low">Low/Slow
</label>
...
...
@@ -33,11 +33,11 @@
<label ngbButtonLabel class="btn btn-outline-success">
<input ngbButton type="radio" value="high">High/Fast
</label>
</div>
</div>
-->
<!-- /fee buttons -->
<div
class=
"form-group clearfix"
>
<div
*
ngIf=
"estimatedFee"
>
<label>
Estimated
Fee:
</label>
<label>
Transaction
Fee:
</label>
<label>
{{ estimatedFee | coinNotation }} {{ coinUnit }}
</label>
</div>
</div>
...
...
Breeze.UI/src/app/wallet/sidebar/sidebar.component.html
View file @
0385ae83
...
...
@@ -3,7 +3,7 @@
<!-- menu-->
<ul
class=
"list-unstyled menu"
>
<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>
</li>
</ul>
...
...
Breeze.UI/src/app/wallet/transaction-details/transaction-details.component.css
View file @
0385ae83
.bubble
.modal-header-logo
img
{
height
:
36px
;
margin-top
:
-17px
;
}
Breeze.UI/src/app/wallet/transaction-details/transaction-details.component.html
View file @
0385ae83
<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>
<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
class=
"modal-body"
>
<h5
class=
"modal-title text-uppercase"
id=
"modalDetail"
>
Transaction Details
</h5>
...
...
@@ -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>
</ul>
<ul
class=
"list-inline row"
*
ngIf=
"transaction.transactionType == 'sent'"
>
<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
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>
</ul>
<ul
class=
"list-inline row"
>
<li
class=
"list-inline-item col blockLabel"
>
Date
</li>
...
...
@@ -28,8 +32,8 @@
<li
class=
"list-inline-item col-8 blockText"
>
#{{ transaction.transactionConfirmedInBlock }}
</li>
</ul>
<ul
class=
"list-inline row"
>
<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 blockLabel"
>
Confirmations
</li>
<li
class=
"list-inline-item col-8 blockText"
>
{{ confirmations }}
</li>
</ul>
<ul
class=
"list-inline row"
>
<li
class=
"list-inline-item col blockLabel mb-3"
>
Transaction ID
</li>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment