From 6c6ea5772bc6130853145359d350c9802c7bb9d8 Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Tue, 7 May 2024 15:13:55 +0200 Subject: [PATCH 1/3] fix native gesture behaviour --- .../getOnboardingModalScreenOptions/index.native.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts b/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts index 170a2f1c5865..98dd131a9332 100644 --- a/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts +++ b/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts @@ -3,7 +3,10 @@ import type {ThemeStyles} from '@styles/index'; import type {StyleUtilsType} from '@styles/utils'; function getOnboardingModalScreenOptions(isSmallScreenWidth: boolean, styles: ThemeStyles, StyleUtils: StyleUtilsType) { - return getRootNavigatorScreenOptions(isSmallScreenWidth, styles, StyleUtils).fullScreen; + return { + ...getRootNavigatorScreenOptions(isSmallScreenWidth, styles, StyleUtils).fullScreen, + gestureEnabled: false, + }; } export default getOnboardingModalScreenOptions; From 0a9b377575752493cd8f6ca16e56e357a8b2451f Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Wed, 8 May 2024 11:37:28 +0200 Subject: [PATCH 2/3] Update ReportActionsView to handle invoice rooms --- src/pages/home/report/ReportActionsView.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx index 02008a464859..79c83b249f3d 100755 --- a/src/pages/home/report/ReportActionsView.tsx +++ b/src/pages/home/report/ReportActionsView.tsx @@ -408,7 +408,8 @@ function ReportActionsView({ reportActions.length >= 1 && !isLoadingInitialReportActions && !isLoadingOlderReportActions && - !isLoadingNewerReportActions; + !isLoadingNewerReportActions && + !ReportUtils.isInvoiceRoom(report); if (shouldOpenReport) { Report.openReport(reportID, reportActionID); @@ -423,6 +424,7 @@ function ReportActionsView({ isLoadingOlderReportActions, isLoadingNewerReportActions, isLoadingInitialReportActions, + report, ]); // Check if the first report action in the list is the one we're currently linked to From 92312c15b05a118cfeaf676b3ea380ac3fadba4d Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Wed, 8 May 2024 12:42:57 +0200 Subject: [PATCH 3/3] Revert "fix native gesture behaviour" This reverts commit 6c6ea5772bc6130853145359d350c9802c7bb9d8. --- .../getOnboardingModalScreenOptions/index.native.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts b/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts index 98dd131a9332..170a2f1c5865 100644 --- a/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts +++ b/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts @@ -3,10 +3,7 @@ import type {ThemeStyles} from '@styles/index'; import type {StyleUtilsType} from '@styles/utils'; function getOnboardingModalScreenOptions(isSmallScreenWidth: boolean, styles: ThemeStyles, StyleUtils: StyleUtilsType) { - return { - ...getRootNavigatorScreenOptions(isSmallScreenWidth, styles, StyleUtils).fullScreen, - gestureEnabled: false, - }; + return getRootNavigatorScreenOptions(isSmallScreenWidth, styles, StyleUtils).fullScreen; } export default getOnboardingModalScreenOptions;