nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix bits lost in merge

Browse Source
This commit is contained in:
David Baker
2025-02-05 12:01:18 +01:00
parent 6a20703ebc
commit b7b2ea3448
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
View File

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