diff --git a/packages/page-society/src/Candidates/Bid.tsx b/packages/page-society/src/Candidates/Bid.tsx
index 81f4a0102e..66bdf09ba2 100644
--- a/packages/page-society/src/Candidates/Bid.tsx
+++ b/packages/page-society/src/Candidates/Bid.tsx
@@ -49,7 +49,29 @@ function BidRow ({ index, value: { kind, value, who } }: Props): React.ReactElem
|
-
+
+
+ {kind.isVouch
+ ? isVoucher && (
+ ('Unvouch')}
+ params={[index]}
+ tx={api.tx.society.unvouch}
+ />
+ )
+ : isBidder && (
+ ('Unbid')}
+ params={[index]}
+ tx={api.tx.society.unbid}
+ />
+ )
+ }
+ |
|
@@ -58,30 +80,6 @@ function BidRow ({ index, value: { kind, value, who } }: Props): React.ReactElem
)}
-
- {kind.isVouch
- ? (
- ('Unvouch')}
- params={[index]}
- tx={api.tx.society.unvouch}
- />
- )
- : (
- ('Unbid')}
- params={[index]}
- tx={api.tx.society.unbid}
- />
- )
- }
- |
);
}
diff --git a/packages/page-society/src/Candidates/BidType.tsx b/packages/page-society/src/Candidates/BidType.tsx
index cd9ed4e752..3df49a00ed 100644
--- a/packages/page-society/src/Candidates/BidType.tsx
+++ b/packages/page-society/src/Candidates/BidType.tsx
@@ -4,14 +4,16 @@
import type { PalletSocietyBidKind } from '@polkadot/types/lookup';
import React, { useMemo } from 'react';
+import styled from 'styled-components';
import { AddressSmall } from '@polkadot/react-components';
interface Props {
+ className?: string;
value?: PalletSocietyBidKind;
}
-function BidType ({ value }: Props): React.ReactElement {
+function BidType ({ className, value }: Props): React.ReactElement {
const vouchId = useMemo(
() => value?.isVouch
? value.asVouch[0]
@@ -20,11 +22,23 @@ function BidType ({ value }: Props): React.ReactElement {
);
return (
- <>
- {value && value.type} |
- {vouchId && } |
- >
+
+
{value && value.type}
+ {vouchId &&
}
+
);
}
-export default React.memo(BidType);
+export default React.memo(styled(BidType)`
+ align-items: center;
+ display: flex;
+ flex-wrap: no-wrap;
+
+ > div {
+ flex: 0;
+
+ &:first-child {
+ padding-right: 1.5rem;
+ }
+ }
+`);
diff --git a/packages/page-society/src/Candidates/Bids.tsx b/packages/page-society/src/Candidates/Bids.tsx
index 4ab86a202e..3138c2985c 100644
--- a/packages/page-society/src/Candidates/Bids.tsx
+++ b/packages/page-society/src/Candidates/Bids.tsx
@@ -22,10 +22,9 @@ function Bids ({ className }: Props): React.ReactElement {
const headerRef = useRef([
[t('bids'), 'start'],
- [t('bid kind'), 'start', 2],
+ [t('bid kind'), 'start'],
[t('value')],
- [t('tip')],
- []
+ [t('tip')]
]);
return (
diff --git a/packages/page-society/src/Candidates/Candidate.tsx b/packages/page-society/src/Candidates/Candidate.tsx
index 539742c268..e12e24f1e7 100644
--- a/packages/page-society/src/Candidates/Candidate.tsx
+++ b/packages/page-society/src/Candidates/Candidate.tsx
@@ -42,7 +42,9 @@ function Candidate ({ allMembers, isMember, ownMembers, value: { accountId, kind
|
-
+
+
+ |
|
diff --git a/packages/page-society/src/Candidates/Candidates.tsx b/packages/page-society/src/Candidates/Candidates.tsx
index da732050a3..9e7578b74d 100644
--- a/packages/page-society/src/Candidates/Candidates.tsx
+++ b/packages/page-society/src/Candidates/Candidates.tsx
@@ -23,7 +23,7 @@ function Candidates ({ allMembers, candidates, className = '', isMember, ownMemb
const headerRef = useRef([
[t('candidates'), 'start'],
- [t('bid kind'), 'start', 2],
+ [t('bid kind'), 'start'],
[t('value')],
[undefined, 'expand'],
[]
diff --git a/packages/page-society/src/Suspended/Suspension.tsx b/packages/page-society/src/Suspended/Suspension.tsx
index f8282405e5..debfcbf894 100644
--- a/packages/page-society/src/Suspended/Suspension.tsx
+++ b/packages/page-society/src/Suspended/Suspension.tsx
@@ -23,7 +23,9 @@ function Suspension ({ balance, bid, value }: Props): React.ReactElement
|
-
+
+
+ |
{balance && (
diff --git a/packages/page-society/src/Suspended/index.tsx b/packages/page-society/src/Suspended/index.tsx
index 665e6f4f3d..4e5a639c71 100644
--- a/packages/page-society/src/Suspended/index.tsx
+++ b/packages/page-society/src/Suspended/index.tsx
@@ -52,11 +52,11 @@ function Suspended ({ className }: Props): React.ReactElement {
const headerRef = useRef({
candidates: [
[t('candidates'), 'start'],
- [t('bid kind'), 'start', 2],
+ [t('bid kind'), 'start'],
[t('value')]
],
members: [
- [t('members'), 'start']
+ [t('members'), 'start', 3]
]
});
|