From 03772495929005b64b501d8d79587ee5f042f889 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 8 Apr 2019 13:50:38 -0400
Subject: [PATCH] MM-14960 Use the correct icon set for channel types (#2699)

---
 app/components/channel_icon.js | 8 +++++++-
 app/components/vector_icon.js  | 9 +++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/components/channel_icon.js b/app/components/channel_icon.js
index 9a2422ae2..c0969c005 100644
--- a/app/components/channel_icon.js
+++ b/app/components/channel_icon.js
@@ -8,10 +8,11 @@ import {
     Text,
     View,
 } from 'react-native';
-import Icon from 'react-native-vector-icons/FontAwesome5';
 
 import {General} from 'mattermost-redux/constants';
 
+import Icon from 'app/components/vector_icon';
+
 import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
 
 export default class ChannelIcon extends React.PureComponent {
@@ -85,6 +86,7 @@ export default class ChannelIcon extends React.PureComponent {
                 <Icon
                     name='archive'
                     style={[style.icon, unreadIcon, activeIcon, {fontSize: size}]}
+                    type='fontawesome'
                 />
             );
         } else if (isBot) {
@@ -92,6 +94,7 @@ export default class ChannelIcon extends React.PureComponent {
                 <Icon
                     name='robot'
                     style={[style.icon, unreadIcon, activeIcon, {fontSize: size}, style.iconBot]}
+                    type='fontawesome5'
                 />
             );
         } else if (hasDraft) {
@@ -99,6 +102,7 @@ export default class ChannelIcon extends React.PureComponent {
                 <Icon
                     name='pencil'
                     style={[style.icon, unreadIcon, activeIcon, {fontSize: size}]}
+                    type='fontawesome'
                 />
             );
         } else if (type === General.OPEN_CHANNEL) {
@@ -106,6 +110,7 @@ export default class ChannelIcon extends React.PureComponent {
                 <Icon
                     name='globe'
                     style={[style.icon, unreadIcon, activeIcon, {fontSize: size}]}
+                    type='fontawesome'
                 />
             );
         } else if (type === General.PRIVATE_CHANNEL) {
@@ -113,6 +118,7 @@ export default class ChannelIcon extends React.PureComponent {
                 <Icon
                     name='lock'
                     style={[style.icon, unreadIcon, activeIcon, {fontSize: size}]}
+                    type='fontawesome'
                 />
             );
         } else if (type === General.GM_CHANNEL) {
diff --git a/app/components/vector_icon.js b/app/components/vector_icon.js
index e074021d7..d0a6d89cb 100644
--- a/app/components/vector_icon.js
+++ b/app/components/vector_icon.js
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import React, {PureComponent} from 'react';
 import {Text} from 'react-native';
 import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome';
+import FontAwesome5Icon from 'react-native-vector-icons/FontAwesome5';
 import FoundationIcon from 'react-native-vector-icons/Foundation';
 import IonIcon from 'react-native-vector-icons/Ionicons';
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons';
@@ -33,6 +34,14 @@ export default class VectorIcon extends PureComponent {
                     size={size}
                 />
             );
+        case 'fontawesome5':
+            return (
+                <FontAwesome5Icon
+                    name={name}
+                    style={style}
+                    size={size}
+                />
+            );
         case 'foundation':
             return (
                 <FoundationIcon