From 5b9cf5ba2aa45446eed2bf29bb96f3f53e744b68 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 16 Jun 2020 11:15:11 +0200 Subject: [PATCH] Clear proxy/multisig state (#2963) * Clear old state between use * Patch * Check tx outside multisig call * Set key for modal --- CHANGELOG.md | 2 +- lerna.json | 2 +- package.json | 2 +- packages/apps-config/package.json | 2 +- packages/apps-electron/package.json | 4 +- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 6 +- packages/page-123code/package.json | 4 +- packages/page-accounts/package.json | 4 +- packages/page-claims/package.json | 4 +- packages/page-contracts/package.json | 2 +- packages/page-council/package.json | 6 +- packages/page-dashboard/package.json | 6 +- packages/page-democracy/package.json | 6 +- packages/page-explorer/package.json | 4 +- packages/page-extrinsics/package.json | 8 +- packages/page-generic-asset/package.json | 4 +- packages/page-i18n/package.json | 4 +- packages/page-js/package.json | 4 +- packages/page-parachains/package.json | 6 +- packages/page-settings/package.json | 8 +- packages/page-society/package.json | 4 +- packages/page-staking/package.json | 8 +- packages/page-storage/package.json | 6 +- packages/page-sudo/package.json | 4 +- packages/page-tech-comm/package.json | 6 +- packages/page-toolbox/package.json | 4 +- packages/page-treasury/package.json | 6 +- packages/react-api/package.json | 2 +- packages/react-components/package.json | 6 +- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 4 +- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 4 +- packages/react-signer/src/Address.tsx | 31 ++++---- packages/react-signer/src/index.tsx | 1 + yarn.lock | 96 ++++++++++++------------ 37 files changed, 136 insertions(+), 140 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c90dba37ca..2408976e35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -## 0.45.1 Jun 16, 2020 +## 0.45.2 Jun 16, 2020 - I18n for ja (Thanks to https://github.com/SotaWatanabe) - Ia8n for pt (thanks to https://github.com/laurogripa) diff --git a/lerna.json b/lerna.json index c1885b9a2e..d11730df56 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.45.1" + "version": "0.45.2" } diff --git a/package.json b/package.json index 7bc39b0e7b..9d448998f9 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.45.1", + "version": "0.45.2", "license": "Apache-2", "private": true, "homepage": ".", diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 80973342f2..75b92953a5 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.45.1", + "version": "0.45.2", "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 91a62969dc..bb99cda8e1 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -2,11 +2,11 @@ "name": "@polkadot/apps-electron", "main": "index.js", "private": true, - "version": "0.45.1", + "version": "0.45.2", "dependencies": { "@babel/polyfill": "^7.10.1", "@polkadot/dev": "^0.55.10", - "@polkadot/react-components": "0.45.1", + "@polkadot/react-components": "0.45.2", "electron-updater": "^4.3.1" }, "devDependencies": { diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 43dc88f42b..839a7dedea 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.45.1", + "version": "0.45.2", "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 821ddf3119..2a85037b06 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/apps", "private": true, - "version": "0.45.1", + "version": "0.45.2", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -16,8 +16,8 @@ "@babel/polyfill": "^7.10.1", "@babel/runtime": "^7.10.2", "@polkadot/dev": "^0.55.10", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-signer": "0.45.1", + "@polkadot/react-components": "0.45.2", + "@polkadot/react-signer": "0.45.2", "query-string": "^6.13.1" }, "devDependencies": { diff --git a/packages/page-123code/package.json b/packages/page-123code/package.json index 59e50130e4..36ae6410f4 100644 --- a/packages/page-123code/package.json +++ b/packages/page-123code/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-123code", "private": true, - "version": "0.45.1", + "version": "0.45.2", "description": "A basic app that shows the ropes on customisation", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json index ff3d223ad7..f0b1313e46 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.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/react-components": "0.45.1", + "@polkadot/react-components": "0.45.2", "@polkadot/react-qr": "^0.54.1", "@polkadot/vanitygen": "^0.14.1", "detect-browser": "^5.1.0", diff --git a/packages/page-claims/package.json b/packages/page-claims/package.json index ca53cd0eb2..89cfc96c5e 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.45.1", + "version": "0.45.2", "description": "An app for claiming Polkadot tokens", "main": "index.js", "scripts": {}, @@ -13,7 +13,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1", + "@polkadot/react-components": "0.45.2", "secp256k1": "^3.8.0" } } diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json index 3531feb57d..8a195161b2 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.45.1", + "version": "0.45.2", "description": "Deployment and management of substrate contracts", "main": "index.js", "scripts": {}, diff --git a/packages/page-council/package.json b/packages/page-council/package.json index e362d7e94c..cc4f93a34a 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.45.1", + "version": "0.45.2", "description": "Council", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-query": "0.45.1" + "@polkadot/react-components": "0.45.2", + "@polkadot/react-query": "0.45.2" } } diff --git a/packages/page-dashboard/package.json b/packages/page-dashboard/package.json index a7de89faf3..221ad632bf 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.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/apps-routing": "0.45.1", - "@polkadot/react-components": "0.45.1" + "@polkadot/apps-routing": "0.45.2", + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-democracy/package.json b/packages/page-democracy/package.json index ccd79c1675..689d58da61 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.45.1", + "version": "0.45.2", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-query": "0.45.1" + "@polkadot/react-components": "0.45.2", + "@polkadot/react-query": "0.45.2" } } diff --git a/packages/page-explorer/package.json b/packages/page-explorer/package.json index 556b104ffc..58621385c2 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.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-extrinsics/package.json b/packages/page-extrinsics/package.json index 7d4a131961..0785a3ee28 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.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-params": "0.45.1", - "@polkadot/react-signer": "0.45.1" + "@polkadot/react-components": "0.45.2", + "@polkadot/react-params": "0.45.2", + "@polkadot/react-signer": "0.45.2" } } diff --git a/packages/page-generic-asset/package.json b/packages/page-generic-asset/package.json index 39a6e5b4ff..212fc068e7 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.45.1", + "version": "0.45.2", "description": "A basic GenericAsset transfer app", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-i18n/package.json b/packages/page-i18n/package.json index 53c5e50d76..6dd2c2c805 100644 --- a/packages/page-i18n/package.json +++ b/packages/page-i18n/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-i18n", "private": true, - "version": "0.45.1", + "version": "0.45.2", "description": "A basic string translayor", "main": "index.js", "scripts": {}, @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-js/package.json b/packages/page-js/package.json index 4813905093..ce6779b6a3 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.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-parachains/package.json b/packages/page-parachains/package.json index e9852a7654..c5702753a2 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.45.1", + "version": "0.45.2", "description": "Parachains", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-query": "0.45.1" + "@polkadot/react-components": "0.45.2", + "@polkadot/react-query": "0.45.2" } } diff --git a/packages/page-settings/package.json b/packages/page-settings/package.json index 962c3a9ee0..a9031a63c3 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.45.1", + "version": "0.45.2", "description": "Settings management", "main": "index.js", "scripts": {}, @@ -12,9 +12,9 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/apps-config": "0.45.1", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-query": "0.45.1", + "@polkadot/apps-config": "0.45.2", + "@polkadot/react-components": "0.45.2", + "@polkadot/react-query": "0.45.2", "query-string": "^6.13.1" } } diff --git a/packages/page-society/package.json b/packages/page-society/package.json index 3ad5651bd2..951c3dc798 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.45.1", + "version": "0.45.2", "description": "A society", "main": "index.js", "scripts": {}, @@ -9,6 +9,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-staking/package.json b/packages/page-staking/package.json index bd20688466..2caa6dec4c 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.45.1", + "version": "0.45.2", "description": "A basic staking app", "main": "index.js", "scripts": {}, @@ -12,8 +12,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/app-explorer": "0.45.1", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-query": "0.45.1" + "@polkadot/app-explorer": "0.45.2", + "@polkadot/react-components": "0.45.2", + "@polkadot/react-query": "0.45.2" } } diff --git a/packages/page-storage/package.json b/packages/page-storage/package.json index 857d0bf099..4723dea2ac 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.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-params": "0.45.1" + "@polkadot/react-components": "0.45.2", + "@polkadot/react-params": "0.45.2" } } diff --git a/packages/page-sudo/package.json b/packages/page-sudo/package.json index ede6493235..9b97646ce8 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.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-tech-comm/package.json b/packages/page-tech-comm/package.json index 0552579b3c..ddcaced083 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.45.1", + "version": "0.45.2", "description": "Council", "main": "index.js", "scripts": {}, @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-query": "0.45.1" + "@polkadot/react-components": "0.45.2", + "@polkadot/react-query": "0.45.2" } } diff --git a/packages/page-toolbox/package.json b/packages/page-toolbox/package.json index 445fd3be3e..364da62656 100644 --- a/packages/page-toolbox/package.json +++ b/packages/page-toolbox/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/app-toolbox", "private": true, - "version": "0.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/page-treasury/package.json b/packages/page-treasury/package.json index b409bb27e0..a81d0c3bb5 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.45.1", + "version": "0.45.2", "description": "A referendum & proposal app", "main": "index.js", "scripts": {}, @@ -13,7 +13,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1", - "@polkadot/react-query": "0.45.1" + "@polkadot/react-components": "0.45.2", + "@polkadot/react-query": "0.45.2" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 0cf0bd5851..6d0cdd5b8c 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-api", - "version": "0.45.1", + "version": "0.45.2", "description": "A collection of RxJs React components the Polkadot JS API", "main": "index.js", "keywords": [ diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 370607aab1..17d6aaf510 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-components", - "version": "0.45.1", + "version": "0.45.2", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ "dependencies": { "@babel/runtime": "^7.10.2", "@polkadot/keyring": "^2.14.1", - "@polkadot/react-api": "0.45.1", + "@polkadot/react-api": "0.45.2", "@polkadot/react-identicon": "^0.54.1", - "@polkadot/react-query": "0.45.1", + "@polkadot/react-query": "0.45.2", "@polkadot/ui-keyring": "^0.54.1", "@polkadot/ui-settings": "^0.54.1", "chart.js": "^2.9.3", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index c971a14a4d..15821e6b43 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-hooks", - "version": "0.45.1", + "version": "0.45.2", "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 6bf91c499d..cad36fb7c0 100644 --- a/packages/react-params/package.json +++ b/packages/react-params/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-params", - "version": "0.45.1", + "version": "0.45.2", "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.10.2", - "@polkadot/react-components": "0.45.1" + "@polkadot/react-components": "0.45.2" } } diff --git a/packages/react-query/package.json b/packages/react-query/package.json index 09af37a3f1..88f4881e07 100644 --- a/packages/react-query/package.json +++ b/packages/react-query/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-query", - "version": "0.45.1", + "version": "0.45.2", "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 9a6d866268..5ce9f1eb24 100644 --- a/packages/react-signer/package.json +++ b/packages/react-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/react-signer", - "version": "0.45.1", + "version": "0.45.2", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/react-components": "0.45.1", + "@polkadot/react-components": "0.45.2", "@polkadot/react-qr": "^0.54.1" } } diff --git a/packages/react-signer/src/Address.tsx b/packages/react-signer/src/Address.tsx index 61484dcc46..a2a45048b2 100644 --- a/packages/react-signer/src/Address.tsx +++ b/packages/react-signer/src/Address.tsx @@ -66,10 +66,10 @@ function filterProxies (tx: SubmittableExtrinsic<'promise'>, proxies: [string, P .map(([address]) => address); } -async function queryForMultisig (api: ApiPromise, requestAddress: string, proxyAddress: string | null, tx?: SubmittableExtrinsic<'promise'>): Promise { +async function queryForMultisig (api: ApiPromise, requestAddress: string, proxyAddress: string | null, tx: SubmittableExtrinsic<'promise'>): Promise { const multiModule = api.tx.multisig ? 'multisig' : 'utility'; - if (tx && isFunction(api.query[multiModule]?.multisigs)) { + if (isFunction(api.query[multiModule]?.multisigs)) { const address = proxyAddress || requestAddress; const { threshold, who } = extractExternal(address); const hash = (proxyAddress ? api.tx.proxy.proxy(requestAddress, null, tx) : tx).method.hash; @@ -96,16 +96,13 @@ async function queryForMultisig (api: ApiPromise, requestAddress: string, proxyA async function queryForProxy (api: ApiPromise, address: string, tx: SubmittableExtrinsic<'promise'>): Promise { if (isFunction(api.query.proxy?.proxies)) { - const [_proxies] = await api.query.proxy.proxies(address); const { isProxied } = extractExternal(address); + const [_proxies] = await api.query.proxy.proxies(address); + const proxies = _proxies.map(([accountId, type]): [string, ProxyType] => [accountId.toString(), type]); + const proxiesFilter = filterProxies(tx, proxies); - if (_proxies.length) { - const proxies = _proxies.map(([accountId, type]): [string, ProxyType] => [accountId.toString(), type]); - const proxiesFilter = filterProxies(tx, proxies); - - return proxiesFilter.length - ? { address, isProxied, proxies, proxiesFilter } - : null; + if (proxiesFilter.length) { + return { address, isProxied, proxies, proxiesFilter }; } } @@ -132,13 +129,12 @@ function Address ({ currentItem, onChange, passwordError, requestAddress }: Prop // proxy for requestor useEffect((): void => { - if (currentItem.extrinsic) { + setProxyInfo(null); + + currentItem.extrinsic && queryForProxy(api, requestAddress, currentItem.extrinsic) .then((info) => mountedRef.current && setProxyInfo(info)) .catch(console.error); - } else { - setProxyInfo(null); - } }, [api, currentItem, mountedRef, requestAddress]); useEffect((): void => { @@ -147,7 +143,9 @@ function Address ({ currentItem, onChange, passwordError, requestAddress }: Prop // multisig useEffect((): void => { - if (extractExternal(proxyAddress || requestAddress).isMultisig) { + setMultInfo(null); + + currentItem.extrinsic && extractExternal(proxyAddress || requestAddress).isMultisig && queryForMultisig(api, requestAddress, proxyAddress, currentItem.extrinsic) .then((info): void => { if (mountedRef.current) { @@ -156,9 +154,6 @@ function Address ({ currentItem, onChange, passwordError, requestAddress }: Prop } }) .catch(console.error); - } else { - setMultInfo(null); - } }, [proxyAddress, api, currentItem, mountedRef, requestAddress]); // address diff --git a/packages/react-signer/src/index.tsx b/packages/react-signer/src/index.tsx index 77f7c17ffe..3a8c247c56 100644 --- a/packages/react-signer/src/index.tsx +++ b/packages/react-signer/src/index.tsx @@ -96,6 +96,7 @@ function Signer ({ children, className = '' }: Props): React.ReactElement {currentItem.isUnsigned diff --git a/yarn.lock b/yarn.lock index 241982c118..2e64ae5175 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3006,7 +3006,7 @@ __metadata: resolution: "@polkadot/app-123code@workspace:packages/page-123code" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3015,7 +3015,7 @@ __metadata: resolution: "@polkadot/app-accounts@workspace:packages/page-accounts" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 "@polkadot/react-qr": ^0.54.1 "@polkadot/vanitygen": ^0.14.1 detect-browser: ^5.1.0 @@ -3028,7 +3028,7 @@ __metadata: resolution: "@polkadot/app-claims@workspace:packages/page-claims" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 secp256k1: ^3.8.0 languageName: unknown linkType: soft @@ -3047,8 +3047,8 @@ __metadata: resolution: "@polkadot/app-council@workspace:packages/page-council" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-query": 0.45.1 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-query": 0.45.2 languageName: unknown linkType: soft @@ -3057,8 +3057,8 @@ __metadata: resolution: "@polkadot/app-dashboard@workspace:packages/page-dashboard" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/apps-routing": 0.45.1 - "@polkadot/react-components": 0.45.1 + "@polkadot/apps-routing": 0.45.2 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3067,17 +3067,17 @@ __metadata: resolution: "@polkadot/app-democracy@workspace:packages/page-democracy" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-query": 0.45.1 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-query": 0.45.2 languageName: unknown linkType: soft -"@polkadot/app-explorer@0.45.1, @polkadot/app-explorer@workspace:packages/page-explorer": +"@polkadot/app-explorer@0.45.2, @polkadot/app-explorer@workspace:packages/page-explorer": version: 0.0.0-use.local resolution: "@polkadot/app-explorer@workspace:packages/page-explorer" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3086,9 +3086,9 @@ __metadata: resolution: "@polkadot/app-extrinsics@workspace:packages/page-extrinsics" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-params": 0.45.1 - "@polkadot/react-signer": 0.45.1 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-params": 0.45.2 + "@polkadot/react-signer": 0.45.2 languageName: unknown linkType: soft @@ -3097,7 +3097,7 @@ __metadata: resolution: "@polkadot/app-generic-asset@workspace:packages/page-generic-asset" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3106,7 +3106,7 @@ __metadata: resolution: "@polkadot/app-i18n@workspace:packages/page-i18n" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3115,7 +3115,7 @@ __metadata: resolution: "@polkadot/app-js@workspace:packages/page-js" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3124,8 +3124,8 @@ __metadata: resolution: "@polkadot/app-parachains@workspace:packages/page-parachains" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-query": 0.45.1 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-query": 0.45.2 languageName: unknown linkType: soft @@ -3134,9 +3134,9 @@ __metadata: resolution: "@polkadot/app-settings@workspace:packages/page-settings" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/apps-config": 0.45.1 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-query": 0.45.1 + "@polkadot/apps-config": 0.45.2 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-query": 0.45.2 query-string: ^6.13.1 languageName: unknown linkType: soft @@ -3146,7 +3146,7 @@ __metadata: resolution: "@polkadot/app-society@workspace:packages/page-society" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3155,9 +3155,9 @@ __metadata: resolution: "@polkadot/app-staking@workspace:packages/page-staking" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/app-explorer": 0.45.1 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-query": 0.45.1 + "@polkadot/app-explorer": 0.45.2 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-query": 0.45.2 languageName: unknown linkType: soft @@ -3166,8 +3166,8 @@ __metadata: resolution: "@polkadot/app-storage@workspace:packages/page-storage" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-params": 0.45.1 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-params": 0.45.2 languageName: unknown linkType: soft @@ -3176,7 +3176,7 @@ __metadata: resolution: "@polkadot/app-sudo@workspace:packages/page-sudo" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3185,8 +3185,8 @@ __metadata: resolution: "@polkadot/app-tech-comm@workspace:packages/page-tech-comm" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-query": 0.45.1 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-query": 0.45.2 languageName: unknown linkType: soft @@ -3195,7 +3195,7 @@ __metadata: resolution: "@polkadot/app-toolbox@workspace:packages/page-toolbox" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3204,12 +3204,12 @@ __metadata: resolution: "@polkadot/app-treasury@workspace:packages/page-treasury" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-query": 0.45.1 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-query": 0.45.2 languageName: unknown linkType: soft -"@polkadot/apps-config@0.45.1, @polkadot/apps-config@workspace:packages/apps-config": +"@polkadot/apps-config@0.45.2, @polkadot/apps-config@workspace:packages/apps-config": version: 0.0.0-use.local resolution: "@polkadot/apps-config@workspace:packages/apps-config" dependencies: @@ -3224,7 +3224,7 @@ __metadata: dependencies: "@babel/polyfill": ^7.10.1 "@polkadot/dev": ^0.55.10 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 "@types/react": ^16.9.36 "@types/react-dom": ^16.9.8 babel-loader: ^8.1.0 @@ -3238,7 +3238,7 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/apps-routing@0.45.1, @polkadot/apps-routing@workspace:packages/apps-routing": +"@polkadot/apps-routing@0.45.2, @polkadot/apps-routing@workspace:packages/apps-routing": version: 0.0.0-use.local resolution: "@polkadot/apps-routing@workspace:packages/apps-routing" dependencies: @@ -3253,8 +3253,8 @@ __metadata: "@babel/polyfill": ^7.10.1 "@babel/runtime": ^7.10.2 "@polkadot/dev": ^0.55.10 - "@polkadot/react-components": 0.45.1 - "@polkadot/react-signer": 0.45.1 + "@polkadot/react-components": 0.45.2 + "@polkadot/react-signer": 0.45.2 babel-loader: ^8.1.0 copy-webpack-plugin: ^6.0.2 css-loader: ^3.6.0 @@ -3410,7 +3410,7 @@ __metadata: languageName: node linkType: hard -"@polkadot/react-api@0.45.1, @polkadot/react-api@workspace:packages/react-api": +"@polkadot/react-api@0.45.2, @polkadot/react-api@workspace:packages/react-api": version: 0.0.0-use.local resolution: "@polkadot/react-api@workspace:packages/react-api" dependencies: @@ -3421,15 +3421,15 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/react-components@0.45.1, @polkadot/react-components@workspace:packages/react-components": +"@polkadot/react-components@0.45.2, @polkadot/react-components@workspace:packages/react-components": version: 0.0.0-use.local resolution: "@polkadot/react-components@workspace:packages/react-components" dependencies: "@babel/runtime": ^7.10.2 "@polkadot/keyring": ^2.14.1 - "@polkadot/react-api": 0.45.1 + "@polkadot/react-api": 0.45.2 "@polkadot/react-identicon": ^0.54.1 - "@polkadot/react-query": 0.45.1 + "@polkadot/react-query": 0.45.2 "@polkadot/ui-keyring": ^0.54.1 "@polkadot/ui-settings": ^0.54.1 "@types/codeflask": ^1.4.1 @@ -3488,12 +3488,12 @@ __metadata: languageName: node linkType: hard -"@polkadot/react-params@0.45.1, @polkadot/react-params@workspace:packages/react-params": +"@polkadot/react-params@0.45.2, @polkadot/react-params@workspace:packages/react-params": version: 0.0.0-use.local resolution: "@polkadot/react-params@workspace:packages/react-params" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 languageName: unknown linkType: soft @@ -3514,7 +3514,7 @@ __metadata: languageName: node linkType: hard -"@polkadot/react-query@0.45.1, @polkadot/react-query@workspace:packages/react-query": +"@polkadot/react-query@0.45.2, @polkadot/react-query@workspace:packages/react-query": version: 0.0.0-use.local resolution: "@polkadot/react-query@workspace:packages/react-query" dependencies: @@ -3522,12 +3522,12 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/react-signer@0.45.1, @polkadot/react-signer@workspace:packages/react-signer": +"@polkadot/react-signer@0.45.2, @polkadot/react-signer@workspace:packages/react-signer": version: 0.0.0-use.local resolution: "@polkadot/react-signer@workspace:packages/react-signer" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/react-components": 0.45.1 + "@polkadot/react-components": 0.45.2 "@polkadot/react-qr": ^0.54.1 languageName: unknown linkType: soft