ui-soxo-bootstrap-core 2.6.1 → 2.6.2

package/core/lib/pages/change-password/change-password.js

@@ -39,7 +39,7 @@ function ChangePassword({ history }) {
 
 	const [loading, setLoading] = useState(false);
 
-	console.log(user);
+
 
 	const onFinish = (values) => {
 
@@ -55,34 +55,24 @@ function ChangePassword({ history }) {
 					confirm_password: values.conpassword
 				}
 
-				ApiUtils.post({
-					url: `users/change-password`,
-					formBody,
-					hideError: true
-				}).then((result) => {
-
-					var msg = Object.values(result)
-
-					if (msg[0] === 'INCORRECT PASSWORD') {
-						//If current Password is entered wrong
-						message.error('Incorrect Password')
-						setLoading(false);
-						return false
-					}
-					else {
+        ApiUtils.post({
+          url: `users/change-password`,
+          formBody,
+          hideError: true
+        })
+          .then((result) => {          
 
 						setLoading(false);
 
 						history.goBack();
 
-						// Update successful.
-						message.success('Your password has been updated!')
-					}
-
-				}).catch(function (error) {
-
-					// An error happened.
-					message.error(error.result || error.message)
+              // Update successful.
+              message.success(result.result || 'Your password has been updated!');
+          
+            }).catch(function (error) {
+			
+				// An error happened.
+            	message.warning(error.result || error.message);
 
 					setLoading(false);
 

package/core/lib/pages/login/login.js

@@ -127,7 +127,8 @@ function LoginPhone({ history, appSettings }) {
     const lastPasswordChange = otherDetails?.last_password_change;
 
     if (lastPasswordChange) {
-      const passwordExpiryDate = new Date(lastPasswordChange);
+      const onlyDate = new Date(lastPasswordChange).toISOString().split('T')[0];
+      const passwordExpiryDate = new Date(onlyDate);
       passwordExpiryDate.setDate(passwordExpiryDate.getDate() + PASSWORD_VALIDITY_DAYS);
 
       const passwordStatus = checkExpiryStatus({
@@ -335,10 +336,10 @@ function LoginPhone({ history, appSettings }) {
       if (result.success) {
         //  for expiry_time
         startFromExpiry(result?.expiry_time);
-        // if the api is sucess then go for otpverification step
-        setotpVerification(true);
         // set  button loading false
         setLoading(false);
+        // if the api is sucess then go for otpverification step
+        setotpVerification(true);
       } else {
         setLoading(false);
         message.error(result.message);
@@ -806,8 +807,8 @@ function LoginPhone({ history, appSettings }) {
                   title={expiredPassword ? 'Password Expired' : 'Forgot Password'}
                   subtitle={
                     expiredPassword
-                      ? 'Enter your username and choose your preferred OTP method to receive a reset link.'
-                      : 'Enter your username to reset your password and select your preferred OTP method.'
+                      ? 'Your password has expired. Select a preferred communication method to receive the One-Time Password (OTP) to continue.'
+                      : 'Enter your username and Select a preferred communication method to receive the One-Time Password (OTP) to continue..'
                   }
                   buttonText={expiredPassword ? 'Send Reset Link' : 'Reset Password'}
                 />

package/core/lib/pages/login/reset-password.js

@@ -17,7 +17,7 @@
  * @param {boolean} disabledUserName - Disable username field
  */
 
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Divider, Form, Input, message } from 'antd';
 import { Button } from '../../elements';
 import CommunicationModeSelection from './commnication-mode-selection';
@@ -36,6 +36,9 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
 
   const [form] = Form.useForm();
 
+  // Ref to username input auto focus
+  const inputRef = useRef(null);
+
   // Pre-fills username if provided and disabled.
   useEffect(() => {
     if (disabledUserName && defaultUsername) {
@@ -43,6 +46,10 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
     }
   }, [disabledUserName, defaultUsername]);
 
+  useEffect(() => {
+    inputRef.current?.focus();
+  }, []);
+
   /**
    * Sends forgot password request to backend.
    * Payload: { mode, username, user_type: 'staff' }
@@ -83,18 +90,12 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
   return (
     <motion.div
       className="forgot-password-container"
-      initial={{ opacity: 0, y: 70 }}
+      initial={{ opacity: 0, y: 30 }}
       animate={{ opacity: 1, y: 0 }}
-      exit={{ opacity: 0, y: -50 }}
+      exit={{ opacity: 0, y: -20 }}
       transition={{
-        y: {
-          duration: 1,
-          ease: [0.22, 0.08, 0.26, 1],
-        },
-        opacity: {
-          duration: 0.45,
-          ease: 'easeOut',
-        },
+        duration: 0.30,
+        ease: 'easeOut',
       }}
     >
       <h3 className="password-title">{title}</h3>
@@ -102,7 +103,7 @@ function ResetPassword({ onBack, title, subtitle, buttonText, defaultUsername, d
       <Divider />
       <Form layout="vertical" form={form} onFinish={handleSendForgetPassword}>
         <Form.Item label="Username" name="username" rules={[{ required: true, message: 'Please input your username' }]}>
-          <Input placeholder="Enter your username" disabled={disabledUserName} />
+          <Input placeholder="Enter your username" disabled={disabledUserName} ref={inputRef}/>
         </Form.Item>
 
         <CommunicationModeSelection communicationMode={communicationMode} setCommunicationMode={setCommunicationMode} modeError={modeError} />

package/core/lib/utils/http/http.utils.js

@@ -153,5 +153,6 @@ export async function ApiCall({ url, formBody, method, settings, ...props }) {
     return result;
   } catch (err) {
     console.error('Login error -->', err?.message);
+    throw err;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui-soxo-bootstrap-core",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "All the Core Components for you to start",
   "keywords": [
     "all in one"