Merge pull request #106 from NazarUsov/testnet/issues

Bug fixes
hyle-team · Mar 19, 2024 · 534f849 · 534f849
2 parents e4a76ad + 20199de
commit 534f849
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
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
@@ -199,7 +199,7 @@ import { zanoAssetInfo } from '@parts/data/assets';
                                                 <ng-container *ngIf="subtransfer.amount.toNumber() !== 0">
                                                     <div class="text-ellipsis">
                                                         <span *ngIf="!subtransfer.is_income">
-                                                            {{ subtransfer.amount | intToMoney }}
+                                                            {{ subtransfer.amount.negated() | intToMoney }}
                                                         </span>
                                                         <span *ngIf="subtransfer.is_income">
                                                             {{ subtransfer.amount | intToMoney }}
@@ -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 {

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
@@ -230,6 +230,7 @@ import { defaultImgSrc, zanoAssetInfo } from '@parts/data/assets';
                                 appDefaultImg
                             />
                             {{ asset.asset_info.full_name || '---' }}
+                            ({{ asset.total | intToMoney }} {{ asset.asset_info.ticker }})
                         </ng-template>
                     </ng-select>
                     <div

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
@@ -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
@@ -315,7 +315,9 @@ const objTabs: { [key in TabNameKeys]: Tab } = {
                 </ng-container>
             </div>
             <div class="tabs-content">
-                <router-outlet *ngIf="!loader"></router-outlet>
+                <div style="flex: 1;" [ngStyle]="{ display: loader ? 'none' : 'flex' }">
+                  <router-outlet></router-outlet>
+                </div>
                 <div class="preloader" *ngIf="loader">
                     <p class="mb-2">
                         {{ 'Loading...' | translate }}
@@ -365,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)
@@ -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);
         }
 
@@ -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);
                 }
             });
         });