Created ATTACHMENT_ID regex

Expensify · Jan 23, 2023 · 5cd5533 · 5cd5533
1 parent 0b4d0b6
commit 5cd5533
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/CONST.js b/src/CONST.js
@@ -772,6 +772,8 @@ const CONST = {
         EMOJI_SUGGESTIONS: /:[a-zA-Z0-9_+-]{1,40}$/,
         AFTER_FIRST_LINE_BREAK: /\n.*/g,
         CODE_2FA: /^\d{6}$/,
+
+        ATTACHMENT_ID: /chat-attachments\/(\d+)/,
     },
 
     PRONOUNS: {

diff --git a/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.js b/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.js
@@ -6,6 +6,7 @@ import {
     propTypes as anchorForAttachmentsOnlyPropTypes,
     defaultProps as anchorForAttachmentsOnlyDefaultProps,
 } from './anchorForAttachmentsOnlyPropTypes';
+import CONST from '../../CONST';
 import ONYXKEYS from '../../ONYXKEYS';
 import AttachmentView from '../AttachmentView';
 import * as Download from '../../libs/actions/Download';
@@ -33,7 +34,7 @@ class BaseAnchorForAttachmentsOnly extends React.Component {
     render() {
         const sourceURL = this.props.source;
         const sourceURLWithAuth = addEncryptedAuthTokenToURL(sourceURL);
-        const sourceID = (sourceURL.match(/chat-attachments\/(\d+)/) || [])[1];
+        const sourceID = (sourceURL.match(CONST.REGEX.ATTACHMENT_ID) || [])[1];
         const fileName = this.props.displayName;
 
         const isDownloading = this.props.download && this.props.download.isDownloading;
@@ -84,7 +85,7 @@ BaseAnchorForAttachmentsOnly.defaultProps = defaultProps;
 export default withOnyx({
     download: {
         key: ({source}) => {
-            const sourceID = (source.match(/chat-attachments\/(\d+)/) || [])[1];
+            const sourceID = (source.match(CONST.REGEX.ATTACHMENT_ID) || [])[1];
             return `${ONYXKEYS.COLLECTION.DOWNLOAD}${sourceID}`;
         },
     },

diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -53,7 +53,7 @@ export default [
             const attachmentDetails = getAttachmentDetails(html);
             const {originalFileName, sourceURL} = attachmentDetails;
             const sourceURLWithAuth = addEncryptedAuthTokenToURL(sourceURL);
-            const sourceID = (sourceURL.match(/chat-attachments\/(\d+)/) || [])[1];
+            const sourceID = (sourceURL.match(CONST.REGEX.ATTACHMENT_ID) || [])[1];
             Download.setDownload(sourceID, true);
             fileDownload(sourceURLWithAuth, originalFileName).then(() => Download.setDownload(sourceID, false));
             if (closePopover) {