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

Get fiat numbers rendering on tooltip. Need to find way to create line breaks.

This commit is contained in:
Kevin Serrano 2016-08-05 12:18:44 -07:00
parent be76b05726
commit 260de6532c
7 changed files with 33 additions and 14 deletions

View File

@ -293,12 +293,6 @@ ConfigManager.prototype.updateConversionRate = function () {
const parsedResponse = JSON.parse(response) const parsedResponse = JSON.parse(response)
this.setConversionPrice(parsedResponse.ticker.price) this.setConversionPrice(parsedResponse.ticker.price)
this.setConversionDate(parsedResponse.timestamp) this.setConversionDate(parsedResponse.timestamp)
console.log('=================')
console.log('Updated currency!')
console.log('=================')
console.log(this.getConversionRate())
console.log(this.getCurrentFiat())
console.log(parsedResponse)
}).catch((err) => { }).catch((err) => {
console.error('Error in conversion.', err) console.error('Error in conversion.', err)
}) })

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,8 @@
{ {
"metamask": { "metamask": {
"currentFiat": "USD",
"conversionRate": 11.06608791,
"conversionDate": 1470421024,
"isInitialized": true, "isInitialized": true,
"isUnlocked": true, "isUnlocked": true,
"currentDomain": "example.com", "currentDomain": "example.com",

View File

@ -1,5 +1,8 @@
{ {
"metamask": { "metamask": {
"currentFiat": "USD",
"conversionRate": 11.06608791,
"conversionDate": 1470421024,
"isInitialized": true, "isInitialized": true,
"isUnlocked": true, "isUnlocked": true,
"currentDomain": "example.com", "currentDomain": "example.com",
@ -81,4 +84,4 @@
"warning": null "warning": null
}, },
"identities": {} "identities": {}
} }

View File

@ -1,8 +1,8 @@
{ {
"metamask": { "metamask": {
"currentFiat": "JPY", "currentFiat": "USD",
"conversionRate": "N/A", "conversionRate": 11.06608791,
"conversionDate": "N/A", "conversionDate": 1470421024,
"isInitialized": true, "isInitialized": true,
"isUnlocked": true, "isUnlocked": true,
"currentDomain": "example.com", "currentDomain": "example.com",

View File

@ -20,6 +20,7 @@ module.exports = connect(mapStateToProps)(AccountDetailScreen)
function mapStateToProps (state) { function mapStateToProps (state) {
return { return {
metamask: state.metamask,
identities: state.metamask.identities, identities: state.metamask.identities,
accounts: state.metamask.accounts, accounts: state.metamask.accounts,
address: state.metamask.selectedAccount, address: state.metamask.selectedAccount,
@ -250,4 +251,3 @@ AccountDetailScreen.prototype.transactionList = function () {
AccountDetailScreen.prototype.requestAccountExport = function () { AccountDetailScreen.prototype.requestAccountExport = function () {
this.props.dispatch(actions.requestExportAccount()) this.props.dispatch(actions.requestExportAccount())
} }

View File

@ -1,10 +1,22 @@
const Component = require('react').Component const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const inherits = require('util').inherits const inherits = require('util').inherits
const connect = require('react-redux').connect
const formatBalance = require('../util').formatBalance const formatBalance = require('../util').formatBalance
const generateBalanceObject = require('../util').generateBalanceObject const generateBalanceObject = require('../util').generateBalanceObject
const Tooltip = require('./tooltip.js') const Tooltip = require('./tooltip.js')
module.exports = EthBalanceComponent
function mapStateToProps (state) {
return {
conversionRate: state.metamask.conversionRate,
conversionDate: state.metamask.conversionDate,
currentFiat: state.metamask.currentFiat,
}
}
module.exports = connect(mapStateToProps)(EthBalanceComponent)
inherits(EthBalanceComponent, Component) inherits(EthBalanceComponent, Component)
function EthBalanceComponent () { function EthBalanceComponent () {
@ -37,6 +49,11 @@ EthBalanceComponent.prototype.renderBalance = function (value, state) {
if (value === 'None') return value if (value === 'None') return value
var balanceObj = generateBalanceObject(value, state.shorten ? 1 : 3) var balanceObj = generateBalanceObject(value, state.shorten ? 1 : 3)
var balance var balance
var splitBalance = value.split(' ')
var ethNumber = splitBalance[0]
var ethSuffix = splitBalance[1]
var fiatNumber = Number(splitBalance[0]) * state.conversionRate
var fiatSuffix = state.currentFiat
if (state.shorten) { if (state.shorten) {
balance = balanceObj.shortBalance balance = balanceObj.shortBalance
@ -49,7 +66,9 @@ EthBalanceComponent.prototype.renderBalance = function (value, state) {
return ( return (
h(Tooltip, { h(Tooltip, {
position: 'bottom', position: 'bottom',
title: value.split(' ')[0], multiline: true,
title: `${ethNumber} ${ethSuffix}
${fiatNumber} ${fiatSuffix}`,
}, [ }, [
h('.flex-column', { h('.flex-column', {
style: { style: {