Improve useGaslessGovernanceEnabled

aragon · Feb 7, 2024 · 4aa5e61 · 4aa5e61
1 parent 4f239d8
commit 4aa5e61
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/src/components/membersList/index.tsx b/src/components/membersList/index.tsx
@@ -37,7 +37,7 @@ export const MembersList: React.FC<MembersListProps> = ({
   // Gasless voting plugin support non wrapped tokens
   // Used to hide delegation column in case of gasless voting plugin
   const {data: daoDetails} = useDaoDetailsQuery();
-  const {isGovernanceEnabled} = useGaslessGovernanceEnabled(daoDetails);
+  const {isGovernanceEnabled} = useGaslessGovernanceEnabled({daoDetails});
 
   const isTokenBasedDao = token != null;
   const useCompactMode = isCompactMode ?? !isDesktop;

diff --git a/src/hooks/useExistingToken.tsx b/src/hooks/useExistingToken.tsx
@@ -26,7 +26,7 @@ export const useExistingToken = ({
 } = {}) => {
   const {api: provider} = useProviders();
   const {data: daoDetailsFetched} = useDaoDetailsQuery();
-  const {isGovernanceEnabled} = useGaslessGovernanceEnabled(daoDetails);
+  const {isGovernanceEnabled} = useGaslessGovernanceEnabled({daoDetails});
 
   const dao = useMemo(
     () => daoDetails || daoDetailsFetched,

diff --git a/src/hooks/useGaslessGovernanceEnabled.tsx b/src/hooks/useGaslessGovernanceEnabled.tsx
@@ -3,16 +3,25 @@ import {useVotingSettings} from '../services/aragon-sdk/queries/use-voting-setti
 import {DaoDetails} from '@aragon/sdk-client';
 import {GaslessPluginVotingSettings} from '@vocdoni/gasless-voting';
 
-export const useGaslessGovernanceEnabled = (
-  daoDetails?: DaoDetails | null | undefined
-) => {
-  const pluginType = daoDetails?.plugins[0].id as PluginTypes;
+export const useGaslessGovernanceEnabled = ({
+  pluginType,
+  pluginAddress,
+  daoDetails,
+}: {
+  pluginType?: PluginTypes;
+  pluginAddress?: string;
+  daoDetails?: DaoDetails | null | undefined;
+}) => {
+  const pType =
+    pluginType ?? (daoDetails?.plugins[0].id as PluginTypes) ?? null;
+  const pAddress =
+    pluginAddress ?? (daoDetails?.plugins[0].instanceAddress as string) ?? null;
   const {data: votingSettings} = useVotingSettings({
-    pluginAddress: daoDetails?.plugins[0].instanceAddress as string,
-    pluginType,
+    pluginAddress: pAddress,
+    pluginType: pType,
   });
 
-  const isGasless = pluginType === GaselessPluginName;
+  const isGasless = pType === GaselessPluginName;
   let isGovernanceEnabled = true;
 
   if (isGasless) {

diff --git a/src/pages/mintTokens.tsx b/src/pages/mintTokens.tsx
@@ -42,7 +42,7 @@ export const MintToken: React.FC = () => {
     pluginAddress: daoDetails?.plugins[0].instanceAddress as string,
     pluginType: daoDetails?.plugins[0].id as PluginTypes,
   });
-  const {isGovernanceEnabled} = useGaslessGovernanceEnabled(daoDetails);
+  const {isGovernanceEnabled} = useGaslessGovernanceEnabled({daoDetails});
 
   const {t} = useTranslation();
   const {network} = useNetwork();

diff --git a/src/services/aragon-sdk/queries/use-delegatee.ts b/src/services/aragon-sdk/queries/use-delegatee.ts
@@ -29,7 +29,7 @@ export const useDelegatee = (
   daoDetails: DaoDetails | null | undefined
 ) => {
   const pluginType = daoDetails?.plugins[0].id as PluginTypes;
-  const {isGovernanceEnabled} = useGaslessGovernanceEnabled(daoDetails);
+  const {isGovernanceEnabled} = useGaslessGovernanceEnabled({daoDetails});
 
   const client = usePluginClient(
     pluginType === GaselessPluginName