fixed dark mode bug

istvan-kreisz · Jul 18, 2021 · 5d2863b · 5d2863b
1 parent c1db9a9
commit 5d2863b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/electron/databaseCoordinator.ts b/electron/databaseCoordinator.ts
@@ -102,8 +102,8 @@ const databaseCoordinator = () => {
 
 	const getSettings = (): Settings => {
 		const settings = get('settings');
-		if (settings['darkModeOn'] === undefined) {
-			settings['darkModeOn'] = false;
+		if (settings !== undefined && settings?.darkModeOn === undefined) {
+			settings.darkModeOn = false;
 		}
 		if (is(settings, SettingsSchema)) {
 			return settings;
@@ -132,8 +132,8 @@ const databaseCoordinator = () => {
 		callback: (oldValue?: Settings, newValue?: Settings) => void
 	) => {
 		store.onDidChange('settings', (newValue: any, oldValue: any) => {
-			if (newValue['darkModeOn'] === undefined) {
-				newValue['darkModeOn'] = false;
+			if (newValue !== undefined && newValue?.darkModeOn === undefined) {
+				newValue.darkModeOn = false;
 			}
 			if (newValue && is(newValue, SettingsSchema)) {
 				if (oldValue && is(oldValue, SettingsSchema)) {
@@ -145,8 +145,8 @@ const databaseCoordinator = () => {
 		});
 		const settings = get('settings');
 		if (settings) {
-			if (settings['darkModeOn'] === undefined) {
-				settings['darkModeOn'] = false;
+			if (settings !== undefined && settings?.darkModeOn === undefined) {
+				settings.darkModeOn = false;
 			}
 			assert(settings, SettingsSchema);
 			callback(undefined, settings);

diff --git a/src/App.tsx b/src/App.tsx
@@ -64,8 +64,6 @@ const App = () => {
 			if (is(settings, SettingsSchema)) {
 				setCurrency(settings.currency);
 				const html = document?.getElementsByTagName('html')?.[0];
-				console.log(html);
-				console.log(settings.darkModeOn);
 				if (html) {
 					if (settings.darkModeOn) {
 						if (!html.classList.contains('dark')) {