Skip to content
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

fix page size changing after use wrong 2fa and clicking on Save button #10265

Merged
merged 2 commits into from
Aug 9, 2022
Merged

fix page size changing after use wrong 2fa and clicking on Save button #10265

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3e8e2e
fix page size changing after use wrong 2fa and clicking on Save button
aimane-chnaif Aug 5, 2022
61948af
Merge branch 'main' of https://github.com/aimane-chnaif/Expensify int…
aimane-chnaif Aug 7, 2022
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
82 changes: 45 additions & 37 deletions src/pages/signin/SignInPageLayout/SignInPageContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,54 +37,62 @@ const SignInPageContent = props => (
showsVerticalScrollIndicator={false}
style={[
styles.h100,
styles.alignSelfCenter,
!props.isSmallScreenWidth && styles.alignSelfCenter,
!props.isSmallScreenWidth && styles.signInPageWideLeftContainer,
]}
contentContainerStyle={[
scrollViewContentContainerStyles,
styles.alignItemsCenter,
!props.isSmallScreenWidth && styles.ph6,
]}
>
<SignInPageForm style={[
styles.flex1,
styles.alignSelfStretch,
props.isSmallScreenWidth && styles.signInPageNarrowContentContainer,
props.isSmallScreenWidth ? styles.ph5 : styles.ph4,
]}
>
<LoginKeyboardAvoidingView
behavior="position"
contentContainerStyle={[
props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {},
!props.isMediumScreenWidth ? styles.signInPageWideLeftContentMargin : {},
styles.mb3,
StyleUtils.getModalPaddingStyles({
shouldAddBottomSafeAreaPadding: true,
modalContainerStylePaddingBottom: 20,
safeAreaPaddingBottom: props.insets.bottom,
}),
]}
<View style={[styles.flex1, styles.flexRow]}>
<View style={[
styles.flex1,
props.isSmallScreenWidth && styles.signInPageNarrowContentContainer,
]}
>
<View style={[
styles.componentHeightLarge,
...(props.isSmallScreenWidth ? [styles.mb2] : [styles.mt6, styles.mb5]),
<SignInPageForm style={[
styles.flex1,
styles.alignSelfStretch,
props.isSmallScreenWidth ? styles.ph5 : styles.ph4,
]}
>
<ExpensifyCashLogo
width={variables.componentSizeLarge}
height={variables.componentSizeLarge}
/>
<LoginKeyboardAvoidingView
behavior="position"
contentContainerStyle={[
props.isSmallScreenWidth ? styles.signInPageNarrowContentMargin : {},
!props.isMediumScreenWidth ? styles.signInPageWideLeftContentMargin : {},
styles.mb3,
StyleUtils.getModalPaddingStyles({
shouldAddBottomSafeAreaPadding: true,
modalContainerStylePaddingBottom: 20,
safeAreaPaddingBottom: props.insets.bottom,
}),
]}
>
<View style={[
styles.componentHeightLarge,
...(props.isSmallScreenWidth ? [styles.mb2] : [styles.mt6, styles.mb5]),
]}
>
<ExpensifyCashLogo
width={variables.componentSizeLarge}
height={variables.componentSizeLarge}
/>
</View>
{props.shouldShowWelcomeText && (
<Text style={[styles.mv5, styles.textLabel, styles.h3]}>
{props.welcomeText}
</Text>
)}
{props.children}
</LoginKeyboardAvoidingView>
</SignInPageForm>
<View style={[styles.mb5, styles.alignSelfCenter, styles.ph5]}>
<TermsAndLicenses />
</View>
{props.shouldShowWelcomeText && (
<Text style={[styles.mv5, styles.textLabel, styles.h3]}>
{props.welcomeText}
</Text>
)}
{props.children}
</LoginKeyboardAvoidingView>
</SignInPageForm>
<View style={[styles.mb5, styles.alignSelfCenter, props.isSmallScreenWidth && styles.signInPageNarrowContentContainer, styles.ph5]}>
<TermsAndLicenses />
</View>
</View>
</ScrollView>
);
Expand Down