From b7b2ea3448d7763ac2cfb7b4d82db99844a7f8b6 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 5 Feb 2025 12:01:18 +0100
Subject: [PATCH] Fix bits lost in merge

---
 .../tabs/user/EncryptionUserSettingsTab.tsx   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx b/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
index dd9fb7e67f..a0e2dbc08d 100644
--- a/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
@@ -24,6 +24,7 @@ import { ResetIdentityPanel } from "../../encryption/ResetIdentityPanel";
 import { RecoveryPanelOutOfSync } from "../../encryption/RecoveryPanelOutOfSync";
 import Spinner from "../../../elements/Spinner";
 import { useEventEmitter } from "../../../../../hooks/useEventEmitter";
+import { KeyBackupPanel } from "../../encryption/KeyStoragePanel";
 
 /**
  * The state in the encryption settings tab.
@@ -112,13 +113,20 @@ export function EncryptionUserSettingsTab({ initialState = "loading" }: Encrypti
             case "main":
                 content = (
                     <>
-                        <RecoveryPanel
-                            onChangeRecoveryKeyClick={(setupNewKey) =>
-                                setupNewKey ? setState("set_recovery_key") : setState("change_recovery_key")
-                            }
-                        />
-                        <Separator kind="section" />
-                        <AdvancedPanel onResetIdentityClick={() => setState("reset_identity_compromised")} />
+                        <KeyBackupPanel />
+                        {keyBackupIsEnabled && (
+                            <>
+                                <RecoveryPanel
+                                    onChangeRecoveryKeyClick={(setupNewKey) =>
+                                        setupNewKey ? setState("set_recovery_key") : setState("change_recovery_key")
+                                    }
+                                />
+                                <Separator kind="section" />
+                                <AdvancedPanel
+                                    onResetIdentityClick={() => setState("reset_identity_compromised")}
+                                />{" "}
+                            </>
+                        )}
                     </>
                 );
                 break;