diff options
| author | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
|---|---|---|
| committer | Clemens <cle1000.cb@gmail.com> | 2016-07-19 12:32:36 +0200 |
| commit | 698fb11132598a38851383f805dde5ca4d2a046d (patch) | |
| tree | 95fc0184735722ccd6e4697f884496d6852e13f6 /web/src/js/components/FlowTable | |
| parent | 48728af43ad746d70ef3e251dc28b75028dea1e6 (diff) | |
| parent | 18dd84b9081fb5552d5b5b2560405496445e2110 (diff) | |
| download | mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.gz mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.tar.bz2 mitmproxy-698fb11132598a38851383f805dde5ca4d2a046d.zip | |
Merge remote-tracking branch 'origin/master' into flow_editing
Diffstat (limited to 'web/src/js/components/FlowTable')
| -rw-r--r-- | web/src/js/components/FlowTable/FlowTableHead.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/src/js/components/FlowTable/FlowTableHead.jsx b/web/src/js/components/FlowTable/FlowTableHead.jsx index f65369bd..50242737 100644 --- a/web/src/js/components/FlowTable/FlowTableHead.jsx +++ b/web/src/js/components/FlowTable/FlowTableHead.jsx @@ -3,7 +3,7 @@ import { connect } from 'react-redux' import classnames from 'classnames' import columns from './FlowColumns' -import { updateSort } from '../../ducks/views/main' +import { updateSort } from '../../ducks/flowView' FlowTableHead.propTypes = { updateSort: PropTypes.func.isRequired, @@ -29,8 +29,8 @@ function FlowTableHead({ sortColumn, sortDesc, updateSort }) { export default connect( state => ({ - sortDesc: state.flows.views.main.sort.desc, - sortColumn: state.flows.views.main.sort.column, + sortDesc: state.flowView.sort.desc, + sortColumn: state.flowView.sort.column, }), { updateSort |