|
|
@ -948,18 +948,24 @@ export class ActivitiesService { |
|
|
assetProfiles |
|
|
assetProfiles |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
activities.activities = activities.activities.map((activity) => { |
|
|
const hasSplits = [...splitsByAssetProfile.values()].some((splits) => { |
|
|
const key = getAssetProfileIdentifier({ |
|
|
return splits.length > 0; |
|
|
dataSource: activity.assetProfile.dataSource, |
|
|
|
|
|
symbol: activity.assetProfile.symbol |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
return adjustActivityBySplits( |
|
|
|
|
|
activity, |
|
|
|
|
|
splitsByAssetProfile.get(key) ?? [] |
|
|
|
|
|
); |
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
if (hasSplits) { |
|
|
|
|
|
activities.activities = activities.activities.map((activity) => { |
|
|
|
|
|
const key = getAssetProfileIdentifier({ |
|
|
|
|
|
dataSource: activity.assetProfile.dataSource, |
|
|
|
|
|
symbol: activity.assetProfile.symbol |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
return adjustActivityBySplits( |
|
|
|
|
|
activity, |
|
|
|
|
|
splitsByAssetProfile.get(key) ?? [] |
|
|
|
|
|
); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (withCash && !this.areCashActivitiesExcludedByFilters(filters)) { |
|
|
if (withCash && !this.areCashActivitiesExcludedByFilters(filters)) { |
|
|
const cashDetails = await this.accountService.getCashDetails({ |
|
|
const cashDetails = await this.accountService.getCashDetails({ |
|
|
filters, |
|
|
filters, |
|
|
|