refactor: remove unnecessary helpers

Author: szuperaz

src/components/MessageComposer/AttachmentPreviewList/AttachmentUploadProgressIndicator.tsx

@@ -4,7 +4,6 @@ import React, { type ReactNode } from 'react';
 import { ProgressIndicator as DefaultProgressIndicator } from '../../Loading';
 import { useComponentContext } from '../../../context';
 import { LoadingIndicatorIcon } from '../icons';
-import { clampUploadPercent } from './utils/uploadProgress';
 
 export type AttachmentUploadProgressVariant = 'inline' | 'overlay';
 
@@ -30,8 +29,6 @@ export const AttachmentUploadProgressIndicator = ({
     return <>{fallback ?? <LoadingIndicatorIcon />}</>;
   }
 
-  const percent = Math.round(clampUploadPercent(uploadProgress));
-
   return (
     <div
       className={clsx(
@@ -40,7 +37,7 @@ export const AttachmentUploadProgressIndicator = ({
         className,
       )}
     >
-      <ProgressIndicator percent={percent} />
+      <ProgressIndicator percent={uploadProgress} />
     </div>
   );
 };

src/components/MessageComposer/AttachmentPreviewList/AudioAttachmentPreview.tsx

@@ -23,7 +23,6 @@ import { useAudioPlayer } from '../../AudioPlayback/WithAudioPlayback';
 import { useStateStore } from '../../../store';
 import {
   formatUploadByteFraction,
-  readUploadProgress,
   resolveAttachmentFullByteSize,
 } from './utils/uploadProgress';
 
@@ -47,9 +46,8 @@ export const AudioAttachmentPreview = ({
   removeAttachments,
 }: AudioAttachmentPreviewProps) => {
   const { t } = useTranslationContext();
-  const { id, previewUri, uploadPermissionCheck, uploadState } =
+  const { id, previewUri, uploadPermissionCheck, uploadProgress, uploadState } =
     attachment.localMetadata ?? {};
-  const uploadProgress = readUploadProgress(attachment.localMetadata);
   const fullBytes = resolveAttachmentFullByteSize(attachment);
   const showUploadFraction =
     uploadState === 'uploading' &&

src/components/MessageComposer/AttachmentPreviewList/FileAttachmentPreview.tsx

@@ -8,7 +8,6 @@ import { RemoveAttachmentPreviewButton } from '../RemoveAttachmentPreviewButton'
 import { AttachmentPreviewRoot } from './utils/AttachmentPreviewRoot';
 import {
   formatUploadByteFraction,
-  readUploadProgress,
   resolveAttachmentFullByteSize,
 } from './utils/uploadProgress';
 import { FileSizeIndicator } from '../../Attachment';
@@ -25,8 +24,8 @@ export const FileAttachmentPreview = ({
   removeAttachments,
 }: FileAttachmentPreviewProps) => {
   const { t } = useTranslationContext('FilePreview');
-  const { id, uploadPermissionCheck, uploadState } = attachment.localMetadata ?? {};
-  const uploadProgress = readUploadProgress(attachment.localMetadata);
+  const { id, uploadPermissionCheck, uploadProgress, uploadState } =
+    attachment.localMetadata ?? {};
   const fullBytes = resolveAttachmentFullByteSize(attachment);
   const showUploadFraction =
     uploadState === 'uploading' &&

src/components/MessageComposer/AttachmentPreviewList/MediaAttachmentPreview.tsx

@@ -24,7 +24,6 @@ import { RemoveAttachmentPreviewButton } from '../RemoveAttachmentPreviewButton'
 import { Button } from '../../Button';
 import { AttachmentUploadProgressIndicator } from './AttachmentUploadProgressIndicator';
 import { AttachmentPreviewRoot } from './utils/AttachmentPreviewRoot';
-import { readUploadProgress } from './utils/uploadProgress';
 
 export type MediaAttachmentPreviewProps<CustomLocalMetadata = Record<string, unknown>> =
   UploadAttachmentPreviewProps<
@@ -44,8 +43,8 @@ export const MediaAttachmentPreview = ({
     useComponentContext();
   const [thumbnailPreviewError, setThumbnailPreviewError] = useState(false);
 
-  const { id, uploadPermissionCheck, uploadState } = attachment.localMetadata ?? {};
-  const uploadProgress = readUploadProgress(attachment.localMetadata);
+  const { id, uploadPermissionCheck, uploadProgress, uploadState } =
+    attachment.localMetadata ?? {};
 
   const isUploading = uploadState === 'uploading';
   const handleThumbnailLoadError = useCallback(() => setThumbnailPreviewError(true), []);

src/components/MessageComposer/AttachmentPreviewList/utils/uploadProgress.ts

@@ -1,21 +1,5 @@
 import { prettifyFileSize } from '../../hooks/utils';
 
-export function readUploadProgress(
-  localMetadata: { uploadProgress?: unknown } | null | undefined,
-): number | undefined {
-  if (!localMetadata) return undefined;
-  const { uploadProgress } = localMetadata;
-  if (uploadProgress === undefined) return undefined;
-  if (typeof uploadProgress !== 'number' || !Number.isFinite(uploadProgress))
-    return undefined;
-  return uploadProgress;
-}
-
-export function clampUploadPercent(value: number): number {
-  if (!Number.isFinite(value)) return 0;
-  return Math.min(100, Math.max(0, value));
-}
-
 function safePrettifyFileSize(bytes: number, maximumFractionDigits?: number): string {
   if (!Number.isFinite(bytes) || bytes < 0) return '';
   if (bytes === 0) return '0 B';
@@ -27,8 +11,7 @@ export function formatUploadByteFraction(
   fullBytes: number,
   maximumFractionDigits?: number,
 ): string {
-  const clamped = clampUploadPercent(uploadPercent);
-  const uploaded = Math.round((clamped / 100) * fullBytes);
+  const uploaded = Math.round((uploadPercent / 100) * fullBytes);
   return `${safePrettifyFileSize(uploaded, maximumFractionDigits)} / ${safePrettifyFileSize(fullBytes, maximumFractionDigits)}`;
 }