Skip to content

Commit

Permalink
Merge pull request #99 from NazarUsov/testnet/issues
Browse files Browse the repository at this point in the history 
Issue #76 | Testnet
  • Loading branch information
@cryptozoidberg
cryptozoidberg authored Jan 31, 2024
2 parents 5b75ace + 7320d19 commit 972ffbf
Show file tree
Hide file tree
Showing 8 changed files with 153 additions and 90 deletions.
1 change: 1 addition & 0 deletions .idea/codeStyles/codeStyleConfig.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion html_source/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"build --watch": "ng build --output-path \"/Applications/Zano.app/Contents/MacOS/html\" --watch",
"build --watch": "ng build --output-path \"D:/work/nazar/Zano/html\" --watch",
"build --html": "node update-build-time.js && ng build --output-path \"../html/\"",
"test": "ng test",
"lint": "ng lint",
Expand Down
17 changes: 17 additions & 0 deletions html_source/src/app/api/models/wallet.model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,23 @@ export class Wallet {
this._balances$.next(sortedAssets);
}

get isEmpty(): boolean {
if (!this.balances) {
return true;
}

for (const asset of this.balances) {
const value = asset.total || 0;
const isEmpty = !Boolean(new BigNumber(value).toNumber());

if (!isEmpty) {
return false;
}
}

return true;
}

mined_total: number;
tracking_hey: string;
is_auditable: boolean;
Expand Down
2 changes: 1 addition & 1 deletion html_source/src/app/pages/wallet/tabs/assets/assets.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ export class AssetsComponent implements OnInit, OnDestroy {
}

