diff --git a/package.json b/package.json
index 46092e30de..fc57d88964 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "url": "https://github.com/polkadot-js/apps.git"
   },
   "sideEffects": false,
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "workspaces": [
     "packages/*"
   ],
diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json
index 465eb9ba28..ae4f103062 100644
--- a/packages/apps-config/package.json
+++ b/packages/apps-config/package.json
@@ -10,7 +10,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "main": "index.js",
   "dependencies": {
     "@acala-network/type-definitions": "^3.0.2-4",
diff --git a/packages/apps-config/src/packageInfo.ts b/packages/apps-config/src/packageInfo.ts
index df9e8e7ca4..3fcd423a69 100644
--- a/packages/apps-config/src/packageInfo.ts
+++ b/packages/apps-config/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/apps-config', version: '0.98.2-42' };
+export const packageInfo = { name: '@polkadot/apps-config', version: '0.98.2-44' };
diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json
index d9483ff381..bf7144e037 100644
--- a/packages/apps-electron/package.json
+++ b/packages/apps-electron/package.json
@@ -10,12 +10,12 @@
     "url": "https://github.com/polkadot-js/apps.git"
   },
   "sideEffects": false,
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/core": "^7.16.0",
     "@babel/polyfill": "^7.12.1",
     "@polkadot/dev": "^0.63.26",
-    "@polkadot/react-components": "^0.98.2-42",
+    "@polkadot/react-components": "^0.98.2-44",
     "electron-log": "^4.4.1",
     "electron-updater": "^4.6.1"
   },
diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json
index 5da2f112da..3622181f38 100644
--- a/packages/apps-routing/package.json
+++ b/packages/apps-routing/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0"
   }
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 941351c460..ce437d06f7 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -11,20 +11,20 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/core": "^7.16.0",
     "@babel/polyfill": "^7.12.1",
     "@babel/runtime": "^7.16.0",
-    "@polkadot/apps-config": "^0.98.2-42",
-    "@polkadot/apps-routing": "^0.98.2-42",
+    "@polkadot/apps-config": "^0.98.2-44",
+    "@polkadot/apps-routing": "^0.98.2-44",
     "@polkadot/dev": "^0.63.26",
-    "@polkadot/react-api": "^0.98.2-42",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-hooks": "^0.98.2-42",
-    "@polkadot/react-params": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42",
-    "@polkadot/react-signer": "^0.98.2-42",
+    "@polkadot/react-api": "^0.98.2-44",
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-hooks": "^0.98.2-44",
+    "@polkadot/react-params": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44",
+    "@polkadot/react-signer": "^0.98.2-44",
     "punycode": "^2.1.1",
     "query-string": "^7.0.1"
   },
diff --git a/packages/apps/src/packageInfo.ts b/packages/apps/src/packageInfo.ts
index 2ec97c6a47..1072f2b0b9 100644
--- a/packages/apps/src/packageInfo.ts
+++ b/packages/apps/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/apps', version: '0.98.2-42' };
+export const packageInfo = { name: '@polkadot/apps', version: '0.98.2-44' };
diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json
index ad0467604e..c1ea17d1b7 100644
--- a/packages/page-accounts/package.json
+++ b/packages/page-accounts/package.json
@@ -11,16 +11,16 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
     "@polkadot/phishing": "^0.6.402",
-    "@polkadot/react-components": "^0.98.2-42",
+    "@polkadot/react-components": "^0.98.2-44",
     "@polkadot/vanitygen": "^0.48.2",
     "detect-browser": "^5.2.1",
     "file-saver": "^2.0.5"
   },
   "devDependencies": {
-    "@polkadot/test-support": "0.98.2-42"
+    "@polkadot/test-support": "0.98.2-44"
   }
 }
diff --git a/packages/page-addresses/package.json b/packages/page-addresses/package.json
index a9729a3069..4da8b0de8c 100644
--- a/packages/page-addresses/package.json
+++ b/packages/page-addresses/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
+    "@polkadot/react-components": "^0.98.2-44",
     "file-saver": "^2.0.5"
   },
   "devDependencies": {
diff --git a/packages/page-assets/package.json b/packages/page-assets/package.json
index f23c20d287..c8b6a036d8 100644
--- a/packages/page-assets/package.json
+++ b/packages/page-assets/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-bounties/package.json b/packages/page-bounties/package.json
index 9ffbfb8c3c..8ad81feff3 100644
--- a/packages/page-bounties/package.json
+++ b/packages/page-bounties/package.json
@@ -11,12 +11,12 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   },
   "devDependencies": {
-    "@polkadot/test-support": "0.98.2-42"
+    "@polkadot/test-support": "0.98.2-44"
   }
 }
