From 486917d69223255a0cddf2bbc4a8f1b6bdf48271 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Sat, 28 Sep 2019 18:44:52 +0200
Subject: [PATCH] Automated cherry pick of #3344 (#3345)

* Fix channel navbar title displayName variable

* Fix snapshots
---
 .../__snapshots__/channel_title.test.js.snap      | 15 ++++++++++++++-
 .../channel_title/channel_title.js                |  2 +-
 .../channel_title/channel_title.test.js           |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/screens/channel/channel_nav_bar/channel_title/__snapshots__/channel_title.test.js.snap b/app/screens/channel/channel_nav_bar/channel_title/__snapshots__/channel_title.test.js.snap
index 286ecbdf1..56e371084 100644
--- a/app/screens/channel/channel_nav_bar/channel_title/__snapshots__/channel_title.test.js.snap
+++ b/app/screens/channel/channel_nav_bar/channel_title/__snapshots__/channel_title.test.js.snap
@@ -33,6 +33,19 @@ exports[`ChannelTitle should match snapshot 1`] = `
           "textAlign": "center",
         }
       }
+    >
+      My Channel
+    </Text>
+    <Icon
+      allowFontScaling={false}
+      name="chevron-down"
+      size={12}
+      style={
+        Object {
+          "color": undefined,
+          "marginHorizontal": 5,
+        }
+      }
     />
   </View>
 </TouchableOpacity>
@@ -77,7 +90,7 @@ exports[`ChannelTitle should match snapshot when isSelfDMChannel is true 1`] = `
         id="channel_header.directchannel.you"
         values={
           Object {
-            "displayname": undefined,
+            "displayName": "My User",
           }
         }
       />
diff --git a/app/screens/channel/channel_nav_bar/channel_title/channel_title.js b/app/screens/channel/channel_nav_bar/channel_title/channel_title.js
index deedc4c0b..e91c20a04 100644
--- a/app/screens/channel/channel_nav_bar/channel_title/channel_title.js
+++ b/app/screens/channel/channel_nav_bar/channel_title/channel_title.js
@@ -99,7 +99,7 @@ export default class ChannelTitle extends PureComponent {
         if (isSelfDMChannel) {
             const messageId = t('channel_header.directchannel.you');
             const defaultMessage = '{displayName} (you)';
-            const values = {displayname: channelDisplayName};
+            const values = {displayName: channelDisplayName};
 
             return (
                 <FormattedText
diff --git a/app/screens/channel/channel_nav_bar/channel_title/channel_title.test.js b/app/screens/channel/channel_nav_bar/channel_title/channel_title.test.js
index 703b6597a..fd89d5a37 100644
--- a/app/screens/channel/channel_nav_bar/channel_title/channel_title.test.js
+++ b/app/screens/channel/channel_nav_bar/channel_title/channel_title.test.js
@@ -10,6 +10,7 @@ jest.mock('react-intl');
 
 describe('ChannelTitle', () => {
     const baseProps = {
+        displayName: 'My Channel',
         isGuest: false,
         hasGuests: false,
         canHaveSubtitle: false,
@@ -27,6 +28,7 @@ describe('ChannelTitle', () => {
     test('should match snapshot when isSelfDMChannel is true', () => {
         const props = {
             ...baseProps,
+            displayName: 'My User',
             isSelfDMChannel: true,
         };
         const wrapper = shallow(