Skip to content

Commit b25a163

Browse files
committed
added proposal module to proposal response
1 parent c1c60eb commit b25a163

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

src/formulas/formulas/contract/proposal/daoProposalMultiple/formulas.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ export const proposal: ContractFormula<
7878
}),
7979
])
8080
: [undefined, undefined]
81-
const proposalModulePrefix = daoProposalModules?.find(
81+
const proposalModule = daoProposalModules?.find(
8282
(m) => m.address === contractAddress
83-
)?.prefix
83+
)
8484

8585
const idNum = Number(id)
8686
const proposal =
@@ -99,12 +99,13 @@ export const proposal: ContractFormula<
9999

100100
return {
101101
...(await intoResponse(env, proposal, idNum)),
102+
...(proposalModule && {
103+
proposalModule,
104+
daoProposalId: `${proposalModule.prefix}${id}`,
105+
}),
102106
...(daoAddress && {
103-
hideFromSearch: !!hideFromSearch,
104107
dao: daoAddress,
105-
...(proposalModulePrefix && {
106-
daoProposalId: `${proposalModulePrefix}${id}`,
107-
}),
108+
hideFromSearch: !!hideFromSearch,
108109
}),
109110
}
110111
},

src/formulas/formulas/contract/proposal/daoProposalSingle/formulas.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ export const proposal: ContractFormula<
7878
}),
7979
])
8080
: [undefined, undefined]
81-
const proposalModulePrefix = daoProposalModules?.find(
81+
const proposalModule = daoProposalModules?.find(
8282
(m) => m.address === contractAddress
83-
)?.prefix
83+
)
8484

8585
const idNum = Number(id)
8686
let proposal = (
@@ -118,12 +118,13 @@ export const proposal: ContractFormula<
118118

119119
return {
120120
...(await intoResponse(env, proposal, idNum, { v2 })),
121+
...(proposalModule && {
122+
proposalModule,
123+
daoProposalId: `${proposalModule.prefix}${id}`,
124+
}),
121125
...(daoAddress && {
122-
hideFromSearch: !!hideFromSearch,
123126
dao: daoAddress,
124-
...(proposalModulePrefix && {
125-
daoProposalId: `${proposalModulePrefix}${id}`,
126-
}),
127+
hideFromSearch: !!hideFromSearch,
127128
}),
128129
}
129130
},

0 commit comments

Comments
 (0)