From 186c60182641f8b874c55a1db2ae224c1b1e7cb1 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 3 Jul 2025 21:43:23 +0800 Subject: [PATCH 1/3] Revert "Merge pull request #65352 from Expensify/revert-65225-fix/64638-login-page-shows-briefly-when-open-public-room-as-anon-user" This reverts commit cf8fa5b32aea221a184955026e4c1f9fb6e4fedf, reversing changes made to 9692015e898ed5ec78f291d40fa9a4c8fcfc28f7. --- src/Expensify.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Expensify.tsx b/src/Expensify.tsx index 587e529ec8a4..0cc71df88ed1 100644 --- a/src/Expensify.tsx +++ b/src/Expensify.tsx @@ -93,7 +93,7 @@ function Expensify() { const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: true}); const [lastRoute] = useOnyx(ONYXKEYS.LAST_ROUTE, {canBeMissing: true}); const [userMetadata] = useOnyx(ONYXKEYS.USER_METADATA, {canBeMissing: true}); - const [isCheckingPublicRoom] = useOnyx(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, {initWithStoredValues: false, canBeMissing: true}); + const [isCheckingPublicRoom = true] = useOnyx(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, {initWithStoredValues: false, canBeMissing: true}); const [updateAvailable] = useOnyx(ONYXKEYS.UPDATE_AVAILABLE, {initWithStoredValues: false, canBeMissing: true}); const [updateRequired] = useOnyx(ONYXKEYS.UPDATE_REQUIRED, {initWithStoredValues: false, canBeMissing: true}); const [isSidebarLoaded] = useOnyx(ONYXKEYS.IS_SIDEBAR_LOADED, {canBeMissing: true}); From 7509052e1f060dd2f8156c044c9dbd9ad20d846e Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 3 Jul 2025 21:45:06 +0800 Subject: [PATCH 2/3] fix app stuck on splash screen on hybrid app --- src/Expensify.tsx | 1 + src/libs/actions/Report.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Expensify.tsx b/src/Expensify.tsx index 0cc71df88ed1..af36956840e8 100644 --- a/src/Expensify.tsx +++ b/src/Expensify.tsx @@ -214,6 +214,7 @@ function Expensify() { Linking.addEventListener('url', (state) => { // We use custom deeplink handler in setup/hybridApp if (CONFIG.IS_HYBRID_APP) { + Report.doneCheckingPublicRoom(); return; } Report.openReportFromDeepLink(state.url); diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index 91f5655ef8f2..0a4dddb1ed45 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -3359,6 +3359,10 @@ function toggleEmojiReaction( addEmojiReaction(originalReportID, reportAction.reportActionID, emoji, skinTone); } +function doneCheckingPublicRoom() { + Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false); +} + function openReportFromDeepLink(url: string) { const reportID = getReportIDFromLink(url); const isAuthenticated = hasAuthToken(); @@ -3369,11 +3373,11 @@ function openReportFromDeepLink(url: string) { // Show the sign-in page if the app is offline if (networkStatus === CONST.NETWORK.NETWORK_STATUS.OFFLINE) { - Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false); + doneCheckingPublicRoom(); } } else { // If we're not opening a public room (no reportID) or the user is authenticated, we unblock the UI (hide splash screen) - Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false); + doneCheckingPublicRoom(); } let route = getRouteFromLink(url); @@ -5777,6 +5781,7 @@ export { deleteReportComment, deleteReportField, dismissTrackExpenseActionableWhisper, + doneCheckingPublicRoom, downloadReportPDF, editReportComment, expandURLPreview, From 5c3d5c37e818f875b8bb0fd98399a0f75fb1fbc7 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Sat, 5 Jul 2025 14:40:15 +0800 Subject: [PATCH 3/3] fix app stuck on splash screen on hybrid app --- src/Expensify.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Expensify.tsx b/src/Expensify.tsx index af36956840e8..be677ecc0f48 100644 --- a/src/Expensify.tsx +++ b/src/Expensify.tsx @@ -204,6 +204,7 @@ function Expensify() { Linking.getInitialURL().then((url) => { // We use custom deeplink handler in setup/hybridApp if (CONFIG.IS_HYBRID_APP) { + Report.doneCheckingPublicRoom(); return; } setInitialUrl(url); @@ -214,7 +215,6 @@ function Expensify() { Linking.addEventListener('url', (state) => { // We use custom deeplink handler in setup/hybridApp if (CONFIG.IS_HYBRID_APP) { - Report.doneCheckingPublicRoom(); return; } Report.openReportFromDeepLink(state.url);