Merge branch 'master' into development_sikander

lib/api/marathon/marathon_api_client.dart

@@ -87,8 +87,8 @@ class MarathonApiClient {
   Future<int?> joinMarathonAsParticipant() async {
     Map<String, String> jsonObject = <String, String>{
       "employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER ?? "",
-      "employeeNameAr": AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? "",
-      "employeeNameEn": AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "",
+      "employeeNameAr": AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "",
+      "employeeNameEn": AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? "",
       "marathonId": AppState().getMarathonProjectId!,
     };
 
@@ -103,7 +103,6 @@ class MarathonApiClient {
     );
   }
 
-
   Future<QuestionModel> getNextQuestion({required String? questionId, required String marathonId}) async {
     Map<String, String?> jsonObject = <String, String?>{
       "previousQuestionId": questionId,