Skip to content
This repository was archived by the owner on Aug 29, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/screens/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useCallback, useState } from "react";
import LuckitLogo from "../components/Logo";
import cls from "./Login.module.scss";
import clsx from "clsx";
import { validateE164, validateEmail } from "../utils/string";
import { validateEmail } from "../utils/string";
import Spinner from "../components/Spinner";
import { API, GenericError, ResponseError } from "../services/api";
import { useMainContext } from "../MainContext";
Expand All @@ -19,6 +19,7 @@ export default function LoginScreen() {
const [otpLogin, setOtpLogin] = useState(false);
const [pNInput, setPNInput] = useState("");
const [phoneNumber, setPhoneNumber] = useState("");
const [phoneNumberValid, setPhoneNumberValid] = useState(false);
const [otpCode, setOtpCode] = useState("");
const [sentOtp, setSentOtp] = useState(false);

Expand Down Expand Up @@ -171,6 +172,7 @@ export default function LoginScreen() {
value={pNInput}
onValueChange={(v) => setPNInput(v)}
onE164ValueChange={(v) => setPhoneNumber(v)}
onSuccessChange={(v) => setPhoneNumberValid(v)}
className={clsx("input", cls.Input)}
/>
{sentOtp &&
Expand Down Expand Up @@ -206,19 +208,19 @@ export default function LoginScreen() {
</>
}
{(otpLogin && !sentOtp) ? <button
disabled={loading || !phoneNumber || !validateE164(phoneNumber)}
disabled={loading || !phoneNumber || !phoneNumberValid}
className={clsx(cls.Button, "btn")}
onClick={() => handleSendOtp()}
>
{loading ?
<div className={cls.Loading}>
<Spinner data-size="3" />
</div>
: !validateE164(phoneNumber) ? "invalid phone number" : "send otp"}
: !phoneNumberValid ? "invalid phone number" : "send otp"}
</button> :
<button
disabled={
otpLogin ? !otpCode || otpCode.length < 6 || otpCode.length > 6 || !phoneNumber || !validateE164(phoneNumber) || loading :
otpLogin ? !otpCode || otpCode.length < 6 || otpCode.length > 6 || !phoneNumber || !phoneNumberValid || loading :
!email || !password || !validateEmail(email) || loading
}
className={clsx(cls.Button, "btn")}
Expand Down
5 changes: 0 additions & 5 deletions src/utils/string.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ export function parseJwt(token: string) {
return JSON.parse(jsonPayload);
}

export function validateE164(phoneNumber: string) {
const reg = /^\+[1-9]\d{1,14}$/;
return reg.test(phoneNumber);
}

export const timeSinceOf = function (date: number) {

const text = [
Expand Down
Loading