fix merge conflicts

1 files changed, 20 insertions, 0 deletions

diff --git a/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.component.js b/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.component.js
new file mode 100644
index 000000000..f2b537f11
--- /dev/null
+++ b/ui/app/components/user-preferenced-token-input/user-preferenced-token-input.component.js
@@ -0,0 +1,20 @@
+import React, { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+import TokenInput from '../token-input'
+
+export default class UserPreferencedTokenInput extends PureComponent {
+  static propTypes = {
+    useETHAsPrimaryCurrency: PropTypes.bool,
+  }
+
+  render () {
+    const { useETHAsPrimaryCurrency, ...restProps } = this.props
+
+    return (
+      <TokenInput
+        {...restProps}
+        showFiat={!useETHAsPrimaryCurrency}
+      />
+    )
+  }
+}