diff --git a/lib/new_ui/otp/otp_validation_bootmsheet_widget.dart b/lib/new_ui/otp/otp_validation_bootmsheet_widget.dart index 35581ff8..b3ab81fc 100644 --- a/lib/new_ui/otp/otp_validation_bootmsheet_widget.dart +++ b/lib/new_ui/otp/otp_validation_bootmsheet_widget.dart @@ -76,7 +76,7 @@ class _GenericBottomSheetState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - AppText(widget.isForEmail ? TranslationBase.of(context).enterEmailAddress : TranslationBase.of(context).enterPhoneNumber, + AppText(widget.isForEmail ? TranslationBase.of(context).enterEmail : TranslationBase.of(context).enterPhoneNumber, fontSize: 28, letterSpacing: -2, color: Color(0xFF2E3039), fontWeight: FontWeight.w600), InkWell( onTap: () { diff --git a/lib/pages/login/register_new.dart b/lib/pages/login/register_new.dart index 3f2ff485..2bc43879 100644 --- a/lib/pages/login/register_new.dart +++ b/lib/pages/login/register_new.dart @@ -249,7 +249,7 @@ class _RegisterNew extends State { selectedDOB = DateTime.parse(value!); if (isHijri == 1) { var hijriDate = HijriGregConverter.gregorianToHijri(DateTime.parse(value)); - selectedDOB = DateTime(hijriDate.year, hijriDate.month, hijriDate.day, DateTime.now().hour, DateTime.now().minute, DateTime.now().second); + selectedDOB = DateTime(hijriDate.year, hijriDate.month, hijriDate.day); } else { selectedDOB = DateTime.parse(value); } diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index 76dfe15b..ec374f72 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -136,21 +136,18 @@ class Utils { } } - static String formatHijriDateToDisplay(String hijriDateString) { try { // Assuming hijriDateString is in the format yyyy-MM-dd - final parts = hijriDateString.split('-'); + final datePart = hijriDateString.split("T").first; + final parts = datePart.split('-'); if (parts.length != 3) return ""; final day = parts[2].padLeft(2, '0'); final year = parts[0]; // Map month number to short month name (Hijri months) - const hijriMonthNames = [ - 'Muharram', 'Safar', 'Rabi I', 'Rabi II', 'Jumada I', 'Jumada II', - 'Rajab', 'Sha\'ban', 'Ramadan', 'Shawwal', 'Dhu al-Qi\'dah', 'Dhu al-Hijjah' - ]; + const hijriMonthNames = ['Muharram', 'Safar', 'Rabi I', 'Rabi II', 'Jumada I', 'Jumada II', 'Rajab', 'Sha\'ban', 'Ramadan', 'Shawwal', 'Dhu al-Qi\'dah', 'Dhu al-Hijjah']; final monthIndex = int.tryParse(parts[1]) ?? 1; final month = hijriMonthNames[monthIndex - 1]; @@ -161,8 +158,6 @@ class Utils { } } - - static String formatDateToUsage(String isoDateString) { try { final dateTime = DateTime.parse(isoDateString);