diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-06-22 06:04:00 +0800 |
| commit | cf663f1104697440121d32cc6db2a8a1d5d54c5a (patch) | |
| tree | 3ed4b8b9fe8c85f3b3a5bf68482c3fb9967f2de5 /ui/app/components/identicon.js | |
| parent | 265725c6edd62a7f46a9b9cf5a443cf01f0ff00c (diff) | |
| parent | dc2ef967028723afe9fe1efd669754723e38a4f0 (diff) | |
| download | tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.gz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.bz2 tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.lz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.xz tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.tar.zst tangerine-wallet-browser-cf663f1104697440121d32cc6db2a8a1d5d54c5a.zip | |
Fix conflict
Diffstat (limited to 'ui/app/components/identicon.js')
| -rw-r--r-- | ui/app/components/identicon.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/identicon.js b/ui/app/components/identicon.js index fd61b3125..5fe07ce7a 100644 --- a/ui/app/components/identicon.js +++ b/ui/app/components/identicon.js @@ -9,13 +9,13 @@ const iconFactory = iconFactoryGen(jazzicon) module.exports = IdenticonComponent inherits(IdenticonComponent, Component) -function IdenticonComponent() { +function IdenticonComponent () { Component.call(this) this.defaultDiameter = 46 } -IdenticonComponent.prototype.render = function() { +IdenticonComponent.prototype.render = function () { var state = this.props var diameter = state.diameter || this.defaultDiameter return ( @@ -32,7 +32,7 @@ IdenticonComponent.prototype.render = function() { ) } -IdenticonComponent.prototype.componentDidMount = function(){ +IdenticonComponent.prototype.componentDidMount = function () { var state = this.props var address = state.address |