fix(activity-feed): fix conversions in custodial activity feed and ad…

…d refund address
blockchain · Dec 8, 2020 · 06eb5ba · 06eb5ba
1 parent 124f78d
commit 06eb5ba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/simpleBuy/sagas.ts
@@ -57,6 +57,7 @@ import {
   SBBillingAddressFormValuesType,
   SBCheckoutFormValuesType
 } from './types'
+import { selectReceiveAddress } from '../utils/sagas'
 import { UserDataType } from 'data/modules/types'
 import BigNumber from 'bignumber.js'
 import moment from 'moment'
@@ -270,13 +271,18 @@ export default ({
                   amount
                 )
               )
-
+        const refundAddr =
+          direction === 'FROM_USERKEY'
+            ? yield call(selectReceiveAddress, from, networks)
+            : undefined
         const sellOrder: SwapOrderType = yield call(
           api.createSwapOrder,
           direction,
           quote.quote.id,
           cryptoAmt,
-          getFiatFromPair(pair.pair)
+          getFiatFromPair(pair.pair),
+          undefined,
+          refundAddr
         )
         // on chain
         if (direction === 'FROM_USERKEY') {

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/CustodialTx/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Transactions/CustodialTx/index.tsx
@@ -70,7 +70,10 @@ const CustodialTxListItem: React.FC<Props> = props => {
           data-e2e='orderAmountColumn'
         >
           <StyledCoinDisplay coin={props.coin} data-e2e='orderCoinAmt'>
-            {tx.amount.symbol in CoinTypeEnum && tx.type === 'SELL'
+            {tx.amount.symbol in CoinTypeEnum &&
+            (tx.type === 'DEPOSIT' || tx.type === 'WITHDRAWAL')
+              ? tx.amountMinor
+              : tx.amount.symbol in CoinTypeEnum && tx.type === 'SELL'
               ? convertBaseToStandard('FIAT', tx.amountMinor)
               : tx.amount.value}
           </StyledCoinDisplay>
@@ -82,7 +85,10 @@ const CustodialTxListItem: React.FC<Props> = props => {
               color='grey600'
               data-e2e='orderFiatAmt'
             >
-              {tx.amount.symbol in CoinTypeEnum && tx.type === 'SELL'
+              {tx.amount.symbol in CoinTypeEnum &&
+              (tx.type === 'DEPOSIT' || tx.type === 'WITHDRAWAL')
+                ? tx.amountMinor
+                : tx.amount.symbol in CoinTypeEnum && tx.type === 'SELL'
                 ? convertBaseToStandard('FIAT', tx.amountMinor)
                 : tx.amount.value}
             </StyledFiatDisplay>