diff --git a/.eslintrc.js b/.eslintrc.js index f4dd8b2a6b..d4eba7027a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,5 +12,7 @@ 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.js b/.yarn/releases/yarn-2.1.1.cjs similarity index 100% rename from .yarn/releases/yarn-2.1.1.js rename to .yarn/releases/yarn-2.1.1.cjs diff --git a/.yarnrc.yml b/.yarnrc.yml index c50a3ad76f..38e7cd24aa 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.js +yarnPath: .yarn/releases/yarn-2.1.1.cjs diff --git a/package.json b/package.json index ee45f3578a..a07e468874 100644 --- a/package.json +++ b/package.json @@ -33,13 +33,13 @@ "afterSign": "electron-builder-notarize" }, "resolutions": { - "@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", + "@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", "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.39", - "@polkadot/ts": "^0.3.39", + "@polkadot/dev": "^0.55.43", + "@polkadot/ts": "^0.3.40", "@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 6794d90f1b..42c30e7255 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.39", + "@polkadot/dev": "^0.55.43", "@polkadot/react-components": "0.56.0-beta.8", "electron-log": "^4.2.4", "electron-updater": "^4.3.5" diff --git a/packages/apps/package.json b/packages/apps/package.json index 43526914dc..6ada87d8b8 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.39", + "@polkadot/dev": "^0.55.43", "@polkadot/react-components": "0.56.0-beta.8", "@polkadot/react-signer": "0.56.0-beta.8", "punycode": "^2.1.1", diff --git a/packages/page-accounts/src/modals/Create.tsx b/packages/page-accounts/src/modals/Create.tsx index 629b0d97db..785acbdad2 100644 --- a/packages/page-accounts/src/modals/Create.tsx +++ b/packages/page-accounts/src/modals/Create.tsx @@ -316,10 +316,16 @@ function Create ({ className = '', onClose, onStatusChange, seed: propsSeed, typ + password={password} + /> + {!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.')}

+
+ )} ('Advanced creation options')} > @@ -364,11 +370,6 @@ 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.')}

-
- )}