From be855a4d168dbe26ae851f6215f35ef5bb33d67a Mon Sep 17 00:00:00 2001 From: Andrew Mendelsohn Date: Tue, 4 Apr 2023 17:07:31 -0500 Subject: [PATCH] [C-2419] Fix offline lineup loading (#3164) --- .../mobile/src/hooks/useReachabilityEffect.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/mobile/src/hooks/useReachabilityEffect.ts b/packages/mobile/src/hooks/useReachabilityEffect.ts index 617958ae6e1..c0941e24224 100644 --- a/packages/mobile/src/hooks/useReachabilityEffect.ts +++ b/packages/mobile/src/hooks/useReachabilityEffect.ts @@ -25,19 +25,20 @@ export const useReachabilityEffect = ( const handleReachabilityStateChange = useCallback( (nextReachabilityState: boolean) => { - const wasUnreachable = includeFirstRender - ? !prevReachability - : prevReachability !== undefined && !prevReachability + const isFirstRenderRun = + includeFirstRender && prevReachability === undefined + const wasUnreachable = prevReachability !== undefined && !prevReachability + const wasReachable = prevReachability !== undefined && prevReachability - const wasReachable = includeFirstRender - ? prevReachability - : prevReachability !== undefined && prevReachability - - if (nextReachabilityState && wasUnreachable && onBecomeReachable) { + if ( + nextReachabilityState && + (wasUnreachable || isFirstRenderRun) && + onBecomeReachable + ) { onBecomeReachable() } else if ( !nextReachabilityState && - wasReachable && + (wasReachable || isFirstRenderRun) && onBecomeUnreachable ) { onBecomeUnreachable()