Merge pull request #522 from HausDAO/feat/519-tolowercase-queries

fixes queries if dao address isn't lowercase
HausDAO · Sep 6, 2024 · 447e49f · 447e49f
2 parents 98a1e81 + 5aeefe5
commit 447e49f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/libs/moloch-v3-hooks/src/hooks/useConnectedMember.tsx b/libs/moloch-v3-hooks/src/hooks/useConnectedMember.tsx
@@ -26,7 +26,7 @@ export const fetchMember = async ({
   try {
     const res = await findMember({
       networkId: daochain,
-      dao: daoid,
+      dao: daoid.toLowerCase(),
       memberAddress: address.toLowerCase(),
       graphApiKeys,
     });

diff --git a/libs/moloch-v3-hooks/src/hooks/useDaoData.tsx b/libs/moloch-v3-hooks/src/hooks/useDaoData.tsx
@@ -22,7 +22,7 @@ export const fetchDao = async ({
   try {
     const daoRes = await findDao({
       networkId: daoChain,
-      dao: daoId,
+      dao: daoId.toLowerCase(),
       includeTokens: true,
       graphApiKeys,
     });

diff --git a/libs/moloch-v3-hooks/src/hooks/useDaoMember.tsx b/libs/moloch-v3-hooks/src/hooks/useDaoMember.tsx
@@ -24,7 +24,7 @@ const fetchMember = async ({
 
   try {
     const res = await findMember({
-      dao: daoId,
+      dao: daoId.toLowerCase(),
       memberAddress,
       networkId: daoChain,
       graphApiKeys,

diff --git a/libs/moloch-v3-hooks/src/hooks/useDaoMembers.tsx b/libs/moloch-v3-hooks/src/hooks/useDaoMembers.tsx
@@ -111,7 +111,7 @@ export const useDaoMembers = (props?: DaoMembersProps) => {
     [queryId, { daoId, daoChain, filter, ordering, paging }],
     ({ pageParam }) =>
       fetchMembers({
-        daoId,
+        daoId: daoId?.toLowerCase(),
         daoChain,
         graphApiKeys,
         filter,

diff --git a/libs/moloch-v3-hooks/src/hooks/useDaoProposal.tsx b/libs/moloch-v3-hooks/src/hooks/useDaoProposal.tsx
@@ -23,7 +23,7 @@ const fetchProposal = async ({
 
   try {
     const res = await findProposal({
-      dao: daoId,
+      dao: daoId.toLowerCase(),
       proposalId,
       networkId: daoChain,
       graphApiKeys,

diff --git a/libs/moloch-v3-hooks/src/hooks/useDaoProposals.tsx b/libs/moloch-v3-hooks/src/hooks/useDaoProposals.tsx
@@ -110,7 +110,7 @@ export const useDaoProposals = (props?: DaoProposalsProps) => {
     ['proposals', { daoId, daoChain, filter, ordering, paging }],
     ({ pageParam }) =>
       fetchProposals({
-        daoId,
+        daoId: daoId?.toLowerCase(),
         daoChain,
         graphApiKeys,
         filter,

diff --git a/libs/moloch-v3-hooks/src/hooks/useDaoRecords.tsx b/libs/moloch-v3-hooks/src/hooks/useDaoRecords.tsx
@@ -69,7 +69,7 @@ export const useRecords = ({
     [credentialType || recordType, { daoId, chainId }],
     () =>
       fetchRecords({
-        daoId,
+        daoId: daoId.toLowerCase(),
         chainId: chainId as ValidNetwork,
         recordType,
         pageSize,

diff --git a/libs/moloch-v3-macro-ui/src/components/DaoSettings/ShamanList.tsx b/libs/moloch-v3-macro-ui/src/components/DaoSettings/ShamanList.tsx
@@ -31,7 +31,7 @@ export const ShamanList = ({
       </ShamanListContainer>
       {shamen &&
         shamen.map((shaman) => (
-          <ShamanListContainer key={shaman.id}>
+          <ShamanListContainer key={`${shaman.id}-${shaman.permissions}`}>
             <span className="contract">
               <AddressDisplay
                 address={shaman.shamanAddress}