Merge branch 'uat' into newmaster

1 files changed, 44 insertions, 0 deletions

diff --git a/ui/app/components/send/gas-fee-display-v2.js b/ui/app/components/send/gas-fee-display-v2.js
new file mode 100644
index 000000000..0c4c3f7a9
--- /dev/null
+++ b/ui/app/components/send/gas-fee-display-v2.js
@@ -0,0 +1,44 @@
+const Component = require('react').Component
+const h = require('react-hyperscript')
+const inherits = require('util').inherits
+const CurrencyDisplay = require('./currency-display')
+
+module.exports = GasFeeDisplay
+
+inherits(GasFeeDisplay, Component)
+function GasFeeDisplay () {
+  Component.call(this)
+}
+
+GasFeeDisplay.prototype.render = function () {
+  const {
+    conversionRate,
+    gasTotal,
+    onClick,
+    primaryCurrency = 'ETH',
+    convertedCurrency,
+  } = this.props
+
+  return h('div.send-v2__gas-fee-display', [
+
+    gasTotal
+      ? h(CurrencyDisplay, {
+        primaryCurrency,
+        convertedCurrency,
+        value: gasTotal,
+        conversionRate,
+        convertedPrefix: '$',
+        readOnly: true,
+      })
+      : h('div.currency-display', 'Loading...'),
+
+    h('button.send-v2__sliders-icon-container', {
+      onClick,
+      disabled: !gasTotal,
+    }, [
+      h('i.fa.fa-sliders.send-v2__sliders-icon'),
+    ]),
+
+  ])
+}
+