Skip to content

Commit

Permalink
Merge pull request #343 from poanetwork/develop
Browse files Browse the repository at this point in the history
NW release 5.0.0
  • Loading branch information
vbaranov committed Mar 31, 2020
2 parents e5f07b3 + 8a04cd5 commit 96d3e4c
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## 5.0.0 Tue Mar 31 2020

- [#340](https://github.com/poanetwork/nifty-wallet/pull/340) - (Feature) Update in-page provider (EIP-1193)
- [#340](https://github.com/poanetwork/nifty-wallet/pull/340), [#342](https://github.com/poanetwork/nifty-wallet/pull/342) - (Feature) Update in-page provider (EIP-1193)
- [#334](https://github.com/poanetwork/nifty-wallet/pull/334) - (Feature) Ability to set tx value for payable methods
- [#333](https://github.com/poanetwork/nifty-wallet/pull/333) - (Fix) Support RSK testnet explorer links
- [#332](https://github.com/poanetwork/nifty-wallet/pull/332) - (Chore) Return to main screen from removal of imported account
Expand Down
1 change: 1 addition & 0 deletions app/scripts/controllers/permissions/enums.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,5 @@ export const SAFE_METHODS = [
'wallet_watchAsset',
'eth_getEncryptionPublicKey',
'eth_decrypt',
'eth_accounts',
]
4 changes: 0 additions & 4 deletions app/scripts/inpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ proxiedInpageProvider._web3Ref = web3.eth

setupDappAutoReload(web3, inpageProvider.publicConfigStore)

// set web3 defaultAccount
inpageProvider.publicConfigStore.subscribe(function (state) {
web3.eth.defaultAccount = state.selectedAddress
})
//
// end deprecate:Q1-2020
//
Expand Down
46 changes: 41 additions & 5 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"mkdirp": "^0.5.1",
"multihashes": "^0.4.12",
"nanoid": "^2.1.6",
"nifty-wallet-inpage-provider": "github:poanetwork/nifty-wallet-inpage-provider#1.3.0",
"nifty-wallet-inpage-provider": "github:poanetwork/nifty-wallet-inpage-provider#1.4.0",
"nonce-tracker": "^1.0.0",
"number-to-bn": "^1.7.0",
"obj-multiplex": "^1.0.0",
Expand Down

0 comments on commit 96d3e4c

Please sign in to comment.