Merge pull request #576 from lbryio/first-run-restart
do not proceed past Setup account without an email address
This commit is contained in:
commit
6a1287d1b0
2 changed files with 14 additions and 17 deletions
|
@ -38,11 +38,11 @@ class EmailCollectPage extends React.PureComponent {
|
|||
// save the value to the state email
|
||||
const { onEmailChanged } = this.props;
|
||||
this.setState({ email: text });
|
||||
AsyncStorage.setItem(Constants.KEY_FIRST_RUN_EMAIL, text);
|
||||
AsyncStorage.setItem(Constants.KEY_EMAIL_VERIFY_PENDING, 'true');
|
||||
if (onEmailChanged) {
|
||||
onEmailChanged(text);
|
||||
}
|
||||
AsyncStorage.setItem(Constants.KEY_FIRST_RUN_EMAIL, text);
|
||||
AsyncStorage.setItem(Constants.KEY_EMAIL_VERIFY_PENDING, 'true');
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
|
@ -178,8 +178,7 @@ class FirstRunScreen extends React.PureComponent {
|
|||
|
||||
handleEmailCollectPageContinue() {
|
||||
const { notify, addUserEmail } = this.props;
|
||||
|
||||
AsyncStorage.getItem(Constants.KEY_FIRST_RUN_EMAIL).then(email => {
|
||||
const { email } = this.state;
|
||||
// validate the email
|
||||
if (!email || email.indexOf('@') === -1) {
|
||||
return notify({
|
||||
|
@ -189,7 +188,6 @@ class FirstRunScreen extends React.PureComponent {
|
|||
|
||||
addUserEmail(email);
|
||||
this.setState({ emailSubmitted: true });
|
||||
});
|
||||
}
|
||||
|
||||
checkBottomContainer = (pageName) => {
|
||||
|
@ -234,10 +232,9 @@ class FirstRunScreen extends React.PureComponent {
|
|||
}
|
||||
|
||||
onEmailViewLayout = () => {
|
||||
this.setState({ showBottomContainer: true });
|
||||
AsyncStorage.getItem('firstRunEmail').then(email => {
|
||||
this.setState({ showSkip: !email || email.trim().length === 0 });
|
||||
});
|
||||
this.setState({ showBottomContainer: true, showSkip: true });
|
||||
AsyncStorage.removeItem(Constants.KEY_FIRST_RUN_EMAIL);
|
||||
AsyncStorage.removeItem(Constants.KEY_EMAIL_VERIFY_PENDING);
|
||||
}
|
||||
|
||||
onWalletPasswordChanged = (password) => {
|
||||
|
|
Loading…
Reference in a new issue