From 9fde464c115cc930bc37e59a4ef2fec79d3d9287 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 1 Apr 2020 15:30:08 +0200 Subject: [PATCH] Bump dev, JSX prop rules (#2499) --- package.json | 8 +- packages/apps/package.json | 2 +- packages/apps/src/SideBar/Item.tsx | 2 +- packages/apps/src/SideBar/index.tsx | 4 +- packages/apps/src/overlays/Accounts.tsx | 2 +- packages/page-123code/src/AccountSelector.tsx | 3 + packages/page-123code/src/SummaryBar.tsx | 5 +- .../page-accounts/src/Accounts/Account.tsx | 22 +- packages/page-accounts/src/Accounts/index.tsx | 7 +- .../src/Accounts/modals/Backup.tsx | 2 +- .../src/Accounts/modals/Create.tsx | 4 +- .../src/Accounts/modals/Derive.tsx | 2 +- .../src/Accounts/modals/Identity.tsx | 10 +- .../src/Accounts/modals/Import.tsx | 2 +- .../page-accounts/src/Accounts/modals/Qr.tsx | 2 +- .../src/Accounts/modals/RecoverSetup.tsx | 2 +- .../src/Accounts/modals/Transfer.tsx | 14 +- .../page-accounts/src/Contacts/Address.tsx | 22 +- packages/page-accounts/src/Contacts/index.tsx | 7 +- .../src/Contacts/modals/Create.tsx | 2 +- packages/page-accounts/src/Vanity/index.tsx | 4 +- packages/page-claims/src/index.tsx | 4 +- packages/page-contracts/package.json | 2 +- packages/page-contracts/src/ABI.tsx | 4 +- packages/page-contracts/src/Codes/Code.tsx | 6 +- packages/page-contracts/src/Codes/Upload.tsx | 2 +- packages/page-contracts/src/Codes/index.tsx | 8 +- .../page-contracts/src/Contracts/Contract.tsx | 4 +- .../page-contracts/src/Contracts/Outcome.tsx | 6 +- .../page-contracts/src/Contracts/index.tsx | 2 +- .../page-contracts/src/MessageSignature.tsx | 8 +- packages/page-contracts/src/Messages.tsx | 6 +- packages/page-contracts/src/Modal.tsx | 4 +- packages/page-contracts/src/RemoveABI.tsx | 6 +- packages/page-contracts/src/index.tsx | 10 +- .../src/Motions/ProposeMotion.tsx | 4 +- .../page-council/src/Overview/Candidates.tsx | 14 +- .../page-council/src/Overview/Members.tsx | 7 +- .../src/Overview/SubmitCandidacy.tsx | 2 +- packages/page-council/src/Overview/Vote.tsx | 2 +- .../src/Overview/DispatchQueue.tsx | 7 +- .../page-democracy/src/Overview/Fasttrack.tsx | 2 +- .../page-democracy/src/Overview/PreImage.tsx | 9 +- .../src/Overview/PreImageButton.tsx | 2 +- .../page-democracy/src/Overview/Proposals.tsx | 7 +- .../page-democracy/src/Overview/Propose.tsx | 9 +- .../src/Overview/Referendums.tsx | 7 +- .../page-democracy/src/Overview/Seconding.tsx | 4 +- .../page-democracy/src/Overview/Voting.tsx | 2 +- packages/page-explorer/src/BlockHeaders.tsx | 7 +- .../page-explorer/src/BlockInfo/ByHash.tsx | 14 +- .../page-explorer/src/BlockInfo/Extrinsic.tsx | 15 +- .../src/BlockInfo/Extrinsics.tsx | 19 +- packages/page-explorer/src/Forks.tsx | 5 +- packages/page-explorer/src/Query.tsx | 2 +- packages/page-explorer/src/index.tsx | 8 +- packages/page-extrinsics/src/Balance.tsx | 2 +- packages/page-extrinsics/src/Selection.tsx | 13 +- packages/page-generic-asset/src/AssetCard.tsx | 8 +- packages/page-generic-asset/src/Assets.tsx | 8 +- packages/page-generic-asset/src/Transfer.tsx | 18 +- packages/page-generic-asset/src/index.tsx | 4 +- .../page-generic-asset/src/modals/Create.tsx | 4 +- packages/page-js/src/ActionButtons.tsx | 4 +- packages/page-js/src/Output.tsx | 5 +- packages/page-js/src/Playground.tsx | 2 +- .../page-parachains/src/Overview/Register.tsx | 4 +- .../src/Parachain/Deregister.tsx | 2 +- .../page-parachains/src/Parachain/index.tsx | 2 +- packages/page-settings/src/Developer.tsx | 13 +- packages/page-settings/src/General.tsx | 12 +- .../src/Metadata/ChainColorIndicator.tsx | 7 +- .../src/Metadata/NetworkSpecs.tsx | 2 +- packages/page-settings/src/util.tsx | 2 +- .../page-society/src/Overview/Members.tsx | 7 +- .../src/Actions/Account/BondExtra.tsx | 11 +- .../src/Actions/Account/Nominate.tsx | 4 +- .../Actions/Account/SetControllerAccount.tsx | 4 +- .../Actions/Account/SetRewardDestination.tsx | 4 +- .../src/Actions/Account/SetSessionKey.tsx | 2 +- .../src/Actions/Account/Unbond.tsx | 2 +- .../src/Actions/Account/Validate.tsx | 2 +- .../src/Actions/Account/index.tsx | 20 +- .../page-staking/src/Actions/NewStake.tsx | 4 +- packages/page-staking/src/Actions/index.tsx | 9 +- .../page-staking/src/Overview/CurrentList.tsx | 14 +- packages/page-staking/src/Targets/index.tsx | 7 +- packages/page-staking/src/index.tsx | 4 +- .../page-storage/src/Selection/Consts.tsx | 2 +- .../page-storage/src/Selection/Modules.tsx | 2 +- packages/page-storage/src/Selection/index.tsx | 18 +- packages/page-sudo/src/SetKey.tsx | 6 +- packages/page-sudo/src/Sudo.tsx | 4 +- packages/page-sudo/src/index.tsx | 31 +- .../page-tech-comm/src/Overview/Members.tsx | 7 +- .../page-tech-comm/src/Proposals/Propose.tsx | 4 +- .../page-tech-comm/src/Proposals/index.tsx | 7 +- packages/page-toolbox/src/Rpc/Account.tsx | 2 +- packages/page-toolbox/src/Rpc/Selection.tsx | 6 +- packages/page-toolbox/src/Sign.tsx | 4 +- packages/page-toolbox/src/Unlock.tsx | 8 +- packages/page-toolbox/src/Verify.tsx | 7 +- packages/page-toolbox/src/index.tsx | 8 +- .../page-treasury/src/Overview/Approve.tsx | 4 +- .../page-treasury/src/Overview/Proposals.tsx | 9 +- .../page-treasury/src/Overview/Propose.tsx | 6 +- packages/page-treasury/src/Overview/index.tsx | 5 +- packages/react-api/package.json | 2 +- packages/react-components/src/ActionItem.tsx | 2 +- packages/react-components/src/AddressInfo.tsx | 16 +- .../react-components/src/AddressSmall.tsx | 2 +- packages/react-components/src/Badge.tsx | 2 +- packages/react-components/src/Balance.tsx | 5 +- packages/react-components/src/Bubble.tsx | 7 +- .../react-components/src/Button/Button.tsx | 9 +- packages/react-components/src/Button/Or.tsx | 2 +- packages/react-components/src/CopyButton.tsx | 2 +- packages/react-components/src/Dropdown.tsx | 2 +- packages/react-components/src/Extrinsic.tsx | 2 +- packages/react-components/src/Forget.tsx | 6 +- packages/react-components/src/Input.tsx | 6 +- .../src/InputAddress/createHeader.tsx | 2 +- .../src/InputAddressMulti.tsx | 2 +- .../react-components/src/InputBalance.tsx | 4 +- .../src/InputBalanceBonded.tsx | 2 +- packages/react-components/src/InputError.tsx | 7 +- packages/react-components/src/InputFile.tsx | 2 +- packages/react-components/src/InputNumber.tsx | 2 +- packages/react-components/src/LabelHelp.tsx | 6 +- packages/react-components/src/Modal.tsx | 5 +- packages/react-components/src/Row.tsx | 9 +- packages/react-components/src/Spinner.tsx | 4 +- .../react-components/src/StakingUnbonding.tsx | 9 +- .../react-components/src/Status/index.tsx | 4 +- packages/react-components/src/Tag.tsx | 2 +- packages/react-components/src/Toggle.tsx | 2 +- packages/react-components/src/Tooltip.tsx | 4 +- .../react-components/src/TreasuryProposal.tsx | 4 +- packages/react-components/src/TxButton.tsx | 2 +- packages/react-components/src/TxModal.tsx | 2 +- packages/react-components/src/TxModalNew.tsx | 2 +- packages/react-components/src/VoteToggle.tsx | 2 +- packages/react-components/src/VoteValue.tsx | 7 +- packages/react-params/src/Param/Balance.tsx | 2 +- packages/react-params/src/Param/Bool.tsx | 2 +- packages/react-params/src/Param/Enum.tsx | 2 +- packages/react-params/src/Param/Vector.tsx | 10 +- packages/react-params/src/Param/Vote.tsx | 2 +- .../react-params/src/Param/VoteThreshold.tsx | 2 +- packages/react-params/src/Param/index.tsx | 2 +- packages/react-signer/src/Modal.tsx | 54 +- yarn.lock | 527 +++++++++--------- 152 files changed, 865 insertions(+), 582 deletions(-) diff --git a/package.json b/package.json index a502d84f91..c0157598c4 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^1.9.0-beta.26", - "@polkadot/api-contract": "^1.9.0-beta.26", + "@polkadot/api": "^1.9.1", + "@polkadot/api-contract": "^1.9.1", "@polkadot/keyring": "^2.7.1", - "@polkadot/types": "^1.9.0-beta.26", + "@polkadot/types": "^1.9.1", "@polkadot/util": "^2.7.1", "@polkadot/util-crypto": "^2.7.1", "babel-core": "^7.0.0-bridge.0", @@ -36,7 +36,7 @@ "@babel/core": "^7.9.0", "@babel/register": "^7.9.0", "@babel/runtime": "^7.9.2", - "@polkadot/dev": "^0.51.9", + "@polkadot/dev": "^0.52.1", "@polkadot/ts": "^0.3.14", "@types/bn.js": "^4.11.6", "@types/chart.js": "^2.9.16", diff --git a/packages/apps/package.json b/packages/apps/package.json index c6a9108346..8148e2c450 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -15,7 +15,7 @@ "dependencies": { "@babel/polyfill": "^7.8.7", "@babel/runtime": "^7.9.2", - "@polkadot/dev": "^0.51.9", + "@polkadot/dev": "^0.52.1", "@polkadot/react-components": "0.40.0-beta.221", "@polkadot/react-signer": "0.40.0-beta.221", "query-string": "^6.11.1" diff --git a/packages/apps/src/SideBar/Item.tsx b/packages/apps/src/SideBar/Item.tsx index aadf9e07d6..e5f97b6423 100644 --- a/packages/apps/src/SideBar/Item.tsx +++ b/packages/apps/src/SideBar/Item.tsx @@ -105,8 +105,8 @@ function Item ({ route, isCollapsed, onClick }: Props): React.ReactElement{t(`sidebar.${name}`, i18n)} {count !== 0 && ( )} diff --git a/packages/apps/src/SideBar/index.tsx b/packages/apps/src/SideBar/index.tsx index 56b0c1e4c0..5374fd4282 100644 --- a/packages/apps/src/SideBar/index.tsx +++ b/packages/apps/src/SideBar/index.tsx @@ -49,8 +49,8 @@ function SideBar ({ className, collapse, handleResize, isCollapsed, isMenuOpen, return ( ) : ( diff --git a/packages/apps/src/overlays/Accounts.tsx b/packages/apps/src/overlays/Accounts.tsx index c0f8ace07f..49b5f48c17 100644 --- a/packages/apps/src/overlays/Accounts.tsx +++ b/packages/apps/src/overlays/Accounts.tsx @@ -32,8 +32,8 @@ function Accounts ({ className }: Props): React.ReactElement | null {

{t("You don't have any accounts. Some features are currently hidden and will only become available once you have accounts.")}

{t('Create an account now.')} diff --git a/packages/page-123code/src/AccountSelector.tsx b/packages/page-123code/src/AccountSelector.tsx index de34e60905..eb1ad90340 100644 --- a/packages/page-123code/src/AccountSelector.tsx +++ b/packages/page-123code/src/AccountSelector.tsx @@ -2,6 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +// only here, needs to be available for the rest of the codebase +/* eslint-disable react/jsx-max-props-per-line */ + import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { AccountIndex, Bubble, InputAddress } from '@polkadot/react-components'; diff --git a/packages/page-123code/src/SummaryBar.tsx b/packages/page-123code/src/SummaryBar.tsx index cf29ffaee4..e28c65006b 100644 --- a/packages/page-123code/src/SummaryBar.tsx +++ b/packages/page-123code/src/SummaryBar.tsx @@ -2,6 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +// only here, needs to be available for the rest of the codebase +/* eslint-disable react/jsx-max-props-per-line */ + import { DeriveStakingValidators } from '@polkadot/api-derive/types'; import { Balance, BlockNumber } from '@polkadot/types/interfaces'; @@ -35,7 +38,7 @@ function SummaryBar (): React.ReactElement { {validators && ( { validators.validators.map((accountId, index): React.ReactNode => ( - + )) } )} diff --git a/packages/page-accounts/src/Accounts/Account.tsx b/packages/page-accounts/src/Accounts/Account.tsx index 10c0acd262..20c4d3ccf6 100644 --- a/packages/page-accounts/src/Accounts/Account.tsx +++ b/packages/page-accounts/src/Accounts/Account.tsx @@ -229,12 +229,13 @@ function Account ({ address, className, filter, isFavorite, toggleFavorite }: Pr @@ -265,9 +265,9 @@ function Account ({ address, className, filter, isFavorite, toggleFavorite }: Pr {isForgetOpen && ( )} {isIdentityOpen && ( @@ -313,21 +313,27 @@ function Account ({ address, className, filter, isFavorite, toggleFavorite }: Pr {isEditingTags ? ( ) : ( -

+
{tags.length ? tags.map((tag): React.ReactNode => ( - + )) : } @@ -368,9 +374,9 @@ function Account ({ address, className, filter, isFavorite, toggleFavorite }: Pr } >
}> -

