Remove unnecessary withRouter
and compose
calls
#7890
Merged
withRouter
and compose
calls
#7890