diff --git a/packages/page-democracy/src/Overview/PreImage.tsx b/packages/page-democracy/src/Overview/PreImage.tsx index 3cbeba0ba2..a7f497d614 100644 --- a/packages/page-democracy/src/Overview/PreImage.tsx +++ b/packages/page-democracy/src/Overview/PreImage.tsx @@ -8,7 +8,7 @@ import type { HexString } from '@polkadot/util/types'; import React, { useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; -import { Extrinsic, Input, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components'; +import { Extrinsic, InputAddress, InputBalance, Modal, Static, TxButton } from '@polkadot/react-components'; import { useApi } from '@polkadot/react-hooks'; import { Available } from '@polkadot/react-query'; import { BN, BN_ZERO, isString } from '@polkadot/util'; @@ -94,12 +94,11 @@ function PreImage ({ className = '', imageHash, isImminent = false, onClose }: P label={t('propose')} onChange={setProposal} /> - ('The hash of the selected proposal, use it for submitting the proposal')} - isDisabledError={!isMatched} label={t('preimage hash')} value={encodedHash} + withCopy /> {!isImminent && storageFee && ( @@ -137,13 +136,4 @@ export default React.memo(styled(PreImage)` margin: 0.5rem 0; text-align: right; } - - .disabledLook .ui.input > input { - background: transparent; - border-style: dashed; - &:focus{ - background: transparent; - border-color: #d9d8d7; - } - } `); diff --git a/packages/page-preimages/src/Preimages/Add.tsx b/packages/page-preimages/src/Preimages/Add.tsx index eece6c32d3..80a1964103 100644 --- a/packages/page-preimages/src/Preimages/Add.tsx +++ b/packages/page-preimages/src/Preimages/Add.tsx @@ -4,9 +4,8 @@ import type { SubmittableExtrinsic } from '@polkadot/api/types'; import React, { useEffect, useState } from 'react'; -import styled from 'styled-components'; -import { Button, Extrinsic, Input, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components'; +import { Button, Extrinsic, InputAddress, InputBalance, Modal, Static, TxButton } from '@polkadot/react-components'; import { useApi, useToggle } from '@polkadot/react-hooks'; import { Available } from '@polkadot/react-query'; import { BN, BN_ZERO } from '@polkadot/util'; @@ -93,19 +92,17 @@ function Add ({ className, imageHash }: Props): React.ReactElement { label={t('propose')} onChange={setProposal} /> - ('The hash of the selected proposal, use it for submitting the proposal')} - isDisabledError={!isMatched} label={t('preimage hash')} value={encodedHash} + withCopy /> - ('The encoded length of the selected proposal, as available on-chain')} - isDisabledError={!isMatched} label={t('preimage length')} value={encodedLength.toString()} + withCopy /> {!storageFee.isZero() && ( @@ -141,13 +138,4 @@ function Add ({ className, imageHash }: Props): React.ReactElement { ); } -export default React.memo(styled(Add)` - .disabledLook .ui.input > input { - background: transparent; - border-style: dashed; - &:focus{ - background: transparent; - border-color: #d9d8d7; - } - } -`); +export default React.memo(Add); diff --git a/packages/react-components/src/Expander.tsx b/packages/react-components/src/Expander.tsx index e1ba573f29..24ea5a4fbd 100644 --- a/packages/react-components/src/Expander.tsx +++ b/packages/react-components/src/Expander.tsx @@ -110,14 +110,14 @@ function Expander ({ children, className = '', help, helpIcon, isHeader, isLeft, {isLeft && icon}
- {help && ( - - )} {summaryHead}
+ {help && ( + + )} {summary} {headerSub && (
{isExpanded ? headerSub : headerSubMini}