[WIP] Aggregate data for QRView

2 files changed, 18 insertions, 3 deletions

diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js
index 104d2c6ed..2a5359fd4 100644
--- a/ui/app/components/modals/account-details-modal.js
+++ b/ui/app/components/modals/account-details-modal.js
@@ -3,10 +3,15 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const connect = require('react-redux').connect
 const actions = require('../../actions')
+const { getSelectedIdentity, getSelectedAddress } = require('../../selectors')
+
+const QrView = require('../qr-code')
 
 function mapStateToProps (state) {
   return {
     address: state.metamask.selectedAddress,
+    selectedAddress: getSelectedAddress(state),
+    selectedIdentity: getSelectedIdentity(state),
   }
 }
 
@@ -14,7 +19,8 @@ function mapDispatchToProps (dispatch) {
   return {
     hideModal: () => {
       dispatch(actions.hideModal())
-    }
+    },
+    showQrView: (selected, identity) => dispatch(actions.showQrView(selected, identity)),
   }
 }
 
@@ -45,7 +51,12 @@ AccountDetailsModal.prototype.render = function () {
       ]),
 
       h('div', {}, [
-        'QR Code',
+        h(QrView, {
+          Qr: {
+            message: this.props.selectedAddress,
+            data: this.props.selectedIdentity,
+          }
+        }, []),
       ]),
 
       h('div', {}, [
diff --git a/ui/app/components/qr-code.js b/ui/app/components/qr-code.js
index 06b9aed9b..df749fe17 100644
--- a/ui/app/components/qr-code.js
+++ b/ui/app/components/qr-code.js
@@ -10,7 +10,11 @@ module.exports = connect(mapStateToProps)(QrCodeView)
 
 function mapStateToProps (state) {
   return {
-    Qr: state.appState.Qr,
+    // Qr: state.appState.Qr,
+    /*
+      Qr.message - address
+      Qr.data - identity
+     */
     buyView: state.appState.buyView,
     warning: state.appState.warning,
   }