diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-06 21:49:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 21:49:26 +0200 |
| commit | eb7fc34708e7e31bcce559801563ff497595c247 (patch) | |
| tree | 3c88f745c397db2893dc7927504c8582a400a68d /app/javascript/glitch | |
| parent | 7b42d14f456d036e768015c2e12aa93c1bf9226d (diff) | |
| parent | 91836d577e1f02ffbeb417246ef13e211455a123 (diff) | |
Merge pull request #124 from glitch-soc/data-avatar-of
all checks have failed woooooo \*merges*
Diffstat (limited to 'app/javascript/glitch')
| -rw-r--r-- | app/javascript/glitch/components/account/header.js | 6 | ||||
| -rw-r--r-- | app/javascript/glitch/components/status/header.js | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/app/javascript/glitch/components/account/header.js b/app/javascript/glitch/components/account/header.js index b79140c02..a1197c4be 100644 --- a/app/javascript/glitch/components/account/header.js +++ b/app/javascript/glitch/components/account/header.js @@ -194,11 +194,7 @@ Here, we render our component using all the things we've defined above. <div> <a href={account.get('url')} target='_blank' rel='noopener'> <span className='account__header__avatar'> - <Avatar - src={account.get('avatar')} - staticSrc={account.get('avatar_static')} - size={90} - /> + <Avatar account={account} size={90} /> </span> <span className='account__header__display-name' diff --git a/app/javascript/glitch/components/status/header.js b/app/javascript/glitch/components/status/header.js index 5ce59fba4..bdb868e4d 100644 --- a/app/javascript/glitch/components/status/header.js +++ b/app/javascript/glitch/components/status/header.js @@ -216,16 +216,9 @@ if we have a `friend` and a normal `<Avatar>` if we don't. > <div className='status__avatar'>{ friend ? ( - <AvatarOverlay - staticSrc={account.get('avatar_static')} - overlaySrc={friend.get('avatar_static')} - /> + <AvatarOverlay account={account} friend={friend} /> ) : ( - <Avatar - src={account.get('avatar')} - staticSrc={account.get('avatar_static')} - size={48} - /> + <Avatar account={account} size={48} /> ) }</div> <DisplayName account={account} /> |