From 97314b7dc1b644d87ae1b3a2efca2fbe39e3ce1f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 3 Jun 2025 14:13:48 +0530
Subject: [PATCH] conv

---
 web/packages/accounts/pages/recover.tsx            | 11 ++++++-----
 web/packages/accounts/pages/two-factor/recover.tsx |  8 +++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/web/packages/accounts/pages/recover.tsx b/web/packages/accounts/pages/recover.tsx
index 356cf8deb3..e0ed5eced5 100644
--- a/web/packages/accounts/pages/recover.tsx
+++ b/web/packages/accounts/pages/recover.tsx
@@ -8,7 +8,7 @@ import { sendOTT } from "ente-accounts/services/user";
 import { recoveryKeyB64FromMnemonic } from "ente-accounts/utils/recovery-key";
 import { LinkButton } from "ente-base/components/LinkButton";
 import { useBaseContext } from "ente-base/context";
-import { sharedCryptoWorker } from "ente-base/crypto";
+import { decryptBoxB64 } from "ente-base/crypto";
 import log from "ente-base/log";
 import SingleInputForm, {
     type SingleInputFormProps,
@@ -62,10 +62,11 @@ const Page: React.FC = () => {
     ) => {
         try {
             const keyAttr = keyAttributes!;
-            const cryptoWorker = await sharedCryptoWorker();
-            const masterKey = await cryptoWorker.decryptB64(
-                keyAttr.masterKeyEncryptedWithRecoveryKey!,
-                keyAttr.masterKeyDecryptionNonce!,
+            const masterKey = await decryptBoxB64(
+                {
+                    encryptedData: keyAttr.masterKeyEncryptedWithRecoveryKey!,
+                    nonce: keyAttr.masterKeyDecryptionNonce!,
+                },
                 await recoveryKeyB64FromMnemonic(recoveryKey),
             );
             await saveKeyInSessionStore("encryptionKey", masterKey);
diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx
index 1d207b2990..90d93ab23c 100644
--- a/web/packages/accounts/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -14,7 +14,7 @@ import { recoveryKeyB64FromMnemonic } from "ente-accounts/utils/recovery-key";
 import { LinkButton } from "ente-base/components/LinkButton";
 import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";
 import { useBaseContext } from "ente-base/context";
-import { sharedCryptoWorker } from "ente-base/crypto";
+import { decryptBoxB64 } from "ente-base/crypto";
 import type { B64EncryptionResult } from "ente-base/crypto/libsodium";
 import log from "ente-base/log";
 import SingleInputForm, {
@@ -92,10 +92,8 @@ const Page: React.FC<RecoverPageProps> = ({ twoFactorType }) => {
     ) => {
         try {
             const { encryptedData, nonce } = encryptedTwoFactorSecret!;
-            const cryptoWorker = await sharedCryptoWorker();
-            const twoFactorSecret = await cryptoWorker.decryptB64(
-                encryptedData,
-                nonce,
+            const twoFactorSecret = await decryptBoxB64(
+                { encryptedData, nonce },
                 await recoveryKeyB64FromMnemonic(recoveryKey),
             );
             const resp = await removeTwoFactor(