diff --git a/packages/app-accounts/src/modals/Backup.tsx b/packages/app-accounts/src/modals/Backup.tsx index e3a5127e0b..0f7a5d7ae5 100644 --- a/packages/app-accounts/src/modals/Backup.tsx +++ b/packages/app-accounts/src/modals/Backup.tsx @@ -68,7 +68,6 @@ export default function ({ address, onClose }: Props): React.ReactElement { {this.renderContent()} {this.renderButtons()} diff --git a/packages/app-accounts/src/modals/Create.tsx b/packages/app-accounts/src/modals/Create.tsx index 8bad72a162..16b2ed9176 100644 --- a/packages/app-accounts/src/modals/Create.tsx +++ b/packages/app-accounts/src/modals/Create.tsx @@ -191,7 +191,6 @@ function Create ({ className, onClose, onStatusChange, seed: propsSeed, type: pr {address && isConfirmationOpen && ( + {address && isConfirmationOpen && ( { const { isFileValid, isPassValid } = this.state; return ( - + {this.renderInput()} diff --git a/packages/app-accounts/src/modals/Qr.tsx b/packages/app-accounts/src/modals/Qr.tsx index 593ef76fee..0b4f2ad8e5 100644 --- a/packages/app-accounts/src/modals/Qr.tsx +++ b/packages/app-accounts/src/modals/Qr.tsx @@ -50,7 +50,6 @@ function QrModal ({ className, onClose, onStatusChange }: Props): React.ReactEle { diff --git a/packages/app-accounts/src/modals/Transfer.tsx b/packages/app-accounts/src/modals/Transfer.tsx index 513e073e30..90915e34cf 100644 --- a/packages/app-accounts/src/modals/Transfer.tsx +++ b/packages/app-accounts/src/modals/Transfer.tsx @@ -87,7 +87,6 @@ function Transfer ({ className, onClose, recipientId: propRecipientId, senderId:
diff --git a/packages/app-address-book/src/modals/Create.tsx b/packages/app-address-book/src/modals/Create.tsx index 88037d8f1d..8dd0925505 100644 --- a/packages/app-address-book/src/modals/Create.tsx +++ b/packages/app-address-book/src/modals/Create.tsx @@ -75,10 +75,7 @@ export default function Create ({ onClose, onStatusChange }: Props): React.React }; return ( - + { diff --git a/packages/app-democracy/src/Overview/Voting.tsx b/packages/app-democracy/src/Overview/Voting.tsx index 1961c745df..a8e5a29ed3 100644 --- a/packages/app-democracy/src/Overview/Voting.tsx +++ b/packages/app-democracy/src/Overview/Voting.tsx @@ -33,7 +33,6 @@ export default function Voting ({ referendumId }: Props): React.ReactElement diff --git a/packages/app-generic-asset/src/modals/Create.tsx b/packages/app-generic-asset/src/modals/Create.tsx index ff46365249..f409c65813 100644 --- a/packages/app-generic-asset/src/modals/Create.tsx +++ b/packages/app-generic-asset/src/modals/Create.tsx @@ -28,10 +28,7 @@ function Create ({ onClose, onRegister, t }: Props): React.ReactElement { }; return ( - + { {this.renderContent()} diff --git a/packages/app-staking/src/Actions/Account/InjectKeys.tsx b/packages/app-staking/src/Actions/Account/InjectKeys.tsx index 370cf72a49..87cafd106e 100644 --- a/packages/app-staking/src/Actions/Account/InjectKeys.tsx +++ b/packages/app-staking/src/Actions/Account/InjectKeys.tsx @@ -72,7 +72,6 @@ function InjectKeys ({ isOpen = true, onClose, t }: Props): React.ReactElement

diff --git a/packages/app-staking/src/Actions/Account/Nominate.tsx b/packages/app-staking/src/Actions/Account/Nominate.tsx index ea9b835a92..be2bd35022 100644 --- a/packages/app-staking/src/Actions/Account/Nominate.tsx +++ b/packages/app-staking/src/Actions/Account/Nominate.tsx @@ -61,7 +61,6 @@ function Nominate ({ className, controllerId, nominees, onClose, next, stakingOv { diff --git a/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx b/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx index 9439e694ab..631d38f44a 100644 --- a/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx +++ b/packages/app-staking/src/Actions/Account/SetRewardDestination.tsx @@ -39,7 +39,6 @@ class SetRewardDestination extends TxComponent { {this.renderContent()} diff --git a/packages/app-staking/src/Actions/Account/SetSessionKey.tsx b/packages/app-staking/src/Actions/Account/SetSessionKey.tsx index 857e97ce07..a68c5400a4 100644 --- a/packages/app-staking/src/Actions/Account/SetSessionKey.tsx +++ b/packages/app-staking/src/Actions/Account/SetSessionKey.tsx @@ -42,7 +42,6 @@ function SetSessionKey ({ controllerId, isOpen, onClose, sessionIds, stashId, t diff --git a/packages/app-staking/src/Actions/Account/Unbond.tsx b/packages/app-staking/src/Actions/Account/Unbond.tsx index 7bb36dc773..88274ba990 100644 --- a/packages/app-staking/src/Actions/Account/Unbond.tsx +++ b/packages/app-staking/src/Actions/Account/Unbond.tsx @@ -63,7 +63,6 @@ class Unbond extends TxComponent { {this.renderContent()} diff --git a/packages/app-staking/src/Actions/Account/Validate.tsx b/packages/app-staking/src/Actions/Account/Validate.tsx index 619a3c3542..f70eaf2e29 100644 --- a/packages/app-staking/src/Actions/Account/Validate.tsx +++ b/packages/app-staking/src/Actions/Account/Validate.tsx @@ -85,7 +85,6 @@ class Validate extends TxComponent { {this.renderContent()} diff --git a/packages/app-staking/src/Actions/NewStake.tsx b/packages/app-staking/src/Actions/NewStake.tsx index 0d6b188e75..5413754d13 100644 --- a/packages/app-staking/src/Actions/NewStake.tsx +++ b/packages/app-staking/src/Actions/NewStake.tsx @@ -59,7 +59,6 @@ class NewStake extends TxComponent { diff --git a/packages/app-tech-comm/src/Proposals/Voting.tsx b/packages/app-tech-comm/src/Proposals/Voting.tsx index eeb29332a7..30ce6d9ff9 100644 --- a/packages/app-tech-comm/src/Proposals/Voting.tsx +++ b/packages/app-tech-comm/src/Proposals/Voting.tsx @@ -35,7 +35,6 @@ function Voting ({ hash, proposalId, t }: Props): React.ReactElement | nu {isVotingOpen && ( diff --git a/packages/app-toolbox/src/Unlock.tsx b/packages/app-toolbox/src/Unlock.tsx index 480ef82612..40fd5c2c38 100644 --- a/packages/app-toolbox/src/Unlock.tsx +++ b/packages/app-toolbox/src/Unlock.tsx @@ -46,7 +46,6 @@ class Unlock extends TxComponent { {this.renderContent()} {this.renderActions()} diff --git a/packages/app-treasury/src/Overview/Propose.tsx b/packages/app-treasury/src/Overview/Propose.tsx index 1b1a862b9f..a127a95a68 100644 --- a/packages/app-treasury/src/Overview/Propose.tsx +++ b/packages/app-treasury/src/Overview/Propose.tsx @@ -35,7 +35,6 @@ export default function Propose ({ className }: Props): React.ReactElement diff --git a/packages/app-treasury/src/Overview/Submission.tsx b/packages/app-treasury/src/Overview/Submission.tsx index 6fea8316c9..1ed5545cdd 100644 --- a/packages/app-treasury/src/Overview/Submission.tsx +++ b/packages/app-treasury/src/Overview/Submission.tsx @@ -47,7 +47,6 @@ export default function Submission ({ councilProposals, id, isDisabled }: Props) {isOpen && ( diff --git a/packages/app-treasury/src/Overview/Voting.tsx b/packages/app-treasury/src/Overview/Voting.tsx index ce95958e7a..d735f93e77 100644 --- a/packages/app-treasury/src/Overview/Voting.tsx +++ b/packages/app-treasury/src/Overview/Voting.tsx @@ -65,7 +65,6 @@ export default function Voting ({ councilProposals, isDisabled }: Props): React. {isOpen && ( diff --git a/packages/apps/src/modals/Network.tsx b/packages/apps/src/modals/Network.tsx index b38c68bfbb..e1fc8fe976 100644 --- a/packages/apps/src/modals/Network.tsx +++ b/packages/apps/src/modals/Network.tsx @@ -20,7 +20,6 @@ export default function NetworkModal ({ className, onClose }: Props): React.Reac diff --git a/packages/react-components/src/Forget.tsx b/packages/react-components/src/Forget.tsx index c765a237b7..26be73c829 100644 --- a/packages/react-components/src/Forget.tsx +++ b/packages/react-components/src/Forget.tsx @@ -102,7 +102,6 @@ export default function Forget (props: Props): React.ReactElement { className='app--accounts-Modal' header={getHeaderText(mode, t)} onClose={onClose} - open > {renderContent(props, t)} diff --git a/packages/react-components/src/Modal.tsx b/packages/react-components/src/Modal.tsx index 77dc935b8a..b605438460 100644 --- a/packages/react-components/src/Modal.tsx +++ b/packages/react-components/src/Modal.tsx @@ -12,11 +12,12 @@ import { classes } from './util'; interface Props extends BareProps { children: React.ReactNode; header?: React.ReactNode; + open?: boolean; [index: string]: any; } function Modal (props: Props): React.ReactElement { - const { className, children, header } = props; + const { className, children, header, open = true } = props; return ( { className={classes('theme--default', 'ui--Modal', className)} dimmer='inverted' header={undefined} + open={open} > {header && ( {header} diff --git a/packages/react-signer/src/Modal.tsx b/packages/react-signer/src/Modal.tsx index 59d7221b04..6d00e09231 100644 --- a/packages/react-signer/src/Modal.tsx +++ b/packages/react-signer/src/Modal.tsx @@ -163,10 +163,7 @@ class Signer extends React.PureComponent { } return ( - + {this.renderContent()}