Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Wallet subscriptions & refresh (#7283)
Browse files Browse the repository at this point in the history
* Update to @parity/api 2.1.7

* Update packages

* Update after signer API alias
  • Loading branch information
jacogr authored Dec 15, 2017
1 parent 9821fd9 commit 6587dfe
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 51 deletions.
32 changes: 3 additions & 29 deletions js-old/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js-old/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"build:app": "webpack --config webpack/app",
"build:dll": "webpack --config webpack/vendor",
"ci:build": "cross-env NODE_ENV=production npm run build",
"clean": "rimraf ./.build ./.coverage ./.happypack ./.npmjs ./build ./node_modules/.cache",
"clean": "rimraf ./.build ./.coverage ./.happypack ./.npmjs ./node_modules/.cache",
"lint": "npm run lint:css && npm run lint:js",
"lint:css": "stylelint ./src/**/*.css",
"lint:js": "eslint --ignore-path .gitignore ./src/",
Expand Down Expand Up @@ -133,7 +133,7 @@
},
"dependencies": {
"@parity/abi": "2.1.x",
"@parity/api": "2.1.x",
"@parity/api": "^2.1.14",
"@parity/wordlist": "1.1.x",
"base32.js": "0.1.0",
"bignumber.js": "3.0.1",
Expand Down
1 change: 0 additions & 1 deletion js-old/src/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<div id="container">
<div class="loading">Loading</div>
</div>
<script src="/parity-utils/inject.js"></script>
<script src="vendor.js"></script>
</body>
</html>
18 changes: 9 additions & 9 deletions js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"build:embed": "cross-env EMBED=1 node webpack/embed",
"build:i18n": "npm run clean && npm run build && babel-node ./scripts/build-i18n.js",
"ci:build": "cross-env NODE_ENV=production npm run build",
"clean": "rimraf ./.build ./.coverage ./.happypack ./build",
"clean": "rimraf ./.build ./.coverage ./.happypack",
"coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
"lint": "npm run lint:css && npm run lint:js",
"lint:cached": "npm run lint:css && npm run lint:js:cached",
Expand Down Expand Up @@ -140,7 +140,7 @@
"yargs": "6.6.0"
},
"dependencies": {
"@parity/api": "^2.1.6",
"@parity/api": "^2.1.14",
"@parity/plugin-signer-account": "paritytech/plugin-signer-account",
"@parity/plugin-signer-default": "paritytech/plugin-signer-default",
"@parity/plugin-signer-hardware": "paritytech/plugin-signer-hardware",
Expand Down
11 changes: 3 additions & 8 deletions js/src/DappRequests/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,9 @@ export default class Store {
return;
}

if (
(method &&
methodGroupFromMethod[method] &&
!this.hasTokenPermission(method, token)) ||
(api &&
methodGroupFromMethod[params[0]] &&
!this.hasTokenPermission(method, token))
) {
const _method = api ? params[0] : method;

if (methodGroupFromMethod[_method] && !this.hasTokenPermission(_method, token)) {
this.queueRequest(id, { // The requestId of a request is the id inside data
data,
source
Expand Down

0 comments on commit 6587dfe

Please sign in to comment.