diff --git a/packages/page-council/src/Overview/Candidate.tsx b/packages/page-council/src/Overview/Candidate.tsx
index f1242960d6..82e60af2f5 100644
--- a/packages/page-council/src/Overview/Candidate.tsx
+++ b/packages/page-council/src/Overview/Candidate.tsx
@@ -5,8 +5,7 @@
import { AccountId, Balance } from '@polkadot/types/interfaces';
import React from 'react';
-import styled from 'styled-components';
-import { AddressSmall, Badge, Icon } from '@polkadot/react-components';
+import { AddressSmall, Tag } from '@polkadot/react-components';
import { FormatBalance } from '@polkadot/react-query';
import { useTranslation } from '../translate';
@@ -24,22 +23,17 @@ function Candidate ({ className, address, balance, isPrime, voters }: Props): Re
const { t } = useTranslation();
return (
-
|
|
-
+ |
{isPrime && (
-
- }
- isInline
- isTooltip
- type='green'
- />
- {t('prime voter')}
-
+
)}
|
@@ -56,20 +50,4 @@ function Candidate ({ className, address, balance, isPrime, voters }: Props): Re
);
}
-export default React.memo(styled(Candidate)`
- &.council--isPrime {
- td {
- background-color: rgba(239, 255, 239, 0.8) !important;
- }
- }
-
- .council--prime > div {
- display: inline-flex;
- align-items: center;
- white-space: nowrap;
-
- > span {
- color: green;
- }
- }
-`);
+export default React.memo(Candidate);
diff --git a/packages/page-democracy/src/Overview/Referendum.tsx b/packages/page-democracy/src/Overview/Referendum.tsx
index ecc2871720..3e79d81501 100644
--- a/packages/page-democracy/src/Overview/Referendum.tsx
+++ b/packages/page-democracy/src/Overview/Referendum.tsx
@@ -79,7 +79,7 @@ function Referendum ({ className, value }: Props): React.ReactElement | n
)}
|
-
+ |
{isBoolean(isPassing) && (
+
|
|
-
+ |
{isHead && (
-
- }
- isInline
- isTooltip
- type='green'
- />
- {t('society head')}
-
+
)}
|
+ |
{strikes.toString()}
@@ -46,20 +41,4 @@ function Member ({ className, isHead, value: { accountId, strikes } }: Props): R
);
}
-export default React.memo(styled(Member)`
- &.society--isHead {
- td {
- background-color: rgba(239, 255, 239, 0.8) !important;
- }
- }
-
- .society--head > div {
- display: inline-flex;
- align-items: center;
- white-space: nowrap;
-
- > span {
- color: green;
- }
- }
-`);
+export default React.memo(Member);
diff --git a/packages/page-tech-comm/src/Overview/Members.tsx b/packages/page-tech-comm/src/Overview/Members.tsx
index ee18bf246c..21502eeeca 100644
--- a/packages/page-tech-comm/src/Overview/Members.tsx
+++ b/packages/page-tech-comm/src/Overview/Members.tsx
@@ -5,8 +5,7 @@
import { AccountId } from '@polkadot/types/interfaces';
import React from 'react';
-import styled from 'styled-components';
-import { AddressSmall, Badge, Icon, Table } from '@polkadot/react-components';
+import { AddressSmall, Table, Tag } from '@polkadot/react-components';
import { useTranslation } from '../translate';
@@ -25,32 +24,23 @@ function Members ({ className, members, prime }: Props): React.ReactElement
- {members.map((accountId): React.ReactNode => {
- const isPrime = prime?.toString() === accountId.toString();
-
- return (
-
- |
-
- |
-
- {isPrime && (
-
- }
- isInline
- type='green'
- />
- {' '}{t('prime voter')}
-
- )}
- |
-
- );
- })}
+ {members.map((accountId): React.ReactNode => (
+
+ |
+
+ |
+
+ {prime?.eq(accountId) && (
+
+ )}
+ |
+ |
+
+ ))}
)
@@ -60,17 +50,4 @@ function Members ({ className, members, prime }: Props): React.ReactElement div {
- display: inline-flex;
- align-items: center;
- white-space: nowrap;
-
- > span {
- color: green;
- }
- }
-`);
+export default React.memo(Members);
| |