private listenChangeWallet(): void {
this.variablesService.getWalletChangedEvent.pipe(takeUntil(this.destroy$)).subscribe({
this.variablesService.currentWalletChangedEvent.pipe(takeUntil(this.destroy$)).subscribe({
next: () => {
this.currentPage = 0;
},
Expand Down
4 changes: 2 additions & 2 deletions html_source/src/app/pages/wallet/tabs/history/history.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,13 +411,13 @@ export class HistoryComponent implements OnInit, OnDestroy {

this.init();

this.variablesService.getWalletChangedEvent.pipe(takeUntil(this.destroy$)).subscribe({
this.variablesService.currentWalletChangedEvent.pipe(takeUntil(this.destroy$)).subscribe({
next: () => {
this.getRecentTransfers();
},
});

this.variablesService.getWalletChangedEvent
this.variablesService.currentWalletChangedEvent
.pipe(
filter(w => !!w),
takeUntil(this.destroy$)
Expand Down
211 changes: 128 additions & 83 deletions html_source/src/app/pages/wallet/wallet/wallet.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { VariablesService } from '@parts/services/variables.service';
import { BackendService, Commands } from '@api/services/backend.service';
import { Subject } from 'rxjs';
import { StateKeys, Store, Sync } from '@store/store';
import { distinctUntilChanged, filter, takeUntil } from 'rxjs/operators';
import { distinctUntilChanged, filter, map, takeUntil } from 'rxjs/operators';
import { hasOwnProperty } from '@parts/functions/hasOwnProperty';
import { Dialog, DialogConfig } from '@angular/cdk/dialog';
import { ConfirmModalComponent, ConfirmModalData } from '@parts/modals/confirm-modal/confirm-modal.component';
Expand All @@ -12,11 +12,77 @@ import { AddCustomTokenComponent } from './modals/add-custom-token/add-custom-to
import { Asset } from '@api/models/assets.model';
import { AssetDetailsComponent } from '@parts/modals/asset-details/asset-details.component';
import { WalletsService } from '@parts/services/wallets.service';
import { Wallet } from '@api/models/wallet.model';

interface Tab {
id: string;
title: string;
icon: string;
link: string;
disabled: boolean;
indicator?: boolean;
}

type TabNameKeys = 'assets' | 'history' | 'send' | 'receive' | 'swap' | 'staking';

const objTabs: { [key in TabNameKeys]: Tab } = {
assets: {
id: 'assets',
title: 'WALLET.TABS.ASSETS',
icon: 'balance-icon',
link: '/assets',
disabled: false
},
history: {
id: 'history',
title: 'WALLET.TABS.HISTORY',
icon: 'time-circle',
link: '/history',
disabled: false,
},
send: {
id: 'send',
title: 'WALLET.TABS.SEND',
icon: 'arrow-up-square',
link: '/send',
disabled: false,
},
receive: {
id: 'receive',
title: 'WALLET.TABS.RECEIVE',
icon: 'arrow-down-square',
link: '/receive',
disabled: false,
},
swap: {
id: 'swap',
title: 'Swap',
icon: 'swap',
link: '/swap',
disabled: false,
},
// TODO: https://github.com/hyle-team/zano/issues/374
// contract: {
// title: 'WALLET.TABS.CONTRACTS',
// icon: 'document',
// link: '/contracts',
// disabled: false,
// },
staking: {
id: 'staking',
title: 'WALLET.TABS.STAKING',
icon: 'staking',
link: '/staking',
indicator: false,
disabled: false,
},
};

@Component({
selector: 'app-wallet',
template: `
<div class="header mb-2" fxFlex="0 0 auto" fxLayout="row nowrap" fxLayoutAlign="space-between start" fxLayoutGap="1rem">
<div class="header mb-2" fxFlex="0 0 auto" fxLayout="row nowrap" fxLayoutAlign="space-between start"
fxLayoutGap="1rem">
<div class="left overflow-hidden">
<div class="wallet-wrapper" fxLayout="column" fxLayoutAlign="start start">
<div class="title" fxLayout="row nowrap" fxLayoutAlign="start center">
Expand Down Expand Up @@ -62,7 +128,8 @@ import { WalletsService } from '@parts/services/wallets.service';
variablesService.daemon_state === 2
"
>
<div [class.available]="variablesService.currentWallet.alias | isAvailableAliasName" class="alias mr-1">
<div [class.available]="variablesService.currentWallet.alias | isAvailableAliasName"
class="alias mr-1">
{{ variablesService.currentWallet.alias.name }}
</div>
Expand Down Expand Up @@ -199,7 +266,7 @@ import { WalletsService } from '@parts/services/wallets.service';
</ng-container>
<li class="item">
<button
(click)="beforeClose(variablesService.currentWallet.wallet_id)"
(click)="close(variablesService.currentWallet.wallet_id)"
[delay]="500"
[timeDelay]="500"
class="w-100 px-2 py-1"
Expand All @@ -218,21 +285,12 @@ import { WalletsService } from '@parts/services/wallets.service';
<div class="tabs">
<div class="tabs-header">
<ng-container *ngFor="let tab of tabs; let index = index">
<button
[disabled]="tab.disabled"
[ngClass]="{
hide:
(tab.link === '/send' || tab.link === '/contracts') &&
variablesService.currentWallet.is_watch_only &&
variablesService.currentWallet.is_auditable
}"
[routerLink]="['/wallet' + tab.link]"
class="tab-header"
routerLinkActive="active"
>
<button [disabled]="tab.disabled" [routerLink]="['/wallet' + tab.link]" class="tab-header"
routerLinkActive="active">
<i [ngClass]="tab.icon" class="icon mr-1"></i>
<span>{{ tab.title | translate }}</span>
<span *ngIf="tab.indicator" class="indicator">{{ variablesService.currentWallet.new_contracts }}</span>
<span *ngIf="tab.indicator"
class="indicator">{{ variablesService.currentWallet.new_contracts }}</span>
</button>
</ng-container>
</div>
Expand All @@ -253,52 +311,7 @@ export class WalletComponent implements OnInit, OnDestroy {

walletSyncVisible = false;

tabs = [
{
title: 'WALLET.TABS.ASSETS',
icon: 'balance-icon',
link: '/assets',
disabled: false,
},
{
title: 'WALLET.TABS.HISTORY',
icon: 'time-circle',
link: '/history',
disabled: false,
},
{
title: 'WALLET.TABS.SEND',
icon: 'arrow-up-square',
link: '/send',
disabled: true,
},
{
title: 'WALLET.TABS.RECEIVE',
icon: 'arrow-down-square',
link: '/receive',
disabled: false,
},
{
title: 'Swap',
icon: 'swap',
link: '/swap',
disabled: false,
},
// TODO: https://github.com/hyle-team/zano/issues/374
// {
// title: 'WALLET.TABS.CONTRACTS',
// icon: 'document',
// link: '/contracts',
// disabled: true,
// },
{
title: 'WALLET.TABS.STAKING',
icon: 'staking',
link: '/staking',
indicator: false,
disabled: true,
},
];
tabs: Tab[] = [];

private destroy$ = new Subject<void>();

Expand All @@ -314,6 +327,41 @@ export class WalletComponent implements OnInit, OnDestroy {
this.variablesService.setCurrentWallet(0);
}
this.walletLoaded = this.variablesService.currentWallet.loaded;

this.variablesService.currentWalletChangedEvent
.pipe(
takeUntil(this.destroy$)
)
.subscribe({
next: (wallet: Wallet) => {
this.createTabs(wallet);

const disabled = wallet.isEmpty;
this.setDisabledTabs(['send', 'swap', 'staking'], disabled);
},
});
}

createTabs({ is_auditable, is_watch_only }: Wallet): void {
const conditionForHiding: boolean = !is_auditable || !is_watch_only;
const tabs: Array<Tab> = [];

tabs.push(objTabs.assets);
tabs.push(objTabs.history);

if (conditionForHiding) {
tabs.push(objTabs.send);
}

tabs.push(objTabs.receive);

if (conditionForHiding) {
tabs.push(objTabs.swap);
}

tabs.push(objTabs.staking);

this.tabs = tabs;
}

@HostListener('document:keydown.shift', ['$event.key'])
Expand Down Expand Up @@ -372,11 +420,6 @@ export class WalletComponent implements OnInit, OnDestroy {
},
});
this.updateWalletStatus();
this.variablesService.getWalletChangedEvent.pipe(takeUntil(this.destroy$)).subscribe({
next: () => {
this.setTabsDisabled(!this.variablesService.currentWallet.balances);
},
});
}

toggleMenuDropdown(): void {
Expand All @@ -388,11 +431,11 @@ export class WalletComponent implements OnInit, OnDestroy {
}
}

resyncCurrentWallet(id): void {
this.backend.resyncWallet(id);
resyncCurrentWallet(wallet_id: number): void {
this.backend.resyncWallet(wallet_id);
}

beforeClose(wallet_id): void {
close(wallet_id: number): void {
const dialogConfig: DialogConfig<ConfirmModalData> = {
data: {
title: 'WALLET.CONFIRM.MESSAGE',
Expand All @@ -402,9 +445,15 @@ export class WalletComponent implements OnInit, OnDestroy {

this.dialog
.open<boolean>(ConfirmModalComponent, dialogConfig)
.closed.pipe(takeUntil(this.destroy$))
.closed
.pipe(
filter(Boolean),
takeUntil(this.destroy$)
)
.subscribe({
next: confirmed => confirmed && this.closeWallet(wallet_id),
next: () => {
this.walletsService.closeWallet(wallet_id);
},
});
}

Expand Down Expand Up @@ -434,10 +483,6 @@ export class WalletComponent implements OnInit, OnDestroy {
this.dialog.open(ExportHistoryModalComponent);
}

closeWallet(wallet_id): void {
this.walletsService.closeWallet(wallet_id);
}

ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
Expand All @@ -459,7 +504,8 @@ export class WalletComponent implements OnInit, OnDestroy {
if (wallet_state === 2 && wallet_id === this.variablesService.currentWallet.wallet_id) {
this.walletLoaded = this.variablesService.getWallet(this.variablesService.currentWallet.wallet_id)?.loaded || false;
if (this.walletLoaded) {
this.setTabsDisabled(!this.variablesService.currentWallet.balances);
const disabled = this.variablesService.currentWallet.isEmpty;
this.setDisabledTabs(['send', 'swap', 'staking'], disabled);
}
} else {
this.walletLoaded = false;
Expand All @@ -468,10 +514,9 @@ export class WalletComponent implements OnInit, OnDestroy {
});
}

setTabsDisabled(disabled: boolean): void {
this.tabs[2].disabled = disabled;
this.tabs[4].disabled = disabled;
// TODO: https://github.com/hyle-team/zano/issues/374
// this.tabs[5].disabled = disabled;
setDisabledTabs(ids: string[], disabled: boolean): void {
this.tabs
.filter(({ id }) => ids.includes(id))
.forEach(tab => (tab.disabled = disabled));
}
}
4 changes: 2 additions & 2 deletions html_source/src/app/parts/services/variables.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export class VariablesService {

getAliasChangedEvent = new BehaviorSubject(null);

getWalletChangedEvent = new BehaviorSubject<Wallet>(null);
currentWalletChangedEvent = new BehaviorSubject<Wallet>(null);

idle = new Idle().whenNotInteractive().do(async () => {
if (this.appPass === '') {
Expand Down Expand Up @@ -222,7 +222,7 @@ export class VariablesService {
this.wallets.forEach(wallet => {
if (wallet.wallet_id === id) {
this.currentWallet = wallet;
this.getWalletChangedEvent.next(wallet);
this.currentWalletChangedEvent.next(wallet);
}
});
}
Expand Down
Loading

0 comments on commit 972ffbf

Please sign in to comment.