Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Mark locked transaction visual part & mining reward notification

Browse source
This commit is contained in:
wildkif 2019-05-21 18:34:09 +03:00
parent a31178a4db
commit 8ee0ff7402
15 changed files with 110 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/qt-daemon/html/assets/i18n/en.json
View file

@ -278,6 +278,7 @@
"HISTORY": {
"STATUS": "Status",
"STATUS_TOOLTIP": "Confirmations {{current}}/{{total}}",
"LOCK_TOOLTIP": "Locked till {{date}}",
"SEND": "Sent",
"RECEIVED": "Received",
"DATE": "Date",
@ -301,7 +302,8 @@
"COMPLETE_SELLER": "Successfully complete contract, receive payment on contract, and return pledge",
"CREATE_ALIAS": "Fee for assigning alias",
"UPDATE_ALIAS": "Fee for editing alias",
"MINED": "Mined funds",
"POW_REWARD": "POW reward",
"POS_REWARD": "POS reward",
"CREATE_CONTRACT": "Send contract offer",
"PLEDGE_CONTRACT": "Make pledge on offer",
"NULLIFY_CONTRACT": "Nullify pledges for contract",

10
src/gui/qt-daemon/html/assets/icons/lock-transaction.svg Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<path class="st0" d="M26,15v-5c0-5.5-4.5-10-10-10h-0.1c-5.5,0-10,4.5-10,10v5H3v17h12.9H16h13V15H26z M9.9,10c0-3.3,2.7-6,6-6H16
c3.3,0,6,2.7,6,6v5H9.9V10z M14,27v-7h4v7H14z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 582 B

28
src/gui/qt-daemon/html/assets/scss/layout/_wallet.scss
View file

@ -140,6 +140,13 @@ app-history {
tr {
&.locked-transaction {
@include themify($themes) {
color: themed(optionalTextColor);
}
}
&:nth-child(4n+1) {
@include themify($themes) {
@ -185,17 +192,30 @@ app-history {
}
}
.lock-transaction {
@include themify($themes) {
background-color: themed(orangeTextColor);
}
}
.status.send {
.icon {
background-color: #ff5252;
.status-transaction {
@include themify($themes) {
background-color: themed(redTextColor);
}
}
}
.status.received {
.icon {
background-color: #00c853;
.status-transaction {
@include themify($themes) {
background-color: themed(greenTextColor);
}
}
}
}

10
src/gui/qt-daemon/html/lock-transaction.svg Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<path class="st0" d="M26,15v-5c0-5.5-4.5-10-10-10h-0.1c-5.5,0-10,4.5-10,10v5H3v17h12.9H16h13V15H26z M9.9,10c0-3.3,2.7-6,6-6H16
c3.3,0,6,2.7,6,6v5H9.9V10z M14,27v-7h4v7H14z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 582 B

6
src/gui/qt-daemon/html/main.js
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/main.js.map
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/styles.js
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/styles.js.map
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html_source/src/app/_helpers/pipes/history-type-messages.pipe.ts
View file

@ -43,7 +43,7 @@ export class HistoryTypeMessagesPipe implements PipeTransform {
case 5:
return this.translate.instant('HISTORY.TYPE_MESSAGES.UPDATE_ALIAS');
case 6:
return this.translate.instant('HISTORY.TYPE_MESSAGES.MINED');
return (item.td['spn'] && item.td['spn'].length) ? this.translate.instant('HISTORY.TYPE_MESSAGES.POS_REWARD') : this.translate.instant('HISTORY.TYPE_MESSAGES.POW_REWARD');
case 7:
return this.translate.instant('HISTORY.TYPE_MESSAGES.CREATE_CONTRACT');
case 8:

7
src/gui/qt-daemon/html_source/src/app/history/history.component.html
View file

@ -12,7 +12,7 @@
</thead>
<tbody>
<ng-container *ngFor="let item of variablesService.currentWallet.history">
<tr (click)="openDetails(item.tx_hash)">
<tr (click)="openDetails(item.tx_hash)" [class.locked-transaction]="false">
<td>
<div class="status" [class.send]="!item.is_income" [class.received]="item.is_income">
<ng-container *ngIf="variablesService.height_app - item.height < 10 || item.height === 0 && item.timestamp > 0">
@ -20,7 +20,10 @@
<div class="fill" [style.height]="getHeight(item) + '%'"></div>
</div>
</ng-container>
<i class="icon"></i>
<ng-container *ngIf="false">
<i class="icon lock-transaction" tooltip="{{ 'HISTORY.LOCK_TOOLTIP' | translate : {'date': item.timestamp * 1000 | date : 'MM.dd.yy'} }}" placement="bottom-left" tooltipClass="table-tooltip" [delay]="500"></i>
</ng-container>
<i class="icon status-transaction"></i>
<span>{{ (item.is_income ? 'HISTORY.RECEIVED' : 'HISTORY.SEND') | translate }}</span>
</div>
</td>

16
src/gui/qt-daemon/html_source/src/app/history/history.component.scss
View file

@ -35,7 +35,17 @@
}
}
.icon {
.lock-transaction {
position: absolute;
top: 50%;
left: -2rem;
transform: translateY(-50%);
mask: url(../../assets/icons/lock-transaction.svg) no-repeat center;
width: 1.2rem;
height: 1.2rem;
}
.status-transaction {
margin-right: 1rem;
width: 1.7rem;
height: 1.7rem;
@ -43,14 +53,14 @@
&.send {
.icon {
.status-transaction {
mask: url(../../assets/icons/send.svg) no-repeat center;
}
}
&.received {
.icon {
.status-transaction {
mask: url(../../assets/icons/receive.svg) no-repeat center;
}
}

2
src/gui/qt-daemon/html_source/src/app/history/history.component.ts
View file

@ -15,7 +15,7 @@ export class HistoryComponent implements OnInit, OnDestroy, AfterViewChecked {
constructor(
private route: ActivatedRoute,
private variablesService: VariablesService
public variablesService: VariablesService
) {}
ngOnInit() {

4
src/gui/qt-daemon/html_source/src/assets/i18n/en.json
View file

@ -278,6 +278,7 @@
"HISTORY": {
"STATUS": "Status",
"STATUS_TOOLTIP": "Confirmations {{current}}/{{total}}",
"LOCK_TOOLTIP": "Locked till {{date}}",
"SEND": "Sent",
"RECEIVED": "Received",
"DATE": "Date",
@ -301,7 +302,8 @@
"COMPLETE_SELLER": "Successfully complete contract, receive payment on contract, and return pledge",
"CREATE_ALIAS": "Fee for assigning alias",
"UPDATE_ALIAS": "Fee for editing alias",
"MINED": "Mined funds",
"POW_REWARD": "POW reward",
"POS_REWARD": "POS reward",
"CREATE_CONTRACT": "Send contract offer",
"PLEDGE_CONTRACT": "Make pledge on offer",
"NULLIFY_CONTRACT": "Nullify pledges for contract",

10
src/gui/qt-daemon/html_source/src/assets/icons/lock-transaction.svg Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<path class="st0" d="M26,15v-5c0-5.5-4.5-10-10-10h-0.1c-5.5,0-10,4.5-10,10v5H3v17h12.9H16h13V15H26z M9.9,10c0-3.3,2.7-6,6-6H16
c3.3,0,6,2.7,6,6v5H9.9V10z M14,27v-7h4v7H14z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 582 B

28
src/gui/qt-daemon/html_source/src/assets/scss/layout/_wallet.scss
View file

@ -140,6 +140,13 @@ app-history {
tr {
&.locked-transaction {
@include themify($themes) {
color: themed(optionalTextColor);
}
}
&:nth-child(4n+1) {
@include themify($themes) {
@ -185,17 +192,30 @@ app-history {
}
}
.lock-transaction {
@include themify($themes) {
background-color: themed(orangeTextColor);
}
}
.status.send {
.icon {
background-color: #ff5252;
.status-transaction {
@include themify($themes) {
background-color: themed(redTextColor);
}
}
}
.status.received {
.icon {
background-color: #00c853;
.status-transaction {
@include themify($themes) {
background-color: themed(greenTextColor);
}
}
}
}