diff --git a/lib/api/chat/chat_api_client.dart b/lib/api/chat/chat_api_client.dart
index 87e684e..c4bba3a 100644
--- a/lib/api/chat/chat_api_client.dart
+++ b/lib/api/chat/chat_api_client.dart
@@ -30,6 +30,8 @@ class ChatApiClient {
       {
         "employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(),
         "password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG",
+        "isMobile": true,
+        "deviceToken": AppState().getDeviceToken,
       },
     );
     if (!kReleaseMode) {
diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart
index e43c774..b3a4a32 100644
--- a/lib/app_state/app_state.dart
+++ b/lib/app_state/app_state.dart
@@ -17,6 +17,12 @@ class AppState {
 
   factory AppState() => _instance;
 
+  String? deviceToken = "";
+
+  set setDeviceToken(v) => deviceToken = v;
+
+  String? get getDeviceToken => deviceToken;
+
   bool isAuthenticated = false;
 
   set setIsAuthenticated(v) => isAuthenticated = v;
diff --git a/lib/classes/push-notification-handler.dart b/lib/classes/push-notification-handler.dart
new file mode 100644
index 0000000..b95ceb2
--- /dev/null
+++ b/lib/classes/push-notification-handler.dart
@@ -0,0 +1,59 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:mohem_flutter_app/app_state/app_state.dart';
+
+// |--> Push Notification Background
+Future<dynamic> backgroundMessageHandler(message) async {
+  print("Firebase backgroundMessageHandler!!!");
+}
+
+class PushNotificationHandler {
+  final BuildContext context;
+  static PushNotificationHandler? _instance;
+
+  PushNotificationHandler(this.context) {
+    PushNotificationHandler._instance = this;
+  }
+
+  static PushNotificationHandler getInstance() => _instance!;
+
+  void init() async {
+    FirebaseMessaging.onMessage.listen((RemoteMessage message) async {
+      if (Platform.isIOS) {
+        await Future.delayed(Duration(milliseconds: 3000)).then((value) {
+          newMessage(message);
+        });
+      } else {
+        newMessage(message);
+      }
+    });
+
+    FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) async {
+      if (Platform.isIOS) {
+        await Future.delayed(Duration(milliseconds: 3000)).then((value) {
+          newMessage(message);
+        });
+      } else {
+        newMessage(message);
+      }
+    });
+
+    FirebaseMessaging.instance.onTokenRefresh.listen((fcm_token) {
+      print("Push Notification onTokenRefresh: " + fcm_token);
+      AppState().setDeviceToken = fcm_token;
+    });
+
+    FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
+  }
+
+  void newMessage(RemoteMessage remoteMessage) async {
+    print("Remote Message: " + remoteMessage.data.toString());
+    if (remoteMessage.data.isEmpty) {
+      return;
+    }
+  }
+}
diff --git a/lib/ui/login/login_screen.dart b/lib/ui/login/login_screen.dart
index 7ba82e4..26e9f3e 100644
--- a/lib/ui/login/login_screen.dart
+++ b/lib/ui/login/login_screen.dart
@@ -12,6 +12,7 @@ import 'package:mohem_flutter_app/api/login_api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
+import 'package:mohem_flutter_app/classes/push-notification-handler.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
@@ -91,8 +92,15 @@ class _LoginScreenState extends State<LoginScreen> {
     try {
       Utils.showLoading(context);
       await Firebase.initializeApp();
+      await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions(
+        alert: true,
+        badge: true,
+        sound: true,
+      );
+      PushNotificationHandler(context).init();
       _firebaseMessaging = FirebaseMessaging.instance;
       firebaseToken = await _firebaseMessaging.getToken();
+      AppState().setDeviceToken = firebaseToken;
       loginInfo = await LoginApiClient().getMobileLoginInfoNEW(firebaseToken ?? "", Platform.isAndroid ? "android" : "ios");
       if (loginInfo == null) {
         await checkPrefs();
@@ -171,7 +179,6 @@ class _LoginScreenState extends State<LoginScreen> {
       }
       if (isAppOpenBySystem!) checkFirebaseToken();
     }
-
     // username.text = "15444";
 
     return Scaffold(
diff --git a/lib/ui/marathon/widgets/marathon_details_card.dart b/lib/ui/marathon/widgets/marathon_details_card.dart
index dda7ef8..267d2d3 100644
--- a/lib/ui/marathon/widgets/marathon_details_card.dart
+++ b/lib/ui/marathon/widgets/marathon_details_card.dart
@@ -57,7 +57,7 @@ class MarathonDetailsCard extends StatelessWidget {
                         children: marathonDetailModel.sponsors!.first.sponsorPrizes!
                             .map(
                               (SponsorPrizes prizes) =>
-                                  "${AppState().isArabic(context) ? prizes.marathonPrizeAr : prizes.marathonPrizeAr}".toText16(color: MyColors.greenColor, isBold: true).paddingOnly(right: 5),
+                                  "${AppState().isArabic(context) ? prizes.marathonPrizeAr : prizes.marathonPrizeEn}".toText16(color: MyColors.greenColor, isBold: true).paddingOnly(right: 5),
                             )
                             .toList(),
                       ),
diff --git a/lib/widgets/mark_attendance_widget.dart b/lib/widgets/mark_attendance_widget.dart
index dfe3b79..59681b7 100644
--- a/lib/widgets/mark_attendance_widget.dart
+++ b/lib/widgets/mark_attendance_widget.dart
@@ -218,6 +218,15 @@ class _MarkAttendanceWidgetState extends State<MarkAttendanceWidget> {
     Utils.showLoading(context);
     bool isConnected = await WiFiForIoTPlugin.connect(AppState().getMohemmWifiSSID ?? "",
         password: AppState().getMohemmWifiPassword ?? "", joinOnce: Platform.isIOS ? false : true, security: NetworkSecurity.WPA, withInternet: false);
+    //
+    // print("CURRENT SSID: ${await WiFiForIoTPlugin.getSSID()}");
+
+    if (await WiFiForIoTPlugin.getSSID() == AppState().getMohemmWifiSSID) {
+      isConnected = true;
+    } else {
+      isConnected = false;
+    }
+
     if (isConnected) {
       if (Platform.isIOS) {
         await closeWifiRequest();