Merge remote-tracking branch 'oxen/unstable' into userconfig_disappearingmessage

_locales/en/messages.json

@@ -246,8 +246,11 @@
   "nicknamePlaceholder": "New Nickname",
   "changeNicknameMessage": "Enter a nickname for this user",
   "noteToSelf": "Note to Self",
+  "savedMessages": "Saved Messages",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility.",
+  "matchThemeSystemSettingTitle": "Auto dark-mode",
+  "matchThemeSystemSettingDescription": "Match system settings",
   "startConversation": "Start New Conversation",
   "invalidNumberError": "Please check the Session ID or ONS name and try again",
   "failedResolveOns": "Failed to resolve ONS name",
@@ -436,6 +439,10 @@
   "open": "Open",
   "audioMessageAutoplayTitle": "Autoplay Audio Messages",
   "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.",
+  "enterKeySettingTitle": "Enter Key",
+  "enterKeySettingDescription": "Function of the enter key when typing in a conversation.",
+  "enterSendNewMessageDescription": "ENTER sends a message, SHIFT + ENTER starts a new line",
+  "enterNewLineDescription": "SHIFT + ENTER sends a message, ENTER starts a new line",
   "clickToTrustContact": "Click to download media",
   "trustThisContactDialogTitle": "Trust $name$?",
   "trustThisContactDialogDescription": "Are you sure you want to download media sent by $name$?",

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.11.4",
+  "version": "1.11.5",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",

stylesheets/_modules.scss

@@ -811,8 +811,8 @@
   font-size: 20px;
   font-weight: normal;
   letter-spacing: 0;
-
   text-align: center;
