regression: Upload loading state relying on percentage instead of file URL (#39780)

Author: dougfabris

apps/meteor/client/lib/chats/uploads.ts

@@ -152,7 +152,7 @@ class UploadsStore extends Emitter<{ update: void; [x: `cancelling-${Upload['id'
 								return;
 							}
 							const progress = (event.loaded / event.total) * 100;
-							this.updateUpload(id, { percentage: Math.round(progress) || 0 });
+							this.updateUpload(id, { percentage: Math.min(Math.round(progress), 99) || 0 });
 						},
 						error: (event) => {
 							this.updateUpload(id, { percentage: 0, error: new Error(xhr.responseText) });
@@ -175,7 +175,7 @@ class UploadsStore extends Emitter<{ update: void; [x: `cancelling-${Upload['id'
 
 						if (xhr.status === 200) {
 							const result = JSON.parse(xhr.responseText);
-							this.updateUpload(id, { id: result.file._id, url: result.file.url });
+							this.updateUpload(id, { id: result.file._id, url: result.file.url, percentage: 100 });
 							return;
 						}
 

apps/meteor/client/views/room/body/hooks/useFileUpload.ts

@@ -33,7 +33,7 @@ export const useFileUpload = () => {
 		[chat],
 	);
 
-	const isUploading = uploads.length > 0 && uploads.some((upload) => upload.percentage < 100 && !upload.error);
+	const isUploading = uploads.length > 0 && uploads.some((upload) => !upload.url && !upload.error);
 
 	return useMemo(
 		() => ({

apps/meteor/client/views/room/composer/messageBox/MessageComposerFileItem.tsx

@@ -26,7 +26,7 @@ const MessageComposerFileItem = ({ upload, onRemove, onEdit, onCancel, disabled,
 
 	const fileSize = formatBytes(upload.file.size, 2);
 	const fileExtension = getMimeType(upload.file.type, upload.file.name);
-	const isLoading = upload.percentage !== 100 && !upload.error;
+	const isLoading = !upload.url && !upload.error;
 
 	const handleOpenFilePreview = () => {
 		if (isLoading || upload.error) {