Open E.cash to non-developers

src/libs/API.js

@@ -31,7 +31,6 @@ function isAuthTokenRequired(command) {
         'Graphite_Timer',
         'Authenticate',
         'GetAccountStatus',
-        'SetGithubUsername',
         'SetPassword',
         'User_SignUp',
         'ResendValidateCode',
@@ -540,17 +539,6 @@ function ResendValidateCode(parameters) {
     return Network.post(commandName, parameters);
 }
 
-/**
- * @param {Object} parameters
- * @param {String} parameters.githubUsername
- * @returns {Promise}
- */
-function SetGithubUsername(parameters) {
-    const commandName = 'SetGithubUsername';
-    requireParameters(['email', 'githubUsername'], parameters, commandName);
-    return Network.post(commandName, parameters);
-}
-
 /**
  * @param {Object} parameters
  * @param {String} parameters.password
@@ -636,7 +624,6 @@ export {
     Report_TogglePinned,
     Report_UpdateLastRead,
     ResendValidateCode,
-    SetGithubUsername,
     SetNameValuePair,
     SetPassword,
     UpdateAccount,

src/libs/actions/Session.js

@@ -88,7 +88,6 @@ function fetchAccountDetails(login) {
                 });
                 Onyx.merge(ONYXKEYS.ACCOUNT, {
                     accountExists: response.accountExists,
-                    canAccessExpensifyCash: response.canAccessExpensifyCash,
                     requiresTwoFactorAuth: response.requiresTwoFactorAuth,
                 });
 
@@ -185,30 +184,6 @@ function signIn(password, twoFactorAuthCode) {
         });
 }
 
-/**
- * Puts the github username into Onyx so that it can be used when creating accounts or logins
- *
- * @param {String} username
- */
-function setGitHubUsername(username) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {error: '', loading: true});
-
-    API.SetGithubUsername({email: credentials.login, githubUsername: username})
-        .then((response) => {
-            if (response.jsonCode === 200) {
-                Onyx.merge(ONYXKEYS.CREDENTIALS, {githubUsername: username});
-                Onyx.merge(ONYXKEYS.ACCOUNT, {canAccessExpensifyCash: true});
-                return;
-            }
-
-            // This request can fail if an invalid GitHub username was entered
-            Onyx.merge(ONYXKEYS.ACCOUNT, {error: 'Please enter a valid GitHub username'});
-        })
-        .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
-        });
-}
-
 /**
  * Resend the validation link to the user that is validating their account
  * this happens in the createAccount() flow
@@ -261,7 +236,6 @@ function setPassword(password, validateCode) {
 
 export {
     fetchAccountDetails,
-    setGitHubUsername,
     setPassword,
     signIn,
     signOut,

src/pages/signin/LoginForm/LoginFormNarrow.js

@@ -8,10 +8,8 @@ import _ from 'underscore';
 import styles from '../../../styles/styles';
 import themeColors from '../../../styles/themes/default';
 import ButtonWithLoader from '../../../components/ButtonWithLoader';
-import openURLInNewTab from '../../../libs/openURLInNewTab';
 import {fetchAccountDetails} from '../../../libs/actions/Session';
 import welcomeScreenshot from '../../../../assets/images/welcome-screenshot.png';
-import CONST from '../../../CONST';
 import ONYXKEYS from '../../../ONYXKEYS';
 
 const propTypes = {
@@ -64,7 +62,7 @@ class LoginFormNarrow extends React.Component {
         return (
             <View style={[styles.loginFormContainer]}>
                 <View style={[styles.mb4]}>
-                    <Text style={[styles.formLabel]}>Sign up for the waitlist</Text>
+                    <Text style={[styles.formLabel]}>Enter your phone or email:</Text>
                     <TextInput
                         style={[styles.textInput]}
                         value={this.state.login}
@@ -73,7 +71,7 @@ class LoginFormNarrow extends React.Component {
                         onChangeText={text => this.setState({login: text})}
                         onSubmitEditing={this.validateAndSubmitForm}
                         autoCapitalize="none"
-                        placeholder="Email or phone"
+                        placeholder="Phone or Email"
                         placeholderTextColor={themeColors.textSupporting}
                     />
                 </View>
@@ -105,31 +103,13 @@ class LoginFormNarrow extends React.Component {
                     />
                 </View>
 
-                <View style={[styles.mb6]}>
-                    <Text style={[styles.textLabel]}>
-                        With Expensify.cash, chat and payments are the same thing. Launching Summer 2021,
-                        {' '}
-                        join the waitlist to be first in line!
-                    </Text>
-                </View>
-
                 <View>
                     <Text style={[styles.textLabel, styles.textStrong, styles.mb1]}>
-                        Attention Open Source Developers:
+                        With Expensify.cash, chat and payments are the same thing.
                     </Text>
                     <Text style={[styles.textLabel]}>
-                        Enter your GitHub handle on the next page to skip the wait and join our dev-only beta;
-                        {' '}
-                        help build tomorrow and
-                        {' '}
-                        <Text
-                            style={[styles.link, styles.mx1]}
-                            onPress={() => openURLInNewTab(CONST.UPWORK_URL)}
-                        >
-                            earn cash
-                        </Text>
-                        {' '}
-                        today!
+                        {'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.
                     </Text>
                 </View>
             </View>

src/pages/signin/LoginForm/LoginFormWide.js

@@ -6,8 +6,6 @@ import _ from 'underscore';
 import {fetchAccountDetails} from '../../../libs/actions/Session';
 import styles from '../../../styles/styles';
 import ButtonWithLoader from '../../../components/ButtonWithLoader';
-import openURLInNewTab from '../../../libs/openURLInNewTab';
-import CONST from '../../../CONST';
 import ONYXKEYS from '../../../ONYXKEYS';
 
 const propTypes = {
@@ -61,7 +59,7 @@ class LoginFormWide extends React.Component {
             <>
                 <View style={[styles.loginFormContainer]}>
                     <View style={[styles.mb4]}>
-                        <Text style={[styles.formLabel]}>Sign up for the waitlist</Text>
+                        <Text style={[styles.formLabel]}>Enter your phone or email:</Text>
                         <TextInput
                             style={[styles.textInput]}
                             value={this.state.login}
@@ -70,7 +68,7 @@ class LoginFormWide extends React.Component {
                             onChangeText={text => this.setState({login: text})}
                             onSubmitEditing={this.validateAndSubmitForm}
                             autoCapitalize="none"
-                            placeholder="Email or phone"
+                            placeholder="Phone or Email"
                             autoFocus
                         />
                     </View>
@@ -96,31 +94,13 @@ class LoginFormWide extends React.Component {
                 </View>
 
                 <View style={[styles.mt6]}>
-                    <View style={[styles.mb6]}>
-                        <Text style={[styles.textP]}>
-                            With Expensify.cash, chat and payments are the same thing. Launching Summer 2021,
-                            {' '}
-                            join the waitlist to be first in line!
-                        </Text>
-                    </View>
-
                     <View style={[styles.mb6]}>
                         <Text style={[styles.textP, styles.textStrong, styles.mb1]}>
-                            Attention Open Source Developers:
+                            With Expensify.cash, chat and payments are the same thing.
                         </Text>
                         <Text style={[styles.textP]}>
-                            Enter your Github handle on the next page to skip the wait and join our dev-only beta;
-                            {' '}
-                            help build tomorrow and
-                            {' '}
-                            <Text
-                                style={[styles.link, styles.mx1]}
-                                onPress={() => openURLInNewTab(CONST.UPWORK_URL)}
-                            >
-                                earn cash
-                            </Text>
-                            {' '}
-                            today!
+                            {'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.
                         </Text>
                     </View>
                 </View>

src/pages/signin/PasswordForm.js

@@ -19,9 +19,6 @@ const propTypes = {
         // Whether or not the account already exists
         accountExists: PropTypes.bool,
 
-        // Whether or not there have been chat reports shared with this user
-        canAccessExpensifyCash: PropTypes.bool,
-
         // Whether or not two factor authentication is required
         requiresTwoFactorAuth: PropTypes.bool,
 

src/pages/signin/SignInPage.js

@@ -13,7 +13,6 @@ import styles from '../../styles/styles';
 import updateUnread from '../../libs/UnreadIndicatorUpdater/updateUnread/index';
 import SignInPageLayout from './SignInPageLayout';
 import LoginForm from './LoginForm';
-import GithubUsernameForm from './GithubUsernameForm';
 import PasswordForm from './PasswordForm';
 import ResendValidationForm from './ResendValidationForm';
 
@@ -25,17 +24,13 @@ const propTypes = {
         // Whether or not the account already exists
         accountExists: PropTypes.bool,
 
-        // Whether or not there have been chat reports shared with this user
-        canAccessExpensifyCash: PropTypes.bool,
-
         // Error to display when there is an account error returned
         error: PropTypes.string,
     }),
 
     // The credentials of the person signing in
     credentials: PropTypes.shape({
         login: PropTypes.string,
-        githubUsername: PropTypes.string,
         password: PropTypes.string,
         twoFactorAuthCode: PropTypes.string,
     }),
@@ -70,26 +65,12 @@ class SignInPage extends Component {
         // - A login has not been entered yet
         const showLoginForm = !this.props.credentials.login;
 
-        // Show the GitHub username form if
-        // - A login has been entered
-        // - AND they do not have access to this app yet
-        // - AND the user hasn't entered a GitHub username yet
-        // - AND a password hasn't been entered yet
-        const showGithubUsernameForm = this.props.credentials.login
-            && !this.props.account.canAccessExpensifyCash
-            && !this.props.credentials.githubUsername
-            && !this.props.credentials.password;
-
         // Show the password form if
         // - A login has been entered
         // - AND a GitHub username has been entered OR they already have access to expensify cash
         // - AND an account exists already for this login
         // - AND a password hasn't been entered yet
         const showPasswordForm = this.props.credentials.login
-            && (
-                this.props.credentials.githubUsername
-                || this.props.account.canAccessExpensifyCash
-            )
             && this.props.account.accountExists
             && !this.props.credentials.password;
 
@@ -98,10 +79,6 @@ class SignInPage extends Component {
         // - AND a GitHub username has been entered OR they already have access to this app
         // - AND an account did not exist for that login
         const showResendValidationLinkForm = this.props.credentials.login
-            && (
-                this.props.credentials.githubUsername
-                || this.props.account.canAccessExpensifyCash
-            )
             && !this.props.account.accountExists;
 
         return (
@@ -110,8 +87,6 @@ class SignInPage extends Component {
                     <SignInPageLayout>
                         {showLoginForm && <LoginForm />}
 
-                        {showGithubUsernameForm && <GithubUsernameForm />}
-
                         {showPasswordForm && <PasswordForm />}
 
                         {showResendValidationLinkForm && <ResendValidationForm />}