+  background-color: rgba(0, 0, 0, 0.7);
 }
 
 .module-image__close-button {

ts/components/basic/SessionRadioGroup.tsx

@@ -8,7 +8,7 @@ interface Props {
   initialItem: string;
   items: Array<{ value: string; label: string }>;
   group: string;
-  onClick: (selectedValue: string) => any;
+  onClick: (selectedValue: string) => void;
   style?: CSSProperties;
 }
 

ts/components/conversation/composition/CompositionBox.tsx

@@ -832,8 +832,19 @@ class CompositionBoxInner extends React.Component<Props, State> {
   }
 
   private async onKeyDown(event: any) {
-    if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing) {
-      // If shift, newline. If in IME composing mode, leave it to IME. Else send message.
+    const isEnter = event.key === 'Enter';
+    const isShiftEnter = event.shiftKey && isEnter;
+    const isShiftSendEnabled = window.getSettingValue(SettingsKey.hasShiftSendEnabled) as boolean;
+    const isNotComposing = !event.nativeEvent.isComposing;
+
+    if (isShiftSendEnabled && isEnter && isNotComposing) {
+      event.preventDefault();
+      if (isShiftEnter) {
+        await this.onSendMessage();
+      } else {
+        this.insertNewLine();
+      }
+    } else if (isEnter && !event.shiftKey && isNotComposing) {
       event.preventDefault();
       await this.onSendMessage();
     } else if (event.key === 'Escape' && this.state.showEmojiPanel) {
@@ -845,6 +856,34 @@ class CompositionBoxInner extends React.Component<Props, State> {
     }
   }
 
+  private insertNewLine() {
+    const messageBox = this.textarea.current;
+    if (!messageBox) {
+      return;
+    }
+
+    const { draft } = this.state;
+    const { selectedConversationKey } = this.props;
+
+    if (!selectedConversationKey) {
+      return; // add this check to prevent undefined from being used
+    }
+
+    const currentSelectionStart = Number(messageBox.selectionStart);
+    const realSelectionStart = getSelectionBasedOnMentions(draft, currentSelectionStart);
+
+    const before = draft.slice(0, realSelectionStart);
+    const after = draft.slice(realSelectionStart);
+
+    const updatedDraft = `${before}\n${after}`;
+
+    this.setState({ draft: updatedDraft });
+    updateDraftForConversation({
+      conversationKey: selectedConversationKey,
+      draft: updatedDraft,
+    });
+  }
+
   private async onKeyUp() {
     if (!this.props.selectedConversationKey) {
       throw new Error('selectedConversationKey is needed');

ts/components/leftpane/ActionsPanel.tsx

@@ -43,7 +43,8 @@ import {
   getFreshSwarmFor,
 } from '../../session/apis/snode_api/snodePool';
 import { isDarkTheme } from '../../state/selectors/theme';
-import { ThemeStateType } from '../../themes/constants/colors';
+import { ensureThemeConsistency } from '../../themes/SessionTheme';
+import { getOppositeTheme } from '../../util/theme';
 import { switchThemeTo } from '../../themes/switchTheme';
 import { ConfigurationSync } from '../../session/utils/job_runners/jobs/ConfigurationSyncJob';
 import { ReleasedFeatures } from '../../util/releaseFeature';
@@ -62,11 +63,8 @@ const Section = (props: { type: SectionType }) => {
     if (type === SectionType.Profile) {
       dispatch(editProfileModal({}));
     } else if (type === SectionType.ColorMode) {
-      const currentTheme = String(window.Events.getThemeSetting());
-      const newTheme = (isDarkMode
-        ? currentTheme.replace('dark', 'light')
-        : currentTheme.replace('light', 'dark')) as ThemeStateType;
-
+      const currentTheme = window.Events.getThemeSetting();
+      const newTheme = getOppositeTheme(currentTheme);
       // We want to persist the primary color when using the color mode button
       void switchThemeTo({
         theme: newTheme,
@@ -150,14 +148,26 @@ const cleanUpMediasInterval = DURATION.MINUTES * 60;
 const fetchReleaseFromFileServerInterval = 1000 * 60; // try to fetch the latest release from the fileserver every minute
 
 const setupTheme = async () => {
+  const shouldFollowSystemTheme = window.getSettingValue(SettingsKey.hasFollowSystemThemeEnabled);
   const theme = window.Events.getThemeSetting();
-  // We don't want to reset the primary color on startup
-  await switchThemeTo({
+  const themeConfig = {
     theme,
     mainWindow: true,
     usePrimaryColor: true,
     dispatch: window?.inboxStore?.dispatch || undefined,
-  });
+  };
+
+  if (shouldFollowSystemTheme) {
+    // Check if system theme matches currently set theme, if not switch it and return true, if matching return false
+    const wasThemeSwitched = await ensureThemeConsistency();
+    if (!wasThemeSwitched) {
+      // if theme wasn't switched them set theme to default
+      await switchThemeTo(themeConfig);
+    }
+    return;
+  }
+
+  await switchThemeTo(themeConfig);
 };
 
 // Do this only if we created a new Session ID, or if we already received the initial configuration message

ts/components/settings/section/CategoryAppearance.tsx

@@ -3,13 +3,15 @@ import React from 'react';
 import useUpdate from 'react-use/lib/useUpdate';
 import { SettingsKey } from '../../../data/settings-key';
 import { isHideMenuBarSupported } from '../../../types/Settings';
-
+import { useHasFollowSystemThemeEnabled } from '../../../state/selectors/settings';
+import { ensureThemeConsistency } from '../../../themes/SessionTheme';
 import { SessionToggleWithDescription } from '../SessionSettingListItem';
 import { SettingsThemeSwitcher } from '../SettingsThemeSwitcher';
 import { ZoomingSessionSlider } from '../ZoomingSessionSlider';
 
 export const SettingsCategoryAppearance = (props: { hasPassword: boolean | null }) => {
   const forceUpdate = useUpdate();
+  const isFollowSystemThemeEnabled = useHasFollowSystemThemeEnabled();
 
   if (props.hasPassword !== null) {
     const isHideMenuBarActive =
@@ -32,6 +34,20 @@ export const SettingsCategoryAppearance = (props: { hasPassword: boolean | null
             active={isHideMenuBarActive}
           />
         )}
+        <SessionToggleWithDescription
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClickToggle={async () => {
+            const toggledValue = !isFollowSystemThemeEnabled;
+            await window.setSettingValue(SettingsKey.hasFollowSystemThemeEnabled, toggledValue);
+            if (!isFollowSystemThemeEnabled) {
+              await ensureThemeConsistency();
+            }
+          }}
+          title={window.i18n('matchThemeSystemSettingTitle')}
+          description={window.i18n('matchThemeSystemSettingDescription')}
+          active={isFollowSystemThemeEnabled}
+          dataTestId="enable-follow-system-theme"
+        />
       </>
     );
   }

ts/components/settings/section/CategoryConversations.tsx

@@ -6,10 +6,13 @@ import { SettingsKey } from '../../../data/settings-key';
 import { ToastUtils } from '../../../session/utils';
 import { toggleAudioAutoplay } from '../../../state/ducks/userConfig';
 import { getAudioAutoplay } from '../../../state/selectors/userConfig';
-
+import { SessionRadioGroup } from '../../basic/SessionRadioGroup';
 import { BlockedContactsList } from '../BlockedList';
-
-import { SessionToggleWithDescription } from '../SessionSettingListItem';
+import {
+  SessionSettingsItemWrapper,
+  SessionToggleWithDescription,
+} from '../SessionSettingListItem';
+import { useHasEnterSendEnabled } from '../../../state/selectors/settings';
 
 async function toggleCommunitiesPruning() {
   try {
@@ -81,13 +84,49 @@ const AudioMessageAutoPlaySetting = () => {
   );
 };
 
+const EnterKeyFunctionSetting = () => {
+  const initialSetting = useHasEnterSendEnabled();
+  const selectedWithSettingTrue = 'enterForNewLine';
+
+  const items = [
+    {
+      label: window.i18n('enterSendNewMessageDescription'),
+      value: 'enterForSend',
+    },
+    {
+      label: window.i18n('enterNewLineDescription'),
+      value: selectedWithSettingTrue,
+    },
+  ];
+
+  return (
+    <SessionSettingsItemWrapper
+      title={window.i18n('enterKeySettingTitle')}
+      description={window.i18n('enterKeySettingDescription')}
+      inline={false}
+    >
+      <SessionRadioGroup
+        initialItem={initialSetting ? 'enterForNewLine' : 'enterForSend'}
+        group={SettingsKey.hasShiftSendEnabled} // make sure to define this key in your SettingsKey enum
+        items={items}
+        onClick={(selectedRadioValue: string) => {
+          void window.setSettingValue(
+            SettingsKey.hasShiftSendEnabled,
+            selectedRadioValue === selectedWithSettingTrue
+          );
+        }}
+      />
+    </SessionSettingsItemWrapper>
+  );
+};
+
 export const CategoryConversations = () => {
   return (
     <>
       <CommunitiesPruningSetting />
       <SpellCheckSetting />
       <AudioMessageAutoPlaySetting />
-
+      <EnterKeyFunctionSetting />
       <BlockedContactsList />
     </>
   );

ts/data/settings-key.ts

@@ -1,7 +1,7 @@
 const settingsReadReceipt = 'read-receipt-setting';
 const settingsTypingIndicator = 'typing-indicators-setting';
 const settingsAutoUpdate = 'auto-update';
-
+const hasShiftSendEnabled = 'hasShiftSendEnabled';
 const settingsMenuBar = 'hide-menu-bar';
 const settingsSpellCheck = 'spell-check';
 const settingsLinkPreview = 'link-preview-setting';
@@ -14,6 +14,7 @@ const someDeviceOutdatedSyncing = 'someDeviceOutdatedSyncing';
 const hasSyncedInitialConfigurationItem = 'hasSyncedInitialConfigurationItem';
 const lastAvatarUploadTimestamp = 'lastAvatarUploadTimestamp';
 const hasLinkPreviewPopupBeenDisplayed = 'hasLinkPreviewPopupBeenDisplayed';
+const hasFollowSystemThemeEnabled = 'hasFollowSystemThemeEnabled';
 
 // user config tracking timestamps (to discard incoming messages which would make a change we reverted in the last config message we merged)
 const latestUserProfileEnvelopeTimestamp = 'latestUserProfileEnvelopeTimestamp';
@@ -24,6 +25,7 @@ export const SettingsKey = {
   settingsReadReceipt,
   settingsTypingIndicator,
   settingsAutoUpdate,
+  hasShiftSendEnabled,
   settingsMenuBar,
   settingsSpellCheck,
   settingsLinkPreview,
@@ -39,6 +41,7 @@ export const SettingsKey = {
   latestUserProfileEnvelopeTimestamp,
   latestUserGroupEnvelopeTimestamp,
   latestUserContactsEnvelopeTimestamp,
+  hasFollowSystemThemeEnabled,
 } as const;
 
 export const KNOWN_BLINDED_KEYS_ITEM = 'KNOWN_BLINDED_KEYS_ITEM';

ts/mains/main_node.ts

@@ -10,6 +10,7 @@ import {
   dialog,
   ipcMain as ipc,
   Menu,
+  nativeTheme,
   protocol as electronProtocol,
   screen,
   shell,
@@ -1116,6 +1117,15 @@ ipc.on('set-auto-update-setting', async (_event, enabled) => {
   }
 });
 
+ipc.on('get-native-theme', event => {
+  event.sender.send('send-native-theme', nativeTheme.shouldUseDarkColors);
+});
+
+nativeTheme.on('updated', () => {
+  // Inform all renderer processes of the theme change
+  mainWindow?.webContents.send('native-theme-update', nativeTheme.shouldUseDarkColors);
+});
+
 async function getThemeFromMainWindow() {
   return new Promise(resolve => {
     ipc.once('get-success-theme-setting', (_event, value) => {

ts/mains/main_renderer.tsx

@@ -3,7 +3,9 @@ import _ from 'lodash';
 import ReactDOM from 'react-dom';
 
 import nativeEmojiData from '@emoji-mart/data';
-import React from 'react';
+import { ipcRenderer } from 'electron';
+// eslint-disable-next-line import/no-named-default
+import { default as React } from 'react';
 
 import { isMacOS } from '../OS';
 import { SessionInboxView } from '../components/SessionInboxView';
@@ -22,11 +24,13 @@ import { getOurPubKeyStrFromCache } from '../session/utils/User';
 import { runners } from '../session/utils/job_runners/JobRunner';
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { switchPrimaryColorTo } from '../themes/switchPrimaryColor';
+import { switchThemeTo } from '../themes/switchTheme';
 import { BlockedNumberController } from '../util';
 import { initialiseEmojiData } from '../util/emoji';
 import { Notifications } from '../util/notifications';
 import { Registration } from '../util/registration';
 import { Storage, isSignInByLinking } from '../util/storage';
+import { getOppositeTheme, isThemeMismatched } from '../util/theme';
 
 // Globally disable drag and drop
 document.body.addEventListener(
@@ -109,6 +113,23 @@ function mapOldThemeToNew(theme: string) {
       return theme;
   }
 }
+// using __unused as lodash is imported using _
+ipcRenderer.on('native-theme-update', (__unused, shouldUseDarkColors) => {
+  const shouldFollowSystemTheme = window.getSettingValue(SettingsKey.hasFollowSystemThemeEnabled);
+
+  if (shouldFollowSystemTheme) {
+    const theme = window.Events.getThemeSetting();
+    if (isThemeMismatched(theme, shouldUseDarkColors)) {
+      const newTheme = getOppositeTheme(theme);
+      void switchThemeTo({
+        theme: newTheme,
+        mainWindow: true,
+        usePrimaryColor: true,
+        dispatch: window?.inboxStore?.dispatch,
+      });
+    }
+  }
+});
 
 async function startJobRunners() {
   // start the job runners

ts/receiver/closedGroups.ts

@@ -18,13 +18,13 @@ import { ConversationTypeEnum } from '../models/conversationAttributes';
 import { getSwarmPollingInstance } from '../session/apis/snode_api';
 import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
+import { DisappearingMessageUpdate } from '../session/disappearing_messages/types';
 import { ClosedGroupEncryptionPairReplyMessage } from '../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage';
 import { UserUtils } from '../session/utils';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { ReleasedFeatures } from '../util/releaseFeature';
 import { Storage } from '../util/storage';
 // eslint-disable-next-line import/no-unresolved, import/extensions
-import { DisappearingMessageUpdate } from '../session/disappearing_messages/types';
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import { getSettingsKeyFromLibsessionWrapper } from './configMessage';
 import { ECKeyPair, HexKeyPair } from './keypairs';

ts/receiver/configMessage.ts

@@ -24,6 +24,7 @@ import { PubKey } from '../session/types';
 import { StringUtils, UserUtils } from '../session/utils';
 import { toHex } from '../session/utils/String';
 import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob';
+import { FetchMsgExpirySwarm } from '../session/utils/job_runners/jobs/FetchMsgExpirySwarmJob'; // eslint-disable-next-line import/no-unresolved, import/extensions
 import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils';
 import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts';
 import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile';
@@ -40,8 +41,8 @@ import {
   isSignInByLinking,
   setLastProfileUpdateTimestamp,
 } from '../util/storage';
-// eslint-disable-next-line import/no-unresolved, import/extensions
-import { FetchMsgExpirySwarm } from '../session/utils/job_runners/jobs/FetchMsgExpirySwarmJob';
+
+// eslint-disable-next-line import/no-unresolved
 import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions';
 import {
   ContactsWrapperActions,

ts/session/utils/calling/CallManager.ts

@@ -145,16 +145,17 @@ const iceServersFullArray = [
     username: 'session202111',
     credential: '053c268164bc7bd7',
   },
-  {
-    urls: 'turn:fenrir.getsession.org',
-    username: 'session202111',
-    credential: '053c268164bc7bd7',
-  },
-  {
-    urls: 'turn:frigg.getsession.org',
-    username: 'session202111',
-    credential: '053c268164bc7bd7',
-  },
+  // excluding those two (fenrir & frigg) as they are TCP only for now
+  // {
+  //   urls: 'turn:fenrir.getsession.org',
+  //   username: 'session202111',
+  //   credential: '053c268164bc7bd7',
+  // },
+  // {
+  //   urls: 'turn:frigg.getsession.org',
+  //   username: 'session202111',
+  //   credential: '053c268164bc7bd7',
+  // },
   {
     urls: 'turn:angus.getsession.org',
     username: 'session202111',

ts/state/ducks/search.ts

@@ -70,6 +70,7 @@ export function search(query: string): SearchResultsKickoffActionType {
 async function doSearch(query: string): Promise<SearchResultsPayloadType> {
   const options: SearchOptions = {
     noteToSelf: window.i18n('noteToSelf').toLowerCase(),
+    savedMessages: window.i18n('savedMessages').toLowerCase(),
     ourNumber: UserUtils.getOurPubKeyStrFromCache(),
   };
   const advancedSearchOptions = getAdvancedSearchOptionsFromQuery(query);
@@ -200,7 +201,7 @@ async function queryMessages(query: string): Promise<Array<MessageResultProps>>
 }
 
 async function queryConversationsAndContacts(providedQuery: string, options: SearchOptions) {
-  const { ourNumber, noteToSelf } = options;
+  const { ourNumber, noteToSelf, savedMessages } = options;
   const query = providedQuery.replace(/[+-.()]*/g, '');
 
   const searchResults: Array<ReduxConversationType> = await Data.searchConversations(query);
@@ -224,9 +225,11 @@ async function queryConversationsAndContacts(providedQuery: string, options: Sea
       conversations.push(conversation.id);
     }
   }
+
+  const queryLowered = providedQuery.toLowerCase();
   // Inject synthetic Note to Self entry if query matches localized 'Note to Self'
-  if (noteToSelf.indexOf(providedQuery.toLowerCase()) !== -1) {
-    // ensure that we don't have duplicates in our results
+  if (noteToSelf.includes(queryLowered) || savedMessages.includes(queryLowered)) {
+    // Ensure that we don't have duplicates in our results
     contacts = contacts.filter(id => id !== ourNumber);
     conversations = conversations.filter(id => id !== ourNumber);
 

ts/state/ducks/settings.tsx

@@ -8,6 +8,8 @@ const SettingsBoolsKeyTrackedInRedux = [
   SettingsKey.someDeviceOutdatedSyncing,
   SettingsKey.settingsLinkPreview,
   SettingsKey.hasBlindedMsgRequestsEnabled,
+  SettingsKey.hasFollowSystemThemeEnabled,
+  SettingsKey.hasShiftSendEnabled,
 ] as const;
 
 export type SettingsState = {
@@ -20,6 +22,8 @@ export function getSettingsInitialState() {
       someDeviceOutdatedSyncing: false,
       'link-preview-setting': false, // this is the value of SettingsKey.settingsLinkPreview
       hasBlindedMsgRequestsEnabled: false,
+      hasFollowSystemThemeEnabled: false,
+      hasShiftSendEnabled: false,
     },
   };
 }
@@ -47,6 +51,11 @@ const settingsSlice = createSlice({
         SettingsKey.hasBlindedMsgRequestsEnabled,
         false
       );
+      const hasFollowSystemThemeEnabled = Storage.get(
+        SettingsKey.hasFollowSystemThemeEnabled,
+        false
+      );
+      const hasShiftSendEnabled = Storage.get(SettingsKey.hasShiftSendEnabled, false);
       state.settingsBools.someDeviceOutdatedSyncing = isBoolean(outdatedSync)
         ? outdatedSync
         : false;
@@ -54,6 +63,15 @@ const settingsSlice = createSlice({
       state.settingsBools.hasBlindedMsgRequestsEnabled = isBoolean(hasBlindedMsgRequestsEnabled)
         ? hasBlindedMsgRequestsEnabled
         : false;
+
+      state.settingsBools.hasFollowSystemThemeEnabled = isBoolean(hasFollowSystemThemeEnabled)
+        ? hasFollowSystemThemeEnabled
+        : false;
+
+      state.settingsBools.hasShiftSendEnabled = isBoolean(hasShiftSendEnabled)
+        ? hasShiftSendEnabled
+        : false;
+
       return state;
     },
     updateSettingsBoolValue(state, action: PayloadAction<{ id: string; value: boolean }>) {

ts/state/selectors/settings.ts

@@ -11,6 +11,12 @@ const getHasDeviceOutdatedSyncing = (state: StateType) =>
 const getHasBlindedMsgRequestsEnabled = (state: StateType) =>
   state.settings.settingsBools[SettingsKey.hasBlindedMsgRequestsEnabled];
 
+const getHasFollowSystemThemeEnabled = (state: StateType) =>
+  state.settings.settingsBools[SettingsKey.hasFollowSystemThemeEnabled];
+
+const getHasShiftSendEnabled = (state: StateType) =>
+  state.settings.settingsBools[SettingsKey.hasShiftSendEnabled];
+
 export const useHasLinkPreviewEnabled = () => {
   const value = useSelector(getLinkPreviewEnabled);
   return Boolean(value);
@@ -25,3 +31,14 @@ export const useHasBlindedMsgRequestsEnabled = () => {
   const value = useSelector(getHasBlindedMsgRequestsEnabled);
   return Boolean(value);
 };
+
+export const useHasFollowSystemThemeEnabled = () => {
+  const value = useSelector(getHasFollowSystemThemeEnabled);
+  return Boolean(value);
+};
+
+export const useHasEnterSendEnabled = () => {
+  const value = useSelector(getHasShiftSendEnabled);
+
+  return Boolean(value);
+};

ts/state/selectors/theme.ts

@@ -1,8 +1,9 @@
 import { ThemeStateType } from '../../themes/constants/colors';
 import { StateType } from '../reducer';
+import { checkDarkTheme, checkLightTheme } from '../../util/theme';
 
 export const getTheme = (state: StateType): ThemeStateType => state.theme;
 
-export const isDarkTheme = (state: StateType): boolean => state.theme.includes('dark');
+export const isDarkTheme = (state: StateType): boolean => checkDarkTheme(state.theme);
 
-export const isLightTheme = (state: StateType): boolean => state.theme.includes('light');
+export const isLightTheme = (state: StateType): boolean => checkLightTheme(state.theme);

ts/themes/SessionTheme.tsx

@@ -1,7 +1,9 @@
+import { ipcRenderer } from 'electron';
 import React from 'react';
-
 import { createGlobalStyle } from 'styled-components';
+import { switchThemeTo } from './switchTheme';
 import { classicDark } from './classicDark';
+import { getOppositeTheme, isThemeMismatched } from '../util/theme';
 import { declareCSSVariables, THEME_GLOBALS } from './globals';
 
 // Defaults to Classic Dark theme
@@ -18,3 +20,26 @@ export const SessionTheme = ({ children }: { children: any }) => (
     {children}
   </>
 );
+
+export async function ensureThemeConsistency(): Promise<boolean> {
+  const theme = window.Events.getThemeSetting();
+
+  return new Promise(resolve => {
+    ipcRenderer.send('get-native-theme');
+    ipcRenderer.once('send-native-theme', (_, shouldUseDarkColors) => {
+      const isMismatchedTheme = isThemeMismatched(theme, shouldUseDarkColors);
+      if (isMismatchedTheme) {
+        const newTheme = getOppositeTheme(theme);
+        void switchThemeTo({
+          theme: newTheme,
+          mainWindow: true,
+          usePrimaryColor: true,
+          dispatch: window?.inboxStore?.dispatch,
+        });
+        resolve(true); // Theme was switched
+      } else {
+        resolve(false); // Theme was not switched
+      }
+    });
+  });
+}

ts/types/LocalizerKeys.ts

@@ -179,9 +179,13 @@ export type LocalizerKeys =
   | 'endCall'
   | 'enterAnOpenGroupURL'
   | 'enterDisplayName'
+  | 'enterKeySettingDescription'
+  | 'enterKeySettingTitle'
+  | 'enterNewLineDescription'
   | 'enterNewPassword'
   | 'enterPassword'
   | 'enterRecoveryPhrase'
+  | 'enterSendNewMessageDescription'
   | 'enterSessionID'
   | 'enterSessionIDOfRecipient'
   | 'enterSessionIDOrONSName'
@@ -255,6 +259,8 @@ export type LocalizerKeys =
   | 'mainMenuWindow'
   | 'markAllAsRead'
   | 'markUnread'
+  | 'matchThemeSystemSettingDescription'
+  | 'matchThemeSystemSettingTitle'
   | 'maxPasswordAttempts'
   | 'maximumAttachments'
   | 'media'
@@ -401,6 +407,7 @@ export type LocalizerKeys =
   | 'save'
   | 'saveLogToDesktop'
   | 'saved'
+  | 'savedMessages'
   | 'savedTheFile'
   | 'searchFor...'
   | 'searchForContactsOnly'

ts/types/Search.ts

@@ -1,6 +1,7 @@
 export type SearchOptions = {
   ourNumber: string;
   noteToSelf: string;
+  savedMessages: string;
 };
 
 export type AdvancedSearchOptions = {

ts/util/theme.ts

@@ -0,0 +1,21 @@
+import { ThemeStateType } from '../themes/constants/colors';
+
+export const checkDarkTheme = (theme: ThemeStateType): boolean => theme.includes('dark');
+export const checkLightTheme = (theme: ThemeStateType): boolean => theme.includes('light');
+
+export function getOppositeTheme(themeName: ThemeStateType): ThemeStateType {
+  if (checkDarkTheme(themeName)) {
+    return themeName.replace('dark', 'light') as ThemeStateType;
+  }
+  if (checkLightTheme(themeName)) {
+    return themeName.replace('light', 'dark') as ThemeStateType;
+  }
+  // If neither 'dark' nor 'light' is in the theme name, return the original theme name.
+  return themeName as ThemeStateType;
+}
+
+export function isThemeMismatched(themeName: ThemeStateType, prefersDark: boolean): boolean {
+  const systemLightTheme = checkLightTheme(themeName);
+  const systemDarkTheme = checkDarkTheme(themeName);
+  return (prefersDark && systemLightTheme) || (!prefersDark && systemDarkTheme);
+}