Merge branch 'master' of bitbucket.org:jubilian/post_enrollment_app

android/app/build.gradle

@@ -19,12 +19,12 @@ if (project.hasProperty('google-services.json')) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '54'
+    flutterVersionCode = '55'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '2.0.16'
+    flutterVersionName = '2.0.17'
 }
 
 def keystoreProperties = new Properties()

lib/pages/changePassword.dart

@@ -128,12 +128,43 @@ class _changesPasswordState extends State<changesPassword> {
              ToastHelper.showErrorToast(context, message!);
              print('Invalid mobile number');
            }
+         } else if (response.statusCode == 401) {
+           setState(() {
+             _isLoading = false;
+           });
+           await SessionManager().clear();
+           ToastHelper.showErrorToast(context, 'Session Out');
+           if (!context.mounted) return;
+           context.go('/login');
+
+         } else if (response.statusCode == 403) {
+           setState(() {
+             _isLoading = false;
+           });
+           await SessionManager().clear();
+           ToastHelper.showErrorToast(context, 'Session Out');
+           if (!context.mounted) return;
+           context.go('/login');
+
+         } else if (response.statusCode == 451) {
+           setState(() {
+             _isLoading = false;
+           });
+           final body =  jsonDecode(response.body);
+           final message = body['message'];
+           ToastHelper.showWarningToast(context, message);
+         } else if (response.statusCode == 429) {
+           setState(() {
+             _isLoading = false;
+           });
+           final body =  jsonDecode(response.body);
+           final message = body['message'];
+           ToastHelper.showWarningToast(context, message);
          } else {
            setState(() {
              _isLoading = false;
            });
-          ToastHelper.showErrorToast(context, 'Something went wrong');
+           throw Exception('Failed to load data');
-          throw Exception('Failed to verify mobile number');
          }
        }
      } catch (e) {

lib/pages/email_verify.dart

@@ -268,13 +268,18 @@ class _MyEmailVerifyState extends State<MyEmailVerify> {
         String status = data['status'];
 
         // Directly access the post_enrollment data
-        Map<String, dynamic> post = data['post_enrollment'];
+        Map<String, dynamic>? post;
+
+        if (data['post_enrollment'] != null &&
+            data['post_enrollment'] is Map<String, dynamic>) {
+          post = data['post_enrollment'];
+        }
+
         print('post: $post');
 
         _postToken = postToken;
-        String postStatus = post['status'];
 
-        if (postStatus == 'success') {
+        if (post != null && post['status'] == 'success') {
           setState(() {
             _isOtpVerified = true; // ✅ LOCK
           });
@@ -291,11 +296,43 @@ class _MyEmailVerifyState extends State<MyEmailVerify> {
           // Show a Snackbar if the OTP is invalid
           print('OTP verification failed. Please try again.');
         }
+      } else if (response.statusCode == 401) {
+        setState(() {
+          _isLoading = false;
+        });
+          await SessionManager().clear();
+        ToastHelper.showErrorToast(context, 'Session Out');
+        if (!context.mounted) return;
+        context.go('/login');
+
+      } else if (response.statusCode == 403) {
+        setState(() {
+          _isLoading = false;
+        });
+        await SessionManager().clear();
+        ToastHelper.showErrorToast(context, 'Session Out');
+        if (!context.mounted) return;
+        context.go('/login');
+
+      } else if (response.statusCode == 451) {
+        setState(() {
+          _isLoading = false;
+        });
+        final body =  jsonDecode(response.body);
+        final message = body['message'];
+        ToastHelper.showWarningToast(context, message);
+      } else if (response.statusCode == 429) {
+        setState(() {
+          _isLoading = false;
+        });
+        final body =  jsonDecode(response.body);
+        final message = body['message'];
+        ToastHelper.showWarningToast(context, message);
       } else {
-        final SharedPreferences prefs = await SharedPreferences.getInstance();
+        setState(() {
-        prefs.clear();
+          _isLoading = false;
-        ToastHelper.showWarningToast(context, 'Something went wrong');
+        });
-        throw Exception('Failed to verify OTP');
+        throw Exception('Failed to load data');
       }
     } catch (e) {
       final SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -887,42 +924,6 @@ class _MyEmailVerifyState extends State<MyEmailVerify> {
                                         ),
                                       ),
                                     ),
-                                    if (!Responsive.isMobile(context) &&
-                                        !Responsive.isTablet(context))
-                                      Expanded(
-                                        flex: 2,
-                                        child: MouseRegion(
-                                          cursor: SystemMouseCursors.click,
-                                          child: GestureDetector(
-                                            onTap: () {
-                                              context.go('/hrLogin');
-                                              // Navigator.pushNamed(
-                                              //     context, 'hrLogin');
-                                            },
-                                            child: Row(
-                                              mainAxisAlignment: MainAxisAlignment
-                                                  .end, // Align to the end (right)
-                                              children: [
-                                                Text(
-                                                  'HR Login',
-                                                  style: GoogleFonts.poppins(
-                                                    color: Color(
-                                                        0xFF000000), // Text color
-                                                    // Add other text styles as needed
-                                                  ),
-                                                ),
-                                                SizedBox(width: 5),
-                                                Icon(
-                                                  Icons
-                                                      .east, // Icon for customer login
-                                                  color: Colors
-                                                      .black, // Adjust color as needed
-                                                ),
-                                              ],
-                                            ),
-                                          ),
-                                        ),
-                                      ),
                                   ],
                                 ),
                               ],
