feat: New landing page design #3079
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,7 +95,7 @@ export default { | |
| hello: 'Hello', | ||
| phoneCountryCode: '1', | ||
| welcomeText: { | ||
| phrase1: 'Welcome to new Expensify! Enter your phone or email to continue.', | ||
| phrase2: 'Money talks. And now that chat and payments are in one place, it\'s also easy.', | ||
| phrase3: 'Your payments get to you as fast as you can get your point across.', | ||
| }, | ||
|
|
@@ -259,17 +259,26 @@ export default { | |
| }, | ||
| signInPage: { | ||
| expensifyDotCash: 'Expensify.cash', | ||
| expensifyIsOpenSource: 'New Expensify is open source', | ||
|
There was a problem hiding this comment. @kevinksullivan is this how we want it to read? As stated elsewhere, this just seems clunky/grammatically incorrect to me. There was a problem hiding this comment. Perhaps |
||
| theCode: 'the code', | ||
| openJobs: 'open jobs', | ||
| heroHeading: 'Split bills\nand chat with friends.', | ||
| heroDescription: { | ||
| phrase1: 'Money talks. And now that chat and payments are in one place, it\'s also easy. Your payments get to you as fast as you can get your point across.', | ||
| phrase2: 'New Expensify is open source. View', | ||
| phrase3: 'the code', | ||
| phrase4: 'View', | ||
| phrase5: 'open jobs', | ||
| }, | ||
| }, | ||
| termsOfUse: { | ||
| phrase1: 'By logging in, you agree to the', | ||
| phrase2: 'terms of service', | ||
| phrase3: 'and', | ||
| phrase4: 'privacy policy', | ||
| phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS', | ||
| phrase6: 'ID:2017010) pursuant to its', | ||
joelbettner marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| phrase7: 'licenses', | ||
| }, | ||
| passwordForm: { | ||
| pleaseFillOutAllFields: 'Please fill out all fields', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,66 @@ | ||
| import React from 'react'; | ||
| import {ScrollView, View} from 'react-native'; | ||
| import PropTypes from 'prop-types'; | ||
| import styles from '../../../styles/styles'; | ||
| import variables from '../../../styles/variables'; | ||
| import ExpensifyCashLogo from '../../../components/ExpensifyCashLogo'; | ||
| import Text from '../../../components/Text'; | ||
| import TermsAndLicenses from '../TermsAndLicenses'; | ||
| import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; | ||
| import compose from '../../../libs/compose'; | ||
| import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions'; | ||
|
|
||
| const propTypes = { | ||
| /** The children to show inside the layout */ | ||
| children: PropTypes.node.isRequired, | ||
|
|
||
| ...windowDimensionsPropTypes, | ||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const SignInPageLayoutNarrow = props => ( | ||
| <ScrollView | ||
| keyboardShouldPersistTaps="handled" | ||
| contentContainerStyle={[ | ||
| styles.flexGrow1, | ||
| styles.pb5, | ||
| styles.mh5, | ||
| styles.signInPageNarrowContentContainer, | ||
| styles.alignSelfCenter, | ||
| ]} | ||
| > | ||
| <View style={[styles.flexGrow1]}> | ||
| <View | ||
| style={[ | ||
| styles.signInPageInnerNative, | ||
| styles.flex1, | ||
| styles.dFlex, | ||
| styles.flexColumn, | ||
| props.windowHeight > props.windowWidth ? styles.mt40Percentage : null, | ||
| ]} | ||
| > | ||
| <View style={[styles.signInPageLogoNative, styles.mb2]}> | ||
| <ExpensifyCashLogo | ||
| width={variables.componentSizeLarge} | ||
| height={variables.componentSizeLarge} | ||
| /> | ||
| </View> | ||
| <Text style={[styles.mv5, styles.textLabel, styles.h3]}> | ||
| {props.translate('welcomeText.phrase1')} | ||
| </Text> | ||
| {props.children} | ||
| </View> | ||
| <View style={[styles.mt3]}> | ||
| <TermsAndLicenses /> | ||
| </View> | ||
| </View> | ||
| </ScrollView> | ||
| ); | ||
|
|
||
| SignInPageLayoutNarrow.propTypes = propTypes; | ||
| SignInPageLayoutNarrow.displayName = 'SignInPageLayoutNarrow'; | ||
|
|
||
| export default compose( | ||
| withWindowDimensions, | ||
| withLocalize, | ||
| )(SignInPageLayoutNarrow); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This language is confusing. Perhaps
'Welcome to the new Expensify! Enter your phone number or email to continue.'@kevinksullivan does it not seem weird to you to have it say
"Welcome to new Expensify!"?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree. I think
the New Expensifyis best as the latest mockup shows.