IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into bugfix/mobile-loader

Browse Source
This commit is contained in:
Viktor Fomin 2023-03-02 15:03:31 +03:00
commit fbcd2500fe
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/Shell.jsx
View File

@ -517,7 +517,6 @@ const ShellWrapper = inject(({ auth, backup }) => {
setSnackbarExist,
socketHelper,
setTheme,
getWhiteLabelLogoUrls,
whiteLabelLogoUrls,
} = settingsStore;
const isBase = settingsStore.theme.isBase;

5
packages/common/store/AuthStore.js
View File

@ -79,7 +79,6 @@ class AuthStore {
this.settingsStore.getCompanyInfoSettings()
);
}
requests.push(this.settingsStore.getWhiteLabelLogoUrls());
}
}
@ -101,7 +100,7 @@ class AuthStore {
let success = false;
if (this.isAuthenticated) {
success = this.userStore.isLoaded && this.settingsStore.isLoaded;
success && this.setLanguage();
} else {
success = this.settingsStore.isLoaded;
@ -235,7 +234,7 @@ class AuthStore {
get isAuthenticated() {
return (
this.settingsStore.isLoaded && !!this.settingsStore.socketUrl
//|| //this.userStore.isAuthenticated
//|| //this.userStore.isAuthenticated
);
}