diff --git a/packages/page-calendar/package.json b/packages/page-calendar/package.json
index 9a455fbd74..cf71cbe751 100644
--- a/packages/page-calendar/package.json
+++ b/packages/page-calendar/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-claims/package.json b/packages/page-claims/package.json
index bf182183e2..30f086e473 100644
--- a/packages/page-claims/package.json
+++ b/packages/page-claims/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
+    "@polkadot/react-components": "^0.98.2-44",
     "secp256k1": "^3.8.0"
   }
 }
diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json
index be2a0f5914..d927c55793 100644
--- a/packages/page-contracts/package.json
+++ b/packages/page-contracts/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
     "@polkadot/api-contract": "^6.6.2-14"
diff --git a/packages/page-council/package.json b/packages/page-council/package.json
index 5845448ea4..6dc9fa9d6f 100644
--- a/packages/page-council/package.json
+++ b/packages/page-council/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44"
   }
 }
diff --git a/packages/page-democracy/package.json b/packages/page-democracy/package.json
index 136eee7130..26e8f7b773 100644
--- a/packages/page-democracy/package.json
+++ b/packages/page-democracy/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44"
   }
 }
diff --git a/packages/page-explorer/package.json b/packages/page-explorer/package.json
index 7f6db55a36..b667107a02 100644
--- a/packages/page-explorer/package.json
+++ b/packages/page-explorer/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-extrinsics/package.json b/packages/page-extrinsics/package.json
index ed5026dce2..e53dd0a1d7 100644
--- a/packages/page-extrinsics/package.json
+++ b/packages/page-extrinsics/package.json
@@ -11,11 +11,11 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-params": "^0.98.2-42",
-    "@polkadot/react-signer": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-params": "^0.98.2-44",
+    "@polkadot/react-signer": "^0.98.2-44"
   }
 }
diff --git a/packages/page-gilt/package.json b/packages/page-gilt/package.json
index 5694f884c6..8f60f86e92 100644
--- a/packages/page-gilt/package.json
+++ b/packages/page-gilt/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-js/package.json b/packages/page-js/package.json
index 8018ce8511..4a63bf5dc8 100644
--- a/packages/page-js/package.json
+++ b/packages/page-js/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-membership/package.json b/packages/page-membership/package.json
index 6fa55616c5..50cdca0ab7 100644
--- a/packages/page-membership/package.json
+++ b/packages/page-membership/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44"
   }
 }
diff --git a/packages/page-parachains/package.json b/packages/page-parachains/package.json
index b5cba20b74..e951b4fa55 100644
--- a/packages/page-parachains/package.json
+++ b/packages/page-parachains/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44"
   }
 }
diff --git a/packages/page-poll/package.json b/packages/page-poll/package.json
index 37e7c64c67..feab9d18e3 100644
--- a/packages/page-poll/package.json
+++ b/packages/page-poll/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-rpc/package.json b/packages/page-rpc/package.json
index 0418c57b9d..1e9a1eab5b 100644
--- a/packages/page-rpc/package.json
+++ b/packages/page-rpc/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-settings/package.json b/packages/page-settings/package.json
index caf6abd8a7..69163d7af5 100644
--- a/packages/page-settings/package.json
+++ b/packages/page-settings/package.json
@@ -11,12 +11,12 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/apps-config": "^0.98.2-42",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42",
+    "@polkadot/apps-config": "^0.98.2-44",
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44",
     "query-string": "^7.0.1"
   }
 }
diff --git a/packages/page-signing/package.json b/packages/page-signing/package.json
index f9d18ffebc..be6b1d50bb 100644
--- a/packages/page-signing/package.json
+++ b/packages/page-signing/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-society/package.json b/packages/page-society/package.json
index 74257315e3..d97f3655b5 100644
--- a/packages/page-society/package.json
+++ b/packages/page-society/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-staking/package.json b/packages/page-staking/package.json
index 0dcc29e917..22ce1c1e25 100644
--- a/packages/page-staking/package.json
+++ b/packages/page-staking/package.json
@@ -11,11 +11,11 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/app-explorer": "^0.98.2-42",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42"
+    "@polkadot/app-explorer": "^0.98.2-44",
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44"
   }
 }
diff --git a/packages/page-storage/package.json b/packages/page-storage/package.json
index d14d6ae27b..bb737e16e6 100644
--- a/packages/page-storage/package.json
+++ b/packages/page-storage/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-params": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-params": "^0.98.2-44"
   }
 }
