-
{t('home.welcome', { name: firstName })}
-{t('home.subtitle')}
+{t('home.welcome', { name: firstName })}
+{t('home.subtitle')}
diff --git a/apps/business/src/pages/LoginPage.tsx b/apps/business/src/pages/LoginPage.tsx
index a57aea0..cefe433 100644
--- a/apps/business/src/pages/LoginPage.tsx
+++ b/apps/business/src/pages/LoginPage.tsx
@@ -11,8 +11,8 @@ import { setActiveBusiness } from '../lib/businessContext'
import {
logout as logoutRequest,
register,
+ resetPassword,
sendOtp,
- verifyOtp,
} from '../services/authService'
import { useT } from '../i18n/useT'
import styles from './LoginPage.module.css'
@@ -22,7 +22,7 @@ type SmsStep = 'phone' | 'code'
export function LoginPage() {
const navigate = useNavigate()
- const { login } = useAuth()
+ const { login, loginWithOtp } = useAuth()
const { businessName, logoUrl } = useTenantBranding()
const businessDomain = getBusinessDomain()
const t = useT()
@@ -184,9 +184,9 @@ export function LoginPage() {
try {
const cellNumber = toE164CellNumber(phone)
- await verifyOtp(cellNumber, smsCode)
- setInfo(t('forgot.info.partial'))
- setTimeout(() => switchView('login'), 2500)
+ await resetPassword(cellNumber, smsCode, newPassword)
+ setInfo(t('forgot.info.success'))
+ setTimeout(() => switchView('login'), 2000)
} catch (err) {
handleApiError(err, t('forgot.error.verify'))
} finally {
@@ -201,14 +201,7 @@ export function LoginPage() {
try {
const cellNumber = toE164CellNumber(phone)
- await verifyOtp(cellNumber, smsCode)
-
- if (!password) {
- setError(t('otp.error.password'))
- return
- }
-
- await login(cellNumber, password)
+ await loginWithOtp(cellNumber, smsCode)
navigate('/')
} catch (err) {
handleApiError(err, t('otp.error.signIn'))
@@ -600,6 +593,7 @@ export function LoginPage() {
{error}
)}
+ {info && {info}
}
{smsStep === 'phone' ? (
<>
@@ -653,23 +647,6 @@ export function LoginPage() {