From 96e22136a47b4ca0e5f6444473a22ed0936ca88f Mon Sep 17 00:00:00 2001
From: MartinBraquet <martin.braquet@gmail.com>
Date: Fri, 13 Mar 2026 15:56:43 +0100
Subject: [PATCH] Fix global choices not refreshing after profile creation /
 edition

---
 web/components/optional-profile-form.tsx | 26 +++++++++++-------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/web/components/optional-profile-form.tsx b/web/components/optional-profile-form.tsx
index ddb13ca0..555923bb 100644
--- a/web/components/optional-profile-form.tsx
+++ b/web/components/optional-profile-form.tsx
@@ -20,7 +20,7 @@ import {Profile, ProfileWithoutUser} from 'common/profiles/profile'
 import {PLATFORM_LABELS, type Site, SITE_ORDER, Socials} from 'common/socials'
 import {BaseUser} from 'common/user'
 import {range} from 'lodash'
-import {Fragment, useEffect, useRef, useState} from 'react'
+import {Fragment, useRef, useState} from 'react'
 import Textarea from 'react-expanding-textarea'
 import toast from 'react-hot-toast'
 import {AddOptionEntry} from 'web/components/add-option-entry'
@@ -38,10 +38,9 @@ import {RadioToggleGroup} from 'web/components/widgets/radio-toggle-group'
 import {Select} from 'web/components/widgets/select'
 import {Slider} from 'web/components/widgets/slider'
 import {Title} from 'web/components/widgets/title'
-import {fetchChoices} from 'web/hooks/use-choices'
-import {useLocale, useT} from 'web/lib/locale'
+import {useChoicesContext} from 'web/hooks/use-choices'
+import {useT} from 'web/lib/locale'
 import {track} from 'web/lib/service/analytics'
-import {db} from 'web/lib/supabase/db'
 import {colClassName, labelClassName} from 'web/pages/signup'
 
 import {SocialIcon} from './user/social'
@@ -73,19 +72,14 @@ export const OptionalProfileUserForm = (props: {
 
   const [newLinkPlatform, setNewLinkPlatform] = useState('')
   const [newLinkValue, setNewLinkValue] = useState('')
-  const [interestChoices, setInterestChoices] = useState({})
-  const [causeChoices, setCauseChoices] = useState({})
-  const [workChoices, setWorkChoices] = useState({})
-  const {locale} = useLocale()
+
+  const choices = useChoicesContext()
+  const [interestChoices, setInterestChoices] = useState(choices.interests)
+  const [causeChoices, setCauseChoices] = useState(choices.causes)
+  const [workChoices, setWorkChoices] = useState(choices.work)
 
   const [keywordsString, setKeywordsString] = useState<string>(profile.keywords?.join(', ') || '')
 
-  useEffect(() => {
-    fetchChoices('interests', locale).then(setInterestChoices)
-    fetchChoices('causes', locale).then(setCauseChoices)
-    fetchChoices('work', locale).then(setWorkChoices)
-  }, [db])
-
   const errorToast = () => {
     toast.error(t('profile.optional.error.invalid_fields', 'Some fields are incorrect...'))
   }
@@ -113,6 +107,10 @@ export const OptionalProfileUserForm = (props: {
 
     await onSubmit()
 
+    choices.refreshInterests()
+    choices.refreshCauses()
+    choices.refreshWork()
+
     setIsSubmitting(false)
   }