From 20b5d243b6f5c38862128730801764c8988cede3 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus <bernhard.josephus@gmail.com> Date: Mon, 22 Apr 2024 23:47:21 +0800 Subject: [PATCH 1/2] update live markdown --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c243421edf76..b46050bfd01b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@babel/plugin-proposal-private-methods": "^7.18.6", "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@dotlottie/react-player": "^1.6.3", - "@expensify/react-native-live-markdown": "0.1.62", + "@expensify/react-native-live-markdown": "0.1.63", "@expo/metro-runtime": "~3.1.1", "@formatjs/intl-datetimeformat": "^6.10.0", "@formatjs/intl-listformat": "^7.2.2", @@ -3570,9 +3570,9 @@ } }, "node_modules/@expensify/react-native-live-markdown": { - "version": "0.1.62", - "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.62.tgz", - "integrity": "sha512-o70/tFIGZJ1U8U8aqTQu1HAZed6nt5LYWk74mrceRxQHOqsKhZgn2q5EuEy8EMIcnCGKjwxuDyZJbuRexgHx/A==", + "version": "0.1.63", + "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.63.tgz", + "integrity": "sha512-+X2RYWyAApdhJroMNq4dw5UW9c9oZwsmvT83LSgMYbJ/4OdwSy4xibReoBQzOiV/qB25JoUttd7kjdACnyCHfA==", "engines": { "node": ">= 18.0.0" }, diff --git a/package.json b/package.json index 55ae82ed8b36..8f29d3363414 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@babel/plugin-proposal-private-methods": "^7.18.6", "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@dotlottie/react-player": "^1.6.3", - "@expensify/react-native-live-markdown": "0.1.62", + "@expensify/react-native-live-markdown": "0.1.63", "@expo/metro-runtime": "~3.1.1", "@formatjs/intl-datetimeformat": "^6.10.0", "@formatjs/intl-listformat": "^7.2.2", From f5fcdd1c66df822d096cf720a0d330b271448d21 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus <bernhard.josephus@gmail.com> Date: Tue, 23 Apr 2024 00:01:04 +0800 Subject: [PATCH 2/2] dismiss modal when navigating to concierge chat --- src/components/WalletStatementModal/index.native.tsx | 2 +- src/components/WalletStatementModal/index.tsx | 2 +- src/pages/GetAssistancePage.tsx | 2 +- src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx | 2 +- .../ConnectBankAccount/components/FinishChatCard.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/WalletStatementModal/index.native.tsx b/src/components/WalletStatementModal/index.native.tsx index 8dbc743a02ee..8717ac7f8472 100644 --- a/src/components/WalletStatementModal/index.native.tsx +++ b/src/components/WalletStatementModal/index.native.tsx @@ -33,7 +33,7 @@ function WalletStatementModal({statementPageURL, session}: WalletStatementProps) if (type === CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE) { webViewRef.current.stopLoading(); - Report.navigateToConciergeChat(); + Report.navigateToConciergeChat(true); } if (type === CONST.WALLET.WEB_MESSAGE_TYPE.STATEMENT && url) { diff --git a/src/components/WalletStatementModal/index.tsx b/src/components/WalletStatementModal/index.tsx index d6120b842ddc..d469eedc9761 100644 --- a/src/components/WalletStatementModal/index.tsx +++ b/src/components/WalletStatementModal/index.tsx @@ -24,7 +24,7 @@ function WalletStatementModal({statementPageURL, session}: WalletStatementProps) } if (event.data.type === CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE) { - Report.navigateToConciergeChat(); + Report.navigateToConciergeChat(true); } if (event.data.type === CONST.WALLET.WEB_MESSAGE_TYPE.STATEMENT && event.data.url) { diff --git a/src/pages/GetAssistancePage.tsx b/src/pages/GetAssistancePage.tsx index b543524fc68e..3d2aac1f7870 100644 --- a/src/pages/GetAssistancePage.tsx +++ b/src/pages/GetAssistancePage.tsx @@ -37,7 +37,7 @@ function GetAssistancePage({route, account}: GetAssistancePageProps) { const menuItems: MenuItemWithLink[] = [ { title: translate('getAssistancePage.chatWithConcierge'), - onPress: () => Report.navigateToConciergeChat(), + onPress: () => Report.navigateToConciergeChat(true), icon: Expensicons.ChatBubble, shouldShowRightIcon: true, wrapperStyle: [styles.cardMenuItem], diff --git a/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx b/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx index c6ec7dc49b9f..de95007d2b47 100644 --- a/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx +++ b/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx @@ -57,7 +57,7 @@ function ManageTeamsExpensesModal() { const completeEngagement = () => { Report.completeEngagementModal(CONST.INTRO_CHOICES.MANAGE_TEAM, messageCopy); - Report.navigateToConciergeChat(); + Report.navigateToConciergeChat(true); }; const navigateBack = () => { diff --git a/src/pages/ReimbursementAccount/ConnectBankAccount/components/FinishChatCard.tsx b/src/pages/ReimbursementAccount/ConnectBankAccount/components/FinishChatCard.tsx index 7ecf9b9ad253..5f5786fd51c7 100644 --- a/src/pages/ReimbursementAccount/ConnectBankAccount/components/FinishChatCard.tsx +++ b/src/pages/ReimbursementAccount/ConnectBankAccount/components/FinishChatCard.tsx @@ -27,7 +27,7 @@ function FinishChatCard({requiresTwoFactorAuth, reimbursementAccount}: FinishCha const styles = useThemeStyles(); const policyID = reimbursementAccount?.achData?.policyID ?? ''; const shouldShowResetModal = reimbursementAccount.shouldShowResetModal ?? false; - const handleNavigateToConciergeChat = () => Report.navigateToConciergeChat(); + const handleNavigateToConciergeChat = () => Report.navigateToConciergeChat(true); return ( <ScrollView style={[styles.flex1]}>