diff --git a/apps/mobile/packages/core/lib/src/routing/client/navigator.dart b/apps/mobile/packages/core/lib/src/routing/client/navigator.dart index a6a735ed..54746a8d 100644 --- a/apps/mobile/packages/core/lib/src/routing/client/navigator.dart +++ b/apps/mobile/packages/core/lib/src/routing/client/navigator.dart @@ -102,8 +102,8 @@ extension ClientNavigator on IModularNavigator { } /// Navigates to the full list of invoices awaiting approval. - void toAwaitingApproval({Object? arguments}) { - safePush(ClientPaths.awaitingApproval, arguments: arguments); + Future toAwaitingApproval({Object? arguments}) { + return safePush(ClientPaths.awaitingApproval, arguments: arguments); } /// Navigates to the Invoice Ready page. diff --git a/apps/mobile/packages/features/client/billing/lib/src/presentation/pages/completion_review_page.dart b/apps/mobile/packages/features/client/billing/lib/src/presentation/pages/completion_review_page.dart index 1d49c5bb..1090cfc6 100644 --- a/apps/mobile/packages/features/client/billing/lib/src/presentation/pages/completion_review_page.dart +++ b/apps/mobile/packages/features/client/billing/lib/src/presentation/pages/completion_review_page.dart @@ -49,7 +49,6 @@ class _ShiftCompletionReviewPageState extends State { title: invoice.title, subtitle: invoice.clientName, showBackButton: true, - onLeadingPressed: () => Modular.to.toAwaitingApproval(), ), body: SafeArea( child: SingleChildScrollView( diff --git a/apps/mobile/packages/features/client/billing/lib/src/presentation/widgets/completion_review/completion_review_actions.dart b/apps/mobile/packages/features/client/billing/lib/src/presentation/widgets/completion_review/completion_review_actions.dart index 5e5feb2a..2e34a81e 100644 --- a/apps/mobile/packages/features/client/billing/lib/src/presentation/widgets/completion_review/completion_review_actions.dart +++ b/apps/mobile/packages/features/client/billing/lib/src/presentation/widgets/completion_review/completion_review_actions.dart @@ -8,6 +8,8 @@ import 'package:krow_core/core.dart'; import '../../blocs/shift_completion_review/shift_completion_review_bloc.dart'; import '../../blocs/shift_completion_review/shift_completion_review_event.dart'; import '../../blocs/shift_completion_review/shift_completion_review_state.dart'; +import '../../blocs/billing_bloc.dart'; +import '../../blocs/billing_event.dart'; class CompletionReviewActions extends StatelessWidget { const CompletionReviewActions({required this.invoiceId, super.key}); @@ -30,6 +32,7 @@ class CompletionReviewActions extends StatelessWidget { : UiSnackbarType.warning; UiSnackbar.show(context, message: message, type: type); + Modular.get().add(const BillingLoadStarted()); Modular.to.toAwaitingApproval(); } else if (state.status == ShiftCompletionReviewStatus.failure) { UiSnackbar.show(