about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/follow_requests
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/follow_requests
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/follow_requests')
-rw-r--r--app/javascript/mastodon/features/follow_requests/components/account_authorize.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
index 566953ddd..66fa5c235 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
@@ -32,7 +32,7 @@ export default class AccountAuthorize extends ImmutablePureComponent {
       <div className='account-authorize__wrapper'>
         <div className='account-authorize'>
           <Permalink href={account.get('url')} to={`/accounts/${account.get('id')}`} className='detailed-status__display-name'>
-            <div className='account-authorize__avatar'><Avatar src={account.get('avatar')} staticSrc={account.get('avatar_static')} size={48} /></div>
+            <div className='account-authorize__avatar'><Avatar account={account} size={48} /></div>
             <DisplayName account={account} />
           </Permalink>