diff --git a/package.json b/package.json index 3f967398eb..a64b77e8b7 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,11 @@ "afterSign": "electron-builder-notarize" }, "resolutions": { - "@polkadot/api": "^2.4.2-16", - "@polkadot/api-contract": "^2.4.2-16", + "@polkadot/api": "^2.4.2-20", + "@polkadot/api-contract": "^2.4.2-20", "@polkadot/keyring": "^3.6.2-12", "@polkadot/networks": "^3.6.2-12", - "@polkadot/types": "^2.4.2-16", + "@polkadot/types": "^2.4.2-20", "@polkadot/util": "^3.6.2-12", "@polkadot/util-crypto": "^3.6.2-12", "@polkadot/wasm-crypto": "^1.4.1", diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json index 77e36eb808..0abda738d0 100644 --- a/packages/page-accounts/package.json +++ b/packages/page-accounts/package.json @@ -13,7 +13,7 @@ "dependencies": { "@babel/runtime": "^7.12.1", "@polkadot/react-components": "^0.64.2-6", - "@polkadot/vanitygen": "^0.22.2-6", + "@polkadot/vanitygen": "^0.22.2-7", "detect-browser": "^5.2.0", "file-saver": "^2.0.2" }, diff --git a/packages/page-addresses/package.json b/packages/page-addresses/package.json index c636ecb0fe..3abebb9cfa 100644 --- a/packages/page-addresses/package.json +++ b/packages/page-addresses/package.json @@ -13,7 +13,7 @@ "dependencies": { "@babel/runtime": "^7.12.1", "@polkadot/react-components": "^0.64.2-6", - "@polkadot/vanitygen": "^0.22.2-6", + "@polkadot/vanitygen": "^0.22.2-7", "detect-browser": "^5.2.0", "file-saver": "^2.0.2" }, diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json index 9d4e2677a1..e87a282d25 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.12.1", - "@polkadot/api-contract": "^2.4.2-16" + "@polkadot/api-contract": "^2.4.2-20" } } diff --git a/packages/page-contracts/src/Contracts/Call.tsx b/packages/page-contracts/src/Contracts/Call.tsx index 59ccbb241d..1b7b7e66ac 100644 --- a/packages/page-contracts/src/Contracts/Call.tsx +++ b/packages/page-contracts/src/Contracts/Call.tsx @@ -63,9 +63,9 @@ function Call ({ className = '', contract, messageIndex, onCallResult, onChangeM contract .read(message, message.isPayable ? dbValue : 0, -1, ...dbParams) .send(accountId) - .then(({ result }) => setEstimatedWeight( - result.isSuccess - ? result.asSuccess.gasConsumed + .then(({ gasConsumed, result }) => setEstimatedWeight( + result.isOk + ? gasConsumed : null )) .catch(() => setEstimatedWeight(null)); diff --git a/packages/page-contracts/src/Contracts/Outcome.tsx b/packages/page-contracts/src/Contracts/Outcome.tsx index 8353a4bf92..d8218c87e0 100644 --- a/packages/page-contracts/src/Contracts/Outcome.tsx +++ b/packages/page-contracts/src/Contracts/Outcome.tsx @@ -22,7 +22,7 @@ function Outcome ({ className = '', onClear, outcome: { from, message, output, p } - value={valueToText('Text', output)} + value={valueToText('Text', result.isOk ? output : result)} />