Merge branch 'main' into feature/add-error-handling-for-redis-connections

CHANGELOG.md

@@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added error handling for the Redis connections to keep the app running if the connection fails
+- Added error handling for the _Redis_ connections to keep the app running if the connection fails
+
+### Fixed
+
+- Fixed the missing values in the holdings table
 
 ## 1.292.0 - 2023-07-24
 

libs/ui/src/lib/holdings-table/holdings-table.component.html

@@ -61,7 +61,7 @@
       </td>
     </ng-container>
 
-    <ng-container matColumnDef="value">
+    <ng-container matColumnDef="valueInBaseCurrency">
       <th
         *matHeaderCellDef
         class="d-none d-lg-table-cell justify-content-end px-1"
@@ -79,7 +79,7 @@
           <gf-value
             [isCurrency]="true"
             [locale]="locale"
-            [value]="isLoading ? undefined : element.value"
+            [value]="isLoading ? undefined : element.valueInBaseCurrency"
           ></gf-value>
         </div>
       </td>

libs/ui/src/lib/holdings-table/holdings-table.component.ts

@@ -55,7 +55,7 @@ export class HoldingsTableComponent implements OnChanges, OnDestroy, OnInit {
     this.displayedColumns = ['icon', 'nameWithSymbol', 'dateOfFirstActivity'];
 
     if (this.hasPermissionToShowValues) {
-      this.displayedColumns.push('value');
+      this.displayedColumns.push('valueInBaseCurrency');
     }
 
     this.displayedColumns.push('allocationInPercentage');