@tap-payments/os-micro-frontend-shared 0.0.188 → 0.0.189

package/build/components/Calender/Calender.js

@@ -15,7 +15,7 @@ import ClickAwayListener from '@mui/material/ClickAwayListener';
 import Popper from '@mui/material/Popper';
 import { useTranslation } from 'react-i18next';
 import { Calendar as MDPicker, DateObject } from 'react-multi-date-picker';
-import TimePicker, { getDefaultHour, getDefaultMinute } from '../Timepicker';
+import TimePicker, { getDefaultHour, getDefaultMinute, convertTo12Hour } from '../Timepicker';
 import { darkLeftArrowIcon, darkRightArrowIcon } from '../../constants/index.js';
 import { ArrowButton, CalenderWrapper, SelectedDate, Wrapper, ButtonsWrapper, CancelButton, OkayButton, FooterButtonsWrapper } from './style';
 const weekDays = ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'];
@@ -25,8 +25,8 @@ function Calender(_a) {
     const [anchorEl, setAnchorEl] = useState(null);
     const [date, setDate] = useState(value ? new DateObject(new Date(value.toLocaleString())) : new DateObject(new Date()));
     const [tempDate, setTempDate] = useState(value ? new DateObject(new Date(value.toLocaleString())) : new DateObject(new Date()));
-    const defaultHour = (value === null || value === void 0 ? void 0 : value.hour) && (value === null || value === void 0 ? void 0 : value.hour) > 12 ? (value === null || value === void 0 ? void 0 : value.hour) - 12 : value === null || value === void 0 ? void 0 : value.hour;
-    const [time, setTime] = useState({ hour: defaultHour !== null && defaultHour !== void 0 ? defaultHour : getDefaultHour(), minute: (_b = value === null || value === void 0 ? void 0 : value.minute) !== null && _b !== void 0 ? _b : getDefaultMinute() });
+    const defaultHour = (value === null || value === void 0 ? void 0 : value.hour) ? convertTo12Hour(value.hour) : getDefaultHour();
+    const [time, setTime] = useState({ hour: defaultHour, minute: (_b = value === null || value === void 0 ? void 0 : value.minute) !== null && _b !== void 0 ? _b : getDefaultMinute() });
     const { t } = useTranslation();
     const open = Boolean(anchorEl);
     const getArrow = (direction) => {

package/build/components/Timepicker/utils.d.ts

@@ -1,2 +1,3 @@
+export declare const convertTo12Hour: (hour24: number) => number;
 export declare const getDefaultMinute: () => number;
 export declare const getDefaultHour: () => number;

package/build/components/Timepicker/utils.js

@@ -1,2 +1,12 @@
+export const convertTo12Hour = (hour24) => {
+    if (hour24 === 0)
+        return 12;
+    if (hour24 <= 12)
+        return hour24;
+    return hour24 - 12;
+};
 export const getDefaultMinute = () => new Date().getMinutes();
-export const getDefaultHour = () => (new Date().getHours() > 12 ? new Date().getHours() - 12 : new Date().getHours());
+export const getDefaultHour = () => {
+    const currentHour = new Date().getHours();
+    return convertTo12Hour(currentHour);
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tap-payments/os-micro-frontend-shared",
   "description": "Shared components and utilities for Tap Payments micro frontends",
-  "version": "0.0.188",
+  "version": "0.0.189",
   "type": "module",
   "main": "build/index.js",
   "module": "build/index.js",