Fix merge conflicts

1 files changed, 0 insertions, 62 deletions

diff --git a/ui/app/components/send/gas-fee-display.js b/ui/app/components/send/gas-fee-display.js
deleted file mode 100644
index a9a3f3f49..000000000
--- a/ui/app/components/send/gas-fee-display.js
+++ /dev/null
@@ -1,62 +0,0 @@
-const Component = require('react').Component
-const h = require('react-hyperscript')
-const inherits = require('util').inherits
-const USDFeeDisplay = require('./usd-fee-display')
-const EthFeeDisplay = require('./eth-fee-display')
-const { getTxFeeBn, formatBalance, shortenBalance } = require('../../util')
-
-module.exports = GasFeeDisplay
-
-inherits(GasFeeDisplay, Component)
-function GasFeeDisplay () {
-  Component.call(this)
-}
-
-GasFeeDisplay.prototype.getTokenValue = function () {
-  const {
-    tokenExchangeRate,
-    gas,
-    gasPrice,
-    blockGasLimit,
-  } = this.props
-
-  const value = formatBalance(getTxFeeBn(gas, gasPrice, blockGasLimit), 6, true)
-  const [ethNumber] = value.split(' ')
-
-  return shortenBalance(Number(ethNumber) / tokenExchangeRate, 6)
-}
-
-GasFeeDisplay.prototype.render = function () {
-  const {
-    activeCurrency,
-    conversionRate,
-    gas,
-    gasPrice,
-    blockGasLimit,
-  } = this.props
-
-  switch (activeCurrency) {
-    case 'USD':
-      return h(USDFeeDisplay, {
-        activeCurrency,
-        conversionRate,
-        gas,
-        gasPrice,
-        blockGasLimit,
-      })
-    case 'ETH':
-      return h(EthFeeDisplay, {
-        activeCurrency,
-        conversionRate,
-        gas,
-        gasPrice,
-        blockGasLimit,
-      })
-    default:
-      return h('div.token-gas', [
-        h('div.token-gas__amount', this.getTokenValue()),
-        h('div.token-gas__symbol', activeCurrency),
-      ])
-  }
-}
-