From 1f76f8cdff6d0f2be8d2e334f424de9ade243fbc Mon Sep 17 00:00:00 2001
From: Ben Furber <ben.furber@googlemail.com>
Date: Wed, 25 Sep 2024 14:11:29 +0100
Subject: [PATCH] fix: right js data copied for user info setting

---
 .../cypress/src/integration/settings.spec.ts  |  2 +-
 .../UserSettings/SettingsPageUserProfile.tsx  | 43 +++++++++----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/packages/cypress/src/integration/settings.spec.ts b/packages/cypress/src/integration/settings.spec.ts
index cf96d3db9a..ebc0d92f27 100644
--- a/packages/cypress/src/integration/settings.spec.ts
+++ b/packages/cypress/src/integration/settings.spec.ts
@@ -43,7 +43,7 @@ describe('[Settings]', () => {
       cy.get('[data-cy="Confirm.modal: Modal"]').should('be.visible')
     })
 
-    it.only('[Edit a new profile]', () => {
+    it('[Edit a new profile]', () => {
       const country = 'Brazil'
       const userImage = 'avatar'
       const displayName = 'settings_member_new'
diff --git a/src/pages/UserSettings/SettingsPageUserProfile.tsx b/src/pages/UserSettings/SettingsPageUserProfile.tsx
index d0c1bc5861..5a87b7e7f4 100644
--- a/src/pages/UserSettings/SettingsPageUserProfile.tsx
+++ b/src/pages/UserSettings/SettingsPageUserProfile.tsx
@@ -2,6 +2,7 @@ import { useState } from 'react'
 import { Form } from 'react-final-form'
 import { ARRAY_ERROR } from 'final-form'
 import arrayMutators from 'final-form-arrays'
+import { toJS } from 'mobx'
 import { Button, Loader } from 'oa-components'
 import { ProfileTypeList } from 'oa-shared'
 import { UnsavedChangesDialog } from 'src/common/Form/UnsavedChangesDialog'
@@ -32,14 +33,15 @@ export const SettingsPageUserProfile = () => {
   const [isLoading, setIsLoading] = useState<boolean>(false)
 
   const { userStore } = useCommonStores().stores
-  const user = userStore.activeUser
+  const user = toJS(userStore.activeUser)
+
+  if (!user) return null
 
   const saveProfile = async (values: IUser) => {
-    if (!user) return
     setIsLoading(true)
 
     const toUpdate = {
-      _id: user?._id,
+      _id: user._id,
       ...values,
     }
 
@@ -88,36 +90,31 @@ export const SettingsPageUserProfile = () => {
 
   const coverImages = new Array(4)
     .fill(null)
-    .map((v, i) => (user?.coverImages[i] ? user?.coverImages[i] : v))
+    .map((v, i) => (user.coverImages[i] ? user.coverImages[i] : v))
 
-  const links = (
-    user && user?.links?.length > 0 ? user.links : [{} as any]
-  ).map((i) => ({
-    ...i,
-    key: uuid(),
-  }))
+  const links = (user && user.links?.length > 0 ? user.links : [{} as any]).map(
+    (i) => ({ ...i, key: uuid() }),
+  )
 
   const initialValues = {
-    profileType: user?.profileType || ProfileTypeList.MEMBER,
-    displayName: user?.displayName || null,
-    userName: user?.userName,
+    profileType: user.profileType || ProfileTypeList.MEMBER,
+    displayName: user.displayName || null,
+    userName: user.userName,
     links,
-    location: user?.location || null,
-    about: user?.about || null,
-    openingHours: user?.openingHours || [{}],
-    workspaceType: user?.workspaceType || null,
-    collectedPlasticTypes: user?.collectedPlasticTypes || null,
-    machineBuilderXp: user?.machineBuilderXp || null,
+    location: user.location || null,
+    about: user.about || null,
+    openingHours: user.openingHours || [{}],
+    workspaceType: user.workspaceType || null,
+    collectedPlasticTypes: user.collectedPlasticTypes || null,
+    machineBuilderXp: user.machineBuilderXp || null,
     isContactableByPublic:
-      user?.isContactableByPublic || DEFAULT_PUBLIC_CONTACT_PREFERENCE,
-    userImage: user?.userImage || null,
+      user.isContactableByPublic || DEFAULT_PUBLIC_CONTACT_PREFERENCE,
+    userImage: user.userImage || null,
     coverImages,
   }
 
   const formId = 'userProfileForm'
 
-  if (!user) return null
-
   return (
     <Form
       id={formId}