Chat Fixes & Counter Updated on Signal R

lib/ui/chat/chat_detailed_screen.dart

@@ -95,7 +95,8 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
           21.width,
         ],
       ),
-      body: Consumer<ChatProviderModel>(
+      body: SafeArea(
+        child: Consumer<ChatProviderModel>(
           builder: (BuildContext context, ChatProviderModel m, Widget? child) {
             return (m.isLoading
                 ? ChatHomeShimmer(
@@ -235,6 +236,7 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
                   ));
           },
         ),
+      ),
     );
   }
 
@@ -248,14 +250,14 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
             border: Border.all(color: MyColors.darkGrey3BColor, width: 1), borderRadius: BorderRadius.circular(10.0), image: DecorationImage(image: MemoryImage(data.first.image!), fit: BoxFit.cover)),
       );
     } else {
-      return data.first.fileTypeResponse != null
+      return data.first.fileTypeResponse != null && data.first.fileTypeResponse!.fileTypeName != null
           ? Container(
               width: 43,
               height: 43,
-              constraints: BoxConstraints(),
+              constraints: const BoxConstraints(),
               decoration: BoxDecoration(border: Border.all(color: MyColors.darkGrey3BColor, width: 1), borderRadius: BorderRadius.circular(10.0), color: Colors.white),
-              child: SvgPicture.asset(m.getType(data.first.fileTypeResponse!.fileTypeName), alignment: Alignment.center, fit: BoxFit.cover).paddingOnly(left: 5, right: 5, top: 5, bottom: 5))
-          : SizedBox();
+              child: SvgPicture.asset(m.getType(data.first.fileTypeResponse!.fileTypeName ?? ""), alignment: Alignment.center, fit: BoxFit.cover).paddingOnly(left: 5, right: 5, top: 5, bottom: 5))
+          : const SizedBox();
     }
   }