Skip to content

Fix web theme saving in local storage#8599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isaacsolo merged 1 commit into from
May 23, 2024
+8 −8
Merged

Fix web theme saving in local storage #8599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion packages/web/src/pages/settings-page/SettingsPageProvider.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import {
subscribeSafariPushBrowser,
Permission
} from 'utils/browserNotifications'
import { THEME_KEY } from 'utils/theme/theme'
import { withClassNullGuard } from 'utils/withNullGuard'

import { SettingsPageProps as DesktopSettingsPageProps } from './components/desktop/SettingsPage'
Expand DownExpand Up@@ -248,7 +249,12 @@ function makeMapStateToProps() {

function mapDispatchToProps(dispatch: Dispatch) {
return {
setTheme: (theme: any) => dispatch(setTheme({ theme })),
setTheme: (theme: any) => {
dispatch(setTheme({ theme }))
if (typeof window !== 'undefined') {
window.localStorage.setItem(THEME_KEY, theme)
}
},
getNotificationSettings: () =>
dispatch(settingPageActions.getNotificationSettings()),
getPushNotificationSettings: () =>
Expand Down
8 changes: 1 addition & 7 deletions packages/web/src/utils/theme/theme.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { SystemAppearance, Theme } from '@audius/common/models'

const THEME_KEY = 'theme'
export const THEME_KEY = 'theme'
export const PREFERS_DARK_MEDIA_QUERY = '(prefers-color-scheme: dark)'

export const doesPreferDarkMode = () => {
Expand All@@ -18,12 +18,6 @@ export const shouldShowDark = (theme?: Theme | null) => {
)
}

export const setTheme = (theme: Theme) => {
if (typeof window !== 'undefined') {
window.localStorage.setItem(THEME_KEY, theme)
}
}

export const getTheme = (): Theme | null => {
const theme =
typeof window !== 'undefined'
Expand Down