fix(front): fix progress display

SARDONYX-sard · Nov 9, 2024 · 6c91805 · 6c91805
1 parent fa1d9d5
commit 6c91805
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/gui/frontend/src/components/atoms/ConvertButton/ConvertButton.tsx b/gui/frontend/src/components/atoms/ConvertButton/ConvertButton.tsx
@@ -36,7 +36,7 @@ export function ConvertButton({ loading, progress, ...props }: Props) {
   return (
     <LoadingButton
       disabled={loading || isComplete}
-      endIcon={loading || isComplete ? undefined : <ConvertIcon />}
+      endIcon={loading || isComplete ? <CircularProgressWithLabel value={progress} /> : <ConvertIcon />}
       loading={loading}
       loadingPosition='end'
       sx={{
@@ -74,21 +74,7 @@ export function ConvertButton({ loading, progress, ...props }: Props) {
       variant='contained'
       {...props}
     >
-      <span>
-        {loading ? (
-          <>
-            {t('converting-btn')}
-            <CircularProgressWithLabel value={progress} />
-          </>
-        ) : isComplete ? (
-          <>
-            OK
-            <CircularProgressWithLabel value={progress} />
-          </>
-        ) : (
-          t('convert-btn')
-        )}
-      </span>
+      <span>{loading ? `${t('converting-btn')} ${progress}%` : isComplete ? 'OK' : t('convert-btn')}</span>
     </LoadingButton>
   );
 }