From 4b2795502c0e5a1bd0586d5a6f4c6822ed7d5d6d Mon Sep 17 00:00:00 2001
From: Leonard Kim <leonard.h.kim@gmail.com>
Date: Fri, 8 Sep 2017 13:52:07 -0700
Subject: [PATCH] fix(contact-list): call getAvatarURL directly

Instead of going through the Avatar object, call the getAvatarURL
directly so that the code flows consistently use the participant
representation within redux.
---
 .../components/ContactListPanel.web.js            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/react/features/contact-list/components/ContactListPanel.web.js b/react/features/contact-list/components/ContactListPanel.web.js
index bf05e80e8..f36dca477 100644
--- a/react/features/contact-list/components/ContactListPanel.web.js
+++ b/react/features/contact-list/components/ContactListPanel.web.js
@@ -2,10 +2,8 @@ import Button from '@atlaskit/button';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
-import Avatar from '../../../../modules/UI/avatar/Avatar';
-
 import { translate } from '../../base/i18n';
-import { getParticipants } from '../../base/participants';
+import { getAvatarURL, getParticipants } from '../../base/participants';
 import { openInviteDialog } from '../../invite';
 
 import ContactListItem from './ContactListItem';
@@ -114,15 +112,18 @@ class ContactListPanel extends Component {
      * @returns {ReactElement[]}
      */
     _renderContacts() {
-        return this.props._participants.map(({ avatarId, id, name }) =>
-            ( // eslint-disable-line no-extra-parens
+        return this.props._participants.map(participant => {
+            const { id, name } = participant;
+
+            return (
                 <ContactListItem
                     avatarURI = { interfaceConfig.SHOW_CONTACTLIST_AVATARS
-                        ? Avatar.getAvatarUrl(avatarId) : null }
+                        ? getAvatarURL(participant) : null }
                     id = { id }
                     key = { id }
                     name = { name } />
-            ));
+            );
+        });
     }
 
     /**