Skip to content

#76 feat: add button to resend activation email for unverified accounts #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hossein-ab99 merged 1 commit into from
Dec 24, 2024
Merged

#76 feat: add button to resend activation email for unverified accounts #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions src/main/Mobile/Pages/Login/components/LoginForm/LoginForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {useDispatch} from "react-redux";
import React, {useEffect, useState} from "react";
import {useDispatch, useSelector} from "react-redux";
import classes from "../../Login.module.css";
import TextInput from "../../../../../../components/TextInput/TextInput";
import LoginFormLoading from "../LoginLoading/LoginFormLoading";
Expand All @@ -15,6 +15,7 @@ import ForgetPassword from "../ForgetPassword/ForgetPassword";
import {useGetKycStatus} from "../../../../../../queries";
import Icon from "../../../../../../components/Icon/Icon";
import {login, parseToken} from "js-api-client";
import EmailVerification from "../EmailVerification/EmailVerification";


const LoginForm = () => {
Expand All @@ -24,6 +25,8 @@ const LoginForm = () => {
const location = useLocation();
const dispatch = useDispatch();

const verifyEmailLock = useSelector((state) => state.exchange.verifyEmailLock)

const isDevelopment = window.env.REACT_APP_ENV === "development";
const [isInputVisible, setIsInputVisible] = useState(false);
const [isLoading, setLoading] = useState(false);
Expand All @@ -33,12 +36,20 @@ const LoginForm = () => {
const [credential, setCredential] = useState({username: "", password: "", otp: ""});
const {refetch: getKycStatus} = useGetKycStatus();

const [verifyEmail, setVerifyEmail] = useState(false);
const [showVerifyEmail, setShowVerifyEmail] = useState(false);
const [disable, setDisable] = useState(false);

const from = location.state?.from?.pathname || "/";

const agent = [deviceType, browserName, fullBrowserVersion]
const clientSecret = window.env.REACT_APP_CLIENT_SECRET
const clientId = window.env.REACT_APP_CLIENT_ID

useEffect(() => {
if (verifyEmailLock && new Date().getTime() < verifyEmailLock) setDisable(true)
}, [verifyEmailLock]);

useEffect(() => {
setNeedOTP(undefined)
}, [credential.username])
Expand Down Expand Up @@ -88,6 +99,7 @@ const LoginForm = () => {
return setNeedOTP(true)
}
if (err?.response?.status === 400 && err?.response?.data?.error_description === "Account is not fully set up") {
setShowVerifyEmail(true)
return setLoginError(t("login.accountNotActive"));
}
setLoginError(t("login.loginError"));
Expand All @@ -100,6 +112,9 @@ const LoginForm = () => {

if (isLoading) return <LoginFormLoading/>

if (verifyEmail) return <EmailVerification returnFunc={() => setVerifyEmail(false)} email={credential.username} disable={disable} returnFuncDisableFalse={() => setDisable(false)} returnFuncDisableTrue={() => setDisable(true)}/>


const setOTPInputHandler = (val) => {
setCredential({...credential, otp: val})
}
Expand Down Expand Up @@ -146,8 +161,20 @@ const LoginForm = () => {
<span className="cursor-pointer flex ai-center fs-0-7"
onClick={returnToLogin}>{t('login.back')}</span>
:
<span className="cursor-pointer flex ai-center fs-0-7"
onClick={()=>setForgetPassword(true)}>{t('login.forgetPassword')}</span>

<>
{
showVerifyEmail ?
<span className="cursor-pointer flex ai-center fs-0-7"
onClick={()=>setVerifyEmail(true)}>{t('login.verificationEmail')}</span>
:
<span className="cursor-pointer flex ai-center fs-0-7"
onClick={()=>setForgetPassword(true)}>{t('login.forgetPassword')}</span>

}
</>
/*<span className="cursor-pointer flex ai-center fs-0-7"
onClick={()=>setForgetPassword(true)}>{t('login.forgetPassword')}</span>*/
}
</div>
</div>
Expand Down