Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

fix-merge-conflict-issues

Aswin Asok96427f606ee3
diff --git a/web/apps/locker/src/components/LockerAccountDrawer.tsx b/web/apps/locker/src/components/LockerAccountDrawer.tsx
index 35275f20ae..0b6fbe903c 100644
--- a/web/apps/locker/src/components/LockerAccountDrawer.tsx
+++ b/web/apps/locker/src/components/LockerAccountDrawer.tsx
@@ -1,10 +1,4 @@
import {
- generatePasskeyRecovery,
- recoveryKeyMnemonic,
-} from "@/services/authenticated-session";
-import {
- ComputerPhoneSyncIcon,
- Key01Icon,
Key02Icon,
Mail01Icon,
PasswordValidationIcon,
@@ -72,15 +66,6 @@ export const LockerAccountDrawer: React.FC<
setAuthenticatedAction(undefined);
};
- const handleOpenPasskeys = async () => {
- handleRootClose();
- try {
- await openAccountsManagePasskeysPage(generatePasskeyRecovery);
- } catch (e) {
- onGenericError(e);
- }
- };
-
return (
<>
<LockerTitledNestedSidebarDrawer
@@ -117,8 +102,7 @@ export const LockerAccountDrawer: React.FC<
<LockerRecoveryKeyDrawer
open={isRecoveryKeyOpen}
onClose={() => setIsRecoveryKeyOpen(false)}
- getRecoveryKeyMnemonic={recoveryKeyMnemonic}
- showMiniDialog={showMiniDialog}
+ onRootClose={handleRootClose}
/>
</>
);
diff --git a/web/apps/locker/src/components/LockerRecoveryKeyDrawer.tsx b/web/apps/locker/src/components/LockerRecoveryKeyDrawer.tsx
index e1324f1aba..c18bdebef2 100644
--- a/web/apps/locker/src/components/LockerRecoveryKeyDrawer.tsx
+++ b/web/apps/locker/src/components/LockerRecoveryKeyDrawer.tsx
@@ -1,3 +1,4 @@
+import { recoveryKeyMnemonic } from "@/services/authenticated-session";
import {
Box,
Button,
@@ -37,6 +38,7 @@ export function LockerRecoveryKeyDrawer({
>
<RecoveryKeyContents
{...{ open, onClose, showMiniDialog }}
+ getRecoveryKeyMnemonic={recoveryKeyMnemonic}
presentation={LockerRecoveryKeyPresentation}
/>
</LockerTitledNestedSidebarDrawer>
diff --git a/web/apps/locker/src/components/LockerSecurityDrawer.tsx b/web/apps/locker/src/components/LockerSecurityDrawer.tsx
index 081dff8fb7..d264df7bc9 100644
--- a/web/apps/locker/src/components/LockerSecurityDrawer.tsx
+++ b/web/apps/locker/src/components/LockerSecurityDrawer.tsx
@@ -1,3 +1,4 @@
+import { generatePasskeyRecovery } from "@/services/authenticated-session";
import {
ComputerPhoneSyncIcon,
Key01Icon,
@@ -52,7 +53,7 @@ export const LockerSecurityDrawer: React.FC<
const handleOpenPasskeys = async () => {
handleRootClose();
try {
- await openAccountsManagePasskeysPage();
+ await openAccountsManagePasskeysPage(generatePasskeyRecovery);
} catch (e) {
onGenericError(e);
}