Merge pull request #792 from haqq-network/dev

release
haqq-network · Apr 25, 2024 · e021c13 · e021c13 · vercel · Apr 26, 2024
2 parents 5d77b2a + b665a57
commit e021c13
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/libs/data-access/cosmos/src/lib/data-access-cosmos.ts b/libs/data-access/cosmos/src/lib/data-access-cosmos.ts
@@ -482,7 +482,6 @@ export function createCosmosService(cosmosRestEndpoint: string): CosmosService {
   }
 
   async function getProposalTally(id: string) {
-    console.log('getProposalTally', { id });
     const getProposalTallyUrl = new URL(
       `${cosmosRestEndpoint}${generateEndpointProposalTally(id)}`,
     );

diff --git a/libs/shell/governance/src/lib/proposal-details-page.tsx b/libs/shell/governance/src/lib/proposal-details-page.tsx
@@ -356,7 +356,8 @@ export function ProposalDetailsComponent({
 
     const voted = Number.parseInt(
       formatUnits(
-        BigInt(proposalTally.no) +
+        BigInt(proposalTally.abstain) +
+          BigInt(proposalTally.no) +
           BigInt(proposalTally.no_with_veto) +
           BigInt(proposalTally.yes),
         18,

diff --git a/libs/shell/shared/src/hooks/use-authz-actions/use-authz-actions.tsx b/libs/shell/shared/src/hooks/use-authz-actions/use-authz-actions.tsx
@@ -54,7 +54,11 @@ export function useAuthzActions(): AuthzActionsHook {
   const { haqqAddress, ethAddress } = useAddress();
   const chains = useSupportedChains();
   const { chain = chains[0] } = useNetwork();
-  const chainParams = getChainParams(chain.id);
+  const chainParams = getChainParams(
+    chain.unsupported !== undefined && !chain.unsupported
+      ? chain.id
+      : chains[0].id,
+  );
   const haqqChain = mapToCosmosChain(chainParams);
 
   const handleGrant = useCallback(

diff --git a/libs/shell/shared/src/hooks/use-proposal-actions/use-proposal-actions.ts b/libs/shell/shared/src/hooks/use-proposal-actions/use-proposal-actions.ts
@@ -47,7 +47,11 @@ export function useProposalActions(): ProposalActionsHook {
   const chains = useSupportedChains();
   const { haqqAddress, ethAddress } = useAddress();
   const { chain = chains[0] } = useNetwork();
-  const chainParams = getChainParams(chain.id);
+  const chainParams = getChainParams(
+    chain.unsupported !== undefined && !chain.unsupported
+      ? chain.id
+      : chains[0].id,
+  );
   const haqqChain = mapToCosmosChain(chainParams);
 
   const handleVote = useCallback(
@@ -56,7 +60,6 @@ export function useProposalActions(): ProposalActionsHook {
       option: number,
       estimatedFee?: EstimatedFeeResponse,
     ) => {
-      console.log('handleVote', { proposalId, option });
       const pubkey = await getPubkey(ethAddress as string);
       const sender = await getSender(haqqAddress as string, pubkey);
       const memo = `Vote for proposal #${proposalId}`;

diff --git a/libs/shell/ui-kit/src/components/proposal-vote-progress/proposal-vote-progress.tsx b/libs/shell/ui-kit/src/components/proposal-vote-progress/proposal-vote-progress.tsx
@@ -70,7 +70,7 @@ export function ProposalVoteProgress({
     };
   }, [results]);
 
-  const [yesPercents, abstainPercents, noPercents, vetoPercents] =
+  const [yesPercents, noPercents, abstainPercents, vetoPercents] =
     useMemo(() => {
       if (total === 0) {
         return [0, 0, 0, 0];