From 78e7c86f2e5913631df72cdd6e9c86089aa07aeb Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Fri, 15 Mar 2024 11:20:44 +0200 Subject: [PATCH 1/6] Issue #111 --- .../wallet/tabs/swap/pages/swap/swap.component.scss | 1 + .../src/app/pages/wallet/wallet/wallet.component.ts | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/html_source/src/app/pages/wallet/tabs/swap/pages/swap/swap.component.scss b/html_source/src/app/pages/wallet/tabs/swap/pages/swap/swap.component.scss index 0ffd340e..0536a27c 100644 --- a/html_source/src/app/pages/wallet/tabs/swap/pages/swap/swap.component.scss +++ b/html_source/src/app/pages/wallet/tabs/swap/pages/swap/swap.component.scss @@ -1,5 +1,6 @@ :host { width: 100%; + height: 100%; display: flex; flex-direction: row; } diff --git a/html_source/src/app/pages/wallet/wallet/wallet.component.ts b/html_source/src/app/pages/wallet/wallet/wallet.component.ts index effd8b30..4d0827b9 100644 --- a/html_source/src/app/pages/wallet/wallet/wallet.component.ts +++ b/html_source/src/app/pages/wallet/wallet/wallet.component.ts @@ -315,7 +315,9 @@ const objTabs: { [key in TabNameKeys]: Tab } = {
- +
+ +

{{ 'Loading...' | translate }} @@ -394,9 +396,7 @@ export class WalletComponent implements OnInit, OnDestroy { navigationInterceptor(event: RouterEvent): void { if (event instanceof NavigationStart) { - this.loader = true; - } if (event instanceof NavigationEnd) { setTimeout(() => { @@ -405,12 +405,12 @@ export class WalletComponent implements OnInit, OnDestroy { } if (event instanceof NavigationCancel) { setTimeout(() => { - this.loader = true; + this.loader = false; }, 500); } if (event instanceof NavigationError) { setTimeout(() => { - this.loader = true; + this.loader = false; }, 500); } From 63d2bb7d66190da99978a0e8d8af13772a62f118 Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Fri, 15 Mar 2024 16:36:32 +0200 Subject: [PATCH 2/6] Issue #116 --- .../src/app/pages/wallet/tabs/history/history.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html_source/src/app/pages/wallet/tabs/history/history.component.ts b/html_source/src/app/pages/wallet/tabs/history/history.component.ts index 8b910f87..48b24976 100644 --- a/html_source/src/app/pages/wallet/tabs/history/history.component.ts +++ b/html_source/src/app/pages/wallet/tabs/history/history.component.ts @@ -199,7 +199,7 @@ import { zanoAssetInfo } from '@parts/data/assets';

- {{ subtransfer.amount | intToMoney }} + {{ subtransfer.amount.negated() | intToMoney }} {{ subtransfer.amount | intToMoney }} From 5f2c80316d0fac95ea27bbac71e606ac90bb690d Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Fri, 15 Mar 2024 17:08:44 +0200 Subject: [PATCH 3/6] Issue #114 --- .../src/app/pages/wallet/tabs/history/history.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html_source/src/app/pages/wallet/tabs/history/history.component.ts b/html_source/src/app/pages/wallet/tabs/history/history.component.ts index 48b24976..73799f8c 100644 --- a/html_source/src/app/pages/wallet/tabs/history/history.component.ts +++ b/html_source/src/app/pages/wallet/tabs/history/history.component.ts @@ -494,7 +494,7 @@ export class HistoryComponent implements OnInit, OnDestroy { isVisibleFee(transaction: Transaction): boolean { const { subtransfers } = transaction; - return !subtransfers?.find(({ asset_id }) => asset_id === zanoAssetInfo.asset_id)?.is_income; + return subtransfers ? !subtransfers?.every(({ is_income }) => is_income) : false; } strokeSize(item): number { From e4c3637d1d4a9b2270a14404d27296df4146ebf3 Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Fri, 15 Mar 2024 17:14:39 +0200 Subject: [PATCH 4/6] Issue #113 --- html_source/src/app/pages/wallet/wallet/wallet.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/html_source/src/app/pages/wallet/wallet/wallet.component.ts b/html_source/src/app/pages/wallet/wallet/wallet.component.ts index 4d0827b9..b0512bbf 100644 --- a/html_source/src/app/pages/wallet/wallet/wallet.component.ts +++ b/html_source/src/app/pages/wallet/wallet/wallet.component.ts @@ -367,7 +367,7 @@ export class WalletComponent implements OnInit, OnDestroy { next: (wallet: Wallet) => { this.createTabs(wallet); const disabled = !wallet.loaded; - this.setDisabledTabs(['send', 'staking'], disabled); + this.setDisabledTabs(['send', 'swap', 'staking'], disabled); this.variablesService.is_hardfok_active$.pipe( take(1) @@ -581,10 +581,10 @@ export class WalletComponent implements OnInit, OnDestroy { if (wallet_state === 2) { this.walletLoaded = true; - this.setDisabledTabs(['send', 'staking'], false); + this.setDisabledTabs(['send', 'swap', 'staking'], false); } else { this.walletLoaded = false; - this.setDisabledTabs(['send', 'staking'], true); + this.setDisabledTabs(['send', 'swap', 'staking'], true); } }); }); From 4c2bc916678862009c22a08a870a70ec5486bb96 Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Fri, 15 Mar 2024 17:35:11 +0200 Subject: [PATCH 5/6] Issue #110 --- html_source/src/app/pages/wallet/tabs/send/send.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/html_source/src/app/pages/wallet/tabs/send/send.component.ts b/html_source/src/app/pages/wallet/tabs/send/send.component.ts index bfafbbc4..d7bfcb76 100644 --- a/html_source/src/app/pages/wallet/tabs/send/send.component.ts +++ b/html_source/src/app/pages/wallet/tabs/send/send.component.ts @@ -230,6 +230,7 @@ import { defaultImgSrc, zanoAssetInfo } from '@parts/data/assets'; appDefaultImg /> {{ asset.asset_info.full_name || '---' }} + ({{ asset.unlocked | intToMoney }} {{ asset.asset_info.ticker }})
Date: Mon, 18 Mar 2024 13:33:37 +0200 Subject: [PATCH 6/6] Update balance in send tab --- html_source/src/app/pages/wallet/tabs/send/send.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html_source/src/app/pages/wallet/tabs/send/send.component.ts b/html_source/src/app/pages/wallet/tabs/send/send.component.ts index d7bfcb76..9ecee113 100644 --- a/html_source/src/app/pages/wallet/tabs/send/send.component.ts +++ b/html_source/src/app/pages/wallet/tabs/send/send.component.ts @@ -230,7 +230,7 @@ import { defaultImgSrc, zanoAssetInfo } from '@parts/data/assets'; appDefaultImg /> {{ asset.asset_info.full_name || '---' }} - ({{ asset.unlocked | intToMoney }} {{ asset.asset_info.ticker }}) + ({{ asset.total | intToMoney }} {{ asset.asset_info.ticker }})