Support thumbnail export & import during backup of visual attachments

ts/components/conversation/Image.tsx

@@ -156,14 +156,25 @@ export function Image({
       }}
     >
       {pending ? (
-        blurHash ? (
+        url || blurHash ? (
           <div className="module-image__download-pending">
-            <Blurhash
-              hash={blurHash}
-              width={width}
-              height={height}
-              style={{ display: 'block' }}
-            />
+            {url ? (
+              <img
+                onError={onError}
+                className="module-image__image"
+                alt={alt}
+                height={height}
+                width={width}
+                src={url}
+              />
+            ) : blurHash ? (
+              <Blurhash
+                hash={blurHash}
+                width={width}
+                height={height}
+                style={{ display: 'block' }}
+              />
+            ) : undefined}
             <div className="module-image__download-pending--spinner-container">
               <div
                 className="module-image__download-pending--spinner"

ts/components/conversation/ImageGrid.tsx

@@ -4,7 +4,10 @@
 import React from 'react';
 import classNames from 'classnames';
 
-import type { AttachmentType } from '../../types/Attachment';
+import type {
+  AttachmentForUIType,
+  AttachmentType,
+} from '../../types/Attachment';
 import {
   areAllAttachmentsVisual,
   getAlt,
@@ -21,7 +24,7 @@ import type { LocalizerType, ThemeType } from '../../types/Util';
 export type DirectionType = 'incoming' | 'outgoing';
 
 export type Props = {
-  attachments: ReadonlyArray<AttachmentType>;
+  attachments: ReadonlyArray<AttachmentForUIType>;
   bottomOverlay?: boolean;
   direction: DirectionType;
   isSticker?: boolean;
@@ -158,7 +161,9 @@ export function ImageGrid({
           playIconOverlay={isVideoAttachment(attachments[0])}
           height={height}
           width={width}
-          url={getUrl(attachments[0])}
+          url={
+            getUrl(attachments[0]) ?? attachments[0].thumbnailFromBackup?.url
+          }
           tabIndex={tabIndex}
           onClick={onClick}
           onError={onError}