Merge pull request #11909 from Expensify/revert-11527-jack-conciergePath

Revert "Update handling so that Concierge link redirects to chat" (cherry picked from commit 32f94ec)
Expensify · Oct 17, 2022 · e186359 · e186359
1 parent 9698199
commit e186359
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/src/components/WalletStatementModal/index.js b/src/components/WalletStatementModal/index.js
@@ -9,7 +9,6 @@ import ONYXKEYS from '../../ONYXKEYS';
 import {walletStatementPropTypes, walletStatementDefaultProps} from './WalletStatementModalPropTypes';
 import styles from '../../styles/styles';
 import FullScreenLoadingIndicator from '../FullscreenLoadingIndicator';
-import * as Report from '../../libs/actions/Report';
 import ROUTES from '../../ROUTES';
 import Navigation from '../../libs/Navigation/Navigation';
 
@@ -28,18 +27,13 @@ class WalletStatementModal extends React.Component {
      * @param {MessageEvent} e
      */
     navigate(e) {
-        if (!e.data || !e.data.type || (e.data.type !== 'STATEMENT_NAVIGATE' && e.data.type !== 'CONCIERGE_NAVIGATE')) {
+        if (!e.data || e.data.type !== 'STATEMENT_NAVIGATE' || !e.data.url) {
             return;
         }
-
-        if (e.data.type === 'STATEMENT_NAVIGATE' && e.data.url) {
-            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND, ROUTES.IOU_BILL];
-            const navigateToIOURoute = _.find(iouRoutes, iouRoute => e.data.url.includes(iouRoute));
-            if (navigateToIOURoute) {
-                Navigation.navigate(navigateToIOURoute);
-            }
-        } else if (e.data.type === 'CONCIERGE_NAVIGATE') {
-            Report.navigateToConciergeChat();
+        const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND, ROUTES.IOU_BILL];
+        const navigateToIOURoute = _.find(iouRoutes, iouRoute => e.data.url.includes(iouRoute));
+        if (navigateToIOURoute) {
+            Navigation.navigate(navigateToIOURoute);
         }
     }
 

diff --git a/src/components/WalletStatementModal/index.native.js b/src/components/WalletStatementModal/index.native.js
@@ -8,7 +8,6 @@ import ONYXKEYS from '../../ONYXKEYS';
 import compose from '../../libs/compose';
 import {walletStatementPropTypes, walletStatementDefaultProps} from './WalletStatementModalPropTypes';
 import FullScreenLoadingIndicator from '../FullscreenLoadingIndicator';
-import * as Report from '../../libs/actions/Report';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 
@@ -23,24 +22,18 @@ class WalletStatementModal extends React.Component {
     /**
      * Handles in-app navigation for webview links
      *
-     * @param {String} params.type
+     * @param {Object} params
      * @param {String} params.url
      */
-    navigate({type, url}) {
-        if (!this.webview || (type !== 'STATEMENT_NAVIGATE' && type !== 'CONCIERGE_NAVIGATE')) {
+    navigate({url}) {
+        if (!this.webview || !url) {
             return;
         }
-
-        if (type === 'STATEMENT_NAVIGATE' && url) {
-            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND, ROUTES.IOU_BILL];
-            const navigateToIOURoute = _.find(iouRoutes, iouRoute => url.includes(iouRoute));
-            if (navigateToIOURoute) {
-                this.webview.stopLoading();
-                Navigation.navigate(navigateToIOURoute);
-            }
-        } else if (type === 'CONCIERGE_NAVIGATE') {
+        const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND, ROUTES.IOU_BILL];
+        const navigateToIOURoute = _.find(iouRoutes, iouRoute => url.includes(iouRoute));
+        if (navigateToIOURoute) {
             this.webview.stopLoading();
-            Report.navigateToConciergeChat();
+            Navigation.navigate(navigateToIOURoute);
         }
     }