ui: media attachments before text (#23467)

* ui: media attachments before text

* fix prettier formatting

diff --git a/tools/ui/src/lib/constants/image-size.ts b/tools/ui/src/lib/constants/image-size.ts
index 0d0c4e48434e3024a0d4bb090ff6ec83b3625c5d..bcc1da08b1936719c9e3dd34cd495a410d486fcc 100644 (file)
--- a/tools/ui/src/lib/constants/image-size.ts
+++ b/tools/ui/src/lib/constants/image-size.ts
@@ -1 +1 @@
-export const MEGAPIXELS_TO_PIXELS = 1_000_000;
\ No newline at end of file
+export const MEGAPIXELS_TO_PIXELS = 1_000_000;

diff --git a/tools/ui/src/lib/services/chat.service.ts b/tools/ui/src/lib/services/chat.service.ts
index 5b7b7e8229d68469928b058d9e6ebb31ae3834b3..3c9ca74796d401b972cc4bba60f592b8e256e870 100644 (file)
--- a/tools/ui/src/lib/services/chat.service.ts
+++ b/tools/ui/src/lib/services/chat.service.ts
@@ -879,14 +879,6 @@ export class ChatService {
                        });
                }
 
-               if (message.content) {
-                       contentParts.push({
-                               type: ContentPartType.TEXT,
-                               text: message.content
-                       });
-               }
-
-               // Include images from all messages
                const imageFiles = message.extra.filter(
                        (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraImageFile =>
                                extra.type === AttachmentType.IMAGE
@@ -919,6 +911,13 @@ export class ChatService {
                        });
                }
 
+               if (message.content) {
+                       contentParts.push({
+                               type: ContentPartType.TEXT,
+                               text: message.content
+                       });
+               }
+
                const videoFiles = message.extra.filter(
                        (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraVideoFile =>
                                extra.type === AttachmentType.VIDEO

diff --git a/tools/ui/src/lib/utils/cap-img-size.ts b/tools/ui/src/lib/utils/cap-img-size.ts
index fa2af53f6fd77b42b800d732d76e516c11c46e0b..1ba218316b7af676df811c3ec4c71114b0f09b3b 100644 (file)
--- a/tools/ui/src/lib/utils/cap-img-size.ts
+++ b/tools/ui/src/lib/utils/cap-img-size.ts
@@ -14,9 +14,8 @@ export function capImageDataURLSize(
 ): Promise<string> {
        return new Promise((resolve, reject) => {
                try {
-                       
                        const mimeMatch = base64UrlImage.match(BASE64_IMAGE_URI_REGEX);
-                       
+
                        if (!mimeMatch) {
                                return reject(new Error('Invalid data URL format.'));
                        }