From 521cebf0776e687f066c4cb23aa16202838f8b33 Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Thu, 9 Jan 2025 14:49:34 +0100
Subject: [PATCH] Assert that `recoveryKey.encodedPrivateKey` is always defined

---
 .../views/settings/encryption/ChangeRecoveryKey.tsx      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/views/settings/encryption/ChangeRecoveryKey.tsx b/src/components/views/settings/encryption/ChangeRecoveryKey.tsx
index c9c5e30a85c..cb8e05c176c 100644
--- a/src/components/views/settings/encryption/ChangeRecoveryKey.tsx
+++ b/src/components/views/settings/encryption/ChangeRecoveryKey.tsx
@@ -68,7 +68,8 @@ export function ChangeRecoveryKey({
 
     // We create a new recovery key, the recovery key will be displayed to the user
     const recoveryKey = useAsyncMemo(() => matrixClient.getCrypto()!.createRecoveryKeyFromPassphrase(), []);
-    if (!recoveryKey?.encodedPrivateKey) return null;
+    // Waiting for the recovery key to be generated
+    if (!recoveryKey) return null;
 
     let content: JSX.Element;
     switch (state) {
@@ -86,7 +87,8 @@ export function ChangeRecoveryKey({
             // Show a generated recovery key and ask the user to save it.
             content = (
                 <KeyPanel
-                    recoveryKey={recoveryKey.encodedPrivateKey}
+                    // encodedPrivateKey is always defined, the optional typing is incorrect
+                    recoveryKey={recoveryKey.encodedPrivateKey!}
                     onConfirmClick={() => setState("confirm")}
                     onCancelClick={onCancelClick}
                 />
@@ -96,7 +98,8 @@ export function ChangeRecoveryKey({
             // Ask the user to enter the recovery key they just save to confirm it.
             content = (
                 <KeyForm
-                    recoveryKey={recoveryKey.encodedPrivateKey}
+                    // encodedPrivateKey is always defined, the optional typing is incorrect
+                    recoveryKey={recoveryKey.encodedPrivateKey!}
                     onCancelClick={onCancelClick}
                     onSubmit={async () => {
                         const crypto = matrixClient.getCrypto();