diff --git a/src/settings/useSetting.ts b/src/settings/useSetting.ts index f857dad1..8076bf6b 100644 --- a/src/settings/useSetting.ts +++ b/src/settings/useSetting.ts @@ -23,6 +23,7 @@ import { setLocalStorageItem, useLocalStorage, } from "../useLocalStorage"; +import { useEnableEmbeddedE2EE } from "../e2ee/e2eeHooks"; type Setting = [T, (value: T) => void]; type DisableableSetting = [T, ((value: T) => void) | null]; @@ -90,11 +91,13 @@ export const useOptInAnalytics = (): DisableableSetting => { }; export const useEnableSPAE2EE = (): DisableableSetting => { + const embeddedE2EEEnabled = useEnableEmbeddedE2EE(); const settingVal = useSetting( "enable-end-to-end-encryption", true ); + if (embeddedE2EEEnabled) return [false, null]; if (!isE2EESupported()) return [false, null]; return settingVal;