diff --git a/packages/page-society/src/Candidates/Bid.tsx b/packages/page-society/src/Candidates/Bid.tsx index a35823ee75..8651d74ab2 100644 --- a/packages/page-society/src/Candidates/Bid.tsx +++ b/packages/page-society/src/Candidates/Bid.tsx @@ -22,13 +22,26 @@ function BidRow ({ index, value: { kind, value, who } }: Props): React.ReactElem const { api } = useApi(); const { allAccounts } = useAccounts(); - const isBidder = useMemo( - (): boolean => { - const address = who.toString(); + const [voucher, tip] = useMemo( + () => kind.isVouch + ? kind.asVouch + : [null, null], + [kind] + ); - return allAccounts.some((accountId) => accountId === address); + const [isBidder, isVoucher] = useMemo( + (): [boolean, boolean] => { + const whoSS58 = who.toString(); + const vouchSS58 = voucher && voucher.toString(); + + return [ + allAccounts.some((accountId) => accountId === whoSS58), + vouchSS58 + ? allAccounts.some((accountId) => accountId === vouchSS58) + : false + ]; }, - [allAccounts, who] + [allAccounts, voucher, who] ); return ( @@ -40,18 +53,35 @@ function BidRow ({ index, value: { kind, value, who } }: Props): React.ReactElem