Merge branch 'develop' into TokensPerAccountBasis

8 files changed, 322 insertions, 1 deletions

diff --git a/ui/app/components/button-group/button-group.component.js b/ui/app/components/button-group/button-group.component.js
new file mode 100644
index 000000000..f99f710ce
--- /dev/null
+++ b/ui/app/components/button-group/button-group.component.js
@@ -0,0 +1,61 @@
+import React, { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+import classnames from 'classnames'
+
+export default class ButtonGroup extends PureComponent {
+  static propTypes = {
+    defaultActiveButtonIndex: PropTypes.number,
+    disabled: PropTypes.bool,
+    children: PropTypes.array,
+    className: PropTypes.string,
+    style: PropTypes.object,
+  }
+
+  static defaultProps = {
+    className: 'button-group',
+  }
+
+  state = {
+    activeButtonIndex: this.props.defaultActiveButtonIndex || 0,
+  }
+
+  handleButtonClick (activeButtonIndex) {
+    this.setState({ activeButtonIndex })
+  }
+
+  renderButtons () {
+    const { children, disabled } = this.props
+
+    return React.Children.map(children, (child, index) => {
+      return child && (
+        <button
+          className={classnames(
+            'button-group__button',
+            { 'button-group__button--active': index === this.state.activeButtonIndex },
+          )}
+          onClick={() => {
+            this.handleButtonClick(index)
+            child.props.onClick && child.props.onClick()
+          }}
+          disabled={disabled || child.props.disabled}
+          key={index}
+        >
+          { child.props.children }
+        </button>
+      )
+    })
+  }
+
+  render () {
+    const { className, style } = this.props
+
+    return (
+      <div
+        className={className}
+        style={style}
+      >
+        { this.renderButtons() }
+      </div>
+    )
+  }
+}
diff --git a/ui/app/components/button-group/button-group.stories.js b/ui/app/components/button-group/button-group.stories.js
new file mode 100644
index 000000000..14e1a7e49
--- /dev/null
+++ b/ui/app/components/button-group/button-group.stories.js
@@ -0,0 +1,49 @@
+import React from 'react'
+import { storiesOf } from '@storybook/react'
+import { action } from '@storybook/addon-actions'
+import ButtonGroup from './'
+import Button from '../button'
+import { text, boolean } from '@storybook/addon-knobs/react'
+
+storiesOf('ButtonGroup', module)
+  .add('with Buttons', () =>
+    <ButtonGroup
+      style={{ width: '300px' }}
+      disabled={boolean('Disabled', false)}
+      defaultActiveButtonIndex={1}
+    >
+      <Button
+        onClick={action('cheap')}
+      >
+        {text('Button1', 'Cheap')}
+      </Button>
+      <Button
+        onClick={action('average')}
+      >
+        {text('Button2', 'Average')}
+      </Button>
+      <Button
+        onClick={action('fast')}
+      >
+        {text('Button3', 'Fast')}
+      </Button>
+    </ButtonGroup>
+  )
+  .add('with a disabled Button', () =>
+    <ButtonGroup
+      style={{ width: '300px' }}
+      disabled={boolean('Disabled', false)}
+    >
+      <Button
+        onClick={action('enabled')}
+      >
+        {text('Button1', 'Enabled')}
+      </Button>
+      <Button
+        onClick={action('disabled')}
+        disabled
+      >
+        {text('Button2', 'Disabled')}
+      </Button>
+    </ButtonGroup>
+  )
diff --git a/ui/app/components/button-group/index.js b/ui/app/components/button-group/index.js
new file mode 100644
index 000000000..df470bd57
--- /dev/null
+++ b/ui/app/components/button-group/index.js
@@ -0,0 +1 @@
+export { default } from './button-group.component'
diff --git a/ui/app/components/button-group/index.scss b/ui/app/components/button-group/index.scss
new file mode 100644
index 000000000..29713c75b
--- /dev/null
+++ b/ui/app/components/button-group/index.scss
@@ -0,0 +1,38 @@
+.button-group {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  &__button {
+    font-family: Roboto;
+    font-size: 1rem;
+    color: $tundora;
+    border-style: solid;
+    border-color: $alto;
+    border-width: 1px 1px 1px;
+    border-left: 0;
+    flex: 1;
+    padding: 12px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    &:first-child {
+      border-left: 1px solid $alto;
+      border-radius: 4px 0 0 4px;
+    }
+
+    &:last-child {
+      border-radius: 0 4px 4px 0;
+    }
+
+    &--active {
+      background-color: $dodger-blue;
+      color: $white;
+    }
+
+    &:disabled {
+      opacity: .5;
+    }
+  }
+}
\ No newline at end of file
diff --git a/ui/app/components/button-group/tests/button-group-component.test.js b/ui/app/components/button-group/tests/button-group-component.test.js
new file mode 100644
index 000000000..f07bb97c8
--- /dev/null
+++ b/ui/app/components/button-group/tests/button-group-component.test.js
@@ -0,0 +1,97 @@
+import React from 'react'
+import assert from 'assert'
+import { shallow } from 'enzyme'
+import sinon from 'sinon'
+import ButtonGroup from '../button-group.component.js'
+
+const childButtonSpies = {
+  onClick: sinon.spy(),
+}
+
+sinon.spy(ButtonGroup.prototype, 'handleButtonClick')
+sinon.spy(ButtonGroup.prototype, 'renderButtons')
+
+const mockButtons = [
+  <button onClick={childButtonSpies.onClick} key={'a'}><div className="mockClass" /></button>,
+  <button onClick={childButtonSpies.onClick} key={'b'}></button>,
+  <button onClick={childButtonSpies.onClick} key={'c'}></button>,
+]
+
+describe('ButtonGroup Component', function () {
+  let wrapper
+
+  beforeEach(() => {
+    wrapper = shallow(<ButtonGroup
+      defaultActiveButtonIndex={1}
+      disabled={false}
+      className="someClassName"
+      style={ { color: 'red' } }
+    >{mockButtons}</ButtonGroup>)
+  })
+
+  afterEach(() => {
+    childButtonSpies.onClick.resetHistory()
+    ButtonGroup.prototype.handleButtonClick.resetHistory()
+    ButtonGroup.prototype.renderButtons.resetHistory()
+  })
+
+  describe('handleButtonClick', () => {
+    it('should set the activeButtonIndex', () => {
+      assert.equal(wrapper.state('activeButtonIndex'), 1)
+      wrapper.instance().handleButtonClick(2)
+      assert.equal(wrapper.state('activeButtonIndex'), 2)
+    })
+  })
+
+  describe('renderButtons', () => {
+    it('should render a button for each child', () => {
+        const childButtons = wrapper.find('.button-group__button')
+        assert.equal(childButtons.length, 3)
+    })
+
+    it('should render the correct button with an active state', () => {
+        const childButtons = wrapper.find('.button-group__button')
+        const activeChildButton = wrapper.find('.button-group__button--active')
+        assert.deepEqual(childButtons.get(1), activeChildButton.get(0))
+    })
+
+    it('should call handleButtonClick and the respective button\'s onClick method when a button is clicked', () => {
+        assert.equal(ButtonGroup.prototype.handleButtonClick.callCount, 0)
+        assert.equal(childButtonSpies.onClick.callCount, 0)
+        const childButtons = wrapper.find('.button-group__button')
+        childButtons.at(0).props().onClick()
+        childButtons.at(1).props().onClick()
+        childButtons.at(2).props().onClick()
+        assert.equal(ButtonGroup.prototype.handleButtonClick.callCount, 3)
+        assert.equal(childButtonSpies.onClick.callCount, 3)
+    })
+
+    it('should render all child buttons as disabled if props.disabled is true', () => {
+        const childButtons = wrapper.find('.button-group__button')
+        childButtons.forEach(button => {
+            assert.equal(button.props().disabled, undefined)
+        })
+        wrapper.setProps({ disabled: true })
+        const disabledChildButtons = wrapper.find('[disabled=true]')
+        assert.equal(disabledChildButtons.length, 3)
+    })
+
+    it('should render the children of the button', () => {
+        const mockClass = wrapper.find('.mockClass')
+        assert.equal(mockClass.length, 1)
+    })
+  })
+
+  describe('render', () => {
+    it('should render a div with the expected class and style', () => {
+      assert.equal(wrapper.find('div').at(0).props().className, 'someClassName')
+      assert.deepEqual(wrapper.find('div').at(0).props().style, { color: 'red' })
+    })
+
+    it('should call renderButtons when rendering', () => {
+        assert.equal(ButtonGroup.prototype.renderButtons.callCount, 1)
+        wrapper.instance().render()
+        assert.equal(ButtonGroup.prototype.renderButtons.callCount, 2)
+    })
+  })
+})
diff --git a/ui/app/components/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js b/ui/app/components/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js
new file mode 100644
index 000000000..6f2489071
--- /dev/null
+++ b/ui/app/components/confirm-page-container/confirm-detail-row/tests/confirm-detail-row.component.test.js
@@ -0,0 +1,64 @@
+import React from 'react'
+import assert from 'assert'
+import { shallow } from 'enzyme'
+import ConfirmDetailRow from '../confirm-detail-row.component.js'
+import sinon from 'sinon'
+
+const propsMethodSpies = {
+  onHeaderClick: sinon.spy(),
+}
+
+describe('Confirm Detail Row Component', function () {
+  let wrapper
+
+  beforeEach(() => {
+    wrapper = shallow(<ConfirmDetailRow
+      errorType={'mockErrorType'}
+      label={'mockLabel'}
+      showError={false}
+      fiatText = {'mockFiatText'}
+      ethText = {'mockEthText'}
+      fiatTextColor= {'mockColor'}
+      onHeaderClick= {propsMethodSpies.onHeaderClick}
+      headerText = {'mockHeaderText'}
+      headerTextClassName = {'mockHeaderClass'}
+    />)
+  })
+
+	describe('render', () => {
+    it('should render a div with a confirm-detail-row class', () => {
+      assert.equal(wrapper.find('div.confirm-detail-row').length, 1)
+    })
+
+    it('should render the label as a child of the confirm-detail-row__label', () => {
+      assert.equal(wrapper.find('.confirm-detail-row > .confirm-detail-row__label').childAt(0).text(), 'mockLabel')
+    })
+
+    it('should render the headerText as a child of the confirm-detail-row__header-text', () => {
+      assert.equal(wrapper.find('.confirm-detail-row__details > .confirm-detail-row__header-text').childAt(0).text(), 'mockHeaderText')
+    })
+
+    it('should render the fiatText as a child of the confirm-detail-row__fiat', () => {
+      assert.equal(wrapper.find('.confirm-detail-row__details > .confirm-detail-row__fiat').childAt(0).text(), 'mockFiatText')
+    })
+
+    it('should render the ethText as a child of the confirm-detail-row__eth', () => {
+      assert.equal(wrapper.find('.confirm-detail-row__details > .confirm-detail-row__eth').childAt(0).text(), 'mockEthText')
+    })
+
+    it('should set the fiatTextColor on confirm-detail-row__fiat', () => {
+      assert.equal(wrapper.find('.confirm-detail-row__fiat').props().style.color, 'mockColor')
+    })
+
+    it('should assure the confirm-detail-row__header-text classname is correct', () => {
+      assert.equal(wrapper.find('.confirm-detail-row__header-text').props().className, 'confirm-detail-row__header-text mockHeaderClass')
+    })
+
+    it('should call onHeaderClick when headerText div gets clicked', () => {
+      wrapper.find('.confirm-detail-row__header-text').props().onClick()
+      assert.equal(assert.equal(propsMethodSpies.onHeaderClick.callCount, 1))
+    })
+
+
+	})
+})
diff --git a/ui/app/components/index.scss b/ui/app/components/index.scss
index 32f0e90e4..b3e14ce23 100644
--- a/ui/app/components/index.scss
+++ b/ui/app/components/index.scss
@@ -1,3 +1,5 @@
+@import './button-group/index';
+
 @import './export-text-container/index';
 
 @import './selected-account/index';
diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js
index 0d693b805..1a639d0b9 100644
--- a/ui/app/components/tx-list-item.js
+++ b/ui/app/components/tx-list-item.js
@@ -213,14 +213,23 @@ TxListItem.prototype.showRetryButton = function () {
   if (!txParams) {
     return false
   }
+  let currentTxIsLatest = false
   const currentNonce = txParams.nonce
   const currentNonceTxs = selectedAddressTxList.filter(tx => tx.txParams.nonce === currentNonce)
   const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
+  const currentSubmittedTxs = selectedAddressTxList.filter(tx => tx.status === 'submitted')
   const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[currentNonceSubmittedTxs.length - 1]
   const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
     lastSubmittedTxWithCurrentNonce.id === transactionId
+  if (currentSubmittedTxs.length > 0) {
+    const lastTx = currentSubmittedTxs.reduce((tx1, tx2) => {
+      if (tx1.submittedTime < tx2.submittedTime) return tx1
+      return tx2
+    })
+    currentTxIsLatest = lastTx.id === transactionId
+  }
 
-  return currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000
+  return currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000 && currentTxIsLatest
 }
 
 TxListItem.prototype.setSelectedToken = function (tokenAddress) {