Merge branch 'develop' into feature/VerifyRoleRoute

Author: PurnenduMIshra129th

src/screens/MemberDetail/MemberDetail.tsx

@@ -73,7 +73,7 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
     appLanguageCode: '',
     image: '',
     gender: '',
-    birthDate: '2024-03-14',
+    birthDate: '',
     grade: '',
     empStatus: '',
     maritalStatus: '',
@@ -241,8 +241,10 @@ const MemberDetail: React.FC<MemberDetailProps> = ({ id }): JSX.Element => {
       try {
         const { data } = await updateUser({
           variables: {
-            id: currentUrl,
-            ...formState,
+            data: {
+              id: currentUrl,
+              ...formState,
+            },
           },
         });
         if (data) {

src/screens/UserPortal/Settings/Settings.spec.tsx

@@ -129,21 +129,23 @@ const updateMock = [
     request: {
       query: UPDATE_USER_MUTATION,
       variables: {
-        firstName: 'John',
-        lastName: 'randomUpdated',
-        createdAt: '2021-03-01T00:00:00.000Z',
-        gender: 'MALE',
-        email: '[email protected]',
-        phoneNumber: '+174567890',
-        birthDate: '2024-03-01',
-        grade: 'GRADUATE',
-        empStatus: 'PART_TIME',
-        maritalStatus: 'SINGLE',
-        address: 'random',
-        state: 'random',
-        country: 'IN',
-        eventsAttended: [{ _id: 'event1' }, { _id: 'event2' }],
-        image: '',
+        data: {
+          firstName: 'John',
+          lastName: 'randomUpdated',
+          createdAt: '2021-03-01T00:00:00.000Z',
+          gender: 'MALE',
+          email: '[email protected]',
+          phoneNumber: '+174567890',
+          birthDate: '2024-03-01',
+          grade: 'GRADUATE',
+          empStatus: 'PART_TIME',
+          maritalStatus: 'SINGLE',
+          address: 'random',
+          state: 'random',
+          country: 'IN',
+          eventsAttended: [{ _id: 'event1' }, { _id: 'event2' }],
+          image: '',
+        },
       },
     },
     result: {

src/screens/UserPortal/Settings/Settings.tsx

@@ -99,7 +99,9 @@ export default function settings(): JSX.Element {
         updatedUserDetails = { ...updatedUserDetails, image: '' };
       }
       const { data } = await updateUserDetails({
-        variables: updatedUserDetails,
+        variables: {
+          data: updatedUserDetails,
+        },
       });
       if (data) {
         toast.success(
@@ -158,7 +160,6 @@ export default function settings(): JSX.Element {
    */
   const handleResetChanges = (): void => {
     setisUpdated(false);
-    /* istanbul ignore next */
     if (data) {
       const {
         firstName,
@@ -192,7 +193,6 @@ export default function settings(): JSX.Element {
   };
 
   useEffect(() => {
-    /* istanbul ignore next */
     if (data) {
       const {
         firstName,
@@ -314,9 +314,8 @@ export default function settings(): JSX.Element {
                             role="button"
                             aria-label="Edit profile picture"
                             tabIndex={0}
-                            onKeyDown={
-                              /*istanbul ignore next*/
-                              (e) => e.key === 'Enter' && handleImageUpload()
+                            onKeyDown={(e) =>
+                              e.key === 'Enter' && handleImageUpload()
                             }
                           />
                         </div>
@@ -330,18 +329,15 @@ export default function settings(): JSX.Element {
                         data-testid="fileInput"
                         multiple={false}
                         ref={fileInputRef}
-                        onChange={
-                          /* istanbul ignore next */
-                          async (
-                            e: React.ChangeEvent<HTMLInputElement>,
-                          ): Promise<void> => {
-                            const file = e.target?.files?.[0];
-                            if (file) {
-                              const image = await convertToBase64(file);
-                              setUserDetails({ ...userDetails, image });
-                            }
+                        onChange={async (
+                          e: React.ChangeEvent<HTMLInputElement>,
+                        ): Promise<void> => {
+                          const file = e.target?.files?.[0];
+                          if (file) {
+                            const image = await convertToBase64(file);
+                            setUserDetails({ ...userDetails, image });
                           }
-                        }
+                        }}
                         style={{ display: 'none' }}
                       />
                     </Col>