Skip to content

armgit / ente

Public Imported from GitHub
0

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

[web][photos] Keep session actions separate from toggle state

Aswin Asok7a7029f838b2
diff --git a/web/apps/photos/src/components/sidebar/account/SessionsSettings.tsx b/web/apps/photos/src/components/sidebar/account/SessionsSettings.tsx
index 6cbe8cab01..003f79c5b5 100644
--- a/web/apps/photos/src/components/sidebar/account/SessionsSettings.tsx
+++ b/web/apps/photos/src/components/sidebar/account/SessionsSettings.tsx
@@ -1,3 +1,4 @@
+import CheckIcon from "@mui/icons-material/Check";
import DevicesIcon from "@mui/icons-material/Devices";
import RefreshIcon from "@mui/icons-material/Refresh";
import {
@@ -241,7 +242,11 @@ const SessionRow: React.FC<SessionRowProps> = ({
<MenuComponent
startIcon={<DevicesIcon />}
title={isCurrentDevice ? t("this_device") : session.prettyUA}
- selected={isCurrentDevice}
+ endIcon={
+ isCurrentDevice ? (
+ <CheckIcon sx={{ fontSize: 20, color: "accent.main" }} />
+ ) : undefined
+ }
description={
<Stack sx={{ gap: 0.5, mt: 0.5 }}>
{!isCurrentDevice && (
diff --git a/web/packages/base/components/v2/MenuComponent.tsx b/web/packages/base/components/v2/MenuComponent.tsx
index 52d46be2ce..26a8d49ee0 100644
--- a/web/packages/base/components/v2/MenuComponent.tsx
+++ b/web/packages/base/components/v2/MenuComponent.tsx
@@ -6,9 +6,10 @@ import type { ReactNode } from "react";
interface MenuComponentProps {
title: string;
description?: ReactNode;
- selected: boolean;
+ selected?: boolean;
onClick: () => void;
startIcon?: ReactNode;
+ endIcon?: ReactNode;
}
export function MenuComponent({
@@ -17,6 +18,7 @@ export function MenuComponent({
selected,
onClick,
startIcon,
+ endIcon,
}: MenuComponentProps) {
return (
<FocusVisibleButton
@@ -85,9 +87,12 @@ export function MenuComponent({
placeItems: "center",
}}
>
- {selected && (
- <CheckIcon sx={{ fontSize: 20, color: "accent.main" }} />
- )}
+ {endIcon ??
+ (selected && (
+ <CheckIcon
+ sx={{ fontSize: 20, color: "accent.main" }}
+ />
+ ))}
</Box>
</FocusVisibleButton>
);