π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(UploadProgressDetails):fix-close-button-mismatches
Aswin Asok322102df00f3
diff --git a/web/packages/gallery/components/upload-progress-v2/UploadProgressDetails.tsx b/web/packages/gallery/components/upload-progress-v2/UploadProgressDetails.tsxindex 116cde31b7..43a55357b3 100644--- a/web/packages/gallery/components/upload-progress-v2/UploadProgressDetails.tsx+++ b/web/packages/gallery/components/upload-progress-v2/UploadProgressDetails.tsx@@ -26,7 +26,7 @@ import {type ListedFile,} from "./UploadFileList";-export function UploadProgressDetails({ closeOnly }: { closeOnly: boolean }) {+export function UploadProgressDetails() {const {finishedUploads,hasLivePhotos,@@ -197,7 +197,7 @@ export function UploadProgressDetails({ closeOnly }: { closeOnly: boolean }) {</Typography>)}</Box>- {isDone && (closeOnly || failedCount > 0) && (+ {isDone && (<ButtonfullWidthonClick={failedCount > 0 ? retryFailed : onClose}diff --git a/web/packages/gallery/components/upload-progress-v2/UploadProgressDialog.tsx b/web/packages/gallery/components/upload-progress-v2/UploadProgressDialog.tsxindex 913a371103..d3107617a1 100644--- a/web/packages/gallery/components/upload-progress-v2/UploadProgressDialog.tsx+++ b/web/packages/gallery/components/upload-progress-v2/UploadProgressDialog.tsx@@ -20,7 +20,7 @@ import {} from "./helpers";import { UploadProgressDetails } from "./UploadProgressDetails";-export function UploadProgressDialog({ closeOnly }: { closeOnly: boolean }) {+export function UploadProgressDialog() {const { onClose, uploadPhase } = useUploadProgressContext();const isDone = uploadPhase == "done";@@ -39,11 +39,11 @@ export function UploadProgressDialog({ closeOnly }: { closeOnly: boolean }) {<Box sx={uploadProgressDialogContentSx(isDone)}><UploadProgressV2Header />{isDone ? (- <UploadProgressDetails closeOnly={closeOnly} />+ <UploadProgressDetails />) : (<Stack sx={{ gap: 3 }}><UploadProgressV2Summary />- <UploadProgressDetails closeOnly={closeOnly} />+ <UploadProgressDetails /></Stack>)}</Box>diff --git a/web/packages/gallery/components/upload-progress-v2/UploadProgressV2.tsx b/web/packages/gallery/components/upload-progress-v2/UploadProgressV2.tsxindex 2e9c9f85a0..40d66ce16d 100644--- a/web/packages/gallery/components/upload-progress-v2/UploadProgressV2.tsx+++ b/web/packages/gallery/components/upload-progress-v2/UploadProgressV2.tsx@@ -121,11 +121,7 @@ function UploadProgress({return (<UploadProgressContext.Provider value={contextValue}>- {expanded ? (- <UploadProgressDialog closeOnly={summaryMode == "cancelling"} />- ) : (- <MinimizedUploadProgress />- )}+ {expanded ? <UploadProgressDialog /> : <MinimizedUploadProgress />}<StopUploadConfirmationDialogopen={showStopConfirmation}onClose={handleStopConfirmationClose}