Merge Google Maps branch

2026-01-29 09:59:10 -05:00
parent 9067d14475 ee16f31ed8
commit 75e7c35cea
56 changed files with 19831 additions and 23087 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ $RECYCLE.BIN/

 # IDE & Editors
 .idea/
-.vscode/
 *.iml
 *.iws
 *.swp
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,41 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Client (Dev) - Android",
+            "request": "launch",
+            "type": "dart",
+            "program": "apps/mobile/apps/client/lib/main.dart",
+            "args": [
+                "--dart-define-from-file=${workspaceFolder}/apps/mobile/config.dev.json"
+            ]
+        },
+        {
+            "name": "Client (Dev) - iOS",
+            "request": "launch",
+            "type": "dart",
+            "program": "apps/mobile/apps/client/lib/main.dart",
+            "args": [
+                "--dart-define-from-file=${workspaceFolder}/apps/mobile/config.dev.json"
+            ]
+        },
+        {
+            "name": "Staff (Dev) - Android",
+            "request": "launch",
+            "type": "dart",
+            "program": "apps/mobile/apps/staff/lib/main.dart",
+            "args": [
+                "--dart-define-from-file=${workspaceFolder}/apps/mobile/config.dev.json"
+            ]
+        },
+        {
+            "name": "Staff (Dev) - iOS",
+            "request": "launch",
+            "type": "dart",
+            "program": "apps/mobile/apps/staff/lib/main.dart",
+            "args": [
+                "--dart-define-from-file=${workspaceFolder}/apps/mobile/config.dev.json"
+            ]
+        }
+    ]
+}
--- a/apps/mobile/apps/client/lib/main.dart
+++ b/apps/mobile/apps/client/lib/main.dart
@@ -56,8 +56,7 @@ class AppWidget extends StatelessWidget {
  Widget build(BuildContext context) {
    return BlocProvider<core_localization.LocaleBloc>(
      create: (BuildContext context) =>
-          Modular.get<core_localization.LocaleBloc>()
-            ..add(const core_localization.LoadLocale()),
+          Modular.get<core_localization.LocaleBloc>(),
      child:
          BlocBuilder<
            core_localization.LocaleBloc,
--- a/apps/mobile/apps/client/pubspec.yaml
+++ b/apps/mobile/apps/client/pubspec.yaml
@@ -1,7 +1,7 @@
 name: krowwithus_client
 description: "Krow Client Application"
 publish_to: "none"
-version: 0.0.1-M3+1
+version: 0.0.1-M3+2
 resolution: workspace

 environment:
--- a/apps/mobile/apps/staff/lib/main.dart
+++ b/apps/mobile/apps/staff/lib/main.dart
@@ -1,5 +1,6 @@
 import 'package:core_localization/core_localization.dart' as core_localization;
 import 'package:design_system/design_system.dart';
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -7,7 +8,6 @@ import 'package:flutter_modular/flutter_modular.dart';
 import 'package:staff_authentication/staff_authentication.dart'
    as staff_authentication;
 import 'package:staff_main/staff_main.dart' as staff_main;
-import 'package:firebase_core/firebase_core.dart';

 void main() async {
  WidgetsFlutterBinding.ensureInitialized();
@@ -36,28 +36,30 @@ class AppWidget extends StatelessWidget {
  Widget build(BuildContext context) {
    return BlocProvider<core_localization.LocaleBloc>(
      create: (BuildContext context) =>
-          Modular.get<core_localization.LocaleBloc>()
-            ..add(const core_localization.LoadLocale()),
+          Modular.get<core_localization.LocaleBloc>(),
      child:
          BlocBuilder<
            core_localization.LocaleBloc,
            core_localization.LocaleState
          >(
-            builder: (BuildContext context, core_localization.LocaleState state) {
-              return core_localization.TranslationProvider(
-                  child: MaterialApp.router(
-                title: "KROW Staff",
-                theme: UiTheme.light,
-                routerConfig: Modular.routerConfig,
-                locale: state.locale,
-                supportedLocales: state.supportedLocales,
-                localizationsDelegates: const <LocalizationsDelegate<dynamic>>[
-                  GlobalMaterialLocalizations.delegate,
-                  GlobalWidgetsLocalizations.delegate,
-                  GlobalCupertinoLocalizations.delegate,
-                ],
-              ));
-            },
+            builder:
+                (BuildContext context, core_localization.LocaleState state) {
+                  return core_localization.TranslationProvider(
+                    child: MaterialApp.router(
+                      title: "KROW Staff",
+                      theme: UiTheme.light,
+                      routerConfig: Modular.routerConfig,
+                      locale: state.locale,
+                      supportedLocales: state.supportedLocales,
+                      localizationsDelegates:
+                          const <LocalizationsDelegate<dynamic>>[
+                            GlobalMaterialLocalizations.delegate,
+                            GlobalWidgetsLocalizations.delegate,
+                            GlobalCupertinoLocalizations.delegate,
+                          ],
+                    ),
+                  );
+                },
          ),
    );
  }
--- a/apps/mobile/config.dev.json
+++ b/apps/mobile/config.dev.json
@@ -0,0 +1,3 @@
+{
+  "GOOGLE_PLACES_API_KEY": "AIzaSyAS9yTf4q51_CNSZ7mbmeS9V3l_LZR80lU"
+}
--- a/apps/mobile/packages/core_localization/lib/src/bloc/locale_bloc.dart
+++ b/apps/mobile/packages/core_localization/lib/src/bloc/locale_bloc.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import '../domain/usecases/get_default_locale_use_case.dart';
 import '../domain/usecases/get_locale_use_case.dart';
+import '../domain/usecases/get_supported_locales_use_case.dart';
 import '../domain/usecases/set_locale_use_case.dart';
 import '../l10n/strings.g.dart';
 import 'locale_event.dart';
@@ -11,23 +13,39 @@ import 'locale_state.dart';
 /// It coordinates the flow between user language requests and persistent storage
 /// using [SetLocaleUseCase] and [GetLocaleUseCase].
 class LocaleBloc extends Bloc<LocaleEvent, LocaleState> {
-  final GetLocaleUseCase getLocaleUseCase;
-  final SetLocaleUseCase setLocaleUseCase;
-
  /// Creates a [LocaleBloc] with the required use cases.
-  LocaleBloc({required this.getLocaleUseCase, required this.setLocaleUseCase})
-    : super(LocaleState.initial()) {
+  LocaleBloc({
+    required this.getLocaleUseCase,
+    required this.setLocaleUseCase,
+    required this.getSupportedLocalesUseCase,
+    required this.getDefaultLocaleUseCase,
+  }) : super(LocaleState.initial()) {
    on<ChangeLocale>(_onChangeLocale);
    on<LoadLocale>(_onLoadLocale);
+
+    /// Initial event
+    add(const LoadLocale());
  }

+  /// Use case for retrieving the saved locale.
+  final GetLocaleUseCase getLocaleUseCase;
+
+  /// Use case for saving the selected locale.
+  final SetLocaleUseCase setLocaleUseCase;
+
+  /// Use case for retrieving supported locales.
+  final GetSupportedLocalesUseCase getSupportedLocalesUseCase;
+
+  /// Use case for retrieving the default locale.
+  final GetDefaultLocaleUseCase getDefaultLocaleUseCase;
+
  /// Handles the [ChangeLocale] event by saving it via the use case and emitting new state.
  Future<void> _onChangeLocale(
    ChangeLocale event,
    Emitter<LocaleState> emit,
  ) async {
    // 1. Update slang settings
-    LocaleSettings.setLocaleRaw(event.locale.languageCode);
+    await LocaleSettings.setLocaleRaw(event.locale.languageCode);

    // 2. Persist using Use Case
    await setLocaleUseCase(event.locale);
@@ -46,11 +64,14 @@ class LocaleBloc extends Bloc<LocaleEvent, LocaleState> {
    LoadLocale event,
    Emitter<LocaleState> emit,
  ) async {
-    final Locale? savedLocale = await getLocaleUseCase();
-    final Locale locale = const Locale('es');
+    final Locale savedLocale = await getLocaleUseCase();
+    final List<Locale> supportedLocales = getSupportedLocalesUseCase();

-    LocaleSettings.setLocaleRaw(locale.languageCode);
+    await LocaleSettings.setLocaleRaw(savedLocale.languageCode);

-    emit(LocaleState(locale: locale, supportedLocales: state.supportedLocales));
+    emit(LocaleState(
+      locale: savedLocale,
+      supportedLocales: supportedLocales,
+    ));
  }
 }
--- a/apps/mobile/packages/core_localization/lib/src/bloc/locale_state.dart
+++ b/apps/mobile/packages/core_localization/lib/src/bloc/locale_state.dart
@@ -1,20 +1,21 @@
 import 'package:flutter/material.dart';
+
 import '../l10n/strings.g.dart';

 /// Represents the current state of the application's localization.
 class LocaleState {
+  /// Creates a [LocaleState] with the specified [locale].
+  const LocaleState({required this.locale, required this.supportedLocales});
+
+    /// The initial state of the application, defaulting to English.
+  factory LocaleState.initial() => LocaleState(
+    locale: AppLocaleUtils.findDeviceLocale().flutterLocale,
+    supportedLocales: AppLocaleUtils.supportedLocales,
+  );
+
  /// The current active locale.
  final Locale locale;

  /// The list of supported locales for the application.
  final List<Locale> supportedLocales;
-
-  /// Creates a [LocaleState] with the specified [locale].
-  const LocaleState({required this.locale, required this.supportedLocales});
-
-  /// The initial state of the application, defaulting to English.
-  factory LocaleState.initial() => LocaleState(
-    locale: const Locale('es'),
-    supportedLocales: AppLocaleUtils.supportedLocales,
-  );
 }
--- a/apps/mobile/packages/core_localization/lib/src/data/repositories_impl/locale_repository_impl.dart
+++ b/apps/mobile/packages/core_localization/lib/src/data/repositories_impl/locale_repository_impl.dart
@@ -1,4 +1,6 @@
 import 'dart:ui';
+import 'package:core_localization/src/l10n/strings.g.dart';
+
 import '../../domain/repositories/locale_repository_interface.dart';
 import '../datasources/locale_local_data_source.dart';

@@ -7,22 +9,36 @@ import '../datasources/locale_local_data_source.dart';
 /// This class handles the mapping between domain [Locale] objects and the raw
 /// strings handled by the [LocaleLocalDataSource].
 class LocaleRepositoryImpl implements LocaleRepositoryInterface {
-  final LocaleLocalDataSource _localDataSource;
+  /// Creates a [LocaleRepositoryImpl] with the provided [localDataSource].
+  LocaleRepositoryImpl({required this.localDataSource});

-  /// Creates a [LocaleRepositoryImpl] with the provided [_localDataSource].
-  LocaleRepositoryImpl(this._localDataSource);
+  final LocaleLocalDataSource localDataSource;

  @override
  Future<void> saveLocale(Locale locale) {
-    return _localDataSource.saveLanguageCode(locale.languageCode);
+    return localDataSource.saveLanguageCode(locale.languageCode);
  }

  @override
-  Future<Locale?> getSavedLocale() async {
-    final String? languageCode = await _localDataSource.getLanguageCode();
+  Future<Locale> getSavedLocale() async {
+    return getDefaultLocale();
+
+    /// TODO: FEATURE_NOT_IMPLEMENTED: Implement saved locale retrieval later
+    final String? languageCode = await localDataSource.getLanguageCode();
    if (languageCode != null) {
      return Locale(languageCode);
    }
-    return null;
  }
+
+  @override
+  Locale getDefaultLocale() {
+    final Locale deviceLocale = AppLocaleUtils.findDeviceLocale().flutterLocale;
+    if (getSupportedLocales().contains(deviceLocale)) {
+      return deviceLocale;
+    }
+    return const Locale('en');
+  }
+
+  @override
+  List<Locale> getSupportedLocales() => AppLocaleUtils.supportedLocales;
 }
--- a/apps/mobile/packages/core_localization/lib/src/domain/repositories/locale_repository_interface.dart
+++ b/apps/mobile/packages/core_localization/lib/src/domain/repositories/locale_repository_interface.dart
@@ -13,5 +13,11 @@ abstract interface class LocaleRepositoryInterface {
  /// Retrieves the saved [locale] from persistent storage.
  ///
  /// Returns `null` if no locale has been previously saved.
-  Future<Locale?> getSavedLocale();
+  Future<Locale> getSavedLocale();
+
+  /// Retrieves the default [Locale] for the application.
+  Locale getDefaultLocale();
+
+  /// Retrieves the list of supported [Locale]s.
+  List<Locale> getSupportedLocales();
 }
--- a/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_default_locale_use_case.dart
+++ b/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_default_locale_use_case.dart
@@ -0,0 +1,15 @@
+import 'dart:ui';
+import '../repositories/locale_repository_interface.dart';
+
+/// Use case to retrieve the default locale.
+class GetDefaultLocaleUseCase {
+  final LocaleRepositoryInterface _repository;
+
+  /// Creates a [GetDefaultLocaleUseCase] with the required [LocaleRepositoryInterface].
+  GetDefaultLocaleUseCase(this._repository);
+
+  /// Retrieves the default locale.
+  Locale call() {
+    return _repository.getDefaultLocale();
+  }
+}
--- a/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_locale_use_case.dart
+++ b/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_locale_use_case.dart
@@ -13,7 +13,7 @@ class GetLocaleUseCase extends NoInputUseCase<Locale?> {
  GetLocaleUseCase(this._repository);

  @override
-  Future<Locale?> call() {
+  Future<Locale> call() {
    return _repository.getSavedLocale();
  }
 }
--- a/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_supported_locales_use_case.dart
+++ b/apps/mobile/packages/core_localization/lib/src/domain/usecases/get_supported_locales_use_case.dart
@@ -0,0 +1,15 @@
+import 'dart:ui';
+import '../repositories/locale_repository_interface.dart';
+
+/// Use case to retrieve the list of supported locales.
+class GetSupportedLocalesUseCase {
+  final LocaleRepositoryInterface _repository;
+
+  /// Creates a [GetSupportedLocalesUseCase] with the required [LocaleRepositoryInterface].
+  GetSupportedLocalesUseCase(this._repository);
+
+  /// Retrieves the supported locales.
+  List<Locale> call() {
+    return _repository.getSupportedLocales();
+  }
+}
--- a/apps/mobile/packages/core_localization/lib/src/l10n/strings.g.dart
+++ b/apps/mobile/packages/core_localization/lib/src/l10n/strings.g.dart
@@ -6,7 +6,7 @@
 /// Locales: 2
 /// Strings: 1038 (519 per locale)
 ///
-/// Built on 2026-01-27 at 19:37 UTC
+/// Built on 2026-01-29 at 06:58 UTC

 // coverage:ignore-file
 // ignore_for_file: type=lint, unused_import
--- a/apps/mobile/packages/core_localization/lib/src/localization_module.dart
+++ b/apps/mobile/packages/core_localization/lib/src/localization_module.dart
@@ -3,7 +3,9 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'data/datasources/locale_local_data_source.dart';
 import 'data/repositories_impl/locale_repository_impl.dart';
 import 'domain/repositories/locale_repository_interface.dart';
+import 'domain/usecases/get_default_locale_use_case.dart';
 import 'domain/usecases/get_locale_use_case.dart';
+import 'domain/usecases/get_supported_locales_use_case.dart';
 import 'domain/usecases/set_locale_use_case.dart';
 import 'bloc/locale_bloc.dart';

@@ -18,28 +20,36 @@ class LocalizationModule extends Module {
    i.addInstance<SharedPreferencesAsync>(SharedPreferencesAsync());

    // Data Sources
-    i.addSingleton<LocaleLocalDataSource>(
+    i.addLazySingleton<LocaleLocalDataSource>(
      () => LocaleLocalDataSourceImpl(i.get<SharedPreferencesAsync>()),
    );

    // Repositories
-    i.addSingleton<LocaleRepositoryInterface>(
-      () => LocaleRepositoryImpl(i.get<LocaleLocalDataSource>()),
+    i.addLazySingleton<LocaleRepositoryInterface>(
+      () => LocaleRepositoryImpl(localDataSource: i.get<LocaleLocalDataSource>()),
    );

    // Use Cases
-    i.addSingleton<GetLocaleUseCase>(
+    i.addLazySingleton<GetLocaleUseCase>(
      () => GetLocaleUseCase(i.get<LocaleRepositoryInterface>()),
    );
-    i.addSingleton<SetLocaleUseCase>(
+    i.addLazySingleton<SetLocaleUseCase>(
      () => SetLocaleUseCase(i.get<LocaleRepositoryInterface>()),
    );
+    i.addLazySingleton<GetSupportedLocalesUseCase>(
+      () => GetSupportedLocalesUseCase(i.get<LocaleRepositoryInterface>()),
+    );
+    i.addLazySingleton<GetDefaultLocaleUseCase>(
+      () => GetDefaultLocaleUseCase(i.get<LocaleRepositoryInterface>()),
+    );

    // BLoCs
-    i.addSingleton<LocaleBloc>(
+    i.add<LocaleBloc>(
      () => LocaleBloc(
        getLocaleUseCase: i.get<GetLocaleUseCase>(),
        setLocaleUseCase: i.get<SetLocaleUseCase>(),
+        getSupportedLocalesUseCase: i.get<GetSupportedLocalesUseCase>(),
+        getDefaultLocaleUseCase: i.get<GetDefaultLocaleUseCase>(),
      ),
    );
  }
--- a/apps/mobile/packages/data_connect/lib/src/dataconnect_generated/.guides/usage.md
+++ b/apps/mobile/packages/data_connect/lib/src/dataconnect_generated/.guides/usage.md
@@ -4,13 +4,13 @@
 ExampleConnector.instance.CreateAssignment(createAssignmentVariables).execute();
 ExampleConnector.instance.UpdateAssignment(updateAssignmentVariables).execute();
 ExampleConnector.instance.DeleteAssignment(deleteAssignmentVariables).execute();
-ExampleConnector.instance.createTaskComment(createTaskCommentVariables).execute();
-ExampleConnector.instance.updateTaskComment(updateTaskCommentVariables).execute();
-ExampleConnector.instance.deleteTaskComment(deleteTaskCommentVariables).execute();
-ExampleConnector.instance.createVendor(createVendorVariables).execute();
-ExampleConnector.instance.updateVendor(updateVendorVariables).execute();
-ExampleConnector.instance.deleteVendor(deleteVendorVariables).execute();
-ExampleConnector.instance.listVendorBenefitPlans(listVendorBenefitPlansVariables).execute();
+ExampleConnector.instance.listBenefitsData(listBenefitsDataVariables).execute();
+ExampleConnector.instance.getBenefitsDataByKey(getBenefitsDataByKeyVariables).execute();
+ExampleConnector.instance.listBenefitsDataByStaffId(listBenefitsDataByStaffIdVariables).execute();
+ExampleConnector.instance.listBenefitsDataByVendorBenefitPlanId(listBenefitsDataByVendorBenefitPlanIdVariables).execute();
+ExampleConnector.instance.listBenefitsDataByVendorBenefitPlanIds(listBenefitsDataByVendorBenefitPlanIdsVariables).execute();
+ExampleConnector.instance.getStaffDocumentByKey(getStaffDocumentByKeyVariables).execute();
+ExampleConnector.instance.listStaffDocumentsByStaffId(listStaffDocumentsByStaffIdVariables).execute();

 ```

@@ -23,8 +23,8 @@ Optional fields can be discovered based on classes that have `Optional` object t
 This is an example of a mutation with an optional field:

 ```dart
-await ExampleConnector.instance.filterStaffRoles({ ... })
-.staffId(...)
+await ExampleConnector.instance.filterStaffAvailabilityStats({ ... })
+.needWorkIndexMin(...)
 .execute();
 ```

--- a/apps/mobile/packages/data_connect/lib/src/dataconnect_generated/README.md
+++ b/apps/mobile/packages/data_connect/lib/src/dataconnect_generated/README.md
--- a/apps/mobile/packages/data_connect/lib/src/dataconnect_generated/generated.dart
+++ b/apps/mobile/packages/data_connect/lib/src/dataconnect_generated/generated.dart
--- a/apps/mobile/packages/domain/lib/src/adapters/profile/tax_form_adapter.dart
+++ b/apps/mobile/packages/domain/lib/src/adapters/profile/tax_form_adapter.dart
@@ -15,18 +15,36 @@ class TaxFormAdapter {
    DateTime? createdAt,
    DateTime? updatedAt,
  }) {
-    return TaxForm(
-      id: id,
-      type: _stringToType(type),
-      title: title,
-      subtitle: subtitle,
-      description: description,
-      status: _stringToStatus(status),
-      staffId: staffId,
-      formData: formData is Map ? Map<String, dynamic>.from(formData) : null,
-      createdAt: createdAt,
-      updatedAt: updatedAt,
-    );
+    final TaxFormType formType = _stringToType(type);
+    final TaxFormStatus formStatus = _stringToStatus(status);
+    final Map<String, dynamic> formDetails =
+        formData is Map ? Map<String, dynamic>.from(formData as Map) : <String, dynamic>{};
+
+    if (formType == TaxFormType.i9) {
+      return I9TaxForm(
+        id: id,
+        title: title,
+        subtitle: subtitle,
+        description: description,
+        status: formStatus,
+        staffId: staffId,
+        formData: formDetails,
+        createdAt: createdAt,
+        updatedAt: updatedAt,
+      );
+    } else {
+      return W4TaxForm(
+        id: id,
+        title: title,
+        subtitle: subtitle,
+        description: description,
+        status: formStatus,
+        staffId: staffId,
+        formData: formDetails,
+        createdAt: createdAt,
+        updatedAt: updatedAt,
+      );
+    }
  }

  static TaxFormType _stringToType(String? value) {
--- a/apps/mobile/packages/domain/lib/src/entities/profile/tax_form.dart
+++ b/apps/mobile/packages/domain/lib/src/entities/profile/tax_form.dart
@@ -4,27 +4,26 @@ enum TaxFormType { i9, w4 }

 enum TaxFormStatus { notStarted, inProgress, submitted, approved, rejected }

-class TaxForm extends Equatable {
+abstract class TaxForm extends Equatable {
  final String id;
-  final TaxFormType type;
+  TaxFormType get type;
  final String title;
  final String? subtitle;
  final String? description;
  final TaxFormStatus status;
  final String? staffId;
-  final Map<String, dynamic>? formData;
+  final Map<String, dynamic> formData;
  final DateTime? createdAt;
  final DateTime? updatedAt;

  const TaxForm({
    required this.id,
-    required this.type,
    required this.title,
    this.subtitle,
    this.description,
    this.status = TaxFormStatus.notStarted,
    this.staffId,
-    this.formData,
+    this.formData = const {},
    this.createdAt,
    this.updatedAt,
  });
@@ -43,3 +42,37 @@ class TaxForm extends Equatable {
        updatedAt,
      ];
 }
+
+class I9TaxForm extends TaxForm {
+  const I9TaxForm({
+    required super.id,
+    required super.title,
+    super.subtitle,
+    super.description,
+    super.status,
+    super.staffId,
+    super.formData,
+    super.createdAt,
+    super.updatedAt,
+  });
+
+  @override
+  TaxFormType get type => TaxFormType.i9;
+}
+
+class W4TaxForm extends TaxForm {
+  const W4TaxForm({
+    required super.id,
+    required super.title,
+    super.subtitle,
+    super.description,
+    super.status,
+    super.staffId,
+    super.formData,
+    super.createdAt,
+    super.updatedAt,
+  });
+
+  @override
+  TaxFormType get type => TaxFormType.w4;
+}
--- a/apps/mobile/packages/features/client/client_coverage/pubspec.lock
+++ b/apps/mobile/packages/features/client/client_coverage/pubspec.lock
@@ -1,650 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.13.0"
-  auto_injector:
-    dependency: transitive
-    description:
-      name: auto_injector
-      sha256: "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  bloc:
-    dependency: transitive
-    description:
-      name: bloc
-      sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.4"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  code_assets:
-    dependency: transitive
-    description:
-      name: code_assets
-      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.1"
-  core_localization:
-    dependency: "direct main"
-    description:
-      path: "../../../core_localization"
-      relative: true
-    source: path
-    version: "0.0.1"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.7"
-  csv:
-    dependency: transitive
-    description:
-      name: csv
-      sha256: c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.0"
-  design_system:
-    dependency: "direct main"
-    description:
-      path: "../../../design_system"
-      relative: true
-    source: path
-    version: "0.0.1"
-  equatable:
-    dependency: "direct main"
-    description:
-      name: equatable
-      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.8"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.3"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_bloc:
-    dependency: "direct main"
-    description:
-      name: flutter_bloc
-      sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.6"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_modular:
-    dependency: "direct main"
-    description:
-      name: flutter_modular
-      sha256: "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.4.1"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  font_awesome_flutter:
-    dependency: transitive
-    description:
-      name: font_awesome_flutter
-      sha256: b9011df3a1fa02993630b8fb83526368cf2206a711259830325bab2f1d2a4eb0
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.12.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  google_fonts:
-    dependency: transitive
-    description:
-      name: google_fonts
-      sha256: "6996212014b996eaa17074e02b1b925b212f5e053832d9048970dc27255a8fb3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.1.0"
-  hooks:
-    dependency: transitive
-    description:
-      name: hooks
-      sha256: "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.6.0"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.2"
-  intl:
-    dependency: "direct main"
-    description:
-      name: intl
-      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.2"
-  krow_core:
-    dependency: "direct main"
-    description:
-      path: "../../../core"
-      relative: true
-    source: path
-    version: "0.0.1"
-  krow_data_connect:
-    dependency: "direct main"
-    description:
-      path: "../../../data_connect"
-      relative: true
-    source: path
-    version: "0.0.1"
-  krow_domain:
-    dependency: "direct main"
-    description:
-      path: "../../../domain"
-      relative: true
-    source: path
-    version: "0.0.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.0.2"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.10"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.1"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  lucide_icons:
-    dependency: transitive
-    description:
-      name: lucide_icons
-      sha256: ad24d0fd65707e48add30bebada7d90bff2a1bba0a72d6e9b19d44246b0e83c4
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.257.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.17"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.17.0"
-  modular_core:
-    dependency: transitive
-    description:
-      name: modular_core
-      sha256: "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.1"
-  native_toolchain_c:
-    dependency: transitive
-    description:
-      name: native_toolchain_c
-      sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.17.4"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  objective_c:
-    dependency: transitive
-    description:
-      name: objective_c
-      sha256: "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.4"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  path_provider:
-    dependency: transitive
-    description:
-      name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  path_provider_android:
-    dependency: transitive
-    description:
-      name: path_provider_android
-      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.22"
-  path_provider_foundation:
-    dependency: transitive
-    description:
-      name: path_provider_foundation
-      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.1"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.6"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.5+1"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  result_dart:
-    dependency: transitive
-    description:
-      name: result_dart
-      sha256: "0666b21fbdf697b3bdd9986348a380aa204b3ebe7c146d8e4cdaa7ce735e6054"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  shared_preferences:
-    dependency: transitive
-    description:
-      name: shared_preferences
-      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.4"
-  shared_preferences_android:
-    dependency: transitive
-    description:
-      name: shared_preferences_android
-      sha256: "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.18"
-  shared_preferences_foundation:
-    dependency: transitive
-    description:
-      name: shared_preferences_foundation
-      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.6"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.3"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  slang:
-    dependency: transitive
-    description:
-      name: slang
-      sha256: "13e3b6f07adc51ab751e7889647774d294cbce7a3382f81d9e5029acfe9c37b2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.12.0"
-  slang_flutter:
-    dependency: transitive
-    description:
-      name: slang_flutter
-      sha256: "0a4545cca5404d6b7487cf61cf1fe56c52daeb08de56a7574ee8381fbad035a0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.12.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.7"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.5.2"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
-      url: "https://pub.dev"
-    source: hosted
-    version: "15.0.2"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
-sdks:
-  dart: ">=3.10.7 <4.0.0"
-  flutter: ">=3.38.4"
--- a/apps/mobile/packages/features/client/client_coverage/pubspec.yaml
+++ b/apps/mobile/packages/features/client/client_coverage/pubspec.yaml
@@ -2,6 +2,7 @@ name: client_coverage
 description: Client coverage feature for tracking daily shift coverage and worker status
 version: 1.0.0
 publish_to: none
+resolution: workspace

 environment:
  sdk: ^3.6.0
@@ -26,7 +27,8 @@ dependencies:
  flutter_modular: ^6.3.4
  flutter_bloc: ^8.1.6
  equatable: ^2.0.7
-  intl: ^0.20.1
+  intl: ^0.20.0
+  firebase_data_connect: ^0.2.2+1

 dev_dependencies:
  flutter_test:
--- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/add_hub_dialog.dart
+++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/add_hub_dialog.dart
@@ -2,6 +2,8 @@ import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:core_localization/core_localization.dart';

+import 'hub_address_autocomplete.dart';
+
 /// A dialog for adding a new hub.
 class AddHubDialog extends StatefulWidget {
  /// Callback when the "Create Hub" button is pressed.
@@ -74,12 +76,9 @@ class _AddHubDialogState extends State<AddHubDialog> {
                ),
                const SizedBox(height: UiConstants.space4),
                _buildFieldLabel(t.client_hubs.add_hub_dialog.address_label),
-                TextField(
+                HubAddressAutocomplete(
                  controller: _addressController,
-                  style: UiTypography.body1r.textPrimary,
-                  decoration: _buildInputDecoration(
-                    t.client_hubs.add_hub_dialog.address_hint,
-                  ),
+                  hintText: t.client_hubs.add_hub_dialog.address_hint,
                ),
                const SizedBox(height: UiConstants.space8),
                Row(
--- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_address_autocomplete.dart
+++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_address_autocomplete.dart
@@ -0,0 +1,55 @@
+import 'package:design_system/design_system.dart';
+import 'package:flutter/material.dart';
+import 'package:google_places_flutter/google_places_flutter.dart';
+import 'package:google_places_flutter/model/prediction.dart';
+
+import '../../util/hubs_constants.dart';
+
+class HubAddressAutocomplete extends StatelessWidget {
+  const HubAddressAutocomplete({
+    required this.controller,
+    required this.hintText,
+    super.key,
+  });
+
+  final TextEditingController controller;
+  final String hintText;
+
+  @override
+  Widget build(BuildContext context) {
+    return GooglePlaceAutoCompleteTextField(
+      textEditingController: controller,
+      googleAPIKey: HubsConstants.googlePlacesApiKey,
+      debounceTime: 500,
+      countries: HubsConstants.supportedCountries,
+      isLatLngRequired: false,
+      getPlaceDetailWithLatLng: (Prediction prediction) {
+        // Handle lat/lng if needed in the future
+      },
+      itemClick: (Prediction prediction) {
+        controller.text = prediction.description ?? '';
+        controller.selection = TextSelection.fromPosition(
+          TextPosition(offset: controller.text.length),
+        );
+      },
+      itemBuilder: (_, _, Prediction prediction) {
+        return Padding(
+          padding: const EdgeInsets.all(UiConstants.space2),
+          child: Row(
+            spacing: UiConstants.space1,
+            children: <Widget>[
+              const Icon(UiIcons.mapPin, color: UiColors.iconSecondary),
+              Expanded(
+                child: Text(
+                  prediction.description ?? "",
+                  style: UiTypography.body1r.textSecondary,
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+      textStyle: UiTypography.body1r.textPrimary,
+    );
+  }
+}
--- a/apps/mobile/packages/features/client/hubs/lib/src/util/hubs_constants.dart
+++ b/apps/mobile/packages/features/client/hubs/lib/src/util/hubs_constants.dart
@@ -0,0 +1,4 @@
+class HubsConstants {
+  static const String googlePlacesApiKey = String.fromEnvironment('GOOGLE_PLACES_API_KEY');
+  static const List<String> supportedCountries = <String>['us'];
+}
--- a/apps/mobile/packages/features/client/hubs/pubspec.yaml
+++ b/apps/mobile/packages/features/client/hubs/pubspec.yaml
@@ -11,11 +11,7 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
-  flutter_bloc: ^8.1.0
-  flutter_modular: ^6.3.2
-  equatable: ^2.0.5
-  lucide_icons: ^0.257.0
-  
+
  # Architecture Packages
  krow_core:
    path: ../../../core
@@ -27,8 +23,14 @@ dependencies:
    path: ../../../design_system
  core_localization:
    path: ../../../core_localization
+  
+  flutter_bloc: ^8.1.0
+  flutter_modular: ^6.3.2
+  equatable: ^2.0.5
+  lucide_icons: ^0.257.0
  firebase_auth: ^6.1.4
  firebase_data_connect: ^0.2.2+2
+  google_places_flutter: ^2.1.1

 dev_dependencies:
  flutter_test:
--- a/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_actions.dart
+++ b/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_actions.dart
@@ -24,8 +24,8 @@ class SettingsActions extends StatelessWidget {
        delegate: SliverChildListDelegate(<Widget>[
          const SizedBox(height: UiConstants.space5),

-           /// TODO: FEATURE_NOT_YET_IMPLEMENTED
-           // Edit profile is not yet implemented
+          /// TODO: FEATURE_NOT_YET_IMPLEMENTED
+          // Edit profile is not yet implemented

          // Hubs button
          UiButton.primary(
@@ -49,12 +49,19 @@ class SettingsActions extends StatelessWidget {
      ),
    );
  }
+  
+  /// Handles the sign-out button click event.
+  void _onSignoutClicked(BuildContext context) {
+    ReadContext(
+      context,
+    ).read<ClientSettingsBloc>().add(const ClientSettingsSignOutRequested());
+  }

  /// Shows a confirmation dialog for signing out.
  Future<void> _showSignOutDialog(BuildContext context) {
    return showDialog(
      context: context,
-      builder: (BuildContext context) => AlertDialog(
+      builder: (BuildContext dialogContext) => AlertDialog(
        backgroundColor: UiColors.bgPopup,
        elevation: 0,
        shape: RoundedRectangleBorder(borderRadius: UiConstants.radiusLg),
@@ -70,12 +77,7 @@ class SettingsActions extends StatelessWidget {
          // Log out button
          UiButton.secondary(
            text: t.client_settings.profile.log_out,
-            onPressed: () {
-              Modular.to.pop();
-              BlocProvider.of<ClientSettingsBloc>(
-                context,
-              ).add(const ClientSettingsSignOutRequested());
-            },
+            onPressed: () => _onSignoutClicked(context),
          ),

          // Cancel button
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/certificates/pubspec.lock
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/certificates/pubspec.lock
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/certificates/pubspec.yaml
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/certificates/pubspec.yaml
@@ -2,6 +2,7 @@ name: staff_certificates
 description: Staff certificates feature
 version: 0.0.1
 publish_to: none
+resolution: workspace

 environment:
  sdk: '>=3.0.0 <4.0.0'
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/documents/pubspec.lock
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/documents/pubspec.lock
@@ -1,778 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  _flutterfire_internals:
-    dependency: transitive
-    description:
-      name: _flutterfire_internals
-      sha256: cd83f7d6bd4e4c0b0b4fef802e8796784032e1cc23d7b0e982cf5d05d9bbe182
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.66"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.1"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.7.0"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.13.0"
-  auto_injector:
-    dependency: transitive
-    description:
-      name: auto_injector
-      sha256: "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  bloc:
-    dependency: "direct main"
-    description:
-      name: bloc
-      sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.4"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  code_assets:
-    dependency: transitive
-    description:
-      name: code_assets
-      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.1"
-  core_localization:
-    dependency: "direct main"
-    description:
-      path: "../../../../../core_localization"
-      relative: true
-    source: path
-    version: "0.0.1"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.7"
-  csv:
-    dependency: transitive
-    description:
-      name: csv
-      sha256: c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.0"
-  design_system:
-    dependency: "direct main"
-    description:
-      path: "../../../../../design_system"
-      relative: true
-    source: path
-    version: "0.0.1"
-  equatable:
-    dependency: "direct main"
-    description:
-      name: equatable
-      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.8"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.3"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  firebase_app_check:
-    dependency: transitive
-    description:
-      name: firebase_app_check
-      sha256: "45f0d279ea7ae4eac1867a4c85aa225761e3ac0ccf646386a860b2bc16581f76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.1+4"
-  firebase_app_check_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_app_check_platform_interface
-      sha256: e32b4e6adeaac207a6f7afe0906d97c0811de42fb200d9b6317a09155de65e2b
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1+4"
-  firebase_app_check_web:
-    dependency: transitive
-    description:
-      name: firebase_app_check_web
-      sha256: "2cbc8a18a34813a7e31d7b30f989973087421cd5d0e397b4dd88a90289aa2bed"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2+2"
-  firebase_auth:
-    dependency: "direct main"
-    description:
-      name: firebase_auth
-      sha256: b20d1540460814c5984474c1e9dd833bdbcff6ecd8d6ad86cc9da8cfd581c172
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.4"
-  firebase_auth_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_auth_platform_interface
-      sha256: fd0225320b6bbc92460c86352d16b60aea15f9ef88292774cca97b0522ea9f72
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.6"
-  firebase_auth_web:
-    dependency: transitive
-    description:
-      name: firebase_auth_web
-      sha256: be7dccb263b89fbda2a564de9d8193118196e8481ffb937222a025cdfdf82c40
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
-  firebase_core:
-    dependency: transitive
-    description:
-      name: firebase_core
-      sha256: "923085c881663ef685269b013e241b428e1fb03cdd0ebde265d9b40ff18abf80"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.4.0"
-  firebase_core_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_core_platform_interface
-      sha256: cccb4f572325dc14904c02fcc7db6323ad62ba02536833dddb5c02cac7341c64
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.2"
-  firebase_core_web:
-    dependency: transitive
-    description:
-      name: firebase_core_web
-      sha256: "83e7356c704131ca4d8d8dd57e360d8acecbca38b1a3705c7ae46cc34c708084"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.0"
-  firebase_data_connect:
-    dependency: "direct main"
-    description:
-      name: firebase_data_connect
-      sha256: "01d0f8e33c520a6e6f59cf5ac6ff281d1927f7837f094fa8eb5fdb0b1b328ad8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2+2"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_bloc:
-    dependency: "direct main"
-    description:
-      name: flutter_bloc
-      sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.6"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_modular:
-    dependency: "direct main"
-    description:
-      name: flutter_modular
-      sha256: "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.4.1"
-  flutter_test:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  font_awesome_flutter:
-    dependency: transitive
-    description:
-      name: font_awesome_flutter
-      sha256: b9011df3a1fa02993630b8fb83526368cf2206a711259830325bab2f1d2a4eb0
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.12.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  google_fonts:
-    dependency: transitive
-    description:
-      name: google_fonts
-      sha256: "6996212014b996eaa17074e02b1b925b212f5e053832d9048970dc27255a8fb3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.1.0"
-  google_identity_services_web:
-    dependency: transitive
-    description:
-      name: google_identity_services_web
-      sha256: "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.3+1"
-  googleapis_auth:
-    dependency: transitive
-    description:
-      name: googleapis_auth
-      sha256: befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.6.0"
-  grpc:
-    dependency: transitive
-    description:
-      name: grpc
-      sha256: e93ee3bce45c134bf44e9728119102358c7cd69de7832d9a874e2e74eb8cab40
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.4"
-  hooks:
-    dependency: transitive
-    description:
-      name: hooks
-      sha256: "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.6.0"
-  http2:
-    dependency: transitive
-    description:
-      name: http2
-      sha256: "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.1"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.2"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.2"
-  krow_core:
-    dependency: "direct main"
-    description:
-      path: "../../../../../core"
-      relative: true
-    source: path
-    version: "0.0.1"
-  krow_data_connect:
-    dependency: "direct main"
-    description:
-      path: "../../../../../data_connect"
-      relative: true
-    source: path
-    version: "0.0.1"
-  krow_domain:
-    dependency: "direct main"
-    description:
-      path: "../../../../../domain"
-      relative: true
-    source: path
-    version: "0.0.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.0.2"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.10"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  lucide_icons:
-    dependency: "direct main"
-    description:
-      name: lucide_icons
-      sha256: ad24d0fd65707e48add30bebada7d90bff2a1bba0a72d6e9b19d44246b0e83c4
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.257.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.17"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.17.0"
-  modular_core:
-    dependency: transitive
-    description:
-      name: modular_core
-      sha256: "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.1"
-  native_toolchain_c:
-    dependency: transitive
-    description:
-      name: native_toolchain_c
-      sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.17.4"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  objective_c:
-    dependency: transitive
-    description:
-      name: objective_c
-      sha256: "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.4"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  path_provider:
-    dependency: transitive
-    description:
-      name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  path_provider_android:
-    dependency: transitive
-    description:
-      name: path_provider_android
-      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.22"
-  path_provider_foundation:
-    dependency: transitive
-    description:
-      name: path_provider_foundation
-      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.1"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.6"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  protobuf:
-    dependency: transitive
-    description:
-      name: protobuf
-      sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.5+1"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  result_dart:
-    dependency: transitive
-    description:
-      name: result_dart
-      sha256: "0666b21fbdf697b3bdd9986348a380aa204b3ebe7c146d8e4cdaa7ce735e6054"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  shared_preferences:
-    dependency: transitive
-    description:
-      name: shared_preferences
-      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.4"
-  shared_preferences_android:
-    dependency: transitive
-    description:
-      name: shared_preferences_android
-      sha256: "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.18"
-  shared_preferences_foundation:
-    dependency: transitive
-    description:
-      name: shared_preferences_foundation
-      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.6"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.3"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  slang:
-    dependency: transitive
-    description:
-      name: slang
-      sha256: "13e3b6f07adc51ab751e7889647774d294cbce7a3382f81d9e5029acfe9c37b2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.12.0"
-  slang_flutter:
-    dependency: transitive
-    description:
-      name: slang_flutter
-      sha256: "0a4545cca5404d6b7487cf61cf1fe56c52daeb08de56a7574ee8381fbad035a0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.12.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.7"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.5.2"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
-      url: "https://pub.dev"
-    source: hosted
-    version: "15.0.2"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
-sdks:
-  dart: ">=3.10.7 <4.0.0"
-  flutter: ">=3.38.4"
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/documents/pubspec.yaml
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/documents/pubspec.yaml
@@ -2,6 +2,7 @@ name: staff_documents
 description: Staff Documents feature.
 version: 0.0.1
 publish_to: none
+resolution: workspace

 environment:
  sdk: '>=3.10.0 <4.0.0'
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/data/mappers/tax_form_mapper.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/data/mappers/tax_form_mapper.dart
@@ -0,0 +1,76 @@
+import 'package:firebase_data_connect/firebase_data_connect.dart';
+import 'package:krow_data_connect/krow_data_connect.dart' as dc;
+import 'package:krow_domain/krow_domain.dart';
+
+class TaxFormMapper {
+  static TaxForm fromDataConnect(dc.GetTaxFormsByStaffIdTaxForms form) {
+    // Construct the legacy map for the entity
+    final Map<String, dynamic> formData = {
+      'firstName': form.firstName,
+      'lastName': form.lastName,
+      'middleInitial': form.mInitial,
+      'otherLastNames': form.oLastName,
+      'dob': _formatDate(form.dob),
+      'ssn': form.socialSN.toString(),
+      'email': form.email,
+      'phone': form.phone,
+      'address': form.address,
+      'aptNumber': form.apt,
+      'city': form.city,
+      'state': form.state,
+      'zipCode': form.zipCode,
+
+      // I-9 Fields
+      'citizenshipStatus': form.citizen?.stringValue,
+      'uscisNumber': form.uscis,
+      'passportNumber': form.passportNumber,
+      'countryIssuance': form.countryIssue,
+      'preparerUsed': form.prepartorOrTranslator,
+
+      // W-4 Fields
+      'filingStatus': form.marital?.stringValue,
+      'multipleJobs': form.multipleJob,
+      'qualifyingChildren': form.childrens,
+      'otherDependents': form.otherDeps,
+      'otherIncome': form.otherInconme?.toString(),
+      'deductions': form.deductions?.toString(),
+      'extraWithholding': form.extraWithholding?.toString(),
+
+      'signature': form.signature,
+    };
+
+    String title = '';
+    String subtitle = '';
+    String description = '';
+
+    if (form.formType == dc.TaxFormType.I9) {
+      title = 'Form I-9';
+      subtitle = 'Employment Eligibility Verification';
+      description = 'Required for all new hires to verify identity.';
+    } else {
+      title = 'Form W-4';
+      subtitle = 'Employee\'s Withholding Certificate';
+      description = 'Determines federal income tax withholding.';
+    }
+
+    return TaxFormAdapter.fromPrimitives(
+      id: form.id,
+      type: form.formType.stringValue,
+      title: title,
+      subtitle: subtitle,
+      description: description,
+      status: form.status.stringValue,
+      staffId: form.staffId,
+      formData: formData,
+      updatedAt: form.updatedAt?.toDateTime(),
+    );
+  }
+
+  static String? _formatDate(Timestamp? timestamp) {
+    if (timestamp == null) return null;
+
+    final DateTime date = timestamp.toDateTime();
+
+    return '${date.month.toString().padLeft(2, '0')}/${date.day.toString().padLeft(2, '0')}/${date.year}';
+  }
+}
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/data/repositories/tax_forms_repository_impl.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/data/repositories/tax_forms_repository_impl.dart
@@ -6,6 +6,7 @@ import 'package:krow_data_connect/krow_data_connect.dart' as dc;
 import 'package:krow_domain/krow_domain.dart';

 import '../../domain/repositories/tax_forms_repository.dart';
+import '../mappers/tax_form_mapper.dart';

 class TaxFormsRepositoryImpl implements TaxFormsRepository {
  TaxFormsRepositoryImpl({
@@ -33,11 +34,11 @@ class TaxFormsRepositoryImpl implements TaxFormsRepository {
  @override
  Future<List<TaxForm>> getTaxForms() async {
    final String staffId = _getStaffId();
-    final QueryResult<dc.GetTaxFormsBystaffIdData, dc.GetTaxFormsBystaffIdVariables>
+    final QueryResult<dc.GetTaxFormsByStaffIdData, dc.GetTaxFormsByStaffIdVariables>
        result =
-        await dataConnect.getTaxFormsBystaffId(staffId: staffId).execute();
+        await dataConnect.getTaxFormsByStaffId(staffId: staffId).execute();

-    final List<TaxForm> forms = result.data.taxForms.map((dc.GetTaxFormsBystaffIdTaxForms e) => _mapToEntity(e)).toList();
+    final List<TaxForm> forms = result.data.taxForms.map(TaxFormMapper.fromDataConnect).toList();

    // Check if required forms exist, create if not.
    final Set<TaxFormType> typesPresent = forms.map((TaxForm f) => f.type).toSet();
@@ -53,98 +54,161 @@ class TaxFormsRepositoryImpl implements TaxFormsRepository {
    }

    if (createdNew) {
-      final QueryResult<dc.GetTaxFormsBystaffIdData, dc.GetTaxFormsBystaffIdVariables>
+      final QueryResult<dc.GetTaxFormsByStaffIdData, dc.GetTaxFormsByStaffIdVariables>
          result2 =
-          await dataConnect.getTaxFormsBystaffId(staffId: staffId).execute();
-      return result2.data.taxForms.map((dc.GetTaxFormsBystaffIdTaxForms e) => _mapToEntity(e)).toList();
+          await dataConnect.getTaxFormsByStaffId(staffId: staffId).execute();
+      return result2.data.taxForms.map(TaxFormMapper.fromDataConnect).toList();
    }

    return forms;
  }

  Future<void> _createInitialForm(String staffId, TaxFormType type) async {
-    String title = '';
-    String subtitle = '';
-    String description = '';
-
-    if (type == TaxFormType.i9) {
-      title = 'Form I-9';
-      subtitle = 'Employment Eligibility Verification';
-      description = 'Required for all new hires to verify identity.';
-    } else {
-      title = 'Form W-4';
-      subtitle = 'Employee\'s Withholding Certificate';
-      description = 'Determines federal income tax withholding.';
-    }
-
    await dataConnect
        .createTaxForm(
          staffId: staffId,
-          formType: dc.TaxFormType.values.byName(TaxFormAdapter.typeToString(type)),
-          title: title,
+          formType:
+              dc.TaxFormType.values.byName(TaxFormAdapter.typeToString(type)),
+          firstName: '',
+          lastName: '',
+          socialSN: 0,
+          address: '',
+          status: dc.TaxFormStatus.NOT_STARTED,
        )
-        .subtitle(subtitle)
-        .description(description)
-        .status(dc.TaxFormStatus.NOT_STARTED)
        .execute();
  }

  @override
-  Future<void> submitForm(TaxFormType type, Map<String, dynamic> data) async {
-    final String staffId = _getStaffId();
-    final QueryResult<dc.GetTaxFormsBystaffIdData, dc.GetTaxFormsBystaffIdVariables>
-        result =
-        await dataConnect.getTaxFormsBystaffId(staffId: staffId).execute();
-    final String targetTypeString = TaxFormAdapter.typeToString(type);
-
-    final dc.GetTaxFormsBystaffIdTaxForms form = result.data.taxForms.firstWhere(
-      (dc.GetTaxFormsBystaffIdTaxForms e) => e.formType.stringValue == targetTypeString,
-      orElse: () => throw Exception('Form not found for submission'),
-    );
-
-    // AnyValue expects a scalar, list, or map.
-    await dataConnect
-        .updateTaxForm(
-          id: form.id,
-        )
-        .formData(AnyValue.fromJson(data))
-        .status(dc.TaxFormStatus.SUBMITTED)
-        .execute();
+  Future<void> updateI9Form(I9TaxForm form) async {
+    final Map<String, dynamic> data = form.formData;
+    final dc.UpdateTaxFormVariablesBuilder builder = dataConnect.updateTaxForm(id: form.id);
+    _mapCommonFields(builder, data);
+    _mapI9Fields(builder, data);
+    await builder.execute();
  }

  @override
-  Future<void> updateFormStatus(TaxFormType type, TaxFormStatus status) async {
-    final String staffId = _getStaffId();
-    final QueryResult<dc.GetTaxFormsBystaffIdData, dc.GetTaxFormsBystaffIdVariables>
-        result =
-        await dataConnect.getTaxFormsBystaffId(staffId: staffId).execute();
-    final String targetTypeString = TaxFormAdapter.typeToString(type);
-
-    final dc.GetTaxFormsBystaffIdTaxForms form = result.data.taxForms.firstWhere(
-      (dc.GetTaxFormsBystaffIdTaxForms e) => e.formType.stringValue == targetTypeString,
-      orElse: () => throw Exception('Form not found for update'),
-    );
-
-    await dataConnect
-        .updateTaxForm(
-          id: form.id,
-        )
-        .status(dc.TaxFormStatus.values.byName(TaxFormAdapter.statusToString(status)))
-        .execute();
+  Future<void> submitI9Form(I9TaxForm form) async {
+    final Map<String, dynamic> data = form.formData;
+    final dc.UpdateTaxFormVariablesBuilder builder = dataConnect.updateTaxForm(id: form.id);
+    _mapCommonFields(builder, data);
+    _mapI9Fields(builder, data);
+    await builder.status(dc.TaxFormStatus.SUBMITTED).execute();
  }

-  TaxForm _mapToEntity(dc.GetTaxFormsBystaffIdTaxForms form) {
-    return TaxFormAdapter.fromPrimitives(
-      id: form.id,
-      type: form.formType.stringValue,
-      title: form.title,
-      subtitle: form.subtitle,
-      description: form.description,
-      status: form.status.stringValue,
-      staffId: form.staffId,
-      formData: form.formData, // Adapter expects dynamic
-      updatedAt: form.updatedAt?.toDateTime(),
-    );
+  @override
+  Future<void> updateW4Form(W4TaxForm form) async {
+    final Map<String, dynamic> data = form.formData;
+    final dc.UpdateTaxFormVariablesBuilder builder = dataConnect.updateTaxForm(id: form.id);
+    _mapCommonFields(builder, data);
+    _mapW4Fields(builder, data);
+    await builder.execute();
+  }
+
+  @override
+  Future<void> submitW4Form(W4TaxForm form) async {
+    final Map<String, dynamic> data = form.formData;
+    final dc.UpdateTaxFormVariablesBuilder builder = dataConnect.updateTaxForm(id: form.id);
+    _mapCommonFields(builder, data);
+    _mapW4Fields(builder, data);
+    await builder.status(dc.TaxFormStatus.SUBMITTED).execute();
+  }
+
+  void _mapCommonFields(dc.UpdateTaxFormVariablesBuilder builder, Map<String, dynamic> data) {
+    if (data.containsKey('firstName')) builder.firstName(data['firstName'] as String?);
+    if (data.containsKey('lastName')) builder.lastName(data['lastName'] as String?);
+    if (data.containsKey('middleInitial')) builder.mInitial(data['middleInitial'] as String?);
+    if (data.containsKey('otherLastNames')) builder.oLastName(data['otherLastNames'] as String?);
+    if (data.containsKey('dob')) {
+      final String dob = data['dob'] as String;
+      // Handle both ISO string and MM/dd/yyyy manual entry
+      DateTime? date;
+      try {
+        date = DateTime.parse(dob);
+      } catch (_) {
+        try {
+          // Fallback minimal parse for mm/dd/yyyy
+          final List<String> parts = dob.split('/');
+          if (parts.length == 3) {
+            date = DateTime(
+              int.parse(parts[2]), 
+              int.parse(parts[0]), 
+              int.parse(parts[1]),
+            );
+          }
+        } catch (_) {}
+      }
+      if (date != null) {
+        final int ms = date.millisecondsSinceEpoch;
+        final int seconds = (ms / 1000).floor();
+        builder.dob(Timestamp(0, seconds));
+      }
+    }
+    if (data.containsKey('ssn') && data['ssn']?.toString().isNotEmpty == true) {
+      builder.socialSN(int.tryParse(data['ssn'].toString().replaceAll(RegExp(r'\D'), '')) ?? 0);
+    }
+    if (data.containsKey('email')) builder.email(data['email'] as String?);
+    if (data.containsKey('phone')) builder.phone(data['phone'] as String?);
+    if (data.containsKey('address')) builder.address(data['address'] as String?);
+    if (data.containsKey('aptNumber')) builder.apt(data['aptNumber'] as String?);
+    if (data.containsKey('city')) builder.city(data['city'] as String?);
+    if (data.containsKey('state')) builder.state(data['state'] as String?);
+    if (data.containsKey('zipCode')) builder.zipCode(data['zipCode'] as String?);
+  }
+
+  void _mapI9Fields(dc.UpdateTaxFormVariablesBuilder builder, Map<String, dynamic> data) {
+    if (data.containsKey('citizenshipStatus')) {
+      final String status = data['citizenshipStatus'] as String;
+      // Map string to enum if possible, or handle otherwise.
+      // Generated enum: CITIZEN, NONCITIZEN_NATIONAL, PERMANENT_RESIDENT, ALIEN_AUTHORIZED
+      try {
+        builder.citizen(dc.CitizenshipStatus.values.byName(status.toUpperCase()));
+      } catch (_) {}
+    }
+    if (data.containsKey('uscisNumber')) builder.uscis(data['uscisNumber'] as String?);
+    if (data.containsKey('passportNumber')) builder.passportNumber(data['passportNumber'] as String?);
+    if (data.containsKey('countryIssuance')) builder.countryIssue(data['countryIssuance'] as String?);
+    if (data.containsKey('preparerUsed')) builder.prepartorOrTranslator(data['preparerUsed'] as bool?);
+    if (data.containsKey('signature')) builder.signature(data['signature'] as String?);
+    // Note: admissionNumber not in builder based on file read
+  }
+
+  void _mapW4Fields(dc.UpdateTaxFormVariablesBuilder builder, Map<String, dynamic> data) {
+    if (data.containsKey('cityStateZip')) {
+       final String csz = data['cityStateZip'] as String;
+       // Extremely basic split: City, State Zip
+       final List<String> parts = csz.split(',');
+       if (parts.length >= 2) {
+         builder.city(parts[0].trim());
+         final String stateZip = parts[1].trim();
+         final List<String> szParts = stateZip.split(' ');
+         if (szParts.isNotEmpty) builder.state(szParts[0]);
+         if (szParts.length > 1) builder.zipCode(szParts.last);
+       }
+    }
+    if (data.containsKey('filingStatus')) {
+      // MARITIAL_STATUS_SINGLE, MARITIAL_STATUS_MARRIED, MARITIAL_STATUS_HEAD
+       try {
+         final String status = data['filingStatus'] as String;
+         // Simple mapping assumptions:
+         if (status.contains('single')) builder.marital(dc.MaritalStatus.SINGLE);
+         else if (status.contains('married')) builder.marital(dc.MaritalStatus.MARRIED);
+         else if (status.contains('head')) builder.marital(dc.MaritalStatus.HEAD);
+       } catch (_) {}
+    }
+    if (data.containsKey('multipleJobs')) builder.multipleJob(data['multipleJobs'] as bool?);
+    if (data.containsKey('qualifyingChildren')) builder.childrens(data['qualifyingChildren'] as int?);
+    if (data.containsKey('otherDependents')) builder.otherDeps(data['otherDependents'] as int?);
+    if (data.containsKey('otherIncome')) {
+       builder.otherInconme(double.tryParse(data['otherIncome'].toString()));
+    }
+    if (data.containsKey('deductions')) {
+       builder.deductions(double.tryParse(data['deductions'].toString()));
+    }
+    if (data.containsKey('extraWithholding')) {
+       builder.extraWithholding(double.tryParse(data['extraWithholding'].toString()));
+    }
+    if (data.containsKey('signature')) builder.signature(data['signature'] as String?);
  }
 }

--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/entities/tax_form_entity.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/entities/tax_form_entity.dart
@@ -1,26 +0,0 @@
-import 'package:equatable/equatable.dart';
-
-enum TaxFormType { i9, w4 }
-
-enum TaxFormStatus { notStarted, inProgress, submitted, approved, rejected }
-
-class TaxFormEntity extends Equatable {
-  final TaxFormType type;
-  final String title;
-  final String subtitle;
-  final String description;
-  final TaxFormStatus status;
-  final DateTime? lastUpdated;
-
-  const TaxFormEntity({
-    required this.type,
-    required this.title,
-    required this.subtitle,
-    required this.description,
-    this.status = TaxFormStatus.notStarted,
-    this.lastUpdated,
-  });
-
-  @override
-  List<Object?> get props => [type, title, subtitle, description, status, lastUpdated];
-}
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/repositories/tax_forms_repository.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/repositories/tax_forms_repository.dart
@@ -2,6 +2,8 @@ import 'package:krow_domain/krow_domain.dart';

 abstract class TaxFormsRepository {
  Future<List<TaxForm>> getTaxForms();
-  Future<void> submitForm(TaxFormType type, Map<String, dynamic> data);
-  Future<void> updateFormStatus(TaxFormType type, TaxFormStatus status);
+  Future<void> updateI9Form(I9TaxForm form);
+  Future<void> submitI9Form(I9TaxForm form);
+  Future<void> updateW4Form(W4TaxForm form);
+  Future<void> submitW4Form(W4TaxForm form);
 }
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/save_i9_form_usecase.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/save_i9_form_usecase.dart
@@ -0,0 +1,12 @@
+import 'package:krow_domain/krow_domain.dart';
+import '../repositories/tax_forms_repository.dart';
+
+class SaveI9FormUseCase {
+  final TaxFormsRepository _repository;
+
+  SaveI9FormUseCase(this._repository);
+
+  Future<void> call(I9TaxForm form) async {
+    return _repository.updateI9Form(form);
+  }
+}
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/save_w4_form_usecase.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/save_w4_form_usecase.dart
@@ -0,0 +1,12 @@
+import 'package:krow_domain/krow_domain.dart';
+import '../repositories/tax_forms_repository.dart';
+
+class SaveW4FormUseCase {
+  final TaxFormsRepository _repository;
+
+  SaveW4FormUseCase(this._repository);
+
+  Future<void> call(W4TaxForm form) async {
+    return _repository.updateW4Form(form);
+  }
+}
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/submit_i9_form_usecase.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/submit_i9_form_usecase.dart
@@ -0,0 +1,12 @@
+import 'package:krow_domain/krow_domain.dart';
+import '../repositories/tax_forms_repository.dart';
+
+class SubmitI9FormUseCase {
+  final TaxFormsRepository _repository;
+
+  SubmitI9FormUseCase(this._repository);
+
+  Future<void> call(I9TaxForm form) async {
+    return _repository.submitI9Form(form);
+  }
+}
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/submit_tax_form_usecase.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/submit_tax_form_usecase.dart
@@ -1,12 +0,0 @@
-import 'package:krow_domain/krow_domain.dart';
-import '../repositories/tax_forms_repository.dart';
-
-class SubmitTaxFormUseCase {
-  final TaxFormsRepository _repository;
-
-  SubmitTaxFormUseCase(this._repository);
-
-  Future<void> call(TaxFormType type, Map<String, dynamic> data) async {
-    return _repository.submitForm(type, data);
-  }
-}
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/submit_w4_form_usecase.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/domain/usecases/submit_w4_form_usecase.dart
@@ -0,0 +1,12 @@
+import 'package:krow_domain/krow_domain.dart';
+import '../repositories/tax_forms_repository.dart';
+
+class SubmitW4FormUseCase {
+  final TaxFormsRepository _repository;
+
+  SubmitW4FormUseCase(this._repository);
+
+  Future<void> call(W4TaxForm form) async {
+    return _repository.submitW4Form(form);
+  }
+}
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/blocs/i9/form_i9_cubit.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/blocs/i9/form_i9_cubit.dart
@@ -1,13 +1,47 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:krow_domain/krow_domain.dart';
+import 'package:uuid/uuid.dart';

-import '../../../domain/usecases/submit_tax_form_usecase.dart';
+import '../../../domain/usecases/submit_i9_form_usecase.dart';
 import 'form_i9_state.dart';

 class FormI9Cubit extends Cubit<FormI9State> {
-  final SubmitTaxFormUseCase _submitTaxFormUseCase;
+  final SubmitI9FormUseCase _submitI9FormUseCase;
+  String _formId = '';

-  FormI9Cubit(this._submitTaxFormUseCase) : super(const FormI9State());
+  FormI9Cubit(this._submitI9FormUseCase) : super(const FormI9State());
+
+  void initialize(TaxForm? form) {
+    if (form == null || form.formData.isEmpty) {
+      emit(const FormI9State()); // Reset to empty if no form
+      return;
+    }
+    
+    final Map<String, dynamic> data = form.formData;
+    _formId = form.id;
+    emit(FormI9State(
+      firstName: data['firstName'] as String? ?? '',
+      lastName: data['lastName'] as String? ?? '',
+      middleInitial: data['middleInitial'] as String? ?? '',
+      otherLastNames: data['otherLastNames'] as String? ?? '',
+      dob: data['dob'] as String? ?? '',
+      ssn: data['ssn'] as String? ?? '',
+      email: data['email'] as String? ?? '',
+      phone: data['phone'] as String? ?? '',
+      address: data['address'] as String? ?? '',
+      aptNumber: data['aptNumber'] as String? ?? '',
+      city: data['city'] as String? ?? '',
+      state: data['state'] as String? ?? '',
+      zipCode: data['zipCode'] as String? ?? '',
+      citizenshipStatus: data['citizenshipStatus'] as String? ?? '',
+      uscisNumber: data['uscisNumber'] as String? ?? '',
+      admissionNumber: data['admissionNumber'] as String? ?? '',
+      passportNumber: data['passportNumber'] as String? ?? '',
+      countryIssuance: data['countryIssuance'] as String? ?? '',
+      preparerUsed: data['preparerUsed'] as bool? ?? false,
+      signature: data['signature'] as String? ?? '',
+    ));
+  }

  void nextStep(int totalSteps) {
    if (state.currentStep < totalSteps - 1) {
@@ -52,18 +86,36 @@ class FormI9Cubit extends Cubit<FormI9State> {
  Future<void> submit() async {
    emit(state.copyWith(status: FormI9Status.submitting));
    try {
-      await _submitTaxFormUseCase(
-        TaxFormType.i9,
-        <String, dynamic>{
-          'firstName': state.firstName,
-          'lastName': state.lastName,
-          'middleInitial': state.middleInitial,
-          'citizenshipStatus': state.citizenshipStatus,
-          'ssn': state.ssn,
-          'signature': state.signature,
-          // ... add other fields as needed for backend
-        },
+      final Map<String, dynamic> formData = {
+        'firstName': state.firstName,
+        'lastName': state.lastName,
+        'middleInitial': state.middleInitial,
+        'otherLastNames': state.otherLastNames,
+        'dob': state.dob,
+        'ssn': state.ssn,
+        'email': state.email,
+        'phone': state.phone,
+        'address': state.address,
+        'aptNumber': state.aptNumber,
+        'city': state.city,
+        'state': state.state,
+        'zipCode': state.zipCode,
+        'citizenshipStatus': state.citizenshipStatus,
+        'uscisNumber': state.uscisNumber,
+        'admissionNumber': state.admissionNumber,
+        'passportNumber': state.passportNumber,
+        'countryIssuance': state.countryIssuance,
+        'preparerUsed': state.preparerUsed,
+        'signature': state.signature,
+      };
+
+      final I9TaxForm form = I9TaxForm(
+        id: _formId.isNotEmpty ? _formId : const Uuid().v4(),
+        title: 'Form I-9',
+        formData: formData,
      );
+
+      await _submitI9FormUseCase(form);
      emit(state.copyWith(status: FormI9Status.success));
    } catch (e) {
      emit(state.copyWith(
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/blocs/w4/form_w4_cubit.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/blocs/w4/form_w4_cubit.dart
@@ -1,13 +1,47 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:krow_domain/krow_domain.dart';
+import 'package:uuid/uuid.dart';

-import '../../../domain/usecases/submit_tax_form_usecase.dart';
+import '../../../domain/usecases/submit_w4_form_usecase.dart';
 import 'form_w4_state.dart';

 class FormW4Cubit extends Cubit<FormW4State> {
-  final SubmitTaxFormUseCase _submitTaxFormUseCase;
+  final SubmitW4FormUseCase _submitW4FormUseCase;
+  String _formId = '';

-  FormW4Cubit(this._submitTaxFormUseCase) : super(const FormW4State());
+  FormW4Cubit(this._submitW4FormUseCase) : super(const FormW4State());
+
+  void initialize(TaxForm? form) {
+    if (form == null || form.formData.isEmpty) {
+      emit(const FormW4State()); // Reset
+      return;
+    }
+    
+    final Map<String, dynamic> data = form.formData;
+    _formId = form.id;
+    
+    // Combine address parts if needed, or take existing
+    final String city = data['city'] as String? ?? '';
+    final String stateVal = data['state'] as String? ?? '';
+    final String zip = data['zipCode'] as String? ?? '';
+    final String cityStateZip = '$city, $stateVal $zip'.trim();
+
+    emit(FormW4State(
+      firstName: data['firstName'] as String? ?? '',
+      lastName: data['lastName'] as String? ?? '',
+      ssn: data['ssn'] as String? ?? '',
+      address: data['address'] as String? ?? '',
+      cityStateZip: cityStateZip.contains(',') ? cityStateZip : '',
+      filingStatus: data['filingStatus'] as String? ?? '',
+      multipleJobs: data['multipleJobs'] as bool? ?? false,
+      qualifyingChildren: data['qualifyingChildren'] as int? ?? 0,
+      otherDependents: data['otherDependents'] as int? ?? 0,
+      otherIncome: data['otherIncome'] as String? ?? '',
+      deductions: data['deductions'] as String? ?? '',
+      extraWithholding: data['extraWithholding'] as String? ?? '',
+      signature: data['signature'] as String? ?? '',
+    ));
+  }

  void nextStep(int totalSteps) {
    if (state.currentStep < totalSteps - 1) {
@@ -45,18 +79,29 @@ class FormW4Cubit extends Cubit<FormW4State> {
  Future<void> submit() async {
    emit(state.copyWith(status: FormW4Status.submitting));
    try {
-      await _submitTaxFormUseCase(
-        TaxFormType.w4,
-        <String, dynamic>{
-          'firstName': state.firstName,
-          'lastName': state.lastName,
-          'ssn': state.ssn,
-          'filingStatus': state.filingStatus,
-          'multipleJobs': state.multipleJobs,
-          'signature': state.signature,
-          // ... add other fields as needed
-        },
+      final Map<String, dynamic> formData = {
+        'firstName': state.firstName,
+        'lastName': state.lastName,
+        'ssn': state.ssn,
+        'address': state.address,
+        'cityStateZip': state.cityStateZip, // Note: Repository should split this if needed.
+        'filingStatus': state.filingStatus,
+        'multipleJobs': state.multipleJobs,
+        'qualifyingChildren': state.qualifyingChildren,
+        'otherDependents': state.otherDependents,
+        'otherIncome': state.otherIncome,
+        'deductions': state.deductions,
+        'extraWithholding': state.extraWithholding,
+        'signature': state.signature,
+      };
+
+      final W4TaxForm form = W4TaxForm(
+        id: _formId.isNotEmpty ? _formId : const Uuid().v4(),
+        title: 'Form W-4',
+        formData: formData,
      );
+
+      await _submitW4FormUseCase(form);
      emit(state.copyWith(status: FormW4Status.success));
    } catch (e) {
      emit(state.copyWith(
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/pages/form_i9_page.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/pages/form_i9_page.dart
@@ -2,12 +2,14 @@ import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_modular/flutter_modular.dart' hide ModularWatchExtension;
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:krow_domain/krow_domain.dart';

 import '../blocs/i9/form_i9_cubit.dart';
 import '../blocs/i9/form_i9_state.dart';

 class FormI9Page extends StatefulWidget {
-  const FormI9Page({super.key});
+  final TaxForm? form;
+  const FormI9Page({super.key, this.form});

  @override
  State<FormI9Page> createState() => _FormI9PageState();
@@ -22,6 +24,16 @@ class _FormI9PageState extends State<FormI9Page> {
    'SD', 'TN', 'TX', 'UT', 'VT', 'VA', 'WA', 'WV', 'WI', 'WY'
  ];

+  @override
+  void initState() {
+    super.initState();
+    if (widget.form != null) {
+      // Use post-frame callback or simple direct call since we are using Modular.get in build
+      // But better helper:
+      Modular.get<FormI9Cubit>().initialize(widget.form);
+    }
+  }
+
  final List<Map<String, String>> _steps = <Map<String, String>>[
    <String, String>{'title': 'Personal Information', 'subtitle': 'Name and contact details'},
    <String, String>{'title': 'Address', 'subtitle': 'Your current address'},
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/pages/form_w4_page.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/pages/form_w4_page.dart
@@ -2,18 +2,81 @@ import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_modular/flutter_modular.dart' hide ModularWatchExtension;
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:krow_domain/krow_domain.dart';

 import '../blocs/w4/form_w4_cubit.dart';
 import '../blocs/w4/form_w4_state.dart';

 class FormW4Page extends StatefulWidget {
-  const FormW4Page({super.key});
+  final TaxForm? form;
+  const FormW4Page({super.key, this.form});

  @override
  State<FormW4Page> createState() => _FormW4PageState();
 }

 class _FormW4PageState extends State<FormW4Page> {
+  @override
+  void initState() {
+    super.initState();
+    if (widget.form != null) {
+      Modular.get<FormW4Cubit>().initialize(widget.form);
+    }
+  }
+
+  final List<String> _usStates = <String>[
+    'Alabama',
+    'Alaska',
+    'Arizona',
+    'Arkansas',
+    'California',
+    'Colorado',
+    'Connecticut',
+    'Delaware',
+    'Florida',
+    'Georgia',
+    'Hawaii',
+    'Idaho',
+    'Illinois',
+    'Indiana',
+    'Iowa',
+    'Kansas',
+    'Kentucky',
+    'Louisiana',
+    'Maine',
+    'Maryland',
+    'Massachusetts',
+    'Michigan',
+    'Minnesota',
+    'Mississippi',
+    'Missouri',
+    'Montana',
+    'Nebraska',
+    'Nevada',
+    'New Hampshire',
+    'New Jersey',
+    'New Mexico',
+    'New York',
+    'North Carolina',
+    'North Dakota',
+    'Ohio',
+    'Oklahoma',
+    'Oregon',
+    'Pennsylvania',
+    'Rhode Island',
+    'South Carolina',
+    'South Dakota',
+    'Tennessee',
+    'Texas',
+    'Utah',
+    'Vermont',
+    'Virginia',
+    'Washington',
+    'West Virginia',
+    'Wisconsin',
+    'Wyoming',
+  ];
+
  final List<Map<String, String>> _steps = <Map<String, String>>[
    <String, String>{'title': 'Personal Information', 'subtitle': 'Step 1'},
    <String, String>{'title': 'Filing Status', 'subtitle': 'Step 1c'},
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/pages/tax_forms_page.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/presentation/pages/tax_forms_page.dart
@@ -140,14 +140,14 @@ class TaxFormsPage extends StatelessWidget {

  Widget _buildFormCard(TaxForm form) {
    // Helper to get icon based on type (could be in entity or a mapper)
-    final String icon = form.type == TaxFormType.i9 ? '🛂' : '📋';
+    final String icon = form is I9TaxForm ? '🛂' : '📋';

    return GestureDetector(
      onTap: () {
-        if (form.type == TaxFormType.i9) {
-          Modular.to.pushNamed('i9');
-        } else if (form.type == TaxFormType.w4) {
-          Modular.to.pushNamed('w4');
+        if (form is I9TaxForm) {
+          Modular.to.pushNamed('i9', arguments: form);
+        } else if (form is W4TaxForm) {
+          Modular.to.pushNamed('w4', arguments: form);
        }
      },
      child: Container(
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/staff_tax_forms_module.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/lib/src/staff_tax_forms_module.dart
@@ -1,10 +1,12 @@
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter_modular/flutter_modular.dart';
 import 'package:krow_data_connect/krow_data_connect.dart';
+import 'package:krow_domain/krow_domain.dart';
 import 'data/repositories/tax_forms_repository_impl.dart';
 import 'domain/repositories/tax_forms_repository.dart';
 import 'domain/usecases/get_tax_forms_usecase.dart';
-import 'domain/usecases/submit_tax_form_usecase.dart';
+import 'domain/usecases/submit_i9_form_usecase.dart';
+import 'domain/usecases/submit_w4_form_usecase.dart';
 import 'presentation/blocs/i9/form_i9_cubit.dart';
 import 'presentation/blocs/tax_forms/tax_forms_cubit.dart';
 import 'presentation/blocs/w4/form_w4_cubit.dart';
@@ -24,7 +26,8 @@ class StaffTaxFormsModule extends Module {
    
    // Use Cases
    i.addLazySingleton(GetTaxFormsUseCase.new);
-    i.addLazySingleton(SubmitTaxFormUseCase.new);
+    i.addLazySingleton(SubmitI9FormUseCase.new);
+    i.addLazySingleton(SubmitW4FormUseCase.new);

    // Blocs
    i.addLazySingleton(TaxFormsCubit.new);
@@ -35,7 +38,13 @@ class StaffTaxFormsModule extends Module {
  @override
  void routes(RouteManager r) {
    r.child('/', child: (_) => const TaxFormsPage());
-    r.child('/i9', child: (_) => const FormI9Page());
-    r.child('/w4', child: (_) => const FormW4Page());
+    r.child(
+      '/i9', 
+      child: (_) => FormI9Page(form: r.args.data as TaxForm?),
+    );
+    r.child(
+      '/w4', 
+      child: (_) => FormW4Page(form: r.args.data as TaxForm?),
+    );
  }
 }
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/pubspec.lock
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/pubspec.lock
@@ -1,778 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  _flutterfire_internals:
-    dependency: transitive
-    description:
-      name: _flutterfire_internals
-      sha256: cd83f7d6bd4e4c0b0b4fef802e8796784032e1cc23d7b0e982cf5d05d9bbe182
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.66"
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.1"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.7.0"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.13.0"
-  auto_injector:
-    dependency: transitive
-    description:
-      name: auto_injector
-      sha256: "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  bloc:
-    dependency: "direct main"
-    description:
-      name: bloc
-      sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.4"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  code_assets:
-    dependency: transitive
-    description:
-      name: code_assets
-      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.1"
-  core_localization:
-    dependency: "direct main"
-    description:
-      path: "../../../../../core_localization"
-      relative: true
-    source: path
-    version: "0.0.1"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.7"
-  csv:
-    dependency: transitive
-    description:
-      name: csv
-      sha256: c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.0"
-  design_system:
-    dependency: "direct main"
-    description:
-      path: "../../../../../design_system"
-      relative: true
-    source: path
-    version: "0.0.1"
-  equatable:
-    dependency: "direct main"
-    description:
-      name: equatable
-      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.8"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.3"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  firebase_app_check:
-    dependency: transitive
-    description:
-      name: firebase_app_check
-      sha256: "45f0d279ea7ae4eac1867a4c85aa225761e3ac0ccf646386a860b2bc16581f76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.1+4"
-  firebase_app_check_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_app_check_platform_interface
-      sha256: e32b4e6adeaac207a6f7afe0906d97c0811de42fb200d9b6317a09155de65e2b
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1+4"
-  firebase_app_check_web:
-    dependency: transitive
-    description:
-      name: firebase_app_check_web
-      sha256: "2cbc8a18a34813a7e31d7b30f989973087421cd5d0e397b4dd88a90289aa2bed"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2+2"
-  firebase_auth:
-    dependency: "direct main"
-    description:
-      name: firebase_auth
-      sha256: b20d1540460814c5984474c1e9dd833bdbcff6ecd8d6ad86cc9da8cfd581c172
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.4"
-  firebase_auth_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_auth_platform_interface
-      sha256: fd0225320b6bbc92460c86352d16b60aea15f9ef88292774cca97b0522ea9f72
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.6"
-  firebase_auth_web:
-    dependency: transitive
-    description:
-      name: firebase_auth_web
-      sha256: be7dccb263b89fbda2a564de9d8193118196e8481ffb937222a025cdfdf82c40
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
-  firebase_core:
-    dependency: transitive
-    description:
-      name: firebase_core
-      sha256: "923085c881663ef685269b013e241b428e1fb03cdd0ebde265d9b40ff18abf80"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.4.0"
-  firebase_core_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_core_platform_interface
-      sha256: cccb4f572325dc14904c02fcc7db6323ad62ba02536833dddb5c02cac7341c64
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.2"
-  firebase_core_web:
-    dependency: transitive
-    description:
-      name: firebase_core_web
-      sha256: "83e7356c704131ca4d8d8dd57e360d8acecbca38b1a3705c7ae46cc34c708084"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.0"
-  firebase_data_connect:
-    dependency: "direct main"
-    description:
-      name: firebase_data_connect
-      sha256: "01d0f8e33c520a6e6f59cf5ac6ff281d1927f7837f094fa8eb5fdb0b1b328ad8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2+2"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_bloc:
-    dependency: "direct main"
-    description:
-      name: flutter_bloc
-      sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.6"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_modular:
-    dependency: "direct main"
-    description:
-      name: flutter_modular
-      sha256: "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.4.1"
-  flutter_test:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  font_awesome_flutter:
-    dependency: transitive
-    description:
-      name: font_awesome_flutter
-      sha256: b9011df3a1fa02993630b8fb83526368cf2206a711259830325bab2f1d2a4eb0
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.12.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  google_fonts:
-    dependency: transitive
-    description:
-      name: google_fonts
-      sha256: "6996212014b996eaa17074e02b1b925b212f5e053832d9048970dc27255a8fb3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.1.0"
-  google_identity_services_web:
-    dependency: transitive
-    description:
-      name: google_identity_services_web
-      sha256: "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.3+1"
-  googleapis_auth:
-    dependency: transitive
-    description:
-      name: googleapis_auth
-      sha256: befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.6.0"
-  grpc:
-    dependency: transitive
-    description:
-      name: grpc
-      sha256: e93ee3bce45c134bf44e9728119102358c7cd69de7832d9a874e2e74eb8cab40
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.4"
-  hooks:
-    dependency: transitive
-    description:
-      name: hooks
-      sha256: "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.6.0"
-  http2:
-    dependency: transitive
-    description:
-      name: http2
-      sha256: "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.1"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.2"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.2"
-  krow_core:
-    dependency: "direct main"
-    description:
-      path: "../../../../../core"
-      relative: true
-    source: path
-    version: "0.0.1"
-  krow_data_connect:
-    dependency: "direct main"
-    description:
-      path: "../../../../../data_connect"
-      relative: true
-    source: path
-    version: "0.0.1"
-  krow_domain:
-    dependency: "direct main"
-    description:
-      path: "../../../../../domain"
-      relative: true
-    source: path
-    version: "0.0.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.0.2"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.10"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  lucide_icons:
-    dependency: "direct main"
-    description:
-      name: lucide_icons
-      sha256: ad24d0fd65707e48add30bebada7d90bff2a1bba0a72d6e9b19d44246b0e83c4
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.257.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.17"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.17.0"
-  modular_core:
-    dependency: transitive
-    description:
-      name: modular_core
-      sha256: "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.1"
-  native_toolchain_c:
-    dependency: transitive
-    description:
-      name: native_toolchain_c
-      sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.17.4"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  objective_c:
-    dependency: transitive
-    description:
-      name: objective_c
-      sha256: "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.4"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  path_provider:
-    dependency: transitive
-    description:
-      name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  path_provider_android:
-    dependency: transitive
-    description:
-      name: path_provider_android
-      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.22"
-  path_provider_foundation:
-    dependency: transitive
-    description:
-      name: path_provider_foundation
-      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.1"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.6"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  protobuf:
-    dependency: transitive
-    description:
-      name: protobuf
-      sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.0"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.5+1"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  result_dart:
-    dependency: transitive
-    description:
-      name: result_dart
-      sha256: "0666b21fbdf697b3bdd9986348a380aa204b3ebe7c146d8e4cdaa7ce735e6054"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  shared_preferences:
-    dependency: transitive
-    description:
-      name: shared_preferences
-      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.4"
-  shared_preferences_android:
-    dependency: transitive
-    description:
-      name: shared_preferences_android
-      sha256: "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.18"
-  shared_preferences_foundation:
-    dependency: transitive
-    description:
-      name: shared_preferences_foundation
-      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.6"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.3"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  slang:
-    dependency: transitive
-    description:
-      name: slang
-      sha256: "13e3b6f07adc51ab751e7889647774d294cbce7a3382f81d9e5029acfe9c37b2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.12.0"
-  slang_flutter:
-    dependency: transitive
-    description:
-      name: slang_flutter
-      sha256: "0a4545cca5404d6b7487cf61cf1fe56c52daeb08de56a7574ee8381fbad035a0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.12.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.7"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.5.2"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
-      url: "https://pub.dev"
-    source: hosted
-    version: "15.0.2"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
-sdks:
-  dart: ">=3.10.7 <4.0.0"
-  flutter: ">=3.38.4"
--- a/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/pubspec.yaml
+++ b/apps/mobile/packages/features/staff/profile_sections/compliance/tax_forms/pubspec.yaml
@@ -2,6 +2,7 @@ name: staff_tax_forms
 description: Staff Tax Forms feature.
 version: 0.0.1
 publish_to: none
+resolution: workspace

 environment:
  sdk: '>=3.10.0 <4.0.0'
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/blocs/personal_info_bloc.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/blocs/personal_info_bloc.dart
@@ -25,11 +25,13 @@ class PersonalInfoBloc extends Bloc<PersonalInfoEvent, PersonalInfoState>
    required UpdatePersonalInfoUseCase updatePersonalInfoUseCase,
  })  : _getPersonalInfoUseCase = getPersonalInfoUseCase,
        _updatePersonalInfoUseCase = updatePersonalInfoUseCase,
-        super(const PersonalInfoState()) {
+        super(const PersonalInfoState.initial()) {
    on<PersonalInfoLoadRequested>(_onLoadRequested);
-    on<PersonalInfoFieldUpdated>(_onFieldUpdated);
-    on<PersonalInfoSaveRequested>(_onSaveRequested);
-    on<PersonalInfoPhotoUploadRequested>(_onPhotoUploadRequested);
+    on<PersonalInfoFieldChanged>(_onFieldChanged);
+    on<PersonalInfoAddressSelected>(_onAddressSelected);
+    on<PersonalInfoFormSubmitted>(_onSubmitted);
+
+    add(const PersonalInfoLoadRequested());
  }

  /// Handles loading staff profile information.
@@ -67,8 +69,8 @@ class PersonalInfoBloc extends Bloc<PersonalInfoEvent, PersonalInfoState>
  }

  /// Handles updating a field value in the current staff profile.
-  void _onFieldUpdated(
-    PersonalInfoFieldUpdated event,
+  void _onFieldChanged(
+    PersonalInfoFieldChanged event,
    Emitter<PersonalInfoState> emit,
  ) {
    final Map<String, dynamic> updatedValues = Map.from(state.formValues);
@@ -77,8 +79,8 @@ class PersonalInfoBloc extends Bloc<PersonalInfoEvent, PersonalInfoState>
  }

  /// Handles saving staff profile information.
-  Future<void> _onSaveRequested(
-    PersonalInfoSaveRequested event,
+  Future<void> _onSubmitted(
+    PersonalInfoFormSubmitted event,
    Emitter<PersonalInfoState> emit,
  ) async {
    if (state.staff == null) return;
@@ -116,33 +118,16 @@ class PersonalInfoBloc extends Bloc<PersonalInfoEvent, PersonalInfoState>
    }
  }

-  /// Handles uploading a profile photo.
-  Future<void> _onPhotoUploadRequested(
-    PersonalInfoPhotoUploadRequested event,
+  void _onAddressSelected(
+    PersonalInfoAddressSelected event,
    Emitter<PersonalInfoState> emit,
-  ) async {
-    if (state.staff == null) return;
-
-    emit(state.copyWith(status: PersonalInfoStatus.uploadingPhoto));
-    try {
-      // TODO: Implement photo upload when repository method is available
-      // final photoUrl = await _repository.uploadProfilePhoto(event.filePath);
-      // final updatedStaff = Staff(...);
-      // emit(state.copyWith(
-      //   status: PersonalInfoStatus.loaded,
-      //   staff: updatedStaff,
-      // ));
-      
-      // For now, just return to loaded state
-      emit(state.copyWith(status: PersonalInfoStatus.loaded));
-    } catch (e) {
-      emit(state.copyWith(
-        status: PersonalInfoStatus.error,
-        errorMessage: e.toString(),
-      ));
-    }
+  ) {
+      // TODO: Implement Google Places logic if needed
  }

+  /// With _onPhotoUploadRequested and _onSaveRequested removed or renamed,
+  /// there are no errors pointing to them here.
+
  @override
  void dispose() {
    close();
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/blocs/personal_info_event.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/blocs/personal_info_event.dart
@@ -14,11 +14,11 @@ class PersonalInfoLoadRequested extends PersonalInfoEvent {
 }

 /// Event to update a field value.
-class PersonalInfoFieldUpdated extends PersonalInfoEvent {
+class PersonalInfoFieldChanged extends PersonalInfoEvent {
  final String field;
  final dynamic value;

-  const PersonalInfoFieldUpdated({
+  const PersonalInfoFieldChanged({
    required this.field,
    required this.value,
  });
@@ -27,17 +27,16 @@ class PersonalInfoFieldUpdated extends PersonalInfoEvent {
  List<Object?> get props => [field, value];
 }

-/// Event to save personal information.
-class PersonalInfoSaveRequested extends PersonalInfoEvent {
-  const PersonalInfoSaveRequested();
+/// Event to submit the form.
+class PersonalInfoFormSubmitted extends PersonalInfoEvent {
+  const PersonalInfoFormSubmitted();
 }

-/// Event to upload a profile photo.
-class PersonalInfoPhotoUploadRequested extends PersonalInfoEvent {
-  final String filePath;
-
-  const PersonalInfoPhotoUploadRequested({required this.filePath});
-
+/// Event when an address is selected from autocomplete.
+class PersonalInfoAddressSelected extends PersonalInfoEvent {
+  final String address;
+  const PersonalInfoAddressSelected(this.address);
+  
  @override
-  List<Object?> get props => [filePath];
+  List<Object?> get props => [address];
 }
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/blocs/personal_info_state.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/blocs/personal_info_state.dart
@@ -49,6 +49,13 @@ class PersonalInfoState extends Equatable {
    this.errorMessage,
  });

+  /// Initial state.
+  const PersonalInfoState.initial()
+      : status = PersonalInfoStatus.initial,
+        staff = null,
+        formValues = const {},
+        errorMessage = null;
+
  /// Creates a copy of this state with the given fields replaced.
  PersonalInfoState copyWith({
    PersonalInfoStatus? status,
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/pages/personal_info_page.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/pages/personal_info_page.dart
@@ -26,8 +26,7 @@ class PersonalInfoPage extends StatelessWidget {
  Widget build(BuildContext context) {
    final TranslationsStaffOnboardingPersonalInfoEn i18n = t.staff.onboarding.personal_info;
    return BlocProvider<PersonalInfoBloc>(
-      create: (BuildContext context) => Modular.get<PersonalInfoBloc>()
-        ..add(const PersonalInfoLoadRequested()),
+      create: (BuildContext context) => Modular.get<PersonalInfoBloc>(),
      child: BlocListener<PersonalInfoBloc, PersonalInfoState>(
        listener: (BuildContext context, PersonalInfoState state) {
          if (state.status == PersonalInfoStatus.saved) {
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/widgets/personal_info_content.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/profile_info/lib/src/presentation/widgets/personal_info_content.dart
@@ -56,7 +56,7 @@ class _PersonalInfoContentState extends State<PersonalInfoContent> {

  void _onPhoneChanged() {
    context.read<PersonalInfoBloc>().add(
-      PersonalInfoFieldUpdated(
+      PersonalInfoFieldChanged(
        field: 'phone',
        value: _phoneController.text,
      ),
@@ -73,7 +73,7 @@ class _PersonalInfoContentState extends State<PersonalInfoContent> {
        .toList();

    context.read<PersonalInfoBloc>().add(
-      PersonalInfoFieldUpdated(
+      PersonalInfoFieldChanged(
        field: 'preferredLocations',
        value: locations,
      ),
@@ -81,7 +81,7 @@ class _PersonalInfoContentState extends State<PersonalInfoContent> {
  }

  void _handleSave() {
-    context.read<PersonalInfoBloc>().add(const PersonalInfoSaveRequested());
+    context.read<PersonalInfoBloc>().add(const PersonalInfoFormSubmitted());
  }

  void _handlePhotoTap() {
--- a/apps/mobile/packages/features/staff/shifts/pubspec.lock
+++ b/apps/mobile/packages/features/staff/shifts/pubspec.lock
@@ -1,650 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.13.0"
-  auto_injector:
-    dependency: transitive
-    description:
-      name: auto_injector
-      sha256: "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  bloc:
-    dependency: transitive
-    description:
-      name: bloc
-      sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.4"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  code_assets:
-    dependency: transitive
-    description:
-      name: code_assets
-      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.1"
-  core_localization:
-    dependency: "direct main"
-    description:
-      path: "../../../core_localization"
-      relative: true
-    source: path
-    version: "0.0.1"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.7"
-  csv:
-    dependency: transitive
-    description:
-      name: csv
-      sha256: c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.0"
-  design_system:
-    dependency: "direct main"
-    description:
-      path: "../../../design_system"
-      relative: true
-    source: path
-    version: "0.0.1"
-  equatable:
-    dependency: "direct main"
-    description:
-      name: equatable
-      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.8"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.3"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_bloc:
-    dependency: "direct main"
-    description:
-      name: flutter_bloc
-      sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.6"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_modular:
-    dependency: "direct main"
-    description:
-      name: flutter_modular
-      sha256: "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.4.1"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  font_awesome_flutter:
-    dependency: transitive
-    description:
-      name: font_awesome_flutter
-      sha256: b9011df3a1fa02993630b8fb83526368cf2206a711259830325bab2f1d2a4eb0
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.12.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  google_fonts:
-    dependency: transitive
-    description:
-      name: google_fonts
-      sha256: "6996212014b996eaa17074e02b1b925b212f5e053832d9048970dc27255a8fb3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.1.0"
-  hooks:
-    dependency: transitive
-    description:
-      name: hooks
-      sha256: "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.6.0"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.2"
-  intl:
-    dependency: "direct main"
-    description:
-      name: intl
-      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.2"
-  krow_core:
-    dependency: "direct main"
-    description:
-      path: "../../../core"
-      relative: true
-    source: path
-    version: "0.0.1"
-  krow_data_connect:
-    dependency: "direct main"
-    description:
-      path: "../../../data_connect"
-      relative: true
-    source: path
-    version: "0.0.1"
-  krow_domain:
-    dependency: "direct main"
-    description:
-      path: "../../../domain"
-      relative: true
-    source: path
-    version: "0.0.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.0.2"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.10"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  lucide_icons:
-    dependency: transitive
-    description:
-      name: lucide_icons
-      sha256: ad24d0fd65707e48add30bebada7d90bff2a1bba0a72d6e9b19d44246b0e83c4
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.257.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.17"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.17.0"
-  modular_core:
-    dependency: transitive
-    description:
-      name: modular_core
-      sha256: "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.4.1"
-  native_toolchain_c:
-    dependency: transitive
-    description:
-      name: native_toolchain_c
-      sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.17.4"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  objective_c:
-    dependency: transitive
-    description:
-      name: objective_c
-      sha256: "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.2.4"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  path_provider:
-    dependency: transitive
-    description:
-      name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.5"
-  path_provider_android:
-    dependency: transitive
-    description:
-      name: path_provider_android
-      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.22"
-  path_provider_foundation:
-    dependency: transitive
-    description:
-      name: path_provider_foundation
-      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.1"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.6"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.5+1"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  result_dart:
-    dependency: transitive
-    description:
-      name: result_dart
-      sha256: "0666b21fbdf697b3bdd9986348a380aa204b3ebe7c146d8e4cdaa7ce735e6054"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  shared_preferences:
-    dependency: transitive
-    description:
-      name: shared_preferences
-      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.4"
-  shared_preferences_android:
-    dependency: transitive
-    description:
-      name: shared_preferences_android
-      sha256: "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.18"
-  shared_preferences_foundation:
-    dependency: transitive
-    description:
-      name: shared_preferences_foundation
-      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.6"
-  shared_preferences_linux:
-    dependency: transitive
-    description:
-      name: shared_preferences_linux
-      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_platform_interface:
-    dependency: transitive
-    description:
-      name: shared_preferences_platform_interface
-      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  shared_preferences_web:
-    dependency: transitive
-    description:
-      name: shared_preferences_web
-      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.3"
-  shared_preferences_windows:
-    dependency: transitive
-    description:
-      name: shared_preferences_windows
-      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  slang:
-    dependency: transitive
-    description:
-      name: slang
-      sha256: "13e3b6f07adc51ab751e7889647774d294cbce7a3382f81d9e5029acfe9c37b2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.12.0"
-  slang_flutter:
-    dependency: transitive
-    description:
-      name: slang_flutter
-      sha256: "0a4545cca5404d6b7487cf61cf1fe56c52daeb08de56a7574ee8381fbad035a0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.12.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.7"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.5.2"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
-      url: "https://pub.dev"
-    source: hosted
-    version: "15.0.2"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
-sdks:
-  dart: ">=3.10.7 <4.0.0"
-  flutter: ">=3.38.4"
--- a/apps/mobile/packages/features/staff/shifts/pubspec.yaml
+++ b/apps/mobile/packages/features/staff/shifts/pubspec.yaml
@@ -2,6 +2,7 @@ name: staff_shifts
 description: A new Flutter package project.
 version: 0.0.1
 publish_to: 'none'
+resolution: workspace

 environment:
  sdk: '>=3.0.0 <4.0.0'
--- a/apps/mobile/pubspec.lock
+++ b/apps/mobile/pubspec.lock
@@ -295,6 +295,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.4.1"
+  dio:
+    dependency: transitive
+    description:
+      name: dio
+      sha256: b9d46faecab38fc8cc286f80bc4d61a3bb5d4ac49e51ed877b4d6706efe57b25
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.9.1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
  equatable:
    dependency: transitive
    description:
@@ -515,6 +531,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.3.3+1"
+  google_places_flutter:
+    dependency: transitive
+    description:
+      name: google_places_flutter
+      sha256: "37bd64221cf4a5aa97eb3a33dc2d40f6326aa5ae4e2f2a9a7116bdc1a14f5194"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
  googleapis_auth:
    dependency: transitive
    description:
@@ -939,6 +963,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.1"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.28.0"
  shared_preferences:
    dependency: transitive
    description: