Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/improve form of import dividends dialog (#1582)

Thomas Kaulfc8e23a9c8e4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b331871ef6..4a35e673ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
-- Improved the deprecated `~` in _Sass_ imports
+- Improved the form of the import dividends dialog (disable while loading)
+- Removed the deprecated `~` in _Sass_ imports
## 1.225.0 - 2023-01-07
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 77ef8dfe83..e72b7cde37 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
@@ -56,6 +56,7 @@ export class ImportActivitiesDialog implements OnDestroy {
this.data?.activityTypes?.[0] === 'DIVIDEND'
) {
this.mode = 'DIVIDEND';
+ this.uniqueAssetForm.controls['uniqueAsset'].disable();
this.dataService
.fetchPositions({
@@ -72,6 +73,7 @@ export class ImportActivitiesDialog implements OnDestroy {
this.holdings = sortBy(positions, ({ name }) => {
return name.toLowerCase();
});
+ this.uniqueAssetForm.controls['uniqueAsset'].enable();
this.changeDetectorRef.markForCheck();
});
@@ -111,6 +113,8 @@ export class ImportActivitiesDialog implements OnDestroy {
}
public onLoadDividends() {
+ this.uniqueAssetForm.controls['uniqueAsset'].disable();
+
const { dataSource, symbol } =
this.uniqueAssetForm.controls['uniqueAsset'].value;