Merge branch 'dev'

This commit is contained in:
Dessalines 2019-09-06 13:06:32 -07:00
commit 737d7c6cd1

View file

@ -107,7 +107,6 @@ export class Main extends Component<any, MainState> {
// Necessary for back button for some reason // Necessary for back button for some reason
componentWillReceiveProps(nextProps: any) { componentWillReceiveProps(nextProps: any) {
if (nextProps.history.action == 'POP' || nextProps.history.action == 'PUSH') { if (nextProps.history.action == 'POP' || nextProps.history.action == 'PUSH') {
this.state = this.emptyState;
this.state.type_ = this.getListingTypeFromProps(nextProps); this.state.type_ = this.getListingTypeFromProps(nextProps);
this.state.sort = this.getSortTypeFromProps(nextProps); this.state.sort = this.getSortTypeFromProps(nextProps);
this.state.page = this.getPageFromProps(nextProps); this.state.page = this.getPageFromProps(nextProps);