From 9698199e887b3f8f431e057978ea7281513ceabe Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 17 Oct 2022 12:36:40 -0400 Subject: [PATCH 1/2] Merge pull request #11911 from Expensify/version-BUILD-1B34D8F2-50BD-4FCF-A97E-2D874C0000C5 Update version to 1.2.16-5 on main (cherry picked from commit f6f85eddf7128ba504f4f2d167efdba462563931) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 183b44e65908..90489f196e98 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,8 +156,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001021604 - versionName "1.2.16-4" + versionCode 1001021605 + versionName "1.2.16-5" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 8d257b43467d..9c0f43e4e9c0 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.16.4 + 1.2.16.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index a9a0de27d97f..2fe0d75de018 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.16.4 + 1.2.16.5 diff --git a/package-lock.json b/package-lock.json index 234cc31f48db..2a48185caa09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.16-4", + "version": "1.2.16-5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.16-4", + "version": "1.2.16-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index d47cbea6dd95..b5a611c0c17d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.16-4", + "version": "1.2.16-5", "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 e1863598c135d7838b390bc7e373ca85cd27b457 Mon Sep 17 00:00:00 2001 From: Andre Fonseca Date: Mon, 17 Oct 2022 17:30:44 +0100 Subject: [PATCH 2/2] Merge pull request #11909 from Expensify/revert-11527-jack-conciergePath Revert "Update handling so that Concierge link redirects to chat" (cherry picked from commit 32f94ecc5f984bfa67901483a25b0dbb32d600dd) --- src/components/WalletStatementModal/index.js | 16 +++++--------- .../WalletStatementModal/index.native.js | 21 +++++++------------ 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/src/components/WalletStatementModal/index.js b/src/components/WalletStatementModal/index.js index 2f6d0ca387a1..762bed5b6296 100644 --- 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 index bbbd1bb4f636..9c525a12420c 100644 --- 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); } }