Skip to content

fix: Refreshing Help page briefly displays we couldn't find content #62349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deetergp merged 3 commits into from
May 21, 2025
Merged

fix: Refreshing Help page briefly displays we couldn't find content #62349

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393cefc
fix: Refreshing Help page briefly displays we couldn't find content
truph01 May 20, 2025
649f339
Update src/components/SidePanel/HelpComponents/HelpContent.tsx
truph01 May 21, 2025
c1b903a
merge main
truph01 May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/components/SidePanel/HelpComponents/HelpContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {findFocusedRoute} from '@react-navigation/native';
import React, {useEffect, useMemo, useRef, useState} from 'react';
import {ScrollView} from 'react-native-gesture-handler';
import {useOnyx} from 'react-native-onyx';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
// Importing from the react-native-gesture-handler package instead of the `components/ScrollView` to fix scroll issue:
// https://github.com/react-native-modal/react-native-modal/issues/236
import HeaderGap from '@components/HeaderGap';
Expand All @@ -13,7 +14,6 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useRootNavigationState from '@hooks/useRootNavigationState';
import useThemeStyles from '@hooks/useThemeStyles';
import {normalizedConfigs} from '@libs/Navigation/linkingConfig/config';
import {navigationRef} from '@libs/Navigation/Navigation';
import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
import {getHelpPaneReportType} from '@libs/ReportUtils';
import {getExpenseType} from '@libs/TransactionUtils';
Expand All @@ -32,13 +32,13 @@ function HelpContent({closeSidePanel}: HelpContentProps) {
const {isExtraLargeScreenWidth} = useResponsiveLayout();
const [expandedIndex, setExpandedIndex] = useState(0);

const {params, routeName} = useRootNavigationState(() => {
const focusedRoute = findFocusedRoute(navigationRef.getRootState());
const {params, routeName, currentState} = useRootNavigationState((rootState) => {
const focusedRoute = findFocusedRoute(rootState);
setExpandedIndex(0);

return {
routeName: (focusedRoute?.name ?? '') as Screen,
params: focusedRoute?.params as Record<string, string>,
currentState: rootState,
};
});

Expand Down Expand Up @@ -90,13 +90,17 @@ function HelpContent({closeSidePanel}: HelpContentProps) {
shouldShowCloseButton={isExtraLargeScreenWidth}
shouldDisplayHelpButton={false}
/>
<ScrollView
style={[styles.ph5, styles.pb5]}
userSelect="auto"
scrollIndicatorInsets={{right: Number.MIN_VALUE}}
>
{getHelpContent(styles, route, isProduction, expandedIndex, setExpandedIndex)}
</ScrollView>
{currentState === undefined ? (
<FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
) : (
<ScrollView
style={[styles.ph5, styles.pb5]}
userSelect="auto"
scrollIndicatorInsets={{right: Number.MIN_VALUE}}
>
{getHelpContent(styles, route, isProduction, expandedIndex, setExpandedIndex)}
</ScrollView>
)}
</>
);
}
Expand Down