@@ -953,7 +954,7 @@ class _MyEmailVerifyState extends State<MyEmailVerify> {
                                           MainAxisAlignment.center,
                                       children: [
                                         if (!Responsive.isMobile(context) &&
-                                            !Responsive.isTablet(context))
+                                            !Responsive.isTablet(context))...[
                                           Row(
                                             children: [
                                               Expanded(
@@ -985,6 +986,8 @@ class _MyEmailVerifyState extends State<MyEmailVerify> {
                                             ],
                                           ),
                                           SizedBox(height: 10),
+                                        ],
+
                                         // SizedBox(
                                         //   height: Responsive.isDesktop(context)
                                         //       ? _size.height * 0.1

lib/pages/enrollment/service/api_service.dart

@@ -503,10 +503,15 @@ class ApiService {
     if (response.statusCode == 200) {
       return jsonDecode(response.body);
     } else if (response.statusCode == 401) {
-      if (!_isSessionOutToastShown) {
-        _isSessionOutToastShown = true;
       await _clearLocalStorageAndRedirect();
-      }
+      return {};
+    } else if (response.statusCode == 403) {
+      await _clearLocalStorageAndRedirect();
+      return {};
+    } else if (response.statusCode == 451) {
+      final body = jsonDecode(response.body);
+      final message = body['message'];
+      ToastHelper.showWarningToast(context, message);
       return {};
     } else if (response.statusCode == 429) {
       final body = jsonDecode(response.body);

lib/pages/login.dart

@@ -172,9 +172,35 @@ class _loginState extends State<login> {
           final SharedPreferences prefs = await SharedPreferences.getInstance();
           prefs.clear();
         }
+      } else if (response.statusCode == 401) {
+        setState(() {
+          _isLoading = false;
+        });
+        ToastHelper.showErrorToast(context, 'Session Out');
+      } else if (response.statusCode == 403) {
+        setState(() {
+          _isLoading = false;
+        });
+        ToastHelper.showErrorToast(context, 'Session Out');
+      } else if (response.statusCode == 451) {
+        setState(() {
+          _isLoading = false;
+        });
+        final body =  jsonDecode(response.body);
+        final message = body['message'];
+        ToastHelper.showWarningToast(context, message);
+      } else if (response.statusCode == 429) {
+        setState(() {
+          _isLoading = false;
+        });
+        final body =  jsonDecode(response.body);
+        final message = body['message'];
+        ToastHelper.showWarningToast(context, message);
       } else {
-        ToastHelper.showErrorToast(context, 'Something went wrong');
+        setState(() {
-        throw Exception('Failed to verify pin number');
+          _isLoading = false;
+        });
+        throw Exception('Failed to load data');
       }
     } catch (e) {
       // ToastHelper.showErrorToast(context, 'Something went wrong');
@@ -1100,43 +1126,6 @@ class _loginState extends State<login> {
                                                 height: Responsive.isDesktop(context) ? 150 : 100,
                                               )),
                                         ),
-                                        if (!Responsive.isMobile(context) &&
-                                            !Responsive.isTablet(context))
-                                          Expanded(
-                                            flex: 2,
-                                            child: MouseRegion(
-                                              cursor: SystemMouseCursors.click,
-                                              child: GestureDetector(
-                                                onTap: () {
-                                                  // Add your navigation logic here
-                                                  // For example, you can use Navigator.push to navigate to another page
-                                                  Navigator.pushNamed(
-                                                      context, 'hrLogin');
-                                                },
-                                                child: Row(
-                                                  mainAxisAlignment: MainAxisAlignment
-                                                      .end, // Align to the end (right)
-                                                  children: [
-                                                    Text(
-                                                      'HR Login',
-                                                      style: TextStyle(
-                                                        color: Color(
-                                                            0xFF000000), // Text color
-                                                        // Add other text styles as needed
-                                                      ),
-                                                    ),
-                                                    SizedBox(width: 5),
-                                                    Icon(
-                                                      Icons
-                                                          .east, // Icon for customer login
-                                                      color: Colors
-                                                          .black, // Adjust color as needed
-                                                    ),
-                                                  ],
-                                                ),
-                                              ),
-                                            ),
-                                          ),
                                       ],
                                     ),
                                   ],

