diff --git a/apps/api/src/app/export/export.service.ts b/apps/api/src/app/export/export.service.ts index b4274cbed..370823db3 100644 --- a/apps/api/src/app/export/export.service.ts +++ b/apps/api/src/app/export/export.service.ts @@ -25,24 +25,22 @@ export class ExportService { public async export({ activityIds, filters, - userSettings, - userId + userId, + userSettings }: { activityIds?: string[]; filters?: Filter[]; - userSettings: UserSettings; userId: string; + userSettings: UserSettings; }): Promise { const { ACCOUNT: filtersByAccount } = groupBy(filters, ({ type }) => { return type; }); const platformsMap: { [platformId: string]: Platform } = {}; - const userCurrency = userSettings?.baseCurrency; - let { activities } = await this.orderService.getOrders({ filters, - userCurrency, + userCurrency: userSettings?.baseCurrency, userId, includeDrafts: true, sortColumn: 'date', @@ -251,7 +249,7 @@ export class ExportService { ), user: { settings: { - currency: userCurrency, + currency: userSettings?.baseCurrency, performanceCalculationType: userSettings?.performanceCalculationType } }