diff --git a/package.json b/package.json
index 5e29df3aeb..61de29cc82 100644
--- a/package.json
+++ b/package.json
@@ -33,12 +33,12 @@
"afterSign": "electron-builder-notarize"
},
"resolutions": {
- "@polkadot/api": "^1.31.0-beta.9",
- "@polkadot/api-contract": "^1.31.0-beta.9",
- "@polkadot/keyring": "^3.4.0-beta.2",
- "@polkadot/types": "^1.31.0-beta.9",
- "@polkadot/util": "^3.4.0-beta.2",
- "@polkadot/util-crypto": "^3.4.0-beta.2",
+ "@polkadot/api": "^1.31.0-beta.11",
+ "@polkadot/api-contract": "^1.31.0-beta.11",
+ "@polkadot/keyring": "^3.4.0-beta.3",
+ "@polkadot/types": "^1.31.0-beta.11",
+ "@polkadot/util": "^3.4.0-beta.3",
+ "@polkadot/util-crypto": "^3.4.0-beta.3",
"@polkadot/wasm-crypto": "^1.4.1",
"babel-core": "^7.0.0-bridge.0"
},
diff --git a/packages/page-accounts/src/Accounts/Account.tsx b/packages/page-accounts/src/Accounts/Account.tsx
index 09a305af5c..f3be240f98 100644
--- a/packages/page-accounts/src/Accounts/Account.tsx
+++ b/packages/page-accounts/src/Accounts/Account.tsx
@@ -108,6 +108,7 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
useEffect((): void => {
if (balancesAll) {
setBalance(address, balancesAll.freeBalance.add(balancesAll.reservedBalance));
+
api.api.tx.vesting?.vest && setVestingTx(() =>
balancesAll.vestingLocked.isZero()
? null
@@ -120,7 +121,7 @@ function Account ({ account: { address, meta }, className = '', delegation, filt
bestNumber && democracyLocks && setUnlockableIds(
(prev): DemocracyUnlockable => {
const ids = democracyLocks
- .filter(({ isFinished, unlockAt }) => isFinished && bestNumber.gt(unlockAt))
+ .filter(({ balance, isFinished, unlockAt }) => isFinished && (balance.isMax() || bestNumber.gt(unlockAt)))
.map(({ referendumId }) => referendumId);
if (JSON.stringify(prev.ids) === JSON.stringify(ids)) {
diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json
index 0b6b2f02cd..1895c649a1 100644
--- a/packages/page-contracts/package.json
+++ b/packages/page-contracts/package.json
@@ -12,6 +12,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.11.2",
- "@polkadot/api-contract": "^1.31.0-beta.9"
+ "@polkadot/api-contract": "^1.31.0-beta.11"
}
}
diff --git a/packages/react-api/package.json b/packages/react-api/package.json
index a5bfa16112..80f9e69a41 100644
--- a/packages/react-api/package.json
+++ b/packages/react-api/package.json
@@ -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.31.0-beta.9",
+ "@polkadot/api": "^1.31.0-beta.11",
"@polkadot/extension-dapp": "^0.33.0-beta.7",
"rxjs-compat": "^6.6.2"
}
diff --git a/packages/react-components/package.json b/packages/react-components/package.json
index 0968f662b0..a50cacb7b9 100644
--- a/packages/react-components/package.json
+++ b/packages/react-components/package.json
@@ -14,15 +14,15 @@
"@fortawesome/fontawesome-svg-core": "^1.2.30",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@fortawesome/react-fontawesome": "^0.1.11",
- "@polkadot/keyring": "^3.4.0-beta.2",
+ "@polkadot/keyring": "^3.4.0-beta.3",
"@polkadot/react-api": "0.56.0-beta.32",
"@polkadot/react-identicon": "^0.58.0-beta.9",
"@polkadot/react-qr": "^0.58.0-beta.9",
"@polkadot/react-query": "0.56.0-beta.32",
"@polkadot/ui-keyring": "^0.58.0-beta.9",
"@polkadot/ui-settings": "^0.58.0-beta.9",
- "@polkadot/util": "^3.4.0-beta.2",
- "@polkadot/util-crypto": "^3.4.0-beta.2",
+ "@polkadot/util": "^3.4.0-beta.3",
+ "@polkadot/util-crypto": "^3.4.0-beta.3",
"chart.js": "^2.9.3",
"codeflask": "^1.4.1",
"i18next": "^19.7.0",
diff --git a/packages/react-components/src/DemocracyLocks.tsx b/packages/react-components/src/DemocracyLocks.tsx
index 0c61bdcfcd..72bf018202 100644
--- a/packages/react-components/src/DemocracyLocks.tsx
+++ b/packages/react-components/src/DemocracyLocks.tsx
@@ -47,9 +47,9 @@ function groupLocks (t: TFunction, bestNumber: BN, locks: DeriveDemocracyLock[]
.sort((a, b) => a[0].referendumId.cmp(b[0].referendumId))
.sort((a, b) => a[1].cmp(b[1]))
.sort((a, b) => a[0].isFinished === b[0].isFinished ? 0 : (a[0].isFinished ? -1 : 1))
- .reduce((sorted: Entry[], [{ balance, isFinished, referendumId, vote }, blocks]): Entry[] => {
+ .reduce((sorted: Entry[], [{ balance, isDelegated, isFinished, referendumId, vote }, blocks]): Entry[] => {
const isCountdown = blocks.gt(BN_ZERO);
- const header = #{referendumId.toString()} {formatBalance(balance, { forceUnit: '-' })} {vote.conviction.toString()}
;
+ const header = #{referendumId.toString()} {formatBalance(balance, { forceUnit: '-' })} {vote.conviction.toString()}{isDelegated && '/d'}
;
const prev = sorted.length ? sorted[sorted.length - 1] : null;
if (!prev || (isCountdown || (isFinished !== prev.isFinished))) {
diff --git a/yarn.lock b/yarn.lock
index 23d8647302..0ad8c15392 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3066,57 +3066,57 @@ __metadata:
languageName: node
linkType: hard
-"@polkadot/api-contract@npm:^1.31.0-beta.9":
- version: 1.31.0-beta.9
- resolution: "@polkadot/api-contract@npm:1.31.0-beta.9"
+"@polkadot/api-contract@npm:^1.31.0-beta.11":
+ version: 1.31.0-beta.11
+ resolution: "@polkadot/api-contract@npm:1.31.0-beta.11"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/api": 1.31.0-beta.9
- "@polkadot/rpc-core": 1.31.0-beta.9
- "@polkadot/types": 1.31.0-beta.9
- "@polkadot/util": ^3.4.0-beta.1
+ "@polkadot/api": 1.31.0-beta.11
+ "@polkadot/rpc-core": 1.31.0-beta.11
+ "@polkadot/types": 1.31.0-beta.11
+ "@polkadot/util": ^3.4.0-beta.2
bn.js: ^5.1.3
rxjs: ^6.6.2
- checksum: 4a6e109cdcb06b338c5f926bce7dd5d6b3bdc08aaa56c275ccd81b08a78f39eb9b0f83d509ad3cfb50058e364eb33f3b4737b8c9c687affe88a7c106443c44b4
+ checksum: c6fd765b54559804cb1ea7f2b5ee350d02ab31c666406db9ae9788aebe8b3c3389d3db842555fdae4fa13cd899d08730f8b8ce55c8d4ddf8e42a296e96d877ae
languageName: node
linkType: hard
-"@polkadot/api-derive@npm:1.31.0-beta.9":
- version: 1.31.0-beta.9
- resolution: "@polkadot/api-derive@npm:1.31.0-beta.9"
+"@polkadot/api-derive@npm:1.31.0-beta.11":
+ version: 1.31.0-beta.11
+ resolution: "@polkadot/api-derive@npm:1.31.0-beta.11"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/api": 1.31.0-beta.9
- "@polkadot/rpc-core": 1.31.0-beta.9
- "@polkadot/rpc-provider": 1.31.0-beta.9
- "@polkadot/types": 1.31.0-beta.9
- "@polkadot/util": ^3.4.0-beta.1
- "@polkadot/util-crypto": ^3.4.0-beta.1
+ "@polkadot/api": 1.31.0-beta.11
+ "@polkadot/rpc-core": 1.31.0-beta.11
+ "@polkadot/rpc-provider": 1.31.0-beta.11
+ "@polkadot/types": 1.31.0-beta.11
+ "@polkadot/util": ^3.4.0-beta.2
+ "@polkadot/util-crypto": ^3.4.0-beta.2
bn.js: ^5.1.3
memoizee: ^0.4.14
rxjs: ^6.6.2
- checksum: b02bfe09da86f095a8315bfb42e2464fb7589d617f1cfb33d5e76501ba87906538a57e4693c81766480c22d022d6cbe1070158b19159e49005b102d180831e52
+ checksum: e5d27e4cf7365be06673c338a8d9e401ef1710de7942225421de1d6253066124afb91abdbcd956c6f6cd17188341e70bb82367069212242820b9388a5e37e8e1
languageName: node
linkType: hard
-"@polkadot/api@npm:^1.31.0-beta.9":
- version: 1.31.0-beta.9
- resolution: "@polkadot/api@npm:1.31.0-beta.9"
+"@polkadot/api@npm:^1.31.0-beta.11":
+ version: 1.31.0-beta.11
+ resolution: "@polkadot/api@npm:1.31.0-beta.11"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/api-derive": 1.31.0-beta.9
- "@polkadot/keyring": ^3.4.0-beta.1
- "@polkadot/metadata": 1.31.0-beta.9
- "@polkadot/rpc-core": 1.31.0-beta.9
- "@polkadot/rpc-provider": 1.31.0-beta.9
- "@polkadot/types": 1.31.0-beta.9
- "@polkadot/types-known": 1.31.0-beta.9
- "@polkadot/util": ^3.4.0-beta.1
- "@polkadot/util-crypto": ^3.4.0-beta.1
+ "@polkadot/api-derive": 1.31.0-beta.11
+ "@polkadot/keyring": ^3.4.0-beta.2
+ "@polkadot/metadata": 1.31.0-beta.11
+ "@polkadot/rpc-core": 1.31.0-beta.11
+ "@polkadot/rpc-provider": 1.31.0-beta.11
+ "@polkadot/types": 1.31.0-beta.11
+ "@polkadot/types-known": 1.31.0-beta.11
+ "@polkadot/util": ^3.4.0-beta.2
+ "@polkadot/util-crypto": ^3.4.0-beta.2
bn.js: ^5.1.3
eventemitter3: ^4.0.6
rxjs: ^6.6.2
- checksum: cf9cb347d56ddb7733cf87b2ef02cad90fe463ce24202820c80a4f9380bae9cfaf21c716eeca33dc23d802c502f6a7e95374e28411c37197e9b5a83318f366e5
+ checksum: 9924d411512368d61ec8e9377321d2a5e650787cd01533e3ae4b1a4238f5671ec42b7a352c3def9eef282060aa06844d85419805b730ecd6b7f7108bca6139ae
languageName: node
linkType: hard
@@ -3172,7 +3172,7 @@ __metadata:
resolution: "@polkadot/app-contracts@workspace:packages/page-contracts"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/api-contract": ^1.31.0-beta.9
+ "@polkadot/api-contract": ^1.31.0-beta.11
languageName: unknown
linkType: soft
@@ -3544,28 +3544,28 @@ __metadata:
languageName: node
linkType: hard
-"@polkadot/keyring@npm:^3.4.0-beta.2":
- version: 3.4.0-beta.2
- resolution: "@polkadot/keyring@npm:3.4.0-beta.2"
+"@polkadot/keyring@npm:^3.4.0-beta.3":
+ version: 3.4.0-beta.3
+ resolution: "@polkadot/keyring@npm:3.4.0-beta.3"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/util": 3.4.0-beta.2
- "@polkadot/util-crypto": 3.4.0-beta.2
- checksum: 097bda79c7833a75047d8fd95544e9f0fac118541856a6d199585c29fc84342d982709757f2bf5495d3b8360392a75b54d510d32ea01a669cb41fafeb77a1380
+ "@polkadot/util": 3.4.0-beta.3
+ "@polkadot/util-crypto": 3.4.0-beta.3
+ checksum: 7a350ae55d2a0c4e96f0a4dc65e708c18d74ec43764f47addc1e7fdb25d68284fc049433cf2924fc2d6e2a1d08ac3efe98216f9450b7a54e16a00be69d0e59ac
languageName: node
linkType: hard
-"@polkadot/metadata@npm:1.31.0-beta.9":
- version: 1.31.0-beta.9
- resolution: "@polkadot/metadata@npm:1.31.0-beta.9"
+"@polkadot/metadata@npm:1.31.0-beta.11":
+ version: 1.31.0-beta.11
+ resolution: "@polkadot/metadata@npm:1.31.0-beta.11"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/types": 1.31.0-beta.9
- "@polkadot/types-known": 1.31.0-beta.9
- "@polkadot/util": ^3.4.0-beta.1
- "@polkadot/util-crypto": ^3.4.0-beta.1
+ "@polkadot/types": 1.31.0-beta.11
+ "@polkadot/types-known": 1.31.0-beta.11
+ "@polkadot/util": ^3.4.0-beta.2
+ "@polkadot/util-crypto": ^3.4.0-beta.2
bn.js: ^5.1.3
- checksum: cbc5f812f06b5a970b5f218148e38813e91c35e458961dde11dd3762ce81e35f7e18005824ad119215f1ae866715a47e2bc545eb96f5c49d4c3101f17736200f
+ checksum: 927a5905c55f5f8bed4d06ee07582b7d78cfba17ac378f0592784496af548c478d0af2965d86f26f87ce9665f48623a1a8f495562ac87e7a5f5232edbb526c14
languageName: node
linkType: hard
@@ -3574,7 +3574,7 @@ __metadata:
resolution: "@polkadot/react-api@workspace:packages/react-api"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/api": ^1.31.0-beta.9
+ "@polkadot/api": ^1.31.0-beta.11
"@polkadot/extension-dapp": ^0.33.0-beta.7
rxjs-compat: ^6.6.2
languageName: unknown
@@ -3588,15 +3588,15 @@ __metadata:
"@fortawesome/fontawesome-svg-core": ^1.2.30
"@fortawesome/free-solid-svg-icons": ^5.14.0
"@fortawesome/react-fontawesome": ^0.1.11
- "@polkadot/keyring": ^3.4.0-beta.2
+ "@polkadot/keyring": ^3.4.0-beta.3
"@polkadot/react-api": 0.56.0-beta.32
"@polkadot/react-identicon": ^0.58.0-beta.9
"@polkadot/react-qr": ^0.58.0-beta.9
"@polkadot/react-query": 0.56.0-beta.32
"@polkadot/ui-keyring": ^0.58.0-beta.9
"@polkadot/ui-settings": ^0.58.0-beta.9
- "@polkadot/util": ^3.4.0-beta.2
- "@polkadot/util-crypto": ^3.4.0-beta.2
+ "@polkadot/util": ^3.4.0-beta.3
+ "@polkadot/util-crypto": ^3.4.0-beta.3
"@types/codeflask": ^1.4.1
chart.js: ^2.9.3
codeflask: ^1.4.1
@@ -3697,35 +3697,35 @@ __metadata:
languageName: unknown
linkType: soft
-"@polkadot/rpc-core@npm:1.31.0-beta.9":
- version: 1.31.0-beta.9
- resolution: "@polkadot/rpc-core@npm:1.31.0-beta.9"
+"@polkadot/rpc-core@npm:1.31.0-beta.11":
+ version: 1.31.0-beta.11
+ resolution: "@polkadot/rpc-core@npm:1.31.0-beta.11"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/metadata": 1.31.0-beta.9
- "@polkadot/rpc-provider": 1.31.0-beta.9
- "@polkadot/types": 1.31.0-beta.9
- "@polkadot/util": ^3.4.0-beta.1
+ "@polkadot/metadata": 1.31.0-beta.11
+ "@polkadot/rpc-provider": 1.31.0-beta.11
+ "@polkadot/types": 1.31.0-beta.11
+ "@polkadot/util": ^3.4.0-beta.2
memoizee: ^0.4.14
rxjs: ^6.6.2
- checksum: cfa9d9613529e5e4cbf856c2c3f70076aef566f0244e0f525897b3219b33af51f7d245e1c0f6ceb799a716940e5967d9e26d4f5ba8fde2dfab7cd75830fabe4c
+ checksum: 7b39832e5e95206200894f7fd66c7cc9d0a776985142c506bc064f7a85100385db6f238bd84befde6086c4aa0fd50474d4815d7fbc9fc2e537a94c528ac381a8
languageName: node
linkType: hard
-"@polkadot/rpc-provider@npm:1.31.0-beta.9":
- version: 1.31.0-beta.9
- resolution: "@polkadot/rpc-provider@npm:1.31.0-beta.9"
+"@polkadot/rpc-provider@npm:1.31.0-beta.11":
+ version: 1.31.0-beta.11
+ resolution: "@polkadot/rpc-provider@npm:1.31.0-beta.11"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/metadata": 1.31.0-beta.9
- "@polkadot/types": 1.31.0-beta.9
- "@polkadot/util": ^3.4.0-beta.1
- "@polkadot/util-crypto": ^3.4.0-beta.1
+ "@polkadot/metadata": 1.31.0-beta.11
+ "@polkadot/types": 1.31.0-beta.11
+ "@polkadot/util": ^3.4.0-beta.2
+ "@polkadot/util-crypto": ^3.4.0-beta.2
bn.js: ^5.1.3
eventemitter3: ^4.0.6
isomorphic-fetch: ^2.2.1
websocket: ^1.0.31
- checksum: 29c97344415acbf1c0c35b9abc073a97c3b34d11bad54ba1e7e0606dbb69cdc128f4126d4186231655dbb50b3a21de07de27ca838232394ceb43f1e7f58c9e56
+ checksum: d5851a8db17320b39230f57ae14614715ffa77d2895dcca08e4ae1387b042e38b922418790ced94c0a8f7bc6a43c8f1cc57a79f561b31ba7aef31ef47d2c2c59
languageName: node
linkType: hard
@@ -3738,31 +3738,31 @@ __metadata:
languageName: node
linkType: hard
-"@polkadot/types-known@npm:1.31.0-beta.9":
- version: 1.31.0-beta.9
- resolution: "@polkadot/types-known@npm:1.31.0-beta.9"
+"@polkadot/types-known@npm:1.31.0-beta.11":
+ version: 1.31.0-beta.11
+ resolution: "@polkadot/types-known@npm:1.31.0-beta.11"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/types": 1.31.0-beta.9
- "@polkadot/util": ^3.4.0-beta.1
+ "@polkadot/types": 1.31.0-beta.11
+ "@polkadot/util": ^3.4.0-beta.2
bn.js: ^5.1.3
- checksum: a37eea3ab372f740b47f76889e73b3d2cb2b123fc8d1c8ed9cda838d2609f10680c942265fdc27f969c715af85c8668fe0b710aaf65ea5ee52895716729a7e7a
+ checksum: e5a31b5f2ce34006b90ed2c28c46585bd4b1ff408c3cb6e65133c455675aded8c7d83ea8ed5e3ac1c1434e542ab0e5ad4754658aa5f1e41a62196a38f546da2c
languageName: node
linkType: hard
-"@polkadot/types@npm:^1.31.0-beta.9":
- version: 1.31.0-beta.9
- resolution: "@polkadot/types@npm:1.31.0-beta.9"
+"@polkadot/types@npm:^1.31.0-beta.11":
+ version: 1.31.0-beta.11
+ resolution: "@polkadot/types@npm:1.31.0-beta.11"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/metadata": 1.31.0-beta.9
- "@polkadot/util": ^3.4.0-beta.1
- "@polkadot/util-crypto": ^3.4.0-beta.1
+ "@polkadot/metadata": 1.31.0-beta.11
+ "@polkadot/util": ^3.4.0-beta.2
+ "@polkadot/util-crypto": ^3.4.0-beta.2
"@types/bn.js": ^4.11.6
bn.js: ^5.1.3
memoizee: ^0.4.14
rxjs: ^6.6.2
- checksum: 38c3e986a6dd999130258209fd5fede67d05c28da132f048c568a1bd5c1a86b0692e23a8ef3c5a9a229c0408114fef8ec2072f1230d8e14c9048593e489219f3
+ checksum: f179977928d0fc62098d86d44702c53c97f26dcad8436fd447b11801987d44dca4f411c0e3929121d189a7ad386bcf14014b0dc0fbdb77bf87033f2e8afef398
languageName: node
linkType: hard
@@ -3814,12 +3814,12 @@ __metadata:
languageName: node
linkType: hard
-"@polkadot/util-crypto@npm:^3.4.0-beta.2":
- version: 3.4.0-beta.2
- resolution: "@polkadot/util-crypto@npm:3.4.0-beta.2"
+"@polkadot/util-crypto@npm:^3.4.0-beta.3":
+ version: 3.4.0-beta.3
+ resolution: "@polkadot/util-crypto@npm:3.4.0-beta.3"
dependencies:
"@babel/runtime": ^7.11.2
- "@polkadot/util": 3.4.0-beta.2
+ "@polkadot/util": 3.4.0-beta.3
"@polkadot/wasm-crypto": ^1.4.1
base-x: ^3.0.8
bip39: ^3.0.2
@@ -3831,13 +3831,13 @@ __metadata:
scryptsy: ^2.1.0
tweetnacl: ^1.0.3
xxhashjs: ^0.2.2
- checksum: 183f02d852bdf4293802074d6970ed3b6fa87d09e189b76771ad6dfc4822175acb2f088213f194d3e37e4361a29419d9469f54eaf8dc50671812d25a406f4cfc
+ checksum: 95608e406991da06634e0093bb700df4de44de527a6c6872c182feeea14239a0fe2bdb68eaa87ff22b6337254b59780cefa8390b6d251eb1909269dbcb49e5c3
languageName: node
linkType: hard
-"@polkadot/util@npm:^3.4.0-beta.2":
- version: 3.4.0-beta.2
- resolution: "@polkadot/util@npm:3.4.0-beta.2"
+"@polkadot/util@npm:^3.4.0-beta.3":
+ version: 3.4.0-beta.3
+ resolution: "@polkadot/util@npm:3.4.0-beta.3"
dependencies:
"@babel/runtime": ^7.11.2
"@types/bn.js": ^4.11.6
@@ -3845,7 +3845,7 @@ __metadata:
camelcase: ^5.3.1
chalk: ^4.1.0
ip-regex: ^4.1.0
- checksum: 157f7235fcdb617e3210bb27a9ea6ea76db433edf53ef95b95daa5e5be496ad1397d9051c10f965102b6d168f349d525de51ad83af4a259f9106fb4835b3be70
+ checksum: 70cf303cb6af3933f99bf52ca1b7eafca91724057d6fa2e2fb45c14aed924fab82c1e5414fcca5f8887b7b16229618aaada059add6702a834910e1d1cfb1f7dc
languageName: node
linkType: hard