Merge pull request #5512 from MetaMask/v4.14.0

Version 4.14.0

3 files changed, 65 insertions, 0 deletions

diff --git a/ui/app/higher-order-components/with-modal-props/index.js b/ui/app/higher-order-components/with-modal-props/index.js
new file mode 100644
index 000000000..e476b51d2
--- /dev/null
+++ b/ui/app/higher-order-components/with-modal-props/index.js
@@ -0,0 +1 @@
+export { default } from './with-modal-props'
diff --git a/ui/app/higher-order-components/with-modal-props/tests/with-modal-props.test.js b/ui/app/higher-order-components/with-modal-props/tests/with-modal-props.test.js
new file mode 100644
index 000000000..654e7062a
--- /dev/null
+++ b/ui/app/higher-order-components/with-modal-props/tests/with-modal-props.test.js
@@ -0,0 +1,43 @@
+
+import assert from 'assert'
+import configureMockStore from 'redux-mock-store'
+import { mount } from 'enzyme'
+import React from 'react'
+import withModalProps from '../with-modal-props'
+
+const mockState = {
+  appState: {
+    modal: {
+      modalState: {
+        props: {
+          prop1: 'prop1',
+          prop2: 2,
+          prop3: true,
+        },
+      },
+    },
+  },
+}
+
+describe('withModalProps', () => {
+  it('should return a component wrapped with modal state props', () => {
+    const TestComponent = props => (
+      <div className="test">Testing</div>
+    )
+    const WrappedComponent = withModalProps(TestComponent)
+    const store = configureMockStore()(mockState)
+    const wrapper = mount(
+      <WrappedComponent store={store} />
+    )
+
+    assert.ok(wrapper)
+    const testComponent = wrapper.find(TestComponent).at(0)
+    assert.equal(testComponent.length, 1)
+    assert.equal(testComponent.find('.test').text(), 'Testing')
+    const testComponentProps = testComponent.props()
+    assert.equal(testComponentProps.prop1, 'prop1')
+    assert.equal(testComponentProps.prop2, 2)
+    assert.equal(testComponentProps.prop3, true)
+    assert.equal(typeof testComponentProps.hideModal, 'function')
+  })
+})
diff --git a/ui/app/higher-order-components/with-modal-props/with-modal-props.js b/ui/app/higher-order-components/with-modal-props/with-modal-props.js
new file mode 100644
index 000000000..02f3855af
--- /dev/null
+++ b/ui/app/higher-order-components/with-modal-props/with-modal-props.js
@@ -0,0 +1,21 @@
+import { connect } from 'react-redux'
+import { hideModal } from '../../actions'
+
+const mapStateToProps = state => {
+  const { appState } = state
+  const { props: modalProps } = appState.modal.modalState
+
+  return {
+    ...modalProps,
+  }
+}
+
+const mapDispatchToProps = dispatch => {
+  return {
+    hideModal: () => dispatch(hideModal()),
+  }
+}
+
+export default function withModalProps (Component) {
+  return connect(mapStateToProps, mapDispatchToProps)(Component)
+}