fix: pro trial upgrade working for most cases

Author: abose

src/nls/root/strings.js

@@ -1678,6 +1678,6 @@ define({
     "PROMO_CARD_4_MESSAGE": "Edit headings, buttons, and copy directly in the preview.",
     "PROMO_LEARN_MORE": "Learn More\u2026",
     "PROMO_GET_APP_UPSELL_BUTTON": "Get {0}",
-    "PROMO_PRO_ENDED_TITLE": "Your {0} upgrade has ended",
+    "PROMO_PRO_ENDED_TITLE": "Your {0} Trial has ended",
     "PROMO_PRO_TRIAL_DAYS_LEFT": "Phoenix Pro Trial ({0} days left)"
 });

src/services/login-browser.js

@@ -393,7 +393,6 @@ define(function (require, exports, module) {
 
     // Only set exports for browser apps to avoid conflict with desktop login
     if (!Phoenix.isNativeApp) {
-        init();
         // kernal exports
         // Add to existing KernalModeTrust.loginService from login-service.js
         LoginService.isLoggedIn = isLoggedIn;
@@ -402,6 +401,7 @@ define(function (require, exports, module) {
         LoginService.getProfile = getProfile;
         LoginService.verifyLoginStatus = () => _verifyBrowserLogin(false);
         LoginService.getAccountBaseURL = _getAccountBaseURL;
+        init();
     }
 
     // public exports

src/services/login-desktop.js

@@ -407,14 +407,14 @@ define(function (require, exports, module) {
 
     // Only set exports for native apps to avoid conflict with browser login
     if (Phoenix.isNativeApp) {
-        init();
         // kernal exports - add to existing KernalModeTrust.loginService from login-service.js
         LoginService.isLoggedIn = isLoggedIn;
         LoginService.signInToAccount = signInToAccount;
         LoginService.signOutAccount = signOutAccount;
         LoginService.getProfile = getProfile;
         LoginService.verifyLoginStatus = () => _verifyLogin(false);
         LoginService.getAccountBaseURL = getAccountBaseURL;
+        init();
     }
 
     // public exports

src/services/profile-menu.js

@@ -140,7 +140,7 @@ define(function (require, exports, module) {
     /**
      * Shows the sign-in popup when the user is not logged in
      */
-    async function showLoginPopup() {
+    function showLoginPopup() {
         // If popup is already visible, just close it
         if (isPopupVisible) {
             closePopup();
@@ -150,26 +150,34 @@ define(function (require, exports, module) {
         // create the popup element
         closePopup(); // close any existing popup first
 
-        // Check if non-logged-in user has trial entitlements
-        const effectiveEntitlements = await KernalModeTrust.loginService.getEffectiveEntitlements();
-        let templateData = {Strings};
-
-        if (effectiveEntitlements && effectiveEntitlements.isInProTrial) {
-            // Add trial information to template data
-            const planName = StringUtils.format(Strings.PROMO_PRO_TRIAL_DAYS_LEFT,
-                effectiveEntitlements.trialDaysRemaining);
-            templateData.trialInfo = {planName};
-        }
-
-        // Render template with data
-        const renderedTemplate = Mustache.render(loginTemplate, templateData);
+        // Render template with basic data first for instant response
+        const renderedTemplate = Mustache.render(loginTemplate, {Strings});
         $popup = $(renderedTemplate);
 
         $("body").append($popup);
         isPopupVisible = true;
 
         positionPopup();
 
+        // Check for trial info asynchronously and update popup
+        KernalModeTrust.loginService.getEffectiveEntitlements().then(effectiveEntitlements => {
+            if (effectiveEntitlements && effectiveEntitlements.isInProTrial && isPopupVisible && $popup) {
+                // Add trial info to the existing popup
+                const planName = StringUtils.format(Strings.PROMO_PRO_TRIAL_DAYS_LEFT,
+                    effectiveEntitlements.trialDaysRemaining);
+                const trialInfoHtml = `<div class="trial-plan-info">
+                    <span class="phoenix-pro-title-plain">
+                        <span class="pro-plan-name">${planName}</span>
+                        <i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
+                    </span>
+                </div>`;
+                $popup.find('.popup-title').after(trialInfoHtml);
+                positionPopup(); // Reposition after adding content
+            }
+        }).catch(error => {
+            console.error('Failed to check trial info for login popup:', error);
+        });
+
         PopUpManager.addPopUp($popup, function() {
             $popup.remove();
             $popup = null;
@@ -365,7 +373,7 @@ define(function (require, exports, module) {
                     $planName.addClass('user-plan-paid').html(proTitle);
                 } else {
                     // For paid users: regular plan name with icon
-                    const proTitle = `<span class="phoenix-pro-title-plain">
+                    const proTitle = `<span class="phoenix-pro-title">
                         <span class="pro-plan-name">${entitlements.plan.name}</span>
                         <i class="fa-solid fa-feather" style="margin-left: 3px;"></i>
                     </span>`;
@@ -550,20 +558,33 @@ define(function (require, exports, module) {
         });
     }
 
+    /**
+     * Check if user has an active trial (works for both logged-in and non-logged-in users)
+     */
+    async function _hasActiveTrial() {
+        try {
+            const effectiveEntitlements = await KernalModeTrust.loginService.getEffectiveEntitlements();
+            return effectiveEntitlements && effectiveEntitlements.isInProTrial;
+        } catch (error) {
+            console.error('Failed to check trial status:', error);
+            return false;
+        }
+    }
+
     /**
      * Initialize branding for non-logged-in trial users on startup
      */
     async function _initializeBrandingForTrialUsers() {
-        // Only check if user is not logged in
-        if (!KernalModeTrust.loginService.isLoggedIn()) {
-            try {
-                const effectiveEntitlements = await KernalModeTrust.loginService.getEffectiveEntitlements();
-                if (effectiveEntitlements && effectiveEntitlements.isInProTrial) {
-                    _updateBranding(effectiveEntitlements);
-                }
-            } catch (error) {
-                console.error('Failed to initialize branding for trial users:', error);
+        try {
+            const effectiveEntitlements = await KernalModeTrust.loginService.getEffectiveEntitlements();
+            if (effectiveEntitlements && effectiveEntitlements.isInProTrial) {
+                console.log('Profile Menu: Found active trial, updating branding...');
+                _updateBranding(effectiveEntitlements);
+            } else {
+                console.log('Profile Menu: No active trial found');
             }
+        } catch (error) {
+            console.error('Failed to initialize branding for trial users:', error);
         }
     }
 
@@ -583,6 +604,14 @@ define(function (require, exports, module) {
 
         // Initialize branding for non-logged-in trial users
         _initializeBrandingForTrialUsers();
+
+        // Listen for entitlements changes to update branding for non-logged-in trial users
+        KernalModeTrust.loginService.on(KernalModeTrust.loginService.EVENT_ENTITLEMENTS_CHANGED, () => {
+            // When entitlements change (including trial activation) for non-logged-in users, update branding
+            if (!KernalModeTrust.loginService.isLoggedIn()) {
+                _initializeBrandingForTrialUsers();
+            }
+        });
     }
 
     function setNotLoggedIn() {
@@ -592,11 +621,24 @@ define(function (require, exports, module) {
         }
         _removeProfileIcon();
 
+        // Reset branding, but preserve trial branding if user has active trial
+        _hasActiveTrial().then(hasActiveTrial => {
+            if (!hasActiveTrial) {
+                // Only reset branding if no trial exists
+                console.log('Profile Menu: No trial, resetting branding to free');
+                _updateBranding(null);
+            } else {
+                // User has trial, maintain pro branding
+                console.log('Profile Menu: Trial exists, maintaining pro branding');
+                _initializeBrandingForTrialUsers();
+            }
+        }).catch(error => {
+            console.error('Failed to check trial status during logout:', error);
+            // Fallback to resetting branding
+            _updateBranding(null);
+        });
         // Clear cached entitlements when user logs out
         KernalModeTrust.loginService.clearEntitlements();
-
-        // Reset branding to free mode
-        _updateBranding(null);
     }
 
     function setLoggedIn(initial, color) {

src/services/promotions.js

@@ -289,6 +289,10 @@ define(function (require, exports, module) {
             trialDays: trialDays,
             isFirstInstall: !existingTrialData
         });
+
+        // Also trigger entitlements changed event since effective entitlements have changed
+        // This allows UI components to update based on the new trial status
+        LoginService.trigger(LoginService.EVENT_ENTITLEMENTS_CHANGED, null);
     }
 
     function _isAnyDialogsVisible() {