fix: fix subscription timezone logic (#32536)

openedx · Jun 21, 2023 · 28ebe52 · 28ebe52
1 parent 597a1f1
commit 28ebe52
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lms/static/js/learner_dashboard/models/program_subscription_model.js b/lms/static/js/learner_dashboard/models/program_subscription_model.js
@@ -79,7 +79,9 @@ class ProgramSubscriptionModel extends Backbone.Model {
             return ['', ''];
         }
 
-        const userTimezone = userPreferences.time_zone || 'UTC';
+        const userTimezone = (
+            userPreferences.time_zone || moment.tz.guess() || 'UTC'
+        );
         const userLanguage = userPreferences['pref-lang'] || 'en';
         const context = {
             datetime: date,
@@ -102,7 +104,9 @@ class ProgramSubscriptionModel extends Backbone.Model {
             return 0;
         }
 
-        const userTimezone = userPreferences.time_zone || 'UTC';
+        const userTimezone = (
+            userPreferences.time_zone || moment.tz.guess() || 'UTC'
+        );
         const trialEndTime = DateUtils.localizeTime(
             DateUtils.stringToMoment(trialEndDate),
             userTimezone