From 52b0fcc2f766dc9cf68e586dcf19897e03db29c2 Mon Sep 17 00:00:00 2001 From: abose Date: Sat, 30 Aug 2025 16:50:52 +0530 Subject: [PATCH 1/2] fix: in browser we get message welcome back, a*** on login --- src/nls/root/strings.js | 1 + src/services/login-browser.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index ed665e515b..c299818750 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -1615,6 +1615,7 @@ define({ "CHECKING_STATUS": "Checking login status\u2026", "NOT_SIGNED_IN_YET": "Not signed in yet. Please complete sign-in in the other tab.", "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK_USER": "Welcome back, {0}!", "POPUP_BLOCKED": "Pop-up blocked. Please allow pop-ups and try again, or manually navigate to {0}", // Collapse Folders diff --git a/src/services/login-browser.js b/src/services/login-browser.js index 1c139b340d..8f0338dfba 100644 --- a/src/services/login-browser.js +++ b/src/services/login-browser.js @@ -268,8 +268,12 @@ define(function (require, exports, module) { function _onLoginSuccess() { if (loginWaitingDialog) { const $template = loginWaitingDialog.getElement(); + const welcomeBackMessage = Phoenix.isNativeApp ? + StringUtils.format(Strings.WELCOME_BACK_USER, userProfile.firstName): Strings.WELCOME_BACK; + // in desktop app, the apis return full username so we can show `Welcome back, alice`, but in + // browser app, we only get name like `a***` due to security posture, so we show `Welcome back` in browser. $template.find('#login-status') - .text(StringUtils.format(Strings.WELCOME_BACK, userProfile.firstName)) + .text(welcomeBackMessage) .css('color', '#10b981'); setTimeout(() => { _cancelLoginWaiting(); From 9ff78cde8c7af5e467938c70919fb8fbbd0c133d Mon Sep 17 00:00:00 2001 From: abose Date: Sat, 30 Aug 2025 16:53:39 +0530 Subject: [PATCH 2/2] fix: welcome back string typo --- src/nls/root/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index c299818750..78028bf314 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -1614,7 +1614,7 @@ define({ "CHECKING": "Checking\u2026", "CHECKING_STATUS": "Checking login status\u2026", "NOT_SIGNED_IN_YET": "Not signed in yet. Please complete sign-in in the other tab.", - "WELCOME_BACK": "Welcome back, {0}!", + "WELCOME_BACK": "Welcome back", "WELCOME_BACK_USER": "Welcome back, {0}!", "POPUP_BLOCKED": "Pop-up blocked. Please allow pop-ups and try again, or manually navigate to {0}",