From 0f8a320b6ad7fd215052bdafa1b71771f2a9d8cc Mon Sep 17 00:00:00 2001
From: "Quentin D.C" <quent043@hotmail.com>
Date: Thu, 11 Apr 2024 07:59:41 +0100
Subject: [PATCH 1/8] Added new user fields in DB to fit offChain data

---
 .../migrations/20240411065853_new_user_fields/migration.sql   | 4 ++++
 prisma/schema.prisma                                          | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 prisma/migrations/20240411065853_new_user_fields/migration.sql

diff --git a/prisma/migrations/20240411065853_new_user_fields/migration.sql b/prisma/migrations/20240411065853_new_user_fields/migration.sql
new file mode 100644
index 00000000..b02cb31d
--- /dev/null
+++ b/prisma/migrations/20240411065853_new_user_fields/migration.sql
@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "role" TEXT,
+ADD COLUMN     "title" TEXT,
+ADD COLUMN     "video" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index a8387072..2b95e0d4 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -43,6 +43,9 @@ model User {
   isEmailVerified          Boolean        @default(false)
   about                    String?
   picture                  String?
+  video                    String?
+  title                    String?
+  role                     String?
   counterStartDate         Int            @default(0)
   weeklyTransactionCounter Int            @default(0)
   workerProfile            WorkerProfile? @relation("WorkerProfile")

From 730bea7ebeaab096ef4cc5b58d458df6b6209bdc Mon Sep 17 00:00:00 2001
From: "Quentin D.C" <quent043@hotmail.com>
Date: Thu, 11 Apr 2024 10:03:33 +0100
Subject: [PATCH 2/8] Updated Form

---
 src/components/Form/ProfileForm.tsx | 60 +++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/src/components/Form/ProfileForm.tsx b/src/components/Form/ProfileForm.tsx
index b8765312..a07af917 100644
--- a/src/components/Form/ProfileForm.tsx
+++ b/src/components/Form/ProfileForm.tsx
@@ -18,6 +18,7 @@ export interface IUpdateProfileFormValues {
   name?: string;
   about?: string;
   skills?: string;
+  email?: string;
 }
 
 const validationSchema = Yup.object({
@@ -36,14 +37,17 @@ function ProfileForm({ callback }: { callback?: () => void }) {
     return <Loading />;
   }
 
+  const initialSkills = user?.workerProfile?.skills.toString() || userDescription?.skills_raw || '';
+
   const initialValues: IUpdateProfileFormValues = {
-    title: userDescription?.title || '',
-    role: userDescription?.role || '',
-    image_url: userDescription?.image_url || user?.picture || '',
-    video_url: userDescription?.video_url || '',
-    name: userDescription?.name || user?.name || '',
-    about: userDescription?.about || '',
-    skills: userDescription?.skills_raw || '',
+    title: user?.title || userDescription?.title || '',
+    role: user?.role || userDescription?.role || '',
+    image_url: user?.picture || userDescription?.image_url || user?.picture || '',
+    video_url: user?.video || userDescription?.video_url || '',
+    name: user?.name || userDescription?.name || user?.name || '',
+    about: user?.about || userDescription?.about || '',
+    skills: initialSkills,
+    email: user?.email || '',
   };
 
   const onSubmit = async (
@@ -99,6 +103,7 @@ function ProfileForm({ callback }: { callback?: () => void }) {
                 <ErrorMessage name='name' />
               </span>
             </label>
+
             <label className='block'>
               <span className='text-base-content'>role</span>
               <Field
@@ -117,6 +122,19 @@ function ProfileForm({ callback }: { callback?: () => void }) {
               </span>
             </label>
 
+            <label className='block'>
+              <span className='text-base-content'>email</span>
+              <Field
+                type='email'
+                id='email'
+                name='email'
+                className='mt-1 mb-1 block w-full rounded-xl border-2 border-info bg-base-200 shadow-sm focus:ring-opacity-50'
+                placeholder=''></Field>
+              <span className='text-alone-error'>
+                <ErrorMessage name='email' />
+              </span>
+            </label>
+
             <label className='block'>
               <span className='text-base-content'>picture url</span>
               <Field
@@ -138,6 +156,32 @@ function ProfileForm({ callback }: { callback?: () => void }) {
               </span>
             </label>
 
+            <label className='block'>
+              <span className='text-base-content'>video presentation url</span>
+              <Field
+                type='text'
+                id='video_url'
+                name='video_url'
+                className='mt-1 mb-1 block w-full rounded-xl border-2 border-info bg-base-200 shadow-sm focus:ring-opacity-50'
+                placeholder=''
+              />
+              {values.video_url && (
+                <div className='border-2 border-info bg-base-200 relative w-full transition-all duration-300 rounded-xl p-4'>
+                  <div className='flex items-center justify-center py-3'>
+                    <video>
+                      <source width='300' src={values.video_url} type='video/webm' />
+                      <source src={values.video_url} type='video/mp4' />
+                      Sorry, your browser doesn't support videos.
+                    </video>
+                    <iframe src={values.video_url} width='300' height='auto' allowFullScreen />
+                  </div>
+                </div>
+              )}
+              <span className='text-alone-error'>
+                <ErrorMessage name='video_url' />
+              </span>
+            </label>
+
             <label className='block'>
               <span className='text-base-content'>about</span>
               <Field
@@ -156,7 +200,7 @@ function ProfileForm({ callback }: { callback?: () => void }) {
             <label className='block'>
               <span className='text-base-content'>skills</span>
 
-              <SkillsInput initialValues={userDescription?.skills_raw} entityId={'skills'} />
+              <SkillsInput initialValues={initialSkills} entityId={'skills'} />
 
               <Field type='hidden' id='skills' name='skills' />
               <span className='text-alone-error'>

From 4e79110c6a5bbedc037893fc5b61eb87b126eb31 Mon Sep 17 00:00:00 2001
From: "Quentin D.C" <quent043@hotmail.com>
Date: Thu, 11 Apr 2024 10:35:04 +0100
Subject: [PATCH 3/8] Added DB persistence

---
 src/app/api/users/[id]/route.ts               | 43 ++++++++++++++++--
 src/components/Form/ProfileForm.tsx           | 34 +++++++++++---
 .../BuilderPlace/hooks/user/useUpdateUser.tsx | 45 ++++++++++++++++++-
 src/modules/BuilderPlace/request.ts           | 13 ++++++
 src/modules/BuilderPlace/utils/user.ts        | 13 ++++++
 5 files changed, 138 insertions(+), 10 deletions(-)
 create mode 100644 src/modules/BuilderPlace/utils/user.ts

diff --git a/src/app/api/users/[id]/route.ts b/src/app/api/users/[id]/route.ts
index 7e610f1a..81fcad32 100644
--- a/src/app/api/users/[id]/route.ts
+++ b/src/app/api/users/[id]/route.ts
@@ -5,10 +5,20 @@ import { ERROR_UPDATING_USER } from '../../../../modules/BuilderPlace/apiRespons
 import { IEmailPreferences, IMutation } from '../../../../types';
 
 export interface UsersFields {
-  // email?: string | null;
-  //TODO complete
+  name?: string;
+  email?: string;
+  about?: string;
+  picture?: string;
+  video?: string;
+  title?: string;
+  role?: string;
+  workerProfileFields?: WorkerProfileFields;
   emailPreferences?: IEmailPreferences | null;
 }
+
+interface WorkerProfileFields {
+  skills?: string[];
+}
 export interface IUpdateProfile extends IMutation<UsersFields> {}
 
 /**
@@ -37,15 +47,42 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
 
   try {
     console.log('Updating profile...', params.id);
+
+    const { workerProfileFields, emailPreferences, ...userDataFields } = body.data;
+
+    let updatedUserDataFields = {
+      ...userDataFields,
+      // Reset isEmailVerified if email is updated
+      ...(!!userDataFields.email && { isEmailVerified: false }),
+    };
+
+    console.log('userDataFields', updatedUserDataFields);
+    console.log('emailPreferences', emailPreferences);
+    console.log('userDataFields', userDataFields);
+
+    // Update User data
     const user = await prisma.user.update({
       where: {
         id: Number(params.id),
       },
       data: {
-        emailPreferences: { ...body.data.emailPreferences },
+        ...updatedUserDataFields,
+        emailPreferences: { ...emailPreferences },
       },
     });
 
+    // Update or create WorkerProfile if skills are provided
+    if (workerProfileFields?.skills) {
+      await prisma.workerProfile.upsert({
+        where: { id: Number(params.id) },
+        update: { skills: workerProfileFields.skills },
+        create: {
+          id: Number(params.id),
+          skills: workerProfileFields.skills,
+        },
+      });
+    }
+
     return Response.json({ id: user?.id }, { status: 200 });
   } catch (e: any) {
     const error = logAndReturnApiError(e, ERROR_UPDATING_USER);
diff --git a/src/components/Form/ProfileForm.tsx b/src/components/Form/ProfileForm.tsx
index a07af917..288d7bd0 100644
--- a/src/components/Form/ProfileForm.tsx
+++ b/src/components/Form/ProfileForm.tsx
@@ -9,6 +9,7 @@ import { showErrorTransactionToast } from '../../utils/toast';
 import Loading from '../Loading';
 import SubmitButton from './SubmitButton';
 import { SkillsInput } from './skills-input';
+import { CheckIcon, XMarkIcon } from '@heroicons/react/24/outline';
 
 export interface IUpdateProfileFormValues {
   title?: string;
@@ -124,12 +125,33 @@ function ProfileForm({ callback }: { callback?: () => void }) {
 
             <label className='block'>
               <span className='text-base-content'>email</span>
-              <Field
-                type='email'
-                id='email'
-                name='email'
-                className='mt-1 mb-1 block w-full rounded-xl border-2 border-info bg-base-200 shadow-sm focus:ring-opacity-50'
-                placeholder=''></Field>
+              <div className='flex items-center'>
+                <Field
+                  type='email'
+                  id='email'
+                  name='email'
+                  className='mt-1 mb-1 block w-full rounded-xl border-2 border-info bg-base-200 shadow-sm focus:ring-opacity-50'
+                  placeholder=''></Field>
+              </div>
+              {user?.isEmailVerified ? (
+                <div className={'flex flex-row items-center'}>
+                  <CheckIcon
+                    width={25}
+                    height={25}
+                    className='bg-base-100 bg-success p-1 mx-2 border border-success-100 rounded-full'
+                  />
+                  <p className='text-sm text-success-500'>Email verified</p>
+                </div>
+              ) : (
+                <div className={'flex flex-row items-center'}>
+                  <XMarkIcon
+                    width={20}
+                    height={20}
+                    className='bg-base-100 bg-error p-1 mx-2 border border-error-200 rounded-full'
+                  />
+                  <p className='text-sm text-error-500'>Email not verified</p>
+                </div>
+              )}
               <span className='text-alone-error'>
                 <ErrorMessage name='email' />
               </span>
diff --git a/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx b/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
index ad6c94ea..1a2cdd8a 100644
--- a/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
+++ b/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
@@ -5,6 +5,12 @@ import useTalentLayerClient from '../../../../hooks/useTalentLayerClient';
 import { createMultiStepsTransactionToast } from '../../../../utils/toast';
 import { IUpdateProfileFormValues } from '../../../../components/Form/ProfileForm';
 import { delegateUpdateProfileData } from '../../../../components/request';
+import { useMutation } from 'react-query';
+import axios, { AxiosResponse } from 'axios';
+import { IUpdateProfile } from '../../../../app/api/users/[id]/route';
+import { containsOffChainProperties } from '../../utils/user';
+import UserContext from '../../context/UserContext';
+import { toast } from 'react-toastify';
 
 const useUpdateUser = () => {
   const chainId = useChainId();
@@ -12,7 +18,13 @@ const useUpdateUser = () => {
   const publicClient = usePublicClient({ chainId });
   const { address } = useAccount();
   const { canUseBackendDelegate, user: talentLayerUser } = useContext(TalentLayerContext);
+  const { user } = useContext(UserContext);
   const talentLayerClient = useTalentLayerClient();
+  const userMutation = useMutation(
+    async (body: IUpdateProfile): Promise<AxiosResponse<{ id: string }>> => {
+      return await axios.put(`/api/users/${user?.id}`, body);
+    },
+  );
 
   const updateUser = async (values: IUpdateProfileFormValues) => {
     if (!walletClient || !talentLayerClient || !address) {
@@ -20,7 +32,8 @@ const useUpdateUser = () => {
     }
 
     try {
-      if (talentLayerUser?.id) {
+      // Update off-chain data
+      if (talentLayerUser?.id && containsOffChainProperties(values)) {
         const profile = {
           title: values.title,
           role: values.role,
@@ -78,6 +91,36 @@ const useUpdateUser = () => {
           !!cid ? cid : undefined,
         );
       }
+
+      // Update database data
+
+      /**
+       * @dev Sign message to prove ownership of the address
+       */
+      const signature = await walletClient.signMessage({
+        account: address,
+        message: `connect with ${address}`,
+      });
+
+      await userMutation.mutateAsync({
+        data: {
+          name: values.name,
+          email: values.email,
+          about: values.about,
+          picture: values.image_url,
+          video: values.video_url,
+          title: values.title,
+          role: values.role,
+          workerProfileFields: { skills: values.skills?.split(',').map(skill => skill.trim()) },
+        },
+        signature: signature,
+        address: address,
+        domain: `${window.location.hostname}${
+          window.location.port ? ':' + window.location.port : ''
+        }`,
+      });
+
+      toast.success('Profile updated successfully');
     } catch (error: any) {
       console.log('CATCH error', error);
 
diff --git a/src/modules/BuilderPlace/request.ts b/src/modules/BuilderPlace/request.ts
index f63d0555..49f59121 100644
--- a/src/modules/BuilderPlace/request.ts
+++ b/src/modules/BuilderPlace/request.ts
@@ -32,6 +32,19 @@ export const getUserBy = async (filters: UsersFilters): Promise<User> => {
   return users[0];
 };
 
+// export const getPlatformBy = async (filters: PlatformsFilters): Promise<BuilderPlace> => {
+//   console.log(`*DEBUG* getPlatformBy fetch!`);
+//
+//   const response = await axios.get('/api/platforms', {
+//     params: filters,
+//   });
+//
+//   const builderPlaces: BuilderPlace[] = response.data.platforms;
+//
+//   console.log(`*DEBUG* getPlatformBy results!`, builderPlaces);
+//   return builderPlaces[0];
+// };
+
 export const getUsersNotificationData = async (
   builderPlaceId: string,
   ownerId: string,
diff --git a/src/modules/BuilderPlace/utils/user.ts b/src/modules/BuilderPlace/utils/user.ts
new file mode 100644
index 00000000..ce62c615
--- /dev/null
+++ b/src/modules/BuilderPlace/utils/user.ts
@@ -0,0 +1,13 @@
+import { IUpdateProfileFormValues } from '../../../components/Form/ProfileForm';
+
+export const containsOffChainProperties = (obj: IUpdateProfileFormValues): boolean => {
+  const properties = ['title', 'role', 'image_url', 'video_url', 'name', 'about', 'skills'];
+
+  for (const property of properties) {
+    if (property in obj) {
+      return true;
+    }
+  }
+
+  return false;
+};

From 93ca3a0549de75234dd6f033cc38677bc35acea3 Mon Sep 17 00:00:00 2001
From: "Quentin D.C" <quent043@hotmail.com>
Date: Thu, 11 Apr 2024 11:05:59 +0100
Subject: [PATCH 4/8] Updated offChainDataCheck utils function

Added refresh
---
 .../BuilderPlace/hooks/user/useUpdateUser.tsx |  8 +++---
 src/modules/BuilderPlace/utils/user.ts        | 26 +++++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx b/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
index 1a2cdd8a..c26be420 100644
--- a/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
+++ b/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
@@ -8,7 +8,7 @@ import { delegateUpdateProfileData } from '../../../../components/request';
 import { useMutation } from 'react-query';
 import axios, { AxiosResponse } from 'axios';
 import { IUpdateProfile } from '../../../../app/api/users/[id]/route';
-import { containsOffChainProperties } from '../../utils/user';
+import { isOffChainDataUpdated } from '../../utils/user';
 import UserContext from '../../context/UserContext';
 import { toast } from 'react-toastify';
 
@@ -18,7 +18,7 @@ const useUpdateUser = () => {
   const publicClient = usePublicClient({ chainId });
   const { address } = useAccount();
   const { canUseBackendDelegate, user: talentLayerUser } = useContext(TalentLayerContext);
-  const { user } = useContext(UserContext);
+  const { user, getUser } = useContext(UserContext);
   const talentLayerClient = useTalentLayerClient();
   const userMutation = useMutation(
     async (body: IUpdateProfile): Promise<AxiosResponse<{ id: string }>> => {
@@ -33,7 +33,7 @@ const useUpdateUser = () => {
 
     try {
       // Update off-chain data
-      if (talentLayerUser?.id && containsOffChainProperties(values)) {
+      if (talentLayerUser?.id && isOffChainDataUpdated(values, talentLayerUser?.description)) {
         const profile = {
           title: values.title,
           role: values.role,
@@ -120,6 +120,8 @@ const useUpdateUser = () => {
         }`,
       });
 
+      getUser();
+
       toast.success('Profile updated successfully');
     } catch (error: any) {
       console.log('CATCH error', error);
diff --git a/src/modules/BuilderPlace/utils/user.ts b/src/modules/BuilderPlace/utils/user.ts
index ce62c615..d6fc0e25 100644
--- a/src/modules/BuilderPlace/utils/user.ts
+++ b/src/modules/BuilderPlace/utils/user.ts
@@ -1,11 +1,27 @@
 import { IUpdateProfileFormValues } from '../../../components/Form/ProfileForm';
+import { IUserDetails } from '../../../types';
 
-export const containsOffChainProperties = (obj: IUpdateProfileFormValues): boolean => {
-  const properties = ['title', 'role', 'image_url', 'video_url', 'name', 'about', 'skills'];
+export const isOffChainDataUpdated = (
+  updateValues: IUpdateProfileFormValues,
+  offChainProfileData?: IUserDetails,
+): boolean => {
+  if (!offChainProfileData) return true;
 
-  for (const property of properties) {
-    if (property in obj) {
-      return true;
+  const updateKeys = Object.keys(updateValues) as Array<keyof IUpdateProfileFormValues>;
+
+  for (const key of updateKeys) {
+    // Check if the field exists in both objects and if it's defined in the update values
+    if (updateValues[key] !== undefined && key in offChainProfileData) {
+      const updateValue = updateValues[key];
+      const existingValue = offChainProfileData[key as keyof IUserDetails];
+
+      console.log('Comparing', key, ':', updateValue, 'vs', existingValue);
+
+      // Comparing values if truthy
+      if (!!updateValue && !!existingValue && updateValue !== existingValue) {
+        console.log('Difference found in', key);
+        return true;
+      }
     }
   }
 

From 4ec40a5abe9b0f26544bedb8928ad6536bf575d1 Mon Sep 17 00:00:00 2001
From: "Quentin D.C" <quent043@hotmail.com>
Date: Thu, 11 Apr 2024 15:11:28 +0100
Subject: [PATCH 5/8] Added fixes

---
 src/app/api/users/[id]/route.ts               | 24 ++++++-
 src/components/Form/ProfileForm.tsx           |  5 ++
 .../BuilderPlace/hooks/user/useUpdateUser.tsx | 62 ++++++-------------
 src/modules/BuilderPlace/utils/user.ts        |  2 +-
 4 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/src/app/api/users/[id]/route.ts b/src/app/api/users/[id]/route.ts
index 81fcad32..a3919998 100644
--- a/src/app/api/users/[id]/route.ts
+++ b/src/app/api/users/[id]/route.ts
@@ -3,6 +3,7 @@ import prisma from '../../../../postgre/postgreClient';
 import { logAndReturnApiError } from '../../../utils/handleApiErrors';
 import { ERROR_UPDATING_USER } from '../../../../modules/BuilderPlace/apiResponses';
 import { IEmailPreferences, IMutation } from '../../../../types';
+import { sendTransactionalEmailValidation } from '../../../../pages/api/utils/sendgrid';
 
 export interface UsersFields {
   name?: string;
@@ -48,15 +49,27 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
   try {
     console.log('Updating profile...', params.id);
 
+    // Fetch current user data from the database
+    const currentUser = await prisma.user.findUnique({
+      where: { id: Number(params.id) },
+    });
+
+    if (!currentUser) {
+      return Response.json({ error: 'User not found' }, { status: 404 });
+    }
+
     const { workerProfileFields, emailPreferences, ...userDataFields } = body.data;
 
+    const isEmailUpdated = !!userDataFields.email && userDataFields.email !== currentUser.email;
+
     let updatedUserDataFields = {
       ...userDataFields,
       // Reset isEmailVerified if email is updated
-      ...(!!userDataFields.email && { isEmailVerified: false }),
+      ...(isEmailUpdated && { isEmailVerified: false }),
     };
 
     console.log('userDataFields', updatedUserDataFields);
+    console.log('isEmailUpdated', isEmailUpdated);
     console.log('emailPreferences', emailPreferences);
     console.log('userDataFields', userDataFields);
 
@@ -83,6 +96,15 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
       });
     }
 
+    // Send validation email if email is updated
+    if (isEmailUpdated)
+      await sendTransactionalEmailValidation(
+        user.email,
+        user.id.toString(),
+        user.name,
+        body?.domain,
+      );
+
     return Response.json({ id: user?.id }, { status: 200 });
   } catch (e: any) {
     const error = logAndReturnApiError(e, ERROR_UPDATING_USER);
diff --git a/src/components/Form/ProfileForm.tsx b/src/components/Form/ProfileForm.tsx
index 288d7bd0..2a8c2a59 100644
--- a/src/components/Form/ProfileForm.tsx
+++ b/src/components/Form/ProfileForm.tsx
@@ -10,6 +10,7 @@ import Loading from '../Loading';
 import SubmitButton from './SubmitButton';
 import { SkillsInput } from './skills-input';
 import { CheckIcon, XMarkIcon } from '@heroicons/react/24/outline';
+import { createVerificationEmailToast } from '../../modules/BuilderPlace/utils/toast';
 
 export interface IUpdateProfileFormValues {
   title?: string;
@@ -62,6 +63,10 @@ function ProfileForm({ callback }: { callback?: () => void }) {
         callback();
       }
 
+      if (initialValues.email !== values.email) {
+        await createVerificationEmailToast();
+      }
+
       refreshData();
       setSubmitting(false);
     } catch (error) {
diff --git a/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx b/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
index c26be420..167a1abe 100644
--- a/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
+++ b/src/modules/BuilderPlace/hooks/user/useUpdateUser.tsx
@@ -1,8 +1,7 @@
 import { useContext } from 'react';
-import { useAccount, useChainId, usePublicClient, useWalletClient } from 'wagmi';
+import { useAccount, useChainId, useWalletClient } from 'wagmi';
 import TalentLayerContext from '../../../../context/talentLayer';
 import useTalentLayerClient from '../../../../hooks/useTalentLayerClient';
-import { createMultiStepsTransactionToast } from '../../../../utils/toast';
 import { IUpdateProfileFormValues } from '../../../../components/Form/ProfileForm';
 import { delegateUpdateProfileData } from '../../../../components/request';
 import { useMutation } from 'react-query';
@@ -15,7 +14,6 @@ import { toast } from 'react-toastify';
 const useUpdateUser = () => {
   const chainId = useChainId();
   const { data: walletClient } = useWalletClient({ chainId });
-  const publicClient = usePublicClient({ chainId });
   const { address } = useAccount();
   const { canUseBackendDelegate, user: talentLayerUser } = useContext(TalentLayerContext);
   const { user, getUser } = useContext(UserContext);
@@ -32,6 +30,15 @@ const useUpdateUser = () => {
     }
 
     try {
+      const promises = [];
+      /**
+       * @dev Sign message to prove ownership of the address
+       */
+      const signature = await walletClient.signMessage({
+        account: address,
+        message: `connect with ${address}`,
+      });
+
       // Update off-chain data
       if (talentLayerUser?.id && isOffChainDataUpdated(values, talentLayerUser?.description)) {
         const profile = {
@@ -45,23 +52,13 @@ const useUpdateUser = () => {
           web3mailPreferences: talentLayerUser.description?.web3mailPreferences,
         };
 
-        let tx;
-        let cid = '';
-
+        let updateOnChain;
         if (canUseBackendDelegate) {
           console.log('DELEGATION');
 
-          /**
-           * @dev Sign message to prove ownership of the address
-           */
-          const signature = await walletClient.signMessage({
-            account: address,
-            message: `connect with ${address}`,
-          });
+          const cid = await talentLayerClient.profile.upload(profile);
 
-          cid = await talentLayerClient.profile.upload(profile);
-
-          const response = await delegateUpdateProfileData(
+          updateOnChain = delegateUpdateProfileData(
             {
               chainId,
               userAddress: address.toString(),
@@ -70,39 +67,16 @@ const useUpdateUser = () => {
             },
             talentLayerUser?.id,
           );
-          tx = response.data.transaction;
         } else {
           console.log('Update profile', profile, talentLayerUser.id);
-          const res = await talentLayerClient?.profile.update(profile, talentLayerUser.id);
-
-          tx = res.tx;
+          updateOnChain = talentLayerClient?.profile.update(profile, talentLayerUser.id);
         }
 
-        await createMultiStepsTransactionToast(
-          chainId,
-          {
-            pending: 'Updating profile...',
-            success: 'Congrats! Your profile has been updated',
-            error: 'An error occurred while updating your profile',
-          },
-          publicClient,
-          tx,
-          'user',
-          !!cid ? cid : undefined,
-        );
+        promises.push(updateOnChain);
       }
 
       // Update database data
-
-      /**
-       * @dev Sign message to prove ownership of the address
-       */
-      const signature = await walletClient.signMessage({
-        account: address,
-        message: `connect with ${address}`,
-      });
-
-      await userMutation.mutateAsync({
+      const updateDataBase = userMutation.mutateAsync({
         data: {
           name: values.name,
           email: values.email,
@@ -120,6 +94,10 @@ const useUpdateUser = () => {
         }`,
       });
 
+      promises.push(updateDataBase);
+
+      await Promise.all(promises);
+
       getUser();
 
       toast.success('Profile updated successfully');
diff --git a/src/modules/BuilderPlace/utils/user.ts b/src/modules/BuilderPlace/utils/user.ts
index d6fc0e25..bcc61eb1 100644
--- a/src/modules/BuilderPlace/utils/user.ts
+++ b/src/modules/BuilderPlace/utils/user.ts
@@ -18,7 +18,7 @@ export const isOffChainDataUpdated = (
       console.log('Comparing', key, ':', updateValue, 'vs', existingValue);
 
       // Comparing values if truthy
-      if (!!updateValue && !!existingValue && updateValue !== existingValue) {
+      if (!!updateValue && updateValue !== existingValue) {
         console.log('Difference found in', key);
         return true;
       }

From fe848840db74290621664a404bc6aaadf23e721b Mon Sep 17 00:00:00 2001
From: "Quentin D.C" <quent043@hotmail.com>
Date: Fri, 12 Apr 2024 12:43:43 +0100
Subject: [PATCH 6/8] Fixed email override

---
 src/app/api/users/[id]/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/api/users/[id]/route.ts b/src/app/api/users/[id]/route.ts
index a3919998..8be2d7d2 100644
--- a/src/app/api/users/[id]/route.ts
+++ b/src/app/api/users/[id]/route.ts
@@ -66,6 +66,7 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
       ...userDataFields,
       // Reset isEmailVerified if email is updated
       ...(isEmailUpdated && { isEmailVerified: false }),
+      ...(!!emailPreferences && { emailPreferences }),
     };
 
     console.log('userDataFields', updatedUserDataFields);
@@ -80,7 +81,6 @@ export async function PUT(req: Request, { params }: { params: { id: string } })
       },
       data: {
         ...updatedUserDataFields,
-        emailPreferences: { ...emailPreferences },
       },
     });
 

From 25f010a2ebc369b492d886503c2254d223758bca Mon Sep 17 00:00:00 2001
From: "Quentin D.C" <quent043@hotmail.com>
Date: Fri, 12 Apr 2024 12:44:15 +0100
Subject: [PATCH 7/8] Fixed CSS

---
 src/components/Form/ProfileForm.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Form/ProfileForm.tsx b/src/components/Form/ProfileForm.tsx
index 2a8c2a59..e0c0ad2d 100644
--- a/src/components/Form/ProfileForm.tsx
+++ b/src/components/Form/ProfileForm.tsx
@@ -145,7 +145,7 @@ function ProfileForm({ callback }: { callback?: () => void }) {
                     height={25}
                     className='bg-base-100 bg-success p-1 mx-2 border border-success-100 rounded-full'
                   />
-                  <p className='text-sm text-success-500'>Email verified</p>
+                  <span className='text-sm text-base-content opacity-50'>Email verified</span>
                 </div>
               ) : (
                 <div className={'flex flex-row items-center'}>
@@ -154,7 +154,7 @@ function ProfileForm({ callback }: { callback?: () => void }) {
                     height={20}
                     className='bg-base-100 bg-error p-1 mx-2 border border-error-200 rounded-full'
                   />
-                  <p className='text-sm text-error-500'>Email not verified</p>
+                  <p className='text-sm text-base-content opacity-50'>Email not verified</p>
                 </div>
               )}
               <span className='text-alone-error'>

From 1a0623c974d843809981237412470ec73dd042dd Mon Sep 17 00:00:00 2001
From: "Quentin D.C" <quent043@hotmail.com>
Date: Tue, 30 Apr 2024 08:40:20 +0100
Subject: [PATCH 8/8] Added a log

---
 src/app/api/delegate/service/route.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/api/delegate/service/route.ts b/src/app/api/delegate/service/route.ts
index 30a35702..72cc8926 100644
--- a/src/app/api/delegate/service/route.ts
+++ b/src/app/api/delegate/service/route.ts
@@ -94,7 +94,14 @@ export async function POST(req: Request) {
         cid: cid,
       });
 
-      console.log('Creating service with args', userId, platformId, cid, signature);
+      console.log(
+        'Creating service with args',
+        userId,
+        platformId,
+        cid,
+        signature,
+        servicePostingFee,
+      );
 
       transaction = await walletClient.writeContract({
         address: config.contracts.serviceRegistry,