|
@ -81,8 +81,12 @@ const mapStateToProps = state => ({ |
|
|
showPayLoadingScreen: payFormSelectors.showPayLoadingScreen(state) |
|
|
showPayLoadingScreen: payFormSelectors.showPayLoadingScreen(state) |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
const mergeProps = (stateProps, dispatchProps, ownProps) => { |
|
|
const mergeProps = (stateProps, dispatchProps, ownProps) => ({ |
|
|
const walletProps = { |
|
|
...stateProps, |
|
|
|
|
|
...dispatchProps, |
|
|
|
|
|
...ownProps, |
|
|
|
|
|
|
|
|
|
|
|
walletProps: { |
|
|
balance: stateProps.balance, |
|
|
balance: stateProps.balance, |
|
|
address: stateProps.address.address, |
|
|
address: stateProps.address.address, |
|
|
info: stateProps.info, |
|
|
info: stateProps.info, |
|
@ -102,14 +106,6 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => { |
|
|
openPayForm: () => dispatchProps.setFormType('PAY_FORM'), |
|
|
openPayForm: () => dispatchProps.setFormType('PAY_FORM'), |
|
|
openRequestForm: () => dispatchProps.setFormType('REQUEST_FORM') |
|
|
openRequestForm: () => dispatchProps.setFormType('REQUEST_FORM') |
|
|
} |
|
|
} |
|
|
|
|
|
}) |
|
|
return { |
|
|
|
|
|
...stateProps, |
|
|
|
|
|
...dispatchProps, |
|
|
|
|
|
...ownProps, |
|
|
|
|
|
|
|
|
|
|
|
walletProps |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(Activity) |
|
|
export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(Activity) |
|
|