diff --git a/packages/page-sudo/package.json b/packages/page-sudo/package.json
index fd5a30c3ce..ac0f213756 100644
--- a/packages/page-sudo/package.json
+++ b/packages/page-sudo/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/page-tech-comm/package.json b/packages/page-tech-comm/package.json
index c744f35f5a..ea599a6858 100644
--- a/packages/page-tech-comm/package.json
+++ b/packages/page-tech-comm/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44"
   }
 }
diff --git a/packages/page-treasury/package.json b/packages/page-treasury/package.json
index 7946ba2771..833c449d81 100644
--- a/packages/page-treasury/package.json
+++ b/packages/page-treasury/package.json
@@ -11,10 +11,10 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42",
-    "@polkadot/react-query": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44",
+    "@polkadot/react-query": "^0.98.2-44"
   }
 }
diff --git a/packages/react-api/package.json b/packages/react-api/package.json
index 42263dd1e0..ea7f84371d 100644
--- a/packages/react-api/package.json
+++ b/packages/react-api/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
     "@polkadot/api": "^6.6.2-14",
diff --git a/packages/react-components/package.json b/packages/react-components/package.json
index 3d90a3a8bf..64f8f894c8 100644
--- a/packages/react-components/package.json
+++ b/packages/react-components/package.json
@@ -11,17 +11,17 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.1.16",
     "@polkadot/keyring": "^7.7.2-5",
-    "@polkadot/react-api": "^0.98.2-42",
+    "@polkadot/react-api": "^0.98.2-44",
     "@polkadot/react-identicon": "^0.86.4-0",
     "@polkadot/react-qr": "^0.86.4-0",
-    "@polkadot/react-query": "^0.98.2-42",
+    "@polkadot/react-query": "^0.98.2-44",
     "@polkadot/ui-keyring": "^0.86.4-0",
     "@polkadot/ui-settings": "^0.86.4-0",
     "@polkadot/util": "^7.7.2-5",
diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json
index 46b62b6b0a..756a119579 100644
--- a/packages/react-hooks/package.json
+++ b/packages/react-hooks/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0"
   }
