Skip to content

Commit

Permalink
Merge pull request #50144 from software-mansion-labs/hybridapp/do-not…
Browse files Browse the repository at this point in the history
…-boot-rn-on-start

[HybridApp] Adjust NewDot to new boot behaviour on iOS

(cherry picked from commit e1d1d57)

(CP triggered by jasperhuangg)
  • Loading branch information
lakchote authored and OSBotify committed Oct 3, 2024
1 parent 1ce587d commit 20d55f6
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 60 deletions.
1 change: 0 additions & 1 deletion src/CONST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4219,7 +4219,6 @@ const CONST = {
},
EVENTS: {
SCROLLING: 'scrolling',
ON_RETURN_TO_OLD_DOT: 'onReturnToOldDot',
},

CHAT_HEADER_LOADER_HEIGHT: 36,
Expand Down
41 changes: 0 additions & 41 deletions src/components/HybridAppMiddleware/index.ios.tsx

This file was deleted.

13 changes: 0 additions & 13 deletions src/components/HybridAppMiddleware/index.tsx

This file was deleted.

6 changes: 1 addition & 5 deletions src/libs/Navigation/NavigationRoot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {DefaultTheme, findFocusedRoute, NavigationContainer} from '@react-naviga
import React, {useContext, useEffect, useMemo, useRef} from 'react';
import {NativeModules} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import HybridAppMiddleware from '@components/HybridAppMiddleware';
import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
import useActiveWorkspace from '@hooks/useActiveWorkspace';
import useCurrentReportID from '@hooks/useCurrentReportID';
Expand Down Expand Up @@ -186,10 +185,7 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady, sh
enabled: false,
}}
>
{/* HybridAppMiddleware needs to have access to navigation ref and SplashScreenHidden context */}
<HybridAppMiddleware>
<AppNavigator authenticated={authenticated} />
</HybridAppMiddleware>
<AppNavigator authenticated={authenticated} />
</NavigationContainer>
);
}
Expand Down

0 comments on commit 20d55f6

Please sign in to comment.