From 474d5ed2917007917d83cabe35d0b44adb3e232e Mon Sep 17 00:00:00 2001 From: Peter Velkov Date: Fri, 24 Mar 2023 20:58:34 +0200 Subject: [PATCH 1/2] Fix AnchorRenderer download link for attachments Attachments should be downloaded from a path relative to the current API root See: https://github.com/Expensify/App/issues/16327#issuecomment-1477596282 --- .../HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js index 8c27cba1f7a8..be8c8a1fc3eb 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js @@ -16,6 +16,7 @@ import AnchorForCommentsOnly from '../../AnchorForCommentsOnly'; import AnchorForAttachmentsOnly from '../../AnchorForAttachmentsOnly'; import * as Url from '../../../libs/Url'; import ROUTES from '../../../ROUTES'; +import tryResolveUrlFromApiRoot from '../../../libs/tryResolveUrlFromApiRoot'; const AnchorRenderer = (props) => { const htmlAttribs = props.tnode.attributes; @@ -77,7 +78,7 @@ const AnchorRenderer = (props) => { if (isAttachment) { return ( ); From 45f2a19460b6d5e466cb1c2fe09d09f322677a38 Mon Sep 17 00:00:00 2001 From: Peter Velkov Date: Fri, 24 Mar 2023 21:19:38 +0200 Subject: [PATCH 2/2] BaseAnchorForAttachmentsOnly `download` prop type mismatch the prop was meant to be and is used like an object: 22fe12648d23321119786d9fc24b5b44ffbaf48f --- .../BaseAnchorForAttachmentsOnly.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.js b/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.js index 86e9e9690a96..87835062a959 100644 --- a/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.js +++ b/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.js @@ -22,7 +22,9 @@ const propTypes = { onPressOut: PropTypes.func, /** If a file download is happening */ - download: PropTypes.bool, + download: PropTypes.shape({ + isDownloading: PropTypes.bool.isRequired, + }), ...anchorForAttachmentsOnlyPropTypes, }; @@ -30,7 +32,7 @@ const propTypes = { const defaultProps = { onPressIn: undefined, onPressOut: undefined, - download: false, + download: {isDownloading: false}, ...anchorForAttachmentsOnlyDefaultProps, };