fixed other areas that needs to hard token hardcoded as 18

Author: ashutoshpw

src/modules/etherlink/components/EvmProposalVoteDetail.tsx

@@ -35,7 +35,9 @@ export const EvmProposalVoteDetail: React.FC<{
       tokenAddress: daoSelected?.token,
       tokenID: daoSelected?.id,
       symbol: daoSelected?.symbol,
-      decimals: daoSelected?.decimals
+      // decimals: daoSelected?.decimals || 18
+      // Hardcoded because of https://github.com/dOrgTech/homebase-app/issues/932
+      decimals: 18
     }),
     [daoSelected]
   )

src/modules/etherlink/components/EvmProposalVoterList.tsx

@@ -23,6 +23,7 @@ import { etherlinkStyled as _est } from "components/ui"
 const { Container, CustomContent, Header, VotesRow, StyledTableCell, StyledTableRow, CopyIcon } = _est
 import OpenInNewIcon from "@mui/icons-material/OpenInNew"
 import { getBlockExplorerUrl } from "modules/etherlink/utils"
+import { ethers } from "ethers"
 interface IVoter {
   voter: string
   option: number
@@ -37,7 +38,7 @@ export const EvmProposalVoterList = () => {
   const theme = useTheme()
   const isMobileSmall = useMediaQuery(theme.breakpoints.down("sm"))
   const { copyAddress, showProposalVoterList, setShowProposalVoterList } = useEvmDaoUiOps()
-  const { daoProposalSelected, daoProposalVoters, network } = useContext(EtherlinkContext)
+  const { daoProposalSelected, daoProposalVoters, network, daoSelected } = useContext(EtherlinkContext)
 
   // Sort votes by cast time (desc)
   const sortedVotes: IVoter[] = useMemo(() => {
@@ -69,6 +70,17 @@ export const EvmProposalVoterList = () => {
     }
   }, [daoProposalVoters])
 
+  const formatWeight = (weight: number | string): string => {
+    try {
+      const decimals = daoSelected?.decimals || 18
+      const weightStr = String(weight)
+      if (!weightStr || weightStr === "0") return "0"
+      return ethers.formatUnits(weightStr, decimals)
+    } catch {
+      return String(weight)
+    }
+  }
+
   const handlePageClick = (event: { selected: number }) => {
     setCurrentPage(event.selected)
   }
@@ -153,7 +165,7 @@ export const EvmProposalVoterList = () => {
                           </Grid>
                           <Grid item container direction="row" alignItems="center" justifyContent="center">
                             <Typography color="textPrimary" variant="body1">
-                              {row.weight}
+                              {formatWeight(row.weight)}
                             </Typography>
                           </Grid>
                         </Grid>{" "}
@@ -176,7 +188,7 @@ export const EvmProposalVoterList = () => {
                         <StyledTableCell align="right">
                           {" "}
                           <Typography color="textPrimary" variant="body1">
-                            {row.weight}
+                            {formatWeight(row.weight)}
                           </Typography>
                         </StyledTableCell>
                         <StyledTableCell align="right">

src/services/contracts/etherlinkDAO/hooks/useEvmProposalOps.tsx

@@ -475,7 +475,9 @@ export const useEvmProposalCreateZustantStore = create<EvmProposalCreateStore>()
           typeof targetAmountStr === "string" && targetAmountStr.trim() !== "" && !isNaN(Number(targetAmountStr))
 
         if (hasValidAddress && hasValidAmount) {
-          const amountWithDecimals = ethers.parseUnits(targetAmountStr, tokenDecimals || 0)
+          // const tokenActualDecimals = tokenDecimals || 18
+          // Hardcoded because of https://github.com/dOrgTech/homebase-app/issues/932
+          const amountWithDecimals = ethers.parseUnits(targetAmountStr, 18)
           const encodedData = iface.encodeFunctionData(selectedInterface.name, [targetAddress, amountWithDecimals])
           payload.createProposalPayload = {
             ...get().createProposalPayload,

src/services/wagmi/etherlink/hooks/useDaoState.ts

@@ -101,7 +101,13 @@ export const useDaoState = ({ network }: { network: string }) => {
     if (!firebaseRootCollection) return
     if (firestoreData?.[firebaseRootCollection]) {
       const allDaoList = firestoreData[firebaseRootCollection]
-      setDaoData(allDaoList)
+      const normalizedDaoList = allDaoList.map((dao: any) => ({
+        ...dao,
+        // decimals: dao.decimals || 18
+        // Hardcoded because of https://github.com/dOrgTech/homebase-app/issues/932
+        decimals: 18
+      }))
+      setDaoData(normalizedDaoList)
       setIsLoadingDaos(false)
     }
     const firestoreNetworkName = getFirestoreNetworkName(network)
@@ -721,7 +727,10 @@ export const useDaoState = ({ network }: { network: string }) => {
     (daoId: string) => {
       const dao = daoData.find(dao => (dao?.id || "").toLowerCase() === (daoId || "").toLowerCase())
       if (dao) {
-        setDaoSelected(dao)
+        setDaoSelected({
+          ...dao,
+          decimals: dao.decimals || 18
+        })
         selectedDaoIdRef.current = daoId
       }
     },