From e070952ba488b146fa8b1c9c075c21c42f1fe9d4 Mon Sep 17 00:00:00 2001 From: Faizan Shoukat Abbasi Date: Sat, 29 Nov 2025 02:39:32 +0500 Subject: [PATCH 1/4] Replace FullScreenLoadingIndicator with ActivityIndicator in HelpContent component --- src/components/SidePanel/HelpComponents/HelpContent.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/SidePanel/HelpComponents/HelpContent.tsx b/src/components/SidePanel/HelpComponents/HelpContent.tsx index 3096921a2a527..1d0049094c5da 100644 --- a/src/components/SidePanel/HelpComponents/HelpContent.tsx +++ b/src/components/SidePanel/HelpComponents/HelpContent.tsx @@ -1,7 +1,8 @@ import {findFocusedRoute} from '@react-navigation/native'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import type {OnyxEntry} from 'react-native-onyx'; -import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; +import {View} from 'react-native'; +import ActivityIndicator from '@components/ActivityIndicator'; import HeaderGap from '@components/HeaderGap'; import ScrollView from '@components/ScrollView'; import getHelpContent from '@components/SidePanel/getHelpContent'; @@ -126,8 +127,10 @@ function HelpContent({closeSidePanel}: HelpContentProps) { shouldShowBackButton={!isExtraLargeScreenWidth} shouldShowCloseButton={isExtraLargeScreenWidth} /> - {currentState === undefined ? ( - + {true ? ( // TEMPORARY: Force loading state for testing - change back to: currentState === undefined + + + ) : ( Date: Sat, 29 Nov 2025 02:59:50 +0500 Subject: [PATCH 2/4] Revert extra code --- src/components/SidePanel/HelpComponents/HelpContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SidePanel/HelpComponents/HelpContent.tsx b/src/components/SidePanel/HelpComponents/HelpContent.tsx index 1d0049094c5da..23736569f11f8 100644 --- a/src/components/SidePanel/HelpComponents/HelpContent.tsx +++ b/src/components/SidePanel/HelpComponents/HelpContent.tsx @@ -127,7 +127,7 @@ function HelpContent({closeSidePanel}: HelpContentProps) { shouldShowBackButton={!isExtraLargeScreenWidth} shouldShowCloseButton={isExtraLargeScreenWidth} /> - {true ? ( // TEMPORARY: Force loading state for testing - change back to: currentState === undefined + {currentState === undefined ? ( From c004c9e49f1e324b3b1b0c0c3c9cf33455de8e48 Mon Sep 17 00:00:00 2001 From: Faizan Shoukat Abbasi Date: Sat, 29 Nov 2025 03:11:08 +0500 Subject: [PATCH 3/4] fixed prettier issue --- src/components/SidePanel/HelpComponents/HelpContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SidePanel/HelpComponents/HelpContent.tsx b/src/components/SidePanel/HelpComponents/HelpContent.tsx index 23736569f11f8..159e932ca0ad7 100644 --- a/src/components/SidePanel/HelpComponents/HelpContent.tsx +++ b/src/components/SidePanel/HelpComponents/HelpContent.tsx @@ -1,7 +1,7 @@ import {findFocusedRoute} from '@react-navigation/native'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; -import type {OnyxEntry} from 'react-native-onyx'; import {View} from 'react-native'; +import type {OnyxEntry} from 'react-native-onyx'; import ActivityIndicator from '@components/ActivityIndicator'; import HeaderGap from '@components/HeaderGap'; import ScrollView from '@components/ScrollView'; From 124f7d4a8d53a778aeec186ac39310700b6ffb59 Mon Sep 17 00:00:00 2001 From: Faizan Shoukat Abbasi Date: Sat, 29 Nov 2025 13:43:53 +0500 Subject: [PATCH 4/4] resolved feedbacks --- src/components/SidePanel/HelpComponents/HelpContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SidePanel/HelpComponents/HelpContent.tsx b/src/components/SidePanel/HelpComponents/HelpContent.tsx index 159e932ca0ad7..89bb1a223e440 100644 --- a/src/components/SidePanel/HelpComponents/HelpContent.tsx +++ b/src/components/SidePanel/HelpComponents/HelpContent.tsx @@ -128,7 +128,7 @@ function HelpContent({closeSidePanel}: HelpContentProps) { shouldShowCloseButton={isExtraLargeScreenWidth} /> {currentState === undefined ? ( - + ) : (