From 34af97331670b5470da75048c888a3c0c179cd90 Mon Sep 17 00:00:00 2001
From: Nev Angelova <nevy.angelova@gmail.com>
Date: Tue, 29 Sep 2020 17:31:54 +0300
Subject: [PATCH] [MM-25789] - Update default settings for new installations
 (#1376)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [MM-25789] - Update default settings for new installations

* Update src/main.js

Co-authored-by: Guillermo Vayá <guillermo.vaya@mattermost.com>

* Update src/main.js

Co-authored-by: Guillermo Vayá <guillermo.vaya@mattermost.com>

* Fix linter

Co-authored-by: Nevyana Angelova <nevyangelova@Nevyanas-MacBook-Pro-2.local>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Guillermo Vayá <guillermo.vaya@mattermost.com>
---
 src/common/config/defaultPreferences.js | 4 ++--
 src/main.js                             | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/common/config/defaultPreferences.js b/src/common/config/defaultPreferences.js
index 0fb3c778..d8de17e4 100644
--- a/src/common/config/defaultPreferences.js
+++ b/src/common/config/defaultPreferences.js
@@ -9,9 +9,9 @@
 const defaultPreferences = {
   version: 2,
   teams: [],
-  showTrayIcon: false,
+  showTrayIcon: true,
   trayIconTheme: 'light',
-  minimizeToTray: false,
+  minimizeToTray: true,
   notifications: {
     flashWindow: 2,
     bounceIcon: true,
diff --git a/src/main.js b/src/main.js
index e37c90f6..a28f8920 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1145,10 +1145,7 @@ function getDeeplinkingURL(args) {
 }
 
 function shouldShowTrayIcon() {
-  if (process.platform === 'win32') {
-    return true;
-  }
-  if (['darwin', 'linux'].includes(process.platform) && config.showTrayIcon === true) {
+  if (config.showTrayIcon === true || process.platform === 'win32') {
     return true;
   }
   return false;