diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.ts index 6ebaa8417..7bd8606ee 100644 --- a/apps/api/src/app/import/import.service.ts +++ b/apps/api/src/app/import/import.service.ts @@ -121,7 +121,6 @@ export class ImportService { currency: undefined, createdAt: undefined, fee: 0, - feeInBaseCurrency: 0, feeInSymbolCurrency: 0, id: assetProfile.id, isDraft: false, @@ -129,13 +128,6 @@ export class ImportService { symbolProfileId: assetProfile.id, type: 'DIVIDEND', unitPrice: marketPrice, - unitPriceInBaseCurrency: - await this.exchangeRateDataService.toCurrencyAtDate( - marketPrice, - assetProfile.currency, - userCurrency, - date - ), unitPriceInSymbolCurrency: marketPrice, updatedAt: undefined, userId: Account?.userId, @@ -448,12 +440,6 @@ export class ImportService { ...order, error, value, - feeInBaseCurrency: await this.exchangeRateDataService.toCurrencyAtDate( - fee, - assetProfile.currency, - userCurrency, - date - ), // @ts-ignore SymbolProfile: assetProfile, valueInBaseCurrency: diff --git a/apps/api/src/app/order/interfaces/activities.interface.ts b/apps/api/src/app/order/interfaces/activities.interface.ts index e085d1f23..c3b487e0c 100644 --- a/apps/api/src/app/order/interfaces/activities.interface.ts +++ b/apps/api/src/app/order/interfaces/activities.interface.ts @@ -11,11 +11,9 @@ export interface Activities { export interface Activity extends Order { Account?: AccountWithPlatform; error?: ActivityError; - feeInBaseCurrency: number; feeInSymbolCurrency: number; SymbolProfile?: EnhancedSymbolProfile; tags?: Tag[]; - unitPriceInBaseCurrency: number; unitPriceInSymbolCurrency: number; updateAccountBalance?: boolean; value: number; diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index bae7b1ac2..eaf576220 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -534,13 +534,6 @@ export class OrderService { return { ...order, value, - feeInBaseCurrency: - await this.exchangeRateDataService.toCurrencyAtDate( - order.fee, - order.currency ?? order.SymbolProfile.currency, - userCurrency, - order.date - ), feeInSymbolCurrency: await this.exchangeRateDataService.toCurrencyAtDate( order.fee, @@ -549,13 +542,6 @@ export class OrderService { order.date ), SymbolProfile: assetProfile, - unitPriceInBaseCurrency: - await this.exchangeRateDataService.toCurrencyAtDate( - order.unitPrice, - order.currency ?? order.SymbolProfile.currency, - userCurrency, - order.date - ), unitPriceInSymbolCurrency: await this.exchangeRateDataService.toCurrencyAtDate( order.unitPrice,