m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-23 02:10:12 +01:00
Code

Fix Merge Problems; update yarn lock

Browse Source
This commit is contained in:
Chi Kei Chan 2017-09-18 11:34:07 -07:00
parent 6c5865d564
commit 162a3827c7
2 changed files with 558 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/app/components/dropdowns/components/account-dropdowns.js
View File

@ -453,5 +453,11 @@ const mapDispatchToProps = (dispatch) => {
} }
} }
module.exports = connect(null, mapDispatchToProps)(AccountDropdowns) function mapStateToProps (state) {
return {
keyrings: state.metamask.keyrings,
}
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDropdowns)

599
yarn.lock
View File

File diff suppressed because it is too large Load Diff