[MM-61717] Refresh Settings Modal without Bootstrap (#3337)
* [MM-61717] Refresh Settings Modal without Bootstrap * Fix i18n * Couple small bug fixes * E2E test updates * Fix linux tests * PR feedback * PR feedback * PR feedback * Fix the border opacity and height * PR feedback * PR feedback 2
This commit is contained in:
@@ -38,16 +38,17 @@ function handleShowOnboardingScreens(showWelcomeScreen: boolean, showNewServerMo
|
||||
log.debug('handleShowOnboardingScreens', {showWelcomeScreen, showNewServerModal, mainWindowIsVisible});
|
||||
|
||||
if (showWelcomeScreen) {
|
||||
if (ModalManager.isModalDisplayed()) {
|
||||
const welcomeScreen = ModalManager.modalQueue.find((modal) => modal.key === 'welcomeScreen');
|
||||
if (welcomeScreen) {
|
||||
return;
|
||||
}
|
||||
|
||||
handleWelcomeScreenModal();
|
||||
|
||||
if (process.env.NODE_ENV === 'test') {
|
||||
const welcomeScreen = ModalManager.modalQueue.find((modal) => modal.key === 'welcomeScreen');
|
||||
if (welcomeScreen?.view.webContents.isLoading()) {
|
||||
welcomeScreen?.view.webContents.once('did-finish-load', () => {
|
||||
const welcomeScreenTest = ModalManager.modalQueue.find((modal) => modal.key === 'welcomeScreen');
|
||||
if (welcomeScreenTest?.view.webContents.isLoading()) {
|
||||
welcomeScreenTest?.view.webContents.once('did-finish-load', () => {
|
||||
app.emit('e2e-app-loaded');
|
||||
});
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user