Browse Source

Merge 02c5391614 into 478f7221b9

pull/7342/merge
Karun Shrestha 2 days ago
committed by GitHub
parent
commit
c44daf5bec
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      apps/api/src/app/account/account.service.ts
  2. 11
      apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts

2
apps/api/src/app/account/account.service.ts

@ -337,7 +337,7 @@ export class AccountService {
accountId,
userId,
balance: new Big(balance).plus(amountInCurrencyOfAccount).toNumber(),
date: date.toISOString()
date: format(new Date(), DATE_FORMAT)
});
}
}

11
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts

@ -297,17 +297,6 @@ export class GfCreateOrUpdateActivityDialogComponent {
this.changeDetectorRef.markForCheck();
});
this.activityForm.get('date')?.valueChanges.subscribe(() => {
if (isToday(this.activityForm.get('date')?.value)) {
this.activityForm.get('updateAccountBalance')?.enable();
} else {
this.activityForm.get('updateAccountBalance')?.disable();
this.activityForm.get('updateAccountBalance')?.setValue(false);
}
this.changeDetectorRef.markForCheck();
});
this.activityForm.get('searchSymbol')?.valueChanges.subscribe(() => {
if (this.activityForm.get('searchSymbol')?.invalid) {
this.data.activity.assetProfile = null;

Loading…
Cancel
Save