From 19bb3e8b999a4071c39d8e62d7ca0e6ac21a4764 Mon Sep 17 00:00:00 2001 From: Ashutosh Kumar Date: Wed, 21 Aug 2024 14:19:46 +0530 Subject: [PATCH] DAO Details for Etherlink --- src/modules/lite/explorer/components/DaoCardDetail.tsx | 4 +--- .../lite/explorer/context/ActionSheets/explorer/index.tsx | 5 +++-- src/modules/lite/explorer/hooks/useIsMember.tsx | 7 ++++++- src/services/utils/utils.ts | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/modules/lite/explorer/components/DaoCardDetail.tsx b/src/modules/lite/explorer/components/DaoCardDetail.tsx index a01a3747..27f22313 100644 --- a/src/modules/lite/explorer/components/DaoCardDetail.tsx +++ b/src/modules/lite/explorer/components/DaoCardDetail.tsx @@ -5,7 +5,6 @@ import { useHistory } from "react-router" import { useTezos } from "services/beacon/hooks/useTezos" import { DashboardContext } from "../context/ActionSheets/explorer" import { updateCount } from "services/services/lite/lite-services" -import { useIsMember } from "../hooks/useIsMember" import { useHoldersTotalCount } from "../hooks/useHolderTotalCount" import ReactHtmlParser from "react-html-parser" @@ -64,11 +63,10 @@ interface DaoCardDetailProps { } export const DaoCardDetail: React.FC = ({ community, setIsUpdated }) => { + console.log("Community", { community }) const navigate = useHistory() const { network, account } = useTezos() - const theme = useTheme() const { isConnected } = useContext(DashboardContext) - const isMember = useIsMember(network, community?.tokenAddress || "", account) const count = useHoldersTotalCount( network, community?.tokenAddress || "", diff --git a/src/modules/lite/explorer/context/ActionSheets/explorer/index.tsx b/src/modules/lite/explorer/context/ActionSheets/explorer/index.tsx index 70caba4f..6821927e 100644 --- a/src/modules/lite/explorer/context/ActionSheets/explorer/index.tsx +++ b/src/modules/lite/explorer/context/ActionSheets/explorer/index.tsx @@ -9,15 +9,16 @@ interface ContextProps { export const DashboardContext = createContext({} as ContextProps) export const AppContextProvider = ({ children }: any) => { - const { account } = useTezos() + const { account, etherlink } = useTezos() const [isConnected, setIsConnected] = useState(false) useEffect(() => { + if (etherlink?.isConnected) return setIsConnected(true) if (account === undefined || !account) { return setIsConnected(false) } return setIsConnected(true) - }, [account]) + }, [account, etherlink]) const values = { isConnected, diff --git a/src/modules/lite/explorer/hooks/useIsMember.tsx b/src/modules/lite/explorer/hooks/useIsMember.tsx index 7929515d..4877eb54 100644 --- a/src/modules/lite/explorer/hooks/useIsMember.tsx +++ b/src/modules/lite/explorer/hooks/useIsMember.tsx @@ -45,7 +45,12 @@ export const useIsMember = (network: Network, tokenAddress: string, memberAddres return } } - fetIsMember() + // TODO: Should be fixed + if (network?.startsWith("etherlink")) { + setIsMember(true) + } else { + fetIsMember() + } return }, [network, tokenAddress, memberAddress]) return isMember diff --git a/src/services/utils/utils.ts b/src/services/utils/utils.ts index 84053631..4cfa41e4 100644 --- a/src/services/utils/utils.ts +++ b/src/services/utils/utils.ts @@ -47,7 +47,7 @@ export const getTokenHoldersCount = async (network: Network, address: string, to // Temporary fix for etherlink if (network.startsWith("etherlink")) { - return 0 + return 1 } const response = await fetch(url)