From d752e8b86494612dedd93b75be08d9ddaae5c779 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <avanmeerten@atlassian.com>
Date: Thu, 13 Jul 2017 14:45:55 -0500
Subject: [PATCH] accept 'avatar' as well as 'avatarUrl' for avatar field

---
 react/features/conference/route.js           | 4 ++--
 react/features/jwt/components/CallOverlay.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/react/features/conference/route.js b/react/features/conference/route.js
index 096517132..bd5eb125c 100644
--- a/react/features/conference/route.js
+++ b/react/features/conference/route.js
@@ -114,10 +114,10 @@ function _setTokenData() {
     const { caller } = state['features/jwt'];
 
     if (caller) {
-        const { avatarUrl, email, name } = caller;
+        const { avatarUrl, avatar, email, name } = caller;
 
         APP.settings.setEmail((email || '').trim(), true);
-        APP.settings.setAvatarUrl((avatarUrl || '').trim());
+        APP.settings.setAvatarUrl((avatarUrl || avatar || '').trim());
         APP.settings.setDisplayName((name || '').trim(), true);
     }
 }
diff --git a/react/features/jwt/components/CallOverlay.js b/react/features/jwt/components/CallOverlay.js
index 87d35d584..0b0689716 100644
--- a/react/features/jwt/components/CallOverlay.js
+++ b/react/features/jwt/components/CallOverlay.js
@@ -158,7 +158,7 @@ class CallOverlay extends Component {
      */
     render() {
         const { className, ringing } = this.state;
-        const { avatarUrl, name } = this.props._callee;
+        const { avatarUrl, avatar, name } = this.props._callee;
 
         return (
             <Container
@@ -171,7 +171,7 @@ class CallOverlay extends Component {
                     </Text>
                     <Avatar
                         { ...this._style('ringing__avatar') }
-                        uri = { avatarUrl } />
+                        uri = { avatarUrl || avatar } />
                     <Container
                         { ...this._style('ringing__caller-info') }>
                         <Text