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

send money to alias

Browse source
This commit is contained in:
wildkif 2019-04-17 17:12:32 +03:00
parent cf40f69126
commit 1b43f9e4e2
12 changed files with 290 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -245,6 +245,7 @@
"FORM_ERRORS": {
"ADDRESS_REQUIRED": "Address is required.",
"ADDRESS_NOT_VALID": "Address not valid.",
"ALIAS_NOT_VALID": "Alias not valid.",
"AMOUNT_REQUIRED": "Amount is required.",
"AMOUNT_ZERO": "Amount is zero.",
"FEE_REQUIRED": "Fee is required.",

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

@ -92,6 +92,24 @@ app-send {
.form-send {
.input-block-address {
.address-dropdown {
@include themify($themes) {
background-color: themed(inputBackgroundColor);
color: themed(mainTextColor);
}
div:hover {
@include themify($themes) {
background-color: themed(selectHoverColor);
}
}
}
}
.send-select {
@include themify($themes) {
@ -178,7 +196,7 @@ app-history {
}
}
.status.send {
.status.send {
.icon {
background-color: #ff5252;

133
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/models/wallet.model.ts
View file

@ -79,7 +79,7 @@ export class Wallet {
item.sortFee = new BigNumber(0);
} else if ((item.hasOwnProperty('contract') && (item.contract[0].state === 3 || item.contract[0].state === 6 || item.contract[0].state === 601) && !item.contract[0].is_a)) {
item.sortFee = item.fee.negated();
item.sortAmount = item.amount.negated();
item.sortAmount = item.amount;
} else {
if (!item.is_income) {
item.sortFee = item.fee.negated();

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

@ -1,8 +1,14 @@
<form class="form-send" [formGroup]="sendForm" (ngSubmit)="onSend()">
<div class="input-block">
<div class="input-block input-block-address">
<label for="send-address">{{ 'SEND.ADDRESS' | translate }}</label>
<input type="text" id="send-address" formControlName="address" (contextmenu)="variablesService.onContextMenu($event)">
<input type="text" id="send-address" formControlName="address" (mousedown)="addressMouseDown($event)" (contextmenu)="variablesService.onContextMenu($event)">
<div class="address-dropdown scrolled-content" *ngIf="isOpen">
<div *ngFor="let item of localAliases" (click)="setAlias(item.name)">{{item.name}}</div>
</div>
<div class="error-block" *ngIf="sendForm.controls['address'].invalid && (sendForm.controls['address'].dirty || sendForm.controls['address'].touched)">
<div *ngIf="sendForm.controls['address'].errors['required']">
{{ 'SEND.FORM_ERRORS.ADDRESS_REQUIRED' | translate }}
@ -10,6 +16,9 @@
<div *ngIf="sendForm.controls['address'].errors['address_not_valid']">
{{ 'SEND.FORM_ERRORS.ADDRESS_NOT_VALID' | translate }}
</div>
<div *ngIf="sendForm.controls['address'].errors['alias_not_valid']">
{{ 'SEND.FORM_ERRORS.ALIAS_NOT_VALID' | translate }}
</div>
</div>
</div>

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

@ -4,6 +4,23 @@
.form-send {
.input-block-address {
position: relative;
.address-dropdown {
position: absolute;
top: 6.5rem;
max-height: 10rem;
overflow: auto;
width: 100%;
div {
font-size: 1.4rem;
padding: 1rem;
}
}
}
.input-blocks-row {
display: flex;

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

@ -1,4 +1,4 @@
import {Component, OnInit, OnDestroy, NgZone} from '@angular/core';
import {Component, OnInit, OnDestroy, NgZone, HostListener} from '@angular/core';
import {FormGroup, FormControl, Validators} from '@angular/forms';
import {ActivatedRoute} from '@angular/router';
import {BackendService} from '../_helpers/services/backend.service';
@ -13,26 +13,57 @@ import {BigNumber} from 'bignumber.js';
})
export class SendComponent implements OnInit, OnDestroy {
isOpen = false;
localAliases = [];
currentWalletId = null;
parentRouting;
sendForm = new FormGroup({
address: new FormControl('', [Validators.required, (g: FormControl) => {
this.localAliases = [];
if (g.value) {
this.backend.validateAddress(g.value, (valid_status) => {
this.ngZone.run(() => {
if (valid_status === false) {
g.setErrors(Object.assign({'address_not_valid': true}, g.errors) );
} else {
if (g.hasError('address_not_valid')) {
delete g.errors['address_not_valid'];
if (Object.keys(g.errors).length === 0) {
g.setErrors(null);
if (g.value.indexOf('@') !== 0) {
this.isOpen = false;
this.backend.validateAddress(g.value, (valid_status) => {
this.ngZone.run(() => {
if (valid_status === false) {
g.setErrors(Object.assign({'address_not_valid': true}, g.errors));
} else {
if (g.hasError('address_not_valid')) {
delete g.errors['address_not_valid'];
if (Object.keys(g.errors).length === 0) {
g.setErrors(null);
}
}
}
}
});
});
});
return (g.hasError('address_not_valid')) ? {'address_not_valid': true} : null;
return (g.hasError('address_not_valid')) ? {'address_not_valid': true} : null;
} else {
this.isOpen = true;
this.localAliases = this.variablesService.aliases.filter((item) => {
return item.name.indexOf(g.value) > -1;
});
if (!(/^@?[a-z0-9\.\-]{6,25}$/.test(g.value))) {
g.setErrors(Object.assign({'alias_not_valid': true}, g.errors));
} else {
this.backend.getAliasByName(g.value.replace('@', ''), (alias_status) => {
this.ngZone.run(() => {
if (alias_status) {
if (g.hasError('alias_not_valid')) {
delete g.errors['alias_not_valid'];
if (Object.keys(g.errors).length === 0) {
g.setErrors(null);
}
}
} else {
g.setErrors(Object.assign({'alias_not_valid': true}, g.errors));
}
});
});
}
return (g.hasError('alias_not_valid')) ? {'alias_not_valid': true} : null;
}
}
return null;
}]),
@ -56,10 +87,29 @@ export class SendComponent implements OnInit, OnDestroy {
constructor(
private route: ActivatedRoute,
private backend: BackendService,
private variablesService: VariablesService,
public variablesService: VariablesService,
private modalService: ModalService,
private ngZone: NgZone
) {}
) {
}
addressMouseDown(e) {
if (e['button'] === 0 && this.sendForm.get('address').value && this.sendForm.get('address').value.indexOf('@') === 0) {
this.isOpen = true;
}
}
setAlias(alias) {
this.sendForm.get('address').setValue(alias);
}
@HostListener('document:click', ['$event.target'])
public onClick(targetElement) {
if (targetElement.id !== 'send-address' && this.isOpen) {
this.isOpen = false;
}
}
ngOnInit() {
this.parentRouting = this.route.parent.params.subscribe(params => {
@ -76,28 +126,55 @@ export class SendComponent implements OnInit, OnDestroy {
onSend() {
if (this.sendForm.valid) {
this.backend.validateAddress(this.sendForm.get('address').value, (valid_status) => {
if (valid_status === false) {
this.ngZone.run(() => {
this.sendForm.get('address').setErrors({address_not_valid: true});
});
} else {
this.backend.sendMoney(
this.currentWalletId,
this.sendForm.get('address').value,
this.sendForm.get('amount').value,
this.sendForm.get('fee').value,
this.sendForm.get('mixin').value,
this.sendForm.get('comment').value,
(send_status, send_data) => {
if (send_status) {
this.modalService.prepareModal('success', 'SEND.SUCCESS_SENT');
this.variablesService.currentWallet.send_data = {address: null, amount: null, comment: null, mixin: null, fee: null};
this.sendForm.reset({address: null, amount: null, comment: null, mixin: 0, fee: this.variablesService.default_fee});
}
if (this.sendForm.get('address').value.indexOf('@') !== 0) {
this.backend.validateAddress(this.sendForm.get('address').value, (valid_status) => {
if (valid_status === false) {
this.ngZone.run(() => {
this.sendForm.get('address').setErrors({'address_not_valid': true});
});
}
});
} else {
this.backend.sendMoney(
this.currentWalletId,
this.sendForm.get('address').value,
this.sendForm.get('amount').value,
this.sendForm.get('fee').value,
this.sendForm.get('mixin').value,
this.sendForm.get('comment').value,
(send_status) => {
if (send_status) {
this.modalService.prepareModal('success', 'SEND.SUCCESS_SENT');
this.variablesService.currentWallet.send_data = {address: null, amount: null, comment: null, mixin: null, fee: null};
this.sendForm.reset({address: null, amount: null, comment: null, mixin: 0, fee: this.variablesService.default_fee});
}
});
}
});
} else {
this.backend.getAliasByName(this.sendForm.get('address').value.replace('@', ''), (alias_status, alias_data) => {
this.ngZone.run(() => {
if (alias_status === false) {
this.ngZone.run(() => {
this.sendForm.get('address').setErrors({'alias_not_valid': true});
});
} else {
this.backend.sendMoney(
this.currentWalletId,
alias_data.address, // this.sendForm.get('address').value,
this.sendForm.get('amount').value,
this.sendForm.get('fee').value,
this.sendForm.get('mixin').value,
this.sendForm.get('comment').value,
(send_status) => {
if (send_status) {
this.modalService.prepareModal('success', 'SEND.SUCCESS_SENT');
this.variablesService.currentWallet.send_data = {address: null, amount: null, comment: null, mixin: null, fee: null};
this.sendForm.reset({address: null, amount: null, comment: null, mixin: 0, fee: this.variablesService.default_fee});
}
});
}
});
});
}
}
}
@ -113,7 +190,7 @@ export class SendComponent implements OnInit, OnDestroy {
comment: this.sendForm.get('comment').value,
mixin: this.sendForm.get('mixin').value,
fee: this.sendForm.get('fee').value
}
};
}
}

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

@ -245,6 +245,7 @@
"FORM_ERRORS": {
"ADDRESS_REQUIRED": "Address is required.",
"ADDRESS_NOT_VALID": "Address not valid.",
"ALIAS_NOT_VALID": "Alias not valid.",
"AMOUNT_REQUIRED": "Amount is required.",
"AMOUNT_ZERO": "Amount is zero.",
"FEE_REQUIRED": "Fee is required.",

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

@ -92,6 +92,24 @@ app-send {
.form-send {
.input-block-address {
.address-dropdown {
@include themify($themes) {
background-color: themed(inputBackgroundColor);
color: themed(mainTextColor);
}
div:hover {
@include themify($themes) {
background-color: themed(selectHoverColor);
}
}
}
}
.send-select {
@include themify($themes) {
@ -178,7 +196,7 @@ app-history {
}
}
.status.send {
.status.send {
.icon {
background-color: #ff5252;