change default value of second argument in formatDate function and us…

…e it in this case to fix time zone calculation
dzonidoo · Aug 20, 2024 · ab586ec · ab586ec
1 parent f21b14b
commit ab586ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/assets/user-profile/components/profile/UserProfile.tsx b/assets/user-profile/components/profile/UserProfile.tsx
@@ -194,7 +194,7 @@ class UserProfile extends React.PureComponent<IProps> {
                                             <div className="nh-container nh-container__text--alert">
                                                 <div className='d-flex flex-column gap-3 p-3'>
                                                     <div>
-                                                        {gettext('All notifications will be paused from {{dateFrom}} to {{dateTo}}', {dateFrom: formatDate(pausedFrom), dateTo: formatDate(pausedTo)})}
+                                                        {gettext('All notifications will be paused from {{dateFrom}} to {{dateTo}}', {dateFrom: formatDate(pausedFrom, true), dateTo: formatDate(pausedTo, true)})}
                                                     </div>
                                                     <div>
                                                         <button

diff --git a/assets/utils.tsx b/assets/utils.tsx
@@ -170,7 +170,7 @@ export function getProductQuery(product: any) {
  * @param {Boolean} ignoreTimezone - avoid converting time to different timezone, will output the date as it is
  * @return {Date}
  */
-export function parseDate(dateString: any, ignoreTimezone: any = false) {
+export function parseDate(dateString: any, ignoreTimezone?: boolean) {
     const parsed = ignoreTimezone ? moment.utc(dateString) : moment(dateString);
 
     parsed.locale(getLocale());
@@ -283,8 +283,8 @@ export function formatTime(dateString: any) {
  * @param {String} dateString
  * @return {String}
  */
-export function formatDate(dateString: any) {
-    return parseDate(dateString).format(DATE_FORMAT);
+export function formatDate(dateString: any, ignoreTimezone?: boolean) {
+    return parseDate(dateString, ignoreTimezone).format(DATE_FORMAT);
 }
 
 /**