Merge pull request #5182 from MetaMask/tx-activity

Add Transaction Details to the Transaction List view

3 files changed, 48 insertions, 0 deletions

diff --git a/ui/app/components/hex-to-decimal/hex-to-decimal.component.js b/ui/app/components/hex-to-decimal/hex-to-decimal.component.js
new file mode 100644
index 000000000..6847a6919
--- /dev/null
+++ b/ui/app/components/hex-to-decimal/hex-to-decimal.component.js
@@ -0,0 +1,21 @@
+import React, { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+import { hexToDecimal } from '../../helpers/conversions.util'
+
+export default class HexToDecimal extends PureComponent {
+  static propTypes = {
+    className: PropTypes.string,
+    value: PropTypes.string,
+  }
+
+  render () {
+    const { className, value } = this.props
+    const decimalValue = hexToDecimal(value)
+
+    return (
+      <div className={className}>
+        { decimalValue }
+      </div>
+    )
+  }
+}
diff --git a/ui/app/components/hex-to-decimal/index.js b/ui/app/components/hex-to-decimal/index.js
new file mode 100644
index 000000000..6e8567ca9
--- /dev/null
+++ b/ui/app/components/hex-to-decimal/index.js
@@ -0,0 +1 @@
+export { default } from './hex-to-decimal.component'
diff --git a/ui/app/components/hex-to-decimal/tests/hex-to-decimal.component.test.js b/ui/app/components/hex-to-decimal/tests/hex-to-decimal.component.test.js
new file mode 100644
index 000000000..c98da9ad4
--- /dev/null
+++ b/ui/app/components/hex-to-decimal/tests/hex-to-decimal.component.test.js
@@ -0,0 +1,26 @@
+import React from 'react'
+import assert from 'assert'
+import { shallow } from 'enzyme'
+import HexToDecimal from '../hex-to-decimal.component'
+
+describe('HexToDecimal Component', () => {
+  it('should render a prefixed hex as a decimal with a className', () => {
+    const wrapper = shallow(<HexToDecimal
+      value="0x3039"
+      className="hex-to-decimal"
+    />)
+
+    assert.ok(wrapper.hasClass('hex-to-decimal'))
+    assert.equal(wrapper.text(), '12345')
+  })
+
+  it('should render an unprefixed hex as a decimal with a className', () => {
+    const wrapper = shallow(<HexToDecimal
+      value="1A85"
+      className="hex-to-decimal"
+    />)
+
+    assert.ok(wrapper.hasClass('hex-to-decimal'))
+    assert.equal(wrapper.text(), '6789')
+  })
+})