Skip validator query until it's needed

Joystream · Dec 28, 2023 · 6e750c4 · 6e750c4
1 parent ac96134
commit 6e750c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/ui/src/memberships/modals/BuyMembershipModal/BuyMembershipFormModal.tsx b/packages/ui/src/memberships/modals/BuyMembershipModal/BuyMembershipFormModal.tsx
@@ -133,7 +133,6 @@ export const BuyMembershipForm = ({
   const [formHandleMap, setFormHandleMap] = useState('')
   const { isUploading, uploadAvatarAndSubmit } = useUploadAvatarAndSubmit(onSubmit)
   const { data } = useGetMembersCountQuery({ variables: { where: { handle_eq: formHandleMap } } })
-  const { allValidators, allValidatorsWithCtrlAcc } = useValidators()
 
   const form = useForm<MemberFormFields>({
     resolver: useYupValidationResolver(CreateMemberSchema),
@@ -155,6 +154,7 @@ export const BuyMembershipForm = ({
     'validatorAccountCandidate',
   ])
 
+  const { allValidators, allValidatorsWithCtrlAcc } = useValidators({ skip: isValidator ?? true })
   const [validatorAccounts, setValidatorAccounts] = useState<Account[]>([])
   const validatorAddresses = useMemo(() => {
     if (!allValidatorsWithCtrlAcc || !allValidators) return

diff --git a/packages/ui/src/validators/hooks/useValidators.ts b/packages/ui/src/validators/hooks/useValidators.ts
@@ -2,12 +2,14 @@ import { useContext, useEffect } from 'react'
 
 import { ValidatorsContext } from '../providers/context'
 
-export const useValidators = () => {
+type Props = { skip?: boolean }
+
+export const useValidators = ({ skip = false }: Props = {}) => {
   const { setShouldFetchValidators, allValidators, allValidatorsWithCtrlAcc, validatorsWithMembership } =
     useContext(ValidatorsContext)
 
   useEffect(() => {
-    setShouldFetchValidators(true)
+    if (!skip) setShouldFetchValidators(true)
   }, [])
 
   return { allValidators, allValidatorsWithCtrlAcc, validatorsWithMembership }