From 28ebe5221f9cc091e0c4bb7a66d7aacd976847cc Mon Sep 17 00:00:00 2001 From: Nawfal Ahmed <111358247+NawfalAhmed@users.noreply.github.com> Date: Wed, 21 Jun 2023 18:10:20 +0500 Subject: [PATCH] fix: fix subscription timezone logic (#32536) --- .../models/program_subscription_model.js | 8 ++++++-- 1 file changed, 6 insertions(+), 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 index ae102503cb..8e491de9f2 100644 --- 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