@opexa/portal-components 0.0.389 → 0.0.391

package/dist/components/SignIn/MobileNumberSignIn.js

@@ -49,12 +49,24 @@ export function MobileNumberSignIn() {
             globalStore.signIn.setOpen(false);
             globalStore.kycReminder.setOpen(true);
         },
+        onError: (err) => {
+            toaster.error({
+                title: 'Sign In Failed',
+                description: err.message,
+            });
+        },
     });
     const sendVerificationCodeMutation = useSendVerificationCodeMutation({
         onSuccess: () => {
             context.setStep(2);
             cooldown.start();
         },
+        onError: (err) => {
+            toaster.error({
+                title: 'Sign In Failed',
+                description: err.message,
+            });
+        },
     });
     const localeInfo = useLocaleInfo();
     const mobileNumberParser = useMobileNumberParser();
@@ -112,17 +124,10 @@ export function MobileNumberSignIn() {
     const form2Ref = useRef(null);
     const featureFlag = useFeatureFlag();
     return (_jsxs(_Fragment, { children: [context.step === 1 && (_jsxs(_Fragment, { children: [_jsxs("form", { className: "mt-3xl", onSubmit: step1Form.handleSubmit(async (data) => {
-                            sendVerificationCodeMutation.mutate({
+                            sendVerificationCodeMutation.mutateAsync({
                                 channel: 'SMS',
                                 recipient: mobileNumberParser.format(data.mobileNumber),
                                 strict: true,
-                            }, {
-                                onError: (err) => {
-                                    toaster.error({
-                                        title: 'Sign In Failed',
-                                        description: err.message,
-                                    });
-                                },
                             });
                         }), children: [_jsxs(Field.Root, { invalid: !!step1Form.formState.errors.mobileNumber, children: [_jsx(Field.Label, { children: "Mobile Number" }), _jsxs("div", { className: "relative", children: [_jsxs("div", { className: "-translate-y-1/2 absolute top-1/2 left-3.5 flex shrink-0 items-center gap-md", children: [_jsx(localeInfo.country.flag, { className: "size-5" }), _jsx("span", { className: "text-text-placeholder", children: localeInfo.mobileNumber.areaCode })] }), _jsx(Field.Input, { style: {
                                                     paddingLeft: `calc(2.75rem + ${localeInfo.mobileNumber.areaCode.length}ch)`,
@@ -157,17 +162,10 @@ export function MobileNumberSignIn() {
                                     globalStore.signUp.setOpen(true);
                                 }, children: "Sign up" })] })] })), context.step === 2 && (_jsxs(_Fragment, { children: [_jsx("h2", { className: "mt-xl text-center font-semibold text-lg", children: "Check your Phone" }), _jsxs("p", { className: "mt-xs text-center text-sm text-text-secondary-700", children: ["We\u2019ve sent a verification code to your mobile number", ' ', _jsx("span", { className: "font-semibold", children: mobileNumberParser.format(step1Form.getValues('mobileNumber')) }), ' ', "via text"] }), _jsxs("form", { ref: form2Ref, className: "mt-5", onSubmit: step2Form.handleSubmit(async ({ verificationCode }) => {
                             const { mobileNumber } = step1Form.getValues();
-                            signInMutation.mutate({
+                            signInMutation.mutateAsync({
                                 type: 'MOBILE_NUMBER',
                                 mobileNumber: mobileNumberParser.format(mobileNumber),
                                 verificationCode: verificationCode.join(''),
-                            }, {
-                                onError: (err) => {
-                                    toaster.error({
-                                        title: 'Sign In Failed',
-                                        description: err.message,
-                                    });
-                                },
                             });
                         }), children: [_jsx(Controller, { name: "verificationCode", control: step2Form.control, render: (o) => (_jsxs(Field.Root, { invalid: o.fieldState.invalid, children: [_jsxs(PinInput.Root, { placeholder: "0", value: o.field.value, onValueChange: (details) => {
                                                 o.field.onChange(details.value);

package/dist/components/SignIn/NameAndPasswordSignIn.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDialogContext } from '@ark-ui/react/dialog';
 import { zodResolver } from '@hookform/resolvers/zod';
+import dynamic from 'next/dynamic';
 import Image from 'next/image';
 import { useRouter } from 'next/navigation';
 import { Controller, useForm } from 'react-hook-form';
@@ -8,6 +9,7 @@ import { twMerge } from 'tailwind-merge';
 import { z } from 'zod';
 import { useShallow } from 'zustand/shallow';
 import { useAuthenticateMutation } from '../../client/hooks/useAuthenticateMutation.js';
+import { useFeatureFlag } from '../../client/hooks/useFeatureFlag.js';
 import { useGlobalStore } from '../../client/hooks/useGlobalStore.js';
 import { useSignInMutation } from '../../client/hooks/useSignInMutation.js';
 import { toaster } from '../../client/utils/toaster.js';
@@ -21,10 +23,8 @@ import { Button } from '../../ui/Button/index.js';
 import { Checkbox } from '../../ui/Checkbox/index.js';
 import { Field } from '../../ui/Field/index.js';
 import { PasswordInput } from '../../ui/PasswordInput/index.js';
-import { useSignInContext, useSignInPropsContext } from './SignInContext.js';
 import { FacebookSignInTrigger } from './FacebookSignInTrigger.js';
-import dynamic from 'next/dynamic';
-import { useFeatureFlag } from '../../client/hooks/useFeatureFlag.js';
+import { useSignInContext, useSignInPropsContext } from './SignInContext.js';
 const GoogleSignInButton = dynamic(() => import('./GoogleSignInTrigger.js').then((m) => m.GoogleSignInTrigger), {
     ssr: false,
     loading: () => null,
@@ -124,14 +124,14 @@ export function NameAndPasswordSignIn() {
     const featureFlag = useFeatureFlag();
     return (_jsxs(_Fragment, { children: [_jsxs("form", { className: "mt-3xl", onSubmit: form.handleSubmit((data) => {
                     if (!signInMutation.data) {
-                        signInMutation.mutate({
+                        signInMutation.mutateAsync({
                             type: 'NAME_AND_PASSWORD',
                             name: data.name,
                             password: data.password,
                         });
                     }
                     else {
-                        authenticateMutation.mutate({
+                        authenticateMutation.mutateAsync({
                             type: 'SECURITY_QUESTION',
                             token: signInMutation.data.token,
                             secretAnswer: data.secretAnswer,

package/dist/components/SignUp/SignUpDefault/SignUpDefaultForm.js

@@ -13,6 +13,7 @@ import { z } from 'zod';
 import { useShallow } from 'zustand/shallow';
 import { useControllableState } from '../../../client/hooks/useControllableState.js';
 import { useCooldown } from '../../../client/hooks/useCooldown.js';
+import { useFeatureFlag } from '../../../client/hooks/useFeatureFlag.js';
 import { useGlobalStore } from '../../../client/hooks/useGlobalStore.js';
 import { useLocaleInfo } from '../../../client/hooks/useLocaleInfo.js';
 import { useMobileNumberParser } from '../../../client/hooks/useMobileNumberParser.js';
@@ -42,6 +43,7 @@ import { createPoll } from '../../../utils/createPoll.js';
 import { useSignUpDefaultPropsContext } from './SignUpDefaultContext.js';
 export function SignUpDefaultForm() {
     const signUpProps = useSignUpDefaultPropsContext();
+    const { enabled } = useFeatureFlag();
     const branchCollection = createListCollection({
         items: signUpProps.branches ?? [],
         itemToValue: (item) => item.code,
@@ -83,14 +85,23 @@ export function SignUpDefaultForm() {
                 });
             }
         }),
-        realName: z
+        firstName: z
             .string()
             .transform((val) => val.trim())
             .refine((val) => val.length >= 2, {
-            message: 'Real name must be 2 or more characters',
+            message: 'First name must be 2 or more characters',
         })
             .refine((val) => val.length <= 50, {
-            message: 'Real name must not be more than 50 characters',
+            message: 'First name must not be more than 50 characters',
+        }),
+        lastName: z
+            .string()
+            .transform((val) => val.trim())
+            .refine((val) => val.length >= 2, {
+            message: 'Last name must be 2 or more characters',
+        })
+            .refine((val) => val.length <= 50, {
+            message: 'Last name must not be more than 50 characters',
         }),
         birthDay: z
             .date({
@@ -125,7 +136,8 @@ export function SignUpDefaultForm() {
         mode: 'all',
         resolver: zodResolver(Step1Definition),
         defaultValues: {
-            realName: '',
+            firstName: '',
+            lastName: '',
             mobileNumber: '',
             branchCode: signUpProps?.branches?.length
                 ? signUpProps.branches[0]?.code
@@ -167,7 +179,7 @@ export function SignUpDefaultForm() {
                             }
                         }), children: [_jsxs(Field.Root, { invalid: !!step1Form.formState.errors.mobileNumber, children: [_jsx(Field.Label, { children: "Mobile Number" }), _jsxs("div", { className: "relative", children: [_jsxs("div", { className: "-translate-y-1/2 absolute top-1/2 left-3.5 flex shrink-0 items-center gap-md", children: [_jsx(localeInfo.country.flag, { className: "size-5" }), _jsx("span", { className: "text-text-placeholder", children: localeInfo.mobileNumber.areaCode })] }), _jsx(Field.Input, { style: {
                                                     paddingLeft: `calc(2.75rem + ${localeInfo.mobileNumber.areaCode.length}ch)`,
-                                                }, ...step1Form.register('mobileNumber') })] }), _jsx(Field.ErrorText, { children: step1Form.formState.errors.mobileNumber?.message })] }), _jsxs(Field.Root, { invalid: !!step1Form.formState.errors.realName, className: "mt-xl", children: [_jsx(Field.Label, { children: "Real Name" }), _jsx(Field.Input, { placeholder: "Enter your real name", ...step1Form.register('realName') }), _jsx(Field.ErrorText, { children: step1Form.formState.errors.realName?.message })] }), _jsxs(Field.Root, { invalid: !!step1Form.formState.errors.birthDay, className: "mt-xl", children: [_jsx(DateOfBirthField, { value: birthDay, onChange: (value) => {
+                                                }, ...step1Form.register('mobileNumber') })] }), _jsx(Field.ErrorText, { children: step1Form.formState.errors.mobileNumber?.message })] }), _jsxs(Field.Root, { invalid: !!step1Form.formState.errors.firstName, className: "mt-xl", children: [_jsx(Field.Label, { children: "First Name" }), _jsx(Field.Input, { placeholder: "Enter your real name", ...step1Form.register('firstName') }), _jsx(Field.ErrorText, { children: step1Form.formState.errors.firstName?.message })] }), _jsxs(Field.Root, { invalid: !!step1Form.formState.errors.lastName, className: "mt-xl", children: [_jsx(Field.Label, { children: "Last Name" }), _jsx(Field.Input, { placeholder: "Enter your real name", ...step1Form.register('lastName') }), _jsx(Field.ErrorText, { children: step1Form.formState.errors.lastName?.message })] }), _jsxs(Field.Root, { invalid: !!step1Form.formState.errors.birthDay, className: "mt-xl", children: [_jsx(DateOfBirthField, { value: birthDay, onChange: (value) => {
                                             if (!value)
                                                 return;
                                             step1Form.setValue('birthDay', value, {
@@ -229,6 +241,13 @@ export function SignUpDefaultForm() {
                                     mobileNumber: mobileNumberParser.format(mobileNumber),
                                     verificationCode: verificationCode.join(''),
                                     referralCode: search.get('referralCode') ?? undefined,
+                                    //new signup
+                                    ...(signUpProps?.branches &&
+                                        signUpProps.branches.length > 0 && {
+                                        branchCode: step1Form.getValues('branchCode'),
+                                    }),
+                                    realName: `${step1Form.getValues('firstName')} ${step1Form.getValues('lastName')}`,
+                                    birthDay: format(step1Form.getValues('birthDay'), 'yyyy-MM-dd'),
                                 });
                                 const name = mobileNumberParser.format(mobileNumber);
                                 const password = `${name}${id}`;
@@ -253,26 +272,6 @@ export function SignUpDefaultForm() {
                                     globalStore.signIn.setOpen(true);
                                     return;
                                 }
-                                else {
-                                    const pollUpdateAccount = createPoll(async () => {
-                                        try {
-                                            await updateAccountMutation.mutateAsync({
-                                                branchCode: step1Form.getValues('branchCode'),
-                                                realName: step1Form.getValues('realName'),
-                                                birthDay: format(step1Form.getValues('birthDay'), 'yyyy-MM-dd'),
-                                            });
-                                            return true;
-                                        }
-                                        catch {
-                                            return false;
-                                        }
-                                    }, {
-                                        until: (ok) => ok,
-                                        maxAttempt: 8,
-                                        interval: 250,
-                                    });
-                                    await pollUpdateAccount();
-                                }
                                 globalStore.signUp.setOpen(false);
                                 globalStore.kycReminder.setOpen(true);
                                 step1Form.reset();

package/dist/services/account.d.ts

@@ -60,8 +60,11 @@ export interface RegisterMemberAccountViaMobileMutationVariables {
     };
     referralCode?: string;
     verificationCode?: string;
+    birthDay?: string;
+    realName?: string;
+    branchCode?: string;
 }
-export type RegisterMemberAccountViaMobileInput = Simplify<RegisterMemberAccountViaMobileMutationVariables['input'] & Pick<RegisterMemberAccountViaMobileMutationVariables, 'verificationCode' | 'referralCode'>>;
+export type RegisterMemberAccountViaMobileInput = Simplify<RegisterMemberAccountViaMobileMutationVariables['input'] & Pick<RegisterMemberAccountViaMobileMutationVariables, 'verificationCode' | 'referralCode' | 'birthDay' | 'realName' | 'branchCode'>>;
 export declare const registerMemberAccountViaMobile: (input: RegisterMemberAccountViaMobileInput, options?: GraphQLRequestOptions) => Promise<void>;
 export interface RegisterMemberAccountByMobileNumberMutationVariables {
     input: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@opexa/portal-components",
-	"version": "0.0.389",
+	"version": "0.0.391",
 	"exports": {
 		"./ui/*": {
 			"types": "./dist/ui/*/index.d.ts",