Browse Source

PR review changes

pull/4486/head
csehatt741 7 days ago
committed by Attila Cseh
parent
commit
3b2086f553
  1. 6
      apps/api/src/app/import/import.service.ts
  2. 6
      apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
  3. 2
      libs/ui/src/lib/activities-table/activities-table.component.html

6
apps/api/src/app/import/import.service.ts

@ -640,12 +640,6 @@ export class ImportService {
`activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
);
}
if (assetProfile.currency !== currency) {
throw new Error(
`activities.${index}.currency ("${currency}") does not match with currency of ${assetProfile.symbol} ("${assetProfile.currency}")`
);
}
}
assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =

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

@ -101,7 +101,11 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
this.data.activity?.SymbolProfile?.currency,
Validators.required
],
currencyOfUnitPrice: [this.data.activity?.currency, Validators.required],
currencyOfUnitPrice: [
this.data.activity?.currency ??
this.data.activity?.SymbolProfile?.currency,
Validators.required
],
dataSource: [
this.data.activity?.SymbolProfile?.dataSource,
Validators.required

2
libs/ui/src/lib/activities-table/activities-table.component.html

@ -280,7 +280,7 @@
class="d-none d-lg-table-cell px-1"
mat-cell
>
{{ element.currency }}
{{ element.currency ?? element.SymbolProfile?.currency }}
</td>
</ng-container>

Loading…
Cancel
Save