diff --git a/package-lock.json b/package-lock.json index d5a57fdc..05316d73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17746,8 +17746,8 @@ } }, "screen-share-indicator-frame": { - "version": "1.4.7", - "resolved": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#91f72807c2e067abf39f5eab32e3fba3f3961a92", + "version": "1.4.8", + "resolved": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#c48f25a170fbf18361d109e58d391d105ca7efc5", "optional": true, "requires": { "run-script-os": "1.0.7" diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts index 6429b27a..f61e073c 100644 --- a/src/app/window-handler.ts +++ b/src/app/window-handler.ts @@ -460,8 +460,21 @@ export class WindowHandler { return; } if (this.url.indexOf('welcome')) { - this.mainWindow.webContents.send('page-load-welcome', { locale: i18n.getLocale(), resource: i18n.loadedResources }); - this.mainWindow.webContents.send('welcome', { url: this.startUrl, message: '', urlValid: true, sso: false }); + this.mainWindow.webContents.send('page-load-welcome', { + locale: i18n.getLocale(), + resource: i18n.loadedResources, + }); + const userConfigUrl = this.userConfig.url + && this.userConfig.url.indexOf('/login/sso/initsso') > -1 ? + this.userConfig.url.slice(0, this.userConfig.url.indexOf('/login/sso/initsso')) + : this.userConfig.url; + + this.mainWindow.webContents.send('welcome', { + url: userConfigUrl || this.startUrl, + message: '', + urlValid: true, + sso: false, + }); } }); diff --git a/src/renderer/preload-main.ts b/src/renderer/preload-main.ts index ba3b9773..7418241c 100644 --- a/src/renderer/preload-main.ts +++ b/src/renderer/preload-main.ts @@ -156,8 +156,8 @@ ipcRenderer.on('page-load', (_event, { locale, resources, enableCustomTitleBar } ipcRenderer.on('page-load-welcome', (_event, data) => { const { locale, resource } = data; i18n.setResource(locale, resource); - // Renders component as soon as the page is ready - document.title = i18n.t('WelcomeText', 'Welcome')(); + + document.title = 'Welcome'; const styles = document.createElement('link'); styles.rel = 'stylesheet'; styles.type = 'text/css';