From 46af0c42c7c3c77cdc47b5f8d0c0d2b44712f8a5 Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@hmg.local>
Date: Mon, 28 Nov 2022 16:14:41 +0300
Subject: [PATCH] updates & fixes

---
 lib/classes/date_uitl.dart                                | 2 +-
 lib/provider/chat_provider_model.dart                     | 1 +
 lib/ui/chat/chat_home_screen.dart                         | 1 +
 lib/ui/work_list/worklist_fragments/actions_fragment.dart | 6 +++---
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/classes/date_uitl.dart b/lib/classes/date_uitl.dart
index f7b8192..f8d1c02 100644
--- a/lib/classes/date_uitl.dart
+++ b/lib/classes/date_uitl.dart
@@ -20,7 +20,7 @@ class DateUtil {
   }
 
   static DateTime convertSimpleStringDateToDate(String date) {
-    return DateFormat("MM/dd/yyyy hh:mm:ss").parse(date);
+    return DateFormat("MM/dd/yyyy hh:mm:ss a").parse(date);
   }
 
   static DateTime convertSimpleStringDateToDateddMMyyyy(String date) {
diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart
index dc98858..74ee633 100644
--- a/lib/provider/chat_provider_model.dart
+++ b/lib/provider/chat_provider_model.dart
@@ -435,6 +435,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
         ChatUser(
           id: targetUserId,
           userName: targetUserName,
+          unreadMessageCount: 0
         ),
       );
       notifyListeners();
diff --git a/lib/ui/chat/chat_home_screen.dart b/lib/ui/chat/chat_home_screen.dart
index 2724683..95ff2ed 100644
--- a/lib/ui/chat/chat_home_screen.dart
+++ b/lib/ui/chat/chat_home_screen.dart
@@ -47,6 +47,7 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
           return m.isLoading
               ? ChatHomeShimmer()
               : ListView(
+            padding: EdgeInsets.zero,
                   shrinkWrap: true,
                   physics: const AlwaysScrollableScrollPhysics(),
                   children: <Widget>[
diff --git a/lib/ui/work_list/worklist_fragments/actions_fragment.dart b/lib/ui/work_list/worklist_fragments/actions_fragment.dart
index fa29d65..98b5b72 100644
--- a/lib/ui/work_list/worklist_fragments/actions_fragment.dart
+++ b/lib/ui/work_list/worklist_fragments/actions_fragment.dart
@@ -147,15 +147,15 @@ class ActionsFragment extends StatelessWidget {
     if (actionHistoryList[index].aCTIONCODE == "SUBMIT") {
       return "";
     } else if (actionHistoryList[index].aCTIONCODE == "PENDING") {
-      if (actionHistoryList[++index].nOTIFICATIONDATE!.isEmpty) {
+      if (actionHistoryList[index + 1].nOTIFICATIONDATE!.isEmpty) {
         return "";
       }
-      DateTime dateTimeFrom = DateUtil.convertSimpleStringDateToDate(actionHistoryList[++index].nOTIFICATIONDATE!);
+      DateTime dateTimeFrom = DateUtil.convertSimpleStringDateToDate(actionHistoryList[index + 1].nOTIFICATIONDATE!);
       Duration duration = DateTime.now().difference(dateTimeFrom);
       return "Action duration: " + DateUtil.formatDuration(duration);
     } else {
       DateTime dateTimeTo = DateUtil.convertSimpleStringDateToDate(actionHistoryList[index].nOTIFICATIONDATE!);
-      DateTime dateTimeFrom = DateUtil.convertSimpleStringDateToDate(actionHistoryList[++index].nOTIFICATIONDATE!);
+      DateTime dateTimeFrom = DateUtil.convertSimpleStringDateToDate(actionHistoryList[index + 1].nOTIFICATIONDATE!);
       Duration duration = dateTimeTo.difference(dateTimeFrom);
       return "Action duration: " + DateUtil.formatDuration(duration);
     }