about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/ui/components/actions_modal.js
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-08-07 19:44:55 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-08-07 19:44:55 +0200
commit594234740788a51fa528152343eb50dc1c6ca093 (patch)
tree07a8e94ab9405f54694117b04637b2db64ef3f52 /app/javascript/mastodon/features/ui/components/actions_modal.js
parent22db9472253f6ffcfed254f7a406a58b53e80cfe (diff)
Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)
* Refactored Avatar and AvatarOverlay (DRY) to have 'account' as prop.
Also removed animate attribute from compose navigation bar, which should
have never been there. Added test for avatar overlay.

* fix broken tests

* god dammit another bug in tests! travis please let this pass

* formatting in avatar overlay
Diffstat (limited to 'app/javascript/mastodon/features/ui/components/actions_modal.js')
-rw-r--r--app/javascript/mastodon/features/ui/components/actions_modal.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/ui/components/actions_modal.js b/app/javascript/mastodon/features/ui/components/actions_modal.js
index cc0620d1c..3d40033be 100644
--- a/app/javascript/mastodon/features/ui/components/actions_modal.js
+++ b/app/javascript/mastodon/features/ui/components/actions_modal.js
@@ -46,7 +46,7 @@ export default class ActionsModal extends ImmutablePureComponent {
 
           <a href={this.props.status.getIn(['account', 'url'])} className='status__display-name'>
             <div className='status__avatar'>
-              <Avatar src={this.props.status.getIn(['account', 'avatar'])} staticSrc={this.props.status.getIn(['account', 'avatar_static'])} size={48} />
+              <Avatar account={this.props.status.get('account')} size={48} />
             </div>
 
             <DisplayName account={this.props.status.get('account')} />