merge dashboard into electron

[bytom/bytom-electron.git] / src / features / transactions / components / New / ConfirmModal / ConfirmModal.jsx

diff --git a/src/features/transactions/components/New/ConfirmModal/ConfirmModal.jsx b/src/features/transactions/components/New/ConfirmModal/ConfirmModal.jsx
index dab5bf0..8a74207 100644 (file)
--- a/src/features/transactions/components/New/ConfirmModal/ConfirmModal.jsx
+++ b/src/features/transactions/components/New/ConfirmModal/ConfirmModal.jsx
@@ -26,12 +26,13 @@ class ConfirmModal extends Component {
       cancel,
       error,
       gas,
+      chainGas,
       t,
       btmAmountUnit,
       assetDecimal
     } = this.props
 
-    const fee = Number(gasLevel.value * gas)
+    const fee = Number( (chainGas||0 ) + gasLevel.value * gas )
 
     const totalAmount = sum(receivers, 'amount.value')
 
@@ -156,6 +157,7 @@ export default  withNamespaces('translations') (reduxForm({
     'receivers[].amount',
     'receivers[].address',
     'gasLevel',
+    'isChainTx',
     'password'
   ],
   destroyOnUnmount: false,