diff --git a/lib/features/auth/models/auth_token.dart b/lib/features/auth/models/auth_token.dart
index d0fcea7..18612c6 100644
--- a/lib/features/auth/models/auth_token.dart
+++ b/lib/features/auth/models/auth_token.dart
@@ -14,14 +14,24 @@ class AuthToken extends Equatable {
     required this.tnc,
   });
 
-   factory AuthToken.fromJson(Map<String, dynamic> json) {
-   final token = json['token'];
-   return AuthToken(
-     accessToken: token,
-     expiresAt: _decodeExpiryFromToken(token), // Keep existing method for expiry
-     tnc: _decodeTncFromToken(token), // Use new method for tnc
-   );
- }
+     factory AuthToken.fromJson(Map<String, dynamic> json) {
+  final token = json['token'];
+
+  // Safely extract tnc.mobile directly from the outer JSON
+  bool tncMobileValue = false; // Default to false if not found or invalid
+  if (json.containsKey('tnc') && json['tnc'] is Map<String, dynamic>) {
+    final tncMap = json['tnc'] as Map<String, dynamic>;
+    if (tncMap.containsKey('mobile') && tncMap['mobile'] is bool) {
+      tncMobileValue = tncMap['mobile'] as bool;
+    }
+  }
+
+  return AuthToken(
+    accessToken: token,
+    expiresAt: _decodeExpiryFromToken(token), // This method is still valid for JWT expiry
+    tnc: tncMobileValue, // Use the correctly extracted value
+  );
+}
 
   static DateTime _decodeExpiryFromToken(String token) {
     try {
@@ -46,42 +56,42 @@ class AuthToken extends Equatable {
     }
   }
   
-  static bool _decodeTncFromToken(String token) {
-  try {
-    final parts = token.split('.');
-    if (parts.length != 3) {
-      throw Exception('Invalid JWT format for TNC decoding');
-    }
-    final payload = parts[1];
-    String normalized = base64Url.normalize(payload);
-    final payloadMap = json.decode(utf8.decode(base64Url.decode(normalized)));
+  //   static bool _decodeTncFromToken(String token) {
+  //   try {
+  //     final parts = token.split('.');
+  //     if (parts.length != 3) {
+  //       throw Exception('Invalid JWT format for TNC decoding');
+  //     }
+  //     final payload = parts[1];
+  //     String normalized = base64Url.normalize(payload);
+  //     final payloadMap = json.decode(utf8.decode(base64Url.decode(normalized)));
 
-    if (payloadMap is! Map<String, dynamic> || !payloadMap.containsKey('tnc')) {
-      // If 'tnc' is not present in the payload, default to false
-      return false;
-    }
+  //     if (payloadMap is! Map<String, dynamic> || !payloadMap.containsKey('tnc')) {
+  //       // If 'tnc' is not present in the payload, default to false
+  //       return false;
+  //     }
 
-    final tncValue = payloadMap['tnc'];
+  //     final tncValue = payloadMap['tnc'];
 
-    // Handle different representations of 'true'
-    if (tncValue is bool) {
-      return tncValue;
-    }
-    if (tncValue is String) {
-      return tncValue.toLowerCase() == 'true';
-    }
-    if (tncValue is int) {
-      return tncValue == 1;
-    }
+  //     // Handle different representations of 'true'
+  //     if (tncValue is bool) {
+  //       return tncValue;
+  //     }
+  //     if (tncValue is String) {
+  //       return tncValue.toLowerCase() == 'true';
+  //     }
+  //     if (tncValue is int) {
+  //       return tncValue == 1;
+  //     }
 
-    // Default to false for any other case
-    return false;
-  } catch (e) {
-    log('Error decoding tnc from token: $e');
-    // Default to false if decoding fails or 'tnc' is not found/invalid
-    return false;
-  }
-}
+  //     // Default to false for any other case
+  //     return false;
+  //   } catch (e) {
+  //     log('Error decoding tnc from token: $e');
+  //     // Default to false if decoding fails or 'tnc' is not found/invalid
+  //     return false;
+  //   }
+  // }
 
   bool get isExpired => DateTime.now().isAfter(expiresAt);