lib/pages/postEnrollment/claims.dart

@@ -1269,8 +1269,8 @@ class _claimsState extends State<claims> {
                                       message:
                                           claimsSubject, // Full text shown on hover
                                       child: Text(
-                                        claimsSubject.length > 30
+                                        claimsSubject.length > 20
-                                            ? '${claimsSubject.substring(0, 30)}...'
+                                            ? '${claimsSubject.substring(0, 20)}...'
                                             : claimsSubject,
                                         textAlign: TextAlign.left,
                                         style: GoogleFonts.poppins(

lib/pages/postEnrollment/planclaimsform.dart

@@ -80,6 +80,10 @@ class _planclaimsformState extends State<planclaimsform> {
   final fileService = FileUploadService();
   bool isSubmitting = false;
 
+  Map<String, dynamic> claimTypeMap = {};
+  List<Map<String, dynamic>> claimTypeList = [];
+  int? claimTypeId;
+  bool isClaimTypeValid = true;
 
   // Declare subjectController and bodyController as instance variables
   late TextEditingController subjectController;
@@ -207,6 +211,7 @@ class _planclaimsformState extends State<planclaimsform> {
         print('fromClaimsPage $fromClaimsPage');
       }
       if (fromClaimsPage == 0) {
+        setState(() {
           claimSubject = claimsDetails['claim_subject'];
           print('claimSubject $claimSubject');
           claimsDepartmentId = claimsDetails['ticket_type_id'];
@@ -217,6 +222,9 @@ class _planclaimsformState extends State<planclaimsform> {
           print('claimsDepartmentId $claimsDepartmentId');
           claimsPolicyNo = claimsDetails['policy_no'];
           client_policy_id = claimsDetails['client_policy_id'];
+          print('Current Client ID : ${client_policy_id}');
+        });
+
         // employeePolicyList = claimsDetails['EmployeePolicy'];
         // print('employeePolicyList : $employeePolicyList');
         List<dynamic> empList = claimsDetails['EmployeePolicy'];
@@ -368,11 +376,23 @@ class _planclaimsformState extends State<planclaimsform> {
               // 'private': department['private'],
             };
           }).toList();
+
+          claimTypeMap = Map<String, dynamic>.from(response['claim_type']);
           isLoading = false;
         });
+        // ✅ AUTO SELECT SERVICE = 1 (GMC)
+        if (fromClaimsPage == 1 && departmentList.isNotEmpty) {
+          serviceId = 1;
+          loadClaimTypes(serviceId);
+        }
+
         if (fromClaimsPage == 0) {
           setInitialServiceId(departmentList);
+          loadClaimTypes(claimsDepartmentId);
         }
+        // if (fromClaimsPage == 0) {
+        //   setInitialServiceId(departmentList);
+        // }
       } else {
         throw Exception('Failed to fetch department list');
       }
@@ -381,6 +401,35 @@ class _planclaimsformState extends State<planclaimsform> {
     }
   }
 
