diff --git a/src/components/common/FollowingButton.tsx b/src/components/common/FollowingButton.tsx index cbf5df7e..f84b1c8f 100644 --- a/src/components/common/FollowingButton.tsx +++ b/src/components/common/FollowingButton.tsx @@ -9,9 +9,8 @@ import { useSubscribeToSite, useUnsubscribeFromSite, useAccountSites, - useAccountAddress, } from "~/queries/site" -import { useConnectModal } from "@crossbell/connect-kit" +import { useAccountState, useConnectModal } from "@crossbell/connect-kit" import clsx from "clsx" export const FollowingButton: React.FC<{ @@ -21,7 +20,7 @@ export const FollowingButton: React.FC<{ size?: "sm" | "xl" loadingStatusChange?: (status: boolean) => void }> = ({ siteId, variant, className, size, loadingStatusChange }) => { - const address = useAccountAddress() + const account = useAccountState((s) => s.computed.account) const subscribeToSite = useSubscribeToSite() const unsubscribeFromSite = useUnsubscribeFromSite() const { show: openConnectModal } = useConnectModal() @@ -31,22 +30,16 @@ export const FollowingButton: React.FC<{ const handleClickSubscribe = async (e: any) => { e.preventDefault() - if (!address) { + if (!account) { setFollowProgress(true) openConnectModal?.() } else if (!userSite.data) { router.push(`${SITE_URL}/dashboard/new-site`) } else if (siteId) { if (subscription.data) { - unsubscribeFromSite.mutate({ - userId: address, - siteId: siteId, - }) + unsubscribeFromSite.mutate({ siteId }) } else { - subscribeToSite.mutate({ - userId: address, - siteId: siteId, - }) + subscribeToSite.mutate({ siteId }) } } } @@ -56,7 +49,7 @@ export const FollowingButton: React.FC<{ useEffect(() => { if ( followProgress && - address && + account && subscription.isSuccess && siteId && userSite.isSuccess @@ -65,10 +58,7 @@ export const FollowingButton: React.FC<{ router.push(`${SITE_URL}/dashboard/new-site`) } if (!subscription.data) { - subscribeToSite.mutate({ - userId: address, - siteId: siteId, - }) + subscribeToSite.mutate({ siteId }) } setFollowProgress(false) } @@ -77,7 +67,7 @@ export const FollowingButton: React.FC<{ userSite.data, router, followProgress, - address, + account, subscription.isSuccess, subscription.data, siteId, diff --git a/src/queries/site.ts b/src/queries/site.ts index 55cbff16..5cff01b9 100644 --- a/src/queries/site.ts +++ b/src/queries/site.ts @@ -121,23 +121,26 @@ export function useSubscribeToSite() { const account = useAccountState((s) => s.computed.account) return useMutation( - async (input: Parameters[0]) => { - return siteModel.subscribeToSite(input, unidata) + async ({ siteId }: { siteId: string }) => { + if (account?.type === "wallet") { + // FIXME: - Support email users + return siteModel.subscribeToSite( + { siteId, userId: account.address }, + unidata, + ) + } }, { - onSuccess: (data, variables) => { - queryClient.invalidateQueries([ - "useGetSiteSubscriptions", - { - siteId: variables.siteId, - }, - ]) - queryClient.invalidateQueries([ - "getSubscription", - variables.siteId, - account?.characterId, - ]) - }, + onSuccess: (data, { siteId }) => + Promise.all([ + queryClient.invalidateQueries(["useGetSiteSubscriptions", siteId]), + + queryClient.invalidateQueries([ + "getSubscription", + siteId, + account?.characterId, + ]), + ]), }, ) } @@ -147,26 +150,25 @@ export function useSubscribeToSites() { const queryClient = useQueryClient() return useMutation( async (input: Parameters[0]) => { + // FIXME: - Support email users return siteModel.subscribeToSites(input, contract) }, { - onSuccess: (data, variables) => { - variables.sites.forEach((site) => { - queryClient.invalidateQueries([ - "useGetSiteSubscriptions", - { - siteId: site.characterId, - }, - ]) - queryClient.invalidateQueries([ - "getSubscription", - { - userId: variables.user.metadata?.proof, - siteId: site.characterId, - }, - ]) - }) - }, + onSuccess: (data, variables) => + Promise.all( + variables.sites.flatMap((site) => [ + queryClient.invalidateQueries([ + "useGetSiteSubscriptions", + site.characterId, + ]), + + queryClient.invalidateQueries([ + "getSubscription", + site.characterId, + variables.user.metadata?.proof, + ]), + ]), + ), }, ) } @@ -177,23 +179,25 @@ export function useUnsubscribeFromSite() { const account = useAccountState((s) => s.computed.account) return useMutation( - async (input: Parameters[0]) => { - return siteModel.unsubscribeFromSite(input, unidata) + async ({ siteId }: { siteId: string }) => { + if (account?.type === "wallet") { + // FIXME: - Support email users + return siteModel.unsubscribeFromSite( + { siteId, userId: account.address }, + unidata, + ) + } }, { - onSuccess: (data, variables) => { - queryClient.invalidateQueries([ - "useGetSiteSubscriptions", - { - siteId: variables.siteId, - }, - ]) - queryClient.invalidateQueries([ - "getSubscription", - variables.siteId, - account?.characterId, - ]) - }, + onSuccess: (data, { siteId }) => + Promise.all([ + queryClient.invalidateQueries(["useGetSiteSubscriptions", siteId]), + queryClient.invalidateQueries([ + "getSubscription", + siteId, + account?.characterId, + ]), + ]), }, ) }