diff --git a/lib/pages/enrollment/addons.dart b/lib/pages/enrollment/addons.dart
index 4c3f96a..aafc64b 100644
--- a/lib/pages/enrollment/addons.dart
+++ b/lib/pages/enrollment/addons.dart
@@ -1189,8 +1189,16 @@ class _addOnsDetailsState extends State<addOnsDetails> {
       isLoading = true;
     });
     print('sendAddOnAPI');
+
     if (gpaDataIsEmpty != 0) {
-      iAgreeForAddOn.add(int.parse(gpaClintPolicyId));
+      print('gpaDataIsEmpty : $gpaDataIsEmpty');
+      for (var item in gpaPolicies) {
+        print('ClientPolicyId');
+        // Extract ClientPolicyId value from each object
+        String clientPolicyId = item['ClientPolicyId'];
+        // Convert to integer and add to iAgreeForAddOn list
+        iAgreeForAddOn.add(int.parse(clientPolicyId));
+      }
     }
 
     if (gmcDataIsEmpty != 0) {
diff --git a/lib/pages/enrollment/empReview.dart b/lib/pages/enrollment/empReview.dart
index 353c5e2..dd544dd 100644
--- a/lib/pages/enrollment/empReview.dart
+++ b/lib/pages/enrollment/empReview.dart
@@ -38,7 +38,7 @@ class _empReviewDetailsState extends State<empReviewDetails> {
   dynamic gpaGridMaster;
   dynamic gmcPolicies;
   dynamic gpasumInsured;
-  dynamic gpaClintPolicyId = 0;
+  dynamic gpaClintPolicyId;
   dynamic gpaMappedFamilyFloaters = [];
   dynamic gpaSelfName;
   dynamic gpaSelfDob;
@@ -565,7 +565,7 @@ class _empReviewDetailsState extends State<empReviewDetails> {
           .where((element) => element['is_value_exist'] == true)
           .toList();
 
-      print(getDependentTrueObjects);
+      print('getDependentTrueObjects : $getDependentTrueObjects');
 
       if (getDependentTrueObjects.isNotEmpty) {
         iAgreeForAddOn.add(int.parse(addOnsDependentClientPolicyId));
@@ -577,7 +577,7 @@ class _empReviewDetailsState extends State<empReviewDetails> {
           .where((element) => element['is_value_exist'] == true)
           .toList();
 
-      print(getSiTrueObjects);
+      print('getSiTrueObjects : $getSiTrueObjects');
 
       if (getSiTrueObjects.isNotEmpty) {
         iAgreeForAddOn.add(int.parse(topUpClientPolicyId));
@@ -589,7 +589,7 @@ class _empReviewDetailsState extends State<empReviewDetails> {
           .where((element) => element['is_value_exist'] == true)
           .toList();
 
-      print(getSiTrueObjects);
+      print('getSiTrueObjects $getSiTrueObjects');
 
       if (getSiTrueObjects.isNotEmpty) {
         iAgreeForAddOn.add(int.parse(topUpParentClientPolicyId));
@@ -600,13 +600,23 @@ class _empReviewDetailsState extends State<empReviewDetails> {
     print(gpaPolicies);
     print('gmcPolicies');
     print(gmcPolicies);
+    print('iAgreeForAddOn $iAgreeForAddOn');
 
     if (gpaDataIsEmpty != 0) {
-      iAgreeForAddOn.add(int.parse(gpaClintPolicyId));
+      print('gpaDataIsEmpty : $gpaDataIsEmpty');
+      for (var item in gpaPolicies) {
+        print('ClientPolicyId');
+        // Extract ClientPolicyId value from each object
+        String clientPolicyId = item['ClientPolicyId'];
+        // Convert to integer and add to iAgreeForAddOn list
+        iAgreeForAddOn.add(int.parse(clientPolicyId));
+      }
     }
+    print('iAgreeForAddOn $iAgreeForAddOn');
 
     if (gmcDataIsEmpty != 0) {
       for (var item in gmcPolicies) {
+        print('ClientPolicyId');
         // Extract ClientPolicyId value from each object
         String clientPolicyId = item['ClientPolicyId'];
         // Convert to integer and add to iAgreeForAddOn list
diff --git a/lib/pages/login.dart b/lib/pages/login.dart
index 6bc8a0b..7ca1373 100644
--- a/lib/pages/login.dart
+++ b/lib/pages/login.dart
@@ -107,10 +107,7 @@ class _loginState extends State<login> {
 
             _verifyPhoneNumber();
 
-            ToastHelper.showSuccessToast(context, message);
-            setState(() {
-              _isLoading = false;
-            });
+            // ToastHelper.showSuccessToast(context, message);
           } else {
             setState(() {
               _isLoading = false;
@@ -144,10 +141,10 @@ class _loginState extends State<login> {
       timeout: const Duration(seconds: 60),
       verificationCompleted: (PhoneAuthCredential credential) async {
         await _auth.signInWithCredential(credential);
-        ToastHelper.showSuccessToast(context, 'Verified Successfully!');
-        setState(() {
-          _isLoading = false;
-        });
+        // ToastHelper.showSuccessToast(context, 'Verified Successfully!');
+        // setState(() {
+        //   _isLoading = false;
+        // });
       },
       verificationFailed: (FirebaseAuthException e) {
         ToastHelper.showSuccessToast(context, 'Verification Failed!');
diff --git a/lib/pages/verify.dart b/lib/pages/verify.dart
index 1c22b44..8ba3340 100644
--- a/lib/pages/verify.dart
+++ b/lib/pages/verify.dart
@@ -256,7 +256,7 @@ class _MyVerifyState extends State<MyVerify> {
           .then((user) async {
         if (user != null) {
           // Handle successful verification
-          ToastHelper.showSuccessToast(context, 'Successfully Login...!');
+          // ToastHelper.showSuccessToast(context, 'Successfully Login...!');
           bool otpVerifyStatus = true;
           generateToken(otpVerifyStatus);
         } else {