Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts: # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
This commit is contained in:
commit
c93a4eda8e
@ -99,7 +99,8 @@ class FilterInput extends React.Component {
|
||||
} = props;
|
||||
const { sortDirection, sortId, inputValue } = selectedFilterData;
|
||||
const sortData = getSortData();
|
||||
const viewSettings = getViewSettingsData();
|
||||
let viewSettings = null;
|
||||
viewSettings = getViewSettingsData && getViewSettingsData();
|
||||
|
||||
const filterValues = selectedFilterData ? this.getDefaultFilterData() : [];
|
||||
|
||||
|
@ -124,7 +124,7 @@ class SortComboBox extends React.Component {
|
||||
spacing="0px"
|
||||
/>
|
||||
</DropDownItem>
|
||||
{viewSettings.length !== 0 && viewAs && isMobileOnly && (
|
||||
{viewSettings && viewSettings.length && viewAs && isMobileOnly && (
|
||||
<>
|
||||
<DropDownItem isSeparator />
|
||||
<DropDownItem noHover>
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 8177bad15d567d997a79478a65d32662a6f773b1
|
||||
Subproject commit b1063eae56d183b5c0b6eb887115c378f3941ebe
|
Loading…
Reference in New Issue
Block a user