fix(bug): fix container and proptype bug

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,
 

app/routes/activity/containers/ActivityContainer.js

@@ -65,16 +65,14 @@ const mapStateToProps = state => ({
 })
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => ({
-  return {
+  ...stateProps,
-    ...stateProps,
+  ...dispatchProps,
-    ...dispatchProps,
+  ...ownProps,
-    ...ownProps,
 
-    // action to open the pay form
+  // action to open the pay form
-    openPayForm: () => dispatchProps.setFormType('PAY_FORM'),
+  openPayForm: () => dispatchProps.setFormType('PAY_FORM'),
-    // action to open the request form
+  // action to open the request form
-    openRequestForm: () => dispatchProps.setFormType('REQUEST_FORM')
+  openRequestForm: () => dispatchProps.setFormType('REQUEST_FORM')
-  }
 })
 
 export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(Activity)