From 237fc3cdb1af0f84da4d3c6db83fbc142dfc0470 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Jun 2024 16:10:07 +0530
Subject: [PATCH] Dear React,

---
 .../accounts/src/pages/passkeys/index.tsx     | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx
index e1c12e2777..6472eeb18e 100644
--- a/web/apps/accounts/src/pages/passkeys/index.tsx
+++ b/web/apps/accounts/src/pages/passkeys/index.tsx
@@ -45,16 +45,20 @@ const Page: React.FC = () => {
         const urlParams = new URLSearchParams(window.location.search);
 
         const token = urlParams.get("token");
-        if (!token) {
+        if (token) {
+            setToken(token);
+        } else {
             log.error("Missing accounts token");
             showPasskeyFetchFailedErrorDialog();
-            return;
         }
-
-        setToken(token);
-        void refreshPasskeys();
     }, []);
 
+    useEffect(() => {
+        if (token) {
+            void refreshPasskeys();
+        }
+    }, [token]);
+
     const refreshPasskeys = async () => {
         try {
             setPasskeys(await getPasskeys(ensure(token)));
@@ -141,15 +145,14 @@ const Page: React.FC = () => {
                     </Box>
                 </Box>
             </CenteredFlex>
-            {token && (
-                <ManagePasskeyDrawer
-                    open={showPasskeyDrawer}
-                    onClose={handleDrawerClose}
-                    passkey={selectedPasskey}
-                    token={token}
-                    onUpdateOrDeletePasskey={handleUpdateOrDeletePasskey}
-                />
-            )}
+
+            <ManagePasskeyDrawer
+                open={showPasskeyDrawer}
+                onClose={handleDrawerClose}
+                passkey={selectedPasskey}
+                token={token}
+                onUpdateOrDeletePasskey={handleUpdateOrDeletePasskey}
+            />
         </>
     );
 };