From 33046d2fad2b41dea496e7f277d052d7ec594ef1 Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Sun, 27 Apr 2025 00:15:15 +0530 Subject: [PATCH 1/7] fix: Onboarding - You appears to be offline appears in left without margin. Signed-off-by: krishna2323 --- .../BaseOnboardingPersonalDetails.tsx | 3 +- .../BaseOnboardingPurpose.tsx | 59 +++++++++---------- .../BaseOnboardingWorkEmail.tsx | 4 +- .../BaseOnboardingWorkspaces.tsx | 3 +- 4 files changed, 31 insertions(+), 38 deletions(-) diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx index 9a18211eb2369..7285fad8a9081 100644 --- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx +++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx @@ -138,7 +138,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat return ( - {isSmallScreenWidth && } ); } diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx index 6df0e703a23e5..672f607598e46 100644 --- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx +++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx @@ -8,15 +8,13 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton'; import * as Illustrations from '@components/Icon/Illustrations'; import type {MenuItemProps} from '@components/MenuItem'; import MenuItemList from '@components/MenuItemList'; -import OfflineIndicator from '@components/OfflineIndicator'; -import SafeAreaConsumer from '@components/SafeAreaConsumer'; +import ScreenWrapper from '@components/ScreenWrapper'; import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import usePermissions from '@hooks/usePermissions'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; -import useWindowDimensions from '@hooks/useWindowDimensions'; import Navigation from '@libs/Navigation/Navigation'; import OnboardingRefManager from '@libs/OnboardingRefManager'; import type {TOnboardingRef} from '@libs/OnboardingRefManager'; @@ -52,7 +50,6 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro const styles = useThemeStyles(); const {translate} = useLocalize(); const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout(); - const {windowHeight} = useWindowDimensions(); const {canUsePrivateDomainOnboarding} = usePermissions(); const [user] = useOnyx(ONYXKEYS.USER, {canBeMissing: true}); @@ -68,7 +65,6 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID, {canBeMissing: true}); const [personalDetailsForm] = useOnyx(ONYXKEYS.FORMS.ONBOARDING_PERSONAL_DETAILS_FORM, {canBeMissing: true}); - const maxHeight = shouldEnableMaxHeight ? windowHeight : undefined; const paddingHorizontal = onboardingIsMediumOrLargerScreenWidth ? styles.ph8 : styles.ph5; const [customChoices = []] = useOnyx(ONYXKEYS.ONBOARDING_CUSTOM_CHOICES, {canBeMissing: true}); @@ -124,34 +120,35 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro return null; } return ( - - {({safeAreaPaddingBottomStyle}) => ( - - - + + + + + + + + {translate('onboarding.purpose.title')} - - - - {translate('onboarding.purpose.title')} - - - - - - - - {isSmallScreenWidth && } + - )} - + + + + + ); } diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx index c0781b5c8e06b..099fd62f1c40c 100644 --- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx +++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx @@ -11,7 +11,6 @@ import type {FormOnyxValues} from '@components/Form/types'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import Icon from '@components/Icon'; import * as Illustrations from '@components/Icon/Illustrations'; -import OfflineIndicator from '@components/OfflineIndicator'; import ScreenWrapper from '@components/ScreenWrapper'; import Text from '@components/Text'; import TextInput from '@components/TextInput'; @@ -123,7 +122,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai return ( - {isSmallScreenWidth && } ); } diff --git a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx index d202e51545318..d834008524821 100644 --- a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx +++ b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx @@ -5,7 +5,6 @@ import {useOnyx} from 'react-native-onyx'; import Button from '@components/Button'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import * as Expensicons from '@components/Icon/Expensicons'; -import OfflineIndicator from '@components/OfflineIndicator'; import ScreenWrapper from '@components/ScreenWrapper'; import SelectionList from '@components/SelectionList'; import UserListItem from '@components/SelectionList/UserListItem'; @@ -132,6 +131,7 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding shouldEnableMaxHeight testID="BaseOnboardingWorkspaces" style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]} + shouldShowOfflineIndicator={isSmallScreenWidth} > } /> - {isSmallScreenWidth && } ); } From d37230d441bc5bddf033e0498908f104625acd43 Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Sun, 27 Apr 2025 01:02:01 +0530 Subject: [PATCH 2/7] fix ESLint. Signed-off-by: krishna2323 --- .../OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx index 7285fad8a9081..d90990272b195 100644 --- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx +++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx @@ -5,7 +5,6 @@ import FormProvider from '@components/Form/FormProvider'; import InputWrapper from '@components/Form/InputWrapper'; import type {FormOnyxValues} from '@components/Form/types'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; -import OfflineIndicator from '@components/OfflineIndicator'; import ScreenWrapper from '@components/ScreenWrapper'; import Text from '@components/Text'; import TextInput from '@components/TextInput'; From bad04652b496d6083b138f4cb6b9699164769eb9 Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Sun, 4 May 2025 01:17:15 +0530 Subject: [PATCH 3/7] fix BaseOnboardingPrivateDomain. Signed-off-by: krishna2323 --- .../OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx index e78ba14210a84..1c13878f49962 100644 --- a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx +++ b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx @@ -31,7 +31,8 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard const [joinablePolicies] = useOnyx(ONYXKEYS.JOINABLE_POLICIES, {canBeMissing: true}); const joinablePoliciesLength = Object.keys(joinablePolicies ?? {}).length; - const {shouldUseNarrowLayout, onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout(); + // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth + const {onboardingIsMediumOrLargerScreenWidth, isSmallScreenWidth} = useResponsiveLayout(); const email = session?.email ?? ''; const domain = email.split('@').at(1) ?? ''; @@ -63,7 +64,7 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard return ( Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(route.params?.backTo))} /> - {shouldUseNarrowLayout && } From 3a5694e06d1f46ef2acb2ce0fc5f789b59fe67cc Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Sun, 4 May 2025 01:27:27 +0530 Subject: [PATCH 4/7] remove unused import. Signed-off-by: krishna2323 --- .../OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx index 1c13878f49962..02d9e2e4a6c22 100644 --- a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx +++ b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx @@ -3,7 +3,6 @@ import {View} from 'react-native'; import {useOnyx} from 'react-native-onyx'; import Button from '@components/Button'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; -import OfflineIndicator from '@components/OfflineIndicator'; import ScreenWrapper from '@components/ScreenWrapper'; import Text from '@components/Text'; import ValidateCodeForm from '@components/ValidateCodeActionModal/ValidateCodeForm'; From 90758d42a24f2b5690f39ab4cf7aabb565ef50da Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Mon, 5 May 2025 10:01:14 +0530 Subject: [PATCH 5/7] use default value of shouldShowOfflineIndicator prop. Signed-off-by: krishna2323 --- .../BaseOnboardingPersonalDetails.tsx | 1 - .../BaseOnboardingPrivateDomain.tsx | 4 +--- src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx | 7 +------ src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx | 5 +---- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx index 1df321daa8a7f..baa323f6b2338 100644 --- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx +++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx @@ -137,7 +137,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat return ( Date: Tue, 6 May 2025 11:07:16 +0530 Subject: [PATCH 6/7] add includeSafeAreaPaddingBottom={false} to slection lists in onboarding flow. Signed-off-by: krishna2323 --- src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx | 1 + src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx index ef95a143e00b8..169bbb31f6c0f 100644 --- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx +++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx @@ -259,6 +259,7 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount footerContent={footerContent} shouldShowTooltips={false} listItemWrapperStyle={onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8] : []} + includeSafeAreaPaddingBottom={false} /> ); diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx index ee4eb0f31d832..418e2094c48b3 100644 --- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx +++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx @@ -93,6 +93,7 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE ListItem={RadioListItem} footerContent={footerContent} listItemWrapperStyle={onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8] : []} + includeSafeAreaPaddingBottom={false} /> ); From 170aaaf86be00017f999e89b42a00a3b76bf2027 Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Wed, 7 May 2025 03:51:04 +0530 Subject: [PATCH 7/7] add includeSafeAreaPaddingBottom to ScreenWrapper. Signed-off-by: krishna2323 --- src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx | 1 - src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx | 1 - 2 files changed, 2 deletions(-) diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx index 6c7de30025b92..25bd0b3a31c67 100644 --- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx +++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx @@ -236,7 +236,6 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount return ( diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx index 418e2094c48b3..3046f13eda3ad 100644 --- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx +++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx @@ -70,7 +70,6 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE return (