From 2ec75571d08833f6399d8b0c91aeb1dab7b8cd4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Mon, 4 Sep 2023 16:15:54 +0200
Subject: [PATCH] Fix `useEnableSPAE2EE`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/settings/useSetting.ts | 3 +++
 1 file changed, 3 insertions(+)

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> = [T, (value: T) => void];
 type DisableableSetting<T> = [T, ((value: T) => void) | null];
@@ -90,11 +91,13 @@ export const useOptInAnalytics = (): DisableableSetting<boolean | null> => {
 };
 
 export const useEnableSPAE2EE = (): DisableableSetting<boolean | null> => {
+  const embeddedE2EEEnabled = useEnableEmbeddedE2EE();
   const settingVal = useSetting<boolean | null>(
     "enable-end-to-end-encryption",
     true
   );
 
+  if (embeddedE2EEEnabled) return [false, null];
   if (!isE2EESupported()) return [false, null];
 
   return settingVal;