@opexa/portal-components 0.0.390 → 0.0.392

package/dist/components/PortalProvider/PortalProvider.js

@@ -7,7 +7,7 @@ import { prefetchSessionQuery } from '../../server/utils/prefetchSessionQuery.js
 import { prefetchWalletQuery } from '../../server/utils/prefetchWalletQuery.js';
 import { getQueryClient } from '../../utils/getQueryClient.js';
 import { FeatureFlag } from './FeatureFlag.js';
-import { LinkGoogleAccountObserver } from './LinkGoogleAccountObserver.js';
+import { SocialAccountLinkObserver } from './SocialAccountLinkObserver.js';
 import { Providers } from './Providers.js';
 import { SessionWatcher } from './SessionWatcher.js';
 import { SetupBtag } from './SetupBtag.js';
@@ -22,5 +22,5 @@ export async function PortalProvider({ recaptchaSiteKey, children, }) {
         prefetchAccountQuery(),
         prefetchWalletQuery(),
     ]);
-    return (_jsxs(Fragment, { children: [_jsx(Providers, { recaptchaSiteKey: recaptchaSiteKey, children: _jsxs(HydrationBoundary, { state: dehydrate(queryClient), children: [children, _jsx(SessionWatcher, {}), _jsx(Suspense, { children: _jsx(SetupDomain, {}) }), _jsx(Suspense, { children: _jsx(SetupCellxpertCxd, {}) }), _jsx(Suspense, { children: _jsx(SetupBtag, {}) })] }) }), _jsx(Snackbar, {}), _jsx(Suspense, { children: _jsx(LinkGoogleAccountObserver, {}) }), _jsx(Suspense, { children: _jsx(FeatureFlag, {}) })] }));
+    return (_jsxs(Fragment, { children: [_jsx(Providers, { recaptchaSiteKey: recaptchaSiteKey, children: _jsxs(HydrationBoundary, { state: dehydrate(queryClient), children: [children, _jsx(SessionWatcher, {}), _jsx(Suspense, { children: _jsx(SetupDomain, {}) }), _jsx(Suspense, { children: _jsx(SetupCellxpertCxd, {}) }), _jsx(Suspense, { children: _jsx(SetupBtag, {}) })] }) }), _jsx(Snackbar, {}), _jsx(Suspense, { children: _jsx(SocialAccountLinkObserver, {}) }), _jsx(Suspense, { children: _jsx(FeatureFlag, {}) })] }));
 }

package/dist/components/PortalProvider/SocialAccountLinkObserver.d.ts

@@ -0,0 +1 @@
+export declare function SocialAccountLinkObserver(): null;

package/dist/components/PortalProvider/SocialAccountLinkObserver.js

@@ -0,0 +1,39 @@
+'use client';
+import { useSearchParams } from 'next/navigation';
+import { useTimeout } from 'usehooks-ts';
+import { toaster } from '../../client/utils/toaster.js';
+import { getQueryClient } from '../../utils/getQueryClient.js';
+import { getSessionQueryKey } from '../../utils/queryKeys.js';
+export function SocialAccountLinkObserver() {
+    const searchParams = useSearchParams();
+    const code = searchParams.get('message') ?? searchParams.get('status');
+    const providerParam = searchParams.get('provider');
+    const provider = providerParam === 'facebook' ? 'Facebook' : 'Google';
+    const queryClient = getQueryClient();
+    useTimeout(() => {
+        if (!code)
+            return;
+        if (code === 'duplicate') {
+            if (provider === 'Facebook') {
+                return toaster.error({
+                    title: 'Facebook Account Already Linked',
+                    description: 'This Facebook account is already linked to another player. Please use a different account or check your player settings.',
+                });
+            }
+            return toaster.error({
+                title: 'Duplicate Account',
+                description: 'An account with this email already exists. Please try signing in instead.',
+            });
+        }
+        if (code === 'linked') {
+            queryClient.invalidateQueries({
+                queryKey: getSessionQueryKey(),
+            });
+            return toaster.success({
+                title: `${provider} Account Linked Successfully`,
+                description: `Your ${provider} account has been successfully connected.`,
+            });
+        }
+    }, code ? 100 : null);
+    return null;
+}

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

@@ -85,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({
@@ -127,7 +136,8 @@ export function SignUpDefaultForm() {
         mode: 'all',
         resolver: zodResolver(Step1Definition),
         defaultValues: {
-            realName: '',
+            firstName: '',
+            lastName: '',
             mobileNumber: '',
             branchCode: signUpProps?.branches?.length
                 ? signUpProps.branches[0]?.code
@@ -169,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, {
@@ -232,11 +242,12 @@ export function SignUpDefaultForm() {
                                     verificationCode: verificationCode.join(''),
                                     referralCode: search.get('referralCode') ?? undefined,
                                     //new signup
-                                    ...(enabled && {
+                                    ...(signUpProps?.branches &&
+                                        signUpProps.branches.length > 0 && {
                                         branchCode: step1Form.getValues('branchCode'),
-                                        realName: step1Form.getValues('realName'),
-                                        birthDay: format(step1Form.getValues('birthDay'), 'yyyy-MM-dd'),
                                     }),
+                                    realName: `${step1Form.getValues('firstName')} ${step1Form.getValues('lastName')}`,
+                                    birthDay: format(step1Form.getValues('birthDay'), 'yyyy-MM-dd'),
                                 });
                                 const name = mobileNumberParser.format(mobileNumber);
                                 const password = `${name}${id}`;
@@ -261,26 +272,6 @@ export function SignUpDefaultForm() {
                                     globalStore.signIn.setOpen(true);
                                     return;
                                 }
-                                else if (!enabled) {
-                                    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/package.json

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