{t('accounts')}

+ +

{t('accounts')}

+ {t('type')} {t('tags')} {t('transactions')} diff --git a/packages/page-accounts/src/Accounts/modals/Backup.tsx b/packages/page-accounts/src/Accounts/modals/Backup.tsx index 2457be5af4..596d1c210e 100644 --- a/packages/page-accounts/src/Accounts/modals/Backup.tsx +++ b/packages/page-accounts/src/Accounts/modals/Backup.tsx @@ -68,8 +68,8 @@ function Backup ({ address, onClose }: Props): React.ReactElement { doBackup={_doBackup} isPassTouched={isPassTouched} isPassValid={isPassValid} - password={password} onChangePass={_onChangePass} + password={password} />
{ return ( <> {hasCode && ( @@ -88,6 +87,7 @@ function Contracts (props: Props): React.ReactElement { /> } + emptyText={t('No contracts available')} > {contracts.map((contract: ApiContract, index): React.ReactNode => ( {withTooltip && ( )} diff --git a/packages/page-contracts/src/Messages.tsx b/packages/page-contracts/src/Messages.tsx index 9dd77641c6..c7915d7860 100644 --- a/packages/page-contracts/src/Messages.tsx +++ b/packages/page-contracts/src/Messages.tsx @@ -56,8 +56,8 @@ function renderItem (props: Props, message: ContractABIMessage, index: number, a return (
{ {messages.map((_, index): React.ReactNode => renderMessage(props, index, t))} {isRemovable && ( )} diff --git a/packages/page-contracts/src/Modal.tsx b/packages/page-contracts/src/Modal.tsx index 6277cb19ca..697b9e07ef 100644 --- a/packages/page-contracts/src/Modal.tsx +++ b/packages/page-contracts/src/Modal.tsx @@ -85,14 +85,14 @@ class ContractModal

? 'The ABI for the WASM code. Since we will be making a call into the code, the ABI is required and stored for future operations such as sending messages.' : 'The ABI for the WASM code. In this step it is optional, but setting it here simplifies the setup of contract instances.' )} + isDisabled={isBusy} + isRequired={this.isContract} label={t( this.isContract ? 'contract ABI' : 'contract ABI (optional)' )} onChange={this.onAddAbi} - isDisabled={isBusy} - isRequired={this.isContract} /> ); } diff --git a/packages/page-contracts/src/RemoveABI.tsx b/packages/page-contracts/src/RemoveABI.tsx index 80b6e7b812..16916cde10 100644 --- a/packages/page-contracts/src/RemoveABI.tsx +++ b/packages/page-contracts/src/RemoveABI.tsx @@ -41,10 +41,10 @@ function RemoveABI ({ code, onClose, onRemove }: Props): React.ReactElement