From 34113c369842031922c11f1349a2e940334a3e43 Mon Sep 17 00:00:00 2001
From: Proddy <paul@derbyshire.nl>
Date: Sun, 2 Jul 2023 10:12:31 +0200
Subject: [PATCH] fix progress bar when uploading

---
 interface/src/components/upload/SingleUpload.tsx  | 11 ++++++-----
 interface/src/framework/system/UploadFileForm.tsx |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interface/src/components/upload/SingleUpload.tsx b/interface/src/components/upload/SingleUpload.tsx
index 8c5358706..498e4b913 100644
--- a/interface/src/components/upload/SingleUpload.tsx
+++ b/interface/src/components/upload/SingleUpload.tsx
@@ -26,11 +26,12 @@ const getBorderColor = (theme: Theme, props: DropzoneState) => {
 export interface SingleUploadProps {
   onDrop: (acceptedFiles: File[]) => void;
   onCancel: () => void;
+  isUploading: boolean;
   progress: Progress;
 }
 
-const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, progress }) => {
-  const isUploading = progress.total > 0;
+const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, progress }) => {
+  const uploading = isUploading && progress.total > 0;
 
   const dropzoneState = useDropzone({
     onDrop,
@@ -48,7 +49,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, progress }) =>
   const { LL } = useI18nContext();
 
   const progressText = () => {
-    if (isUploading) {
+    if (uploading) {
       if (progress.total) {
         return LL.UPLOADING() + ': ' + Math.round((progress.loaded * 100) / progress.total) + '%';
       }
@@ -68,7 +69,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, progress }) =>
           color: theme.palette.grey[400],
           transition: 'border .24s ease-in-out',
           width: '100%',
-          cursor: isUploading ? 'default' : 'pointer',
+          cursor: uploading ? 'default' : 'pointer',
           borderColor: getBorderColor(theme, dropzoneState)
         }
       })}
@@ -77,7 +78,7 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, progress }) =>
       <Box flexDirection="column" display="flex" alignItems="center">
         <CloudUploadIcon fontSize="large" />
         <Typography variant="h6">{progressText()}</Typography>
-        {isUploading && (
+        {uploading && (
           <Fragment>
             <Box width="100%" p={2}>
               <LinearProgress
diff --git a/interface/src/framework/system/UploadFileForm.tsx b/interface/src/framework/system/UploadFileForm.tsx
index e3d2a753b..2bc98b2e5 100644
--- a/interface/src/framework/system/UploadFileForm.tsx
+++ b/interface/src/framework/system/UploadFileForm.tsx
@@ -45,7 +45,6 @@ const UploadFileForm: FC = () => {
       setMd5(data.md5);
       toast.success(LL.UPLOAD() + ' MD5 ' + LL.SUCCESSFUL());
     } else {
-      toast.success(LL.UPLOAD() + ' ' + LL.SUCCESSFUL());
       setRestarting(true);
     }
   });
@@ -123,7 +122,7 @@ const UploadFileForm: FC = () => {
           <Typography variant="body2">{'MD5: ' + md5}</Typography>
         </Box>
       )}
-      <SingleUpload onDrop={startUpload} onCancel={cancelUpload} progress={progress} />
+      <SingleUpload onDrop={startUpload} onCancel={cancelUpload} isUploading={isUploading} progress={progress} />
       {!isUploading && (
         <>
           <Typography sx={{ pt: 2, pb: 2 }} variant="h6" color="primary">