From a4284666a3760a226a3bab2e3745a7247334467f Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Sat, 20 Jul 2019 03:17:32 +0200
Subject: [PATCH] Automated cherry pick of #3002 (#3004)

* Set footerColor the same as navBarBackgroundColor

* Oops, forgot __snapshots__
---
 .../__snapshots__/main_sidebar.test.js.snap   | 13 +++++++
 app/components/sidebars/main/main_sidebar.js  |  2 +-
 .../sidebars/main/main_sidebar.test.js        | 38 +++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 app/components/sidebars/main/__snapshots__/main_sidebar.test.js.snap
 create mode 100644 app/components/sidebars/main/main_sidebar.test.js

diff --git a/app/components/sidebars/main/__snapshots__/main_sidebar.test.js.snap b/app/components/sidebars/main/__snapshots__/main_sidebar.test.js.snap
new file mode 100644
index 000000000..b60408525
--- /dev/null
+++ b/app/components/sidebars/main/__snapshots__/main_sidebar.test.js.snap
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ChannelSidebar should match, full snapshot 1`] = `
+<DrawerLayout
+  drawerPosition="left"
+  drawerWidth={-30}
+  isTablet={false}
+  onDrawerClose={[Function]}
+  onDrawerOpen={[Function]}
+  renderNavigationView={[Function]}
+  useNativeAnimations={true}
+/>
+`;
diff --git a/app/components/sidebars/main/main_sidebar.js b/app/components/sidebars/main/main_sidebar.js
index edb8d6ddd..d489946db 100644
--- a/app/components/sidebars/main/main_sidebar.js
+++ b/app/components/sidebars/main/main_sidebar.js
@@ -378,7 +378,7 @@ export default class ChannelSidebar extends Component {
             <SafeAreaView
                 navBarBackgroundColor={theme.sidebarBg}
                 backgroundColor={theme.sidebarHeaderBg}
-                footerColor={theme.sidebarHeaderBg}
+                footerColor={theme.sidebarBg}
             >
                 <DrawerSwiper
                     ref={this.drawerSwiperRef}
diff --git a/app/components/sidebars/main/main_sidebar.test.js b/app/components/sidebars/main/main_sidebar.test.js
new file mode 100644
index 000000000..a2bbabb42
--- /dev/null
+++ b/app/components/sidebars/main/main_sidebar.test.js
@@ -0,0 +1,38 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {shallow} from 'enzyme';
+
+import Preferences from 'mattermost-redux/constants/preferences';
+
+import ChannelSidebar from './main_sidebar';
+
+jest.mock('react-intl');
+
+describe('ChannelSidebar', () => {
+    const baseProps = {
+        actions: {
+            getTeams: jest.fn(),
+            logChannelSwitch: jest.fn(),
+            makeDirectChannel: jest.fn(),
+            setChannelDisplayName: jest.fn(),
+            setChannelLoading: jest.fn(),
+        },
+        blurPostTextBox: jest.fn(),
+        currentTeamId: 'current-team-id',
+        currentUserId: 'current-user-id',
+        deviceWidth: 10,
+        isLandscape: false,
+        teamsCount: 2,
+        theme: Preferences.THEMES.default,
+    };
+
+    test('should match, full snapshot', () => {
+        const wrapper = shallow(
+            <ChannelSidebar {...baseProps}/>
+        );
+
+        expect(wrapper.getElement()).toMatchSnapshot();
+    });
+});