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
f99a4a4f
Commit
f99a4a4f
authored
Sep 28, 2017
by
Pieterjan Vanhoof
Committed by
GitHub
Sep 28, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #259 from stratisproject/ui
Remove to/from from transaction details
parents
22459cad
a80a81de
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
22 deletions
+3
-22
transaction-info.ts
Breeze.UI/src/app/shared/classes/transaction-info.ts
+1
-3
dashboard.component.ts
Breeze.UI/src/app/wallet/dashboard/dashboard.component.ts
+1
-7
history.component.ts
Breeze.UI/src/app/wallet/history/history.component.ts
+1
-7
transaction-details.component.html
...et/transaction-details/transaction-details.component.html
+0
-5
No files found.
Breeze.UI/src/app/shared/classes/transaction-info.ts
View file @
f99a4a4f
export
class
TransactionInfo
{
constructor
(
transactionType
:
string
,
transactionId
:
string
,
transactionAmount
:
number
,
transaction
Address
:
any
,
transaction
Fee
:
number
,
transactionConfirmedInBlock
:
number
,
transactionTimestamp
:
number
)
{
constructor
(
transactionType
:
string
,
transactionId
:
string
,
transactionAmount
:
number
,
transactionFee
:
number
,
transactionConfirmedInBlock
:
number
,
transactionTimestamp
:
number
)
{
this
.
transactionType
=
transactionType
;
this
.
transactionId
=
transactionId
;
this
.
transactionAmount
=
transactionAmount
;
this
.
transactionAddress
=
transactionAddress
;
this
.
transactionFee
=
transactionFee
;
this
.
transactionConfirmedInBlock
=
transactionConfirmedInBlock
;
this
.
transactionTimestamp
=
transactionTimestamp
;
...
...
@@ -13,7 +12,6 @@ export class TransactionInfo {
public
transactionType
:
string
;
public
transactionId
:
string
;
public
transactionAmount
:
number
;
public
transactionAddress
:
string
;
public
transactionFee
:
number
;
public
transactionConfirmedInBlock
?:
number
;
public
transactionTimestamp
:
number
;
...
...
Breeze.UI/src/app/wallet/dashboard/dashboard.component.ts
View file @
f99a4a4f
...
...
@@ -132,18 +132,12 @@ export class DashboardComponent implements OnInit {
}
let
transactionId
=
transaction
.
id
;
let
transactionAmount
=
transaction
.
amount
;
let
transactionAddress
;
if
(
transaction
.
payments
[
0
])
{
transactionAddress
=
transaction
.
payments
[
0
].
destinationAddress
;
}
else
if
(
transaction
.
toAddress
)
{
transactionAddress
=
transaction
.
toAddress
;
}
let
transactionFee
=
transaction
.
fee
;
let
transactionConfirmedInBlock
=
transaction
.
confirmedInBlock
;
let
transactionTimestamp
=
transaction
.
timestamp
;
let
transactionConfirmed
;
this
.
transactionArray
.
push
(
new
TransactionInfo
(
transactionType
,
transactionId
,
transactionAmount
,
transaction
Address
,
transaction
Fee
,
transactionConfirmedInBlock
,
transactionTimestamp
));
this
.
transactionArray
.
push
(
new
TransactionInfo
(
transactionType
,
transactionId
,
transactionAmount
,
transactionFee
,
transactionConfirmedInBlock
,
transactionTimestamp
));
}
}
...
...
Breeze.UI/src/app/wallet/history/history.component.ts
View file @
f99a4a4f
...
...
@@ -88,18 +88,12 @@ export class HistoryComponent {
}
let
transactionId
=
transaction
.
id
;
let
transactionAmount
=
transaction
.
amount
;
let
transactionAddress
;
if
(
transaction
.
payments
[
0
])
{
transactionAddress
=
transaction
.
payments
[
0
].
destinationAddress
;
}
else
if
(
transaction
.
toAddress
)
{
transactionAddress
=
transaction
.
toAddress
;
}
let
transactionFee
=
transaction
.
fee
;
let
transactionConfirmedInBlock
=
transaction
.
confirmedInBlock
;
let
transactionTimestamp
=
transaction
.
timestamp
;
let
transactionConfirmed
;
this
.
transactions
.
push
(
new
TransactionInfo
(
transactionType
,
transactionId
,
transactionAmount
,
transaction
Address
,
transaction
Fee
,
transactionConfirmedInBlock
,
transactionTimestamp
));
this
.
transactions
.
push
(
new
TransactionInfo
(
transactionType
,
transactionId
,
transactionAmount
,
transactionFee
,
transactionConfirmedInBlock
,
transactionTimestamp
));
}
}
...
...
Breeze.UI/src/app/wallet/transaction-details/transaction-details.component.html
View file @
f99a4a4f
...
...
@@ -15,11 +15,6 @@
<li
*
ngIf=
"transaction.transactionType == 'received'"
class=
"list-inline-item col-9 blockText text-success"
>
{{ transaction.transactionAmount | coinNotation }} {{ coinUnit }}
</li>
<li
*
ngIf=
"transaction.transactionType == 'sent'"
class=
"list-inline-item col-9 blockText text-danger"
>
-{{ transaction.transactionAmount | coinNotation }} {{ coinUnit }}
</li>
</ul>
<ul
class=
"list-inline row"
>
<li
*
ngIf=
"transaction.transactionType == 'received'"
class=
"list-inline-item col blockLabel"
>
From
</li>
<li
*
ngIf=
"transaction.transactionType == 'sent'"
class=
"list-inline-item col blockLabel"
>
To
</li>
<li
class=
"list-inline-item col-9 blockText"
><code>
{{ transaction.transactionAddress }}
</code></li>
</ul>
<ul
class=
"list-inline row"
>
<li
class=
"list-inline-item col blockLabel"
>
Date
</li>
<li
class=
"list-inline-item col-9 blockText"
>
{{ transaction.transactionTimestamp * 1000 | date:'medium' }}
</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