From 84e62329a01819976d2c556a1343f11aefcd7f8c Mon Sep 17 00:00:00 2001 From: Abhinav Date: Fri, 24 Feb 2023 13:34:20 +0530 Subject: [PATCH] fix dedupe screen files not shown --- src/components/PhotoFrame.tsx | 6 +++--- src/pages/gallery/index.tsx | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/components/PhotoFrame.tsx b/src/components/PhotoFrame.tsx index aa49b262e..873aeabbf 100644 --- a/src/components/PhotoFrame.tsx +++ b/src/components/PhotoFrame.tsx @@ -58,7 +58,7 @@ interface Props { ) => void; selected: SelectedState; isFirstLoad?; - hasPersonalFiles?; + hasNoPersonalFiles?; openUploader?; isInSearchMode?: boolean; search?: Search; @@ -80,7 +80,7 @@ const PhotoFrame = ({ setSelected, selected, isFirstLoad, - hasPersonalFiles, + hasNoPersonalFiles, openUploader, isInSearchMode, search, @@ -655,7 +655,7 @@ const PhotoFrame = ({ return ( <> {!isFirstLoad && - !hasPersonalFiles && + hasNoPersonalFiles && !isInSearchMode && activeCollection === ALL_SECTION ? ( diff --git a/src/pages/gallery/index.tsx b/src/pages/gallery/index.tsx index 3a6a29921..ffec7feae 100644 --- a/src/pages/gallery/index.tsx +++ b/src/pages/gallery/index.tsx @@ -142,7 +142,7 @@ export default function Gallery() { const [isFirstLoad, setIsFirstLoad] = useState(false); const [isFirstFetch, setIsFirstFetch] = useState(false); - const [hasPersonalFiles, setHasPersonalFiles] = useState(false); + const [hasNoPersonalFiles, setHasNoPersonalFiles] = useState(false); const [selected, setSelected] = useState({ ownCount: 0, count: 0, @@ -393,11 +393,10 @@ export default function Gallery() { archivedCollections ); setCollectionSummaries(collectionSummaries); - const incomingShareFiles = files.filter( + const hasNoPersonalFiles = files.every( (file) => file.ownerID !== user.id ); - const hasPersonalFiles = files.length - incomingShareFiles.length > 0; - setHasPersonalFiles(hasPersonalFiles); + setHasNoPersonalFiles(hasNoPersonalFiles); }; const clearSelection = function () { @@ -709,7 +708,7 @@ export default function Gallery() { setSelected={setSelected} selected={selected} isFirstLoad={isFirstLoad} - hasPersonalFiles={hasPersonalFiles} + hasNoPersonalFiles={hasNoPersonalFiles} openUploader={openUploader} isInSearchMode={isInSearchMode} search={search}