Skip to content

TagSpaces is an offline, open source, document manager with tagging support

currentUser selector fix

stanimir804f63ac3022
diff --git a/app/components/VerticalNavigation.tsx b/app/components/VerticalNavigation.tsx
index 7c14c83ef..9853e54a2 100644
--- a/app/components/VerticalNavigation.tsx
+++ b/app/components/VerticalNavigation.tsx
@@ -53,7 +53,8 @@ import {
isPerspectivesPanelOpened as isPerspectivesOpened,
isHelpFeedbackPanelOpened as isHelpFeedbackOpened,
isReadOnlyMode,
- getProgress
+ getProgress,
+ currentUser
} from '../reducers/app';
import { actions as SettingsActions, isFirstRun } from '../reducers/settings';
import LoadingLazy from './LoadingLazy';
@@ -446,7 +447,7 @@ function mapStateToProps(state) {
isReadOnlyMode: isReadOnlyMode(state),
directoryPath: getDirectoryPath(state),
progress: getProgress(state),
- user: state.app.user
+ user: currentUser(state)
};
}
diff --git a/app/utils/HandleAuth.tsx b/app/utils/HandleAuth.tsx
index 4f726a634..b3a355787 100644
--- a/app/utils/HandleAuth.tsx
+++ b/app/utils/HandleAuth.tsx
@@ -52,12 +52,12 @@ const HandleAuth = React.memo((props: Props) => {
.catch(e => {
console.error(e);
});
- // @ts-ignore
- username.current = authData.username;
- // @ts-ignore
- props.loggedIn(authData);
props.initApp();
}
+ // @ts-ignore
+ username.current = authData.username;
+ // @ts-ignore
+ props.loggedIn(authData);
} else if (nextAuthState === AuthState.SignedOut) {
username.current = undefined;
props.loggedIn(undefined);