diff --git a/modules/client/src/multisig/internal/client/methods.ts b/modules/client/src/multisig/internal/client/methods.ts index db0235ac..803ad091 100644 --- a/modules/client/src/multisig/internal/client/methods.ts +++ b/modules/client/src/multisig/internal/client/methods.ts @@ -12,6 +12,7 @@ import { MultisigVotingSettings, } from "../../types"; import { + Approver, SubgraphMultisigProposal, SubgraphMultisigProposalListItem, SubgraphMultisigVotingSettings, @@ -25,7 +26,6 @@ import { ProposalCreationStepValue, ProposalQueryParams, ProposalSortBy, - SubgraphMembers, } from "../../../client-common"; import { Multisig__factory } from "@aragon/osx-ethers"; import { @@ -399,7 +399,7 @@ export class MultisigClientMethods extends ClientCore skip = 0, direction = SortDirection.ASC, sortBy = MembersSortBy.ADDRESS, - }: MembersQueryParams): Promise { + }: MembersQueryParams): Promise { // TODO // update this with yup validation if (!isAddress(pluginAddress)) { @@ -415,13 +415,19 @@ export class MultisigClientMethods extends ClientCore sortBy, }; const name = "Multisig members"; - type T = { multisigApprovers: SubgraphMembers }; + type T = { multisigApprovers: any }; const { multisigApprovers } = await this.graphql.request({ query, params, name, }); - return multisigApprovers.map((member) => member.address); + + + + return multisigApprovers.map((member: any) => ({ + address: member.address, + isActive: member.isActive, + })); } /** diff --git a/modules/client/src/multisig/internal/graphql-queries/members.ts b/modules/client/src/multisig/internal/graphql-queries/members.ts index 8203358a..e0be5c92 100644 --- a/modules/client/src/multisig/internal/graphql-queries/members.ts +++ b/modules/client/src/multisig/internal/graphql-queries/members.ts @@ -11,6 +11,7 @@ query MultisigMembers($where: MultisigApprover_filter!, $block: Block_height, $l orderDirection: $direction ) { address + isActive } } `; diff --git a/modules/client/src/multisig/internal/interfaces.ts b/modules/client/src/multisig/internal/interfaces.ts index 1b19011b..effed75a 100644 --- a/modules/client/src/multisig/internal/interfaces.ts +++ b/modules/client/src/multisig/internal/interfaces.ts @@ -29,6 +29,7 @@ import { RemoveAddressesParams, UpdateMultisigVotingSettingsParams, } from "../types"; +import { Approver } from "./types"; // Multisig export interface IMultisigClientMethods { @@ -54,7 +55,7 @@ export interface IMultisigClientMethods { addressOrEns: string, blockNumber?: number, ) => Promise; - getMembers: (params: MembersQueryParams) => Promise; + getMembers: (params: MembersQueryParams) => Promise; getProposal: (proposalId: string) => Promise; getProposals: ( params: ProposalQueryParams, diff --git a/modules/client/src/multisig/internal/types.ts b/modules/client/src/multisig/internal/types.ts index e7ab2140..e590e765 100644 --- a/modules/client/src/multisig/internal/types.ts +++ b/modules/client/src/multisig/internal/types.ts @@ -17,6 +17,11 @@ export type SubgraphMultisigProposal = SubgraphMultisigProposalBase & { creationBlockNumber: string; }; +export type Approver = { + address: string, + isActive: boolean +} + export type SubgraphMultisigApproversListItem = { approver: { address: string }; }; diff --git a/modules/client/test/integration/multisig-client/methods.test.ts b/modules/client/test/integration/multisig-client/methods.test.ts index 730c5683..2d239ae1 100644 --- a/modules/client/test/integration/multisig-client/methods.test.ts +++ b/modules/client/test/integration/multisig-client/methods.test.ts @@ -548,7 +548,7 @@ describe("Client Multisig", () => { ); }); - it("Should get members of the multisig", async () => { + it.only("Should get members of the multisig", async () => { const ctx = new Context(contextParamsLocalChain); const client = new MultisigClient(ctx); const mockedClient = mockedGraphqlRequest.getMockedInstance( @@ -568,6 +568,9 @@ describe("Client Multisig", () => { blockNumber: 123456, }, ); + + console.log("members",members,"wallets", wallets); + expect(wallets.length).toBe(2); expect(wallets).toMatchObject(members); expect(mockedClient.request).toHaveBeenCalledWith(QueryMultisigMembers, {