From 24fedfbf62df77b432f1703b51f8e61a98089f21 Mon Sep 17 00:00:00 2001 From: Jack Mallers Date: Thu, 8 Feb 2018 09:43:50 -0600 Subject: [PATCH] fix(bug): fix container and proptype bug --- app/components/Contacts/Network.js | 2 +- .../activity/containers/ActivityContainer.js | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/components/Contacts/Network.js b/app/components/Contacts/Network.js index 33c5156d..1f843b00 100644 --- a/app/components/Contacts/Network.js +++ b/app/components/Contacts/Network.js @@ -165,11 +165,11 @@ class Network extends Component { } Network.propTypes = { - channels: PropTypes.array.isRequired, currentChannels: PropTypes.array.isRequired, nodes: PropTypes.array.isRequired, nonActiveFilters: PropTypes.array.isRequired, + channels: PropTypes.object.isRequired, balance: PropTypes.object.isRequired, currentTicker: PropTypes.object.isRequired, diff --git a/app/routes/activity/containers/ActivityContainer.js b/app/routes/activity/containers/ActivityContainer.js index 88aa4fba..5437ca83 100644 --- a/app/routes/activity/containers/ActivityContainer.js +++ b/app/routes/activity/containers/ActivityContainer.js @@ -65,16 +65,14 @@ const mapStateToProps = state => ({ }) const mergeProps = (stateProps, dispatchProps, ownProps) => ({ - return { - ...stateProps, - ...dispatchProps, - ...ownProps, + ...stateProps, + ...dispatchProps, + ...ownProps, - // action to open the pay form - openPayForm: () => dispatchProps.setFormType('PAY_FORM'), - // action to open the request form - openRequestForm: () => dispatchProps.setFormType('REQUEST_FORM') - } + // action to open the pay form + openPayForm: () => dispatchProps.setFormType('PAY_FORM'), + // action to open the request form + openRequestForm: () => dispatchProps.setFormType('REQUEST_FORM') }) export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(Activity)