From 82c505895c0edebe3ff0c92f44ea008e615b60ff Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Fri, 2 Sep 2022 11:30:33 +1000
Subject: [PATCH] fix: errors from merging latest settings redesign

---
 ts/components/leftpane/ActionsPanel.tsx          | 1 -
 ts/components/settings/SettingsThemeSwitcher.tsx | 2 +-
 ts/session/utils/Theme.tsx                       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index a280080a2..0bae85aec 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -38,7 +38,6 @@ import { debounce, isEmpty, isString } from 'lodash';
 // tslint:disable-next-line: no-import-side-effect no-submodule-imports
 
 import { ActionPanelOnionStatusLight } from '../dialog/OnionStatusPathDialog';
-import { switchHtmlToDarkTheme, switchHtmlToLightTheme } from '../../themes/SessionTheme';
 import { loadDefaultRooms } from '../../session/apis/open_group_api/opengroupV2/ApiUtil';
 import { getOpenGroupManager } from '../../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2';
 import { getSwarmPollingInstance } from '../../session/apis/snode_api';
diff --git a/ts/components/settings/SettingsThemeSwitcher.tsx b/ts/components/settings/SettingsThemeSwitcher.tsx
index 7701b8a0b..14c652bc1 100644
--- a/ts/components/settings/SettingsThemeSwitcher.tsx
+++ b/ts/components/settings/SettingsThemeSwitcher.tsx
@@ -11,7 +11,7 @@ import {
   OceanBlueDark,
   OceanBlueLight,
   PrimaryColorIds,
-} from '../../state/ducks/SessionTheme';
+} from '../../themes/SessionTheme';
 import { ThemeStateType } from '../../state/ducks/theme';
 import { getTheme } from '../../state/selectors/theme';
 import { SessionRadio, SessionRadioPrimaryColors } from '../basic/SessionRadio';
diff --git a/ts/session/utils/Theme.tsx b/ts/session/utils/Theme.tsx
index 34ac87f27..ceaef1634 100644
--- a/ts/session/utils/Theme.tsx
+++ b/ts/session/utils/Theme.tsx
@@ -1,6 +1,6 @@
 import { Dispatch } from 'redux';
-import { switchHtmlToDarkTheme, switchHtmlToLightTheme } from '../../state/ducks/SessionTheme';
 import { applyTheme, ThemeStateType } from '../../state/ducks/theme';
+import { switchHtmlToDarkTheme, switchHtmlToLightTheme } from '../../themes/SessionTheme';
 
 export async function switchThemeTo(theme: ThemeStateType, dispatch: Dispatch | null) {
   await window.setTheme(theme);