Allow user to proceed to next step if they were previously on the Email Step
This commit is contained in:
parent
9b42976926
commit
32d7d5f06c
|
@ -1,11 +1,13 @@
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { defineMessages, useIntl } from 'react-intl';
|
import { defineMessages, useIntl } from 'react-intl';
|
||||||
import { useParams } from 'react-router-dom';
|
import { useHistory, useParams } from 'react-router-dom';
|
||||||
|
|
||||||
import snackbar from 'soapbox/actions/snackbar';
|
import snackbar from 'soapbox/actions/snackbar';
|
||||||
import { confirmEmailVerification } from 'soapbox/actions/verification';
|
import { confirmEmailVerification } from 'soapbox/actions/verification';
|
||||||
import { Icon, Spinner, Stack, Text } from 'soapbox/components/ui';
|
import { Icon, Spinner, Stack, Text } from 'soapbox/components/ui';
|
||||||
import { useAppDispatch } from 'soapbox/hooks';
|
import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
|
||||||
|
|
||||||
|
import { ChallengeTypes } from './index';
|
||||||
|
|
||||||
import type { AxiosError } from 'axios';
|
import type { AxiosError } from 'axios';
|
||||||
|
|
||||||
|
@ -30,6 +32,14 @@ const messages = defineMessages({
|
||||||
|
|
||||||
const Success = () => {
|
const Success = () => {
|
||||||
const intl = useIntl();
|
const intl = useIntl();
|
||||||
|
const history = useHistory();
|
||||||
|
const currentChallenge = useAppSelector((state) => state.verification.currentChallenge as ChallengeTypes);
|
||||||
|
|
||||||
|
// Bypass the user straight to the next step.
|
||||||
|
if (currentChallenge === ChallengeTypes.SMS) {
|
||||||
|
history.push('/verify');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack space={4} alignItems='center'>
|
<Stack space={4} alignItems='center'>
|
||||||
|
|
|
@ -1,16 +1,15 @@
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { useDispatch } from 'react-redux';
|
|
||||||
import { Redirect } from 'react-router-dom';
|
import { Redirect } from 'react-router-dom';
|
||||||
|
|
||||||
import { fetchVerificationConfig } from 'soapbox/actions/verification';
|
import { fetchVerificationConfig } from 'soapbox/actions/verification';
|
||||||
import { useAppSelector } from 'soapbox/hooks';
|
import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
|
||||||
|
|
||||||
import Registration from './registration';
|
import Registration from './registration';
|
||||||
import AgeVerification from './steps/age-verification';
|
import AgeVerification from './steps/age-verification';
|
||||||
import EmailVerification from './steps/email-verification';
|
import EmailVerification from './steps/email-verification';
|
||||||
import SmsVerification from './steps/sms-verification';
|
import SmsVerification from './steps/sms-verification';
|
||||||
|
|
||||||
enum ChallengeTypes {
|
export enum ChallengeTypes {
|
||||||
EMAIL = 'email',
|
EMAIL = 'email',
|
||||||
SMS = 'sms',
|
SMS = 'sms',
|
||||||
AGE = 'age',
|
AGE = 'age',
|
||||||
|
@ -23,7 +22,7 @@ const verificationSteps = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const Verification = () => {
|
const Verification = () => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useAppDispatch();
|
||||||
|
|
||||||
const isInstanceReady = useAppSelector((state) => state.verification.instance.get('isReady') === true);
|
const isInstanceReady = useAppSelector((state) => state.verification.instance.get('isReady') === true);
|
||||||
const isRegistrationOpen = useAppSelector(state => state.verification.instance.get('registrations') === true);
|
const isRegistrationOpen = useAppSelector(state => state.verification.instance.get('registrations') === true);
|
||||||
|
|
Loading…
Reference in New Issue