Merge branch 'develop' into issues/9053/prevent-negative-quantity-and…

…-empty-description
ohcnetwork · Dec 14, 2024 · e55ae0c · e55ae0c
2 parents 650149a + c8963ad
commit e55ae0c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/cypress/e2e/users_spec/UsersManage.cy.ts b/cypress/e2e/users_spec/UsersManage.cy.ts
@@ -66,7 +66,7 @@ describe("Manage User", () => {
     manageUserPage.verifyEditUserDetails(
       "Devo",
       "Districto",
-      "8/11/1999",
+      "11/08/1999",
       "Female",
     );
   });

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.0.4",
     "cross-env": "^7.0.3",
-    "cypress": "^13.16.1",
+    "cypress": "^13.16.0",
     "dayjs": "^1.11.13",
     "echarts": "^5.5.1",
     "echarts-for-react": "^3.0.2",

diff --git a/src/components/Users/UserViewDetails.tsx b/src/components/Users/UserViewDetails.tsx
@@ -1,5 +1,7 @@
 import { useTranslation } from "react-i18next";
 
+import { formatDate } from "@/Utils/utils";
+
 import { UserModel } from "./models";
 
 interface UserViewDetailsProps {
@@ -77,11 +79,7 @@ export const BasicInfoDetails = ({ user }: UserViewDetailsProps) => {
         <LabelValue
           id="date_of_birth"
           label={t("date_of_birth")}
-          value={
-            user.date_of_birth
-              ? new Date(user.date_of_birth).toLocaleDateString()
-              : null
-          }
+          value={user.date_of_birth ? formatDate(user.date_of_birth) : null}
         />
       </div>
     </div>