diff --git a/src/formulas/formulas/contract/proposal/daoProposalMultiple/formulas.ts b/src/formulas/formulas/contract/proposal/daoProposalMultiple/formulas.ts index d8556d9..c7f81f9 100644 --- a/src/formulas/formulas/contract/proposal/daoProposalMultiple/formulas.ts +++ b/src/formulas/formulas/contract/proposal/daoProposalMultiple/formulas.ts @@ -78,9 +78,9 @@ export const proposal: ContractFormula< }), ]) : [undefined, undefined] - const proposalModulePrefix = daoProposalModules?.find( + const proposalModule = daoProposalModules?.find( (m) => m.address === contractAddress - )?.prefix + ) const idNum = Number(id) const proposal = @@ -99,12 +99,13 @@ export const proposal: ContractFormula< return { ...(await intoResponse(env, proposal, idNum)), + ...(proposalModule && { + proposalModule, + daoProposalId: `${proposalModule.prefix}${id}`, + }), ...(daoAddress && { hideFromSearch: !!hideFromSearch, dao: daoAddress, - ...(proposalModulePrefix && { - daoProposalId: `${proposalModulePrefix}${id}`, - }), }), } }, diff --git a/src/formulas/formulas/contract/proposal/daoProposalSingle/formulas.ts b/src/formulas/formulas/contract/proposal/daoProposalSingle/formulas.ts index 2a0acf0..281856c 100644 --- a/src/formulas/formulas/contract/proposal/daoProposalSingle/formulas.ts +++ b/src/formulas/formulas/contract/proposal/daoProposalSingle/formulas.ts @@ -78,9 +78,9 @@ export const proposal: ContractFormula< }), ]) : [undefined, undefined] - const proposalModulePrefix = daoProposalModules?.find( + const proposalModule = daoProposalModules?.find( (m) => m.address === contractAddress - )?.prefix + ) const idNum = Number(id) let proposal = ( @@ -118,12 +118,13 @@ export const proposal: ContractFormula< return { ...(await intoResponse(env, proposal, idNum, { v2 })), + ...(proposalModule && { + proposalModule, + daoProposalId: `${proposalModule.prefix}${id}`, + }), ...(daoAddress && { - hideFromSearch: !!hideFromSearch, dao: daoAddress, - ...(proposalModulePrefix && { - daoProposalId: `${proposalModulePrefix}${id}`, - }), + hideFromSearch: !!hideFromSearch, }), } },