Merge branch 'main' into feature/improve-tooltip-of-portfolio-proportion-chart

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved the tooltip of the portfolio proportion chart component
 
+### Fixed
+
+- Fixed the missing platform name in the allocations by platform chart on the allocations page
+
 ## 1.264.0 - 2023-05-01
 
 ### Added

apps/api/src/app/portfolio/portfolio.service.ts

@@ -1727,6 +1727,7 @@ export class PortfolioService {
       currentAccounts = await this.accountService.getAccounts(userId);
     } else if (filters.length === 1 && filters[0].type === 'ACCOUNT') {
       currentAccounts = await this.accountService.accounts({
+        include: { Platform: true },
         where: { id: filters[0].id }
       });
     } else {
@@ -1737,6 +1738,7 @@ export class PortfolioService {
       );
 
       currentAccounts = await this.accountService.accounts({
+        include: { Platform: true },
         where: { id: { in: accountIds } }
       });
     }