fix: transaction history portfolio amount

PolymeshAssociation · Jan 21, 2021 · 14a91b2 · 14a91b2
1 parent b94632c
commit 14a91b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/api/entities/Portfolio/__tests__/index.ts b/src/api/entities/Portfolio/__tests__/index.ts
@@ -439,6 +439,17 @@ describe('Portfolio class', () => {
       dsMockUtils.createApolloQueryStub(heartbeat(), true);
       sinon.stub(utilsConversionModule, 'addressToKey').withArgs(account).returns(key);
 
+      const mockBalance1 = dsMockUtils.createMockBalance(amount1.toNumber());
+      const mockBalance2 = dsMockUtils.createMockBalance(amount2.toNumber());
+
+      const numberToBalanceStub = sinon.stub(utilsConversionModule, 'numberToBalance');
+      const balanceToBigNumberStub = sinon.stub(utilsConversionModule, 'balanceToBigNumber');
+
+      numberToBalanceStub.withArgs(amount1, context).returns(mockBalance1);
+      numberToBalanceStub.withArgs(amount2, context).returns(mockBalance2);
+      balanceToBigNumberStub.withArgs(mockBalance1).returns(amount1);
+      balanceToBigNumberStub.withArgs(mockBalance2).returns(amount2);
+
       dsMockUtils.createApolloQueryStub(
         settlements({
           identityId: did,

diff --git a/src/api/entities/Portfolio/index.ts b/src/api/entities/Portfolio/index.ts
@@ -23,6 +23,7 @@ import {
   identityIdToString,
   keyToAddress,
   middlewarePortfolioToPortfolio,
+  numberToBalance,
   portfolioIdToMeshPortfolioId,
   tickerToString,
 } from '~/utils/conversion';
@@ -287,7 +288,7 @@ export class Portfolio extends Entity<UniqueIdentifiers> {
           legs: settlementLegs.map(leg => {
             return {
               token: new SecurityToken({ ticker: leg!.ticker }, context),
-              amount: new BigNumber(leg!.amount),
+              amount: balanceToBigNumber(numberToBalance(new BigNumber(leg!.amount), context)),
               direction: leg!.direction,
               from: middlewarePortfolioToPortfolio(leg!.from, context),
               to: middlewarePortfolioToPortfolio(leg!.to, context),