diff --git a/packages/features/bookings/Booker/components/hooks/useVerifyEmail.ts b/packages/features/bookings/Booker/components/hooks/useVerifyEmail.ts index 83353909ad..22d4dc24ba 100644 --- a/packages/features/bookings/Booker/components/hooks/useVerifyEmail.ts +++ b/packages/features/bookings/Booker/components/hooks/useVerifyEmail.ts @@ -23,6 +23,7 @@ export const useVerifyEmail = ({ const [isEmailVerificationModalVisible, setEmailVerificationModalVisible] = useState(false); const verifiedEmail = useBookerStore((state) => state.verifiedEmail); const setVerifiedEmail = useBookerStore((state) => state.setVerifiedEmail); + const isRescheduling = useBookerStore((state) => Boolean(state.rescheduleUid && state.bookingData)); const debouncedEmail = useDebounce(email, 600); const { data: session } = useSession(); @@ -44,7 +45,7 @@ export const useVerifyEmail = ({ email: debouncedEmail, }, { - enabled: !!debouncedEmail, + enabled: !!debouncedEmail && !isRescheduling, } ); @@ -60,6 +61,7 @@ export const useVerifyEmail = ({ const isVerificationCodeSending = sendEmailVerificationByCodeMutation.isPending; const renderConfirmNotVerifyEmailButtonCond = + isRescheduling || (!requiresBookerEmailVerification && !isEmailVerificationRequired) || (email && verifiedEmail && verifiedEmail === email); diff --git a/packages/platform/atoms/hooks/useVerifyEmail.ts b/packages/platform/atoms/hooks/useVerifyEmail.ts index 1b55a56cde..7b687c322b 100644 --- a/packages/platform/atoms/hooks/useVerifyEmail.ts +++ b/packages/platform/atoms/hooks/useVerifyEmail.ts @@ -33,6 +33,7 @@ export const useVerifyEmail = ({ const [isEmailVerificationModalVisible, setEmailVerificationModalVisible] = useState(false); const verifiedEmail = useBookerStore((state) => state.verifiedEmail); const setVerifiedEmail = useBookerStore((state) => state.setVerifiedEmail); + const isRescheduling = useBookerStore((state) => Boolean(state.rescheduleUid && state.bookingData)); const debouncedEmail = useDebounce(email, 600); const { data: user } = useMe(); @@ -53,7 +54,7 @@ export const useVerifyEmail = ({ throw new Error(res.data.error.message); }); }, - enabled: !!debouncedEmail, + enabled: !!debouncedEmail && !isRescheduling, }); const sendEmailVerificationMutation = useMutation< @@ -90,6 +91,7 @@ export const useVerifyEmail = ({ const isVerificationCodeSending = sendEmailVerificationMutation.isPending; const renderConfirmNotVerifyEmailButtonCond = + isRescheduling || (!requiresBookerEmailVerification && !isEmailVerificationRequired) || (email && verifiedEmail && verifiedEmail === email);