diff --git a/packages/react-params/package.json b/packages/react-params/package.json
index 04a15da57d..11c7b4d608 100644
--- a/packages/react-params/package.json
+++ b/packages/react-params/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/react-params/src/Param/findComponent.ts b/packages/react-params/src/Param/findComponent.ts
index 60a7d537dd..4ea322219b 100644
--- a/packages/react-params/src/Param/findComponent.ts
+++ b/packages/react-params/src/Param/findComponent.ts
@@ -85,11 +85,11 @@ const components: ComponentMap = componentDef.reduce((components, { c, t }): Com
 
 const warnList: string[] = [];
 
-function fromDef ({ displayName, info, lookupName, sub, type, typeName }: TypeDef): string {
-  const nameOverride = displayName || typeName;
+function fromDef ({ displayName, info, lookupName, sub, type }: TypeDef): string {
+  // const nameOverride = displayName || typeName;
 
-  if (nameOverride && SPECIAL_TYPES.includes(nameOverride)) {
-    return nameOverride;
+  if (displayName && SPECIAL_TYPES.includes(displayName)) {
+    return displayName;
   } else if (type.endsWith('RuntimeSessionKeys')) {
     return 'RuntimeSessionKeys';
   }
diff --git a/packages/react-query/package.json b/packages/react-query/package.json
index c1131700db..2aaba8dc1f 100644
--- a/packages/react-query/package.json
+++ b/packages/react-query/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0"
   }
diff --git a/packages/react-signer/package.json b/packages/react-signer/package.json
index 0d3921f8d2..8335d0ab02 100644
--- a/packages/react-signer/package.json
+++ b/packages/react-signer/package.json
@@ -11,9 +11,9 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@babel/runtime": "^7.16.0",
-    "@polkadot/react-components": "^0.98.2-42"
+    "@polkadot/react-components": "^0.98.2-44"
   }
 }
diff --git a/packages/test-support/package.json b/packages/test-support/package.json
index 543579f847..2e9791b3e4 100644
--- a/packages/test-support/package.json
+++ b/packages/test-support/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.98.2-42",
+  "version": "0.98.2-44",
   "dependencies": {
     "@testing-library/react": "^12.1.2",
     "testcontainers": "^7.21.0"
diff --git a/yarn.lock b/yarn.lock
index 28259a9bc9..f4693ad46f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2566,8 +2566,8 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.16.0
     "@polkadot/phishing": ^0.6.402
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/test-support": 0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/test-support": 0.98.2-44
     "@polkadot/vanitygen": ^0.48.2
     detect-browser: ^5.2.1
     file-saver: ^2.0.5
@@ -2579,7 +2579,7 @@ __metadata:
   resolution: "@polkadot/app-addresses@workspace:packages/page-addresses"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
     "@testing-library/react": ^12.1.2
     file-saver: ^2.0.5
     testcontainers: ^7.21.0
@@ -2591,7 +2591,7 @@ __metadata:
   resolution: "@polkadot/app-assets@workspace:packages/page-assets"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2600,8 +2600,8 @@ __metadata:
   resolution: "@polkadot/app-bounties@workspace:packages/page-bounties"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/test-support": 0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/test-support": 0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2610,7 +2610,7 @@ __metadata:
   resolution: "@polkadot/app-calendar@workspace:packages/page-calendar"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2619,7 +2619,7 @@ __metadata:
   resolution: "@polkadot/app-claims@workspace:packages/page-claims"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
     secp256k1: ^3.8.0
   languageName: unknown
   linkType: soft
@@ -2638,8 +2638,8 @@ __metadata:
   resolution: "@polkadot/app-council@workspace:packages/page-council"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2648,17 +2648,17 @@ __metadata:
   resolution: "@polkadot/app-democracy@workspace:packages/page-democracy"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
-"@polkadot/app-explorer@^0.98.2-42, @polkadot/app-explorer@workspace:packages/page-explorer":
+"@polkadot/app-explorer@^0.98.2-44, @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.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2667,9 +2667,9 @@ __metadata:
   resolution: "@polkadot/app-extrinsics@workspace:packages/page-extrinsics"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-params": ^0.98.2-42
-    "@polkadot/react-signer": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-params": ^0.98.2-44
+    "@polkadot/react-signer": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2678,7 +2678,7 @@ __metadata:
   resolution: "@polkadot/app-gilt@workspace:packages/page-gilt"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2687,7 +2687,7 @@ __metadata:
   resolution: "@polkadot/app-js@workspace:packages/page-js"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2696,8 +2696,8 @@ __metadata:
   resolution: "@polkadot/app-membership@workspace:packages/page-membership"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2706,8 +2706,8 @@ __metadata:
   resolution: "@polkadot/app-parachains@workspace:packages/page-parachains"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2716,7 +2716,7 @@ __metadata:
   resolution: "@polkadot/app-poll@workspace:packages/page-poll"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2725,7 +2725,7 @@ __metadata:
   resolution: "@polkadot/app-rpc@workspace:packages/page-rpc"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2734,9 +2734,9 @@ __metadata:
   resolution: "@polkadot/app-settings@workspace:packages/page-settings"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/apps-config": ^0.98.2-42
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/apps-config": ^0.98.2-44
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
     query-string: ^7.0.1
   languageName: unknown
   linkType: soft
@@ -2746,7 +2746,7 @@ __metadata:
   resolution: "@polkadot/app-signing@workspace:packages/page-signing"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2755,7 +2755,7 @@ __metadata:
   resolution: "@polkadot/app-society@workspace:packages/page-society"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2764,9 +2764,9 @@ __metadata:
   resolution: "@polkadot/app-staking@workspace:packages/page-staking"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/app-explorer": ^0.98.2-42
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/app-explorer": ^0.98.2-44
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2775,8 +2775,8 @@ __metadata:
   resolution: "@polkadot/app-storage@workspace:packages/page-storage"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-params": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-params": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2785,7 +2785,7 @@ __metadata:
   resolution: "@polkadot/app-sudo@workspace:packages/page-sudo"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2794,8 +2794,8 @@ __metadata:
   resolution: "@polkadot/app-tech-comm@workspace:packages/page-tech-comm"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -2804,12 +2804,12 @@ __metadata:
   resolution: "@polkadot/app-treasury@workspace:packages/page-treasury"
   dependencies:
     "@babel/runtime": ^7.16.0
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
-"@polkadot/apps-config@^0.98.2-42, @polkadot/apps-config@workspace:packages/apps-config":
+"@polkadot/apps-config@^0.98.2-44, @polkadot/apps-config@workspace:packages/apps-config":
   version: 0.0.0-use.local
   resolution: "@polkadot/apps-config@workspace:packages/apps-config"
   dependencies:
@@ -2850,7 +2850,7 @@ __metadata:
     "@babel/core": ^7.16.0
     "@babel/polyfill": ^7.12.1
     "@polkadot/dev": ^0.63.26
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
     "@types/react-dom": ^17.0.11
     "@types/tmp": ^0.2.2
     babel-loader: ^8.2.3
@@ -2866,7 +2866,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/apps-routing@^0.98.2-42, @polkadot/apps-routing@workspace:packages/apps-routing":
+"@polkadot/apps-routing@^0.98.2-44, @polkadot/apps-routing@workspace:packages/apps-routing":
   version: 0.0.0-use.local
   resolution: "@polkadot/apps-routing@workspace:packages/apps-routing"
   dependencies:
@@ -2881,15 +2881,15 @@ __metadata:
     "@babel/core": ^7.16.0
     "@babel/polyfill": ^7.12.1
     "@babel/runtime": ^7.16.0
-    "@polkadot/apps-config": ^0.98.2-42
-    "@polkadot/apps-routing": ^0.98.2-42
+    "@polkadot/apps-config": ^0.98.2-44
+    "@polkadot/apps-routing": ^0.98.2-44
     "@polkadot/dev": ^0.63.26
-    "@polkadot/react-api": ^0.98.2-42
-    "@polkadot/react-components": ^0.98.2-42
-    "@polkadot/react-hooks": ^0.98.2-42
-    "@polkadot/react-params": ^0.98.2-42
-    "@polkadot/react-query": ^0.98.2-42
-    "@polkadot/react-signer": ^0.98.2-42
+    "@polkadot/react-api": ^0.98.2-44
+    "@polkadot/react-components": ^0.98.2-44
+    "@polkadot/react-hooks": ^0.98.2-44
+    "@polkadot/react-params": ^0.98.2-44
+    "@polkadot/react-query": ^0.98.2-44
+    "@polkadot/react-signer": ^0.98.2-44
     "@types/punycode": ^2.1.0
     assert: ^2.0.0
     babel-loader: ^8.2.3
@@ -3116,7 +3116,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/react-api@^0.98.2-42, @polkadot/react-api@workspace:packages/react-api":
+"@polkadot/react-api@^0.98.2-44, @polkadot/react-api@workspace:packages/react-api":
   version: 0.0.0-use.local
   resolution: "@polkadot/react-api@workspace:packages/react-api"
   dependencies:
@@ -3130,7 +3130,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/react-components@^0.98.2-42, @polkadot/react-components@workspace:packages/react-components":
+"@polkadot/react-components@^0.98.2-44, @polkadot/react-components@workspace:packages/react-components":
   version: 0.0.0-use.local
   resolution: "@polkadot/react-components@workspace:packages/react-components"
   dependencies:
@@ -3139,10 +3139,10 @@ __metadata:
     "@fortawesome/free-solid-svg-icons": ^5.15.4
     "@fortawesome/react-fontawesome": ^0.1.16
     "@polkadot/keyring": ^7.7.2-5
-    "@polkadot/react-api": ^0.98.2-42
+    "@polkadot/react-api": ^0.98.2-44
     "@polkadot/react-identicon": ^0.86.4-0
     "@polkadot/react-qr": ^0.86.4-0
-    "@polkadot/react-query": ^0.98.2-42
+    "@polkadot/react-query": ^0.98.2-44
     "@polkadot/ui-keyring": ^0.86.4-0
     "@polkadot/ui-settings": ^0.86.4-0
     "@polkadot/util": ^7.7.2-5
@@ -3173,7 +3173,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/react-hooks@^0.98.2-42, @polkadot/react-hooks@workspace:packages/react-hooks":
+"@polkadot/react-hooks@^0.98.2-44, @polkadot/react-hooks@workspace:packages/react-hooks":
   version: 0.0.0-use.local
   resolution: "@polkadot/react-hooks@workspace:packages/react-hooks"
   dependencies:
@@ -3208,12 +3208,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/react-params@^0.98.2-42, @polkadot/react-params@workspace:packages/react-params":
+"@polkadot/react-params@^0.98.2-44, @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.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -3237,7 +3237,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/react-query@^0.98.2-42, @polkadot/react-query@workspace:packages/react-query":
+"@polkadot/react-query@^0.98.2-44, @polkadot/react-query@workspace:packages/react-query":
   version: 0.0.0-use.local
   resolution: "@polkadot/react-query@workspace:packages/react-query"
   dependencies:
@@ -3245,12 +3245,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/react-signer@^0.98.2-42, @polkadot/react-signer@workspace:packages/react-signer":
+"@polkadot/react-signer@^0.98.2-44, @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.16.0
-    "@polkadot/react-components": ^0.98.2-42
+    "@polkadot/react-components": ^0.98.2-44
   languageName: unknown
   linkType: soft
 
@@ -3299,7 +3299,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/test-support@0.98.2-42, @polkadot/test-support@workspace:packages/test-support":
+"@polkadot/test-support@0.98.2-44, @polkadot/test-support@workspace:packages/test-support":
   version: 0.0.0-use.local
   resolution: "@polkadot/test-support@workspace:packages/test-support"
   dependencies: