diff --git a/apps/open-spark-solaris/locales/en.ts b/apps/open-spark-solaris/locales/en.ts index 4e08b8530..acaeb1090 100644 --- a/apps/open-spark-solaris/locales/en.ts +++ b/apps/open-spark-solaris/locales/en.ts @@ -101,6 +101,7 @@ const en: { [key: string]: string } = { items: 'Order Overview', loading: 'Loading Plans', pleaseWait: 'Please wait!', - confirmLoaderSubtext: 'While we confirm your order' + confirmLoaderSubtext: 'While we confirm your order', + noProduct: 'There are no products in this category yet! New products will be added soon.' } export default en diff --git a/apps/open-spark/locales/en.ts b/apps/open-spark/locales/en.ts index af9d51a15..2d58ffd66 100644 --- a/apps/open-spark/locales/en.ts +++ b/apps/open-spark/locales/en.ts @@ -69,6 +69,7 @@ const en: { [key: string]: string } = { errorNumber: 'Mobile Number is required', errorNumber2: 'Invalid Mobile Number', errorAddress: 'Complete Address is required', + errorAddressMinLength: 'Address must be at least 3 characters long', errorName2: 'Name can only contain letters and spaces', errorName3: 'Name must contain at least 3 characters', cardNumber: '**** **** **** 1234', @@ -107,12 +108,13 @@ const en: { [key: string]: string } = { gPay: 'Google Pay', items: 'Order Overview', allRequestFullfilled: 'All orders delivered!', - loading: 'Fetching financing plan from ONDC...', + loading: 'Fetching the best finance options from the ONDC network...', pleaseWait: 'Please wait!', fetchingTrackLoaderSubtext: 'While we fetch for tracking and support details', confirmLoaderSubtext: 'While we confirm your order', itemSourceText: '', emptyOrderHistoryText: 'This space appears quite empty!', - noExistingWorkflowText: 'No existing workflows found; create a new workflow to proceed.' + noExistingWorkflowText: 'No existing workflows found; create a new workflow to proceed.', + noProduct: 'There are no products in this category yet! New products will be added soon.' } export default en diff --git a/apps/open-spark/pages/OTPVerification.tsx b/apps/open-spark/pages/OTPVerification.tsx index 38b5e399b..3333c8a18 100644 --- a/apps/open-spark/pages/OTPVerification.tsx +++ b/apps/open-spark/pages/OTPVerification.tsx @@ -104,6 +104,8 @@ const OTPVerification = () => { key={index} value={digit} maxLength={1} + inputMode="numeric" + pattern="[0-9]" onChange={e => handleChange(e.target.value, index)} onKeyUp={e => handleBackspaceAndEnter(e, index)} ref={el => (otpBoxReference.current[index] = el)} diff --git a/apps/open-spark/pages/confirmRent.tsx b/apps/open-spark/pages/confirmRent.tsx index da607b57e..24dec04be 100644 --- a/apps/open-spark/pages/confirmRent.tsx +++ b/apps/open-spark/pages/confirmRent.tsx @@ -155,6 +155,7 @@ export default function ConfirmRent() { className="hideScroll" maxH="calc(100vh - 100px)" overflowY={'scroll'} + mb={5} > diff --git a/apps/open-spark/pages/product.tsx b/apps/open-spark/pages/product.tsx index 98586fa42..558eea564 100644 --- a/apps/open-spark/pages/product.tsx +++ b/apps/open-spark/pages/product.tsx @@ -68,6 +68,7 @@ const Product = () => { totalPrice: selectedProduct.item.price.value, handleIncrement: increment, handleDecrement: decrement, + // counterTitle: 'Select Quantity', counter: counter, cta: { dataTest: testIds.productpage_addTocartButton, diff --git a/apps/open-spark/pages/profile.tsx b/apps/open-spark/pages/profile.tsx index b90753544..707656d2c 100644 --- a/apps/open-spark/pages/profile.tsx +++ b/apps/open-spark/pages/profile.tsx @@ -150,16 +150,16 @@ const ProfilePage = () => { disabled: !profileEditable, customInputBlurHandler: updateProfile }, - { - type: 'text', - name: 'customerId', - value: formData.customerId!, - handleChange: handleInputChange, - label: t.formCustomerId, - error: formErrors.customerId, - dataTest: testIds.profile_customerId, - disabled: true - }, + // { + // type: 'text', + // name: 'customerId', + // value: formData.customerId!, + // handleChange: handleInputChange, + // label: t.formCustomerId, + // error: formErrors.customerId, + // dataTest: testIds.profile_customerId, + // disabled: true + // }, { type: 'text', name: 'address', diff --git a/apps/open-spark/utilities/form-utils.ts b/apps/open-spark/utilities/form-utils.ts index 46e53f1a3..bd3e62cc7 100644 --- a/apps/open-spark/utilities/form-utils.ts +++ b/apps/open-spark/utilities/form-utils.ts @@ -26,6 +26,8 @@ export const validateForm = (formData: ShippingFormData): FormErrors => { if (formData.address.trim() === '') { errors.address = 'errorAddress' + } else if (formData.address.trim().length < 3) { + errors.address = 'errorAddressMinLength' } if (formData.zipCode.trim() === '') { @@ -92,6 +94,8 @@ export const signUpValidateForm = (formData: SignUpProps): CustomFormErrorProps } if (formData.address.trim() === '') { errors.address = 'errorAddress' + } else if (formData.address.trim().length < 3) { + errors.address = 'errorAddressMinLength' } if (formData?.mobileNumber?.trim() === '') { errors.mobileNumber = 'errorNumber' diff --git a/packages/becknified-components/src/components/checkout/checkout-item-details.tsx b/packages/becknified-components/src/components/checkout/checkout-item-details.tsx index 9a299799b..8a9693775 100644 --- a/packages/becknified-components/src/components/checkout/checkout-item-details.tsx +++ b/packages/becknified-components/src/components/checkout/checkout-item-details.tsx @@ -76,7 +76,6 @@ const ItemDetails: React.FC = ({ - ) } diff --git a/packages/becknified-components/src/components/checkout/checkout.tsx b/packages/becknified-components/src/components/checkout/checkout.tsx index da892f4cc..7ac45ec3f 100644 --- a/packages/becknified-components/src/components/checkout/checkout.tsx +++ b/packages/becknified-components/src/components/checkout/checkout.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react' -import { Box, useBreakpoint } from '@chakra-ui/react' +import { Box, Divider, useBreakpoint } from '@chakra-ui/react' import { FormField, Typography, Loader, Button, LoaderWithMessage } from '@beckn-ui/molecules' import DetailsCard from './details-card' import ItemDetails from './checkout-item-details' @@ -51,7 +51,7 @@ const Checkout: React.FC> = ({ {items?.type === 'RENT_AND_HIRE' ? ( ) : ( - (items?.data as ItemDetailProps[])?.map((item, i) => ( + (items?.data as ItemDetailProps[])?.map((item, i, arr) => (
> = ({ currency={item.currency} image={item.image} /> + {arr.length > 1 && i !== arr.length - 1 && }
)) )}