+  void loadClaimTypes(int? serviceId) {
+    if (serviceId == null) return;
+
+    String key = serviceId.toString();
+
+    if (claimTypeMap.containsKey(key)) {
+      Map<String, dynamic> types =
+      Map<String, dynamic>.from(claimTypeMap[key]);
+
+      claimTypeList = types.entries.map((entry) {
+        return {
+          'id': int.parse(entry.key),
+          'name': entry.value,
+        };
+      }).toList();
+
+      // // ✅ AUTO SELECT FIRST CLAIM TYPE
+      // if (claimTypeList.isNotEmpty) {
+      //   claimTypeId = claimTypeList.first['id'];
+      // }
+
+      setState(() {});
+    } else {
+      claimTypeList = [];
+      claimTypeId = null;
+      setState(() {});
+    }
+  }
+
   void fetchPoliciesBasedOnService(int? serviceId) {
     if (policyList.isEmpty) {
       print('Policy list is empty. Ensure data is fetched before filtering.');
@@ -389,7 +438,7 @@ class _planclaimsformState extends State<planclaimsform> {
     setState(() {
       policyNumberId = null;
       policyTypeCondition = null;
-      client_policy_id = null;
+      // client_policy_id = null;
     });
     print('1111 serviceId : $serviceId');
     if (serviceId == 1 || serviceId == 2 || serviceId == 3 || serviceId == 4 || serviceId == 72) {
@@ -446,7 +495,7 @@ class _planclaimsformState extends State<planclaimsform> {
         });
 
         policyTypeCondition = filteredPolicies[0]['ticket_type_id'];
-        client_policy_id = filteredPolicies[0]['client_policy_id'];
+        // client_policy_id = filteredPolicies[0]['client_policy_id'];
         print('Output : $policyTypeCondition'); // Output: GMC
       });
     } else {
@@ -497,7 +546,7 @@ class _planclaimsformState extends State<planclaimsform> {
 
       print('Filtered matching policy_no: $filteredPoliciesList');
 
-      client_policy_id = filteredPoliciesList[0]['client_policy_id'];
+      // client_policy_id = filteredPoliciesList[0]['client_policy_id'];
       subjectController.text = filteredPoliciesList[0]['claim_subject'];
 
 
@@ -643,6 +692,7 @@ class _planclaimsformState extends State<planclaimsform> {
       if (policyTypeCondition == 1 || policyTypeCondition == 72) {
         String formattedAdmitDate = DateFormat('yyyy-MM-dd').format(admitDate!);
         String formattedDischargeDate = DateFormat('yyyy-MM-dd').format(dischargeDate!);
+        fields['claim_type'] = claimTypeId;
         fields['hospital_name'] = hospitalNameController.text;
         fields['hospital_address'] = hospitalAddressController.text;
         fields['hospital_city'] = hospitalCityController.text;
@@ -679,6 +729,7 @@ class _planclaimsformState extends State<planclaimsform> {
       request.headers['Authorization'] = 'Bearer $_token';
       request.headers['APP-SIGNATURE'] = 'nhance-2025-signature-T8f6gV9k5fK2wf5V5c4vId3b0J8z6cAm2x8Y';
       final stringFields = fields.map((key, value) => MapEntry(key, value?.toString() ?? ''));
+      print("📁 stringFields: ${stringFields}");
       request.fields.addAll(stringFields);
 
       // get uploaded files
@@ -1107,6 +1158,32 @@ class _planclaimsformState extends State<planclaimsform> {
                                                             Text('Please select a policy', style: TextStyle(color: Colors.red)),
                                                         ],
                                                       ),
+                                                      SizedBox(height: 15),
+
+                                                       if (policyTypeCondition == 1 || policyTypeCondition == 72)
+                                                                Column(
+                                                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                                                  children: [
+                                                                    buildDropdownField(
+                                                                      'Select Claim Type',
+                                                                          (value) {
+                                                                        setState(() {
+                                                                          claimTypeId = value;
+                                                                          isClaimTypeValid = true;
+                                                                        });
+                                                                      },
+                                                                      false,
+                                                                      claimTypeList,
+                                                                      'name',
+                                                                      claimTypeId,
+                                                                    ),
+                                                                    if (!isClaimTypeValid)
+                                                                      Text(
+                                                                        'Please select a claim type',
+                                                                        style: TextStyle(color: Colors.red),
+                                                                      ),
+                                                                  ],
+                                                                ),
 
                                                       // // if (fromClaimsPage == 1)
                                                       // buildDropdownField(
@@ -1168,7 +1245,7 @@ class _planclaimsformState extends State<planclaimsform> {
                                                             Text('Please select a member', style: TextStyle(color: Colors.red)),
                                                         ],
                                                       ),
-SizedBox(height: 15),
+                                                      SizedBox(height: 15),
                                                       // buildDropdownField(
                                                       //   'Member Name',
                                                       //   (value) {

lib/pages/postEnrollment/service/api_service.dart

@@ -25,7 +25,8 @@ class ApiService {
       String? empCode,
       String? status,
       String? branchID,
-      String? mobileNo,String? emailId) async {
+      String? mobileNo,
+      String? emailId) async {
     print(_postToken);
     if (_postToken == null) {
       await _initializeToken();
@@ -61,7 +62,8 @@ class ApiService {
     if (_postToken == null) {
       await _initializeToken();
     }
-    final url = Uri.parse('${Environment.apiUrl}getAdvertisementImage?client_id=$clientID');
+    final url = Uri.parse(
+        '${Environment.apiUrl}getAdvertisementImage?client_id=$clientID');
     final headers = {
       'Authorization': 'Bearer $_postToken' ?? '',
     };
@@ -110,7 +112,8 @@ class ApiService {
     return response;
   }
 
-  Future<Map<String, dynamic>> getTrackClaimsList(String empPrimaryId,mobileNo,emailID) async {
+  Future<Map<String, dynamic>> getTrackClaimsList(
+      String empPrimaryId, mobileNo, emailID) async {
     print(_postToken);
     if (_postToken == null) {
       await _initializeToken();
@@ -158,12 +161,14 @@ class ApiService {
     return response;
   }
 
-  Future<Map<String, dynamic>> getWellnessLink(empPrimaryId,client_policy_id) async {
+  Future<Map<String, dynamic>> getWellnessLink(
+      empPrimaryId, client_policy_id) async {
     print(_postToken);
     if (_postToken == null) {
       await _initializeToken();
     }
-    final url = Uri.parse('${Environment.apiUrl}getWellnessURL?emp_id=$empPrimaryId');
+    final url =
+        Uri.parse('${Environment.apiUrl}getWellnessURL?emp_id=$empPrimaryId');
     // final url = Uri.parse('${Environment.apiUrl}getWellnessURL?emp_id=$empPrimaryId&client_policy_id=$client_policy_id');
     final headers = {
       'Authorization': 'Bearer $_postToken' ?? '',
@@ -184,7 +189,8 @@ class ApiService {
     };
     final jsonBody = jsonEncode(eCardParam);
     // Send formDataJson as the body
-    final response = await _makePostRequestWithoutFormData(url,jsonBody, headers);
+    final response =
+        await _makePostRequestWithoutFormData(url, jsonBody, headers);
     return response;
   }
 
@@ -200,7 +206,8 @@ class ApiService {
     };
     final jsonBody = jsonEncode(formData);
     // Send formDataJson as the body
-    final response = await _makePostRequestWithoutFormData(url,jsonBody, headers);
+    final response =
+        await _makePostRequestWithoutFormData(url, jsonBody, headers);
     return response;
   }
 
@@ -227,7 +234,6 @@ class ApiService {
     return response['status'] == 'success';
   }
 
-
   Future<Map<String, dynamic>> fetchPolicyTypeAndInsurer() async {
     print(_postToken);
     if (_postToken == null) {
@@ -241,12 +247,14 @@ class ApiService {
     return response;
   }
 
-  Future<Map<String, dynamic>> fetchDepartmentList(String clientId, String empCode) async {
+  Future<Map<String, dynamic>> fetchDepartmentList(
+      String clientId, String empCode) async {
     print(_postToken);
     if (_postToken == null) {
       await _initializeToken();
     }
-    final url = Uri.parse('${Environment.apiUrl}get_ticket_type?client_id=$clientId&emp_code=$empCode');
+    final url = Uri.parse(
+        '${Environment.apiUrl}get_ticket_type?client_id=$clientId&emp_code=$empCode');
     final headers = {
       'Authorization': 'Bearer $_postToken' ?? '',
     };
@@ -374,7 +382,8 @@ class ApiService {
   Future<Map<String, dynamic>> _makeGetRequest(
       Uri url, Map<String, String> headers) async {
     // Add global APP_SIGNATURE header
-    headers['APP-SIGNATURE'] = 'nhance-2025-signature-T8f6gV9k5fK2wf5V5c4vId3b0J8z6cAm2x8Y';
+    headers['APP-SIGNATURE'] =
+        'nhance-2025-signature-T8f6gV9k5fK2wf5V5c4vId3b0J8z6cAm2x8Y';
     final response = await http.get(url, headers: headers);
     return _handleResponse(response);
   }
@@ -382,7 +391,8 @@ class ApiService {
   Future<Map<String, dynamic>> _makePostRequest(
       Uri url, Map<String, String> body, Map<String, String> headers) async {
     // Add global APP_SIGNATURE header
-    headers['APP-SIGNATURE'] = 'nhance-2025-signature-T8f6gV9k5fK2wf5V5c4vId3b0J8z6cAm2x8Y';
+    headers['APP-SIGNATURE'] =
+        'nhance-2025-signature-T8f6gV9k5fK2wf5V5c4vId3b0J8z6cAm2x8Y';
     final response = await http.post(url, headers: headers, body: body);
     return _handleResponse(response);
   }
@@ -390,20 +400,27 @@ class ApiService {
   Future<Map<String, dynamic>> _makePostRequestWithoutFormData(
       Uri url, String body, Map<String, String> headers) async {
     // Add global APP_SIGNATURE header
-    headers['APP-SIGNATURE'] = 'nhance-2025-signature-T8f6gV9k5fK2wf5V5c4vId3b0J8z6cAm2x8Y';
+    headers['APP-SIGNATURE'] =
+        'nhance-2025-signature-T8f6gV9k5fK2wf5V5c4vId3b0J8z6cAm2x8Y';
     final response = await http.post(url, headers: headers, body: body);
     return _handleResponse(response);
   }
 
-
   Future<Map<String, dynamic>> _handleResponse(http.Response response) async {
     if (response.statusCode == 200) {
       return jsonDecode(response.body);
     } else if (response.statusCode == 401) {
       await _clearLocalStorageAndRedirect();
       return {};
+    } else if (response.statusCode == 403) {
+      await _clearLocalStorageAndRedirect();
+      return {};
+    } else if (response.statusCode == 451) {
+      final body = jsonDecode(response.body);
+      final message = body['message'];
+      ToastHelper.showWarningToast(context, message);
+      return {};
     } else if (response.statusCode == 429) {
-      if (!context.mounted) return {};
        final body =  jsonDecode(response.body);
        final message = body['message'];
       ToastHelper.showWarningToast(context, message);

lib/pages/session/SetPinBiometric.dart

@@ -207,10 +207,28 @@
             ToastHelper.showErrorToast(context, 'Invalid Pin Number');
             print('Invalid Pin Number');
           }
-        } else {
+        } else if (response.statusCode == 401) {
-          ToastHelper.showErrorToast(context, 'Something went wrong');
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
           context.go('/login');
-          throw Exception('Failed to verify pin number');
+
+        } else if (response.statusCode == 403) {
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 451) {
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
+        } else if (response.statusCode == 429) {
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
+        } else {
+          throw Exception('Failed to load data');
         }
       } catch (e) {
         ToastHelper.showErrorToast(context, 'Something went wrong');
@@ -425,9 +443,28 @@
             // }
 
           }
+        } else if (response.statusCode == 401) {
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 403) {
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 451) {
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
+        } else if (response.statusCode == 429) {
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
         } else {
-          ToastHelper.showErrorToast(context, 'Something went wrong');
+          throw Exception('Failed to load data');
-          throw Exception('Failed to verify pin number');
         }
       } catch (e) {
         // ToastHelper.showErrorToast(context, 'Something went wrong');
@@ -580,6 +617,7 @@
                             child: Column(
                               // crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
+                                SizedBox(height: 8),
                                 Row(
                                   mainAxisAlignment: MainAxisAlignment.start,
                                   children: [

lib/pages/session/changePin.dart

@@ -12,6 +12,7 @@ import '../../config/environment.dart';
 import '../../customAppBar/responsive.dart';
 import '../../customAppBar/toastHelper.dart';
 import '../postEnrollment/service/svg_service.dart';
+import '../service/SessionManager.dart';
 import 'authenticationService.dart';
 
 class changePin extends StatefulWidget {
@@ -107,11 +108,28 @@ class _changePinState extends State<changePin> {
             ToastHelper.showErrorToast(context, message);
             print('Invalid Pin Number');
           }
+        } else if (response.statusCode == 401) {
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 403) {
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 451) {
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
+        } else if (response.statusCode == 429) {
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
         } else {
-          Map<String, dynamic> data = json.decode(response.body);
+          throw Exception('Failed to load data');
-          String message = data['data']['message'];
-          ToastHelper.showErrorToast(context, message);
-          throw Exception('Failed to verify mobile number');
         }
       }
     } catch (e) {

lib/pages/session/settingUpPinAndBiometric.dart

@@ -166,9 +166,28 @@ class _pinSettingPageState extends State<pinSettingPage> {
             ToastHelper.showErrorToast(context, message);
             print('Invalid Pin Number');
           }
+        } else if (response.statusCode == 401) {
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 403) {
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 451) {
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
+        } else if (response.statusCode == 429) {
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
         } else {
-          ToastHelper.showErrorToast(context, 'Something went wrong');
+          throw Exception('Failed to load data');
-          throw Exception('Failed to verify mobile number');
         }
       // }
     } catch (e) {
@@ -319,6 +338,7 @@ class _pinSettingPageState extends State<pinSettingPage> {
                           child: Column(
                             // crossAxisAlignment: CrossAxisAlignment.center,
                             children: [
+                              SizedBox(height: 8),
                               Row(
                                 mainAxisAlignment: MainAxisAlignment.start,
                                 children: [

lib/pages/setPassword.dart

@@ -118,12 +118,43 @@ class _setPasswordState extends State<setPassword> {
             ToastHelper.showErrorToast(context, message!);
             print('Invalid mobile number');
           }
+        } else if (response.statusCode == 401) {
+          setState(() {
+            _isLoading = false;
+          });
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 403) {
+          setState(() {
+            _isLoading = false;
+          });
+          await SessionManager().clear();
+          ToastHelper.showErrorToast(context, 'Session Out');
+          if (!context.mounted) return;
+          context.go('/login');
+
+        } else if (response.statusCode == 451) {
+          setState(() {
+            _isLoading = false;
+          });
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
+        } else if (response.statusCode == 429) {
+          setState(() {
+            _isLoading = false;
+          });
+          final body =  jsonDecode(response.body);
+          final message = body['message'];
+          ToastHelper.showWarningToast(context, message);
         } else {
           setState(() {
             _isLoading = false;
           });
-          ToastHelper.showErrorToast(context, 'Something went wrong');
+          throw Exception('Failed to load data');
-          throw Exception('Failed to verify mobile number');
         }
       }
     } catch (e) {

pubspec.yaml

@@ -17,8 +17,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
 #version: 1.0.32+32
-version: 1.0.29+34
+version: 1.0.30+35
-#version: 2.0.16+54
+#version: 2.0.17+55
 
 environment:
   sdk: '>=3.3.3 <4.0.0'