Merge branch 'master' into faiz_dev_marathon_text_fix

# Conflicts:
#	lib/classes/consts.dart

lib/classes/consts.dart

@@ -3,8 +3,8 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 class ApiConsts {
   //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
   // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
-   static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
- // static String baseUrl = "https://hmgwebservices.com"; // Live server
+  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+  static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
@@ -38,8 +38,9 @@ class ApiConsts {
   //Brain Marathon Constants
   static String marathonBaseUrlLive = "https://marathoon.com/service/api/";
   static String marathonBaseUrlUAT = "https://marathoon.com/uatservice/api/";
-  // static String marathonBaseUrl = marathonBaseUrlLive;
-  static String marathonBaseUrl = marathonBaseUrlUAT;
+
+  static String marathonBaseUrl = marathonBaseUrlLive;
+  // static String marathonBaseUrl = marathonBaseUrlUAT;
   static String marathonBaseUrlServices = "https://marathoon.com/service/";
   static String marathonParticipantLoginUrl = marathonBaseUrl + "auth/participantlogin";
   static String marathonProjectGetUrl = marathonBaseUrl + "Project/Project_Get";

lib/ui/chat/chat_detailed_screen.dart

@@ -143,7 +143,7 @@ class _ChatDetailScreenState extends State<ChatDetailScreen> {
                                 dateTime: m.dateFormte(m.userChatHistory[i].createdDate!),
                                 cItem: m.userChatHistory[i],
                               ),
-                              onRightSwipe: () {
+                              onRightSwipe: (val) {
                                 m.chatReply(
                                   m.userChatHistory[i],
                                 );

lib/ui/chat/group_chat_detaied_screen.dart

@@ -147,7 +147,7 @@ class _GroupChatDetailScreenState extends State<GroupChatDetailScreen> {
                           dateTime: m.groupChatHistory[i].createdDate!,
                           cItem: m.groupChatHistory[i],
                         ),
-                        onRightSwipe: () {
+                        onRightSwipe: (val) {
                           m.groupChatReply(
                             m.groupChatHistory[i],
                           );