grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix token images // Error in Contract Queries (#4169)

Browse Source
This commit is contained in:
Nicolas Gotchac 2017-01-13 18:14:25 +01:00 committed by Jaco Greeff
parent d0cebc3982
commit 42ddb4f26c
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/src/ui/Balance/balance.js
View File

@ -62,11 +62,15 @@ class Balance extends Component {
value = api.util.fromWei(balance.value).toFormat(3); value = api.util.fromWei(balance.value).toFormat(3);
} }
let imagesrc = token.image; const imageurl = token.image || images[token.address];
if (!imagesrc) { let imagesrc = unknownImage;
imagesrc = images[token.address]
? `${api.dappsUrl}${images[token.address]}` if (imageurl) {
: unknownImage; const host = /^(\/)?api/.test(imageurl)
? api.dappsUrl
: '';
imagesrc = `${host}${imageurl}`;
} }
return ( return (

8
js/src/ui/Form/TypedInput/typedInput.js
View File

@ -71,7 +71,9 @@ export default class TypedInput extends Component {
const { isEth, value } = this.props; const { isEth, value } = this.props;
if (typeof isEth === 'boolean' && value) { if (typeof isEth === 'boolean' && value) {
const ethValue = isEth ? fromWei(value) : value; // Remove formatting commas
const sanitizedValue = typeof value === 'string' ? value.replace(/,/g, '') : value;
const ethValue = isEth ? fromWei(sanitizedValue) : value;
this.setState({ isEth, ethValue }); this.setState({ isEth, ethValue });
} }
} }
@ -393,7 +395,9 @@ export default class TypedInput extends Component {
return this.setState({ isEth: !isEth }); return this.setState({ isEth: !isEth });
} }
const value = isEth ? toWei(ethValue) : fromWei(ethValue); // Remove formatting commas
const sanitizedValue = typeof ethValue === 'string' ? ethValue.replace(/,/g, '') : ethValue;
const value = isEth ? toWei(sanitizedValue) : fromWei(sanitizedValue);
this.setState({ isEth: !isEth, ethValue: value }, () => { this.setState({ isEth: !isEth, ethValue: value }, () => {
this.onEthValueChange(null, value); this.onEthValueChange(null, value);
}); });