diff --git a/.github/workflows/android_deploy.yml b/.github/workflows/android_deploy.yml
index 23b6ef21..59bfad0c 100644
--- a/.github/workflows/android_deploy.yml
+++ b/.github/workflows/android_deploy.yml
@@ -32,6 +32,7 @@ jobs:
       - name: Set up ruby env
         uses: ruby/setup-ruby@v1
         with:
+          ruby-version: 2.7.2
           bundler-cache: true
 
       - name: Retrieve the secret and decode it to a file
diff --git a/.github/workflows/web_deploy.yml b/.github/workflows/web_deploy.yml
index b05ff5c6..55149460 100644
--- a/.github/workflows/web_deploy.yml
+++ b/.github/workflows/web_deploy.yml
@@ -40,7 +40,13 @@ jobs:
           aws-region: ap-south-1
 
       - name: Build Web App
-        run: flutter build web
+        run: |
+          flutter pub cache repair
+          flutter clean
+          flutter pub cache clean
+          flutter pub upgrade
+          flutter pub get
+          flutter build web
 
       - name: Deploy to AWS S3
         run: aws s3 sync build/web/ s3://${{ secrets.AWS_S3_BUCKET_NAME }}
diff --git a/lib/ui/admin/members/details_leaves/employee_details_leaves_screen.dart b/lib/ui/admin/members/details_leaves/employee_details_leaves_screen.dart
index c90a463a..bbbee47e 100644
--- a/lib/ui/admin/members/details_leaves/employee_details_leaves_screen.dart
+++ b/lib/ui/admin/members/details_leaves/employee_details_leaves_screen.dart
@@ -28,7 +28,8 @@ class AdminEmployeeDetailsLeavesPage extends StatelessWidget {
 class AdminEmployeeDetailsLeavesScreen extends StatefulWidget {
   final String employeeName;
 
-  const AdminEmployeeDetailsLeavesScreen({super.key, required this.employeeName});
+  const AdminEmployeeDetailsLeavesScreen(
+      {super.key, required this.employeeName});
 
   @override
   State<AdminEmployeeDetailsLeavesScreen> createState() =>
diff --git a/lib/ui/admin/members/edit_employee/widgets/role_toggle_button.dart b/lib/ui/admin/members/edit_employee/widgets/role_toggle_button.dart
index c4e1364a..028df401 100644
--- a/lib/ui/admin/members/edit_employee/widgets/role_toggle_button.dart
+++ b/lib/ui/admin/members/edit_employee/widgets/role_toggle_button.dart
@@ -8,7 +8,8 @@ class ToggleButton extends StatelessWidget {
   final Role role;
   final Function(Role role) onRoleChange;
 
-  const ToggleButton({super.key, required this.onRoleChange, required this.role});
+  const ToggleButton(
+      {super.key, required this.onRoleChange, required this.role});
 
   @override
   Widget build(BuildContext context) {
@@ -43,28 +44,26 @@ class ToggleButton extends StatelessWidget {
                 ),
               ),
             ),
-            ...roleTypeSelectionToggleButtonAlignment.entries
-                .map(
-                  (roleTypeAlignment) => GestureDetector(
-                    onTap: () => onRoleChange(roleTypeAlignment.key),
-                    child: Align(
-                      alignment: Alignment(roleTypeAlignment.value, 0),
-                      child: Container(
-                        width: width,
-                        color: Colors.transparent,
-                        alignment: Alignment.center,
-                        child: Text(
-                            localization.user_detail_role_type(
-                                roleTypeAlignment.key.name),
-                            textAlign: TextAlign.start,
-                            style: AppTextStyle.style14.copyWith(
-                                color: context.colorScheme.textPrimary,
-                                fontWeight: FontWeight.w700)),
-                      ),
-                    ),
+            ...roleTypeSelectionToggleButtonAlignment.entries.map(
+              (roleTypeAlignment) => GestureDetector(
+                onTap: () => onRoleChange(roleTypeAlignment.key),
+                child: Align(
+                  alignment: Alignment(roleTypeAlignment.value, 0),
+                  child: Container(
+                    width: width,
+                    color: Colors.transparent,
+                    alignment: Alignment.center,
+                    child: Text(
+                        localization
+                            .user_detail_role_type(roleTypeAlignment.key.name),
+                        textAlign: TextAlign.start,
+                        style: AppTextStyle.style14.copyWith(
+                            color: context.colorScheme.textPrimary,
+                            fontWeight: FontWeight.w700)),
                   ),
-                )
-                
+                ),
+              ),
+            )
           ],
         ),
       ),
diff --git a/lib/ui/shared/appbar_drawer/appbar/space_notifier_widget.dart b/lib/ui/shared/appbar_drawer/appbar/space_notifier_widget.dart
index 82faaa2e..932500d3 100644
--- a/lib/ui/shared/appbar_drawer/appbar/space_notifier_widget.dart
+++ b/lib/ui/shared/appbar_drawer/appbar/space_notifier_widget.dart
@@ -6,7 +6,9 @@ import '../../../../data/model/space/space.dart';
 
 class SpaceNotifierWidget extends InheritedNotifier<UserStateNotifier> {
   const SpaceNotifierWidget(
-      {super.key, required UserStateNotifier super.notifier, required super.child});
+      {super.key,
+      required UserStateNotifier super.notifier,
+      required super.child});
 
   static Space? of(BuildContext context) {
     return context