Fix Merge Problems; update yarn lock

7 years ago · 162a3827c7
parent 6c5865d564
commit 162a3827c7
2 changed files with 558 additions and 49 deletions
--- a/ui/app/components/dropdowns/components/account-dropdowns.js
+++ b/ui/app/components/dropdowns/components/account-dropdowns.js
@ -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)

--- a/yarn.lock
+++ b/yarn.lock