Merge pull request #92048 from Expensify/revert-90925-fix/broken-image-download-button-flash

Revert "fix: prevent download button flash when opening broken image attachment"

(cherry picked from commit fd3907d)

(cherry-picked to staging by cristipaval)

Author: cristipaval

src/libs/tryResolveUrlFromApiRoot.ts

@@ -1,7 +1,6 @@
 import type {ImageSourcePropType} from 'react-native';
 import Config from '@src/CONFIG';
 import type {ReceiptSource} from '@src/types/onyx/Transaction';
-import proxyConfig from '../../config/proxyConfig';
 import {getApiRoot} from './ApiUtils';
 
 // Absolute URLs (`/` or `//`) should be resolved from API ROOT
@@ -30,13 +29,6 @@ function tryResolveUrlFromApiRoot(url: string | ImageSourcePropType | ReceiptSou
         return url;
     }
     const apiRoot = getApiRoot({shouldUseSecure: false});
-
-    // When using the staging web proxy, the URL might already include the `/staging/` proxy path.
-    // In that case, do not replace the leading `/` again, as it would create `/staging/staging/...`.
-    if (apiRoot === proxyConfig.STAGING && url.startsWith(apiRoot)) {
-        return url;
-    }
-
     return url.replace(ORIGIN_PATTERN, apiRoot);
 }
 

src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/AttachmentStateContextProvider.tsx

@@ -47,7 +47,7 @@ function AttachmentStateContextProvider({children}: Props) {
         setAttachmentLoadedState({});
     }, []);
 
-    const isAttachmentLoaded = useCallback((key: AttachmentSource) => attachmentLoaded?.[convertSourceToString(key)] === true, [attachmentLoaded]);
+    const isAttachmentLoaded = useCallback((key: AttachmentSource) => attachmentLoaded?.[convertSourceToString(key)] !== false, [attachmentLoaded]);
     const value = useMemo(() => ({setAttachmentLoaded, clearAttachmentLoaded, isAttachmentLoaded}), [setAttachmentLoaded, clearAttachmentLoaded, isAttachmentLoaded]);
     return <AttachmentStateContext.Provider value={value}>{children}</AttachmentStateContext.Provider>;
 }

src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx

@@ -6,7 +6,7 @@ import ActivityIndicator from '@components/ActivityIndicator';
 import AttachmentCarousel from '@components/Attachments/AttachmentCarousel';
 import {AttachmentCarouselPagerActionsContext, AttachmentCarouselPagerStateContext} from '@components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext';
 import type {AttachmentCarouselPagerActionsContextType, AttachmentCarouselPagerStateContextType} from '@components/Attachments/AttachmentCarousel/Pager/types';
-import AttachmentView, {checkIsFileImage} from '@components/Attachments/AttachmentView';
+import AttachmentView from '@components/Attachments/AttachmentView';
 import useAttachmentErrors from '@components/Attachments/AttachmentView/useAttachmentErrors';
 import type {Attachment} from '@components/Attachments/types';
 import BlockingView from '@components/BlockingViews/BlockingView';
@@ -188,19 +188,17 @@ function AttachmentModalBaseContent({
 
     const {isAttachmentLoaded} = useContext(AttachmentStateContext);
     const isEReceipt = transaction && !hasReceiptSource(transaction) && hasEReceipt(transaction);
-    const isFileImage = typeof source !== 'function' && checkIsFileImage(source, fileToDisplay?.name);
     const shouldShowDownloadButton = useMemo(() => {
         const isValidContext = !isEmptyObject(report) || type === CONST.ATTACHMENT_TYPE.SEARCH || shouldAllowDownloadOutsideReportContext;
         if (!isValidContext || isErrorInAttachment(source) || isEReceipt) {
             return false;
         }
 
-        return !!onDownloadAttachment && isDownloadButtonReadyToBeShown && !shouldShowNotFoundPage && !isOffline && !isLocalSource && (!isFileImage || isAttachmentLoaded?.(source));
+        return !!onDownloadAttachment && isDownloadButtonReadyToBeShown && !shouldShowNotFoundPage && !isOffline && !isLocalSource && isAttachmentLoaded?.(source);
     }, [
         isAttachmentLoaded,
         isDownloadButtonReadyToBeShown,
         isErrorInAttachment,
-        isFileImage,
         isLocalSource,
         isOffline,
         onDownloadAttachment,