[MM-40574] Fix for race condition where new server modal didn't show initially on Linux, resizing issues (#1865)

* FIx for linux modal sizing

* Fix race condition, merge'd
This commit is contained in:
Devin Binnie
2021-12-17 09:10:08 -05:00
committed by GitHub
parent 9b1ee66c8c
commit c4e63fb3f9
9 changed files with 48 additions and 17 deletions

View File

@@ -7,7 +7,7 @@ import {RELOAD_CONFIGURATION} from 'common/communication';
import Config from 'common/config';
import {handleConfigUpdate} from 'main/app/config';
import {handleNewServerModal} from 'main/app/intercom';
import {addNewServerModalWhenMainWindowIsShown} from 'main/app/intercom';
import WindowManager from 'main/windows/windowManager';
import AutoLauncher from 'main/AutoLauncher';
@@ -32,7 +32,7 @@ jest.mock('main/app/utils', () => ({
updateServerInfos: jest.fn(),
}));
jest.mock('main/app/intercom', () => ({
handleNewServerModal: jest.fn(),
addNewServerModalWhenMainWindowIsShown: jest.fn(),
}));
jest.mock('main/AutoLauncher', () => ({
enable: jest.fn(),
@@ -98,7 +98,7 @@ describe('main/app/config', () => {
Config.registryConfigData = {};
handleConfigUpdate({teams: []});
expect(handleNewServerModal).toHaveBeenCalled();
expect(addNewServerModalWhenMainWindowIsShown).toHaveBeenCalled();
Object.defineProperty(process, 'platform', {
value: originalPlatform,