1
0
Fork 0
forked from lthn/blockchain

context menu on alias pages

This commit is contained in:
wildkif 2019-02-20 17:25:26 +02:00
parent 43c5641d30
commit 8039204ada
12 changed files with 33 additions and 57 deletions

View file

@ -2170,7 +2170,6 @@ var VariablesService = /** @class */ (function () {
this.wallets = [];
this.aliases = [];
this.aliasesChecked = {};
this.aliasesUnconfirmed = [];
this.enableAliasSearch = false;
this.getHeightAppEvent = new rxjs__WEBPACK_IMPORTED_MODULE_1__["BehaviorSubject"](null);
this.getRefreshStackingEvent = new rxjs__WEBPACK_IMPORTED_MODULE_1__["BehaviorSubject"](null);
@ -2590,6 +2589,7 @@ var AppComponent = /** @class */ (function () {
wallet.balance = data.balance;
wallet.unlocked_balance = data.unlocked_balance;
wallet.mined_total = data.minied_total;
wallet.alias_available = data.is_alias_operations_available;
});
}
});
@ -2651,18 +2651,6 @@ var AppComponent = /** @class */ (function () {
if (!data.ti) {
return;
}
if (_this.variablesService.aliasesUnconfirmed.length) {
var alias = false;
for (var i = 0; i < _this.variablesService.aliasesUnconfirmed.length; i++) {
if (_this.variablesService.aliasesUnconfirmed[i].tx_hash === data.ti.tx_hash) {
alias = _this.variablesService.aliasesUnconfirmed[i];
break;
}
}
if (alias) {
_this.variablesService.aliasesUnconfirmed.splice(_this.variablesService.aliasesUnconfirmed.indexOf(alias), 1);
}
}
var wallet_id = data.wallet_id;
var tr_info = data.ti;
var wallet = _this.variablesService.getWallet(wallet_id);
@ -3297,7 +3285,7 @@ var AppModule = /** @class */ (function () {
/*! no static exports found */
/***/ (function(module, exports) {
module.exports = "<div class=\"content\">\r\n\r\n <div class=\"head\">\r\n <div class=\"breadcrumbs\">\r\n <span [routerLink]=\"['/wallet/' + wallet.wallet_id + '/history']\">{{ wallet.name }}</span>\r\n <span>{{ 'BREADCRUMBS.ASSIGN_ALIAS' | translate }}</span>\r\n </div>\r\n <button class=\"back-btn\" (click)=\"back()\">\r\n <i class=\"icon back\"></i>\r\n <span>{{ 'COMMON.BACK' | translate }}</span>\r\n </button>\r\n </div>\r\n\r\n <form class=\"form-assign\" [formGroup]=\"assignForm\">\r\n\r\n <div class=\"input-block alias-name\">\r\n <label for=\"alias-name\" tooltip=\"{{ 'ASSIGN_ALIAS.NAME.TOOLTIP' | translate }}\" placement=\"bottom\" tooltipClass=\"table-tooltip assign-alias-tooltip\" [delay]=\"500\">\r\n {{ 'ASSIGN_ALIAS.NAME.LABEL' | translate }}\r\n </label>\r\n <input type=\"text\" id=\"alias-name\" formControlName=\"name\" placeholder=\"{{ 'ASSIGN_ALIAS.NAME.PLACEHOLDER' | translate }}\">\r\n <div class=\"error-block\" *ngIf=\"assignForm.controls['name'].invalid && (assignForm.controls['name'].dirty || assignForm.controls['name'].touched)\">\r\n <div *ngIf=\"assignForm.controls['name'].errors['required']\">\r\n {{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_REQUIRED' | translate }}\r\n </div>\r\n <div *ngIf=\"assignForm.controls['name'].errors['pattern'] && assignForm.get('name').value.length > 6 && assignForm.get('name').value.length <= 25\">\r\n {{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_WRONG' | translate }}\r\n </div>\r\n <div *ngIf=\"assignForm.get('name').value.length <= 6 || assignForm.get('name').value.length > 25\">\r\n {{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_LENGTH' | translate }}\r\n </div>\r\n </div>\r\n <div class=\"error-block\" *ngIf=\"alias.exists\">\r\n <div>\r\n {{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_EXISTS' | translate }}\r\n </div>\r\n </div>\r\n </div>\r\n\r\n <div class=\"input-block textarea\">\r\n <label for=\"alias-comment\" tooltip=\"{{ 'ASSIGN_ALIAS.COMMENT.TOOLTIP' | translate }}\" placement=\"bottom\" tooltipClass=\"table-tooltip assign-alias-tooltip\" [delay]=\"500\">\r\n {{ 'ASSIGN_ALIAS.COMMENT.LABEL' | translate }}\r\n </label>\r\n <textarea id=\"alias-comment\" formControlName=\"comment\" placeholder=\"{{ 'ASSIGN_ALIAS.COMMENT.PLACEHOLDER' | translate }}\"></textarea>\r\n </div>\r\n\r\n <div class=\"alias-cost\">{{ \"ASSIGN_ALIAS.COST\" | translate : {value: alias.price | intToMoney, currency: variablesService.defaultCurrency} }}</div>\r\n\r\n <div class=\"wrap-buttons\">\r\n <button type=\"button\" class=\"blue-button\" (click)=\"assignAlias()\" [disabled]=\"!assignForm.valid || !canRegister || notEnoughMoney\">{{ 'ASSIGN_ALIAS.BUTTON_ASSIGN' | translate }}</button>\r\n <button type=\"button\" class=\"blue-button\" (click)=\"back()\">{{ 'ASSIGN_ALIAS.BUTTON_CANCEL' | translate }}</button>\r\n </div>\r\n\r\n </form>\r\n\r\n</div>\r\n\r\n"
module.exports = "<div class=\"content\">\r\n\r\n <div class=\"head\">\r\n <div class=\"breadcrumbs\">\r\n <span [routerLink]=\"['/wallet/' + wallet.wallet_id + '/history']\">{{ wallet.name }}</span>\r\n <span>{{ 'BREADCRUMBS.ASSIGN_ALIAS' | translate }}</span>\r\n </div>\r\n <button class=\"back-btn\" (click)=\"back()\">\r\n <i class=\"icon back\"></i>\r\n <span>{{ 'COMMON.BACK' | translate }}</span>\r\n </button>\r\n </div>\r\n\r\n <form class=\"form-assign\" [formGroup]=\"assignForm\">\r\n\r\n <div class=\"input-block alias-name\">\r\n <label for=\"alias-name\" tooltip=\"{{ 'ASSIGN_ALIAS.NAME.TOOLTIP' | translate }}\" placement=\"bottom\" tooltipClass=\"table-tooltip assign-alias-tooltip\" [delay]=\"500\">\r\n {{ 'ASSIGN_ALIAS.NAME.LABEL' | translate }}\r\n </label>\r\n <input type=\"text\" id=\"alias-name\" formControlName=\"name\" placeholder=\"{{ 'ASSIGN_ALIAS.NAME.PLACEHOLDER' | translate }}\" (contextmenu)=\"variablesService.onContextMenu($event)\">\r\n <div class=\"error-block\" *ngIf=\"assignForm.controls['name'].invalid && (assignForm.controls['name'].dirty || assignForm.controls['name'].touched)\">\r\n <div *ngIf=\"assignForm.controls['name'].errors['required']\">\r\n {{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_REQUIRED' | translate }}\r\n </div>\r\n <div *ngIf=\"assignForm.controls['name'].errors['pattern'] && assignForm.get('name').value.length > 6 && assignForm.get('name').value.length <= 25\">\r\n {{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_WRONG' | translate }}\r\n </div>\r\n <div *ngIf=\"assignForm.get('name').value.length <= 6 || assignForm.get('name').value.length > 25\">\r\n {{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_LENGTH' | translate }}\r\n </div>\r\n </div>\r\n <div class=\"error-block\" *ngIf=\"alias.exists\">\r\n <div>\r\n {{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_EXISTS' | translate }}\r\n </div>\r\n </div>\r\n </div>\r\n\r\n <div class=\"input-block textarea\">\r\n <label for=\"alias-comment\" tooltip=\"{{ 'ASSIGN_ALIAS.COMMENT.TOOLTIP' | translate }}\" placement=\"bottom\" tooltipClass=\"table-tooltip assign-alias-tooltip\" [delay]=\"500\">\r\n {{ 'ASSIGN_ALIAS.COMMENT.LABEL' | translate }}\r\n </label>\r\n <textarea id=\"alias-comment\" formControlName=\"comment\" placeholder=\"{{ 'ASSIGN_ALIAS.COMMENT.PLACEHOLDER' | translate }}\" (contextmenu)=\"variablesService.onContextMenu($event)\"></textarea>\r\n </div>\r\n\r\n <div class=\"alias-cost\">{{ \"ASSIGN_ALIAS.COST\" | translate : {value: alias.price | intToMoney, currency: variablesService.defaultCurrency} }}</div>\r\n\r\n <div class=\"wrap-buttons\">\r\n <button type=\"button\" class=\"blue-button\" (click)=\"assignAlias()\" [disabled]=\"!assignForm.valid || !canRegister || notEnoughMoney\">{{ 'ASSIGN_ALIAS.BUTTON_ASSIGN' | translate }}</button>\r\n <button type=\"button\" class=\"blue-button\" (click)=\"back()\">{{ 'ASSIGN_ALIAS.BUTTON_CANCEL' | translate }}</button>\r\n </div>\r\n\r\n </form>\r\n\r\n</div>\r\n\r\n"
/***/ }),
@ -3429,7 +3417,6 @@ var AssignAliasComponent = /** @class */ (function () {
this.alias.comment = this.assignForm.get('comment').value;
this.backend.registerAlias(this.wallet.wallet_id, this.alias.name, this.wallet.address, this.alias.fee, this.alias.comment, this.alias.rewardOriginal, function (status, data) {
if (status) {
_this.variablesService.aliasesUnconfirmed.push({ tx_hash: data.tx_hash, name: _this.alias.name });
_this.wallet.wakeAlias = true;
_this.modalService.prepareModal('info', 'ASSIGN_ALIAS.REQUEST_ADD_REG');
_this.ngZone.run(function () {
@ -3695,7 +3682,7 @@ var CreateWalletComponent = /** @class */ (function () {
/*! no static exports found */
/***/ (function(module, exports) {
module.exports = "<div class=\"content\">\r\n\r\n <div class=\"head\">\r\n <div class=\"breadcrumbs\">\r\n <span [routerLink]=\"['/wallet/' + wallet.wallet_id + '/history']\">{{ wallet.name }}</span>\r\n <span>{{ 'BREADCRUMBS.EDIT_ALIAS' | translate }}</span>\r\n </div>\r\n <button class=\"back-btn\" (click)=\"back()\">\r\n <i class=\"icon back\"></i>\r\n <span>{{ 'COMMON.BACK' | translate }}</span>\r\n </button>\r\n </div>\r\n\r\n <form class=\"form-edit\">\r\n\r\n <div class=\"input-block alias-name\">\r\n <label for=\"alias-name\">\r\n {{ 'EDIT_ALIAS.NAME.LABEL' | translate }}\r\n </label>\r\n <input type=\"text\" id=\"alias-name\" [value]=\"alias.name\" placeholder=\"{{ 'EDIT_ALIAS.NAME.PLACEHOLDER' | translate }}\" readonly>\r\n </div>\r\n\r\n <div class=\"input-block textarea\">\r\n <label for=\"alias-comment\">\r\n {{ 'EDIT_ALIAS.COMMENT.LABEL' | translate }}\r\n </label>\r\n <textarea id=\"alias-comment\" [(ngModel)]=\"alias.comment\" [ngModelOptions]=\"{standalone: true}\" placeholder=\"{{ 'EDIT_ALIAS.COMMENT.PLACEHOLDER' | translate }}\"></textarea>\r\n <div class=\"error-block\" *ngIf=\"alias.comment.length > 0 && notEnoughMoney\">\r\n {{ 'EDIT_ALIAS.FORM_ERRORS.NO_MONEY' | translate }}\r\n </div>\r\n </div>\r\n\r\n <div class=\"alias-cost\">{{ \"EDIT_ALIAS.COST\" | translate : {value: variablesService.default_fee, currency: variablesService.defaultCurrency} }}</div>\r\n\r\n <div class=\"wrap-buttons\">\r\n <button type=\"button\" class=\"blue-button\" (click)=\"updateAlias()\" [disabled]=\"notEnoughMoney || oldAliasComment === alias.comment\">{{ 'EDIT_ALIAS.BUTTON_EDIT' | translate }}</button>\r\n <button type=\"button\" class=\"blue-button\" (click)=\"back()\">{{ 'EDIT_ALIAS.BUTTON_CANCEL' | translate }}</button>\r\n </div>\r\n\r\n </form>\r\n\r\n</div>\r\n\r\n\r\n"
module.exports = "<div class=\"content\">\r\n\r\n <div class=\"head\">\r\n <div class=\"breadcrumbs\">\r\n <span [routerLink]=\"['/wallet/' + wallet.wallet_id + '/history']\">{{ wallet.name }}</span>\r\n <span>{{ 'BREADCRUMBS.EDIT_ALIAS' | translate }}</span>\r\n </div>\r\n <button class=\"back-btn\" (click)=\"back()\">\r\n <i class=\"icon back\"></i>\r\n <span>{{ 'COMMON.BACK' | translate }}</span>\r\n </button>\r\n </div>\r\n\r\n <form class=\"form-edit\">\r\n\r\n <div class=\"input-block alias-name\">\r\n <label for=\"alias-name\">\r\n {{ 'EDIT_ALIAS.NAME.LABEL' | translate }}\r\n </label>\r\n <input type=\"text\" id=\"alias-name\" [value]=\"alias.name\" placeholder=\"{{ 'EDIT_ALIAS.NAME.PLACEHOLDER' | translate }}\" readonly>\r\n </div>\r\n\r\n <div class=\"input-block textarea\">\r\n <label for=\"alias-comment\">\r\n {{ 'EDIT_ALIAS.COMMENT.LABEL' | translate }}\r\n </label>\r\n <textarea id=\"alias-comment\" [(ngModel)]=\"alias.comment\" [ngModelOptions]=\"{standalone: true}\" placeholder=\"{{ 'EDIT_ALIAS.COMMENT.PLACEHOLDER' | translate }}\" (contextmenu)=\"variablesService.onContextMenu($event)\"></textarea>\r\n <div class=\"error-block\" *ngIf=\"alias.comment.length > 0 && notEnoughMoney\">\r\n {{ 'EDIT_ALIAS.FORM_ERRORS.NO_MONEY' | translate }}\r\n </div>\r\n </div>\r\n\r\n <div class=\"alias-cost\">{{ \"EDIT_ALIAS.COST\" | translate : {value: variablesService.default_fee, currency: variablesService.defaultCurrency} }}</div>\r\n\r\n <div class=\"wrap-buttons\">\r\n <button type=\"button\" class=\"blue-button\" (click)=\"updateAlias()\" [disabled]=\"notEnoughMoney || oldAliasComment === alias.comment\">{{ 'EDIT_ALIAS.BUTTON_EDIT' | translate }}</button>\r\n <button type=\"button\" class=\"blue-button\" (click)=\"back()\">{{ 'EDIT_ALIAS.BUTTON_CANCEL' | translate }}</button>\r\n </div>\r\n\r\n </form>\r\n\r\n</div>\r\n\r\n\r\n"
/***/ }),
@ -5981,7 +5968,7 @@ var StakingComponent = /** @class */ (function () {
/*! no static exports found */
/***/ (function(module, exports) {
module.exports = "<div class=\"content\">\r\n\r\n <div class=\"head\">\r\n <div class=\"breadcrumbs\">\r\n <span [routerLink]=\"['/wallet/' + wallet.wallet_id + '/history']\">{{ wallet.name }}</span>\r\n <span>{{ 'BREADCRUMBS.TRANSFER_ALIAS' | translate }}</span>\r\n </div>\r\n <button class=\"back-btn\" (click)=\"back()\">\r\n <i class=\"icon back\"></i>\r\n <span>{{ 'COMMON.BACK' | translate }}</span>\r\n </button>\r\n </div>\r\n\r\n <form class=\"form-transfer\">\r\n\r\n <div class=\"input-block alias-name\">\r\n <label for=\"alias-name\">\r\n {{ 'EDIT_ALIAS.NAME.LABEL' | translate }}\r\n </label>\r\n <input type=\"text\" id=\"alias-name\" [value]=\"alias.name\" placeholder=\"{{ 'EDIT_ALIAS.NAME.PLACEHOLDER' | translate }}\" readonly>\r\n </div>\r\n\r\n <div class=\"input-block textarea\">\r\n <label for=\"alias-comment\">\r\n {{ 'EDIT_ALIAS.COMMENT.LABEL' | translate }}\r\n </label>\r\n <textarea id=\"alias-comment\" [value]=\"alias.comment\" placeholder=\"{{ 'EDIT_ALIAS.COMMENT.PLACEHOLDER' | translate }}\" readonly></textarea>\r\n </div>\r\n\r\n <div class=\"input-block alias-transfer-address\">\r\n <label for=\"alias-transfer\">\r\n {{ 'TRANSFER_ALIAS.ADDRESS.LABEL' | translate }}\r\n </label>\r\n <input type=\"text\" id=\"alias-transfer\" [(ngModel)]=\"transferAddress\" [ngModelOptions]=\"{standalone: true}\" (ngModelChange)=\"changeAddress()\" placeholder=\"{{ 'TRANSFER_ALIAS.ADDRESS.PLACEHOLDER' | translate }}\">\r\n <div class=\"error-block\" *ngIf=\"transferAddress.length > 0 && (transferAddressAlias || !transferAddressValid || (transferAddressValid && !permissionSend) || notEnoughMoney)\">\r\n <div *ngIf=\"!transferAddressValid\">\r\n {{ 'TRANSFER_ALIAS.FORM_ERRORS.WRONG_ADDRESS' | translate }}\r\n </div>\r\n <div *ngIf=\"transferAddressAlias || (transferAddressValid && !permissionSend)\">\r\n {{ 'TRANSFER_ALIAS.FORM_ERRORS.ALIAS_EXISTS' | translate }}\r\n </div>\r\n <div *ngIf=\"notEnoughMoney\">\r\n {{ 'TRANSFER_ALIAS.FORM_ERRORS.NO_MONEY' | translate }}\r\n </div>\r\n </div>\r\n </div>\r\n\r\n <div class=\"alias-cost\">{{ \"TRANSFER_ALIAS.COST\" | translate : {value: variablesService.default_fee, currency: variablesService.defaultCurrency} }}</div>\r\n\r\n <div class=\"wrap-buttons\">\r\n <button type=\"button\" class=\"blue-button\" (click)=\"transferAlias()\" [disabled]=\"transferAddressAlias || !transferAddressValid || notEnoughMoney\">{{ 'TRANSFER_ALIAS.BUTTON_TRANSFER' | translate }}</button>\r\n <button type=\"button\" class=\"blue-button\" (click)=\"back()\">{{ 'TRANSFER_ALIAS.BUTTON_CANCEL' | translate }}</button>\r\n </div>\r\n\r\n </form>\r\n\r\n</div>\r\n"
module.exports = "<div class=\"content\">\r\n\r\n <div class=\"head\">\r\n <div class=\"breadcrumbs\">\r\n <span [routerLink]=\"['/wallet/' + wallet.wallet_id + '/history']\">{{ wallet.name }}</span>\r\n <span>{{ 'BREADCRUMBS.TRANSFER_ALIAS' | translate }}</span>\r\n </div>\r\n <button class=\"back-btn\" (click)=\"back()\">\r\n <i class=\"icon back\"></i>\r\n <span>{{ 'COMMON.BACK' | translate }}</span>\r\n </button>\r\n </div>\r\n\r\n <form class=\"form-transfer\">\r\n\r\n <div class=\"input-block alias-name\">\r\n <label for=\"alias-name\">\r\n {{ 'EDIT_ALIAS.NAME.LABEL' | translate }}\r\n </label>\r\n <input type=\"text\" id=\"alias-name\" [value]=\"alias.name\" placeholder=\"{{ 'EDIT_ALIAS.NAME.PLACEHOLDER' | translate }}\" readonly>\r\n </div>\r\n\r\n <div class=\"input-block textarea\">\r\n <label for=\"alias-comment\">\r\n {{ 'EDIT_ALIAS.COMMENT.LABEL' | translate }}\r\n </label>\r\n <textarea id=\"alias-comment\" [value]=\"alias.comment\" placeholder=\"{{ 'EDIT_ALIAS.COMMENT.PLACEHOLDER' | translate }}\" readonly></textarea>\r\n </div>\r\n\r\n <div class=\"input-block alias-transfer-address\">\r\n <label for=\"alias-transfer\">\r\n {{ 'TRANSFER_ALIAS.ADDRESS.LABEL' | translate }}\r\n </label>\r\n <input type=\"text\" id=\"alias-transfer\" [(ngModel)]=\"transferAddress\" [ngModelOptions]=\"{standalone: true}\" (ngModelChange)=\"changeAddress()\" placeholder=\"{{ 'TRANSFER_ALIAS.ADDRESS.PLACEHOLDER' | translate }}\" (contextmenu)=\"variablesService.onContextMenu($event)\">\r\n <div class=\"error-block\" *ngIf=\"transferAddress.length > 0 && (transferAddressAlias || !transferAddressValid || (transferAddressValid && !permissionSend) || notEnoughMoney)\">\r\n <div *ngIf=\"!transferAddressValid\">\r\n {{ 'TRANSFER_ALIAS.FORM_ERRORS.WRONG_ADDRESS' | translate }}\r\n </div>\r\n <div *ngIf=\"transferAddressAlias || (transferAddressValid && !permissionSend)\">\r\n {{ 'TRANSFER_ALIAS.FORM_ERRORS.ALIAS_EXISTS' | translate }}\r\n </div>\r\n <div *ngIf=\"notEnoughMoney\">\r\n {{ 'TRANSFER_ALIAS.FORM_ERRORS.NO_MONEY' | translate }}\r\n </div>\r\n </div>\r\n </div>\r\n\r\n <div class=\"alias-cost\">{{ \"TRANSFER_ALIAS.COST\" | translate : {value: variablesService.default_fee, currency: variablesService.defaultCurrency} }}</div>\r\n\r\n <div class=\"wrap-buttons\">\r\n <button type=\"button\" class=\"blue-button\" (click)=\"transferAlias()\" [disabled]=\"transferAddressAlias || !transferAddressValid || notEnoughMoney\">{{ 'TRANSFER_ALIAS.BUTTON_TRANSFER' | translate }}</button>\r\n <button type=\"button\" class=\"blue-button\" (click)=\"back()\">{{ 'TRANSFER_ALIAS.BUTTON_CANCEL' | translate }}</button>\r\n </div>\r\n\r\n </form>\r\n\r\n</div>\r\n"
/***/ }),
@ -6056,7 +6043,7 @@ var TransferAliasComponent = /** @class */ (function () {
if (status) {
_this.backend.getPoolInfo(function (statusPool, dataPool) {
if (dataPool.hasOwnProperty('aliases_que') && dataPool.aliases_que.length) {
_this.setStatus(!~dataPool.aliases_que.searchBy('address', _this.transferAddress));
_this.setStatus(!dataPool.aliases_que.some(function (el) { return el.address === _this.transferAddress; }));
}
else {
_this.setStatus(status);
@ -6072,7 +6059,7 @@ var TransferAliasComponent = /** @class */ (function () {
var _this = this;
this.permissionSend = statusSet;
if (statusSet) {
this.backend.getAliasByAddress(this.transferAddress, function (status, data) {
this.backend.getAliasByAddress(this.transferAddress, function (status) {
_this.ngZone.run(function () {
if (status) {
_this.transferAddressAlias = true;
@ -6358,7 +6345,7 @@ var WalletDetailsComponent = /** @class */ (function () {
/*! no static exports found */
/***/ (function(module, exports) {
module.exports = "<div class=\"header\">\r\n <div>\r\n <h3>{{variablesService.currentWallet.name}}</h3>\r\n <!--<button (click)=\"openInBrowser('docs.zano.org/docs/how-to-get-alias')\">-->\r\n <button [routerLink]=\"['/assign-alias']\" *ngIf=\"!variablesService.currentWallet.alias.hasOwnProperty('name')\">\r\n <i class=\"icon account\"></i>\r\n <span>{{ 'WALLET.REGISTER_ALIAS' | translate }}</span>\r\n </button>\r\n <div class=\"alias\" *ngIf=\"variablesService.currentWallet.alias.hasOwnProperty('name')\">\r\n <span>{{variablesService.currentWallet.alias['name']}}</span>\r\n <i class=\"icon edit\" [routerLink]=\"['/edit-alias']\"></i>\r\n <i class=\"icon transfer\" [routerLink]=\"['/transfer-alias']\"></i>\r\n </div>\r\n </div>\r\n <div>\r\n <button [routerLink]=\"['/details']\" routerLinkActive=\"active\">\r\n <i class=\"icon details\"></i>\r\n <span>{{ 'WALLET.DETAILS' | translate }}</span>\r\n </button>\r\n <!--<button (click)=\"closeWallet()\">\r\n <i class=\"icon lock\"></i>\r\n <span>{{ 'WALLET.LOCK' | translate }}</span>\r\n </button>-->\r\n </div>\r\n</div>\r\n<div class=\"address\">\r\n <span>{{variablesService.currentWallet.address}}</span>\r\n <i class=\"icon\" [class.copy]=\"!copyAnimation\" [class.copied]=\"copyAnimation\" (click)=\"copyAddress()\"></i>\r\n</div>\r\n<div class=\"balance\">\r\n <span [tooltip]=\"getTooltip()\" [placement]=\"'bottom'\" [tooltipClass]=\"'balance-tooltip'\" [delay]=\"300\" [timeout]=\"0\">{{variablesService.currentWallet.balance | intToMoney : '3'}} {{variablesService.defaultCurrency}}</span>\r\n <span>$ {{variablesService.currentWallet.getMoneyEquivalent(variablesService.moneyEquivalent) | intToMoney | number : '1.2-2'}}</span>\r\n</div>\r\n<div class=\"tabs\">\r\n <div class=\"tabs-header\">\r\n <ng-container *ngFor=\"let tab of tabs; let index = index\">\r\n <div class=\"tab\" [class.active]=\"tab.active\" [class.disabled]=\"(tab.link === '/send' || tab.link === '/contracts' || tab.link === '/staking') && variablesService.daemon_state !== 2\" (click)=\"changeTab(index)\">\r\n <i class=\"icon\" [ngClass]=\"tab.icon\"></i>\r\n <span>{{ tab.title | translate }}</span>\r\n <span class=\"indicator\" *ngIf=\"tab.indicator\">{{variablesService.currentWallet.new_contracts}}</span>\r\n </div>\r\n </ng-container>\r\n </div>\r\n <div #scrolledContent class=\"tabs-content scrolled-content\">\r\n <router-outlet></router-outlet>\r\n </div>\r\n</div>\r\n\r\n"
module.exports = "<div class=\"header\">\r\n <div>\r\n <h3>{{variablesService.currentWallet.name}}</h3>\r\n <!--<button (click)=\"openInBrowser('docs.zano.org/docs/how-to-get-alias')\">-->\r\n <button [routerLink]=\"['/assign-alias']\" *ngIf=\"!variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2 && variablesService.currentWallet.alias_available\">\r\n <i class=\"icon account\"></i>\r\n <span>{{ 'WALLET.REGISTER_ALIAS' | translate }}</span>\r\n </button>\r\n <div class=\"alias\" *ngIf=\"variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2\">\r\n <span>{{variablesService.currentWallet.alias['name']}}</span>\r\n <ng-container *ngIf=\"variablesService.currentWallet.alias_available\">\r\n <i class=\"icon edit\" [routerLink]=\"['/edit-alias']\"></i>\r\n <i class=\"icon transfer\" [routerLink]=\"['/transfer-alias']\"></i>\r\n </ng-container>\r\n </div>\r\n </div>\r\n <div>\r\n <button [routerLink]=\"['/details']\" routerLinkActive=\"active\">\r\n <i class=\"icon details\"></i>\r\n <span>{{ 'WALLET.DETAILS' | translate }}</span>\r\n </button>\r\n <!--<button (click)=\"closeWallet()\">\r\n <i class=\"icon lock\"></i>\r\n <span>{{ 'WALLET.LOCK' | translate }}</span>\r\n </button>-->\r\n </div>\r\n</div>\r\n<div class=\"address\">\r\n <span>{{variablesService.currentWallet.address}}</span>\r\n <i class=\"icon\" [class.copy]=\"!copyAnimation\" [class.copied]=\"copyAnimation\" (click)=\"copyAddress()\"></i>\r\n</div>\r\n<div class=\"balance\">\r\n <span [tooltip]=\"getTooltip()\" [placement]=\"'bottom'\" [tooltipClass]=\"'balance-tooltip'\" [delay]=\"300\" [timeout]=\"0\">{{variablesService.currentWallet.balance | intToMoney : '3'}} {{variablesService.defaultCurrency}}</span>\r\n <span>$ {{variablesService.currentWallet.getMoneyEquivalent(variablesService.moneyEquivalent) | intToMoney | number : '1.2-2'}}</span>\r\n</div>\r\n<div class=\"tabs\">\r\n <div class=\"tabs-header\">\r\n <ng-container *ngFor=\"let tab of tabs; let index = index\">\r\n <div class=\"tab\" [class.active]=\"tab.active\" [class.disabled]=\"(tab.link === '/send' || tab.link === '/contracts' || tab.link === '/staking') && variablesService.daemon_state !== 2\" (click)=\"changeTab(index)\">\r\n <i class=\"icon\" [ngClass]=\"tab.icon\"></i>\r\n <span>{{ tab.title | translate }}</span>\r\n <span class=\"indicator\" *ngIf=\"tab.indicator\">{{variablesService.currentWallet.new_contracts}}</span>\r\n </div>\r\n </ng-container>\r\n </div>\r\n <div #scrolledContent class=\"tabs-content scrolled-content\">\r\n <router-outlet></router-outlet>\r\n </div>\r\n</div>\r\n\r\n"
/***/ }),

File diff suppressed because one or more lines are too long

View file

@ -12,6 +12,7 @@ export class Wallet {
unlocked_balance: BigNumber;
mined_total: number;
tracking_hey: string;
alias_available: boolean;
alias?: object;
wakeAlias?: boolean;

View file

@ -40,7 +40,6 @@ export class VariablesService {
public currentWallet: Wallet;
public aliases: any = [];
public aliasesChecked: any = {};
public aliasesUnconfirmed: any = [];
public enableAliasSearch = false;
getHeightAppEvent = new BehaviorSubject(null);

View file

@ -122,6 +122,7 @@ export class AppComponent implements OnInit, OnDestroy {
wallet.balance = data.balance;
wallet.unlocked_balance = data.unlocked_balance;
wallet.mined_total = data.minied_total;
wallet.alias_available = data.is_alias_operations_available;
});
}
});
@ -187,19 +188,6 @@ export class AppComponent implements OnInit, OnDestroy {
return;
}
if (this.variablesService.aliasesUnconfirmed.length) {
let alias = false;
for (let i = 0; i < this.variablesService.aliasesUnconfirmed.length; i++) {
if (this.variablesService.aliasesUnconfirmed[i].tx_hash === data.ti.tx_hash) {
alias = this.variablesService.aliasesUnconfirmed[i];
break;
}
}
if (alias) {
this.variablesService.aliasesUnconfirmed.splice(this.variablesService.aliasesUnconfirmed.indexOf(alias), 1);
}
}
const wallet_id = data.wallet_id;
const tr_info = data.ti;

View file

@ -17,7 +17,7 @@
<label for="alias-name" tooltip="{{ 'ASSIGN_ALIAS.NAME.TOOLTIP' | translate }}" placement="bottom" tooltipClass="table-tooltip assign-alias-tooltip" [delay]="500">
{{ 'ASSIGN_ALIAS.NAME.LABEL' | translate }}
</label>
<input type="text" id="alias-name" formControlName="name" placeholder="{{ 'ASSIGN_ALIAS.NAME.PLACEHOLDER' | translate }}">
<input type="text" id="alias-name" formControlName="name" placeholder="{{ 'ASSIGN_ALIAS.NAME.PLACEHOLDER' | translate }}" (contextmenu)="variablesService.onContextMenu($event)">
<div class="error-block" *ngIf="assignForm.controls['name'].invalid && (assignForm.controls['name'].dirty || assignForm.controls['name'].touched)">
<div *ngIf="assignForm.controls['name'].errors['required']">
{{ 'ASSIGN_ALIAS.FORM_ERRORS.NAME_REQUIRED' | translate }}
@ -40,7 +40,7 @@
<label for="alias-comment" tooltip="{{ 'ASSIGN_ALIAS.COMMENT.TOOLTIP' | translate }}" placement="bottom" tooltipClass="table-tooltip assign-alias-tooltip" [delay]="500">
{{ 'ASSIGN_ALIAS.COMMENT.LABEL' | translate }}
</label>
<textarea id="alias-comment" formControlName="comment" placeholder="{{ 'ASSIGN_ALIAS.COMMENT.PLACEHOLDER' | translate }}"></textarea>
<textarea id="alias-comment" formControlName="comment" placeholder="{{ 'ASSIGN_ALIAS.COMMENT.PLACEHOLDER' | translate }}" (contextmenu)="variablesService.onContextMenu($event)"></textarea>
</div>
<div class="alias-cost">{{ "ASSIGN_ALIAS.COST" | translate : {value: alias.price | intToMoney, currency: variablesService.defaultCurrency} }}</div>

View file

@ -9,7 +9,7 @@ import {Wallet} from '../_helpers/models/wallet.model';
import {MoneyToIntPipe} from '../_helpers/pipes/money-to-int.pipe';
import {IntToMoneyPipe} from '../_helpers/pipes/int-to-money.pipe';
import BigNumber from 'bignumber.js';
import {Subscription} from "rxjs";
import {Subscription} from 'rxjs';
@Component({
selector: 'app-assign-alias',
@ -94,7 +94,6 @@ export class AssignAliasComponent implements OnInit, OnDestroy {
this.alias.comment = this.assignForm.get('comment').value;
this.backend.registerAlias(this.wallet.wallet_id, this.alias.name, this.wallet.address, this.alias.fee, this.alias.comment, this.alias.rewardOriginal, (status, data) => {
if (status) {
this.variablesService.aliasesUnconfirmed.push({tx_hash: data.tx_hash, name: this.alias.name});
this.wallet.wakeAlias = true;
this.modalService.prepareModal('info', 'ASSIGN_ALIAS.REQUEST_ADD_REG');
this.ngZone.run(() => {

View file

@ -24,7 +24,7 @@
<label for="alias-comment">
{{ 'EDIT_ALIAS.COMMENT.LABEL' | translate }}
</label>
<textarea id="alias-comment" [(ngModel)]="alias.comment" [ngModelOptions]="{standalone: true}" placeholder="{{ 'EDIT_ALIAS.COMMENT.PLACEHOLDER' | translate }}"></textarea>
<textarea id="alias-comment" [(ngModel)]="alias.comment" [ngModelOptions]="{standalone: true}" placeholder="{{ 'EDIT_ALIAS.COMMENT.PLACEHOLDER' | translate }}" (contextmenu)="variablesService.onContextMenu($event)"></textarea>
<div class="error-block" *ngIf="alias.comment.length > 0 && notEnoughMoney">
{{ 'EDIT_ALIAS.FORM_ERRORS.NO_MONEY' | translate }}
</div>

View file

@ -1,10 +1,10 @@
import {Component, NgZone, OnInit} from '@angular/core';
import {Location} from '@angular/common';
import {Router} from '@angular/router';
import {BackendService} from "../_helpers/services/backend.service";
import {VariablesService} from "../_helpers/services/variables.service";
import {BackendService} from '../_helpers/services/backend.service';
import {VariablesService} from '../_helpers/services/variables.service';
import {ModalService} from '../_helpers/services/modal.service';
import {Wallet} from "../_helpers/models/wallet.model";
import {Wallet} from '../_helpers/models/wallet.model';
@Component({
selector: 'app-edit-alias',
@ -15,7 +15,7 @@ export class EditAliasComponent implements OnInit {
wallet: Wallet;
alias: any;
oldAliasComment: 'string';
oldAliasComment: string;
notEnoughMoney: boolean;
requestProcessing = false;

View file

@ -31,7 +31,7 @@
<label for="alias-transfer">
{{ 'TRANSFER_ALIAS.ADDRESS.LABEL' | translate }}
</label>
<input type="text" id="alias-transfer" [(ngModel)]="transferAddress" [ngModelOptions]="{standalone: true}" (ngModelChange)="changeAddress()" placeholder="{{ 'TRANSFER_ALIAS.ADDRESS.PLACEHOLDER' | translate }}">
<input type="text" id="alias-transfer" [(ngModel)]="transferAddress" [ngModelOptions]="{standalone: true}" (ngModelChange)="changeAddress()" placeholder="{{ 'TRANSFER_ALIAS.ADDRESS.PLACEHOLDER' | translate }}" (contextmenu)="variablesService.onContextMenu($event)">
<div class="error-block" *ngIf="transferAddress.length > 0 && (transferAddressAlias || !transferAddressValid || (transferAddressValid && !permissionSend) || notEnoughMoney)">
<div *ngIf="!transferAddressValid">
{{ 'TRANSFER_ALIAS.FORM_ERRORS.WRONG_ADDRESS' | translate }}

View file

@ -1,10 +1,10 @@
import {Component, NgZone, OnInit} from '@angular/core';
import {Location} from "@angular/common";
import {Router} from "@angular/router";
import {BackendService} from "../_helpers/services/backend.service";
import {VariablesService} from "../_helpers/services/variables.service";
import {ModalService} from "../_helpers/services/modal.service";
import {Wallet} from "../_helpers/models/wallet.model";
import {Location} from '@angular/common';
import {Router} from '@angular/router';
import {BackendService} from '../_helpers/services/backend.service';
import {VariablesService} from '../_helpers/services/variables.service';
import {ModalService} from '../_helpers/services/modal.service';
import {Wallet} from '../_helpers/models/wallet.model';
@Component({
selector: 'app-transfer-alias',
@ -49,7 +49,7 @@ export class TransferAliasComponent implements OnInit {
if (status) {
this.backend.getPoolInfo((statusPool, dataPool) => {
if (dataPool.hasOwnProperty('aliases_que') && dataPool.aliases_que.length) {
this.setStatus(!~dataPool.aliases_que.searchBy('address', this.transferAddress));
this.setStatus(!dataPool.aliases_que.some((el) => el.address === this.transferAddress));
} else {
this.setStatus(status);
}
@ -63,7 +63,7 @@ export class TransferAliasComponent implements OnInit {
setStatus(statusSet) {
this.permissionSend = statusSet;
if (statusSet) {
this.backend.getAliasByAddress(this.transferAddress, (status, data) => {
this.backend.getAliasByAddress(this.transferAddress, (status) => {
this.ngZone.run(() => {
if (status) {
this.transferAddressAlias = true;

View file

@ -2,14 +2,16 @@
<div>
<h3>{{variablesService.currentWallet.name}}</h3>
<!--<button (click)="openInBrowser('docs.zano.org/docs/how-to-get-alias')">-->
<button [routerLink]="['/assign-alias']" *ngIf="!variablesService.currentWallet.alias.hasOwnProperty('name')">
<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')">
<div class="alias" *ngIf="variablesService.currentWallet.alias.hasOwnProperty('name') && variablesService.currentWallet.loaded && variablesService.daemon_state === 2">
<span>{{variablesService.currentWallet.alias['name']}}</span>
<i class="icon edit" [routerLink]="['/edit-alias']"></i>
<i class="icon transfer" [routerLink]="['/transfer-alias']"></i>
<ng-container *ngIf="variablesService.currentWallet.alias_available">
<i class="icon edit" [routerLink]="['/edit-alias']"></i>
<i class="icon transfer" [routerLink]="['/transfer-alias']"></i>
</ng-container>
</div>
</div>
<div>