Skip to content

armgit / ente

Public Imported from GitHub
0

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

Merge remote-tracking branch 'origin/main' into codex/photos-main-dev

AswinAsok9a16272b2fdd
diff --cc web/apps/photos/src/pages/gallery.tsx
index aa1267e829,d0cf36442f..3271ff0bd0
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@@ -2544,39 -2537,47 +2537,44 @@@ const Page: React.FC = () =>
onClose={handleCloseAuthenticateUser}
onAuthenticate={handleAuthenticate}
/>
- <SingleInputDialog
- {...albumNameInputVisibilityProps}
- variant="v2"
- title={t("new_album")}
- label={t("album_name")}
- submitButtonTitle={t("create")}
- onClose={() => {
- // Do not leak a cancelled add into the next album creation.
- pendingSingleFileAdd.current = undefined;
- postCreateAlbumHidden.current = false;
- setPostCreateAlbumOp(undefined);
- albumNameInputVisibilityProps.onClose();
- }}
- onSubmit={handleAlbumNameSubmit}
- />
- <QuickLinkCreatedNotification
- open={publicLinkToast.open}
- onCopy={() => {
- if (publicLinkToast.url) {
- void navigator.clipboard.writeText(
- publicLinkToast.url,
- );
- }
- }}
- onClose={() =>
- setPublicLinkToast((prev) => ({ ...prev, open: false }))
- }
- />
</FullScreenDropZone>
+ <SingleInputDialog
+ {...albumNameInputVisibilityProps}
+ title={t("new_album")}
+ label={t("album_name")}
+ submitButtonTitle={t("create")}
+ onClose={() => {
+ // Do not leak a cancelled add into the next album creation.
+ pendingSingleFileAdd.current = undefined;
+ postCreateAlbumHidden.current = false;
+ setPostCreateAlbumOp(undefined);
+ albumNameInputVisibilityProps.onClose();
+ }}
+ onSubmit={handleAlbumNameSubmit}
+ />
+ <QuickLinkCreatedNotification
+ open={publicLinkToast.open}
+ onCopy={() => {
+ if (publicLinkToast.url) {
+ void navigator.clipboard.writeText(publicLinkToast.url);
+ }
+ }}
+ onClose={() =>
+ setPublicLinkToast((prev) => ({ ...prev, open: false }))
+ }
+ />
- <AlbumAddedNotification
- open={addToAlbumProgress.open}
+ <Notification
+ open={albumAddedNotification.open}
onClose={() =>
- setAddToAlbumProgress((s) => ({ ...s, open: false }))
+ setAlbumAddedNotification((s) => ({ ...s, open: false }))
}
- phase={addToAlbumProgress.phase}
- albumName={addToAlbumProgress.albumName}
+ keepOpenOnClick
+ attributes={{
+ color: "inherit",
+ startIcon: null,
+ title: t("added_to_album"),
+ caption: albumAddedNotification.albumName,
+ }}
/>
<EditLocationDialog
{...editLocationVisibilityProps}