Fix merge conflicts

1 files changed, 0 insertions, 37 deletions

diff --git a/ui/app/components/send/eth-fee-display.js b/ui/app/components/send/eth-fee-display.js
deleted file mode 100644
index 9eda5ec62..000000000
--- a/ui/app/components/send/eth-fee-display.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const Component = require('react').Component
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-const EthBalance = require('../eth-balance')
-const { getTxFeeBn } = require('../../util')
-
-module.exports = EthFeeDisplay
-
-inherits(EthFeeDisplay, Component)
-function EthFeeDisplay () {
-  Component.call(this)
-}
-
-EthFeeDisplay.prototype.render = function () {
-  const {
-    activeCurrency,
-    conversionRate,
-    gas,
-    gasPrice,
-    blockGasLimit,
-  } = this.props
-
-  return h(EthBalance, {
-    value: getTxFeeBn(gas, gasPrice, blockGasLimit),
-    currentCurrency: activeCurrency,
-    conversionRate,
-    showFiat: false,
-    hideTooltip: true,
-    styleOveride: {
-      color: '#5d5d5d',
-      fontSize: '16px',
-      fontFamily: 'DIN OT',
-      lineHeight: '22.4px',
-    },
-  })
-}
-