Remove references to user.name

pbteja1998 · pbteja1998 · commit 9c1e88c679c4 · 2021-02-19T17:52:33.000+05:30
diff --git a/src/adapters/fauna/index.ts b/src/adapters/fauna/index.ts
@@ -38,6 +38,7 @@ const Adapter = (config, options = {}) => {
 
       const FQL = q.Create(q.Collection(collections.User), {
         data: {
+          name: profile.name,
           email: profile.email,
           image: profile.image,
           account: {
@@ -160,6 +161,7 @@ const Adapter = (config, options = {}) => {
 
       const FQL = q.Update(q.Ref(q.Collection(collections.User), user.id), {
         data: {
+          name: user.name,
           email: user.email,
           image: user.image,
           account: {
diff --git a/src/components/HomePageFeed.tsx b/src/components/HomePageFeed.tsx
@@ -384,9 +384,7 @@ function FollowButton({ user }: { user: User }) {
       </div>
       <div className="min-w-0 flex-1">
         <p className="text-sm font-medium text-gray-900">
-          <A href={`/${user.username}`}>
-            {user.account?.firstName ?? user.name}
-          </A>
+          <A href={`/${user.username}`}>{user.account?.firstName}</A>
         </p>
         <p className="text-sm text-gray-500">
           <A href={`/${user.username}`}>@{user.username}</A>
diff --git a/src/components/members/Member.tsx b/src/components/members/Member.tsx
@@ -47,7 +47,7 @@ export default function Member({ user }: { user: User }) {
       <div className="flex-1 flex flex-col p-8">
         <Avatar src={user.image} className="w-32 h-32 mx-auto" />
         <h3 className="mt-6 text-gray-900 text-sm font-medium">
-          {user.account?.firstName ?? user.name}
+          {user.account?.firstName}
         </h3>
         <dl className="mt-1 flex-grow flex flex-col justify-between">
           <dt className="sr-only">Bio</dt>
diff --git a/src/components/modal/FollowModal.tsx b/src/components/modal/FollowModal.tsx
@@ -16,7 +16,7 @@ export default function FollowModal({
       user={user}
       isOpen={isOpen}
       setIsOpen={setIsOpen}
-      headerText={`Follow ${user.account?.firstName ?? user.name} to see their
+      headerText={`Follow ${user.account?.firstName} to see their
     updates.`}
       subHeaderText="Join our community to never miss their updates."
       icon={UserPlus}
diff --git a/src/components/modal/LikeModal.tsx b/src/components/modal/LikeModal.tsx
@@ -17,9 +17,7 @@ export default function LikeModal({
       isOpen={isOpen}
       setIsOpen={setIsOpen}
       headerText="Like the updates shared by the community members"
-      subHeaderText={`Join our community now to let ${
-        user.account?.firstName ?? user.name
-      } know you like their update.`}
+      subHeaderText={`Join our community now to let ${user.account?.firstName} know you like their update.`}
       icon={ThumbsUp}
     />
   )
diff --git a/src/components/profile/Profile.tsx b/src/components/profile/Profile.tsx
@@ -53,7 +53,7 @@ export default function Profile({ user }: { user: User }) {
             </div>
             <div className="mt-4 text-center sm:mt-0 sm:pt-1 sm:text-left">
               <p className="text-xl font-bold text-gray-900 sm:text-2xl">
-                {user.account?.firstName ?? user.name}
+                {user.account?.firstName}
               </p>
               <p className="text-sm font-medium text-gray-600">
                 {user.account?.bio}
diff --git a/src/components/settings/ProfileSettings.tsx b/src/components/settings/ProfileSettings.tsx
@@ -159,7 +159,7 @@ export default function ProfileSettings() {
                 type="text"
                 name="firstName"
                 className="col-span-4 sm:col-span-2"
-                defaultValue={user.account?.firstName ?? user.name}
+                defaultValue={user.account?.firstName}
                 ref={register({ required: true })}
                 hasError={Boolean(errors.firstName)}
                 errorMessage="This field is required"
diff --git a/src/pages/api/secret.ts b/src/pages/api/secret.ts
