Bugfix/fix preselected default account in create activity dialog (#624)

* Fix preselected default account

* Update changelog

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed the support for multiple accounts with the same name
+- Fixed the preselected default account of the create activity dialog
 
 ## 1.101.0 - 08.01.2022
 

apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts

@@ -106,20 +106,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((state) => {
         if (state?.user) {
-          this.user = state.user;
+          this.updateUser(state.user);
-
-          this.defaultAccountId = this.user?.accounts.find((account) => {
-            return account.isDefault;
-          })?.id;
-
-          this.hasPermissionToCreateOrder = hasPermission(
-            this.user.permissions,
-            permissions.createOrder
-          );
-          this.hasPermissionToDeleteOrder = hasPermission(
-            this.user.permissions,
-            permissions.deleteOrder
-          );
 
           this.changeDetectorRef.markForCheck();
         }
@@ -352,6 +339,12 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
   }
 
   private openCreateTransactionDialog(aTransaction?: OrderModel): void {
+    this.userService
+      .get()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((user) => {
+        this.updateUser(user);
+
         const dialogRef = this.dialog.open(CreateOrUpdateTransactionDialog, {
           data: {
             accounts: this.user?.accounts?.filter((account) => {
@@ -390,6 +383,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
 
             this.router.navigate(['.'], { relativeTo: this.route });
           });
+      });
   }
 
   private openPositionDialog({ symbol }: { symbol: string }) {
@@ -397,7 +391,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
       .get()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((user) => {
-        this.user = user;
+        this.updateUser(user);
 
         const dialogRef = this.dialog.open(PositionDetailDialog, {
           autoFocus: false,
@@ -419,4 +413,21 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
           });
       });
   }
+
+  private updateUser(aUser: User) {
+    this.user = aUser;
+
+    this.defaultAccountId = this.user?.accounts.find((account) => {
+      return account.isDefault;
+    })?.id;
+
+    this.hasPermissionToCreateOrder = hasPermission(
+      this.user.permissions,
+      permissions.createOrder
+    );
+    this.hasPermissionToDeleteOrder = hasPermission(
+      this.user.permissions,
+      permissions.deleteOrder
+    );
+  }
 }