|
|
@ -1914,8 +1914,6 @@ export class PortfolioService { |
|
|
.plus(emergencyFundHoldingsValueInBaseCurrency) |
|
|
.plus(emergencyFundHoldingsValueInBaseCurrency) |
|
|
.toNumber(); |
|
|
.toNumber(); |
|
|
|
|
|
|
|
|
const committedFunds = new Big(totalBuy).minus(totalSell); |
|
|
|
|
|
|
|
|
|
|
|
const totalOfExcludedActivities = this.getSumOfActivityType({ |
|
|
const totalOfExcludedActivities = this.getSumOfActivityType({ |
|
|
userCurrency, |
|
|
userCurrency, |
|
|
activities: excludedActivities, |
|
|
activities: excludedActivities, |
|
|
@ -1979,7 +1977,6 @@ export class PortfolioService { |
|
|
activityCount: activities.filter(({ type }) => { |
|
|
activityCount: activities.filter(({ type }) => { |
|
|
return ['BUY', 'SELL'].includes(type); |
|
|
return ['BUY', 'SELL'].includes(type); |
|
|
}).length, |
|
|
}).length, |
|
|
committedFunds: committedFunds.toNumber(), |
|
|
|
|
|
currentValueInBaseCurrency: currentValueInBaseCurrency.toNumber(), |
|
|
currentValueInBaseCurrency: currentValueInBaseCurrency.toNumber(), |
|
|
dividendInBaseCurrency: dividendInBaseCurrency.toNumber(), |
|
|
dividendInBaseCurrency: dividendInBaseCurrency.toNumber(), |
|
|
emergencyFund: { |
|
|
emergencyFund: { |
|
|
|