diff --git a/CHANGELOG.md b/CHANGELOG.md index 77c28cac95..10829eb954 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,33 @@ # CHANGELOG -## 0.60.0-beta.x +## 0.60.1 Sep 28, 2020 + +Contributed: + +- Update Italian i18n (Thanks to https://github.com/fomod-in) +- Show JSON import warning for different genesis (Thanks to https://github.com/Tbaut) +- Adjust Expander component overflows (Thanks to https://github.com/Tbaut) Changes: +- Adjust payout calculations based on new weights (auto-detect batch size) +- Allow for multiple extrinsic submissions when payouts span multiple batches - Show warning on JSON import to store accounts externally (same as create) +- Combine events displays in status overlays +- Swap treasury proposal defaults to accept +- Adjust multiple input address stretch (use full width for names) +- Filter event/extrinsic metadata with additional readability formatting +- Ensure that tech. comm. voting is filtered by members +- Adjust proposal close to allow account selection when multiple accounts found +- add warning around "this is a dev tool" to the JS playground +- Add toggle to control unlock duration +- URI-encode RPC param (allowing for WS url params) +- Bump Edgeware types (after 2.0-rc upgrade) +- Adjust warning icon for oversubscribed validators +- Simplify JSON import via new keyring functionality +- Adjust button hover highlights for consistency +- `@polkadot/api` 2.0.1 +- `@polkadot/util` 3.5.1 ## 0.59.1 Sep 21, 2020 diff --git a/lerna.json b/lerna.json index bbdc6c181a..3ff904c3e5 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.60.0-beta.29" + "version": "0.60.0" } diff --git a/package.json b/package.json index 9ecdc36fc9..58aca7258b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "main": "packages/apps-electron/build/electron.js", "description": "An Apps portal into the Polkadot network", "author": "Jaco Greeff ", - "version": "0.60.0-beta.29", + "version": "0.60.0", "license": "Apache-2", "private": true, "homepage": ".", @@ -33,10 +33,10 @@ "afterSign": "electron-builder-notarize" }, "resolutions": { - "@polkadot/api": "^1.35.0-beta.19", - "@polkadot/api-contract": "^1.35.0-beta.19", + "@polkadot/api": "^2.0.1", + "@polkadot/api-contract": "^2.0.1", "@polkadot/keyring": "^3.5.1", - "@polkadot/types": "^1.35.0-beta.19", + "@polkadot/types": "^2.0.1", "@polkadot/util": "^3.5.1", "@polkadot/util-crypto": "^3.5.1", "@polkadot/wasm-crypto": "^1.4.1", diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index c8fb8478d4..7d1502c818 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/apps-config", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json index 9c1e8d1ad8..efefa9a5de 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -2,12 +2,12 @@ "name": "@polkadot/apps-electron", "main": "index.js", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "dependencies": { "@babel/core": "^7.11.6", "@babel/polyfill": "^7.11.5", "@polkadot/dev": "^0.55.54", - "@polkadot/react-components": "0.60.0-beta.29", + "@polkadot/react-components": "0.60.0", "electron-log": "^4.2.4", "electron-updater": "^4.3.5" }, diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 87feb39991..a349ae4143 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/apps-routing", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/apps/package.json b/packages/apps/package.json index 3982aa7f5d..933a358055 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/apps", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -17,8 +17,8 @@ "@babel/polyfill": "^7.11.5", "@babel/runtime": "^7.11.2", "@polkadot/dev": "^0.55.54", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-signer": "0.60.0-beta.29", + "@polkadot/react-components": "0.60.0", + "@polkadot/react-signer": "0.60.0", "punycode": "^2.1.1", "query-string": "^6.13.2" }, diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json index 570efdd8f8..9ed1197e36 100644 --- a/packages/page-accounts/package.json +++ b/packages/page-accounts/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-accounts", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,8 +12,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/vanitygen": "^0.21.0-beta.4", + "@polkadot/react-components": "0.60.0", + "@polkadot/vanitygen": "^0.21.1", "detect-browser": "^5.1.1", "file-saver": "^2.0.2" }, diff --git a/packages/page-addresses/package.json b/packages/page-addresses/package.json index dae686709b..3bee8ab392 100644 --- a/packages/page-addresses/package.json +++ b/packages/page-addresses/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-addresses", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,8 +12,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/vanitygen": "^0.21.0-beta.4", + "@polkadot/react-components": "0.60.0", + "@polkadot/vanitygen": "^0.21.1", "detect-browser": "^5.1.1", "file-saver": "^2.0.2" }, diff --git a/packages/page-calendar/package.json b/packages/page-calendar/package.json index 1d4f9979b4..fe223c00ee 100644 --- a/packages/page-calendar/package.json +++ b/packages/page-calendar/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-calendar", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A on-chain events calendar", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-claims/package.json b/packages/page-claims/package.json index c1b02972dd..7a7eae6c18 100644 --- a/packages/page-claims/package.json +++ b/packages/page-claims/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-claims", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -13,7 +13,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", + "@polkadot/react-components": "0.60.0", "secp256k1": "^3.8.0" } } diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json index 57cb419fa0..23b5a0b915 100644 --- a/packages/page-contracts/package.json +++ b/packages/page-contracts/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-contracts", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/api-contract": "^1.35.0-beta.19" + "@polkadot/api-contract": "^2.0.1" } } diff --git a/packages/page-council/package.json b/packages/page-council/package.json index 034c4429ca..8a8eb4af3e 100644 --- a/packages/page-council/package.json +++ b/packages/page-council/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-council", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "Council", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-query": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0", + "@polkadot/react-query": "0.60.0" } } diff --git a/packages/page-dashboard/package.json b/packages/page-dashboard/package.json index 6e73cabe97..22ceba14b3 100644 --- a/packages/page-dashboard/package.json +++ b/packages/page-dashboard/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-dashboard", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "Dashboard for all apps, allowing for an overview and quick navigation", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/apps-routing": "0.60.0-beta.29", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/apps-routing": "0.60.0", + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-democracy/package.json b/packages/page-democracy/package.json index 2720735990..5aaf70c03f 100644 --- a/packages/page-democracy/package.json +++ b/packages/page-democracy/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-democracy", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-query": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0", + "@polkadot/react-query": "0.60.0" } } diff --git a/packages/page-explorer/package.json b/packages/page-explorer/package.json index 4be5681b23..8b6a39c96c 100644 --- a/packages/page-explorer/package.json +++ b/packages/page-explorer/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-explorer", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-extrinsics/package.json b/packages/page-extrinsics/package.json index a3cf0bb38c..411cb8d859 100644 --- a/packages/page-extrinsics/package.json +++ b/packages/page-extrinsics/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-extrinsics", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,8 +12,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-params": "0.60.0-beta.29", - "@polkadot/react-signer": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0", + "@polkadot/react-params": "0.60.0", + "@polkadot/react-signer": "0.60.0" } } diff --git a/packages/page-generic-asset/package.json b/packages/page-generic-asset/package.json index 4c1ab2b69a..8a42d66244 100644 --- a/packages/page-generic-asset/package.json +++ b/packages/page-generic-asset/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-generic-asset", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-js/package.json b/packages/page-js/package.json index e03bcc4222..12fffc06c0 100644 --- a/packages/page-js/package.json +++ b/packages/page-js/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-js", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A simple JavaScript console for playing with the API", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-js/src/Playground.tsx b/packages/page-js/src/Playground.tsx index 8ca149eeec..733c6b2e89 100644 --- a/packages/page-js/src/Playground.tsx +++ b/packages/page-js/src/Playground.tsx @@ -266,15 +266,16 @@ function Playground ({ className = '' }: Props): React.ReactElement { {isWarnOpen && (
-
)} @@ -390,10 +391,12 @@ export default React.memo(styled(Playground)` top: -0.25rem; z-index: 202; - .ui--Button { - position: absolute; - right: 0.5rem; - top: 0.5rem; + article p:first-child { + padding-top: 1rem; + } + + .ui--Button-Group { + margin-bottom: 0; } } `); diff --git a/packages/page-parachains/package.json b/packages/page-parachains/package.json index 6d847576de..0ffbb68851 100644 --- a/packages/page-parachains/package.json +++ b/packages/page-parachains/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-parachains", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-query": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0", + "@polkadot/react-query": "0.60.0" } } diff --git a/packages/page-poll/package.json b/packages/page-poll/package.json index 108d5d8c88..2bd86bfb55 100644 --- a/packages/page-poll/package.json +++ b/packages/page-poll/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-poll", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A basic polling module", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-rpc/package.json b/packages/page-rpc/package.json index c42b576499..b16d768689 100644 --- a/packages/page-rpc/package.json +++ b/packages/page-rpc/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-rpc", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-settings/package.json b/packages/page-settings/package.json index e7c8aef4bb..718908d599 100644 --- a/packages/page-settings/package.json +++ b/packages/page-settings/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-settings", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -12,9 +12,9 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/apps-config": "0.60.0-beta.29", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-query": "0.60.0-beta.29", + "@polkadot/apps-config": "0.60.0", + "@polkadot/react-components": "0.60.0", + "@polkadot/react-query": "0.60.0", "query-string": "^6.13.2" } } diff --git a/packages/page-signing/package.json b/packages/page-signing/package.json index ca3de08dc6..0f8031ce0e 100644 --- a/packages/page-signing/package.json +++ b/packages/page-signing/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-signing", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-society/package.json b/packages/page-society/package.json index 386b83a53d..3415c60dfe 100644 --- a/packages/page-society/package.json +++ b/packages/page-society/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-society", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A society", "main": "index.js", "scripts": {}, @@ -9,6 +9,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-staking/package.json b/packages/page-staking/package.json index cfe5efb90a..fb34cfba21 100644 --- a/packages/page-staking/package.json +++ b/packages/page-staking/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-staking", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -12,8 +12,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/app-explorer": "0.60.0-beta.29", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-query": "0.60.0-beta.29" + "@polkadot/app-explorer": "0.60.0", + "@polkadot/react-components": "0.60.0", + "@polkadot/react-query": "0.60.0" } } diff --git a/packages/page-storage/package.json b/packages/page-storage/package.json index 08c12d7c9c..58344c4bbe 100644 --- a/packages/page-storage/package.json +++ b/packages/page-storage/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-storage", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-params": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0", + "@polkadot/react-params": "0.60.0" } } diff --git a/packages/page-sudo/package.json b/packages/page-sudo/package.json index ad624dc51b..a32309593a 100644 --- a/packages/page-sudo/package.json +++ b/packages/page-sudo/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-sudo", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -13,6 +13,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/page-tech-comm/package.json b/packages/page-tech-comm/package.json index 6170ed6b73..bb1c54fd75 100644 --- a/packages/page-tech-comm/package.json +++ b/packages/page-tech-comm/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-tech-comm", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "Council", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-query": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0", + "@polkadot/react-query": "0.60.0" } } diff --git a/packages/page-treasury/package.json b/packages/page-treasury/package.json index 60a64bbc11..96cb2aa99a 100644 --- a/packages/page-treasury/package.json +++ b/packages/page-treasury/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-treasury", "private": true, - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -13,7 +13,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29", - "@polkadot/react-query": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0", + "@polkadot/react-query": "0.60.0" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 65a8b312d2..7236702478 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/api": "^1.35.0-beta.19", + "@polkadot/api": "^2.0.1", "@polkadot/extension-dapp": "^0.35.0-beta.3", "rxjs-compat": "^6.6.3" } diff --git a/packages/react-components/package.json b/packages/react-components/package.json index cec141404d..6d4fbda9ee 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -15,12 +15,12 @@ "@fortawesome/free-solid-svg-icons": "^5.14.0", "@fortawesome/react-fontawesome": "^0.1.11", "@polkadot/keyring": "^3.5.1", - "@polkadot/react-api": "0.60.0-beta.29", - "@polkadot/react-identicon": "^0.59.0-beta.12", - "@polkadot/react-qr": "^0.59.0-beta.12", - "@polkadot/react-query": "0.60.0-beta.29", - "@polkadot/ui-keyring": "^0.59.0-beta.12", - "@polkadot/ui-settings": "^0.59.0-beta.12", + "@polkadot/react-api": "0.60.0", + "@polkadot/react-identicon": "^0.59.1", + "@polkadot/react-qr": "^0.59.1", + "@polkadot/react-query": "0.60.0", + "@polkadot/ui-keyring": "^0.59.1", + "@polkadot/ui-settings": "^0.59.1", "@polkadot/util": "^3.5.1", "@polkadot/util-crypto": "^3.5.1", "chart.js": "^2.9.3", diff --git a/packages/react-components/src/ErrorBoundary.tsx b/packages/react-components/src/ErrorBoundary.tsx index 3118b6f41d..4a513f985e 100644 --- a/packages/react-components/src/ErrorBoundary.tsx +++ b/packages/react-components/src/ErrorBoundary.tsx @@ -10,6 +10,7 @@ import translate from './translate'; interface Props extends I18nProps { children: React.ReactNode; doThrow?: boolean; + error?: Error | null; onError?: () => void; trigger?: unknown; } @@ -46,14 +47,15 @@ class ErrorBoundary extends React.Component { } public render (): React.ReactNode { - const { children, t } = this.props; + const { children, error: errorProps, t } = this.props; const { error } = this.state; + const displayError = errorProps || error; - return error + return displayError ? (
{t('Uncaught error. Something went wrong with the query and rendering of this component. {{message}}', { - replace: { message: error.message } + replace: { message: displayError.message } })}
) diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index e17bd27944..cae1efa741 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A collection of React hooks the Polkadot JS Apps UI", "main": "index.js", "keywords": [ diff --git a/packages/react-params/package.json b/packages/react-params/package.json index 21245cbb84..b49234cbe9 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index e9a4720373..d5b32473ea 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.60.0-beta.29", + "version": "0.60.0", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json index 16662bc57b..0f3ae471f5 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.60.0-beta.29", + "version": "0.60.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.11.2", - "@polkadot/react-components": "0.60.0-beta.29" + "@polkadot/react-components": "0.60.0" } } diff --git a/packages/react-signer/src/TxSigned.tsx b/packages/react-signer/src/TxSigned.tsx index 74e7aee697..805e68efe1 100644 --- a/packages/react-signer/src/TxSigned.tsx +++ b/packages/react-signer/src/TxSigned.tsx @@ -158,6 +158,7 @@ function TxSigned ({ className, currentItem, requestAddress }: Props): React.Rea const { t } = useTranslation(); const { queueSetTxStatus } = useContext(StatusContext); const [flags, setFlags] = useState(extractExternal(requestAddress)); + const [error, setError] = useState(null); const [{ isQrHashed, qrAddress, qrPayload, qrResolve }, setQrState] = useState({ isQrHashed: false, qrAddress: '', qrPayload: new Uint8Array() }); const [isBusy, setBusy] = useState(false); const [isRenderError, toggleRenderError] = useToggle(); @@ -264,15 +265,26 @@ function TxSigned ({ className, currentItem, requestAddress }: Props): React.Rea const _doStart = useCallback( (): void => { setBusy(true); + setTimeout((): void => { - if (_unlock()) { - isSubmit - ? currentItem.payload - ? _onSendPayload(queueSetTxStatus, currentItem, senderInfo) - : _onSend(queueSetTxStatus, currentItem, senderInfo).catch(console.error) - : _onSign(queueSetTxStatus, currentItem, senderInfo).catch(console.error); - } else { + const errorHandler = (error: Error): void => { + console.error(error); setBusy(false); + setError(error); + }; + + try { + if (_unlock()) { + isSubmit + ? currentItem.payload + ? _onSendPayload(queueSetTxStatus, currentItem, senderInfo) + : _onSend(queueSetTxStatus, currentItem, senderInfo).catch(errorHandler) + : _onSign(queueSetTxStatus, currentItem, senderInfo).catch(errorHandler); + } else { + setBusy(false); + } + } catch (error) { + errorHandler(error as Error); } }, 0); }, @@ -282,7 +294,10 @@ function TxSigned ({ className, currentItem, requestAddress }: Props): React.Rea return ( <> - + {(isBusy && flags.isQr) ? (