diff --git a/package.json b/package.json
index 4198dc7e..a0809e52 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,9 @@
     "packages/*"
   ],
   "resolutions": {
-    "@polkadot/api": "^1.32.0-beta.16",
+    "@polkadot/api": "^1.32.0-beta.18",
     "@polkadot/keyring": "^3.4.1",
-    "@polkadot/types": "^1.32.0-beta.16",
+    "@polkadot/types": "^1.32.0-beta.18",
     "@polkadot/util": "^3.4.1",
     "@polkadot/util-crypto": "^3.4.1",
     "babel-core": "^7.0.0-bridge.0",
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@babel/core": "^7.11.5",
     "@polkadot/dev": "^0.55.45",
-    "@polkadot/typegen": "^1.32.0-beta.16",
+    "@polkadot/typegen": "^1.32.0-beta.18",
     "@types/jest": "^26.0.13",
     "copy-webpack-plugin": "^6.1.0",
     "sinon-chrome": "^3.0.1",
diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json
index d915daec..2625c293 100644
--- a/packages/extension-base/package.json
+++ b/packages/extension-base/package.json
@@ -6,7 +6,7 @@
   "license": "Apache-2",
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@polkadot/api": "^1.32.0-beta.16",
+    "@polkadot/api": "^1.32.0-beta.18",
     "@polkadot/extension-inject": "0.33.0-beta.17",
     "@polkadot/keyring": "^3.4.1",
     "@polkadot/ui-keyring": "^0.59.0-beta.0"
diff --git a/packages/extension-ui/src/Popup/Signing/Request.tsx b/packages/extension-ui/src/Popup/Signing/Request.tsx
index f9928352..30150c06 100644
--- a/packages/extension-ui/src/Popup/Signing/Request.tsx
+++ b/packages/extension-ui/src/Popup/Signing/Request.tsx
@@ -19,11 +19,11 @@ import styled from 'styled-components';
 
 interface Props {
   account: AccountJson;
+  buttonText: string;
+  isFirst?: boolean;
   request: RequestSign;
   signId: string;
   url: string;
-  isFirst?: boolean;
-  buttonText?: string;
 }
 
 interface Data {
@@ -134,7 +134,7 @@ export default function Request ({ account: { isExternal }, buttonText, isFirst,
         isDisabled={isLocked === null}
         onClick={_onSignQuick}
       >
-        Sign the transaction
+        {buttonText}
       </Button>
     );
 
diff --git a/packages/extension-ui/src/Popup/Signing/Unlock.tsx b/packages/extension-ui/src/Popup/Signing/Unlock.tsx
index 2b7da584..17a75aa2 100644
--- a/packages/extension-ui/src/Popup/Signing/Unlock.tsx
+++ b/packages/extension-ui/src/Popup/Signing/Unlock.tsx
@@ -7,15 +7,15 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { Button, InputWithLabel } from '../../components';
 
 interface Props {
+  buttonText: string;
   children?: React.ReactNode;
   className?: string;
   error?: string | null;
   isBusy: boolean;
   onSign: (password: string) => Promise<void>;
-  buttonText?: string;
 }
 
-function Unlock ({ buttonText = 'Sign the transaction', children, className, error, isBusy, onSign }: Props): React.ReactElement<Props> {
+function Unlock ({ buttonText, children, className, error, isBusy, onSign }: Props): React.ReactElement<Props> {
   const [ownError, setError] = useState<string | null>();
   const [password, setPassword] = useState('');
 
diff --git a/packages/extension-ui/src/components/Spinner.tsx b/packages/extension-ui/src/components/Spinner.tsx
index f8ad1aa5..f8290be5 100644
--- a/packages/extension-ui/src/components/Spinner.tsx
+++ b/packages/extension-ui/src/components/Spinner.tsx
@@ -29,7 +29,6 @@ export default React.memo(styled(Spinner)`
   left: 50%;
   margin-left: -1.5rem;
   position: absolute;
-  right: 0.75rem;
   width: 3rem;
   z-index:
 `);
diff --git a/yarn.lock b/yarn.lock
index f63a22fb..fe87a364 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2890,42 +2890,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/api-derive@npm:1.32.0-beta.16":
-  version: 1.32.0-beta.16
-  resolution: "@polkadot/api-derive@npm:1.32.0-beta.16"
+"@polkadot/api-derive@npm:1.32.0-beta.18":
+  version: 1.32.0-beta.18
+  resolution: "@polkadot/api-derive@npm:1.32.0-beta.18"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@polkadot/api": 1.32.0-beta.16
-    "@polkadot/rpc-core": 1.32.0-beta.16
-    "@polkadot/rpc-provider": 1.32.0-beta.16
-    "@polkadot/types": 1.32.0-beta.16
+    "@polkadot/api": 1.32.0-beta.18
+    "@polkadot/rpc-core": 1.32.0-beta.18
+    "@polkadot/rpc-provider": 1.32.0-beta.18
+    "@polkadot/types": 1.32.0-beta.18
     "@polkadot/util": ^3.4.1
     "@polkadot/util-crypto": ^3.4.1
     bn.js: ^5.1.3
     memoizee: ^0.4.14
     rxjs: ^6.6.2
-  checksum: 31fecf459b63df84396f127410f20af091d65791df43fac513dedadc08c10b425ee4a570c906ca613f72e98e3c1c95ba5e8745160a91b3005155911e8a0eca17
+  checksum: 9d6ebb0ed02a0f969aa82192acad567c7907be23d568c8aa1d8ce84f5d4638e66e6a3c0cb3f856cc993d66a98a407c20cc4c7f06b233b9f2b1ad2cd24d5594ab
   languageName: node
   linkType: hard
 
-"@polkadot/api@npm:^1.32.0-beta.16":
-  version: 1.32.0-beta.16
-  resolution: "@polkadot/api@npm:1.32.0-beta.16"
+"@polkadot/api@npm:^1.32.0-beta.18":
+  version: 1.32.0-beta.18
+  resolution: "@polkadot/api@npm:1.32.0-beta.18"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@polkadot/api-derive": 1.32.0-beta.16
+    "@polkadot/api-derive": 1.32.0-beta.18
     "@polkadot/keyring": ^3.4.1
-    "@polkadot/metadata": 1.32.0-beta.16
-    "@polkadot/rpc-core": 1.32.0-beta.16
-    "@polkadot/rpc-provider": 1.32.0-beta.16
-    "@polkadot/types": 1.32.0-beta.16
-    "@polkadot/types-known": 1.32.0-beta.16
+    "@polkadot/metadata": 1.32.0-beta.18
+    "@polkadot/rpc-core": 1.32.0-beta.18
+    "@polkadot/rpc-provider": 1.32.0-beta.18
+    "@polkadot/types": 1.32.0-beta.18
+    "@polkadot/types-known": 1.32.0-beta.18
     "@polkadot/util": ^3.4.1
     "@polkadot/util-crypto": ^3.4.1
     bn.js: ^5.1.3
     eventemitter3: ^4.0.7
     rxjs: ^6.6.2
-  checksum: 8e6297753a801d34fb30fd1ad52394dc9d848f19abfa0441b93dcc23434195a834c9d4bf8588779aca565d7af4e70a07360b6583f2715b8028046ca692e6e5b4
+  checksum: 7d197efc12d9eb20f04d4a2dd6df3df7fab9615c2e6fb07ac8070cf91aa53d6585830f5922081fdc1128b757ce1dbbb54bff3505d09dd363353c9dbb78fdca9c
   languageName: node
   linkType: hard
 
@@ -3028,7 +3028,7 @@ __metadata:
   resolution: "@polkadot/extension-base@workspace:packages/extension-base"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@polkadot/api": ^1.32.0-beta.16
+    "@polkadot/api": ^1.32.0-beta.18
     "@polkadot/extension-inject": 0.33.0-beta.17
     "@polkadot/keyring": ^3.4.1
     "@polkadot/ui-keyring": ^0.59.0-beta.0
@@ -3136,17 +3136,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/metadata@npm:1.32.0-beta.16":
-  version: 1.32.0-beta.16
-  resolution: "@polkadot/metadata@npm:1.32.0-beta.16"
+"@polkadot/metadata@npm:1.32.0-beta.18":
+  version: 1.32.0-beta.18
+  resolution: "@polkadot/metadata@npm:1.32.0-beta.18"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@polkadot/types": 1.32.0-beta.16
-    "@polkadot/types-known": 1.32.0-beta.16
+    "@polkadot/types": 1.32.0-beta.18
+    "@polkadot/types-known": 1.32.0-beta.18
     "@polkadot/util": ^3.4.1
     "@polkadot/util-crypto": ^3.4.1
     bn.js: ^5.1.3
-  checksum: bd6f00771bdf241adb7309b26cad993433ad0c6d6c109d86795f6787a5fb1b32df5d305ac31f94f4b290955765bdae7f382dda96151c1b70c8cb931c899af0f4
+  checksum: cc36a0e045c5d634d23698f458e7c140ff4e30472382f3e1c9d37e57b03080b289aedb50404f5fbbfd1235033cf2501634f0714db5f17d84e62139581f7b2b0e
   languageName: node
   linkType: hard
 
@@ -3189,49 +3189,49 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-core@npm:1.32.0-beta.16":
-  version: 1.32.0-beta.16
-  resolution: "@polkadot/rpc-core@npm:1.32.0-beta.16"
+"@polkadot/rpc-core@npm:1.32.0-beta.18":
+  version: 1.32.0-beta.18
+  resolution: "@polkadot/rpc-core@npm:1.32.0-beta.18"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@polkadot/metadata": 1.32.0-beta.16
-    "@polkadot/rpc-provider": 1.32.0-beta.16
-    "@polkadot/types": 1.32.0-beta.16
+    "@polkadot/metadata": 1.32.0-beta.18
+    "@polkadot/rpc-provider": 1.32.0-beta.18
+    "@polkadot/types": 1.32.0-beta.18
     "@polkadot/util": ^3.4.1
     memoizee: ^0.4.14
     rxjs: ^6.6.2
-  checksum: ad6207e0436b4ff64e8f9f8e51ef02faa53bbb1d9a66bf28fea99bba7b30e4a852b883d5b44973e42ea1e651b13146209cea41dc74bd47a3a6d373dd2b9e93e3
+  checksum: 549397b17856459020630a093a9721bf95540d487c33c40c88b75c21186c4ffa3bbf5eec1372035a17f1d1e2eafc179a389da9141ba31b3a4f517f5847b32c21
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-provider@npm:1.32.0-beta.16":
-  version: 1.32.0-beta.16
-  resolution: "@polkadot/rpc-provider@npm:1.32.0-beta.16"
+"@polkadot/rpc-provider@npm:1.32.0-beta.18":
+  version: 1.32.0-beta.18
+  resolution: "@polkadot/rpc-provider@npm:1.32.0-beta.18"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@polkadot/metadata": 1.32.0-beta.16
-    "@polkadot/types": 1.32.0-beta.16
+    "@polkadot/metadata": 1.32.0-beta.18
+    "@polkadot/types": 1.32.0-beta.18
     "@polkadot/util": ^3.4.1
     "@polkadot/util-crypto": ^3.4.1
     bn.js: ^5.1.3
     eventemitter3: ^4.0.7
     isomorphic-fetch: ^2.2.1
     websocket: ^1.0.32
-  checksum: f290504e0a11fa749faf2eb071a0f0909e25c4ee657dea529c2a4cb7d2bf2aca90e9eb1005b96179814c9cfaee8778a2ecaf88576939344e58cf4ad5a8362e9a
+  checksum: d75760d69667519fbe6dfaa33447c7e0b506ceb276f089c612454a7b11b76da9a1b19e8b7d3afba7d5ab29b1a6bdc019e7545f5de99538ab6923a3740035d5b4
   languageName: node
   linkType: hard
 
-"@polkadot/typegen@npm:^1.32.0-beta.16":
-  version: 1.32.0-beta.16
-  resolution: "@polkadot/typegen@npm:1.32.0-beta.16"
+"@polkadot/typegen@npm:^1.32.0-beta.18":
+  version: 1.32.0-beta.18
+  resolution: "@polkadot/typegen@npm:1.32.0-beta.18"
   dependencies:
     "@babel/core": ^7.11.5
     "@babel/register": ^7.11.5
     "@babel/runtime": ^7.11.2
-    "@polkadot/api": 1.32.0-beta.16
-    "@polkadot/metadata": 1.32.0-beta.16
-    "@polkadot/rpc-provider": 1.32.0-beta.16
-    "@polkadot/types": 1.32.0-beta.16
+    "@polkadot/api": 1.32.0-beta.18
+    "@polkadot/metadata": 1.32.0-beta.18
+    "@polkadot/rpc-provider": 1.32.0-beta.18
+    "@polkadot/types": 1.32.0-beta.18
     "@polkadot/util": ^3.4.1
     handlebars: ^4.7.6
     websocket: ^1.0.32
@@ -3242,35 +3242,35 @@ __metadata:
     polkadot-types-from-defs: scripts/polkadot-types-from-defs.js
     polkadot-types-internal-interfaces: scripts/polkadot-types-internal-interfaces.js
     polkadot-types-internal-metadata: scripts/polkadot-types-internal-metadata.js
-  checksum: 1d5a9d57cbe7ae184639fcb0769b123667d14f98bec1b6e628f8743cce943e0099e6463d2b4a408a8ee3d334a7c3a7d8558c3727081e2be68db3d2e4c6381ed0
+  checksum: addb4c895591d8740d8b315fc4997c8356b7c178bfc87744c5541cd4defd31087bfffb54ac3d60f09f61ae8b8ae44dafc025eddfce71def6b782f30f95dbbdb7
   languageName: node
   linkType: hard
 
-"@polkadot/types-known@npm:1.32.0-beta.16":
-  version: 1.32.0-beta.16
-  resolution: "@polkadot/types-known@npm:1.32.0-beta.16"
+"@polkadot/types-known@npm:1.32.0-beta.18":
+  version: 1.32.0-beta.18
+  resolution: "@polkadot/types-known@npm:1.32.0-beta.18"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@polkadot/types": 1.32.0-beta.16
+    "@polkadot/types": 1.32.0-beta.18
     "@polkadot/util": ^3.4.1
     bn.js: ^5.1.3
-  checksum: 7d9c0398a7a37f7027b58a347ca4acca3210b961699108e108dcd058aac63d0cb5493b8f7540c03faeb246f8a99c05c7f0b48fe60e39ffcd54ea040c9f322800
+  checksum: f39a400ce0dbcafc8c7d8b86c4227ddda5504bacaa70f9a507bdfc4fd4dd57ce19f9893990b8b7403d0db9f3056cf34061ee75e7fe77a72546c69d3e24ad43d6
   languageName: node
   linkType: hard
 
-"@polkadot/types@npm:^1.32.0-beta.16":
-  version: 1.32.0-beta.16
-  resolution: "@polkadot/types@npm:1.32.0-beta.16"
+"@polkadot/types@npm:^1.32.0-beta.18":
+  version: 1.32.0-beta.18
+  resolution: "@polkadot/types@npm:1.32.0-beta.18"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@polkadot/metadata": 1.32.0-beta.16
+    "@polkadot/metadata": 1.32.0-beta.18
     "@polkadot/util": ^3.4.1
     "@polkadot/util-crypto": ^3.4.1
     "@types/bn.js": ^4.11.6
     bn.js: ^5.1.3
     memoizee: ^0.4.14
     rxjs: ^6.6.2
-  checksum: 3b82db773304b7c6d66be05a8993e162246d41f2f4a5213aaf9bf9d9dcaeaeed11eb2d78e9fad658ab3a350f9667a64f18cc292c0fd59eb4f5eee8b0caf7cb40
+  checksum: f68ca0d6aff2ff7dd59880eeae37c2622c5571f7d170800645d74b85281269d34cf0603e2a07b78d065578041d4f18736de768f948fdfa85180bef8b48b2cb87
   languageName: node
   linkType: hard
 
@@ -18866,7 +18866,7 @@ __metadata:
   dependencies:
     "@babel/core": ^7.11.5
     "@polkadot/dev": ^0.55.45
-    "@polkadot/typegen": ^1.32.0-beta.16
+    "@polkadot/typegen": ^1.32.0-beta.18
     "@types/jest": ^26.0.13
     copy-webpack-plugin: ^6.1.0
     sinon-chrome: ^3.0.1