hide irrelevant advanced settings for chatmail users

fix #3819
deltachat · May 15, 2024 · 690f540 · 690f540
1 parent 018e87b
commit 690f540
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - Update `@deltachat/stdio-rpc-server` and `deltachat/jsonrpc-client` to `v1.138.0`
 - upgrade `electron` from `28.2.3` to `30.0.2`
 - increase minimum nodejs version from `18` to `20`
+- hide irrelevant advanced settings for chatmail users
 
 ### Fixed
 - fix chat audit dialog was going out of viewport on smaller screens #3736

diff --git a/src/renderer/components/Settings/Advanced.tsx b/src/renderer/components/Settings/Advanced.tsx
@@ -30,7 +30,7 @@ export default function Advanced({ settingsStore }: Props) {
       <SettingsSeparator />
 
       <SettingsHeading>{tx('pref_encryption')}</SettingsHeading>
-      <Encryption />
+      <Encryption settingsStore={settingsStore} />
       <SettingsSeparator />
 
       <SettingsHeading>{tx('pref_server')}</SettingsHeading>
@@ -43,7 +43,9 @@ export default function Advanced({ settingsStore }: Props) {
       >
         {tx('pref_password_and_account_settings')}
       </SettingsButton>
-      <ImapFolderHandling settingsStore={settingsStore} />
+      {!settingsStore.settings.is_chatmail && (
+        <ImapFolderHandling settingsStore={settingsStore} />
+      )}
     </>
   )
 }
diff --git a/src/renderer/components/Settings/Encryption.tsx b/src/renderer/components/Settings/Encryption.tsx
@@ -19,17 +19,24 @@ import useDialog from '../../hooks/dialog/useDialog'
 
 import type { DialogProps } from '../../contexts/DialogContext'
 import ManageKeys from './ManageKeys'
+import { SettingsStoreState } from '../../stores/settings'
 
-export default function Encryption() {
+type Props = {
+  settingsStore: SettingsStoreState
+}
+
+export default function Encryption({ settingsStore }: Props) {
   const { openDialog } = useDialog()
   const tx = useTranslationFunction()
 
   return (
     <>
-      <CoreSettingsSwitch
-        settingsKey='e2ee_enabled'
-        label={tx('autocrypt_prefer_e2ee')}
-      />
+      {!settingsStore.settings.is_chatmail && (
+        <CoreSettingsSwitch
+          settingsKey='e2ee_enabled'
+          label={tx('autocrypt_prefer_e2ee')}
+        />
+      )}
       <ManageKeys />
       <SettingsButton onClick={() => openDialog(SendAutocryptSetupMessage)}>
         {tx('autocrypt_send_asm_button')}

diff --git a/src/renderer/stores/settings.ts b/src/renderer/stores/settings.ts
@@ -26,6 +26,7 @@ export interface SettingsStoreState {
     only_fetch_mvbox: string
     disable_idle: string
     media_quality: string
+    is_chatmail: string
   }
   desktopSettings: DesktopSettingsType
   rc: RC_Config
@@ -48,6 +49,7 @@ const settingsKeys: Array<keyof SettingsStoreState['settings']> = [
   'only_fetch_mvbox',
   'disable_idle',
   'media_quality',
+  'is_chatmail',
 ]
 
 class SettingsStore extends Store<SettingsStoreState | null> {