From a3aab678fd53bcb692c6f2dfb843dd30e4c56c2a Mon Sep 17 00:00:00 2001
From: Achintha Isuru <achinthaisuru444@gmail.com>
Date: Tue, 10 Mar 2026 10:21:18 -0400
Subject: [PATCH] feat: Refactor review order action bar for improved button
 layout and async handling in permanent order BLoC

---
 .../blocs/permanent_order/permanent_order_bloc.dart | 12 ++++++------
 .../review_order/review_order_action_bar.dart       | 13 ++++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_bloc.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_bloc.dart
index 5c0c34af..4862958d 100644
--- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_bloc.dart
+++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_bloc.dart
@@ -170,10 +170,10 @@ class PermanentOrderBloc extends Bloc<PermanentOrderEvent, PermanentOrderState>
     await _loadRolesForVendor(event.vendor.id, emit);
   }
 
-  void _onHubsLoaded(
+  Future<void> _onHubsLoaded(
     PermanentOrderHubsLoaded event,
     Emitter<PermanentOrderState> emit,
-  ) {
+  ) async {
     final PermanentOrderHubOption? selectedHub = event.hubs.isNotEmpty
         ? event.hubs.first
         : null;
@@ -186,16 +186,16 @@ class PermanentOrderBloc extends Bloc<PermanentOrderEvent, PermanentOrderState>
     );
 
     if (selectedHub != null) {
-      _loadManagersForHub(selectedHub.id, emit);
+      await _loadManagersForHub(selectedHub.id, emit);
     }
   }
 
-  void _onHubChanged(
+  Future<void> _onHubChanged(
     PermanentOrderHubChanged event,
     Emitter<PermanentOrderState> emit,
-  ) {
+  ) async {
     emit(state.copyWith(selectedHub: event.hub, location: event.hub.name));
-    _loadManagersForHub(event.hub.id, emit);
+    await _loadManagersForHub(event.hub.id, emit);
   }
 
   void _onHubManagerChanged(
diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/widgets/review_order/review_order_action_bar.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/widgets/review_order/review_order_action_bar.dart
index fb7014f2..0f000a61 100644
--- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/widgets/review_order/review_order_action_bar.dart
+++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/widgets/review_order/review_order_action_bar.dart
@@ -37,13 +37,16 @@ class ReviewOrderActionBar extends StatelessWidget {
               leadingIcon: UiIcons.chevronLeft,
               onPressed: onBack,
               size: UiButtonSize.large,
+              text: '',
             ),
             const SizedBox(width: UiConstants.space3),
-            UiButton.primary(
-              text: submitLabel ?? t.client_create_order.review.post_order,
-              onPressed: onSubmit,
-              isLoading: isLoading,
-              size: UiButtonSize.large,
+            Expanded(
+              child: UiButton.primary(
+                text: submitLabel ?? t.client_create_order.review.post_order,
+                onPressed: onSubmit,
+                isLoading: isLoading,
+                size: UiButtonSize.large,
+              ),
             ),
           ],
         ),