Skip to content

armgit / ente

Public Imported from GitHub
0

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

[web][photos] Preserve settings when opening export dialog

Aswin Asoke690128b9a02
diff --git a/web/apps/photos/src/components/sidebar/Sidebar.tsx b/web/apps/photos/src/components/sidebar/Sidebar.tsx
index 2f9c5d0bc6..d7a0384e6a 100644
--- a/web/apps/photos/src/components/sidebar/Sidebar.tsx
+++ b/web/apps/photos/src/components/sidebar/Sidebar.tsx
@@ -203,16 +203,18 @@ export const Sidebar: React.FC<SidebarProps> = ({
void (async () => {
try {
if (!(await onAuthenticateUser())) return;
+ closeSections();
showExport();
} catch (error) {
log.error("Failed to authenticate before export", error);
}
})();
- }, [onAuthenticateUser, showExport, showMiniDialog]);
+ }, [closeSections, onAuthenticateUser, showExport, showMiniDialog]);
const performSidebarAction = useCallback(
async (actionID: SidebarActionID) => {
- closeSections();
+ // Export only replaces the section after desktop authentication.
+ if (actionID !== "utility.export") closeSections();
return performSidebarRegistryAction(actionID, {
onClose,
onShowCollectionSummary,
@@ -309,7 +311,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
/>
<UtilitySection
{...{
- showExport: selectSection(handleShowExport),
+ showExport: handleShowExport,
showAccount: selectSection(showAccount),
showReferrals: selectSection(showReferrals),
showPreferences: selectSection(showPreferences),