From 3cb6333181e470b2ad1b7b5429af155304e2e35f Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 26 Aug 2020 12:22:16 +0200 Subject: [PATCH] revert api (#3525) --- .eslintrc.js | 2 - .../{yarn-2.1.1.cjs => yarn-2.1.1.js} | 0 .yarnrc.yml | 2 +- package.json | 18 +- packages/apps-electron/package.json | 2 +- packages/apps/package.json | 2 +- packages/page-accounts/src/modals/Create.tsx | 15 +- packages/page-contracts/package.json | 2 +- packages/react-api/package.json | 2 +- packages/react-api/src/Api.tsx | 2 +- packages/react-components/package.json | 6 +- packages/react-components/src/Expander.tsx | 11 +- yarn.lock | 349 ++++++++---------- 13 files changed, 188 insertions(+), 225 deletions(-) rename .yarn/releases/{yarn-2.1.1.cjs => yarn-2.1.1.js} (100%) diff --git a/.eslintrc.js b/.eslintrc.js index d4eba7027a..f4dd8b2a6b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,7 +12,5 @@ module.exports = { rules: { ...base.rules, '@typescript-eslint/no-explicit-any': 'off', - // this is yielding false positives - '@typescript-eslint/unbound-method': 'off' } }; diff --git a/.yarn/releases/yarn-2.1.1.cjs b/.yarn/releases/yarn-2.1.1.js similarity index 100% rename from .yarn/releases/yarn-2.1.1.cjs rename to .yarn/releases/yarn-2.1.1.js diff --git a/.yarnrc.yml b/.yarnrc.yml index 38e7cd24aa..c50a3ad76f 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -8,4 +8,4 @@ plugins: - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.js spec: "@yarnpkg/plugin-interactive-tools" -yarnPath: .yarn/releases/yarn-2.1.1.cjs +yarnPath: .yarn/releases/yarn-2.1.1.js diff --git a/package.json b/package.json index 6a7025d35f..975f9029af 100644 --- a/package.json +++ b/package.json @@ -33,13 +33,13 @@ "afterSign": "electron-builder-notarize" }, "resolutions": { - "@polkadot/api": "^1.31.0-beta.5", - "@polkadot/api-contract": "^1.31.0-beta.5", - "@polkadot/keyring": "^3.4.0-beta.1", - "@polkadot/types": "^1.31.0-beta.5", - "@polkadot/util": "^3.4.0-beta.1", - "@polkadot/util-crypto": "^3.4.0-beta.1", - "@polkadot/wasm-crypto": "^1.4.0-beta.7", + "@polkadot/api": "^1.30.1", + "@polkadot/api-contract": "^1.30.1", + "@polkadot/keyring": "^3.3.1", + "@polkadot/types": "^1.30.1", + "@polkadot/util": "^3.3.1", + "@polkadot/util-crypto": "^3.3.1", + "@polkadot/wasm-crypto": "^1.3.1", "babel-core": "^7.0.0-bridge.0" }, "scripts": { @@ -82,8 +82,8 @@ "@babel/register": "^7.10.5", "@babel/runtime": "^7.11.2", "@pinata/sdk": "^1.1.11", - "@polkadot/dev": "^0.55.43", - "@polkadot/ts": "^0.3.40", + "@polkadot/dev": "^0.55.39", + "@polkadot/ts": "^0.3.39", "@types/bn.js": "^4.11.6", "@types/chart.js": "^2.9.24", "@types/file-saver": "^2.0.1", diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json index 89a98ec935..cbe50aecab 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -6,7 +6,7 @@ "dependencies": { "@babel/core": "^7.11.4", "@babel/polyfill": "^7.10.4", - "@polkadot/dev": "^0.55.43", + "@polkadot/dev": "^0.55.39", "@polkadot/react-components": "0.56.0-beta.9", "electron-log": "^4.2.4", "electron-updater": "^4.3.5" diff --git a/packages/apps/package.json b/packages/apps/package.json index 5ff0c5ee84..8daa91b27d 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -16,7 +16,7 @@ "@babel/core": "^7.11.4", "@babel/polyfill": "^7.10.4", "@babel/runtime": "^7.11.2", - "@polkadot/dev": "^0.55.43", + "@polkadot/dev": "^0.55.39", "@polkadot/react-components": "0.56.0-beta.9", "@polkadot/react-signer": "0.56.0-beta.9", "punycode": "^2.1.1", diff --git a/packages/page-accounts/src/modals/Create.tsx b/packages/page-accounts/src/modals/Create.tsx index 785acbdad2..629b0d97db 100644 --- a/packages/page-accounts/src/modals/Create.tsx +++ b/packages/page-accounts/src/modals/Create.tsx @@ -316,16 +316,10 @@ function Create ({ className = '', onClose, onStatusChange, seed: propsSeed, typ - {!isElectron && ( -
-

{t('Consider storing your account in a signer such as a browser extension, hardware device, QR-capable phone wallet (non-connected) or desktop application for optimal account security.')} {t('Future versions of the web-only interface will drop support for non-external accounts, much like the IPFS version.')}

-
- )} + password={password}/> ('Advanced creation options')} > @@ -370,6 +364,11 @@ function Create ({ className = '', onClose, onStatusChange, seed: propsSeed, typ + {!isElectron && ( +
+

{t('Consider storing your account in a signer such as a browser extension, hardware device, QR-capable phone wallet (non-connected) or desktop application for optimal account security.')} {t('Future versions of the web-only interface will drop support for non-external accounts, much like the IPFS version.')}

+
+ )}