From b01aba0738478e604e1f36cb72815152b12a1588 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 12 May 2022 15:50:16 -0700
Subject: [PATCH 1/2] Merge pull request #8977 from
 Expensify/version-BUILD-83c4d3e889b87ffe40bf147f0bf327e9b8f67fbb

Update version to 1.1.57-18 on main

(cherry picked from commit 30f79b36b2131b885b2083a99ce03aa6f953236e)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 2 +-
 package.json                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 830469c593a..d74382694b3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015717
-        versionName "1.1.57-17"
+        versionCode 1001015718
+        versionName "1.1.57-18"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index fc38c9344a1..977bbfe0995 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.17</string>
+	<string>1.1.57.18</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1f13cb24aea..36ea7b30959 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.17</string>
+	<string>1.1.57.18</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 2b279bfa8cc..4d6a4f5cf1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-17",
+  "version": "1.1.57-18",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f5d8bdfc5a7..e2d34d41e95 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-17",
+  "version": "1.1.57-18",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 051719a811d93cad800dc3450ce89cd343c89442 Mon Sep 17 00:00:00 2001
From: Joel Bettner <joelbettner@expensify.com>
Date: Thu, 12 May 2022 16:39:12 -0600
Subject: [PATCH 2/2] Merge pull request #8952 from
 Expensify/revert-8769-openOldDotLinks

Revert "Open old dot links with openOldDotLink() function"

(cherry picked from commit 6afed2adc04986c875708651d2e926e7d691c037)
---
 .../HTMLRenderers/AnchorRenderer.js           | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
index bf70adda9f0..e768e59bbf9 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
@@ -8,11 +8,9 @@ import htmlRendererPropTypes from './htmlRendererPropTypes';
 import * as HTMLEngineUtils from '../htmlEngineUtils';
 import Text from '../../Text';
 import CONST from '../../../CONST';
-import CONFIG from '../../../CONFIG';
 import styles from '../../../styles/styles';
 import Navigation from '../../../libs/Navigation/Navigation';
 import AnchorForCommentsOnly from '../../AnchorForCommentsOnly';
-import * as Link from '../../../libs/actions/Link';
 
 const AnchorRenderer = (props) => {
     const htmlAttribs = props.tnode.attributes;
@@ -22,29 +20,16 @@ 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 internalNewExpensifyPath = (attrHref.startsWith(CONST.NEW_EXPENSIFY_URL) && attrHref.replace(CONST.NEW_EXPENSIFY_URL, ''))
+    const internalExpensifyPath = (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 (internalNewExpensifyPath) {
-        return (
-            <Text
-                style={styles.link}
-                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.
     if (internalExpensifyPath) {
         return (
             <Text
                 style={styles.link}
-                onPress={() => Link.openOldDotLink(internalExpensifyPath)}
+                onPress={() => Navigation.navigate(internalExpensifyPath)}
             >
                 <TNodeChildrenRenderer tnode={props.tnode} />
             </Text>