feat(send): apply fee for bch custodial

blockchain · Apr 21, 2021 · e698343 · e698343
1 parent 0fc7153
commit e698343
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagas.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagas.ts
@@ -227,11 +227,20 @@ export default ({
               payment = yield payment.from(payloadT.xpub, fromType)
               break
             case 'CUSTODIAL':
+              const response: ReturnType<typeof api.getWithdrawalFees> = yield call(
+                api.getWithdrawalFees,
+                'mercury',
+                'DEFAULT'
+              )
+              const fee =
+                response.fees.find(({ symbol }) => symbol === 'BTC')
+                  ?.minorValue || '0'
               payment = yield payment.from(
                 payloadT.label,
                 fromType,
-                payloadT.withdrawable
+                new BigNumber(payloadT.withdrawable).minus(fee).toString()
               )
+              payment = yield payment.fee(new BigNumber(fee).toNumber())
               yield put(A.sendBchPaymentUpdatedSuccess(payment.value()))
               yield put(change(FORM, 'to', null))
               break

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Bch/SendBch/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Bch/SendBch/FirstStep/template.success.js
@@ -258,21 +258,19 @@ const FirstStep = props => {
           )}
         </FormItem>
       </FormGroup>
-      {!isFromCustody && (
-        <FormGroup inline margin={isPayPro ? '10px' : '30px'}>
-          <FormItem>
-            <FormLabel>
-              <FormattedMessage
-                id='modals.sendBch.firststep.networkfee'
-                defaultMessage='Network Fee'
-              />
-            </FormLabel>
-            <ComboDisplay size='13px' coin='BCH' weight={500}>
-              {totalFee}
-            </ComboDisplay>
-          </FormItem>
-        </FormGroup>
-      )}
+      <FormGroup inline margin={isPayPro ? '10px' : '30px'}>
+        <FormItem>
+          <FormLabel>
+            <FormattedMessage
+              id='modals.sendBch.firststep.networkfee'
+              defaultMessage='Network Fee'
+            />
+          </FormLabel>
+          <ComboDisplay size='13px' coin='BCH' weight={500}>
+            {totalFee}
+          </ComboDisplay>
+        </FormItem>
+      </FormGroup>
       {isPayPro && invalid && (
         <Text
           size='13px'

diff --git a/packages/blockchain-wallet-v4/src/redux/payment/bch/sagas.js b/packages/blockchain-wallet-v4/src/redux/payment/bch/sagas.js
@@ -330,6 +330,8 @@ export default ({ api }) => {
       },
 
       * fee(value) {
+        if (p.fromType === 'CUSTODIAL')
+          return makePayment(merge(p, { selection: { fee: value } }))
         let fee = yield call(calculateFee, value, p.fees)
         let effectiveBalance = yield call(calculateEffectiveBalance, {
           coins: p.coins,