Merge pull request #595 from dappforce/improvement/event

No finish login from effect after submit create profile
dappforce · Mar 13, 2024 · 4f7a17b · 4f7a17b
2 parents 3d3a0e0 + c010e5d
commit 4f7a17b
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/components/auth/LoginModal/CreateProfileModal.tsx b/src/components/auth/LoginModal/CreateProfileModal.tsx
@@ -13,7 +13,7 @@ import { useMyMainAddress } from '@/stores/my-account'
 import { cx } from '@/utils/class-names'
 import { encodeProfileSource } from '@/utils/profile'
 import { zodResolver } from '@hookform/resolvers/zod'
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { Controller, useForm } from 'react-hook-form'
 import { z } from 'zod'
 import { finishLogin, getRedirectCallback } from './utils'
@@ -26,9 +26,10 @@ export default function CreateProfileModal({
   const hasRedirectCallback = !!getRedirectCallback()
   const myAddress = useMyMainAddress()
   const { data: profile } = getProfileQuery.useQuery(myAddress ?? '')
+  const hasSubmitted = useRef(false)
 
   useEffect(() => {
-    if (profile?.profileSpace?.id) {
+    if (profile?.profileSpace?.id && !hasSubmitted.current) {
       finishLogin(props.closeModal)
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -47,6 +48,7 @@ export default function CreateProfileModal({
     >
       <CreateProfileForm
         loadingUntilTxSuccess={hasRedirectCallback}
+        onSubmit={() => (hasSubmitted.current = true)}
         onTxSuccess={
           hasRedirectCallback
             ? () => {
@@ -76,10 +78,12 @@ const formSchema = z.object({
 type FormSchema = z.infer<typeof formSchema>
 
 function CreateProfileForm({
+  onSubmit,
   onSuccessSent,
   onTxSuccess,
   loadingUntilTxSuccess,
 }: {
+  onSubmit?: () => void
   onSuccessSent?: () => void
   onTxSuccess?: () => void
   loadingUntilTxSuccess?: boolean
@@ -116,8 +120,9 @@ function CreateProfileForm({
       }}
     >
       {({ mutateAsync, isLoading }) => {
-        const onSubmit = handleSubmit(async (data) => {
+        const handleCreateProfileSubmit = handleSubmit(async (data) => {
           sendEvent('account_settings_changed', { profileSource: 'custom' })
+          onSubmit?.()
           await mutateAsync({
             content: {
               name: data.name,
@@ -133,7 +138,10 @@ function CreateProfileForm({
         })
 
         return (
-          <form onSubmit={onSubmit} className={cx('flex flex-col gap-4')}>
+          <form
+            onSubmit={handleCreateProfileSubmit}
+            className={cx('flex flex-col gap-4')}
+          >
             <div className='self-center'>
               <Controller
                 control={control}