diff --git a/lib/view_models/notification_view_model.dart b/lib/view_models/notification_view_model.dart index c888f33..43bdf17 100644 --- a/lib/view_models/notification_view_model.dart +++ b/lib/view_models/notification_view_model.dart @@ -315,17 +315,18 @@ class NotificationViewModel with ChangeNotifier { notifyListeners(); } - String timeAgo(String dateTimeString) { - final createdAt = DateTime.parse(dateTimeString); + String timeAgo(timestamp) { + final int ts = int.tryParse(timestamp.toString()) ?? 0; + final createdAt = DateTime.fromMillisecondsSinceEpoch(ts * 1000).toLocal(); final now = DateTime.now(); final difference = now.difference(createdAt); if (difference.inMinutes < 1) { return NotificationStrings.now; } else if (difference.inMinutes < 60) { - return '${difference.inMinutes} ${NotificationStrings.min} '; + return '${difference.inMinutes} ${NotificationStrings.min}'; } else if (difference.inHours < 24) { - return '${difference.inHours} ${NotificationStrings.hour} '; + return '${difference.inHours} ${NotificationStrings.hour}'; } else if (difference.inDays == 1) { return NotificationStrings.yesterday; } else { diff --git a/lib/views/notification/widgets/notification_card.dart b/lib/views/notification/widgets/notification_card.dart index 9581510..85825b5 100644 --- a/lib/views/notification/widgets/notification_card.dart +++ b/lib/views/notification/widgets/notification_card.dart @@ -112,7 +112,7 @@ class NotificationCard extends StatelessWidget { SvgPicture.asset(AssetsManager.calendar), SizedBox(width: 4.0.w()), Text( - viewModel.timeAgo(notification.createdAt!), + viewModel.timeAgo(notification.createdAt!.toString()), style: TextStyle( fontSize: 12.0.sp(), fontWeight: FontWeight.w400,