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

Merge branch 'predevelop' into develop

Browse source
This commit is contained in:
sowle 2020-06-29 14:26:31 +03:00
commit 0cd37daaff
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
6 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
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

4
src/gui/qt-daemon/html_source/src/app/send/send.component.html
View file

@ -76,8 +76,8 @@
</div>
</div>
<div class="checkbox-block">
<input type="checkbox" id="send-hide" class="style-checkbox" formControlName="hide">
<div class="checkbox-block" [ngClass]="{'disabled-checkbox-block': hideWalletAddress}">
<input type="checkbox" id="send-hide" class="style-checkbox" formControlName="hide" [checked]= "hideWalletAddress">
<label for="send-hide">{{ 'SEND.HIDE' | translate }}</label>
</div>

9
src/gui/qt-daemon/html_source/src/app/send/send.component.scss
View file

@ -73,6 +73,15 @@
> label {
top: 3.5rem;
}
&.disabled-checkbox-block {
label {
cursor: not-allowed;
&:before {
background-color: #556576;
border: 0.1rem solid #556576;
}
}
}
}
}

5
src/gui/qt-daemon/html_source/src/app/send/send.component.ts
View file

@ -17,6 +17,7 @@ export class SendComponent implements OnInit, OnDestroy {
isOpen = false;
localAliases = [];
isModalDialogVisible = false;
hideWalletAddress = false;
mixin: number;
currentWalletId = null;
@ -123,6 +124,10 @@ export class SendComponent implements OnInit, OnDestroy {
this.mixin = 0;
this.sendForm.controls['mixin'].disable();
}
this.hideWalletAddress = this.variablesService.currentWallet.is_auditable && !this.variablesService.currentWallet.is_watch_only;
if (this.hideWalletAddress) {
this.sendForm.controls['hide'].disable();
}
this.sendForm.reset({
address: this.variablesService.currentWallet.send_data['address'],
amount: this.variablesService.currentWallet.send_data['amount'],

22
src/gui/qt-daemon/html_source/src/app/wallet/wallet.component.html
View file

@ -1,16 +1,18 @@
<div class="header">
<div>
<h3 tooltip="{{ variablesService.currentWallet.name }}" placement="bottom-left" tooltipClass="table-tooltip" [delay]="500" [showWhenNoOverflow]="false">{{variablesService.currentWallet.name}}</h3>
<button [routerLink]="['/assign-alias']" *ngIf="!variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2 && variablesService.currentWallet.alias_available">
<i class="icon account"></i>
<span>{{ 'WALLET.REGISTER_ALIAS' | translate }}</span>
</button>
<div class="alias" *ngIf="variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2">
<span>{{variablesService.currentWallet.alias['name']}}</span>
<ng-container *ngIf="variablesService.currentWallet.alias_available">
<i class="icon edit" [routerLink]="['/edit-alias']" tooltip="{{ 'WALLET.TOOLTIPS.EDIT_ALIAS' | translate }}" placement="bottom-right" tooltipClass="table-tooltip account-tooltip" [delay]="500" [timeDelay]="500"></i>
<i class="icon transfer" [routerLink]="['/transfer-alias']" tooltip="{{ 'WALLET.TOOLTIPS.TRANSFER_ALIAS' | translate }}" placement="right" tooltipClass="table-tooltip account-tooltip" [delay]="500" [timeDelay]="500"></i>
</ng-container>
<div *ngIf="!variablesService.currentWallet.is_auditable">
<button [routerLink]="['/assign-alias']" *ngIf="!variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2 && variablesService.currentWallet.alias_available">
<i class="icon account"></i>
<span>{{ 'WALLET.REGISTER_ALIAS' | translate }}</span>
</button>
<div class="alias" *ngIf="variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2">
<span>{{variablesService.currentWallet.alias['name']}}</span>
<ng-container *ngIf="variablesService.currentWallet.alias_available">
<i class="icon edit" [routerLink]="['/edit-alias']" tooltip="{{ 'WALLET.TOOLTIPS.EDIT_ALIAS' | translate }}" placement="bottom-right" tooltipClass="table-tooltip account-tooltip" [delay]="500" [timeDelay]="500"></i>
<i class="icon transfer" [routerLink]="['/transfer-alias']" tooltip="{{ 'WALLET.TOOLTIPS.TRANSFER_ALIAS' | translate }}" placement="right" tooltipClass="table-tooltip account-tooltip" [delay]="500" [timeDelay]="500"></i>
</ng-container>
</div>
</div>
</div>
<div>