diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d7221540..eae689ba3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added support for localized routes in Spanish (`es`) +### Changed + +- Improved the activities import dialog + ## 1.273.0 - 2023-05-28 ### Added diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html index 5bbf30ac3..2849a1629 100644 --- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html @@ -61,20 +61,18 @@ [displayWith]="displayFn" (optionSelected)="onUpdateSymbol($event)" > - - + {{ lookupItem.name }} +
+ {{ lookupItem.symbol | gfSymbol }} · {{ lookupItem.currency + }} - {{ lookupItem.name }} -
- {{ lookupItem.symbol | gfSymbol }} · {{ lookupItem.currency - }} -
-
+ diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts index 4bd636b0d..67a41dc88 100644 --- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts @@ -37,6 +37,7 @@ export class ImportActivitiesDialog implements OnDestroy { public activities: Activity[] = []; public details: any[] = []; public deviceType: string; + public dialogTitle = $localize`Import Activities`; public errorMessages: string[] = []; public holdings: Position[] = []; public importStep: ImportStep = ImportStep.UPLOAD_FILE; @@ -72,6 +73,7 @@ export class ImportActivitiesDialog implements OnDestroy { this.data?.activityTypes?.length === 1 && this.data?.activityTypes?.[0] === 'DIVIDEND' ) { + this.dialogTitle = $localize`Import Dividends`; this.mode = 'DIVIDEND'; this.uniqueAssetForm.controls['uniqueAsset'].disable(); diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html index 179003e23..9cbaff34e 100644 --- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html +++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html @@ -1,7 +1,7 @@ @@ -15,7 +15,14 @@ (selectionChange)="onImportStepChange($event)" > - Select File + + Select Holding + Select File +
{{ holding.name }} + {{ holding.name }} +
+ {{ holding.symbol | gfSymbol }} · {{ holding.currency + }} +
@@ -77,7 +91,14 @@ - Select Activities + + Select Dividends + Select Activities +
- Import Activities... + Import Activities...