Skip to content

Commit adf7d3a

Browse files
committed
Merge branch 'dev' into denton/search
2 parents 28f11c1 + 4f88fcc commit adf7d3a

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

app/src/components/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const App = (): JSX.Element => {
2323
// checks if user is signed in as guest or actual user and changes loggedIn boolean accordingly
2424
useEffect(() => {
2525
if (window.localStorage.getItem('ssid') !== 'guest') {
26-
dispatch(toggleLoggedIn());
26+
dispatch(toggleLoggedIn(true));
2727
}
2828
}, []);
2929

app/src/components/right/LoginButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function LoginButton() {
1515
document.cookie = 'ssid' + '=; Max-Age=0';
1616

1717
if (state.isLoggedIn) {
18-
dispatch(toggleLoggedIn());
18+
dispatch(toggleLoggedIn(false));
1919
}
2020

2121
window.location.href = state.isLoggedIn

app/src/containers/MarketplaceContainer.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ const MarketplaceContainer = () => {
3434

3535
};
3636

37+
38+
3739

3840
return (
3941
<div style={containerStyles}>

app/src/redux/reducers/slice/appStateSlice.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,8 +1248,8 @@ const appStateSlice = createSlice({
12481248
state.components = components;
12491249
},
12501250

1251-
toggleLoggedIn: (state) => {
1252-
state.isLoggedIn = !state.isLoggedIn;
1251+
toggleLoggedIn: (state, action) => {
1252+
state.isLoggedIn = action.payload;
12531253
},
12541254

12551255
snapShotAction: (state, action) => {

0 commit comments

Comments
 (0)