From b836d0483d835b0665a14e41f68f9fbd574fd655 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Mon, 21 Aug 2017 10:06:29 -0700 Subject: [PATCH] [WIP] Render a QR code in AccountDetailsModal --- ui/app/components/modals/account-details-modal.js | 8 +++++--- ui/app/components/qr-code.js | 6 +----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js index 2a5359fd4..f7dcf26eb 100644 --- a/ui/app/components/modals/account-details-modal.js +++ b/ui/app/components/modals/account-details-modal.js @@ -10,7 +10,7 @@ const QrView = require('../qr-code') function mapStateToProps (state) { return { address: state.metamask.selectedAddress, - selectedAddress: getSelectedAddress(state), + // selectedAddress: getSelectedAddress(state), selectedIdentity: getSelectedIdentity(state), } } @@ -35,6 +35,8 @@ module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDetailsModa // It is the only component in this codebase that does so // It utilizes modal styles AccountDetailsModal.prototype.render = function () { + const { selectedIdentity } = this.props + return h('div', {}, [ h('div.account-details-modal-wrapper', { }, [ @@ -53,8 +55,8 @@ AccountDetailsModal.prototype.render = function () { h('div', {}, [ h(QrView, { Qr: { - message: this.props.selectedAddress, - data: this.props.selectedIdentity, + message: this.props.selectedIdentity.name, + data: this.props.selectedIdentity.address, } }, []), ]), diff --git a/ui/app/components/qr-code.js b/ui/app/components/qr-code.js index df749fe17..5a2e4963a 100644 --- a/ui/app/components/qr-code.js +++ b/ui/app/components/qr-code.js @@ -10,11 +10,7 @@ module.exports = connect(mapStateToProps)(QrCodeView) function mapStateToProps (state) { return { - // Qr: state.appState.Qr, - /* - Qr.message - address - Qr.data - identity - */ + // Qr code is not fetched from state. 'message' and 'data' props are passed instead. buyView: state.appState.buyView, warning: state.appState.warning, }