From 5eaeb186fe8196402d84b6b7e90c1a1ec3124bd3 Mon Sep 17 00:00:00 2001
From: Dmytro Melnyshyn <dmytro_melnyshyn@epam.com>
Date: Fri, 29 Aug 2025 13:04:50 +0300
Subject: [PATCH] m-3400-3

---
 src/components/EditSections/EditUserInfo/EditUserInfo.js | 7 +++++--
 src/components/UserDetailSections/UserInfo/UserInfo.js   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index 25af9a15f..c7ec95b12 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -89,7 +89,11 @@ class EditUserInfo extends React.Component {
 
   setRecalculatedExpirationDate = (startCalcToday) => {
     const { form: { change } } = this.props;
-    const recalculatedDate = this.calculateNewExpirationDate(startCalcToday).format('L');
+    // Use .format() instead of .format('L') to preserve timezone information in the ISO string.
+    // .format('L') would produce a local date string like "08/31/2025" which loses timezone context,
+    // causing parseExpirationDate to incorrectly interpret the date and shift it by a day.
+    // .format() produces an ISO string like "2025-08-31T02:59:59+03:00" that maintains timezone info.
+    const recalculatedDate = this.calculateNewExpirationDate(startCalcToday).format();
     const parsedRecalculatedDate = this.parseExpirationDate(recalculatedDate);
 
     change('expirationDate', parsedRecalculatedDate);
@@ -374,7 +378,6 @@ class EditUserInfo extends React.Component {
                     parse={this.parseExpirationDate}
                     disabled={disabled}
                     validate={validateMinDate('ui-users.errors.personal.dateOfBirth')}
-                    timeZone="UTC"
                   />
                   {checkShowRecalculateButton() && (
                     <Button
diff --git a/src/components/UserDetailSections/UserInfo/UserInfo.js b/src/components/UserDetailSections/UserInfo/UserInfo.js
index 24c42d95c..7c532ed58 100644
--- a/src/components/UserDetailSections/UserInfo/UserInfo.js
+++ b/src/components/UserDetailSections/UserInfo/UserInfo.js
@@ -105,7 +105,7 @@ const UserInfo = (props) => {
             <Col xs={3}>
               <KeyValue
                 label={<FormattedMessage id="ui-users.information.expirationDate" />}
-                value={user.expirationDate ? <FormattedDate value={user.expirationDate} timeZone="UTC" /> : '-'}
+                value={user.expirationDate ? <FormattedDate value={user.expirationDate} /> : '-'}
               />
             </Col>
             <Col xs={3}>