Merge pull request #8980 from mateusbra/openOldDotLinksRegression

Open old dot link with openOldDotLink()
Expensify · May 24, 2022 · d4b0582 · d4b0582
2 parents 9d63a10 + 15c3f85
commit d4b0582
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
@@ -6,6 +6,8 @@ import {
 import lodashGet from 'lodash/get';
 import htmlRendererPropTypes from './htmlRendererPropTypes';
 import * as HTMLEngineUtils from '../htmlEngineUtils';
+import * as Link from '../../../libs/actions/Link';
+import CONFIG from '../../../CONFIG';
 import Text from '../../Text';
 import CONST from '../../../CONST';
 import styles from '../../../styles/styles';
@@ -20,16 +22,30 @@ const AnchorRenderer = (props) => {
     const displayName = lodashGet(props.tnode, 'domNode.children[0].data', '');
     const parentStyle = lodashGet(props.tnode, 'parent.styles.nativeTextRet', {});
     const attrHref = htmlAttribs.href || '';
-    const internalExpensifyPath = (attrHref.startsWith(CONST.NEW_EXPENSIFY_URL) && attrHref.replace(CONST.NEW_EXPENSIFY_URL, ''))
+    const internalNewExpensifyPath = (attrHref.startsWith(CONST.NEW_EXPENSIFY_URL) && attrHref.replace(CONST.NEW_EXPENSIFY_URL, ''))
         || (attrHref.startsWith(CONST.STAGING_NEW_EXPENSIFY_URL) && attrHref.replace(CONST.STAGING_NEW_EXPENSIFY_URL, ''));
+    const internalExpensifyPath = attrHref.startsWith(CONFIG.EXPENSIFY.EXPENSIFY_URL) && attrHref.replace(CONFIG.EXPENSIFY.EXPENSIFY_URL, '');
 
     // If we are handling a New Expensify link then we will assume this should be opened by the app internally. This ensures that the links are opened internally via react-navigation
     // instead of in a new tab or with a page refresh (which is the default behavior of an anchor tag)
-    if (internalExpensifyPath) {
+    if (internalNewExpensifyPath) {
         return (
             <Text
                 style={styles.link}
-                onPress={() => Navigation.navigate(internalExpensifyPath)}
+                onPress={() => Navigation.navigate(internalNewExpensifyPath)}
+            >
+                <TNodeChildrenRenderer tnode={props.tnode} />
+            </Text>
+        );
+    }
+
+    // If we are handling an old dot Expensify link we need to open it with openOldDotLink() so we can navigate to it with the user already logged in.
+    // As attachments also use expensify.com we don't want it working the same as links.
+    if (internalExpensifyPath && !isAttachment) {
+        return (
+            <Text
+                style={styles.link}
+                onPress={() => Link.openOldDotLink(internalExpensifyPath)}
             >
                 <TNodeChildrenRenderer tnode={props.tnode} />
             </Text>