LBRYCommunity/lbry-fdroid
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #576 from lbryio/first-run-restart

Browse source 
do not proceed past Setup account without an email address
This commit is contained in:
Akinwale Ariwodola 2019-06-08 22:18:12 +01:00 committed by GitHub
commit 6a1287d1b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/page/firstRun/internal/email-collect-page.js
View file

@ -38,11 +38,11 @@ class EmailCollectPage extends React.PureComponent {
// save the value to the state email // save the value to the state email
const { onEmailChanged } = this.props; const { onEmailChanged } = this.props;
this.setState({ email: text }); this.setState({ email: text });
AsyncStorage.setItem(Constants.KEY_FIRST_RUN_EMAIL, text);
AsyncStorage.setItem(Constants.KEY_EMAIL_VERIFY_PENDING, 'true');
if (onEmailChanged) { if (onEmailChanged) {
onEmailChanged(text); onEmailChanged(text);
} }
AsyncStorage.setItem(Constants.KEY_FIRST_RUN_EMAIL, text);
AsyncStorage.setItem(Constants.KEY_EMAIL_VERIFY_PENDING, 'true');
} }
render() { render() {

27
app/src/page/firstRun/view.js
View file

@ -178,18 +178,16 @@ class FirstRunScreen extends React.PureComponent {
handleEmailCollectPageContinue() { handleEmailCollectPageContinue() {
const { notify, addUserEmail } = this.props; const { notify, addUserEmail } = this.props;
const { email } = this.state;
// validate the email
if (!email || email.indexOf('@') === -1) {
return notify({
message: 'Please provide a valid email address to continue.',
});
}
AsyncStorage.getItem(Constants.KEY_FIRST_RUN_EMAIL).then(email => { addUserEmail(email);
// validate the email this.setState({ emailSubmitted: true });
if (!email || email.indexOf('@') === -1) {
return notify({
message: 'Please provide a valid email address to continue.',
});
}
addUserEmail(email);
this.setState({ emailSubmitted: true });
});
} }
checkBottomContainer = (pageName) => { checkBottomContainer = (pageName) => {
@ -234,10 +232,9 @@ class FirstRunScreen extends React.PureComponent {
} }
onEmailViewLayout = () => { onEmailViewLayout = () => {
this.setState({ showBottomContainer: true }); this.setState({ showBottomContainer: true, showSkip: true });
AsyncStorage.getItem('firstRunEmail').then(email => { AsyncStorage.removeItem(Constants.KEY_FIRST_RUN_EMAIL);
this.setState({ showSkip: !email || email.trim().length === 0 }); AsyncStorage.removeItem(Constants.KEY_EMAIL_VERIFY_PENDING);
});
} }
onWalletPasswordChanged = (password) => { onWalletPasswordChanged = (password) => {