From 36f94fde05d133e446472b4eaaa2a265cdbf9140 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 17 Jul 2017 18:37:33 +0200 Subject: [PATCH] Ui 2 package upgrades (#6076) * Upgrade to React 15.6 * Import PropTypes from prop-types * Update package.json * UI version in built version * Cleanup /api/health status failures * Check reponse.ok * Add icons to view dapps * Adjust layout for dapps * Slightly darker balance background * Adjust shadows --- js/package-lock.json | 820 +++++------------- js/package.json | 8 +- js/src/dapps/chaindeploy/Contract/contract.js | 3 +- js/src/dapps/chaindeploy/Dapp/dapp.js | 3 +- .../chaindeploy/ListItem/Header/header.js | 3 +- .../dapps/chaindeploy/ListItem/Icon/icon.js | 3 +- js/src/dapps/chaindeploy/ListItem/Row/row.js | 3 +- js/src/dapps/chaindeploy/ListItem/listItem.js | 3 +- js/src/dapps/dappreg/Button/button.js | 3 +- js/src/dapps/dappreg/Card/card.js | 3 +- js/src/dapps/dappreg/DappCard/dappCard.js | 3 +- js/src/dapps/dappreg/DappModal/dappModal.js | 3 +- js/src/dapps/dappreg/Dapps/dapps.js | 3 +- js/src/dapps/dappreg/Input/input.js | 3 +- js/src/dapps/dappreg/Modal/modal.js | 3 +- .../dapps/dappreg/ModalDelete/modalDelete.js | 3 +- .../dappreg/ModalRegister/modalRegister.js | 3 +- .../dapps/dappreg/ModalUpdate/modalUpdate.js | 3 +- .../dappreg/SelectAccount/selectAccount.js | 3 +- js/src/dapps/githubhint/Button/button.js | 3 +- js/src/dapps/githubhint/Events/events.js | 3 +- .../localtx/IdentityIcon/identityIcon.js | 3 +- .../dapps/localtx/Transaction/transaction.js | 3 +- js/src/dapps/registry/Accounts/accounts.js | 3 +- .../dapps/registry/Application/application.js | 3 +- js/src/dapps/registry/Container.js | 3 +- js/src/dapps/registry/Events/events.js | 3 +- .../registry/IdentityIcon/identityIcon.js | 3 +- js/src/dapps/registry/Lookup/lookup.js | 3 +- js/src/dapps/registry/Names/names.js | 3 +- js/src/dapps/registry/Records/records.js | 3 +- js/src/dapps/registry/Reverse/reverse.js | 3 +- js/src/dapps/registry/ui/address.js | 3 +- js/src/dapps/registry/ui/hash.js | 3 +- js/src/dapps/signaturereg/Button/button.js | 3 +- js/src/dapps/signaturereg/Events/events.js | 3 +- js/src/dapps/signaturereg/Header/header.js | 3 +- .../signaturereg/IdentityIcon/identityIcon.js | 3 +- js/src/dapps/signaturereg/Import/import.js | 3 +- .../AddressSelect/addressSelect.js | 3 +- .../tokendeploy/Application/Header/header.js | 3 +- .../tokendeploy/Application/application.js | 3 +- .../dapps/tokendeploy/Container/container.js | 3 +- .../Deploy/Deployment/deployment.js | 3 +- .../dapps/tokendeploy/Deploy/Event/event.js | 3 +- .../dapps/tokendeploy/Deploy/Events/events.js | 3 +- .../tokendeploy/IdentityIcon/identityIcon.js | 3 +- .../dapps/tokendeploy/Overview/Owner/owner.js | 3 +- .../dapps/tokendeploy/Overview/Token/token.js | 3 +- js/src/dapps/tokendeploy/Overview/overview.js | 3 +- .../dapps/tokendeploy/Transfer/Event/event.js | 3 +- .../dapps/tokendeploy/Transfer/Send/send.js | 3 +- .../AccountSelector/account-selector.js | 3 +- js/src/dapps/tokenreg/Actions/Query/query.js | 3 +- .../tokenreg/Actions/Register/register.js | 3 +- js/src/dapps/tokenreg/Actions/component.js | 3 +- .../dapps/tokenreg/Application/application.js | 3 +- js/src/dapps/tokenreg/Chip/chip.js | 3 +- js/src/dapps/tokenreg/Container.js | 3 +- .../tokenreg/IdentityIcon/identityIcon.js | 3 +- .../dapps/tokenreg/Inputs/Text/input-text.js | 3 +- js/src/dapps/tokenreg/Loading/loading.js | 3 +- js/src/dapps/tokenreg/Status/status.js | 3 +- .../dapps/tokenreg/Tokens/Token/add-meta.js | 3 +- js/src/dapps/tokenreg/Tokens/Token/token.js | 3 +- .../tokenreg/Tokens/Token/tokenContainer.js | 3 +- js/src/dapps/tokenreg/Tokens/container.js | 3 +- js/src/dapps/tokenreg/Tokens/tokens.js | 3 +- js/src/shared/config/dappsViews.json | 36 +- js/src/shared/redux/providers/status.js | 12 +- js/src/shared/util/proptypes.js | 2 +- js/src/shell/Application/application.js | 3 +- js/src/shell/Connection/connection.js | 3 +- js/src/shell/Dapp/dapp.js | 3 +- js/src/shell/DappRequests/Request/request.js | 3 +- js/src/shell/Dapps/dapps.js | 12 +- js/src/shell/FirstRun/TnC/tnc.js | 3 +- js/src/shell/FirstRun/firstRun.js | 3 +- js/src/shell/ParityBar/parityBar.js | 3 +- js/src/shell/Requests/requests.js | 3 +- js/src/shell/Signer/Embedded/embedded.js | 3 +- .../Account/AccountLink/accountLink.js | 3 +- .../Signer/components/Account/account.js | 3 +- .../DecryptRequest/decryptRequest.js | 3 +- .../components/RequestOrigin/requestOrigin.js | 3 +- .../RequestPending/requestPending.js | 3 +- .../components/SignRequest/signRequest.js | 3 +- .../transactionMainDetails.js | 3 +- .../TransactionPending/transactionPending.js | 3 +- .../transactionPendingForm.js | 3 +- .../transactionPendingFormConfirm.js | 3 +- .../transactionPendingFormReject.js | 3 +- .../components/TxHashLink/txHashLink.js | 3 +- js/src/shell/Snackbar/snackbar.js | 3 +- js/src/shell/Status/Consensus/consensus.js | 3 +- js/src/shell/Status/Upgrade/upgrade.js | 3 +- js/src/shell/Status/status.js | 3 +- js/src/shell/SyncWarning/syncWarning.js | 3 +- js/src/shell/UpgradeParity/upgradeParity.js | 3 +- js/src/shell/index.js | 2 + js/src/ui/AccountCard/accountCard.js | 3 +- js/src/ui/Actionbar/Export/export.js | 3 +- js/src/ui/Actionbar/Import/import.js | 3 +- js/src/ui/Actionbar/Search/search.js | 3 +- js/src/ui/Actionbar/Sort/sort.js | 3 +- js/src/ui/Actionbar/actionbar.css | 2 +- js/src/ui/Actionbar/actionbar.js | 3 +- js/src/ui/Badge/badge.js | 3 +- js/src/ui/Balance/balance.css | 2 +- js/src/ui/Balance/balance.js | 3 +- js/src/ui/BlockStatus/blockStatus.js | 3 +- js/src/ui/Button/button.js | 3 +- js/src/ui/Certifications/certifications.js | 3 +- js/src/ui/ConfirmDialog/confirmDialog.js | 3 +- js/src/ui/Container/Title/Actions/actions.js | 3 +- js/src/ui/Container/Title/title.js | 3 +- js/src/ui/Container/container.css | 7 +- js/src/ui/Container/container.js | 3 +- js/src/ui/ContextProvider/contextProvider.js | 3 +- js/src/ui/CopyToClipboard/copyToClipboard.js | 3 +- js/src/ui/CurrencySymbol/currencySymbol.js | 3 +- js/src/ui/DappCard/dappCard.css | 9 +- js/src/ui/DappCard/dappCard.js | 11 +- js/src/ui/DappIcon/dappIcon.css | 2 + js/src/ui/DappIcon/dappIcon.js | 16 +- js/src/ui/DappLink/dappLink.js | 3 +- js/src/ui/Errors/errors.js | 3 +- js/src/ui/Form/AddressSelect/addressSelect.js | 3 +- js/src/ui/Form/Checkbox/checkbox.js | 3 +- js/src/ui/Form/DappUrlInput/dappUrlInput.js | 3 +- js/src/ui/Form/Dropdown/dropdown.js | 3 +- js/src/ui/Form/FileSelect/fileSelect.js | 3 +- js/src/ui/Form/Input/input.js | 3 +- js/src/ui/Form/InputAddress/inputAddress.js | 3 +- .../InputAddressSelect/inputAddressSelect.js | 3 +- js/src/ui/Form/InputChip/Chip/chip.js | 3 +- js/src/ui/Form/InputChip/inputChip.js | 3 +- js/src/ui/Form/InputDateTime/inputDateTime.js | 3 +- js/src/ui/Form/Label/label.js | 3 +- js/src/ui/Form/LabelWrapper/labelWrapper.js | 3 +- .../Form/PasswordStrength/passwordStrength.js | 3 +- js/src/ui/Form/RadioButtons/radioButtons.js | 3 +- js/src/ui/Form/Slider/slider.js | 3 +- js/src/ui/Form/Toggle/toggle.js | 3 +- js/src/ui/Form/TypedInput/typedInput.js | 3 +- .../VaultSelector/vaultSelector.js | 3 +- js/src/ui/Form/VaultSelect/vaultSelect.js | 3 +- js/src/ui/Form/form.js | 3 +- js/src/ui/GasPriceEditor/gasPriceEditor.js | 3 +- .../GasPriceSelector/CustomBar/customBar.js | 3 +- .../CustomCursor/customCursor.js | 3 +- .../CustomShape/customShape.js | 3 +- .../CustomTooltip/customTooltip.js | 3 +- .../ui/GasPriceSelector/gasPriceSelector.js | 3 +- js/src/ui/Icons/index.js | 126 +-- js/src/ui/IdentityIcon/identityIcon.js | 3 +- js/src/ui/IdentityName/identityName.js | 3 +- js/src/ui/List/Item/item.js | 3 +- js/src/ui/List/list.js | 3 +- js/src/ui/Loading/loading.js | 3 +- js/src/ui/MethodDecoding/methodDecoding.js | 3 +- js/src/ui/Modal/Busy/busy.js | 3 +- js/src/ui/Modal/Completed/completed.js | 3 +- js/src/ui/ModalBox/modalBox.js | 3 +- js/src/ui/Page/page.css | 4 +- js/src/ui/Page/page.js | 3 +- .../ui/ParityBackground/parityBackground.js | 3 +- js/src/ui/Popup/popup.js | 3 +- js/src/ui/Portal/portal.js | 3 +- js/src/ui/Progress/progress.js | 3 +- js/src/ui/QrCode/qrCode.js | 3 +- js/src/ui/QrScan/qrScan.js | 3 +- js/src/ui/ScrollableText/scrollableText.js | 3 +- js/src/ui/SectionList/sectionList.css | 2 +- js/src/ui/SectionList/sectionList.js | 3 +- js/src/ui/SelectionList/selectionList.js | 3 +- js/src/ui/ShortenedHash/shortenedHash.js | 3 +- js/src/ui/SignerIcon/signerIcon.js | 3 +- js/src/ui/Snackbar/snackbar.js | 3 +- .../StackEventListener/stackEventListener.js | 3 +- js/src/ui/StatusIndicator/statusIndicator.js | 3 +- js/src/ui/Steps/Step/step.js | 3 +- js/src/ui/Steps/steps.js | 3 +- js/src/ui/Tabs/Tab/tab.js | 3 +- js/src/ui/Tabs/tabs.js | 3 +- js/src/ui/Tags/tags.js | 3 +- js/src/ui/Title/Waiting/waiting.js | 3 +- js/src/ui/Title/title.js | 3 +- js/src/ui/TokenImage/tokenImage.js | 3 +- js/src/ui/TxHash/txHash.js | 3 +- js/src/ui/TxList/TxRow/txRow.js | 3 +- js/src/ui/TxList/txList.js | 3 +- js/src/ui/VaultCard/Accounts/accounts.js | 3 +- js/src/ui/VaultCard/Buttons/buttons.js | 3 +- js/src/ui/VaultCard/Layout/layout.js | 3 +- js/src/ui/VaultCard/vaultCard.js | 3 +- js/src/ui/VaultTag/vaultTag.js | 3 +- .../Account/DeleteAccount/deleteAccount.js | 3 +- js/src/views/Account/EditMeta/editMeta.js | 3 +- js/src/views/Account/Faucet/faucet.js | 3 +- js/src/views/Account/Header/header.js | 3 +- .../PasswordManager/passwordManager.js | 3 +- .../awaitingDepositStep.js | 3 +- .../awaitingExchangeStep.js | 3 +- .../Shapeshift/CompletedStep/completedStep.js | 3 +- .../Account/Shapeshift/ErrorStep/errorStep.js | 3 +- .../Shapeshift/OptionsStep/optionsStep.js | 3 +- .../views/Account/Shapeshift/Price/price.js | 3 +- .../views/Account/Shapeshift/Value/value.js | 3 +- js/src/views/Account/Shapeshift/shapeshift.js | 3 +- .../Account/Transactions/transactions.js | 3 +- .../views/Account/Transfer/Details/details.js | 3 +- .../Account/Transfer/Details/tokenSelect.js | 3 +- .../views/Account/Transfer/Extras/extras.js | 3 +- js/src/views/Account/Transfer/transfer.js | 3 +- .../Verification/GatherData/gatherData.js | 3 +- .../Verification/QueryCode/queryCode.js | 3 +- .../SendConfirmation/sendConfirmation.js | 3 +- .../Verification/SendRequest/sendRequest.js | 3 +- .../Account/Verification/verification.js | 3 +- js/src/views/Account/account.js | 3 +- .../AccountDetails/accountDetails.js | 3 +- .../AccountDetailsGeth/accountDetailsGeth.js | 3 +- .../CreateAccount/ChangeVault/changeVault.js | 3 +- .../CreationType/creationType.js | 3 +- .../CreateAccount/GethCard/gethCard.js | 3 +- .../CreateAccount/NewAccount/newAccount.js | 3 +- .../Accounts/CreateAccount/NewGeth/newGeth.js | 3 +- .../CreateAccount/NewImport/newImport.js | 3 +- .../Accounts/CreateAccount/NewQr/newQr.js | 3 +- .../Accounts/CreateAccount/RawKey/rawKey.js | 3 +- .../RecoveryPhrase/recoveryPhrase.js | 3 +- .../CreateAccount/TypeIcon/typeIcon.js | 3 +- .../Accounts/CreateAccount/createAccount.js | 3 +- .../WalletDetails/walletDetails.js | 3 +- .../CreateWallet/WalletInfo/walletInfo.js | 3 +- .../CreateWallet/WalletType/walletType.js | 3 +- .../Accounts/CreateWallet/createWallet.js | 3 +- .../Accounts/ExportAccount/exportAccount.js | 3 +- .../ExportAccount/exportInput/exportInput.js | 3 +- js/src/views/Accounts/List/list.js | 3 +- js/src/views/Accounts/Summary/summary.js | 3 +- js/src/views/Accounts/accounts.js | 3 +- js/src/views/Address/Delete/delete.js | 3 +- js/src/views/Address/address.js | 3 +- .../views/Addresses/AddAddress/addAddress.js | 3 +- js/src/views/Addresses/addresses.js | 3 +- js/src/views/Application/Status/status.js | 3 +- js/src/views/Application/TabBar/tabBar.js | 3 +- js/src/views/Contract/Events/Event/event.js | 3 +- js/src/views/Contract/Events/events.js | 3 +- .../AdvancedStep/advancedStep.js | 3 +- .../DetailsStep/detailsStep.js | 3 +- .../ExecuteContract/executeContract.js | 3 +- js/src/views/Contract/Queries/inputQuery.js | 3 +- js/src/views/Contract/Queries/queries.js | 3 +- js/src/views/Contract/contract.js | 3 +- .../LoadContract/loadContract.js | 3 +- .../SaveContract/saveContract.js | 3 +- .../Contracts/AddContract/addContract.js | 3 +- .../DeployContract/DetailsStep/detailsStep.js | 3 +- .../ParametersStep/parametersStep.js | 3 +- .../DeployContract/deployContract.js | 3 +- js/src/views/Contracts/contracts.js | 3 +- js/src/views/DappAccounts/dappAccounts.js | 3 +- .../DappMethods/MethodCheck/methodCheck.js | 3 +- js/src/views/DappMethods/dappMethods.js | 3 +- js/src/views/DappVisible/dappVisible.js | 3 +- js/src/views/Home/Accounts/accounts.js | 3 +- js/src/views/Home/Dapps/dapp.js | 3 +- js/src/views/Home/Dapps/dapps.js | 3 +- js/src/views/Home/News/news.js | 3 +- js/src/views/Home/Urls/urls.js | 3 +- js/src/views/Home/home.js | 3 +- js/src/views/Playground/playgroundExample.js | 3 +- .../views/Settings/Background/background.js | 3 +- js/src/views/Settings/Node/node.js | 3 +- js/src/views/Settings/Proxy/proxy.js | 3 +- js/src/views/Settings/Views/views.js | 3 +- js/src/views/Settings/settings.js | 3 +- .../views/Signer/RequestsPage/requestsPage.js | 3 +- js/src/views/Status/Debug/Toggle/toggle.js | 3 +- js/src/views/Status/Debug/debug.js | 3 +- js/src/views/Status/Health/health.js | 3 +- .../Status/MiningSettings/miningSettings.js | 3 +- js/src/views/Status/Node/node.js | 3 +- js/src/views/Status/Peers/Peer/peer.js | 3 +- js/src/views/Status/Peers/peers.js | 3 +- .../Vaults/VaultAccounts/vaultAccounts.js | 3 +- .../views/Vaults/VaultCreate/vaultCreate.js | 3 +- js/src/views/Vaults/VaultLock/vaultLock.js | 3 +- js/src/views/Vaults/VaultMeta/vaultMeta.js | 3 +- .../views/Vaults/VaultUnlock/vaultUnlock.js | 3 +- js/src/views/Vaults/vaults.js | 3 +- .../Wallet/Confirmations/confirmations.js | 3 +- js/src/views/Wallet/Details/details.js | 3 +- .../views/Wallet/Transactions/transactions.js | 3 +- .../Wallet/WalletSettings/walletSettings.js | 3 +- js/src/views/Wallet/wallet.js | 3 +- js/src/views/Web/AddressBar/addressBar.js | 3 +- js/src/views/Web/web.js | 3 +- js/webpack/dev.server.js | 2 + js/webpack/shared.js | 43 +- 303 files changed, 956 insertions(+), 1014 deletions(-) diff --git a/js/package-lock.json b/js/package-lock.json index 3a8aae6e1..ca1be89ac 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -117,9 +117,10 @@ "dev": true }, "abbrev": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", - "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=" + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", + "dev": true }, "accepts": { "version": "1.3.3", @@ -229,9 +230,10 @@ "dev": true }, "ansi-escapes": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", - "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", + "dev": true }, "ansi-html": { "version": "0.0.7", @@ -420,7 +422,8 @@ "asn1": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", + "dev": true }, "asn1.js": { "version": "4.9.1", @@ -445,7 +448,8 @@ "assert-plus": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true }, "assertion-error": { "version": "1.0.2", @@ -480,7 +484,8 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true }, "attr-accept": { "version": "1.1.0", @@ -504,12 +509,14 @@ "aws-sign2": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "dev": true }, "aws4": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", + "dev": true }, "babel-cli": { "version": "6.23.0", @@ -1691,6 +1698,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "dev": true, "optional": true, "requires": { "tweetnacl": "0.14.5" @@ -1830,14 +1838,6 @@ "readable-stream": "2.3.3" } }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "requires": { - "inherits": "2.0.3" - } - }, "blockies": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/blockies/-/blockies-0.0.2.tgz", @@ -1864,6 +1864,7 @@ "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, "requires": { "hoek": "2.16.3" } @@ -2125,9 +2126,10 @@ "dev": true }, "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", + "dev": true }, "caw": { "version": "1.2.0", @@ -2304,7 +2306,8 @@ "ci-info": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz", - "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ=" + "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ=", + "dev": true }, "cipher-base": { "version": "1.0.4", @@ -2351,17 +2354,19 @@ } }, "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "1.0.1" } }, "cli-width": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz", - "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=" + "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=", + "dev": true }, "cliui": { "version": "3.2.0", @@ -2376,7 +2381,8 @@ "clone": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=" + "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=", + "dev": true }, "clone-regexp": { "version": "1.0.0", @@ -2394,15 +2400,6 @@ "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", "dev": true }, - "cmd-shim": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz", - "integrity": "sha1-b8vamUg6j9FdfTChlspp1oii79s=", - "requires": { - "graceful-fs": "4.1.11", - "mkdirp": "0.5.1" - } - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -2447,6 +2444,7 @@ "version": "1.9.0", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "dev": true, "requires": { "color-name": "1.1.3" } @@ -2460,7 +2458,8 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true }, "color-string": { "version": "0.3.0", @@ -2530,6 +2529,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "dev": true, "requires": { "delayed-stream": "1.0.0" } @@ -2537,7 +2537,8 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true }, "commondir": { "version": "1.0.1", @@ -2756,69 +2757,11 @@ "request": "2.79.0" }, "dependencies": { - "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true - }, - "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true - }, - "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "commander": "2.11.0", - "is-my-json-valid": "2.16.0", - "pinkie-promise": "2.0.1" - } - }, "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true - }, - "request": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", - "dev": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.11.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "2.0.6", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "qs": "6.3.0", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.4.3", - "uuid": "3.0.0" - } - }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", - "dev": true } } }, @@ -2900,6 +2843,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, "requires": { "boom": "2.10.1" } @@ -3252,6 +3196,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, "requires": { "assert-plus": "1.0.0" }, @@ -3259,7 +3204,8 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true } } }, @@ -3284,11 +3230,6 @@ "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=", "dev": true }, - "death": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/death/-/death-1.1.0.tgz", - "integrity": "sha1-AaqcQB7dknUFFEcLgmY5DGbGcxg=" - }, "debug": { "version": "2.6.8", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", @@ -3504,14 +3445,6 @@ "strip-bom": "2.0.0" } }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "requires": { - "clone": "1.0.2" - } - }, "define-properties": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", @@ -3546,7 +3479,8 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true }, "delegates": { "version": "1.0.0", @@ -3866,20 +3800,13 @@ "requires": { "onetime": "1.1.0", "set-immediate-shim": "1.0.1" - }, - "dependencies": { - "onetime": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", - "dev": true - } } }, "ecc-jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "dev": true, "optional": true, "requires": { "jsbn": "0.1.1" @@ -4280,83 +4207,6 @@ "user-home": "2.0.0" }, "dependencies": { - "ansi-escapes": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", - "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", - "dev": true - }, - "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", - "dev": true, - "requires": { - "restore-cursor": "1.0.1" - } - }, - "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", - "dev": true, - "requires": { - "escape-string-regexp": "1.0.5", - "object-assign": "4.1.1" - } - }, - "inquirer": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", - "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", - "dev": true, - "requires": { - "ansi-escapes": "1.4.0", - "ansi-regex": "2.1.1", - "chalk": "1.1.3", - "cli-cursor": "1.0.2", - "cli-width": "2.1.0", - "figures": "1.7.0", - "lodash": "4.17.2", - "readline2": "1.0.1", - "run-async": "0.1.0", - "rx-lite": "3.1.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "through": "2.3.8" - } - }, - "onetime": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", - "dev": true - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", - "dev": true, - "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" - } - }, - "run-async": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", - "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", - "dev": true, - "requires": { - "once": "1.4.0" - } - }, - "rx-lite": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", - "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", - "dev": true - }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -4739,16 +4589,6 @@ "is-extendable": "0.1.1" } }, - "external-editor": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz", - "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=", - "requires": { - "iconv-lite": "0.4.18", - "jschardet": "1.5.0", - "tmp": "0.0.31" - } - }, "extglob": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", @@ -4809,7 +4649,8 @@ "extsprintf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", - "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" + "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=", + "dev": true }, "fancy-log": { "version": "1.3.0", @@ -4869,11 +4710,13 @@ } }, "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" } }, "file-entry-cache": { @@ -5126,12 +4969,14 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true }, "form-data": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, "requires": { "asynckit": "0.4.0", "combined-stream": "1.0.5", @@ -5191,7 +5036,8 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true }, "fsevents": { "version": "1.1.2", @@ -6092,17 +5938,6 @@ } } }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } - }, "function-bind": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", @@ -6198,6 +6033,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, "requires": { "assert-plus": "1.0.0" }, @@ -6205,7 +6041,8 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true } } }, @@ -6229,6 +6066,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -6604,29 +6442,16 @@ } } }, - "har-schema": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", - "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" - }, "har-validator": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", - "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", + "dev": true, "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - }, - "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - } + "chalk": "1.1.3", + "commander": "2.11.0", + "is-my-json-valid": "2.16.0", + "pinkie-promise": "2.0.1" } }, "has": { @@ -6647,9 +6472,10 @@ } }, "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true }, "has-gulplog": { "version": "0.1.0", @@ -6686,6 +6512,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, "requires": { "boom": "2.10.1", "cryptiles": "2.0.5", @@ -6723,7 +6550,8 @@ "hoek": { "version": "2.16.3", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "dev": true }, "hoist-non-react-statics": { "version": "1.2.0", @@ -6960,6 +6788,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, "requires": { "assert-plus": "0.2.0", "jsprim": "1.4.0", @@ -7194,6 +7023,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -7219,79 +7049,24 @@ } }, "inquirer": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.0.tgz", - "integrity": "sha512-4CyUYMP7lOBkiUU1rR24WGrfRX6SucwbY2Mqb1PdApU24wnTIk4TsnkQwV72dDdIKZ2ycLP+fWCV+tA7wwgoew==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", + "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", + "dev": true, "requires": { - "ansi-escapes": "2.0.0", - "chalk": "2.0.1", - "cli-cursor": "2.1.0", + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", "cli-width": "2.1.0", - "external-editor": "2.0.4", - "figures": "2.0.0", + "figures": "1.7.0", "lodash": "4.17.2", - "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx-lite": "4.0.8", - "rx-lite-aggregates": "4.0.8", - "string-width": "2.1.0", - "strip-ansi": "4.0.0", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", "through": "2.3.8" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "ansi-styles": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz", - "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=", - "requires": { - "color-convert": "1.9.0" - } - }, - "chalk": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", - "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", - "requires": { - "ansi-styles": "3.1.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.2.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" - }, - "string-width": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz", - "integrity": "sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA=", - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "3.0.0" - } - }, - "supports-color": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz", - "integrity": "sha512-Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg==", - "requires": { - "has-flag": "2.0.0" - } - } } }, "interpret": { @@ -7415,6 +7190,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz", "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=", + "dev": true, "requires": { "ci-info": "1.0.0" } @@ -7692,7 +7468,8 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true }, "is-url": { "version": "1.2.2", @@ -7725,7 +7502,8 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true }, "isobject": { "version": "3.0.1", @@ -7744,7 +7522,8 @@ "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true }, "istanbul": { "version": "1.0.0-alpha.2", @@ -7760,14 +7539,6 @@ "nopt": "3.0.6", "which": "1.2.14", "wordwrap": "1.0.0" - }, - "dependencies": { - "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true - } } }, "istanbul-api": { @@ -7858,12 +7629,6 @@ "supports-color": "3.2.3" }, "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", @@ -7932,13 +7697,9 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true, "optional": true }, - "jschardet": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.0.tgz", - "integrity": "sha512-+Q8JsoEQbrdE+a/gg1F9XO92gcKXgpE5UACqr0sIubjDmBEkd+OOWPGzQeMrWSLxd73r4dHxBeRW7edHu5LmJQ==" - }, "jsdom": { "version": "9.11.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.11.0.tgz", @@ -7956,7 +7717,7 @@ "html-encoding-sniffer": "1.0.1", "nwmatcher": "1.4.1", "parse5": "1.5.1", - "request": "2.81.0", + "request": "2.79.0", "sax": "1.2.4", "symbol-tree": "3.2.2", "tough-cookie": "2.3.2", @@ -7988,7 +7749,8 @@ "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true }, "json-schema-traverse": { "version": "0.3.1", @@ -8006,7 +7768,8 @@ "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true }, "json3": { "version": "3.3.2", @@ -8079,6 +7842,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.0.2", @@ -8089,7 +7853,8 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true } } }, @@ -8263,11 +8028,6 @@ "through2": "0.6.5" } }, - "leven": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", - "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=" - }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -8594,11 +8354,6 @@ "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" }, - "lodash.toarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", - "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=" - }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -8628,18 +8383,6 @@ "requires": { "figures": "1.7.0", "squeak": "1.3.0" - }, - "dependencies": { - "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", - "dev": true, - "requires": { - "escape-string-regexp": "1.0.5", - "object-assign": "4.1.1" - } - } } }, "loglevel": { @@ -8908,21 +8651,18 @@ "mime-db": { "version": "1.27.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz", - "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=" + "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=", + "dev": true }, "mime-types": { "version": "2.1.15", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz", "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=", + "dev": true, "requires": { "mime-db": "1.27.0" } }, - "mimic-fn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", - "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=" - }, "min-document": { "version": "2.19.0", "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", @@ -9027,12 +8767,6 @@ "path-is-absolute": "1.0.1" } }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, "ms": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", @@ -9151,9 +8885,10 @@ } }, "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", + "dev": true }, "nan": { "version": "2.6.2", @@ -9226,15 +8961,6 @@ "minimatch": "3.0.4" } }, - "node-emoji": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.7.0.tgz", - "integrity": "sha512-dYx345sjhPJUpWaVQKjP0/43y+nTcfBRTZfSciM3ZEbRGaU/9AKaHBPf7AJ9vOKcK0W3v67AgI4m4oo02NLHhQ==", - "requires": { - "lodash.toarray": "4.4.0", - "string.prototype.codepointat": "0.2.0" - } - }, "node-fetch": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz", @@ -9244,26 +8970,6 @@ "is-stream": "1.1.0" } }, - "node-gyp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", - "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", - "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.4", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.2.14" - } - }, "node-libs-browser": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", @@ -9324,8 +9030,9 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, "requires": { - "abbrev": "1.1.0" + "abbrev": "1.0.9" } }, "normalize-package-data": { @@ -9421,7 +9128,8 @@ "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", + "dev": true }, "object-assign": { "version": "4.1.1", @@ -9440,11 +9148,6 @@ "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", "dev": true }, - "object-path": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz", - "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=" - }, "object.assign": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz", @@ -9514,12 +9217,10 @@ "dev": true }, "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "requires": { - "mimic-fn": "1.1.0" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", + "dev": true }, "optimist": { "version": "0.6.1", @@ -9604,15 +9305,6 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, - "osenv": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, "output-file-sync": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz", @@ -9899,12 +9591,6 @@ "supports-color": "3.2.3" }, "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", @@ -10256,6 +9942,12 @@ "supports-color": "4.2.0" } }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, "postcss": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", @@ -10308,6 +10000,12 @@ "supports-color": "4.2.0" } }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, "postcss": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", @@ -10360,6 +10058,12 @@ "supports-color": "4.2.0" } }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, "postcss": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", @@ -10412,6 +10116,12 @@ "supports-color": "4.2.0" } }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, "postcss": { "version": "6.0.6", "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.6.tgz", @@ -10793,15 +10503,6 @@ "integrity": "sha1-8/zKCm/gZzanulcpZgaWF8EwtIE=", "dev": true }, - "proper-lockfile": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz", - "integrity": "sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0=", - "requires": { - "graceful-fs": "4.1.11", - "retry": "0.10.1" - } - }, "proxy-addr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz", @@ -10849,7 +10550,8 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true }, "push.js": { "version": "0.0.11", @@ -10982,13 +10684,15 @@ } }, "react": { - "version": "15.4.2", - "resolved": "https://registry.npmjs.org/react/-/react-15.4.2.tgz", - "integrity": "sha1-QfeZGyYYU5K6m66WyIiefgGDl+8=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/react/-/react-15.6.1.tgz", + "integrity": "sha1-uqhDTsZ4C96ZfNw4C3nNM7ljk98=", "requires": { + "create-react-class": "15.6.0", "fbjs": "0.8.12", "loose-envify": "1.3.1", - "object-assign": "4.1.1" + "object-assign": "4.1.1", + "prop-types": "15.5.10" } }, "react-ace": { @@ -11100,13 +10804,14 @@ "dev": true }, "react-dom": { - "version": "15.4.2", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.4.2.tgz", - "integrity": "sha1-AVNj8FsKH9Uq6e/dOgBg2QaVII8=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz", + "integrity": "sha1-LLDtQZEDjlPCCes6eaI+Kkz5lHA=", "requires": { "fbjs": "0.8.12", "loose-envify": "1.3.1", - "object-assign": "4.1.1" + "object-assign": "4.1.1", + "prop-types": "15.5.10" } }, "react-dropzone": { @@ -11315,14 +11020,6 @@ "warning": "3.0.0" } }, - "read": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", - "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=", - "requires": { - "mute-stream": "0.0.7" - } - }, "read-all-stream": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", @@ -11405,14 +11102,6 @@ "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", "mute-stream": "0.0.5" - }, - "dependencies": { - "mute-stream": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", - "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", - "dev": true - } } }, "recast": { @@ -11746,18 +11435,19 @@ "dev": true }, "request": { - "version": "2.81.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", - "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "version": "2.79.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", + "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", + "dev": true, "requires": { "aws-sign2": "0.6.0", "aws4": "1.6.0", - "caseless": "0.12.0", + "caseless": "0.11.0", "combined-stream": "1.0.5", "extend": "3.0.1", "forever-agent": "0.6.1", "form-data": "2.1.4", - "har-validator": "4.2.1", + "har-validator": "2.0.6", "hawk": "3.1.3", "http-signature": "1.1.1", "is-typedarray": "1.0.0", @@ -11765,37 +11455,27 @@ "json-stringify-safe": "5.0.1", "mime-types": "2.1.15", "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.1.1", + "qs": "6.3.0", "stringstream": "0.0.5", "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", + "tunnel-agent": "0.4.3", "uuid": "3.0.0" }, "dependencies": { "extend": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "dev": true }, - "performance-now": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", - "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" - }, - "qs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", - "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" + "tunnel-agent": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "dev": true } } }, - "request-capture-har": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz", - "integrity": "sha1-zWks+yzHRP2EozWKrG7lFSjPcg0=" - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -11843,19 +11523,15 @@ "dev": true }, "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" + "exit-hook": "1.1.1", + "onetime": "1.1.0" } }, - "retry": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" - }, "rgb-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz", @@ -11875,6 +11551,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "dev": true, "requires": { "glob": "7.1.2" } @@ -11893,11 +11570,6 @@ "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz", "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A=" }, - "roadrunner": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz", - "integrity": "sha1-EYCjDWThlw2PVd2MsNqP/M7K1x4=" - }, "rucksack-css": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/rucksack-css/-/rucksack-css-0.9.1.tgz", @@ -11935,25 +11607,19 @@ } }, "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", + "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", + "dev": true, "requires": { - "is-promise": "2.1.0" + "once": "1.4.0" } }, "rx-lite": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", - "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=" - }, - "rx-lite-aggregates": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", - "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", - "requires": { - "rx-lite": "4.0.8" - } + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", + "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", + "dev": true }, "safe-buffer": { "version": "5.1.1", @@ -12280,6 +11946,7 @@ "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, "requires": { "hoek": "2.16.3" } @@ -12420,6 +12087,7 @@ "version": "1.13.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "dev": true, "requires": { "asn1": "0.2.3", "assert-plus": "1.0.0", @@ -12434,7 +12102,8 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true } } }, @@ -12533,11 +12202,6 @@ "strip-ansi": "3.0.1" } }, - "string.prototype.codepointat": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz", - "integrity": "sha1-aybpvTr8qnvjtCabUm3huCAArHg=" - }, "string.prototype.repeat": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz", @@ -12556,7 +12220,8 @@ "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", - "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", + "dev": true }, "strip-ansi": { "version": "3.0.1", @@ -13038,16 +12703,6 @@ "integrity": "sha1-IGvo4YiGC1FEJTdebxrom/sB/Y0=", "dev": true }, - "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, "tar-fs": { "version": "1.15.3", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz", @@ -13103,7 +12758,8 @@ "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true }, "through2": { "version": "0.6.5", @@ -13184,14 +12840,6 @@ "setimmediate": "1.0.5" } }, - "tmp": { - "version": "0.0.31", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", - "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", - "requires": { - "os-tmpdir": "1.0.2" - } - }, "to-absolute-glob": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", @@ -13233,6 +12881,7 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "dev": true, "requires": { "punycode": "1.4.1" } @@ -13291,6 +12940,7 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true, "optional": true }, "type-check": { @@ -13629,6 +13279,7 @@ "version": "1.3.6", "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "dev": true, "requires": { "extsprintf": "1.0.2" } @@ -13827,12 +13478,6 @@ "lodash": "4.17.2" } }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, "loader-utils": { "version": "0.2.17", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", @@ -13977,6 +13622,7 @@ "version": "1.2.14", "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", + "dev": true, "requires": { "isexe": "2.0.0" } @@ -14143,58 +13789,6 @@ "lodash.assign": "4.2.0" } }, - "yarn": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz", - "integrity": "sha1-jdo6Y8eYs4PPpXdFLCs8s+Sqh+A=", - "requires": { - "babel-runtime": "6.23.0", - "bytes": "2.4.0", - "camelcase": "3.0.0", - "chalk": "1.1.3", - "cmd-shim": "2.0.2", - "commander": "2.11.0", - "death": "1.1.0", - "debug": "2.6.8", - "defaults": "1.0.3", - "detect-indent": "5.0.0", - "ini": "1.3.4", - "inquirer": "3.2.0", - "invariant": "2.2.2", - "is-builtin-module": "1.0.0", - "is-ci": "1.0.10", - "leven": "2.1.0", - "loud-rejection": "1.6.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "node-emoji": "1.7.0", - "node-gyp": "3.6.2", - "object-path": "0.11.4", - "proper-lockfile": "2.0.1", - "read": "1.0.7", - "request": "2.81.0", - "request-capture-har": "1.2.2", - "rimraf": "2.6.1", - "roadrunner": "1.1.0", - "semver": "5.3.0", - "strip-bom": "3.0.0", - "tar": "2.2.1", - "tar-stream": "1.5.4", - "validate-npm-package-license": "3.0.1" - }, - "dependencies": { - "detect-indent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", - "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=" - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - } - } - }, "yauzl": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz", diff --git a/js/package.json b/js/package.json index 379e72d0e..dbd6fe68a 100644 --- a/js/package.json +++ b/js/package.json @@ -179,8 +179,9 @@ "loglevel": "1.4.1", "moment": "2.17.0", "promise-worker": "1.1.1", - "react": "15.4.2", - "react-dom": "15.4.2", + "prop-types": "15.5.10", + "react": "15.6.1", + "react-dom": "15.6.1", "react-inspector": "paritytech/react-inspector", "react-intl": "2.1.5", "react-router": "3.0.0", @@ -198,7 +199,6 @@ "utf8": "2.1.2", "web3": "0.17.0-beta", "whatwg-fetch": "2.0.1", - "worker-loader": "^0.8.0", - "yarn": "^0.21.3" + "worker-loader": "^0.8.0" } } diff --git a/js/src/dapps/chaindeploy/Contract/contract.js b/js/src/dapps/chaindeploy/Contract/contract.js index 1f0b158d2..0be51fbf2 100644 --- a/js/src/dapps/chaindeploy/Contract/contract.js +++ b/js/src/dapps/chaindeploy/Contract/contract.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ListItem, { Header, Row } from '../ListItem'; diff --git a/js/src/dapps/chaindeploy/Dapp/dapp.js b/js/src/dapps/chaindeploy/Dapp/dapp.js index 5a997c295..934eb34f4 100644 --- a/js/src/dapps/chaindeploy/Dapp/dapp.js +++ b/js/src/dapps/chaindeploy/Dapp/dapp.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ListItem, { Header, Row } from '../ListItem'; diff --git a/js/src/dapps/chaindeploy/ListItem/Header/header.js b/js/src/dapps/chaindeploy/ListItem/Header/header.js index e9be01eea..efb8ec705 100644 --- a/js/src/dapps/chaindeploy/ListItem/Header/header.js +++ b/js/src/dapps/chaindeploy/ListItem/Header/header.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Icon from '../Icon'; diff --git a/js/src/dapps/chaindeploy/ListItem/Icon/icon.js b/js/src/dapps/chaindeploy/ListItem/Icon/icon.js index 1f32622e5..25a0e5511 100644 --- a/js/src/dapps/chaindeploy/ListItem/Icon/icon.js +++ b/js/src/dapps/chaindeploy/ListItem/Icon/icon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from '../listItem.css'; diff --git a/js/src/dapps/chaindeploy/ListItem/Row/row.js b/js/src/dapps/chaindeploy/ListItem/Row/row.js index 0982e0321..8e65686cd 100644 --- a/js/src/dapps/chaindeploy/ListItem/Row/row.js +++ b/js/src/dapps/chaindeploy/ListItem/Row/row.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Icon from '../Icon'; diff --git a/js/src/dapps/chaindeploy/ListItem/listItem.js b/js/src/dapps/chaindeploy/ListItem/listItem.js index c670123f9..9738bf9dd 100644 --- a/js/src/dapps/chaindeploy/ListItem/listItem.js +++ b/js/src/dapps/chaindeploy/ListItem/listItem.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from './listItem.css'; diff --git a/js/src/dapps/dappreg/Button/button.js b/js/src/dapps/dappreg/Button/button.js index 40d84b542..deedd8473 100644 --- a/js/src/dapps/dappreg/Button/button.js +++ b/js/src/dapps/dappreg/Button/button.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from './button.css'; diff --git a/js/src/dapps/dappreg/Card/card.js b/js/src/dapps/dappreg/Card/card.js index d3201425c..1b85aca89 100644 --- a/js/src/dapps/dappreg/Card/card.js +++ b/js/src/dapps/dappreg/Card/card.js @@ -15,8 +15,9 @@ // along with Parity. If not, see . import keycode from 'keycode'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import ReactDOM from 'react-dom'; +import PropTypes from 'prop-types'; import styles from './card.css'; diff --git a/js/src/dapps/dappreg/DappCard/dappCard.js b/js/src/dapps/dappreg/DappCard/dappCard.js index deccde9fc..76240829e 100644 --- a/js/src/dapps/dappreg/DappCard/dappCard.js +++ b/js/src/dapps/dappreg/DappCard/dappCard.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Card from '../Card'; import DappsStore from '../dappsStore'; diff --git a/js/src/dapps/dappreg/DappModal/dappModal.js b/js/src/dapps/dappreg/DappModal/dappModal.js index 28597aba9..5cee744fb 100644 --- a/js/src/dapps/dappreg/DappModal/dappModal.js +++ b/js/src/dapps/dappreg/DappModal/dappModal.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import DappsStore from '../dappsStore'; diff --git a/js/src/dapps/dappreg/Dapps/dapps.js b/js/src/dapps/dappreg/Dapps/dapps.js index da9675bcb..d57895051 100644 --- a/js/src/dapps/dappreg/Dapps/dapps.js +++ b/js/src/dapps/dappreg/Dapps/dapps.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import CreateDappCard from '../CreateDappCard'; import DappCard from '../DappCard'; diff --git a/js/src/dapps/dappreg/Input/input.js b/js/src/dapps/dappreg/Input/input.js index 27084c3ed..5071e386d 100644 --- a/js/src/dapps/dappreg/Input/input.js +++ b/js/src/dapps/dappreg/Input/input.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from './input.css'; diff --git a/js/src/dapps/dappreg/Modal/modal.js b/js/src/dapps/dappreg/Modal/modal.js index c6dbd62e4..6e496d2db 100644 --- a/js/src/dapps/dappreg/Modal/modal.js +++ b/js/src/dapps/dappreg/Modal/modal.js @@ -15,8 +15,9 @@ // along with Parity. If not, see . import keycode from 'keycode'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import ReactDOM from 'react-dom'; +import PropTypes from 'prop-types'; import Button from '../Button'; diff --git a/js/src/dapps/dappreg/ModalDelete/modalDelete.js b/js/src/dapps/dappreg/ModalDelete/modalDelete.js index 20ca64067..ebe0a7faa 100644 --- a/js/src/dapps/dappreg/ModalDelete/modalDelete.js +++ b/js/src/dapps/dappreg/ModalDelete/modalDelete.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Modal from '../Modal'; diff --git a/js/src/dapps/dappreg/ModalRegister/modalRegister.js b/js/src/dapps/dappreg/ModalRegister/modalRegister.js index ee4d2a374..24c01a83a 100644 --- a/js/src/dapps/dappreg/ModalRegister/modalRegister.js +++ b/js/src/dapps/dappreg/ModalRegister/modalRegister.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { observer } from 'mobx-react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import DappsStore from '../dappsStore'; diff --git a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js b/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js index 051e56ddc..8c66a4300 100644 --- a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js +++ b/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Modal from '../Modal'; diff --git a/js/src/dapps/dappreg/SelectAccount/selectAccount.js b/js/src/dapps/dappreg/SelectAccount/selectAccount.js index b875ad824..4ca6a99d8 100644 --- a/js/src/dapps/dappreg/SelectAccount/selectAccount.js +++ b/js/src/dapps/dappreg/SelectAccount/selectAccount.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { observer } from 'mobx-react'; +import PropTypes from 'prop-types'; import DappsStore from '../dappsStore'; diff --git a/js/src/dapps/githubhint/Button/button.js b/js/src/dapps/githubhint/Button/button.js index 32bf006c4..a4c539ec2 100644 --- a/js/src/dapps/githubhint/Button/button.js +++ b/js/src/dapps/githubhint/Button/button.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from './button.css'; diff --git a/js/src/dapps/githubhint/Events/events.js b/js/src/dapps/githubhint/Events/events.js index e674d93d1..12d01a7d9 100644 --- a/js/src/dapps/githubhint/Events/events.js +++ b/js/src/dapps/githubhint/Events/events.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import moment from 'moment'; +import PropTypes from 'prop-types'; import styles from './events.css'; diff --git a/js/src/dapps/localtx/IdentityIcon/identityIcon.js b/js/src/dapps/localtx/IdentityIcon/identityIcon.js index c442c4585..31c3e244e 100644 --- a/js/src/dapps/localtx/IdentityIcon/identityIcon.js +++ b/js/src/dapps/localtx/IdentityIcon/identityIcon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import styles from './identityIcon.css'; diff --git a/js/src/dapps/localtx/Transaction/transaction.js b/js/src/dapps/localtx/Transaction/transaction.js index 554c2b757..c1c6c6257 100644 --- a/js/src/dapps/localtx/Transaction/transaction.js +++ b/js/src/dapps/localtx/Transaction/transaction.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import classnames from 'classnames'; import { api } from '../parity'; diff --git a/js/src/dapps/registry/Accounts/accounts.js b/js/src/dapps/registry/Accounts/accounts.js index b17ad63b1..983fc496f 100644 --- a/js/src/dapps/registry/Accounts/accounts.js +++ b/js/src/dapps/registry/Accounts/accounts.js @@ -14,10 +14,11 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import AccountIcon from 'material-ui/svg-icons/action/account-circle'; +import PropTypes from 'prop-types'; import { init } from './actions'; import IdentityIcon from '../IdentityIcon'; diff --git a/js/src/dapps/registry/Application/application.js b/js/src/dapps/registry/Application/application.js index 09cf2d7f8..a2485cea4 100644 --- a/js/src/dapps/registry/Application/application.js +++ b/js/src/dapps/registry/Application/application.js @@ -13,7 +13,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import getMuiTheme from 'material-ui/styles/getMuiTheme'; import lightBaseTheme from 'material-ui/styles/baseThemes/lightBaseTheme'; diff --git a/js/src/dapps/registry/Container.js b/js/src/dapps/registry/Container.js index 4381f4382..c876e4740 100644 --- a/js/src/dapps/registry/Container.js +++ b/js/src/dapps/registry/Container.js @@ -14,9 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; +import PropTypes from 'prop-types'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/dapps/registry/Events/events.js b/js/src/dapps/registry/Events/events.js index 05b138bc5..2b7a3a592 100644 --- a/js/src/dapps/registry/Events/events.js +++ b/js/src/dapps/registry/Events/events.js @@ -14,12 +14,13 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { Card, CardHeader, CardActions, CardText } from 'material-ui/Card'; import Toggle from 'material-ui/Toggle'; import moment from 'moment'; +import PropTypes from 'prop-types'; import { bytesToHex } from '../parity'; import Hash from '../ui/hash'; diff --git a/js/src/dapps/registry/IdentityIcon/identityIcon.js b/js/src/dapps/registry/IdentityIcon/identityIcon.js index aac1043ae..9adf8051b 100644 --- a/js/src/dapps/registry/IdentityIcon/identityIcon.js +++ b/js/src/dapps/registry/IdentityIcon/identityIcon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import styles from './identityIcon.css'; diff --git a/js/src/dapps/registry/Lookup/lookup.js b/js/src/dapps/registry/Lookup/lookup.js index c13267082..71b4758b9 100644 --- a/js/src/dapps/registry/Lookup/lookup.js +++ b/js/src/dapps/registry/Lookup/lookup.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { Card, CardHeader, CardText } from 'material-ui/Card'; @@ -24,6 +24,7 @@ import TextField from 'material-ui/TextField'; import DropDownMenu from 'material-ui/DropDownMenu'; import MenuItem from 'material-ui/MenuItem'; import keycode from 'keycode'; +import PropTypes from 'prop-types'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/dapps/registry/Names/names.js b/js/src/dapps/registry/Names/names.js index 44e33b8da..5b00843ce 100644 --- a/js/src/dapps/registry/Names/names.js +++ b/js/src/dapps/registry/Names/names.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { Card, CardHeader, CardText } from 'material-ui/Card'; @@ -23,6 +23,7 @@ import DropDownMenu from 'material-ui/DropDownMenu'; import MenuItem from 'material-ui/MenuItem'; import RaisedButton from 'material-ui/RaisedButton'; import CheckIcon from 'material-ui/svg-icons/navigation/check'; +import PropTypes from 'prop-types'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/dapps/registry/Records/records.js b/js/src/dapps/registry/Records/records.js index c0f61585c..9a120781a 100644 --- a/js/src/dapps/registry/Records/records.js +++ b/js/src/dapps/registry/Records/records.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { Card, CardHeader, CardText } from 'material-ui/Card'; @@ -23,6 +23,7 @@ import DropDownMenu from 'material-ui/DropDownMenu'; import MenuItem from 'material-ui/MenuItem'; import RaisedButton from 'material-ui/RaisedButton'; import SaveIcon from 'material-ui/svg-icons/content/save'; +import PropTypes from 'prop-types'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/dapps/registry/Reverse/reverse.js b/js/src/dapps/registry/Reverse/reverse.js index 3197e56df..a1c03124c 100644 --- a/js/src/dapps/registry/Reverse/reverse.js +++ b/js/src/dapps/registry/Reverse/reverse.js @@ -14,12 +14,13 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { Card, CardHeader, CardText, TextField, DropDownMenu, MenuItem, RaisedButton } from 'material-ui'; +import PropTypes from 'prop-types'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/dapps/registry/ui/address.js b/js/src/dapps/registry/ui/address.js index 2bf96f2e7..a73a2b8e5 100644 --- a/js/src/dapps/registry/ui/address.js +++ b/js/src/dapps/registry/ui/address.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/dapps/registry/ui/hash.js b/js/src/dapps/registry/ui/hash.js index fe404f5b2..478442deb 100644 --- a/js/src/dapps/registry/ui/hash.js +++ b/js/src/dapps/registry/ui/hash.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; import etherscanUrl from '../util/etherscan-url'; diff --git a/js/src/dapps/signaturereg/Button/button.js b/js/src/dapps/signaturereg/Button/button.js index 802f6f8b7..aa89d9c1c 100644 --- a/js/src/dapps/signaturereg/Button/button.js +++ b/js/src/dapps/signaturereg/Button/button.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from './button.css'; diff --git a/js/src/dapps/signaturereg/Events/events.js b/js/src/dapps/signaturereg/Events/events.js index 9cc9ca483..94ca800d0 100644 --- a/js/src/dapps/signaturereg/Events/events.js +++ b/js/src/dapps/signaturereg/Events/events.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { formatBlockNumber, formatBlockTimestamp, formatSignature } from '../format'; import { attachEvents } from '../services'; diff --git a/js/src/dapps/signaturereg/Header/header.js b/js/src/dapps/signaturereg/Header/header.js index b3988431a..8ad20d3d2 100644 --- a/js/src/dapps/signaturereg/Header/header.js +++ b/js/src/dapps/signaturereg/Header/header.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from './header.css'; import blocks from '@parity/shared/assets/images/dapps/blocks-350.jpg'; diff --git a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js b/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js index c442c4585..31c3e244e 100644 --- a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js +++ b/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import styles from './identityIcon.css'; diff --git a/js/src/dapps/signaturereg/Import/import.js b/js/src/dapps/signaturereg/Import/import.js index c1fcc3997..cac85599e 100644 --- a/js/src/dapps/signaturereg/Import/import.js +++ b/js/src/dapps/signaturereg/Import/import.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import { callRegister, postRegister } from '../services'; diff --git a/js/src/dapps/tokendeploy/AddressSelect/addressSelect.js b/js/src/dapps/tokendeploy/AddressSelect/addressSelect.js index 04c37b10c..29b48f1f6 100644 --- a/js/src/dapps/tokendeploy/AddressSelect/addressSelect.js +++ b/js/src/dapps/tokendeploy/AddressSelect/addressSelect.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import styles from './addressSelect.css'; diff --git a/js/src/dapps/tokendeploy/Application/Header/header.js b/js/src/dapps/tokendeploy/Application/Header/header.js index e8dd3d04d..5096c7b9e 100644 --- a/js/src/dapps/tokendeploy/Application/Header/header.js +++ b/js/src/dapps/tokendeploy/Application/Header/header.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import PAGES from '../pages'; import styles from './header.css'; diff --git a/js/src/dapps/tokendeploy/Application/application.js b/js/src/dapps/tokendeploy/Application/application.js index 24c6202cc..76069aff0 100644 --- a/js/src/dapps/tokendeploy/Application/application.js +++ b/js/src/dapps/tokendeploy/Application/application.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import { attachInstances } from '../services'; diff --git a/js/src/dapps/tokendeploy/Container/container.js b/js/src/dapps/tokendeploy/Container/container.js index f7171b863..7851c02b1 100644 --- a/js/src/dapps/tokendeploy/Container/container.js +++ b/js/src/dapps/tokendeploy/Container/container.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from './container.css'; diff --git a/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js b/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js index 51dcd2f5b..244ba6360 100644 --- a/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js +++ b/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../../parity'; import Container from '../../Container'; diff --git a/js/src/dapps/tokendeploy/Deploy/Event/event.js b/js/src/dapps/tokendeploy/Deploy/Event/event.js index 9503c67c2..b5f66640c 100644 --- a/js/src/dapps/tokendeploy/Deploy/Event/event.js +++ b/js/src/dapps/tokendeploy/Deploy/Event/event.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../../parity'; import { getCoin, txLink } from '../../services'; diff --git a/js/src/dapps/tokendeploy/Deploy/Events/events.js b/js/src/dapps/tokendeploy/Deploy/Events/events.js index b9ec66c77..32aa601c8 100644 --- a/js/src/dapps/tokendeploy/Deploy/Events/events.js +++ b/js/src/dapps/tokendeploy/Deploy/Events/events.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../../parity'; import Container from '../../Container'; diff --git a/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js b/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js index 81a8d0ede..91ee02e57 100644 --- a/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js +++ b/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import styles from './identityIcon.css'; diff --git a/js/src/dapps/tokendeploy/Overview/Owner/owner.js b/js/src/dapps/tokendeploy/Overview/Owner/owner.js index 3e1530e05..6d9f6fcbe 100644 --- a/js/src/dapps/tokendeploy/Overview/Owner/owner.js +++ b/js/src/dapps/tokendeploy/Overview/Owner/owner.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import IdentityIcon from '../../IdentityIcon'; import Token from '../Token'; diff --git a/js/src/dapps/tokendeploy/Overview/Token/token.js b/js/src/dapps/tokendeploy/Overview/Token/token.js index 181484ac9..469ee2089 100644 --- a/js/src/dapps/tokendeploy/Overview/Token/token.js +++ b/js/src/dapps/tokendeploy/Overview/Token/token.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { totalSupply, getCoin } from '../../services'; import styles from './token.css'; diff --git a/js/src/dapps/tokendeploy/Overview/overview.js b/js/src/dapps/tokendeploy/Overview/overview.js index 58333e17e..7c0fe248b 100644 --- a/js/src/dapps/tokendeploy/Overview/overview.js +++ b/js/src/dapps/tokendeploy/Overview/overview.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { loadOwnedTokens } from '../services'; import Container from '../Container'; diff --git a/js/src/dapps/tokendeploy/Transfer/Event/event.js b/js/src/dapps/tokendeploy/Transfer/Event/event.js index bc28bd8b1..225db9312 100644 --- a/js/src/dapps/tokendeploy/Transfer/Event/event.js +++ b/js/src/dapps/tokendeploy/Transfer/Event/event.js @@ -16,7 +16,8 @@ // TODO: This is a copy & paste for Deploy/Event -> render() different. Not very DRY import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../../parity'; import { txLink } from '../../services'; diff --git a/js/src/dapps/tokendeploy/Transfer/Send/send.js b/js/src/dapps/tokendeploy/Transfer/Send/send.js index 35337f42a..9b08b5d65 100644 --- a/js/src/dapps/tokendeploy/Transfer/Send/send.js +++ b/js/src/dapps/tokendeploy/Transfer/Send/send.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { eip20 } from '@parity/shared/contracts/abi'; diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js b/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js index cd568f2ed..b5c070d63 100644 --- a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js +++ b/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js @@ -14,10 +14,11 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { List, ListItem } from 'material-ui/List'; import Subheader from 'material-ui/Subheader'; import Avatar from 'material-ui/Avatar'; +import PropTypes from 'prop-types'; import IdentityIcon from '../../IdentityIcon'; diff --git a/js/src/dapps/tokenreg/Actions/Query/query.js b/js/src/dapps/tokenreg/Actions/Query/query.js index 60166b66d..ff99e0685 100644 --- a/js/src/dapps/tokenreg/Actions/Query/query.js +++ b/js/src/dapps/tokenreg/Actions/Query/query.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Dialog, FlatButton, SelectField, MenuItem } from 'material-ui'; diff --git a/js/src/dapps/tokenreg/Actions/Register/register.js b/js/src/dapps/tokenreg/Actions/Register/register.js index 4c9ca212b..1263d172e 100644 --- a/js/src/dapps/tokenreg/Actions/Register/register.js +++ b/js/src/dapps/tokenreg/Actions/Register/register.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Dialog, FlatButton } from 'material-ui'; diff --git a/js/src/dapps/tokenreg/Actions/component.js b/js/src/dapps/tokenreg/Actions/component.js index eb01efbaa..7555a331b 100644 --- a/js/src/dapps/tokenreg/Actions/component.js +++ b/js/src/dapps/tokenreg/Actions/component.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { RaisedButton } from 'material-ui'; import ActionSearchIcon from 'material-ui/svg-icons/action/search'; diff --git a/js/src/dapps/tokenreg/Application/application.js b/js/src/dapps/tokenreg/Application/application.js index 71081c7ee..97be87481 100644 --- a/js/src/dapps/tokenreg/Application/application.js +++ b/js/src/dapps/tokenreg/Application/application.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import getMuiTheme from 'material-ui/styles/getMuiTheme'; +import PropTypes from 'prop-types'; import { api } from '../parity'; diff --git a/js/src/dapps/tokenreg/Chip/chip.js b/js/src/dapps/tokenreg/Chip/chip.js index 7c19a671c..2d1c67d5b 100644 --- a/js/src/dapps/tokenreg/Chip/chip.js +++ b/js/src/dapps/tokenreg/Chip/chip.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Chip } from 'material-ui'; diff --git a/js/src/dapps/tokenreg/Container.js b/js/src/dapps/tokenreg/Container.js index 4eccaca86..066ed9797 100644 --- a/js/src/dapps/tokenreg/Container.js +++ b/js/src/dapps/tokenreg/Container.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; import Application from './Application'; diff --git a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js b/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js index bbba1cb44..04d29a5bc 100644 --- a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js +++ b/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import styles from './identityIcon.css'; diff --git a/js/src/dapps/tokenreg/Inputs/Text/input-text.js b/js/src/dapps/tokenreg/Inputs/Text/input-text.js index 0862c6443..ade2c9520 100644 --- a/js/src/dapps/tokenreg/Inputs/Text/input-text.js +++ b/js/src/dapps/tokenreg/Inputs/Text/input-text.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { TextField } from 'material-ui'; import CheckIcon from 'material-ui/svg-icons/navigation/check'; diff --git a/js/src/dapps/tokenreg/Loading/loading.js b/js/src/dapps/tokenreg/Loading/loading.js index ceec2de3c..5c33de17b 100644 --- a/js/src/dapps/tokenreg/Loading/loading.js +++ b/js/src/dapps/tokenreg/Loading/loading.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import CircularProgress from 'material-ui/CircularProgress'; +import PropTypes from 'prop-types'; import styles from './loading.css'; diff --git a/js/src/dapps/tokenreg/Status/status.js b/js/src/dapps/tokenreg/Status/status.js index 6f77f386b..17ed9a76f 100644 --- a/js/src/dapps/tokenreg/Status/status.js +++ b/js/src/dapps/tokenreg/Status/status.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { api } from '../parity'; import Chip from '../Chip'; diff --git a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js b/js/src/dapps/tokenreg/Tokens/Token/add-meta.js index 0f73179d9..488893c04 100644 --- a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js +++ b/js/src/dapps/tokenreg/Tokens/Token/add-meta.js @@ -14,9 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { Dialog, RaisedButton, FlatButton, SelectField, MenuItem } from 'material-ui'; import AddIcon from 'material-ui/svg-icons/content/add'; +import PropTypes from 'prop-types'; import InputText from '../../Inputs/Text'; import { ADDRESS_TYPE, URL_TYPE } from '../../Inputs/validation'; diff --git a/js/src/dapps/tokenreg/Tokens/Token/token.js b/js/src/dapps/tokenreg/Tokens/Token/token.js index 9d60d4580..4178f2f64 100644 --- a/js/src/dapps/tokenreg/Tokens/Token/token.js +++ b/js/src/dapps/tokenreg/Tokens/Token/token.js @@ -14,9 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import Paper from 'material-ui/Paper'; import { RaisedButton, SelectField, MenuItem } from 'material-ui'; +import PropTypes from 'prop-types'; import FindIcon from 'material-ui/svg-icons/action/find-in-page'; import DeleteIcon from 'material-ui/svg-icons/action/delete'; diff --git a/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js b/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js index dc15f68d9..f5acf350b 100644 --- a/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js +++ b/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; import Token from './token'; diff --git a/js/src/dapps/tokenreg/Tokens/container.js b/js/src/dapps/tokenreg/Tokens/container.js index 452a84dbf..9920c74df 100644 --- a/js/src/dapps/tokenreg/Tokens/container.js +++ b/js/src/dapps/tokenreg/Tokens/container.js @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; import Tokens from './tokens'; diff --git a/js/src/dapps/tokenreg/Tokens/tokens.js b/js/src/dapps/tokenreg/Tokens/tokens.js index fe0207075..727b49f50 100644 --- a/js/src/dapps/tokenreg/Tokens/tokens.js +++ b/js/src/dapps/tokenreg/Tokens/tokens.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Token from './Token'; import Loading from '../Loading'; diff --git a/js/src/shared/config/dappsViews.json b/js/src/shared/config/dappsViews.json index 8ed3106d4..4422fa53a 100644 --- a/js/src/shared/config/dappsViews.json +++ b/js/src/shared/config/dappsViews.json @@ -7,7 +7,8 @@ "description": "Display the accounts", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "address card" }, { "id": "account", @@ -28,7 +29,8 @@ "description": "Display the accounts added to the addressbook", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "address book" }, { "id": "address", @@ -49,7 +51,8 @@ "description": "Display the contracts added to the addressbook", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "puzzle" }, { "id": "contract", @@ -70,7 +73,8 @@ "description": "Allow setting of accounts to use by default for dapps", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "users" }, { "id": "dappMethods", @@ -80,7 +84,8 @@ "description": "Allow setting of dapp permissions on a per method level", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "map signs" }, { "id": "dappVisible", @@ -90,7 +95,8 @@ "description": "Allow setting of visible dapps", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "hide" }, { "id": "develop", @@ -100,7 +106,8 @@ "description": "Create new contracts", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "connectdevelop" }, { "id": "home", @@ -110,7 +117,8 @@ "description": "Display the status of the node, recently accessed applications, accounts and news", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "home" }, { "id": "playground", @@ -131,7 +139,8 @@ "description": "Display the current and historic Signer requests", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "exchange" }, { "id": "settings", @@ -141,7 +150,8 @@ "description": "Allows the configuraion of all Parity & Parity-UI related options", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "settings" }, { "id": "status", @@ -151,7 +161,8 @@ "description": "Displays an overview of the node including settings, logs and connections", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "feed" }, { "id": "vaults", @@ -161,7 +172,8 @@ "description": "Allows the management of the Account Vaults, including creation, locking and account assignment", "author": "Parity Team ", "version": "2.0.0", - "visible": true + "visible": true, + "semantic-icon": "archive" }, { "id": "wallet", diff --git a/js/src/shared/redux/providers/status.js b/js/src/shared/redux/providers/status.js index 2f363e8fc..784921404 100644 --- a/js/src/shared/redux/providers/status.js +++ b/js/src/shared/redux/providers/status.js @@ -255,7 +255,17 @@ export default class Status { // Support Parity-Extension. const uiUrl = this._api.transport.uiUrlWithProtocol || ''; - return fetch(`${uiUrl}/api/health`).then(res => res.json()); + return fetch(`${uiUrl}/api/health`) + .then((response) => { + if (!response.ok) { + return {}; + } + + return response.json(); + }) + .catch(() => { + return {}; + }); } /** diff --git a/js/src/shared/util/proptypes.js b/js/src/shared/util/proptypes.js index 30b6fafd9..9192f87bd 100644 --- a/js/src/shared/util/proptypes.js +++ b/js/src/shared/util/proptypes.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export function arrayOrObjectProptype () { return PropTypes.oneOfType([ diff --git a/js/src/shell/Application/application.js b/js/src/shell/Application/application.js index ccf8d76cf..aff8e5eb7 100644 --- a/js/src/shell/Application/application.js +++ b/js/src/shell/Application/application.js @@ -15,9 +15,10 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; import { Errors } from '@parity/ui'; diff --git a/js/src/shell/Connection/connection.js b/js/src/shell/Connection/connection.js index d7a20a814..ebb80be9d 100644 --- a/js/src/shell/Connection/connection.js +++ b/js/src/shell/Connection/connection.js @@ -14,9 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; import { Input } from '@parity/ui'; import { CompareIcon, ComputerIcon, DashboardIcon, VpnIcon } from '@parity/ui/Icons'; diff --git a/js/src/shell/Dapp/dapp.js b/js/src/shell/Dapp/dapp.js index e73d0463d..02dcc5be0 100644 --- a/js/src/shell/Dapp/dapp.js +++ b/js/src/shell/Dapp/dapp.js @@ -14,9 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { observer } from 'mobx-react'; import { FormattedMessage } from 'react-intl'; +import PropTypes from 'prop-types'; import DappsStore from '../Dapps/dappsStore'; diff --git a/js/src/shell/DappRequests/Request/request.js b/js/src/shell/DappRequests/Request/request.js index 5d02b03bf..43a932903 100644 --- a/js/src/shell/DappRequests/Request/request.js +++ b/js/src/shell/DappRequests/Request/request.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Button } from '@parity/ui'; diff --git a/js/src/shell/Dapps/dapps.js b/js/src/shell/Dapps/dapps.js index 6cb246385..23097615e 100644 --- a/js/src/shell/Dapps/dapps.js +++ b/js/src/shell/Dapps/dapps.js @@ -16,9 +16,10 @@ import { omitBy } from 'lodash'; import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; +import PropTypes from 'prop-types'; import { Checkbox, DappCard, Page, SectionList } from '@parity/ui'; @@ -81,10 +82,10 @@ class Dapps extends Component { /> } > -
{ this.renderList(this.store.visibleViews) }
-
{ this.renderList(this.store.visibleLocal) }
-
{ this.renderList(this.store.visibleBuiltin) }
-
{ this.renderList(this.store.visibleNetwork, externalOverlay) }
+ { this.renderList(this.store.visibleViews) } + { this.renderList(this.store.visibleLocal) } + { this.renderList(this.store.visibleBuiltin) } + { this.renderList(this.store.visibleNetwork, externalOverlay) } ); } @@ -93,6 +94,7 @@ class Dapps extends Component { return ( diff --git a/js/src/shell/FirstRun/TnC/tnc.js b/js/src/shell/FirstRun/TnC/tnc.js index af464adb4..719ff471c 100644 --- a/js/src/shell/FirstRun/TnC/tnc.js +++ b/js/src/shell/FirstRun/TnC/tnc.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import ReactMarkdown from 'react-markdown'; diff --git a/js/src/shell/FirstRun/firstRun.js b/js/src/shell/FirstRun/firstRun.js index d7bd54491..f830b09b2 100644 --- a/js/src/shell/FirstRun/firstRun.js +++ b/js/src/shell/FirstRun/firstRun.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/shell/ParityBar/parityBar.js b/js/src/shell/ParityBar/parityBar.js index 9a058a552..960f0fbe0 100644 --- a/js/src/shell/ParityBar/parityBar.js +++ b/js/src/shell/ParityBar/parityBar.js @@ -16,7 +16,8 @@ import { throttle } from 'lodash'; import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; diff --git a/js/src/shell/Requests/requests.js b/js/src/shell/Requests/requests.js index 026fd3f9b..d35cd815b 100644 --- a/js/src/shell/Requests/requests.js +++ b/js/src/shell/Requests/requests.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import ReactDOM from 'react-dom'; import { connect } from 'react-redux'; diff --git a/js/src/shell/Signer/Embedded/embedded.js b/js/src/shell/Signer/Embedded/embedded.js index 13e2283a9..e4f72e771 100644 --- a/js/src/shell/Signer/Embedded/embedded.js +++ b/js/src/shell/Signer/Embedded/embedded.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/shell/Signer/components/Account/AccountLink/accountLink.js b/js/src/shell/Signer/components/Account/AccountLink/accountLink.js index afa8e98e5..912e446d7 100644 --- a/js/src/shell/Signer/components/Account/AccountLink/accountLink.js +++ b/js/src/shell/Signer/components/Account/AccountLink/accountLink.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { Link } from 'react-router'; diff --git a/js/src/shell/Signer/components/Account/account.js b/js/src/shell/Signer/components/Account/account.js index 003fdeec3..a176eef7e 100644 --- a/js/src/shell/Signer/components/Account/account.js +++ b/js/src/shell/Signer/components/Account/account.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { IdentityIcon, IdentityName } from '@parity/ui'; diff --git a/js/src/shell/Signer/components/DecryptRequest/decryptRequest.js b/js/src/shell/Signer/components/DecryptRequest/decryptRequest.js index 703582c9e..018c581ff 100644 --- a/js/src/shell/Signer/components/DecryptRequest/decryptRequest.js +++ b/js/src/shell/Signer/components/DecryptRequest/decryptRequest.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/shell/Signer/components/RequestOrigin/requestOrigin.js b/js/src/shell/Signer/components/RequestOrigin/requestOrigin.js index 569e19528..e0136e486 100644 --- a/js/src/shell/Signer/components/RequestOrigin/requestOrigin.js +++ b/js/src/shell/Signer/components/RequestOrigin/requestOrigin.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import IdentityIcon from '@parity/ui/IdentityIcon'; diff --git a/js/src/shell/Signer/components/RequestPending/requestPending.js b/js/src/shell/Signer/components/RequestPending/requestPending.js index 7865a1d77..e116e6906 100644 --- a/js/src/shell/Signer/components/RequestPending/requestPending.js +++ b/js/src/shell/Signer/components/RequestPending/requestPending.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import DecryptRequest from '../DecryptRequest'; import SignRequest from '../SignRequest'; diff --git a/js/src/shell/Signer/components/SignRequest/signRequest.js b/js/src/shell/Signer/components/SignRequest/signRequest.js index 212716035..b1428008d 100644 --- a/js/src/shell/Signer/components/SignRequest/signRequest.js +++ b/js/src/shell/Signer/components/SignRequest/signRequest.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/shell/Signer/components/TransactionMainDetails/transactionMainDetails.js b/js/src/shell/Signer/components/TransactionMainDetails/transactionMainDetails.js index d06a0218f..a6f96d972 100644 --- a/js/src/shell/Signer/components/TransactionMainDetails/transactionMainDetails.js +++ b/js/src/shell/Signer/components/TransactionMainDetails/transactionMainDetails.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import ReactTooltip from 'react-tooltip'; diff --git a/js/src/shell/Signer/components/TransactionPending/transactionPending.js b/js/src/shell/Signer/components/TransactionPending/transactionPending.js index 1cdae2a4b..2cb6314a0 100644 --- a/js/src/shell/Signer/components/TransactionPending/transactionPending.js +++ b/js/src/shell/Signer/components/TransactionPending/transactionPending.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/shell/Signer/components/TransactionPendingForm/transactionPendingForm.js b/js/src/shell/Signer/components/TransactionPendingForm/transactionPendingForm.js index 106c38fb5..281d8e617 100644 --- a/js/src/shell/Signer/components/TransactionPendingForm/transactionPendingForm.js +++ b/js/src/shell/Signer/components/TransactionPendingForm/transactionPendingForm.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { PrevIcon } from '@parity/ui/Icons'; diff --git a/js/src/shell/Signer/components/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/js/src/shell/Signer/components/TransactionPendingFormConfirm/transactionPendingFormConfirm.js index fb7531a86..723ea3bdb 100644 --- a/js/src/shell/Signer/components/TransactionPendingFormConfirm/transactionPendingFormConfirm.js +++ b/js/src/shell/Signer/components/TransactionPendingFormConfirm/transactionPendingFormConfirm.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import keycode from 'keycode'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import { FormattedMessage } from 'react-intl'; import ReactTooltip from 'react-tooltip'; diff --git a/js/src/shell/Signer/components/TransactionPendingFormReject/transactionPendingFormReject.js b/js/src/shell/Signer/components/TransactionPendingFormReject/transactionPendingFormReject.js index 171ee5dc4..d3606cc43 100644 --- a/js/src/shell/Signer/components/TransactionPendingFormReject/transactionPendingFormReject.js +++ b/js/src/shell/Signer/components/TransactionPendingFormReject/transactionPendingFormReject.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Button } from '@parity/ui'; diff --git a/js/src/shell/Signer/components/TxHashLink/txHashLink.js b/js/src/shell/Signer/components/TxHashLink/txHashLink.js index 42cc336e7..4a1a90e11 100644 --- a/js/src/shell/Signer/components/TxHashLink/txHashLink.js +++ b/js/src/shell/Signer/components/TxHashLink/txHashLink.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { txLink } from '~/3rdparty/etherscan/links'; diff --git a/js/src/shell/Snackbar/snackbar.js b/js/src/shell/Snackbar/snackbar.js index 4c232dfa4..24e2d40a7 100644 --- a/js/src/shell/Snackbar/snackbar.js +++ b/js/src/shell/Snackbar/snackbar.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/shell/Status/Consensus/consensus.js b/js/src/shell/Status/Consensus/consensus.js index 000927125..0c5f38527 100644 --- a/js/src/shell/Status/Consensus/consensus.js +++ b/js/src/shell/Status/Consensus/consensus.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; export default function Consensus ({ upgradeStore }) { diff --git a/js/src/shell/Status/Upgrade/upgrade.js b/js/src/shell/Status/Upgrade/upgrade.js index c4b89b0ee..c17e5aea0 100644 --- a/js/src/shell/Status/Upgrade/upgrade.js +++ b/js/src/shell/Status/Upgrade/upgrade.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; export default function Upgrade ({ upgradeStore }) { diff --git a/js/src/shell/Status/status.js b/js/src/shell/Status/status.js index 2f3584002..5d84dfb58 100644 --- a/js/src/shell/Status/status.js +++ b/js/src/shell/Status/status.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { BlockStatus } from '@parity/ui'; diff --git a/js/src/shell/SyncWarning/syncWarning.js b/js/src/shell/SyncWarning/syncWarning.js index 612e5da8b..838ffa7c3 100644 --- a/js/src/shell/SyncWarning/syncWarning.js +++ b/js/src/shell/SyncWarning/syncWarning.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import store from 'store'; diff --git a/js/src/shell/UpgradeParity/upgradeParity.js b/js/src/shell/UpgradeParity/upgradeParity.js index 499209660..bde0bbcda 100644 --- a/js/src/shell/UpgradeParity/upgradeParity.js +++ b/js/src/shell/UpgradeParity/upgradeParity.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Button, Portal } from '@parity/ui'; diff --git a/js/src/shell/index.js b/js/src/shell/index.js index aa8ad95a1..fca92633c 100644 --- a/js/src/shell/index.js +++ b/js/src/shell/index.js @@ -46,6 +46,8 @@ import Dapps from './Dapps'; injectTapEventPlugin(); +console.log('UI version', process.env.UI_VERSION); + if (process.env.NODE_ENV === 'development') { // Expose the React Performance Tools on the`window` object const Perf = require('react-addons-perf'); diff --git a/js/src/ui/AccountCard/accountCard.js b/js/src/ui/AccountCard/accountCard.js index 2040d3441..395e68a5d 100644 --- a/js/src/ui/AccountCard/accountCard.js +++ b/js/src/ui/AccountCard/accountCard.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import keycode from 'keycode'; diff --git a/js/src/ui/Actionbar/Export/export.js b/js/src/ui/Actionbar/Export/export.js index 068d1476c..ffab53036 100644 --- a/js/src/ui/Actionbar/Export/export.js +++ b/js/src/ui/Actionbar/Export/export.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import FileSaver from 'file-saver'; diff --git a/js/src/ui/Actionbar/Import/import.js b/js/src/ui/Actionbar/Import/import.js index 0598b01a2..894689dc9 100644 --- a/js/src/ui/Actionbar/Import/import.js +++ b/js/src/ui/Actionbar/Import/import.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Actionbar/Search/search.js b/js/src/ui/Actionbar/Search/search.js index 72bf50fd5..51a2f79d2 100644 --- a/js/src/ui/Actionbar/Search/search.js +++ b/js/src/ui/Actionbar/Search/search.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Button from '~/ui/Button'; diff --git a/js/src/ui/Actionbar/Sort/sort.js b/js/src/ui/Actionbar/Sort/sort.js index 7e3edc222..c6c97e7f9 100644 --- a/js/src/ui/Actionbar/Sort/sort.js +++ b/js/src/ui/Actionbar/Sort/sort.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { observer } from 'mobx-react'; diff --git a/js/src/ui/Actionbar/actionbar.css b/js/src/ui/Actionbar/actionbar.css index 4bb36abcf..3f023a1bd 100644 --- a/js/src/ui/Actionbar/actionbar.css +++ b/js/src/ui/Actionbar/actionbar.css @@ -21,7 +21,7 @@ flex-direction: row; align-items: center; justify-content: space-between; - padding: 0.5em 1.5em; + padding: 1.5em; margin: 0; .title { diff --git a/js/src/ui/Actionbar/actionbar.js b/js/src/ui/Actionbar/actionbar.js index 41cf9d967..0f20f97eb 100644 --- a/js/src/ui/Actionbar/actionbar.js +++ b/js/src/ui/Actionbar/actionbar.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Badge/badge.js b/js/src/ui/Badge/badge.js index 4e0777228..7115d3041 100644 --- a/js/src/ui/Badge/badge.js +++ b/js/src/ui/Badge/badge.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import styles from './badge.css'; diff --git a/js/src/ui/Balance/balance.css b/js/src/ui/Balance/balance.css index 43387a53a..dc3e1af34 100644 --- a/js/src/ui/Balance/balance.css +++ b/js/src/ui/Balance/balance.css @@ -15,7 +15,7 @@ /* along with Parity. If not, see . */ -$tagColor: rgba(100, 100, 100, 0.25); +$tagColor: rgba(0, 0, 0, 0.25); $textColor: white; .balances { diff --git a/js/src/ui/Balance/balance.js b/js/src/ui/Balance/balance.js index 29c0cb7f5..abf78d412 100644 --- a/js/src/ui/Balance/balance.js +++ b/js/src/ui/Balance/balance.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/ui/BlockStatus/blockStatus.js b/js/src/ui/BlockStatus/blockStatus.js index 15e70f247..9df0c6961 100644 --- a/js/src/ui/BlockStatus/blockStatus.js +++ b/js/src/ui/BlockStatus/blockStatus.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/ui/Button/button.js b/js/src/ui/Button/button.js index 0e0219a50..37499aa33 100644 --- a/js/src/ui/Button/button.js +++ b/js/src/ui/Button/button.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Button as SemanticButton } from 'semantic-ui-react'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Certifications/certifications.js b/js/src/ui/Certifications/certifications.js index f8fa88884..f1e9f9a76 100644 --- a/js/src/ui/Certifications/certifications.js +++ b/js/src/ui/Certifications/certifications.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import defaultIcon from '@parity/shared/assets/images/certifications/unknown.svg'; diff --git a/js/src/ui/ConfirmDialog/confirmDialog.js b/js/src/ui/ConfirmDialog/confirmDialog.js index b58c30971..8009db3f2 100644 --- a/js/src/ui/ConfirmDialog/confirmDialog.js +++ b/js/src/ui/ConfirmDialog/confirmDialog.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Container/Title/Actions/actions.js b/js/src/ui/Container/Title/Actions/actions.js index 0da706afa..c9deaccd2 100644 --- a/js/src/ui/Container/Title/Actions/actions.js +++ b/js/src/ui/Container/Title/Actions/actions.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import styles from '../title.css'; diff --git a/js/src/ui/Container/Title/title.js b/js/src/ui/Container/Title/title.js index bff3aa84c..db6ee951a 100644 --- a/js/src/ui/Container/Title/title.js +++ b/js/src/ui/Container/Title/title.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Container/container.css b/js/src/ui/Container/container.css index 136bd0b74..e0a12b9f2 100644 --- a/js/src/ui/Container/container.css +++ b/js/src/ui/Container/container.css @@ -16,9 +16,10 @@ */ $background: rgba(254, 254, 254, 1); -$backgroundHover: rgba(250, 250, 250, 1); +$backgroundHover: rgba(252, 252, 252, 1); $backgroundLight: rgba(18, 18, 18, 0.5); $borderColor: rgba(242, 242, 242, 1); +$shadow: 0.25em 0.25em 0.25em rgba(0, 0, 0, 0.125); .container { background: $background; @@ -42,16 +43,18 @@ $borderColor: rgba(242, 242, 242, 1); top: 100%; opacity: 0; z-index: 100; + } &:hover { background: $backgroundHover; + box-shadow: $shadow; .hoverOverlay { background: $backgroundHover !important; border: 1px solid $borderColor; border-top: 1px solid transparent; - box-shadow: none !important; + box-shadow: $shadow; display: block; opacity: 1; } diff --git a/js/src/ui/Container/container.js b/js/src/ui/Container/container.js index df705df0f..221aac7f5 100644 --- a/js/src/ui/Container/container.js +++ b/js/src/ui/Container/container.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Link } from 'react-router'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/ContextProvider/contextProvider.js b/js/src/ui/ContextProvider/contextProvider.js index 7bd3b57d0..c1cbf9c31 100644 --- a/js/src/ui/ContextProvider/contextProvider.js +++ b/js/src/ui/ContextProvider/contextProvider.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { IntlProvider } from 'react-intl'; import { observer } from 'mobx-react'; diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.js b/js/src/ui/CopyToClipboard/copyToClipboard.js index 63eafffd7..a75ba79cc 100644 --- a/js/src/ui/CopyToClipboard/copyToClipboard.js +++ b/js/src/ui/CopyToClipboard/copyToClipboard.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Clipboard from 'react-copy-to-clipboard'; import { connect } from 'react-redux'; diff --git a/js/src/ui/CurrencySymbol/currencySymbol.js b/js/src/ui/CurrencySymbol/currencySymbol.js index 3322b0301..8698d070c 100644 --- a/js/src/ui/CurrencySymbol/currencySymbol.js +++ b/js/src/ui/CurrencySymbol/currencySymbol.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; const SYMBOL_ETC = 'ETC'; diff --git a/js/src/ui/DappCard/dappCard.css b/js/src/ui/DappCard/dappCard.css index 9b8705201..5ab1e4b36 100644 --- a/js/src/ui/DappCard/dappCard.css +++ b/js/src/ui/DappCard/dappCard.css @@ -29,9 +29,14 @@ } .image { - left: 1.5em; + color: rgba(0, 0, 0, 0.5); + left: 1.5rem; position: absolute; - top: 1.5em; + top: 1.5rem; +} + +i.image { + top: 2.75rem; } .author, diff --git a/js/src/ui/DappCard/dappCard.js b/js/src/ui/DappCard/dappCard.js index cd02333c2..d6ffa8699 100644 --- a/js/src/ui/DappCard/dappCard.js +++ b/js/src/ui/DappCard/dappCard.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Container, { Title as ContainerTitle } from '~/ui/Container'; import DappIcon from '~/ui/DappIcon'; @@ -49,11 +50,6 @@ export default class DappCard extends Component { className={ [styles.container, className].join(' ') } - hover={ -
- { app.author }, v{ app.version } -
- } link={ this.getLink(app) } onClick={ onClick } > @@ -79,6 +75,9 @@ export default class DappCard extends Component { title={ app.name } byline={ app.description } /> +
+ { app.author }, v{ app.version } +
{ children } diff --git a/js/src/ui/DappIcon/dappIcon.css b/js/src/ui/DappIcon/dappIcon.css index 95ceed864..4bc210b88 100644 --- a/js/src/ui/DappIcon/dappIcon.css +++ b/js/src/ui/DappIcon/dappIcon.css @@ -23,9 +23,11 @@ .normal { height: 56px; width: 56px; + font-size: 49px !important; } .small { height: 32px; width: 32px; + font-size: 28px !important; } diff --git a/js/src/ui/DappIcon/dappIcon.js b/js/src/ui/DappIcon/dappIcon.js index ddff7b47d..3fec84264 100644 --- a/js/src/ui/DappIcon/dappIcon.js +++ b/js/src/ui/DappIcon/dappIcon.js @@ -14,18 +14,26 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; + +import { createIcon } from '~/ui/Icons'; import styles from './dappIcon.css'; export default function DappIcon ({ app, className, small }, { api }) { const { dappsUrl } = api; + const classes = [ + styles.icon, styles[small ? 'small' : 'normal'], className + ].join(' '); + + if (app['semantic-icon']) { + return createIcon(app['semantic-icon'], { className: classes }); + } return ( . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Errors/errors.js b/js/src/ui/Errors/errors.js index 3f0a59157..3f1eb393d 100644 --- a/js/src/ui/Errors/errors.js +++ b/js/src/ui/Errors/errors.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/ui/Form/AddressSelect/addressSelect.js b/js/src/ui/Form/AddressSelect/addressSelect.js index 787bfb04a..b5a162511 100644 --- a/js/src/ui/Form/AddressSelect/addressSelect.js +++ b/js/src/ui/Form/AddressSelect/addressSelect.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import { connect } from 'react-redux'; import keycode, { codes } from 'keycode'; diff --git a/js/src/ui/Form/Checkbox/checkbox.js b/js/src/ui/Form/Checkbox/checkbox.js index e5aeb2a67..8b2104bae 100644 --- a/js/src/ui/Form/Checkbox/checkbox.js +++ b/js/src/ui/Form/Checkbox/checkbox.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Checkbox as SemanticCheckbox } from 'semantic-ui-react'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Form/DappUrlInput/dappUrlInput.js b/js/src/ui/Form/DappUrlInput/dappUrlInput.js index a513059df..3742ad8f4 100644 --- a/js/src/ui/Form/DappUrlInput/dappUrlInput.js +++ b/js/src/ui/Form/DappUrlInput/dappUrlInput.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import keycode from 'keycode'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; export default class DappUrlInput extends Component { static propTypes = { diff --git a/js/src/ui/Form/Dropdown/dropdown.js b/js/src/ui/Form/Dropdown/dropdown.js index 39b36c737..43a0da979 100644 --- a/js/src/ui/Form/Dropdown/dropdown.js +++ b/js/src/ui/Form/Dropdown/dropdown.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Dropdown as SemanticDropdown } from 'semantic-ui-react'; import { parseI18NString } from '@parity/shared/util/messages'; diff --git a/js/src/ui/Form/FileSelect/fileSelect.js b/js/src/ui/Form/FileSelect/fileSelect.js index 49340495e..5c919dbfa 100644 --- a/js/src/ui/Form/FileSelect/fileSelect.js +++ b/js/src/ui/Form/FileSelect/fileSelect.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Dropzone from 'react-dropzone'; import { FormattedMessage } from 'react-intl'; diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js index da9dbaba8..58a251c09 100644 --- a/js/src/ui/Form/Input/input.js +++ b/js/src/ui/Form/Input/input.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { noop } from 'lodash'; import keycode from 'keycode'; import { Input as SemanticInput } from 'semantic-ui-react'; diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js/src/ui/Form/InputAddress/inputAddress.js index 6e10a1c98..16ca40c3c 100644 --- a/js/src/ui/Form/InputAddress/inputAddress.js +++ b/js/src/ui/Form/InputAddress/inputAddress.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import util from '@parity/api/util'; diff --git a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js b/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js index 0cc4f4d19..80dd287da 100644 --- a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js +++ b/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Form/InputChip/Chip/chip.js b/js/src/ui/Form/InputChip/Chip/chip.js index dd5c1b3da..3dd39bdf4 100644 --- a/js/src/ui/Form/InputChip/Chip/chip.js +++ b/js/src/ui/Form/InputChip/Chip/chip.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Form/InputChip/inputChip.js b/js/src/ui/Form/InputChip/inputChip.js index 82fc5a24d..2fcc3ebd1 100644 --- a/js/src/ui/Form/InputChip/inputChip.js +++ b/js/src/ui/Form/InputChip/inputChip.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import keycode from 'keycode'; import { uniq } from 'lodash'; import { Input as SemanticInput } from 'semantic-ui-react'; diff --git a/js/src/ui/Form/InputDateTime/inputDateTime.js b/js/src/ui/Form/InputDateTime/inputDateTime.js index 4b0b16c3b..b8403b524 100644 --- a/js/src/ui/Form/InputDateTime/inputDateTime.js +++ b/js/src/ui/Form/InputDateTime/inputDateTime.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import DateTime from 'react-datetime'; import { parseI18NString } from '@parity/shared/util/messages'; diff --git a/js/src/ui/Form/Label/label.js b/js/src/ui/Form/Label/label.js index 0ad268ac7..ca55da803 100644 --- a/js/src/ui/Form/Label/label.js +++ b/js/src/ui/Form/Label/label.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Form/LabelWrapper/labelWrapper.js b/js/src/ui/Form/LabelWrapper/labelWrapper.js index a7b420763..da5e78c66 100644 --- a/js/src/ui/Form/LabelWrapper/labelWrapper.js +++ b/js/src/ui/Form/LabelWrapper/labelWrapper.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Form/PasswordStrength/passwordStrength.js b/js/src/ui/Form/PasswordStrength/passwordStrength.js index dc3cb0e71..7caeb3eb4 100644 --- a/js/src/ui/Form/PasswordStrength/passwordStrength.js +++ b/js/src/ui/Form/PasswordStrength/passwordStrength.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { debounce } from 'lodash'; import { FormattedMessage } from 'react-intl'; import zxcvbn from 'zxcvbn'; diff --git a/js/src/ui/Form/RadioButtons/radioButtons.js b/js/src/ui/Form/RadioButtons/radioButtons.js index 0371f2c84..a502bbaf5 100644 --- a/js/src/ui/Form/RadioButtons/radioButtons.js +++ b/js/src/ui/Form/RadioButtons/radioButtons.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Radio as SemanticRadio } from 'semantic-ui-react'; import { arrayOrObjectProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Form/Slider/slider.js b/js/src/ui/Form/Slider/slider.js index 3bc3c3456..5e76a7fdb 100644 --- a/js/src/ui/Form/Slider/slider.js +++ b/js/src/ui/Form/Slider/slider.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import styles from './slider.css'; diff --git a/js/src/ui/Form/Toggle/toggle.js b/js/src/ui/Form/Toggle/toggle.js index 23527fd72..ed0e04e6d 100644 --- a/js/src/ui/Form/Toggle/toggle.js +++ b/js/src/ui/Form/Toggle/toggle.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Radio as SemanticRadio } from 'semantic-ui-react'; import LabelWrapper from '../LabelWrapper'; diff --git a/js/src/ui/Form/TypedInput/typedInput.js b/js/src/ui/Form/TypedInput/typedInput.js index 99141cb44..c5540a6fd 100644 --- a/js/src/ui/Form/TypedInput/typedInput.js +++ b/js/src/ui/Form/TypedInput/typedInput.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { range } from 'lodash'; import BigNumber from 'bignumber.js'; diff --git a/js/src/ui/Form/VaultSelect/VaultSelector/vaultSelector.js b/js/src/ui/Form/VaultSelect/VaultSelector/vaultSelector.js index 4fceb5cb0..69f0a204e 100644 --- a/js/src/ui/Form/VaultSelect/VaultSelector/vaultSelector.js +++ b/js/src/ui/Form/VaultSelect/VaultSelector/vaultSelector.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Portal from '~/ui/Portal'; diff --git a/js/src/ui/Form/VaultSelect/vaultSelect.js b/js/src/ui/Form/VaultSelect/vaultSelect.js index b1db9fc25..19dc39fd2 100644 --- a/js/src/ui/Form/VaultSelect/vaultSelect.js +++ b/js/src/ui/Form/VaultSelect/vaultSelect.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import VaultStore from '~/views/Vaults/store'; diff --git a/js/src/ui/Form/form.js b/js/src/ui/Form/form.js index 7353bd254..380b9f7ea 100644 --- a/js/src/ui/Form/form.js +++ b/js/src/ui/Form/form.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import styles from './form.css'; diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.js b/js/src/ui/GasPriceEditor/gasPriceEditor.js index 128573829..03ac93fc4 100644 --- a/js/src/ui/GasPriceEditor/gasPriceEditor.js +++ b/js/src/ui/GasPriceEditor/gasPriceEditor.js @@ -16,7 +16,8 @@ import BigNumber from 'bignumber.js'; import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Input, InputDateTime, RadioButtons } from '../Form'; diff --git a/js/src/ui/GasPriceSelector/CustomBar/customBar.js b/js/src/ui/GasPriceSelector/CustomBar/customBar.js index 36a378028..3aa580c74 100644 --- a/js/src/ui/GasPriceSelector/CustomBar/customBar.js +++ b/js/src/ui/GasPriceSelector/CustomBar/customBar.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Rectangle } from 'recharts'; import { COLORS } from '../util'; diff --git a/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js b/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js index 4b1e81d88..4490175e0 100644 --- a/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js +++ b/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Rectangle } from 'recharts'; import { COLORS, countModifier } from '../util'; diff --git a/js/src/ui/GasPriceSelector/CustomShape/customShape.js b/js/src/ui/GasPriceSelector/CustomShape/customShape.js index 6fc6f7d0b..3b6d23749 100644 --- a/js/src/ui/GasPriceSelector/CustomShape/customShape.js +++ b/js/src/ui/GasPriceSelector/CustomShape/customShape.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Dot } from 'recharts'; export default class CustomShape extends Component { diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js b/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js index ec7afda7e..96c780bec 100644 --- a/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js +++ b/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; export default class CustomTooltip extends Component { diff --git a/js/src/ui/GasPriceSelector/gasPriceSelector.js b/js/src/ui/GasPriceSelector/gasPriceSelector.js index da7f011ef..0049847fc 100644 --- a/js/src/ui/GasPriceSelector/gasPriceSelector.js +++ b/js/src/ui/GasPriceSelector/gasPriceSelector.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Bar, BarChart, ResponsiveContainer, Scatter, ScatterChart, Tooltip, XAxis, YAxis } from 'recharts'; import Slider from '~/ui/Form/Slider'; diff --git a/js/src/ui/Icons/index.js b/js/src/ui/Icons/index.js index e3a59ca7e..6a48d8f51 100644 --- a/js/src/ui/Icons/index.js +++ b/js/src/ui/Icons/index.js @@ -17,65 +17,69 @@ import React from 'react'; import { Icon } from 'semantic-ui-react'; -export const AccountsIcon = (props) => ; -export const AddIcon = (props) => ; -export const AddressIcon = (props) => ; -export const AppsIcon = (props) => ; -export const AttachFileIcon = (props) => ; -export const BackgroundIcon = (props) => ; -export const CancelIcon = (props) => ; -export const CheckIcon = (props) => ; -export const CheckboxTickedIcon = (props) => ; -export const CheckboxUntickedIcon = (props) => ; -export const CloseIcon = (props) => ; -export const CompareIcon = (props) => ; -export const ComputerIcon = (props) => ; -export const ContractIcon = (props) => ; -export const CopyIcon = (props) => ; -export const DashboardIcon = (props) => ; +export function createIcon (name, props = {}) { + return ; +} + +export const AccountsIcon = (props) => createIcon('university', props); +export const AddIcon = (props) => createIcon('plus', props); +export const AddressIcon = (props) => createIcon('address book outline', props); +export const AppsIcon = (props) => createIcon('sitemap', props); +export const AttachFileIcon = (props) => createIcon('attach', props); +export const BackgroundIcon = (props) => createIcon('image', props); +export const CancelIcon = (props) => createIcon('cancel', props); +export const CheckIcon = (props) => createIcon('check', props); +export const CheckboxTickedIcon = (props) => createIcon('checkmark box', props); +export const CheckboxUntickedIcon = (props) => createIcon('square outline', props); +export const CloseIcon = (props) => createIcon('close', props); +export const CompareIcon = (props) => createIcon('exchange', props); +export const ComputerIcon = (props) => createIcon('desktop', props); +export const ContractIcon = (props) => createIcon('code', props); +export const CopyIcon = (props) => createIcon('copy', props); +export const DashboardIcon = (props) => createIcon('cubes', props); export const DoneIcon = CheckIcon; -export const DeleteIcon = (props) => ; -export const DevelopIcon = (props) => ; -export const DialIcon = (props) => ; -export const EditIcon = (props) => ; -export const ErrorIcon = (props) => ; -export const EthernetIcon = (props) => ; -export const FileIcon = (props) => ; -export const FileDownloadIcon = (props) => ; -export const FileUploadIcon = (props) => ; -export const FingerprintIcon = (props) => ; -export const GasIcon = (props) => ; -export const GotoIcon = (props) => ; -export const InfoIcon = (props) => ; -export const KeyIcon = (props) => ; -export const KeyboardIcon = (props) => ; -export const LinkIcon = (props) => ; -export const ListIcon = (props) => ; -export const LockedIcon = (props) => ; -export const MembershipIcon = (props) => ; -export const MethodsIcon = (props) => ; -export const MoveIcon = (props) => ; -export const NextIcon = (props) => ; -export const PauseIcon = (props) => ; -export const PlayIcon = (props) => ; -export const PrevIcon = (props) => ; -export const PrintIcon = (props) => ; -export const QrIcon = (props) => ; -export const RefreshIcon = (props) => ; -export const RemoveIcon = (props) => ; -export const ReorderIcon = (props) => ; -export const ReplayIcon = (props) => ; -export const SaveIcon = (props) => ; -export const SearchIcon = (props) => ; -export const SendIcon = (props) => ; -export const SettingsIcon = (props) => ; -export const SnoozeIcon = (props) => ; -export const SortIcon = (props) => ; -export const StarIcon = (props) => ; -export const StatusIcon = (props) => ; -export const UnlockedIcon = (props) => ; -export const UpdateIcon = (props) => ; -export const UpdateWaitIcon = (props) => ; -export const VisibleIcon = (props) => ; -export const VerifyIcon = (props) => ; -export const VpnIcon = (props) => ; +export const DeleteIcon = (props) => createIcon('trash', props); +export const DevelopIcon = (props) => createIcon('connectdevelop', props); +export const DialIcon = (props) => createIcon('text telephone', props); +export const EditIcon = (props) => createIcon('edit', props); +export const ErrorIcon = (props) => createIcon('exclamation circle', props); +export const EthernetIcon = (props) => createIcon('wifi', props); +export const FileIcon = (props) => createIcon('file outline', props); +export const FileDownloadIcon = (props) => createIcon('download', props); +export const FileUploadIcon = (props) => createIcon('upload', props); +export const FingerprintIcon = (props) => createIcon('target', props); +export const GasIcon = (props) => createIcon('settings', props); +export const GotoIcon = (props) => createIcon('arrow circle right', props); +export const InfoIcon = (props) => createIcon('info circle', props); +export const KeyIcon = (props) => createIcon('key', props); +export const KeyboardIcon = (props) => createIcon('keyboard', props); +export const LinkIcon = (props) => createIcon('linkify', props); +export const ListIcon = (props) => createIcon('list ul', props); +export const LockedIcon = (props) => createIcon('unlock alternate', props); +export const MembershipIcon = (props) => createIcon('id card outline', props); +export const MethodsIcon = (props) => createIcon('map signs', props); +export const MoveIcon = (props) => createIcon('move', props); +export const NextIcon = (props) => createIcon('chevron right', props); +export const PauseIcon = (props) => createIcon('pause', props); +export const PlayIcon = (props) => createIcon('play', props); +export const PrevIcon = (props) => createIcon('chevron left', props); +export const PrintIcon = (props) => createIcon('print', props); +export const QrIcon = (props) => createIcon('qrcode', props); +export const RefreshIcon = (props) => createIcon('refresh', props); +export const RemoveIcon = (props) => createIcon('remove', props); +export const ReorderIcon = (props) => createIcon('align justify', props); +export const ReplayIcon = (props) => createIcon('retweet', props); +export const SaveIcon = (props) => createIcon('save', props); +export const SearchIcon = (props) => createIcon('search', props); +export const SendIcon = (props) => createIcon('send', props); +export const SettingsIcon = (props) => createIcon('settings', props); +export const SnoozeIcon = (props) => createIcon('clock', props); +export const SortIcon = (props) => createIcon('filter', props); +export const StarIcon = (props) => createIcon('star', props); +export const StatusIcon = (props) => createIcon('signal', props); +export const UnlockedIcon = (props) => createIcon('unlock', props); +export const UpdateIcon = (props) => createIcon('cloud download', props); +export const UpdateWaitIcon = (props) => createIcon('wait', props); +export const VisibleIcon = (props) => createIcon('eye', props); +export const VerifyIcon = (props) => createIcon('shield', props); +export const VpnIcon = (props) => createIcon('world', props); diff --git a/js/src/ui/IdentityIcon/identityIcon.js b/js/src/ui/IdentityIcon/identityIcon.js index ca849fc6b..d39fdb762 100644 --- a/js/src/ui/IdentityIcon/identityIcon.js +++ b/js/src/ui/IdentityIcon/identityIcon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { createIdentityImg } from '@parity/api/util/identity'; import { isNullAddress } from '@parity/shared/util/validation'; diff --git a/js/src/ui/IdentityName/identityName.js b/js/src/ui/IdentityName/identityName.js index 12a864f29..f7272b03c 100644 --- a/js/src/ui/IdentityName/identityName.js +++ b/js/src/ui/IdentityName/identityName.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/ui/List/Item/item.js b/js/src/ui/List/Item/item.js index d9549e4b7..7fcba906d 100644 --- a/js/src/ui/List/Item/item.js +++ b/js/src/ui/List/Item/item.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { List as SemanticList } from 'semantic-ui-react'; import styles from './item.css'; diff --git a/js/src/ui/List/list.js b/js/src/ui/List/list.js index fb70e9233..5db2ee68a 100644 --- a/js/src/ui/List/list.js +++ b/js/src/ui/List/list.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { List as SemanticList } from 'semantic-ui-react'; import LabelWrapper from '../Form/LabelWrapper'; diff --git a/js/src/ui/Loading/loading.js b/js/src/ui/Loading/loading.js index 383c4b798..ae7cbf262 100644 --- a/js/src/ui/Loading/loading.js +++ b/js/src/ui/Loading/loading.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Loader as SemanticLoader } from 'semantic-ui-react'; import styles from './loading.css'; diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js index 52d494b30..59d91436c 100644 --- a/js/src/ui/MethodDecoding/methodDecoding.js +++ b/js/src/ui/MethodDecoding/methodDecoding.js @@ -16,7 +16,8 @@ import BigNumber from 'bignumber.js'; import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/ui/Modal/Busy/busy.js b/js/src/ui/Modal/Busy/busy.js index 027472971..4c285b45d 100644 --- a/js/src/ui/Modal/Busy/busy.js +++ b/js/src/ui/Modal/Busy/busy.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Modal/Completed/completed.js b/js/src/ui/Modal/Completed/completed.js index 8ba96fe85..9cfd9b80b 100644 --- a/js/src/ui/Modal/Completed/completed.js +++ b/js/src/ui/Modal/Completed/completed.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import styles from './completed.css'; diff --git a/js/src/ui/ModalBox/modalBox.js b/js/src/ui/ModalBox/modalBox.js index 5134f89fe..ef592aacd 100644 --- a/js/src/ui/ModalBox/modalBox.js +++ b/js/src/ui/ModalBox/modalBox.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Page/page.css b/js/src/ui/Page/page.css index c13f49d6d..9e2043416 100644 --- a/js/src/ui/Page/page.css +++ b/js/src/ui/Page/page.css @@ -23,9 +23,9 @@ } .layout { - padding: 0.25em 0.25em 3em 0.25em; + padding: 0 1.5em 3em 1.5em; } .layoutPadded { - padding: 0.5em 0.5em 3em 0.5em; + padding: 0.5em 1.5em 3em 1.5em; } diff --git a/js/src/ui/Page/page.js b/js/src/ui/Page/page.js index 6234e1084..e8a695b81 100644 --- a/js/src/ui/Page/page.js +++ b/js/src/ui/Page/page.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Actionbar from '../Actionbar'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/ParityBackground/parityBackground.js b/js/src/ui/ParityBackground/parityBackground.js index fa839522b..a760bf265 100644 --- a/js/src/ui/ParityBackground/parityBackground.js +++ b/js/src/ui/ParityBackground/parityBackground.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import GeoPattern from 'geopattern'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; const imageCache = {}; diff --git a/js/src/ui/Popup/popup.js b/js/src/ui/Popup/popup.js index 663fe4dd8..536bca0a1 100644 --- a/js/src/ui/Popup/popup.js +++ b/js/src/ui/Popup/popup.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Popup as SemanticPopup } from 'semantic-ui-react'; export default function Popup ({ children, className, isOpen, trigger, triggerOn }) { diff --git a/js/src/ui/Portal/portal.js b/js/src/ui/Portal/portal.js index 34e4db1a8..cce50387c 100644 --- a/js/src/ui/Portal/portal.js +++ b/js/src/ui/Portal/portal.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . // TODO: semantic-ui-react exposes Portal component, use that -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactDOM from 'react-dom'; import ReactPortal from 'react-portal'; import keycode from 'keycode'; diff --git a/js/src/ui/Progress/progress.js b/js/src/ui/Progress/progress.js index 5c1bf6b9f..af59acc74 100644 --- a/js/src/ui/Progress/progress.js +++ b/js/src/ui/Progress/progress.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Progress as SemanticProgress } from 'semantic-ui-react'; export default function Progress ({ className, color, isDeterminate, max, style, value }) { diff --git a/js/src/ui/QrCode/qrCode.js b/js/src/ui/QrCode/qrCode.js index 967639b98..82c6b89c7 100644 --- a/js/src/ui/QrCode/qrCode.js +++ b/js/src/ui/QrCode/qrCode.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import qrcode from 'qrcode-generator'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { calculateType } from './qrSize'; diff --git a/js/src/ui/QrScan/qrScan.js b/js/src/ui/QrScan/qrScan.js index d75e7d0e9..71f46668e 100644 --- a/js/src/ui/QrScan/qrScan.js +++ b/js/src/ui/QrScan/qrScan.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Reader from 'react-qr-reader'; import styles from './qrScan.css'; diff --git a/js/src/ui/ScrollableText/scrollableText.js b/js/src/ui/ScrollableText/scrollableText.js index 0ea21fb3f..7d59999e4 100644 --- a/js/src/ui/ScrollableText/scrollableText.js +++ b/js/src/ui/ScrollableText/scrollableText.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import styles from './scrollableText.css'; diff --git a/js/src/ui/SectionList/sectionList.css b/js/src/ui/SectionList/sectionList.css index 39a124f5b..b9762e60d 100644 --- a/js/src/ui/SectionList/sectionList.css +++ b/js/src/ui/SectionList/sectionList.css @@ -58,5 +58,5 @@ $widthContracted: 29%; } .section + .section { - margin-top: 1em; + margin-top: 2em; } diff --git a/js/src/ui/SectionList/sectionList.js b/js/src/ui/SectionList/sectionList.js index a9f6ea3ec..797930df7 100644 --- a/js/src/ui/SectionList/sectionList.js +++ b/js/src/ui/SectionList/sectionList.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { arrayOrObjectProptype, nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/SelectionList/selectionList.js b/js/src/ui/SelectionList/selectionList.js index b63e6f0b0..0d4730559 100644 --- a/js/src/ui/SelectionList/selectionList.js +++ b/js/src/ui/SelectionList/selectionList.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { noop } from 'lodash'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { arrayOrObjectProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/ShortenedHash/shortenedHash.js b/js/src/ui/ShortenedHash/shortenedHash.js index b52516af4..c264006fd 100644 --- a/js/src/ui/ShortenedHash/shortenedHash.js +++ b/js/src/ui/ShortenedHash/shortenedHash.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import styles from './shortenedHash.css'; diff --git a/js/src/ui/SignerIcon/signerIcon.js b/js/src/ui/SignerIcon/signerIcon.js index f690088bb..10df42eaf 100644 --- a/js/src/ui/SignerIcon/signerIcon.js +++ b/js/src/ui/SignerIcon/signerIcon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { keccak_256 } from 'js-sha3'; // eslint-disable-line camelcase diff --git a/js/src/ui/Snackbar/snackbar.js b/js/src/ui/Snackbar/snackbar.js index d84bc9eab..17992b67e 100644 --- a/js/src/ui/Snackbar/snackbar.js +++ b/js/src/ui/Snackbar/snackbar.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import styles from './snackbar.css'; diff --git a/js/src/ui/StackEventListener/stackEventListener.js b/js/src/ui/StackEventListener/stackEventListener.js index 586ddcad6..278cb7fcb 100644 --- a/js/src/ui/StackEventListener/stackEventListener.js +++ b/js/src/ui/StackEventListener/stackEventListener.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import ReactEventListener from 'react-event-listener'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; let listenerId = 0; let listenerIds = []; diff --git a/js/src/ui/StatusIndicator/statusIndicator.js b/js/src/ui/StatusIndicator/statusIndicator.js index cacce2a36..860f2deb5 100644 --- a/js/src/ui/StatusIndicator/statusIndicator.js +++ b/js/src/ui/StatusIndicator/statusIndicator.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactTooltip from 'react-tooltip'; import styles from './statusIndicator.css'; diff --git a/js/src/ui/Steps/Step/step.js b/js/src/ui/Steps/Step/step.js index dafcc554f..8e185f963 100644 --- a/js/src/ui/Steps/Step/step.js +++ b/js/src/ui/Steps/Step/step.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Step as SemanticStep } from 'semantic-ui-react'; export default function Step ({ className, isActive, isCompleted, label }) { diff --git a/js/src/ui/Steps/steps.js b/js/src/ui/Steps/steps.js index a35b7ade0..540c860f4 100644 --- a/js/src/ui/Steps/steps.js +++ b/js/src/ui/Steps/steps.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Step as SemanticStep } from 'semantic-ui-react'; import Step from './Step'; diff --git a/js/src/ui/Tabs/Tab/tab.js b/js/src/ui/Tabs/Tab/tab.js index c4a30f40f..be7f4e18a 100644 --- a/js/src/ui/Tabs/Tab/tab.js +++ b/js/src/ui/Tabs/Tab/tab.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Menu as SemanticMenu } from 'semantic-ui-react'; export default function Tab ({ isActive, className, index, label, name, onClick, style }) { diff --git a/js/src/ui/Tabs/tabs.js b/js/src/ui/Tabs/tabs.js index af934c9dc..ee49c70e1 100644 --- a/js/src/ui/Tabs/tabs.js +++ b/js/src/ui/Tabs/tabs.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Menu as SemanticMenu } from 'semantic-ui-react'; import Tab from './Tab'; diff --git a/js/src/ui/Tags/tags.js b/js/src/ui/Tags/tags.js index 30f2c434f..c02845ebd 100644 --- a/js/src/ui/Tags/tags.js +++ b/js/src/ui/Tags/tags.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { arrayOrObjectProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/Title/Waiting/waiting.js b/js/src/ui/Title/Waiting/waiting.js index 1c27cd2d8..43ec55a93 100644 --- a/js/src/ui/Title/Waiting/waiting.js +++ b/js/src/ui/Title/Waiting/waiting.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Progress from '~/ui/Progress'; diff --git a/js/src/ui/Title/title.js b/js/src/ui/Title/title.js index 0c9240c3a..6717d0036 100644 --- a/js/src/ui/Title/title.js +++ b/js/src/ui/Title/title.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/ui/TokenImage/tokenImage.js b/js/src/ui/TokenImage/tokenImage.js index c3de75506..d2618aa81 100644 --- a/js/src/ui/TokenImage/tokenImage.js +++ b/js/src/ui/TokenImage/tokenImage.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import unknownImage from '@parity/shared/assets/images/contracts/unknown-64x64.png'; import IconCache from '~/ui/IconCache'; diff --git a/js/src/ui/TxHash/txHash.js b/js/src/ui/TxHash/txHash.js index b9c32b884..45d98f625 100644 --- a/js/src/ui/TxHash/txHash.js +++ b/js/src/ui/TxHash/txHash.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/ui/TxList/TxRow/txRow.js b/js/src/ui/TxList/TxRow/txRow.js index 521a10a5d..a2c342897 100644 --- a/js/src/ui/TxList/TxRow/txRow.js +++ b/js/src/ui/TxList/TxRow/txRow.js @@ -17,7 +17,8 @@ import moment from 'moment'; import dateDifference from 'date-difference'; import { FormattedMessage } from 'react-intl'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { txLink } from '~/3rdparty/etherscan/links'; diff --git a/js/src/ui/TxList/txList.js b/js/src/ui/TxList/txList.js index eb75e28e3..220519eac 100644 --- a/js/src/ui/TxList/txList.js +++ b/js/src/ui/TxList/txList.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import Store from './store'; diff --git a/js/src/ui/VaultCard/Accounts/accounts.js b/js/src/ui/VaultCard/Accounts/accounts.js index eb3dc661c..0fa6f003f 100644 --- a/js/src/ui/VaultCard/Accounts/accounts.js +++ b/js/src/ui/VaultCard/Accounts/accounts.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import DappLink from '~/ui/DappLink'; diff --git a/js/src/ui/VaultCard/Buttons/buttons.js b/js/src/ui/VaultCard/Buttons/buttons.js index d3e7fb7bd..bda4deeea 100644 --- a/js/src/ui/VaultCard/Buttons/buttons.js +++ b/js/src/ui/VaultCard/Buttons/buttons.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Button from '~/ui/Button'; import { LockedIcon, UnlockedIcon } from '~/ui/Icons'; diff --git a/js/src/ui/VaultCard/Layout/layout.js b/js/src/ui/VaultCard/Layout/layout.js index 8ef795791..c3e800b78 100644 --- a/js/src/ui/VaultCard/Layout/layout.js +++ b/js/src/ui/VaultCard/Layout/layout.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import Title from '~/ui/Title'; import IdentityIcon from '~/ui/IdentityIcon'; diff --git a/js/src/ui/VaultCard/vaultCard.js b/js/src/ui/VaultCard/vaultCard.js index f6f5e460d..b93d89c48 100644 --- a/js/src/ui/VaultCard/vaultCard.js +++ b/js/src/ui/VaultCard/vaultCard.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import Container from '~/ui/Container'; diff --git a/js/src/ui/VaultTag/vaultTag.js b/js/src/ui/VaultTag/vaultTag.js index 196c5b8e4..ad22f2432 100644 --- a/js/src/ui/VaultTag/vaultTag.js +++ b/js/src/ui/VaultTag/vaultTag.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import IdentityIcon from '~/ui/IdentityIcon'; diff --git a/js/src/views/Account/DeleteAccount/deleteAccount.js b/js/src/views/Account/DeleteAccount/deleteAccount.js index bc4ffca69..65c9c7c98 100644 --- a/js/src/views/Account/DeleteAccount/deleteAccount.js +++ b/js/src/views/Account/DeleteAccount/deleteAccount.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Account/EditMeta/editMeta.js b/js/src/views/Account/EditMeta/editMeta.js index 961d8ec41..77ab5bfb8 100644 --- a/js/src/views/Account/EditMeta/editMeta.js +++ b/js/src/views/Account/EditMeta/editMeta.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Account/Faucet/faucet.js b/js/src/views/Account/Faucet/faucet.js index e06b60c31..0ae5a019d 100644 --- a/js/src/views/Account/Faucet/faucet.js +++ b/js/src/views/Account/Faucet/faucet.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { txLink } from '~/3rdparty/etherscan/links'; diff --git a/js/src/views/Account/Header/header.js b/js/src/views/Account/Header/header.js index ffe3f8f2d..d571be41c 100644 --- a/js/src/views/Account/Header/header.js +++ b/js/src/views/Account/Header/header.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Balance, Certifications, Container, CopyToClipboard, ContainerTitle, IdentityIcon, IdentityName, QrCode, Tags, VaultTag } from '@parity/ui'; diff --git a/js/src/views/Account/PasswordManager/passwordManager.js b/js/src/views/Account/PasswordManager/passwordManager.js index 7457c2f8e..e17d1ec9f 100644 --- a/js/src/views/Account/PasswordManager/passwordManager.js +++ b/js/src/views/Account/PasswordManager/passwordManager.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Account/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js b/js/src/views/Account/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js index ef56b0f73..60bf121e4 100644 --- a/js/src/views/Account/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js +++ b/js/src/views/Account/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { CopyToClipboard, QrCode } from '@parity/ui'; diff --git a/js/src/views/Account/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js b/js/src/views/Account/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js index 14cb1e51f..67fdd77b3 100644 --- a/js/src/views/Account/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js +++ b/js/src/views/Account/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { observer } from 'mobx-react'; diff --git a/js/src/views/Account/Shapeshift/CompletedStep/completedStep.js b/js/src/views/Account/Shapeshift/CompletedStep/completedStep.js index 90f6b3eb6..135fd4abb 100644 --- a/js/src/views/Account/Shapeshift/CompletedStep/completedStep.js +++ b/js/src/views/Account/Shapeshift/CompletedStep/completedStep.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Value from '../Value'; diff --git a/js/src/views/Account/Shapeshift/ErrorStep/errorStep.js b/js/src/views/Account/Shapeshift/ErrorStep/errorStep.js index c603a4b77..d8e5ad72e 100644 --- a/js/src/views/Account/Shapeshift/ErrorStep/errorStep.js +++ b/js/src/views/Account/Shapeshift/ErrorStep/errorStep.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import styles from '../shapeshift.css'; diff --git a/js/src/views/Account/Shapeshift/OptionsStep/optionsStep.js b/js/src/views/Account/Shapeshift/OptionsStep/optionsStep.js index 0e1b430bb..0f52f81d2 100644 --- a/js/src/views/Account/Shapeshift/OptionsStep/optionsStep.js +++ b/js/src/views/Account/Shapeshift/OptionsStep/optionsStep.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Checkbox, Dropdown, Form, Input, Warning } from '@parity/ui'; diff --git a/js/src/views/Account/Shapeshift/Price/price.js b/js/src/views/Account/Shapeshift/Price/price.js index bd72a7498..672c2d11b 100644 --- a/js/src/views/Account/Shapeshift/Price/price.js +++ b/js/src/views/Account/Shapeshift/Price/price.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Value from '../Value'; diff --git a/js/src/views/Account/Shapeshift/Value/value.js b/js/src/views/Account/Shapeshift/Value/value.js index 535d17ad7..d1d48eea3 100644 --- a/js/src/views/Account/Shapeshift/Value/value.js +++ b/js/src/views/Account/Shapeshift/Value/value.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import styles from './value.css'; diff --git a/js/src/views/Account/Shapeshift/shapeshift.js b/js/src/views/Account/Shapeshift/shapeshift.js index e30a9e750..6b42f110b 100644 --- a/js/src/views/Account/Shapeshift/shapeshift.js +++ b/js/src/views/Account/Shapeshift/shapeshift.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Button, IdentityIcon, Portal } from '@parity/ui'; diff --git a/js/src/views/Account/Transactions/transactions.js b/js/src/views/Account/Transactions/transactions.js index 560d6c185..7ea8f79b7 100644 --- a/js/src/views/Account/Transactions/transactions.js +++ b/js/src/views/Account/Transactions/transactions.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/views/Account/Transfer/Details/details.js b/js/src/views/Account/Transfer/Details/details.js index d3d0aa7a6..fe7f03db2 100644 --- a/js/src/views/Account/Transfer/Details/details.js +++ b/js/src/views/Account/Transfer/Details/details.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/views/Account/Transfer/Details/tokenSelect.js b/js/src/views/Account/Transfer/Details/tokenSelect.js index 0abbb4657..44fdf31bf 100644 --- a/js/src/views/Account/Transfer/Details/tokenSelect.js +++ b/js/src/views/Account/Transfer/Details/tokenSelect.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { isEqual } from 'lodash'; diff --git a/js/src/views/Account/Transfer/Extras/extras.js b/js/src/views/Account/Transfer/Extras/extras.js index c432780a6..04400d677 100644 --- a/js/src/views/Account/Transfer/Extras/extras.js +++ b/js/src/views/Account/Transfer/Extras/extras.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { GasPriceEditor, Form, Input } from '@parity/ui'; diff --git a/js/src/views/Account/Transfer/transfer.js b/js/src/views/Account/Transfer/transfer.js index 4c7c80542..dd5d80414 100644 --- a/js/src/views/Account/Transfer/transfer.js +++ b/js/src/views/Account/Transfer/transfer.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Account/Verification/GatherData/gatherData.js b/js/src/views/Account/Verification/GatherData/gatherData.js index 192a131a0..7f4fffc76 100644 --- a/js/src/views/Account/Verification/GatherData/gatherData.js +++ b/js/src/views/Account/Verification/GatherData/gatherData.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import BigNumber from 'bignumber.js'; diff --git a/js/src/views/Account/Verification/QueryCode/queryCode.js b/js/src/views/Account/Verification/QueryCode/queryCode.js index c6e748ba1..f4d8ca563 100644 --- a/js/src/views/Account/Verification/QueryCode/queryCode.js +++ b/js/src/views/Account/Verification/QueryCode/queryCode.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { nodeOrStringProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/views/Account/Verification/SendConfirmation/sendConfirmation.js b/js/src/views/Account/Verification/SendConfirmation/sendConfirmation.js index 7d6b1780a..c7efd3021 100644 --- a/js/src/views/Account/Verification/SendConfirmation/sendConfirmation.js +++ b/js/src/views/Account/Verification/SendConfirmation/sendConfirmation.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/views/Account/Verification/SendRequest/sendRequest.js b/js/src/views/Account/Verification/SendRequest/sendRequest.js index bdaebb237..0bf55ab55 100644 --- a/js/src/views/Account/Verification/SendRequest/sendRequest.js +++ b/js/src/views/Account/Verification/SendRequest/sendRequest.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { nullableProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/views/Account/Verification/verification.js b/js/src/views/Account/Verification/verification.js index d7f0832d2..ac876cd04 100644 --- a/js/src/views/Account/Verification/verification.js +++ b/js/src/views/Account/Verification/verification.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { observer } from 'mobx-react'; diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js index 03cf7f8c5..5907b8d85 100644 --- a/js/src/views/Account/account.js +++ b/js/src/views/Account/account.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Accounts/CreateAccount/AccountDetails/accountDetails.js b/js/src/views/Accounts/CreateAccount/AccountDetails/accountDetails.js index 99cf49a59..d8c58d382 100644 --- a/js/src/views/Accounts/CreateAccount/AccountDetails/accountDetails.js +++ b/js/src/views/Accounts/CreateAccount/AccountDetails/accountDetails.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { IdentityIcon, Input, QrCode, Title } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js b/js/src/views/Accounts/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js index f8a8caaa8..662e0bfe2 100644 --- a/js/src/views/Accounts/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js +++ b/js/src/views/Accounts/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { SectionList } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/ChangeVault/changeVault.js b/js/src/views/Accounts/CreateAccount/ChangeVault/changeVault.js index 83afdc38d..02fe7da9a 100644 --- a/js/src/views/Accounts/CreateAccount/ChangeVault/changeVault.js +++ b/js/src/views/Accounts/CreateAccount/ChangeVault/changeVault.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { VaultSelect } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/CreationType/creationType.js b/js/src/views/Accounts/CreateAccount/CreationType/creationType.js index 664ee4fa8..82655a866 100644 --- a/js/src/views/Accounts/CreateAccount/CreationType/creationType.js +++ b/js/src/views/Accounts/CreateAccount/CreationType/creationType.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Container, SelectionList, Title } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/GethCard/gethCard.js b/js/src/views/Accounts/CreateAccount/GethCard/gethCard.js index e8ffdf3f8..769666a3f 100644 --- a/js/src/views/Accounts/CreateAccount/GethCard/gethCard.js +++ b/js/src/views/Accounts/CreateAccount/GethCard/gethCard.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { ETH_TOKEN } from '@parity/shared/util/tokens'; import { AccountCard } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/NewAccount/newAccount.js b/js/src/views/Accounts/CreateAccount/NewAccount/newAccount.js index 50c16a53f..24d69dd32 100644 --- a/js/src/views/Accounts/CreateAccount/NewAccount/newAccount.js +++ b/js/src/views/Accounts/CreateAccount/NewAccount/newAccount.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Button, Form, Input, IdentityIcon, Loading } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/NewGeth/newGeth.js b/js/src/views/Accounts/CreateAccount/NewGeth/newGeth.js index 89c89f63d..b4c8bd7dc 100644 --- a/js/src/views/Accounts/CreateAccount/NewGeth/newGeth.js +++ b/js/src/views/Accounts/CreateAccount/NewGeth/newGeth.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { SelectionList } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/NewImport/newImport.js b/js/src/views/Accounts/CreateAccount/NewImport/newImport.js index 4e5652a4e..9a6861f5b 100644 --- a/js/src/views/Accounts/CreateAccount/NewImport/newImport.js +++ b/js/src/views/Accounts/CreateAccount/NewImport/newImport.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Form, FileSelect, Input } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/NewQr/newQr.js b/js/src/views/Accounts/CreateAccount/NewQr/newQr.js index afa925d72..9d12d7eb0 100644 --- a/js/src/views/Accounts/CreateAccount/NewQr/newQr.js +++ b/js/src/views/Accounts/CreateAccount/NewQr/newQr.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Form, Input, InputAddress, QrScan } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/RawKey/rawKey.js b/js/src/views/Accounts/CreateAccount/RawKey/rawKey.js index 89a4da551..699d79767 100644 --- a/js/src/views/Accounts/CreateAccount/RawKey/rawKey.js +++ b/js/src/views/Accounts/CreateAccount/RawKey/rawKey.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Form, Input } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js b/js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js index f380dbf4c..ad480d519 100644 --- a/js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js +++ b/js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Checkbox, Form, Input, Warning } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateAccount/TypeIcon/typeIcon.js b/js/src/views/Accounts/CreateAccount/TypeIcon/typeIcon.js index 45d26765b..f98c10874 100644 --- a/js/src/views/Accounts/CreateAccount/TypeIcon/typeIcon.js +++ b/js/src/views/Accounts/CreateAccount/TypeIcon/typeIcon.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { AccountsIcon, DoneIcon, FileIcon, FileUploadIcon, KeyboardIcon, KeyIcon, MembershipIcon, QrIcon } from '@parity/ui/Icons'; diff --git a/js/src/views/Accounts/CreateAccount/createAccount.js b/js/src/views/Accounts/CreateAccount/createAccount.js index 2e0745ea5..336d397f9 100644 --- a/js/src/views/Accounts/CreateAccount/createAccount.js +++ b/js/src/views/Accounts/CreateAccount/createAccount.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Accounts/CreateWallet/WalletDetails/walletDetails.js b/js/src/views/Accounts/CreateWallet/WalletDetails/walletDetails.js index 51ac54f59..1086ce773 100644 --- a/js/src/views/Accounts/CreateWallet/WalletDetails/walletDetails.js +++ b/js/src/views/Accounts/CreateWallet/WalletDetails/walletDetails.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Form, TypedInput, Input, AddressSelect, InputAddress } from '@parity/ui'; diff --git a/js/src/views/Accounts/CreateWallet/WalletInfo/walletInfo.js b/js/src/views/Accounts/CreateWallet/WalletInfo/walletInfo.js index 7afda9faa..6aa49eb17 100644 --- a/js/src/views/Accounts/CreateWallet/WalletInfo/walletInfo.js +++ b/js/src/views/Accounts/CreateWallet/WalletInfo/walletInfo.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { fromWei } from '@parity/api/util/wei'; diff --git a/js/src/views/Accounts/CreateWallet/WalletType/walletType.js b/js/src/views/Accounts/CreateWallet/WalletType/walletType.js index 97e1b476e..4cad6456d 100644 --- a/js/src/views/Accounts/CreateWallet/WalletType/walletType.js +++ b/js/src/views/Accounts/CreateWallet/WalletType/walletType.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { walletSourceURL } from '@parity/shared/contracts/code/wallet'; diff --git a/js/src/views/Accounts/CreateWallet/createWallet.js b/js/src/views/Accounts/CreateWallet/createWallet.js index ea59df09a..3c07c7ce7 100644 --- a/js/src/views/Accounts/CreateWallet/createWallet.js +++ b/js/src/views/Accounts/CreateWallet/createWallet.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Accounts/ExportAccount/exportAccount.js b/js/src/views/Accounts/ExportAccount/exportAccount.js index 5780b0161..8b0974208 100644 --- a/js/src/views/Accounts/ExportAccount/exportAccount.js +++ b/js/src/views/Accounts/ExportAccount/exportAccount.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Accounts/ExportAccount/exportInput/exportInput.js b/js/src/views/Accounts/ExportAccount/exportInput/exportInput.js index 0725eb556..f6f677fe7 100644 --- a/js/src/views/Accounts/ExportAccount/exportInput/exportInput.js +++ b/js/src/views/Accounts/ExportAccount/exportInput/exportInput.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Input } from '@parity/ui/Form'; diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js index df02e0502..09c4b826c 100644 --- a/js/src/views/Accounts/List/list.js +++ b/js/src/views/Accounts/List/list.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { pick } from 'lodash'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Accounts/Summary/summary.js b/js/src/views/Accounts/Summary/summary.js index 991f6951a..59388499f 100644 --- a/js/src/views/Accounts/Summary/summary.js +++ b/js/src/views/Accounts/Summary/summary.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { Link } from 'react-router'; import { isEqual } from 'lodash'; diff --git a/js/src/views/Accounts/accounts.js b/js/src/views/Accounts/accounts.js index 5b8b77142..28173ebb3 100644 --- a/js/src/views/Accounts/accounts.js +++ b/js/src/views/Accounts/accounts.js @@ -17,7 +17,8 @@ import { observe } from 'mobx'; import { observer } from 'mobx-react'; import { uniq, isEqual, pickBy } from 'lodash'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Address/Delete/delete.js b/js/src/views/Address/Delete/delete.js index 7eae167e7..4aa16772c 100644 --- a/js/src/views/Address/Delete/delete.js +++ b/js/src/views/Address/Delete/delete.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Address/address.js b/js/src/views/Address/address.js index af4ab0127..9a0352e69 100644 --- a/js/src/views/Address/address.js +++ b/js/src/views/Address/address.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Addresses/AddAddress/addAddress.js b/js/src/views/Addresses/AddAddress/addAddress.js index 561f795fc..894fe504b 100644 --- a/js/src/views/Addresses/AddAddress/addAddress.js +++ b/js/src/views/Addresses/AddAddress/addAddress.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Button, Form, Input, InputAddress, ModalBox, Portal } from '@parity/ui'; diff --git a/js/src/views/Addresses/addresses.js b/js/src/views/Addresses/addresses.js index 3a8671917..a50cae267 100644 --- a/js/src/views/Addresses/addresses.js +++ b/js/src/views/Addresses/addresses.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Application/Status/status.js b/js/src/views/Application/Status/status.js index f44f48eb3..af09cd5e2 100644 --- a/js/src/views/Application/Status/status.js +++ b/js/src/views/Application/Status/status.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/views/Application/TabBar/tabBar.js b/js/src/views/Application/TabBar/tabBar.js index 7ac0d8eac..56e8a498a 100644 --- a/js/src/views/Application/TabBar/tabBar.js +++ b/js/src/views/Application/TabBar/tabBar.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { Link } from 'react-router'; diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js index 7c3bb6f55..bce4f2473 100644 --- a/js/src/views/Contract/Events/Event/event.js +++ b/js/src/views/Contract/Events/Event/event.js @@ -16,7 +16,8 @@ import BigNumber from 'bignumber.js'; import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { IdentityIcon, IdentityName, ShortenedHash, TypedInput } from '@parity/ui'; diff --git a/js/src/views/Contract/Events/events.js b/js/src/views/Contract/Events/events.js index 930905c3f..b3f7fdd4a 100644 --- a/js/src/views/Contract/Events/events.js +++ b/js/src/views/Contract/Events/events.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { uniq } from 'lodash'; diff --git a/js/src/views/Contract/ExecuteContract/AdvancedStep/advancedStep.js b/js/src/views/Contract/ExecuteContract/AdvancedStep/advancedStep.js index 299dff1d9..148a4999a 100644 --- a/js/src/views/Contract/ExecuteContract/AdvancedStep/advancedStep.js +++ b/js/src/views/Contract/ExecuteContract/AdvancedStep/advancedStep.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { GasPriceEditor } from '@parity/ui'; diff --git a/js/src/views/Contract/ExecuteContract/DetailsStep/detailsStep.js b/js/src/views/Contract/ExecuteContract/DetailsStep/detailsStep.js index 9f86f2738..f562e0a4b 100644 --- a/js/src/views/Contract/ExecuteContract/DetailsStep/detailsStep.js +++ b/js/src/views/Contract/ExecuteContract/DetailsStep/detailsStep.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { AddressSelect, Checkbox, Dropdown, Form, Input, TypedInput } from '@parity/ui'; diff --git a/js/src/views/Contract/ExecuteContract/executeContract.js b/js/src/views/Contract/ExecuteContract/executeContract.js index a7eec9189..0b01b18ce 100644 --- a/js/src/views/Contract/ExecuteContract/executeContract.js +++ b/js/src/views/Contract/ExecuteContract/executeContract.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/views/Contract/Queries/inputQuery.js b/js/src/views/Contract/Queries/inputQuery.js index 42b27ac03..c89af54a9 100644 --- a/js/src/views/Contract/Queries/inputQuery.js +++ b/js/src/views/Contract/Queries/inputQuery.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { isEqual } from 'lodash'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Contract/Queries/queries.js b/js/src/views/Contract/Queries/queries.js index 4494ef14c..412418683 100644 --- a/js/src/views/Contract/Queries/queries.js +++ b/js/src/views/Contract/Queries/queries.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Container, TypedInput } from '@parity/ui'; diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js index d8cf5c422..16e8262b5 100644 --- a/js/src/views/Contract/contract.js +++ b/js/src/views/Contract/contract.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/ContractDevelop/LoadContract/loadContract.js b/js/src/views/ContractDevelop/LoadContract/loadContract.js index 03732b5a6..2788e2a68 100644 --- a/js/src/views/ContractDevelop/LoadContract/loadContract.js +++ b/js/src/views/ContractDevelop/LoadContract/loadContract.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Button, List, Portal, Tabs } from '@parity/ui'; diff --git a/js/src/views/ContractDevelop/SaveContract/saveContract.js b/js/src/views/ContractDevelop/SaveContract/saveContract.js index 8ad88578f..84e3446e8 100644 --- a/js/src/views/ContractDevelop/SaveContract/saveContract.js +++ b/js/src/views/ContractDevelop/SaveContract/saveContract.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { ERRORS, validateName } from '@parity/shared/util/validation'; diff --git a/js/src/views/Contracts/AddContract/addContract.js b/js/src/views/Contracts/AddContract/addContract.js index dd96b3993..cadc5256d 100644 --- a/js/src/views/Contracts/AddContract/addContract.js +++ b/js/src/views/Contracts/AddContract/addContract.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Contracts/DeployContract/DetailsStep/detailsStep.js b/js/src/views/Contracts/DeployContract/DetailsStep/detailsStep.js index 3162ec959..aceec4c00 100644 --- a/js/src/views/Contracts/DeployContract/DetailsStep/detailsStep.js +++ b/js/src/views/Contracts/DeployContract/DetailsStep/detailsStep.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { parseAbiType } from '@parity/shared/util/abi'; diff --git a/js/src/views/Contracts/DeployContract/ParametersStep/parametersStep.js b/js/src/views/Contracts/DeployContract/ParametersStep/parametersStep.js index 27691cebe..89a71bdb6 100644 --- a/js/src/views/Contracts/DeployContract/ParametersStep/parametersStep.js +++ b/js/src/views/Contracts/DeployContract/ParametersStep/parametersStep.js @@ -29,7 +29,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { parseAbiType } from '@parity/shared/util/abi'; diff --git a/js/src/views/Contracts/DeployContract/deployContract.js b/js/src/views/Contracts/DeployContract/deployContract.js index f4998d2d7..d7274dcda 100644 --- a/js/src/views/Contracts/DeployContract/deployContract.js +++ b/js/src/views/Contracts/DeployContract/deployContract.js @@ -16,7 +16,8 @@ import BigNumber from 'bignumber.js'; import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Contracts/contracts.js b/js/src/views/Contracts/contracts.js index acf03e037..222bd87f6 100644 --- a/js/src/views/Contracts/contracts.js +++ b/js/src/views/Contracts/contracts.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/DappAccounts/dappAccounts.js b/js/src/views/DappAccounts/dappAccounts.js index 37eaf7129..2381a666c 100644 --- a/js/src/views/DappAccounts/dappAccounts.js +++ b/js/src/views/DappAccounts/dappAccounts.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { AccountCard, Page, SelectionList } from '@parity/ui'; diff --git a/js/src/views/DappMethods/MethodCheck/methodCheck.js b/js/src/views/DappMethods/MethodCheck/methodCheck.js index fa83b2192..3c036d3a7 100644 --- a/js/src/views/DappMethods/MethodCheck/methodCheck.js +++ b/js/src/views/DappMethods/MethodCheck/methodCheck.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { CheckboxTickedIcon, CheckboxUntickedIcon } from '@parity/ui/Icons'; diff --git a/js/src/views/DappMethods/dappMethods.js b/js/src/views/DappMethods/dappMethods.js index ca9074337..84c04c530 100644 --- a/js/src/views/DappMethods/dappMethods.js +++ b/js/src/views/DappMethods/dappMethods.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Page } from '@parity/ui'; diff --git a/js/src/views/DappVisible/dappVisible.js b/js/src/views/DappVisible/dappVisible.js index e84297ab7..b772bb83c 100644 --- a/js/src/views/DappVisible/dappVisible.js +++ b/js/src/views/DappVisible/dappVisible.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { DappCard, Page, SelectionList } from '@parity/ui'; diff --git a/js/src/views/Home/Accounts/accounts.js b/js/src/views/Home/Accounts/accounts.js index f4beaddd0..1b231fc0d 100644 --- a/js/src/views/Home/Accounts/accounts.js +++ b/js/src/views/Home/Accounts/accounts.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { Link } from 'react-router'; diff --git a/js/src/views/Home/Dapps/dapp.js b/js/src/views/Home/Dapps/dapp.js index 5c159a707..df75bac73 100644 --- a/js/src/views/Home/Dapps/dapp.js +++ b/js/src/views/Home/Dapps/dapp.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; diff --git a/js/src/views/Home/Dapps/dapps.js b/js/src/views/Home/Dapps/dapps.js index 401a1bef7..5a4f9c10b 100644 --- a/js/src/views/Home/Dapps/dapps.js +++ b/js/src/views/Home/Dapps/dapps.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { arrayOrObjectProptype } from '@parity/shared/util/proptypes'; diff --git a/js/src/views/Home/News/news.js b/js/src/views/Home/News/news.js index 9d36587ea..97305bc94 100644 --- a/js/src/views/Home/News/news.js +++ b/js/src/views/Home/News/news.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import ReactMarkdown from 'react-markdown'; import { SectionList } from '@parity/ui'; diff --git a/js/src/views/Home/Urls/urls.js b/js/src/views/Home/Urls/urls.js index 6815e7cac..1b76f68e8 100644 --- a/js/src/views/Home/Urls/urls.js +++ b/js/src/views/Home/Urls/urls.js @@ -16,7 +16,8 @@ import { observer } from 'mobx-react'; import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Container, ContainerTitle, DappUrlInput, SectionList } from '@parity/ui'; diff --git a/js/src/views/Home/home.js b/js/src/views/Home/home.js index 921cd21c8..2d9f65031 100644 --- a/js/src/views/Home/home.js +++ b/js/src/views/Home/home.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; diff --git a/js/src/views/Playground/playgroundExample.js b/js/src/views/Playground/playgroundExample.js index 8a4dae283..425e6d89e 100644 --- a/js/src/views/Playground/playgroundExample.js +++ b/js/src/views/Playground/playgroundExample.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import reactElementToJSXString from 'react-element-to-jsx-string'; import styles from './playground.css'; diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js index ed6b7cbba..923e4edca 100644 --- a/js/src/views/Settings/Background/background.js +++ b/js/src/views/Settings/Background/background.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Settings/Node/node.js b/js/src/views/Settings/Node/node.js index b9a9c7934..89408de76 100644 --- a/js/src/views/Settings/Node/node.js +++ b/js/src/views/Settings/Node/node.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Container, Dropdown, LanguageSelector } from '@parity/ui'; diff --git a/js/src/views/Settings/Proxy/proxy.js b/js/src/views/Settings/Proxy/proxy.js index 9259f4670..7bb4bb945 100644 --- a/js/src/views/Settings/Proxy/proxy.js +++ b/js/src/views/Settings/Proxy/proxy.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Container } from '@parity/ui'; diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js index 3fea9a9b4..b6851bf1a 100644 --- a/js/src/views/Settings/Views/views.js +++ b/js/src/views/Settings/Views/views.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Settings/settings.js b/js/src/views/Settings/settings.js index dc87ffe89..c40c8e8a4 100644 --- a/js/src/views/Settings/settings.js +++ b/js/src/views/Settings/settings.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Page, Tabs } from '@parity/ui'; diff --git a/js/src/views/Signer/RequestsPage/requestsPage.js b/js/src/views/Signer/RequestsPage/requestsPage.js index 0fd2b04f8..fe5bed8ab 100644 --- a/js/src/views/Signer/RequestsPage/requestsPage.js +++ b/js/src/views/Signer/RequestsPage/requestsPage.js @@ -16,7 +16,8 @@ import BigNumber from 'bignumber.js'; import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Status/Debug/Toggle/toggle.js b/js/src/views/Status/Debug/Toggle/toggle.js index 178bc2601..35ae4acd4 100644 --- a/js/src/views/Status/Debug/Toggle/toggle.js +++ b/js/src/views/Status/Debug/Toggle/toggle.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import styles from '../debug.css'; diff --git a/js/src/views/Status/Debug/debug.js b/js/src/views/Status/Debug/debug.js index be9577dd8..7c36de670 100644 --- a/js/src/views/Status/Debug/debug.js +++ b/js/src/views/Status/Debug/debug.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Container } from '@parity/ui'; diff --git a/js/src/views/Status/Health/health.js b/js/src/views/Status/Health/health.js index 8ff314cf9..7c3ef864c 100644 --- a/js/src/views/Status/Health/health.js +++ b/js/src/views/Status/Health/health.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/views/Status/MiningSettings/miningSettings.js b/js/src/views/Status/MiningSettings/miningSettings.js index f48d34874..0cb17e594 100644 --- a/js/src/views/Status/MiningSettings/miningSettings.js +++ b/js/src/views/Status/MiningSettings/miningSettings.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import formatNumber from 'format-number'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { ContainerTitle, Input, TypedInput } from '@parity/ui'; diff --git a/js/src/views/Status/Node/node.js b/js/src/views/Status/Node/node.js index 84048d175..a297e636c 100644 --- a/js/src/views/Status/Node/node.js +++ b/js/src/views/Status/Node/node.js @@ -16,7 +16,8 @@ import bytes from 'bytes'; import moment from 'moment'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/views/Status/Peers/Peer/peer.js b/js/src/views/Status/Peers/Peer/peer.js index 8f3c981c5..497cdb7c5 100644 --- a/js/src/views/Status/Peers/Peer/peer.js +++ b/js/src/views/Status/Peers/Peer/peer.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { ScrollableText, ShortenedHash } from '@parity/ui'; diff --git a/js/src/views/Status/Peers/peers.js b/js/src/views/Status/Peers/peers.js index abbb6e0d3..03552d4a6 100644 --- a/js/src/views/Status/Peers/peers.js +++ b/js/src/views/Status/Peers/peers.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; diff --git a/js/src/views/Vaults/VaultAccounts/vaultAccounts.js b/js/src/views/Vaults/VaultAccounts/vaultAccounts.js index e96519090..279749788 100644 --- a/js/src/views/Vaults/VaultAccounts/vaultAccounts.js +++ b/js/src/views/Vaults/VaultAccounts/vaultAccounts.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Vaults/VaultCreate/vaultCreate.js b/js/src/views/Vaults/VaultCreate/vaultCreate.js index 8b644bb91..e93342189 100644 --- a/js/src/views/Vaults/VaultCreate/vaultCreate.js +++ b/js/src/views/Vaults/VaultCreate/vaultCreate.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Vaults/VaultLock/vaultLock.js b/js/src/views/Vaults/VaultLock/vaultLock.js index 297a78c03..cdc1c21a4 100644 --- a/js/src/views/Vaults/VaultLock/vaultLock.js +++ b/js/src/views/Vaults/VaultLock/vaultLock.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Vaults/VaultMeta/vaultMeta.js b/js/src/views/Vaults/VaultMeta/vaultMeta.js index 0f3cc50be..0af817dbd 100644 --- a/js/src/views/Vaults/VaultMeta/vaultMeta.js +++ b/js/src/views/Vaults/VaultMeta/vaultMeta.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Vaults/VaultUnlock/vaultUnlock.js b/js/src/views/Vaults/VaultUnlock/vaultUnlock.js index ba7f51a78..b2d140038 100644 --- a/js/src/views/Vaults/VaultUnlock/vaultUnlock.js +++ b/js/src/views/Vaults/VaultUnlock/vaultUnlock.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Vaults/vaults.js b/js/src/views/Vaults/vaults.js index 2011c5c23..8df9a847f 100644 --- a/js/src/views/Vaults/vaults.js +++ b/js/src/views/Vaults/vaults.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; diff --git a/js/src/views/Wallet/Confirmations/confirmations.js b/js/src/views/Wallet/Confirmations/confirmations.js index 3e882ff69..fa3e6aafc 100644 --- a/js/src/views/Wallet/Confirmations/confirmations.js +++ b/js/src/views/Wallet/Confirmations/confirmations.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import ReactTooltip from 'react-tooltip'; import { connect } from 'react-redux'; diff --git a/js/src/views/Wallet/Details/details.js b/js/src/views/Wallet/Details/details.js index 4d2a790ad..063ad5c58 100644 --- a/js/src/views/Wallet/Details/details.js +++ b/js/src/views/Wallet/Details/details.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { Container, InputAddress } from '@parity/ui'; diff --git a/js/src/views/Wallet/Transactions/transactions.js b/js/src/views/Wallet/Transactions/transactions.js index 1f885f608..f5e14bf10 100644 --- a/js/src/views/Wallet/Transactions/transactions.js +++ b/js/src/views/Wallet/Transactions/transactions.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { bytesToHex } from '@parity/api/util/format'; diff --git a/js/src/views/Wallet/WalletSettings/walletSettings.js b/js/src/views/Wallet/WalletSettings/walletSettings.js index 41b30f0e5..f226efbfa 100644 --- a/js/src/views/Wallet/WalletSettings/walletSettings.js +++ b/js/src/views/Wallet/WalletSettings/walletSettings.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { observer } from 'mobx-react'; diff --git a/js/src/views/Wallet/wallet.js b/js/src/views/Wallet/wallet.js index 4a19dd6a5..2e01894f1 100644 --- a/js/src/views/Wallet/wallet.js +++ b/js/src/views/Wallet/wallet.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/js/src/views/Web/AddressBar/addressBar.js b/js/src/views/Web/AddressBar/addressBar.js index 255b46972..b529d2278 100644 --- a/js/src/views/Web/AddressBar/addressBar.js +++ b/js/src/views/Web/AddressBar/addressBar.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { Button, DappUrlInput } from '@parity/ui'; import { CloseIcon, RefreshIcon, GotoIcon } from '@parity/ui/Icons'; diff --git a/js/src/views/Web/web.js b/js/src/views/Web/web.js index 8e81b43d5..ec627b68b 100644 --- a/js/src/views/Web/web.js +++ b/js/src/views/Web/web.js @@ -15,7 +15,8 @@ // along with Parity. If not, see . import { observer } from 'mobx-react'; -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import AddressBar from './AddressBar'; diff --git a/js/webpack/dev.server.js b/js/webpack/dev.server.js index 038945014..07541a879 100644 --- a/js/webpack/dev.server.js +++ b/js/webpack/dev.server.js @@ -73,6 +73,7 @@ app.use(webpackDevMiddleware(compiler, { // @see https://github.com/webpack/webpack/blob/324d309107f00cfc38ec727521563d309339b2ec/lib/Stats.js#L790 // Accepted values: none, errors-only, minimal, normal, verbose const options = WebpackStats.presetToOptions('minimal'); + options.timings = true; const output = data.stats.toString(options); @@ -89,6 +90,7 @@ Shared.addProxies(app); app.use(express.static(webpackConfig.output.path)); const server = http.createServer(app); + server.listen(process.env.PORT || 3000, function () { console.log('Listening on port', server.address().port); progressBar = new ProgressBar('[:bar] :percent :etas', { total: 50 }); diff --git a/js/webpack/shared.js b/js/webpack/shared.js index a15560689..e9ced22e5 100644 --- a/js/webpack/shared.js +++ b/js/webpack/shared.js @@ -25,7 +25,19 @@ const postcssVars = require('postcss-simple-vars'); const rucksack = require('rucksack-css'); const CircularDependencyPlugin = require('circular-dependency-plugin'); const ProgressBarPlugin = require('progress-bar-webpack-plugin'); +const PackageJson = require('../package.json'); +const UI_VERSION = PackageJson + .version + .split('.') + .map((part, index) => { + if (index !== 2) { + return part; + } + + return `${parseInt(part, 10) + 1}`; + }) + .join('.'); const EMBED = process.env.EMBED; const ENV = process.env.NODE_ENV || 'development'; const isProd = ENV === 'production'; @@ -113,7 +125,8 @@ function getPlugins (_isProd = isProd) { RPC_ADDRESS: JSON.stringify(process.env.RPC_ADDRESS), PARITY_URL: JSON.stringify(process.env.PARITY_URL), DAPPS_URL: JSON.stringify(process.env.DAPPS_URL), - LOGGING: JSON.stringify(!isProd) + LOGGING: JSON.stringify(!isProd), + UI_VERSION: JSON.stringify(UI_VERSION) } }), @@ -125,26 +138,28 @@ function getPlugins (_isProd = isProd) { postcss: postcss, babel: getBabelrc() } - }), + }) + ]); + if (_isProd) { + plugins.push( new webpack.optimize.OccurrenceOrderPlugin(!_isProd), new CircularDependencyPlugin({ exclude: /node_modules/, failOnError: true - }) - ]); + }), - if (_isProd) { - plugins.push(new webpack.optimize.UglifyJsPlugin({ - screwIe8: true, - compress: { - warnings: false - }, - output: { - comments: false - } - })); + new webpack.optimize.UglifyJsPlugin({ + screwIe8: true, + compress: { + warnings: false + }, + output: { + comments: false + } + }) + ); } return plugins;