Skip to content

fix: Web - Subscription- The top of explore plans does not scroll if the screen size is increased. #65924

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
justinpersaud merged 3 commits into from
Jul 14, 2025
Merged

fix: Web - Subscription- The top of explore plans does not scroll if the screen size is increased. #65924

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d220e88
fix: Web - Subscription- The top of explore plans does not scroll if …
Krishna2323 Jul 11, 2025
245f91b
fix safe area padding buttom on native devices.
Krishna2323 Jul 11, 2025
8ad0b65
update modal max height.
Krishna2323 Jul 11, 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
41 changes: 25 additions & 16 deletions src/pages/settings/Subscription/SubscriptionPlan/ComparePlansModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ import {View} from 'react-native';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import Modal from '@components/Modal';
import type {AnimationOut} from '@components/Modal/ReanimatedModal/types';
import SafeAreaConsumer from '@components/SafeAreaConsumer';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useLocalize from '@hooks/useLocalize';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import CONST from '@src/CONST';
import SubscriptionPlanCard from './SubscriptionPlanCard';

Expand All @@ -23,6 +25,7 @@ type ComparePlansModalProps = {
function ComparePlansModal({isModalVisible, setIsModalVisible}: ComparePlansModalProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
const {windowHeight} = useWindowDimensions();
// We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to be consistent with BaseModal component
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {isSmallScreenWidth} = useResponsiveLayout();
Expand Down Expand Up @@ -59,23 +62,29 @@ function ComparePlansModal({isModalVisible, setIsModalVisible}: ComparePlansModa
</View>
);

const maxHeight = isSmallScreenWidth ? undefined : windowHeight - 40;

return (
<Modal
isVisible={isModalVisible}
type={isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.CENTERED : CONST.MODAL.MODAL_TYPE.CENTERED_SMALL}
onClose={() => setIsModalVisible(false)}
animationOut={isSmallScreenWidth ? animationOut : undefined}
innerContainerStyle={isSmallScreenWidth ? undefined : styles.workspaceSection}
>
<HeaderWithBackButton
title={translate('subscription.compareModal.comparePlans')}
shouldShowCloseButton
onCloseButtonPress={() => setIsModalVisible(false)}
shouldShowBackButton={false}
style={isSmallScreenWidth ? styles.pl4 : [styles.pr3, styles.pl8]}
/>
{isSmallScreenWidth ? <ScrollView addBottomSafeAreaPadding>{renderPlans()}</ScrollView> : renderPlans()}
</Modal>
<SafeAreaConsumer>
{({safeAreaPaddingBottomStyle}) => (
<Modal
isVisible={isModalVisible}
type={isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.CENTERED : CONST.MODAL.MODAL_TYPE.CENTERED_SMALL}
onClose={() => setIsModalVisible(false)}
animationOut={isSmallScreenWidth ? animationOut : undefined}
innerContainerStyle={isSmallScreenWidth ? {...safeAreaPaddingBottomStyle, maxHeight} : {...styles.workspaceSection, ...safeAreaPaddingBottomStyle, maxHeight}}
>
<HeaderWithBackButton
title={translate('subscription.compareModal.comparePlans')}
shouldShowCloseButton
onCloseButtonPress={() => setIsModalVisible(false)}
shouldShowBackButton={false}
style={isSmallScreenWidth ? styles.pl4 : [styles.pr3, styles.pl8]}
/>
<ScrollView>{renderPlans()}</ScrollView>
</Modal>
)}
</SafeAreaConsumer>
);
}

Expand Down
Loading