Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Bugfix/fix activities import on non-empty activities page (#4398)
Thomas Kaul12ae54e01bc3
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 44b6c720a6..570112db2a 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Fixed+- Fixed the missing import functionality on the non-empty activities page- Fixed the functionality to delete an asset profile of a custom currency in the admin control panel## 2.143.0 - 2025-03-02diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.html b/apps/client/src/app/pages/portfolio/activities/activities-page.htmlindex 99eb16386d..80ad71b794 100644--- a/apps/client/src/app/pages/portfolio/activities/activities-page.html+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.html@@ -6,9 +6,8 @@[baseCurrency]="user?.settings?.baseCurrency"[dataSource]="dataSource"[deviceType]="deviceType"- [hasPermissionToCreateActivity]="- hasPermissionToCreateActivity && user?.activitiesCount === 0- "+ [hasActivities]="user?.activitiesCount > 0"+ [hasPermissionToCreateActivity]="hasPermissionToCreateActivity"[hasPermissionToDeleteActivity]="hasPermissionToDeleteActivity"[hasPermissionToExportActivities]="!hasImpersonationId"[locale]="user?.settings?.locale"diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.htmlindex 4fdc41c592..e5b33efd24 100644--- a/libs/ui/src/lib/activities-table/activities-table.component.html+++ b/libs/ui/src/lib/activities-table/activities-table.component.html@@ -500,7 +500,10 @@/>@if (- dataSource?.data.length === 0 && hasPermissionToCreateActivity && !isLoading+ !hasActivities &&+ dataSource?.data.length === 0 &&+ hasPermissionToCreateActivity &&+ !isLoading) {<div class="p-3 text-center"><gf-no-transactions-info-indicator [hasBorder]="false" />diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.tsindex 01b4c6eadc..8e5a44a508 100644--- a/libs/ui/src/lib/activities-table/activities-table.component.ts+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts@@ -76,6 +76,7 @@ export class GfActivitiesTableComponent@Input() baseCurrency: string;@Input() dataSource: MatTableDataSource<Activity>;@Input() deviceType: string;+ @Input() hasActivities: boolean;@Input() hasPermissionToCreateActivity: boolean;@Input() hasPermissionToDeleteActivity: boolean;@Input() hasPermissionToExportActivities: boolean;