1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Enables the old shapeshift UI within new ui.

This commit is contained in:
Dan 2017-09-29 12:20:09 -02:30 committed by Chi Kei Chan
parent 67ee5b21e6
commit 7c4d8c4562
3 changed files with 9 additions and 3 deletions

View File

@ -72,6 +72,7 @@ function mapStateToProps (state) {
lastUnreadNotice: state.metamask.lastUnreadNotice,
lostAccounts: state.metamask.lostAccounts,
frequentRpcList: state.metamask.frequentRpcList || [],
Qr: state.appState.Qr,
// state needed to get account dropdown temporarily rendering from app bar
identities,
@ -395,7 +396,10 @@ App.prototype.renderPrimary = function () {
width: '285px',
},
}, [
h(QrView, {key: 'qr'}),
h(QrView, {
key: 'qr',
Qr: props.Qr,
}),
]),
])

View File

@ -29,7 +29,7 @@ function ShiftListItem () {
ShiftListItem.prototype.render = function () {
return (
h('.transaction-list-item.flex-row', {
h('div.tx-list-item.tx-list-clickable', {
style: {
paddingTop: '20px',
paddingBottom: '20px',

View File

@ -5,6 +5,7 @@ const inherits = require('util').inherits
const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
const selectors = require('../selectors')
const TxListItem = require('./tx-list-item')
const ShiftListItem = require('./shift-list-item')
const { formatBalance, formatDate } = require('../util')
const { showConfTxPage } = require('../actions')
@ -56,8 +57,9 @@ TxList.prototype.renderTransaction = function () {
TxList.prototype.renderTransactionListItem = function (transaction, conversionRate) {
// console.log({transaction})
// refer to transaction-list.js:line 58
const shapeshiftProps = {};
if (transaction.key === 'shapeshift') {
return null
return h(ShiftListItem, transaction)
}
const props = {