Skip to content

Commit

Permalink
Merge pull request #28904 from Pujan92/fix/28025
Browse files Browse the repository at this point in the history
  • Loading branch information
roryabraham authored Oct 13, 2023
2 parents ca5127f + f0f0f60 commit 4bcc943
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
12 changes: 6 additions & 6 deletions src/pages/signin/SignInPageLayout/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import variables from '../../../styles/variables';
import * as Expensicons from '../../../components/Icon/Expensicons';
import TextLink from '../../../components/TextLink';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
import compose from '../../../libs/compose';
import Licenses from '../Licenses';
import Socials from '../Socials';
import Hoverable from '../../../components/Hoverable';
Expand All @@ -20,12 +18,14 @@ import * as Session from '../../../libs/actions/Session';
import SignInGradient from '../../../../assets/images/home-fade-gradient--mobile.svg';

const propTypes = {
...windowDimensionsPropTypes,
...withLocalizePropTypes,
scrollPageToTop: PropTypes.func.isRequired,
shouldShowSmallScreen: PropTypes.bool,
};

const defaultProps = {};
const defaultProps = {
shouldShowSmallScreen: false,
};

const navigateHome = (scrollPageToTop) => {
scrollPageToTop();
Expand Down Expand Up @@ -150,7 +150,7 @@ const columns = ({scrollPageToTop}) => [
];

function Footer(props) {
const isVertical = props.isSmallScreenWidth;
const isVertical = props.shouldShowSmallScreen;
const imageDirection = isVertical ? styles.flexRow : styles.flexColumn;
const imageStyle = isVertical ? styles.pr0 : styles.alignSelfCenter;
const columnDirection = isVertical ? styles.flexColumn : styles.flexRow;
Expand Down Expand Up @@ -225,4 +225,4 @@ Footer.propTypes = propTypes;
Footer.displayName = 'Footer';
Footer.defaultProps = defaultProps;

export default compose(withLocalize, withWindowDimensions)(Footer);
export default withLocalize(Footer);
5 changes: 4 additions & 1 deletion src/pages/signin/SignInPageLayout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,10 @@ function SignInPageLayout(props) {
</SignInPageContent>
</View>
<View style={[styles.flex0]}>
<Footer scrollPageToTop={scrollPageToTop} />
<Footer
scrollPageToTop={scrollPageToTop}
shouldShowSmallScreen
/>
</View>
</ScrollView>
)}
Expand Down

0 comments on commit 4bcc943

Please sign in to comment.