diff --git a/src/components/PhotoList.tsx b/src/components/PhotoList.tsx
index 5aedd1fb0..09e749d6e 100644
--- a/src/components/PhotoList.tsx
+++ b/src/components/PhotoList.tsx
@@ -249,6 +249,8 @@ export function PhotoList({
publicCollectionGalleryContext.accessedThroughSharedURL,
galleryContext.photoListHeader,
publicCollectionGalleryContext.photoListHeader,
+ deduplicateContext.isOnDeduplicatePage,
+ deduplicateContext.fileSizeMap,
]);
const groupByFileSize = (timeStampList: TimeStampListItem[]) => {
diff --git a/src/components/PhotoViewer/InfoDialog/RenderCaption.tsx b/src/components/PhotoViewer/InfoDialog/RenderCaption.tsx
index d6d1b210d..c3e5b2bb4 100644
--- a/src/components/PhotoViewer/InfoDialog/RenderCaption.tsx
+++ b/src/components/PhotoViewer/InfoDialog/RenderCaption.tsx
@@ -70,7 +70,7 @@ export function RenderCaption({
{caption}
) : (
- Add a caption
+ {constants.CAPTION_PLACEHOLDER}
)}
diff --git a/src/pages/deduplicate/index.tsx b/src/pages/deduplicate/index.tsx
index 5911f3169..f1af9bce3 100644
--- a/src/pages/deduplicate/index.tsx
+++ b/src/pages/deduplicate/index.tsx
@@ -24,6 +24,8 @@ import router from 'next/router';
import { getKey, SESSION_KEYS } from 'utils/storage/sessionStorage';
import { styled } from '@mui/material';
import { syncCollections } from 'services/collectionService';
+import EnteSpinner from 'components/EnteSpinner';
+import VerticallyCentered from 'components/Container';
export const DeduplicateContext = createContext(
DefaultDeduplicateContext
@@ -143,8 +145,14 @@ export default function Deduplicate() {
setSelected({ count: 0, collectionID: 0 });
};
- if (!duplicateFiles) {
- return <>>;
+ if (!duplicateFiles?.length) {
+ return (
+
+
+ Loading...
+
+
+ );
}
return (
diff --git a/src/themes/darkThemeOptions.tsx b/src/themes/darkThemeOptions.tsx
index 447d321c4..d99d36a62 100644
--- a/src/themes/darkThemeOptions.tsx
+++ b/src/themes/darkThemeOptions.tsx
@@ -87,6 +87,12 @@ declare module '@mui/material/Alert' {
}
}
+declare module '@mui/material/CircularProgress' {
+ export interface CircularProgressPropsColorOverrides {
+ accent: true;
+ }
+}
+
// Create a theme instance.
const darkThemeOptions = createTheme({
components: {
diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx
index 08f920ab1..eba37e90c 100644
--- a/src/utils/strings/englishConstants.tsx
+++ b/src/utils/strings/englishConstants.tsx
@@ -435,7 +435,8 @@ const englishConstants = {
INFO: 'Info',
FILE_ID: 'File ID',
FILE_NAME: 'File name',
- CAPTION: 'Caption',
+ CAPTION: 'Description',
+ CAPTION_PLACEHOLDER: 'Add a description',
CREATION_TIME: 'Creation time',
UPDATED_ON: 'Updated on',
LOCATION: 'Location',