chore: use full name instead of first name and last name

dwarvesf · Sep 27, 2023 · b64eaa3 · b64eaa3
1 parent ce2248e
commit b64eaa3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 27 deletions.
diff --git a/src/components/Header/ProfileModal.tsx b/src/components/Header/ProfileModal.tsx
@@ -23,15 +23,14 @@ interface Props {
 }
 
 const validationSchema = z.object({
-  firstName: z.string().min(1, 'First name is required.'),
-  lastName: z.string().min(1, 'Last name is required.'),
+  fullName: z.string().min(1, 'Full name is required.'),
 })
 
 export const ProfileModal = (props: Props) => {
   const { trigger, open, onOpenChange } = props
   const { user } = useAuthContext()
   const formInstance = useForm({
-    defaultValues: { firstName: user.firstName, lastName: user.lastName },
+    defaultValues: { fullName: user?.fullName },
     resolver: zodResolver(validationSchema),
   })
   const { handleSubmit } = formInstance
@@ -55,16 +54,9 @@ export const ProfileModal = (props: Props) => {
               <form className="mt-5" onSubmit={handleSubmit(onSubmit)}>
                 <div className="space-y-5 mb-8">
                   <FormInput
-                    label="First name"
-                    name="firstName"
-                    placeholder="First name"
-                    rules={{ required: 'Required' }}
-                    fullWidth
-                  />
-                  <FormInput
-                    label="Last name"
-                    name="lastName"
-                    placeholder="Last name"
+                    label="Full name"
+                    name="fullName"
+                    placeholder="Full name"
                     rules={{ required: 'Required' }}
                     fullWidth
                   />

diff --git a/src/pages/forms.tsx b/src/pages/forms.tsx
@@ -13,8 +13,7 @@ import { FormCheckboxGroup } from 'components/FormCheckboxGroup'
 import { Checkbox } from 'components/Checkbox'
 
 const personalFormDefaultValues = {
-  firstName: '',
-  lastName: '',
+  fullName: '',
   email: '',
   country: '',
   address: '',
@@ -24,8 +23,7 @@ const personalFormDefaultValues = {
 }
 
 const personalFormValidationSchema = z.object({
-  firstName: z.string().min(1, 'First name is required.'),
-  lastName: z.string().min(1, 'Last name is required.'),
+  fullName: z.string().min(1, 'Full name is required.'),
   email: z.string().email(),
 })
 
@@ -46,16 +44,8 @@ const PersonalForm = () => {
           <div className="grid grid-cols-6 gap-6 p-6">
             <div className="col-span-3">
               <FormInput
-                label="First name"
-                name="firstName"
-                rules={{ required: 'Required' }}
-                fullWidth
-              />
-            </div>
-            <div className="col-span-3">
-              <FormInput
-                label="Last name"
-                name="lastName"
+                label="Full name"
+                name="fullName"
                 rules={{ required: 'Required' }}
                 fullWidth
               />