Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pages/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ const Settings: NextPage = () => {

useEffect(() => {
getUserInfoExtended((res) => {
setUser(res['data']['userInfo']);
setUser(res);
if (res) {
if (res['data']?.["userInfo"]?.organizationId) {
if (res?.organizationId) {
if (WebSocketsService.getConnectionOpened()) return;
WebSocketsService.setConnectionOpened(true);
WebSocketsService.initWsNotifications();
Expand All @@ -54,7 +54,7 @@ const Settings: NextPage = () => {
}, []);

function refetchAdminMessagesAndProcess() {
getAllActiveAdminMessages((res) => setActiveAdminMessages(postProcessAdminMessages(res["data"]["allActiveAdminMessages"])));
getAllActiveAdminMessages((res) => setActiveAdminMessages(postProcessAdminMessages(res)));
}

useWebsocket(user?.organizationId, Application.ENTRY, CurrentPage.ENTRY_LAYOUT, handleWebsocketNotification)
Expand Down
2 changes: 1 addition & 1 deletion submodules/javascript-functions