From 0a3203098586d18110d0cd335ad46576101d9d7e Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Wed, 30 Nov 2022 12:08:24 -0400
Subject: [PATCH] [MM-48682] Stop user from opening the servers menu when no
 servers are configured (#2434)

---
 src/main/app/intercom.test.js | 20 +++++++-------------
 src/main/menus/app.ts         |  6 ++++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/main/app/intercom.test.js b/src/main/app/intercom.test.js
index 9d403760..c77e3664 100644
--- a/src/main/app/intercom.test.js
+++ b/src/main/app/intercom.test.js
@@ -16,7 +16,6 @@ import {
     handleRemoveServerModal,
     handleWelcomeScreenModal,
     handleMainWindowIsShown,
-    handleShowOnboardingScreens,
 } from './intercom';
 
 jest.mock('common/config', () => ({
@@ -271,21 +270,16 @@ describe('main/app/intercom', () => {
             Config.set.mockImplementation((name, value) => {
                 Config[name] = value;
             });
-            Config.teams = JSON.parse(JSON.stringify([{
-                name: 'test-team',
-                order: 0,
-                url: 'https://someurl.here',
-            }]));
+            Config.registryConfigData = {
+                teams: JSON.parse(JSON.stringify([{
+                    name: 'test-team',
+                    order: 0,
+                    url: 'https://someurl.here',
+                }])),
+            };
 
             handleMainWindowIsShown();
             expect(ModalManager.addModal).not.toHaveBeenCalled();
         });
     });
-
-    describe('handleShowOnboardingScreens', () => {
-        it('MM-48079 should not show onboarding screen or server screen if GPO server is pre-configured', () => {
-            handleShowOnboardingScreens(false, false, true);
-            expect(ModalManager.addModal).not.toHaveBeenCalled();
-        });
-    });
 });
diff --git a/src/main/menus/app.ts b/src/main/menus/app.ts
index dea85b46..e7bb129b 100644
--- a/src/main/menus/app.ts
+++ b/src/main/menus/app.ts
@@ -254,13 +254,15 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
             role: 'close',
             label: isMac ? localizeMessage('main.menus.app.window.closeWindow', 'Close Window') : localizeMessage('main.menus.app.window.close', 'Close'),
             accelerator: 'CmdOrCtrl+W',
-        }, separatorItem, {
+        }, separatorItem,
+        ...(config.data?.teams.length ? [{
             label: localizeMessage('main.menus.app.window.showServers', 'Show Servers'),
             accelerator: `${process.platform === 'darwin' ? 'Cmd+Ctrl' : 'Ctrl+Shift'}+S`,
             click() {
                 ipcMain.emit(OPEN_TEAMS_DROPDOWN);
             },
-        }, ...teams.sort((teamA, teamB) => teamA.order - teamB.order).slice(0, 9).map((team, i) => {
+        }] : []),
+        ...teams.sort((teamA, teamB) => teamA.order - teamB.order).slice(0, 9).map((team, i) => {
             const items = [];
             items.push({
                 label: team.name,