diff --git a/CHANGELOG.md b/CHANGELOG.md
index 238e44e70..005f3950f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Added the name to the symbol column in the activities table
- Combined the name and symbol column in the holdings table (former positions table)
## 1.218.0 - 2022-12-12
diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
index 4004f077f..c888ab9be 100644
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
@@ -223,7 +223,7 @@
[hasPermissionToOpenDetails]="false"
[locale]="data.locale"
[showActions]="false"
- [showSymbolColumn]="false"
+ [showNameColumn]="false"
(export)="onExport()"
>
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 0945bbc04..2f11eb2e2 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -83,26 +83,31 @@
|
-
+
- Symbol
+ Name
|
-
- {{ element.SymbolProfile.name }}
-
-
- {{ element.SymbolProfile.symbol | gfSymbol }}
-
- Draft
+
+ {{ element.SymbolProfile.name }}
+ Draft
+
+
+
+ {{
+ element.SymbolProfile.symbol | gfSymbol
+ }}
|
|
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index 7805527a3..0c05143f5 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -41,7 +41,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
@Input() locale: string;
@Input() pageSize = DEFAULT_PAGE_SIZE;
@Input() showActions: boolean;
- @Input() showSymbolColumn = true;
+ @Input() showNameColumn = true;
@Output() activityDeleted = new EventEmitter();
@Output() activityToClone = new EventEmitter();
@@ -86,7 +86,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
'count',
'date',
'type',
- 'symbol',
+ 'nameWithSymbol',
'quantity',
'unitPrice',
'fee',
@@ -98,9 +98,9 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
'actions'
];
- if (!this.showSymbolColumn) {
+ if (!this.showNameColumn) {
this.displayedColumns = this.displayedColumns.filter((column) => {
- return column !== 'symbol';
+ return column !== 'nameWithSymbol';
});
}