Merge branch 'main' into feature/improve-allocations-page

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Improved the loading state of the value component on the allocations page
+- Improved the value component by always showing the label (also while loading)
 
 ### Fixed
 

libs/ui/src/lib/value/value.component.html

@@ -48,17 +48,6 @@
         </div>
       </ng-container>
     </div>
-    <ng-container>
-      <div *ngIf="size === 'large'">
-        <span class="h6"
-          ><ng-container *ngTemplateOutlet="label"></ng-container
-        ></span>
-        <span *ngIf="subLabel" class="text-muted"> {{ subLabel }}</span>
-      </div>
-      <small *ngIf="size !== 'large'">
-        <ng-container *ngTemplateOutlet="label"></ng-container>
-      </small>
-    </ng-container>
   </ng-container>
 
   <ngx-skeleton-loader
@@ -66,8 +55,20 @@
     animation="pulse"
     [theme]="{
       height:
-        size === 'large' ? '2.5rem' : size === 'medium' ? '2rem' : '1.5rem',
+        size === 'large' ? '2rem' : size === 'medium' ? '1.8rem' : '1.5rem',
       width: '5rem'
     }"
   ></ngx-skeleton-loader>
+
+  <ng-container>
+    <div *ngIf="size === 'large'">
+      <span class="h6"
+        ><ng-container *ngTemplateOutlet="label"></ng-container
+      ></span>
+      <span *ngIf="subLabel" class="text-muted"> {{ subLabel }}</span>
+    </div>
+    <small *ngIf="size !== 'large'">
+      <ng-container *ngTemplateOutlet="label"></ng-container>
+    </small>
+  </ng-container>
 </div>