Merge pull request #114 from NazarUsov/testnet/issues

Fix tab preloader
hyle-team · May 9, 2024 · 17ccc24 · 17ccc24
2 parents a1d86d0 + 30d9087
commit 17ccc24
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 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
@@ -1,7 +1,7 @@
 :host {
     width: 100%;
-    height: 100%;
     display: flex;
+    flex: 1;
     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
@@ -337,14 +337,15 @@ const objTabs: { [key in TabNameKeys]: Tab } = {
                 </ng-container>
             </div>
             <div class="tabs-content">
-                <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 }}
-                    </p>
-                    <div class="loading-bar"></div>
+                <router-outlet></router-outlet>
+
+                <div *ngIf="loader" class="wrapper-tab-preloader">
+                    <div class="preloader">
+                        <p class="mb-2">
+                            {{ 'Loading...' | translate }}
+                        </p>
+                        <div class="loading-bar"></div>
+                    </div>
                 </div>
             </div>
         </div>

diff --git a/html_source/src/assets/scss/components/_preloader.scss b/html_source/src/assets/scss/components/_preloader.scss
@@ -1,3 +1,7 @@
+.wrapper-tab-preloader {
+    display: flex; z-index: 999; position: absolute; top: 0; left: 0; right: 0; bottom: 0; background-color: var(--blue-700);
+}
+
 .preloader {
     align-self: center;
     color: white;

diff --git a/html_source/src/assets/scss/components/_tabs.scss b/html_source/src/assets/scss/components/_tabs.scss
@@ -68,7 +68,7 @@
         overflow: hidden;
         border-radius: 0 0 0.8rem 0.8rem;
         background-color: var(--blue-700);
-
         padding: 2rem;
+        position: relative;
     }
 }