Merge branch 'dev' into Issues-on-payments-timecard-availability-screens-01-02-03-04

.gitignore

@@ -18,7 +18,6 @@ $RECYCLE.BIN/
 
 # IDE & Editors
 .idea/
-.vscode/
 *.iml
 *.iws
 *.swp

.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"
+            ]
+        }
+    ]
+}

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>()
+          Modular.get<core_localization.LocaleBloc>(),
-            ..add(const core_localization.LoadLocale()),
       child:
           BlocBuilder<
             core_localization.LocaleBloc,

apps/mobile/apps/client/pubspec.yaml

@@ -1,7 +1,7 @@
 name: krowwithus_client
 description: "Krow Client Application"
 publish_to: "none"
-version: 0.0.1-M+301
+version: 0.0.1-M3+2
 resolution: workspace
 
 environment:

apps/mobile/apps/design_system_viewer/pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
+version: 0.0.1
 resolution: workspace
 
 environment:

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>()
+          Modular.get<core_localization.LocaleBloc>(),
-            ..add(const core_localization.LoadLocale()),
       child:
           BlocBuilder<
             core_localization.LocaleBloc,
             core_localization.LocaleState
           >(
-            builder: (BuildContext context, core_localization.LocaleState state) {
+            builder:
-              return core_localization.TranslationProvider(
+                (BuildContext context, core_localization.LocaleState state) {
-                  child: MaterialApp.router(
+                  return core_localization.TranslationProvider(
-                title: "KROW Staff",
+                    child: MaterialApp.router(
-                theme: UiTheme.light,
+                      title: "KROW Staff",
-                routerConfig: Modular.routerConfig,
+                      theme: UiTheme.light,
-                locale: state.locale,
+                      routerConfig: Modular.routerConfig,
-                supportedLocales: state.supportedLocales,
+                      locale: state.locale,
-                localizationsDelegates: const <LocalizationsDelegate<dynamic>>[
+                      supportedLocales: state.supportedLocales,
-                  GlobalMaterialLocalizations.delegate,
+                      localizationsDelegates:
-                  GlobalWidgetsLocalizations.delegate,
+                          const <LocalizationsDelegate<dynamic>>[
-                  GlobalCupertinoLocalizations.delegate,
+                            GlobalMaterialLocalizations.delegate,
-                ],
+                            GlobalWidgetsLocalizations.delegate,
-              ));
+                            GlobalCupertinoLocalizations.delegate,
-            },
+                          ],
+                    ),
+                  );
+                },
           ),
     );
   }

apps/mobile/apps/staff/pubspec.yaml

@@ -1,7 +1,7 @@
 name: krowwithus_staff
 description: "Krow Staff Application"
 publish_to: 'none'
-version: 0.0.1+M301
+version: 0.0.1-M3+1
 resolution: workspace
 
 environment:

apps/mobile/config.dev.json

@@ -0,0 +1,3 @@
+{
+  "GOOGLE_PLACES_API_KEY": "AIzaSyAS9yTf4q51_CNSZ7mbmeS9V3l_LZR80lU"
+}

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})
+  LocaleBloc({
-    : super(LocaleState.initial()) {
+    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 savedLocale = await getLocaleUseCase();
-    final Locale locale = savedLocale ?? const Locale('en');
+    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,
+    ));
   }
 }

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,
-  );
 }

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].
+  final LocaleLocalDataSource localDataSource;
-  LocaleRepositoryImpl(this._localDataSource);
 
   @override
   Future<void> saveLocale(Locale locale) {
-    return _localDataSource.saveLanguageCode(locale.languageCode);
+    return localDataSource.saveLanguageCode(locale.languageCode);
   }
 
   @override
-  Future<Locale?> getSavedLocale() async {
+  Future<Locale> getSavedLocale() async {
-    final String? languageCode = await _localDataSource.getLanguageCode();
+    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;
 }

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();
 }

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();
+  }
+}

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();
   }
 }

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();
+  }
+}

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-28 at 09:41 UTC
+/// Built on 2026-01-29 at 15:50 UTC
 
 // coverage:ignore-file
 // ignore_for_file: type=lint, unused_import

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>(
+    i.addLazySingleton<LocaleRepositoryInterface>(
-      () => LocaleRepositoryImpl(i.get<LocaleLocalDataSource>()),
+      () => 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>(),
       ),
     );
   }

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/.guides/usage.md

@@ -1,16 +1,16 @@
 # Basic Usage
 
 ```dart
-ExampleConnector.instance.createFaqData(createFaqDataVariables).execute();
+ExampleConnector.instance.createRecentPayment(createRecentPaymentVariables).execute();
-ExampleConnector.instance.updateFaqData(updateFaqDataVariables).execute();
+ExampleConnector.instance.updateRecentPayment(updateRecentPaymentVariables).execute();
-ExampleConnector.instance.deleteFaqData(deleteFaqDataVariables).execute();
+ExampleConnector.instance.deleteRecentPayment(deleteRecentPaymentVariables).execute();
-ExampleConnector.instance.createStaffAvailability(createStaffAvailabilityVariables).execute();
+ExampleConnector.instance.CreateStaff(createStaffVariables).execute();
-ExampleConnector.instance.updateStaffAvailability(updateStaffAvailabilityVariables).execute();
+ExampleConnector.instance.UpdateStaff(updateStaffVariables).execute();
-ExampleConnector.instance.deleteStaffAvailability(deleteStaffAvailabilityVariables).execute();
+ExampleConnector.instance.DeleteStaff(deleteStaffVariables).execute();
-ExampleConnector.instance.listStaffAvailabilityStats(listStaffAvailabilityStatsVariables).execute();
+ExampleConnector.instance.getStaffDocumentByKey(getStaffDocumentByKeyVariables).execute();
-ExampleConnector.instance.getStaffAvailabilityStatsByStaffId(getStaffAvailabilityStatsByStaffIdVariables).execute();
+ExampleConnector.instance.listStaffDocumentsByStaffId(listStaffDocumentsByStaffIdVariables).execute();
-ExampleConnector.instance.filterStaffAvailabilityStats(filterStaffAvailabilityStatsVariables).execute();
+ExampleConnector.instance.listStaffDocumentsByDocumentType(listStaffDocumentsByDocumentTypeVariables).execute();
-ExampleConnector.instance.createTaxForm(createTaxFormVariables).execute();
+ExampleConnector.instance.listStaffDocumentsByStatus(listStaffDocumentsByStatusVariables).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.updateWorkforce({ ... })
+await ExampleConnector.instance.updateAttireOption({ ... })
-.workforceNumber(...)
+.itemId(...)
 .execute();
 ```
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/create_order.dart

@@ -4,7 +4,6 @@ class CreateOrderVariablesBuilder {
   Optional<String> _vendorId = Optional.optional(nativeFromJson, nativeToJson);
   String businessId;
   OrderType orderType;
-  Optional<String> _location = Optional.optional(nativeFromJson, nativeToJson);
   Optional<OrderStatus> _status = Optional.optional((data) => OrderStatus.values.byName(data), enumSerializer);
   Optional<Timestamp> _date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
   Optional<Timestamp> _startDate = Optional.optional((json) => json['startDate'] = Timestamp.fromJson(json['startDate']), defaultSerializer);
@@ -16,7 +15,7 @@ class CreateOrderVariablesBuilder {
   Optional<AnyValue> _assignedStaff = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<AnyValue> _shifts = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<int> _requested = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _hub = Optional.optional(nativeFromJson, nativeToJson);
+  String teamHubId;
   Optional<AnyValue> _recurringDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<Timestamp> _permanentStartDate = Optional.optional((json) => json['permanentStartDate'] = Timestamp.fromJson(json['permanentStartDate']), defaultSerializer);
   Optional<AnyValue> _permanentDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
@@ -29,10 +28,6 @@ class CreateOrderVariablesBuilder {
    _vendorId.value = t;
    return this;
   }
-  CreateOrderVariablesBuilder location(String? t) {
-   _location.value = t;
-   return this;
-  }
   CreateOrderVariablesBuilder status(OrderStatus? t) {
    _status.value = t;
    return this;
@@ -77,10 +72,6 @@ class CreateOrderVariablesBuilder {
    _requested.value = t;
    return this;
   }
-  CreateOrderVariablesBuilder hub(String? t) {
-   _hub.value = t;
-   return this;
-  }
   CreateOrderVariablesBuilder recurringDays(AnyValue? t) {
    _recurringDays.value = t;
    return this;
@@ -106,7 +97,7 @@ class CreateOrderVariablesBuilder {
    return this;
   }
 
-  CreateOrderVariablesBuilder(this._dataConnect, {required  this.businessId,required  this.orderType,});
+  CreateOrderVariablesBuilder(this._dataConnect, {required  this.businessId,required  this.orderType,required  this.teamHubId,});
   Deserializer<CreateOrderData> dataDeserializer = (dynamic json)  => CreateOrderData.fromJson(jsonDecode(json));
   Serializer<CreateOrderVariables> varsSerializer = (CreateOrderVariables vars) => jsonEncode(vars.toJson());
   Future<OperationResult<CreateOrderData, CreateOrderVariables>> execute() {
@@ -114,7 +105,7 @@ class CreateOrderVariablesBuilder {
   }
 
   MutationRef<CreateOrderData, CreateOrderVariables> ref() {
-    CreateOrderVariables vars= CreateOrderVariables(vendorId: _vendorId,businessId: businessId,orderType: orderType,location: _location,status: _status,date: _date,startDate: _startDate,endDate: _endDate,duration: _duration,lunchBreak: _lunchBreak,total: _total,eventName: _eventName,assignedStaff: _assignedStaff,shifts: _shifts,requested: _requested,hub: _hub,recurringDays: _recurringDays,permanentStartDate: _permanentStartDate,permanentDays: _permanentDays,notes: _notes,detectedConflicts: _detectedConflicts,poReference: _poReference,);
+    CreateOrderVariables vars= CreateOrderVariables(vendorId: _vendorId,businessId: businessId,orderType: orderType,status: _status,date: _date,startDate: _startDate,endDate: _endDate,duration: _duration,lunchBreak: _lunchBreak,total: _total,eventName: _eventName,assignedStaff: _assignedStaff,shifts: _shifts,requested: _requested,teamHubId: teamHubId,recurringDays: _recurringDays,permanentStartDate: _permanentStartDate,permanentDays: _permanentDays,notes: _notes,detectedConflicts: _detectedConflicts,poReference: _poReference,);
     return _dataConnect.mutation("createOrder", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -192,7 +183,6 @@ class CreateOrderVariables {
   late final Optional<String>vendorId;
   final String businessId;
   final OrderType orderType;
-  late final Optional<String>location;
   late final Optional<OrderStatus>status;
   late final Optional<Timestamp>date;
   late final Optional<Timestamp>startDate;
@@ -204,7 +194,7 @@ class CreateOrderVariables {
   late final Optional<AnyValue>assignedStaff;
   late final Optional<AnyValue>shifts;
   late final Optional<int>requested;
-  late final Optional<String>hub;
+  final String teamHubId;
   late final Optional<AnyValue>recurringDays;
   late final Optional<Timestamp>permanentStartDate;
   late final Optional<AnyValue>permanentDays;
@@ -215,7 +205,8 @@ class CreateOrderVariables {
   CreateOrderVariables.fromJson(Map<String, dynamic> json):
   
   businessId = nativeFromJson<String>(json['businessId']),
-  orderType = OrderType.values.byName(json['orderType']) {
+  orderType = OrderType.values.byName(json['orderType']),
+  teamHubId = nativeFromJson<String>(json['teamHubId']) {
   
   
     vendorId = Optional.optional(nativeFromJson, nativeToJson);
@@ -224,10 +215,6 @@ class CreateOrderVariables {
   
   
   
-    location = Optional.optional(nativeFromJson, nativeToJson);
-    location.value = json['location'] == null ? null : nativeFromJson<String>(json['location']);
-  
-  
     status = Optional.optional((data) => OrderStatus.values.byName(data), enumSerializer);
     status.value = json['status'] == null ? null : OrderStatus.values.byName(json['status']);
   
@@ -272,9 +259,6 @@ class CreateOrderVariables {
     requested.value = json['requested'] == null ? null : nativeFromJson<int>(json['requested']);
   
   
-    hub = Optional.optional(nativeFromJson, nativeToJson);
-    hub.value = json['hub'] == null ? null : nativeFromJson<String>(json['hub']);
-  
   
     recurringDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
     recurringDays.value = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']);
@@ -313,7 +297,6 @@ class CreateOrderVariables {
     return vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -325,7 +308,7 @@ class CreateOrderVariables {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
+    teamHubId == otherTyped.teamHubId && 
     recurringDays == otherTyped.recurringDays && 
     permanentStartDate == otherTyped.permanentStartDate && 
     permanentDays == otherTyped.permanentDays && 
@@ -335,7 +318,7 @@ class CreateOrderVariables {
     
   }
   @override
-  int get hashCode => Object.hashAll([vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, eventName.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentStartDate.hashCode, permanentDays.hashCode, notes.hashCode, detectedConflicts.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, eventName.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, teamHubId.hashCode, recurringDays.hashCode, permanentStartDate.hashCode, permanentDays.hashCode, notes.hashCode, detectedConflicts.hashCode, poReference.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -347,9 +330,6 @@ class CreateOrderVariables {
     json['orderType'] = 
     orderType.name
     ;
-    if(location.state == OptionalState.set) {
-      json['location'] = location.toJson();
-    }
     if(status.state == OptionalState.set) {
       json['status'] = status.toJson();
     }
@@ -383,9 +363,7 @@ class CreateOrderVariables {
     if(requested.state == OptionalState.set) {
       json['requested'] = requested.toJson();
     }
-    if(hub.state == OptionalState.set) {
+    json['teamHubId'] = nativeToJson<String>(teamHubId);
-      json['hub'] = hub.toJson();
-    }
     if(recurringDays.state == OptionalState.set) {
       json['recurringDays'] = recurringDays.toJson();
     }
@@ -411,7 +389,6 @@ class CreateOrderVariables {
     required this.vendorId,
     required this.businessId,
     required this.orderType,
-    required this.location,
     required this.status,
     required this.date,
     required this.startDate,
@@ -423,7 +400,7 @@ class CreateOrderVariables {
     required this.assignedStaff,
     required this.shifts,
     required this.requested,
-    required this.hub,
+    required this.teamHubId,
     required this.recurringDays,
     required this.permanentStartDate,
     required this.permanentDays,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/create_shift.dart

@@ -12,6 +12,11 @@ class CreateShiftVariablesBuilder {
   Optional<String> _locationAddress = Optional.optional(nativeFromJson, nativeToJson);
   Optional<double> _latitude = Optional.optional(nativeFromJson, nativeToJson);
   Optional<double> _longitude = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _placeId = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _city = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _state = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _street = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _country = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _description = Optional.optional(nativeFromJson, nativeToJson);
   Optional<ShiftStatus> _status = Optional.optional((data) => ShiftStatus.values.byName(data), enumSerializer);
   Optional<int> _workersNeeded = Optional.optional(nativeFromJson, nativeToJson);
@@ -57,6 +62,26 @@ class CreateShiftVariablesBuilder {
    _longitude.value = t;
    return this;
   }
+  CreateShiftVariablesBuilder placeId(String? t) {
+   _placeId.value = t;
+   return this;
+  }
+  CreateShiftVariablesBuilder city(String? t) {
+   _city.value = t;
+   return this;
+  }
+  CreateShiftVariablesBuilder state(String? t) {
+   _state.value = t;
+   return this;
+  }
+  CreateShiftVariablesBuilder street(String? t) {
+   _street.value = t;
+   return this;
+  }
+  CreateShiftVariablesBuilder country(String? t) {
+   _country.value = t;
+   return this;
+  }
   CreateShiftVariablesBuilder description(String? t) {
    _description.value = t;
    return this;
@@ -98,7 +123,7 @@ class CreateShiftVariablesBuilder {
   }
 
   MutationRef<CreateShiftData, CreateShiftVariables> ref() {
-    CreateShiftVariables vars= CreateShiftVariables(title: title,orderId: orderId,date: _date,startTime: _startTime,endTime: _endTime,hours: _hours,cost: _cost,location: _location,locationAddress: _locationAddress,latitude: _latitude,longitude: _longitude,description: _description,status: _status,workersNeeded: _workersNeeded,filled: _filled,filledAt: _filledAt,managers: _managers,durationDays: _durationDays,createdBy: _createdBy,);
+    CreateShiftVariables vars= CreateShiftVariables(title: title,orderId: orderId,date: _date,startTime: _startTime,endTime: _endTime,hours: _hours,cost: _cost,location: _location,locationAddress: _locationAddress,latitude: _latitude,longitude: _longitude,placeId: _placeId,city: _city,state: _state,street: _street,country: _country,description: _description,status: _status,workersNeeded: _workersNeeded,filled: _filled,filledAt: _filledAt,managers: _managers,durationDays: _durationDays,createdBy: _createdBy,);
     return _dataConnect.mutation("createShift", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -184,6 +209,11 @@ class CreateShiftVariables {
   late final Optional<String>locationAddress;
   late final Optional<double>latitude;
   late final Optional<double>longitude;
+  late final Optional<String>placeId;
+  late final Optional<String>city;
+  late final Optional<String>state;
+  late final Optional<String>street;
+  late final Optional<String>country;
   late final Optional<String>description;
   late final Optional<ShiftStatus>status;
   late final Optional<int>workersNeeded;
@@ -237,6 +267,26 @@ class CreateShiftVariables {
     longitude.value = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']);
   
   
+    placeId = Optional.optional(nativeFromJson, nativeToJson);
+    placeId.value = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']);
+  
+  
+    city = Optional.optional(nativeFromJson, nativeToJson);
+    city.value = json['city'] == null ? null : nativeFromJson<String>(json['city']);
+  
+  
+    state = Optional.optional(nativeFromJson, nativeToJson);
+    state.value = json['state'] == null ? null : nativeFromJson<String>(json['state']);
+  
+  
+    street = Optional.optional(nativeFromJson, nativeToJson);
+    street.value = json['street'] == null ? null : nativeFromJson<String>(json['street']);
+  
+  
+    country = Optional.optional(nativeFromJson, nativeToJson);
+    country.value = json['country'] == null ? null : nativeFromJson<String>(json['country']);
+  
+  
     description = Optional.optional(nativeFromJson, nativeToJson);
     description.value = json['description'] == null ? null : nativeFromJson<String>(json['description']);
   
@@ -292,6 +342,11 @@ class CreateShiftVariables {
     locationAddress == otherTyped.locationAddress && 
     latitude == otherTyped.latitude && 
     longitude == otherTyped.longitude && 
+    placeId == otherTyped.placeId && 
+    city == otherTyped.city && 
+    state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     description == otherTyped.description && 
     status == otherTyped.status && 
     workersNeeded == otherTyped.workersNeeded && 
@@ -303,7 +358,7 @@ class CreateShiftVariables {
     
   }
   @override
-  int get hashCode => Object.hashAll([title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdBy.hashCode]);
+  int get hashCode => Object.hashAll([title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, placeId.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdBy.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -337,6 +392,21 @@ class CreateShiftVariables {
     if(longitude.state == OptionalState.set) {
       json['longitude'] = longitude.toJson();
     }
+    if(placeId.state == OptionalState.set) {
+      json['placeId'] = placeId.toJson();
+    }
+    if(city.state == OptionalState.set) {
+      json['city'] = city.toJson();
+    }
+    if(state.state == OptionalState.set) {
+      json['state'] = state.toJson();
+    }
+    if(street.state == OptionalState.set) {
+      json['street'] = street.toJson();
+    }
+    if(country.state == OptionalState.set) {
+      json['country'] = country.toJson();
+    }
     if(description.state == OptionalState.set) {
       json['description'] = description.toJson();
     }
@@ -376,6 +446,11 @@ class CreateShiftVariables {
     required this.locationAddress,
     required this.latitude,
     required this.longitude,
+    required this.placeId,
+    required this.city,
+    required this.state,
+    required this.street,
+    required this.country,
     required this.description,
     required this.status,
     required this.workersNeeded,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/create_tax_form.dart

@@ -2,31 +2,140 @@ part of 'generated.dart';
 
 class CreateTaxFormVariablesBuilder {
   TaxFormType formType;
-  String title;
+  String firstName;
-  Optional<String> _subtitle = Optional.optional(nativeFromJson, nativeToJson);
+  String lastName;
-  Optional<String> _description = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _mInitial = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<TaxFormStatus> _status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
+  Optional<String> _oLastName = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<Timestamp> _dob = Optional.optional((json) => json['dob'] = Timestamp.fromJson(json['dob']), defaultSerializer);
+  int socialSN;
+  Optional<String> _email = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _phone = Optional.optional(nativeFromJson, nativeToJson);
+  String address;
+  Optional<String> _city = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _apt = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _state = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _zipCode = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<MaritalStatus> _marital = Optional.optional((data) => MaritalStatus.values.byName(data), enumSerializer);
+  Optional<bool> _multipleJob = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _childrens = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _otherDeps = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _totalCredits = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _otherInconme = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _deductions = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _extraWithholding = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<CitizenshipStatus> _citizen = Optional.optional((data) => CitizenshipStatus.values.byName(data), enumSerializer);
+  Optional<String> _uscis = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _passportNumber = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _countryIssue = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<bool> _prepartorOrTranslator = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _signature = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<Timestamp> _date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
+  TaxFormStatus status;
   String staffId;
-  Optional<AnyValue> _formData = Optional.optional(AnyValue.fromJson, defaultSerializer);
+  Optional<String> _createdBy = Optional.optional(nativeFromJson, nativeToJson);
 
-  final FirebaseDataConnect _dataConnect;  CreateTaxFormVariablesBuilder subtitle(String? t) {
+  final FirebaseDataConnect _dataConnect;  CreateTaxFormVariablesBuilder mInitial(String? t) {
-   _subtitle.value = t;
+   _mInitial.value = t;
    return this;
   }
-  CreateTaxFormVariablesBuilder description(String? t) {
+  CreateTaxFormVariablesBuilder oLastName(String? t) {
-   _description.value = t;
+   _oLastName.value = t;
    return this;
   }
-  CreateTaxFormVariablesBuilder status(TaxFormStatus? t) {
+  CreateTaxFormVariablesBuilder dob(Timestamp? t) {
-   _status.value = t;
+   _dob.value = t;
    return this;
   }
-  CreateTaxFormVariablesBuilder formData(AnyValue? t) {
+  CreateTaxFormVariablesBuilder email(String? t) {
-   _formData.value = t;
+   _email.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder phone(String? t) {
+   _phone.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder city(String? t) {
+   _city.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder apt(String? t) {
+   _apt.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder state(String? t) {
+   _state.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder zipCode(String? t) {
+   _zipCode.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder marital(MaritalStatus? t) {
+   _marital.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder multipleJob(bool? t) {
+   _multipleJob.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder childrens(int? t) {
+   _childrens.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder otherDeps(int? t) {
+   _otherDeps.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder totalCredits(double? t) {
+   _totalCredits.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder otherInconme(double? t) {
+   _otherInconme.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder deductions(double? t) {
+   _deductions.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder extraWithholding(double? t) {
+   _extraWithholding.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder citizen(CitizenshipStatus? t) {
+   _citizen.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder uscis(String? t) {
+   _uscis.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder passportNumber(String? t) {
+   _passportNumber.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder countryIssue(String? t) {
+   _countryIssue.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder prepartorOrTranslator(bool? t) {
+   _prepartorOrTranslator.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder signature(String? t) {
+   _signature.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder date(Timestamp? t) {
+   _date.value = t;
+   return this;
+  }
+  CreateTaxFormVariablesBuilder createdBy(String? t) {
+   _createdBy.value = t;
    return this;
   }
 
-  CreateTaxFormVariablesBuilder(this._dataConnect, {required  this.formType,required  this.title,required  this.staffId,});
+  CreateTaxFormVariablesBuilder(this._dataConnect, {required  this.formType,required  this.firstName,required  this.lastName,required  this.socialSN,required  this.address,required  this.status,required  this.staffId,});
   Deserializer<CreateTaxFormData> dataDeserializer = (dynamic json)  => CreateTaxFormData.fromJson(jsonDecode(json));
   Serializer<CreateTaxFormVariables> varsSerializer = (CreateTaxFormVariables vars) => jsonEncode(vars.toJson());
   Future<OperationResult<CreateTaxFormData, CreateTaxFormVariables>> execute() {
@@ -34,7 +143,7 @@ class CreateTaxFormVariablesBuilder {
   }
 
   MutationRef<CreateTaxFormData, CreateTaxFormVariables> ref() {
-    CreateTaxFormVariables vars= CreateTaxFormVariables(formType: formType,title: title,subtitle: _subtitle,description: _description,status: _status,staffId: staffId,formData: _formData,);
+    CreateTaxFormVariables vars= CreateTaxFormVariables(formType: formType,firstName: firstName,lastName: lastName,mInitial: _mInitial,oLastName: _oLastName,dob: _dob,socialSN: socialSN,email: _email,phone: _phone,address: address,city: _city,apt: _apt,state: _state,zipCode: _zipCode,marital: _marital,multipleJob: _multipleJob,childrens: _childrens,otherDeps: _otherDeps,totalCredits: _totalCredits,otherInconme: _otherInconme,deductions: _deductions,extraWithholding: _extraWithholding,citizen: _citizen,uscis: _uscis,passportNumber: _passportNumber,countryIssue: _countryIssue,prepartorOrTranslator: _prepartorOrTranslator,signature: _signature,date: _date,status: status,staffId: staffId,createdBy: _createdBy,);
     return _dataConnect.mutation("createTaxForm", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -110,37 +219,154 @@ class CreateTaxFormData {
 @immutable
 class CreateTaxFormVariables {
   final TaxFormType formType;
-  final String title;
+  final String firstName;
-  late final Optional<String>subtitle;
+  final String lastName;
-  late final Optional<String>description;
+  late final Optional<String>mInitial;
-  late final Optional<TaxFormStatus>status;
+  late final Optional<String>oLastName;
+  late final Optional<Timestamp>dob;
+  final int socialSN;
+  late final Optional<String>email;
+  late final Optional<String>phone;
+  final String address;
+  late final Optional<String>city;
+  late final Optional<String>apt;
+  late final Optional<String>state;
+  late final Optional<String>zipCode;
+  late final Optional<MaritalStatus>marital;
+  late final Optional<bool>multipleJob;
+  late final Optional<int>childrens;
+  late final Optional<int>otherDeps;
+  late final Optional<double>totalCredits;
+  late final Optional<double>otherInconme;
+  late final Optional<double>deductions;
+  late final Optional<double>extraWithholding;
+  late final Optional<CitizenshipStatus>citizen;
+  late final Optional<String>uscis;
+  late final Optional<String>passportNumber;
+  late final Optional<String>countryIssue;
+  late final Optional<bool>prepartorOrTranslator;
+  late final Optional<String>signature;
+  late final Optional<Timestamp>date;
+  final TaxFormStatus status;
   final String staffId;
-  late final Optional<AnyValue>formData;
+  late final Optional<String>createdBy;
   @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
   CreateTaxFormVariables.fromJson(Map<String, dynamic> json):
   
   formType = TaxFormType.values.byName(json['formType']),
-  title = nativeFromJson<String>(json['title']),
+  firstName = nativeFromJson<String>(json['firstName']),
+  lastName = nativeFromJson<String>(json['lastName']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  address = nativeFromJson<String>(json['address']),
+  status = TaxFormStatus.values.byName(json['status']),
   staffId = nativeFromJson<String>(json['staffId']) {
   
   
   
   
-    subtitle = Optional.optional(nativeFromJson, nativeToJson);
+  
-    subtitle.value = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']);
+    mInitial = Optional.optional(nativeFromJson, nativeToJson);
+    mInitial.value = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']);
   
   
-    description = Optional.optional(nativeFromJson, nativeToJson);
+    oLastName = Optional.optional(nativeFromJson, nativeToJson);
-    description.value = json['description'] == null ? null : nativeFromJson<String>(json['description']);
+    oLastName.value = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']);
   
   
-    status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
+    dob = Optional.optional((json) => json['dob'] = Timestamp.fromJson(json['dob']), defaultSerializer);
-    status.value = json['status'] == null ? null : TaxFormStatus.values.byName(json['status']);
+    dob.value = json['dob'] == null ? null : Timestamp.fromJson(json['dob']);
   
   
   
-    formData = Optional.optional(AnyValue.fromJson, defaultSerializer);
+    email = Optional.optional(nativeFromJson, nativeToJson);
-    formData.value = json['formData'] == null ? null : AnyValue.fromJson(json['formData']);
+    email.value = json['email'] == null ? null : nativeFromJson<String>(json['email']);
+  
+  
+    phone = Optional.optional(nativeFromJson, nativeToJson);
+    phone.value = json['phone'] == null ? null : nativeFromJson<String>(json['phone']);
+  
+  
+  
+    city = Optional.optional(nativeFromJson, nativeToJson);
+    city.value = json['city'] == null ? null : nativeFromJson<String>(json['city']);
+  
+  
+    apt = Optional.optional(nativeFromJson, nativeToJson);
+    apt.value = json['apt'] == null ? null : nativeFromJson<String>(json['apt']);
+  
+  
+    state = Optional.optional(nativeFromJson, nativeToJson);
+    state.value = json['state'] == null ? null : nativeFromJson<String>(json['state']);
+  
+  
+    zipCode = Optional.optional(nativeFromJson, nativeToJson);
+    zipCode.value = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']);
+  
+  
+    marital = Optional.optional((data) => MaritalStatus.values.byName(data), enumSerializer);
+    marital.value = json['marital'] == null ? null : MaritalStatus.values.byName(json['marital']);
+  
+  
+    multipleJob = Optional.optional(nativeFromJson, nativeToJson);
+    multipleJob.value = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']);
+  
+  
+    childrens = Optional.optional(nativeFromJson, nativeToJson);
+    childrens.value = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']);
+  
+  
+    otherDeps = Optional.optional(nativeFromJson, nativeToJson);
+    otherDeps.value = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']);
+  
+  
+    totalCredits = Optional.optional(nativeFromJson, nativeToJson);
+    totalCredits.value = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']);
+  
+  
+    otherInconme = Optional.optional(nativeFromJson, nativeToJson);
+    otherInconme.value = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']);
+  
+  
+    deductions = Optional.optional(nativeFromJson, nativeToJson);
+    deductions.value = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']);
+  
+  
+    extraWithholding = Optional.optional(nativeFromJson, nativeToJson);
+    extraWithholding.value = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']);
+  
+  
+    citizen = Optional.optional((data) => CitizenshipStatus.values.byName(data), enumSerializer);
+    citizen.value = json['citizen'] == null ? null : CitizenshipStatus.values.byName(json['citizen']);
+  
+  
+    uscis = Optional.optional(nativeFromJson, nativeToJson);
+    uscis.value = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']);
+  
+  
+    passportNumber = Optional.optional(nativeFromJson, nativeToJson);
+    passportNumber.value = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']);
+  
+  
+    countryIssue = Optional.optional(nativeFromJson, nativeToJson);
+    countryIssue.value = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']);
+  
+  
+    prepartorOrTranslator = Optional.optional(nativeFromJson, nativeToJson);
+    prepartorOrTranslator.value = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']);
+  
+  
+    signature = Optional.optional(nativeFromJson, nativeToJson);
+    signature.value = json['signature'] == null ? null : nativeFromJson<String>(json['signature']);
+  
+  
+    date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
+    date.value = json['date'] == null ? null : Timestamp.fromJson(json['date']);
+  
+  
+  
+  
+    createdBy = Optional.optional(nativeFromJson, nativeToJson);
+    createdBy.value = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
   
   }
   @override
@@ -154,16 +380,41 @@ class CreateTaxFormVariables {
 
     final CreateTaxFormVariables otherTyped = other as CreateTaxFormVariables;
     return formType == otherTyped.formType && 
-    title == otherTyped.title && 
+    firstName == otherTyped.firstName && 
-    subtitle == otherTyped.subtitle && 
+    lastName == otherTyped.lastName && 
-    description == otherTyped.description && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
     status == otherTyped.status && 
     staffId == otherTyped.staffId && 
-    formData == otherTyped.formData;
+    createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([formType.hashCode, title.hashCode, subtitle.hashCode, description.hashCode, status.hashCode, staffId.hashCode, formData.hashCode]);
+  int get hashCode => Object.hashAll([formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdBy.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -171,31 +422,125 @@ class CreateTaxFormVariables {
     json['formType'] = 
     formType.name
     ;
-    json['title'] = nativeToJson<String>(title);
+    json['firstName'] = nativeToJson<String>(firstName);
-    if(subtitle.state == OptionalState.set) {
+    json['lastName'] = nativeToJson<String>(lastName);
-      json['subtitle'] = subtitle.toJson();
+    if(mInitial.state == OptionalState.set) {
+      json['mInitial'] = mInitial.toJson();
     }
-    if(description.state == OptionalState.set) {
+    if(oLastName.state == OptionalState.set) {
-      json['description'] = description.toJson();
+      json['oLastName'] = oLastName.toJson();
     }
-    if(status.state == OptionalState.set) {
+    if(dob.state == OptionalState.set) {
-      json['status'] = status.toJson();
+      json['dob'] = dob.toJson();
     }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if(email.state == OptionalState.set) {
+      json['email'] = email.toJson();
+    }
+    if(phone.state == OptionalState.set) {
+      json['phone'] = phone.toJson();
+    }
+    json['address'] = nativeToJson<String>(address);
+    if(city.state == OptionalState.set) {
+      json['city'] = city.toJson();
+    }
+    if(apt.state == OptionalState.set) {
+      json['apt'] = apt.toJson();
+    }
+    if(state.state == OptionalState.set) {
+      json['state'] = state.toJson();
+    }
+    if(zipCode.state == OptionalState.set) {
+      json['zipCode'] = zipCode.toJson();
+    }
+    if(marital.state == OptionalState.set) {
+      json['marital'] = marital.toJson();
+    }
+    if(multipleJob.state == OptionalState.set) {
+      json['multipleJob'] = multipleJob.toJson();
+    }
+    if(childrens.state == OptionalState.set) {
+      json['childrens'] = childrens.toJson();
+    }
+    if(otherDeps.state == OptionalState.set) {
+      json['otherDeps'] = otherDeps.toJson();
+    }
+    if(totalCredits.state == OptionalState.set) {
+      json['totalCredits'] = totalCredits.toJson();
+    }
+    if(otherInconme.state == OptionalState.set) {
+      json['otherInconme'] = otherInconme.toJson();
+    }
+    if(deductions.state == OptionalState.set) {
+      json['deductions'] = deductions.toJson();
+    }
+    if(extraWithholding.state == OptionalState.set) {
+      json['extraWithholding'] = extraWithholding.toJson();
+    }
+    if(citizen.state == OptionalState.set) {
+      json['citizen'] = citizen.toJson();
+    }
+    if(uscis.state == OptionalState.set) {
+      json['uscis'] = uscis.toJson();
+    }
+    if(passportNumber.state == OptionalState.set) {
+      json['passportNumber'] = passportNumber.toJson();
+    }
+    if(countryIssue.state == OptionalState.set) {
+      json['countryIssue'] = countryIssue.toJson();
+    }
+    if(prepartorOrTranslator.state == OptionalState.set) {
+      json['prepartorOrTranslator'] = prepartorOrTranslator.toJson();
+    }
+    if(signature.state == OptionalState.set) {
+      json['signature'] = signature.toJson();
+    }
+    if(date.state == OptionalState.set) {
+      json['date'] = date.toJson();
+    }
+    json['status'] = 
+    status.name
+    ;
     json['staffId'] = nativeToJson<String>(staffId);
-    if(formData.state == OptionalState.set) {
+    if(createdBy.state == OptionalState.set) {
-      json['formData'] = formData.toJson();
+      json['createdBy'] = createdBy.toJson();
     }
     return json;
   }
 
   CreateTaxFormVariables({
     required this.formType,
-    required this.title,
+    required this.firstName,
-    required this.subtitle,
+    required this.lastName,
-    required this.description,
+    required this.mInitial,
+    required this.oLastName,
+    required this.dob,
+    required this.socialSN,
+    required this.email,
+    required this.phone,
+    required this.address,
+    required this.city,
+    required this.apt,
+    required this.state,
+    required this.zipCode,
+    required this.marital,
+    required this.multipleJob,
+    required this.childrens,
+    required this.otherDeps,
+    required this.totalCredits,
+    required this.otherInconme,
+    required this.deductions,
+    required this.extraWithholding,
+    required this.citizen,
+    required this.uscis,
+    required this.passportNumber,
+    required this.countryIssue,
+    required this.prepartorOrTranslator,
+    required this.signature,
+    required this.date,
     required this.status,
     required this.staffId,
-    required this.formData,
+    required this.createdBy,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/create_team_hub.dart

@@ -4,14 +4,31 @@ class CreateTeamHubVariablesBuilder {
   String teamId;
   String hubName;
   String address;
+  Optional<String> _placeId = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _latitude = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _longitude = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _city = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _state = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _street = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _country = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _zipCode = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _managerName = Optional.optional(nativeFromJson, nativeToJson);
   Optional<bool> _isActive = Optional.optional(nativeFromJson, nativeToJson);
   Optional<AnyValue> _departments = Optional.optional(AnyValue.fromJson, defaultSerializer);
 
-  final FirebaseDataConnect _dataConnect;  CreateTeamHubVariablesBuilder city(String? t) {
+  final FirebaseDataConnect _dataConnect;  CreateTeamHubVariablesBuilder placeId(String? t) {
+   _placeId.value = t;
+   return this;
+  }
+  CreateTeamHubVariablesBuilder latitude(double? t) {
+   _latitude.value = t;
+   return this;
+  }
+  CreateTeamHubVariablesBuilder longitude(double? t) {
+   _longitude.value = t;
+   return this;
+  }
+  CreateTeamHubVariablesBuilder city(String? t) {
    _city.value = t;
    return this;
   }
@@ -19,6 +36,14 @@ class CreateTeamHubVariablesBuilder {
    _state.value = t;
    return this;
   }
+  CreateTeamHubVariablesBuilder street(String? t) {
+   _street.value = t;
+   return this;
+  }
+  CreateTeamHubVariablesBuilder country(String? t) {
+   _country.value = t;
+   return this;
+  }
   CreateTeamHubVariablesBuilder zipCode(String? t) {
    _zipCode.value = t;
    return this;
@@ -44,7 +69,7 @@ class CreateTeamHubVariablesBuilder {
   }
 
   MutationRef<CreateTeamHubData, CreateTeamHubVariables> ref() {
-    CreateTeamHubVariables vars= CreateTeamHubVariables(teamId: teamId,hubName: hubName,address: address,city: _city,state: _state,zipCode: _zipCode,managerName: _managerName,isActive: _isActive,departments: _departments,);
+    CreateTeamHubVariables vars= CreateTeamHubVariables(teamId: teamId,hubName: hubName,address: address,placeId: _placeId,latitude: _latitude,longitude: _longitude,city: _city,state: _state,street: _street,country: _country,zipCode: _zipCode,managerName: _managerName,isActive: _isActive,departments: _departments,);
     return _dataConnect.mutation("createTeamHub", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -122,8 +147,13 @@ class CreateTeamHubVariables {
   final String teamId;
   final String hubName;
   final String address;
+  late final Optional<String>placeId;
+  late final Optional<double>latitude;
+  late final Optional<double>longitude;
   late final Optional<String>city;
   late final Optional<String>state;
+  late final Optional<String>street;
+  late final Optional<String>country;
   late final Optional<String>zipCode;
   late final Optional<String>managerName;
   late final Optional<bool>isActive;
@@ -139,6 +169,18 @@ class CreateTeamHubVariables {
   
   
   
+    placeId = Optional.optional(nativeFromJson, nativeToJson);
+    placeId.value = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']);
+  
+  
+    latitude = Optional.optional(nativeFromJson, nativeToJson);
+    latitude.value = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']);
+  
+  
+    longitude = Optional.optional(nativeFromJson, nativeToJson);
+    longitude.value = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']);
+  
+  
     city = Optional.optional(nativeFromJson, nativeToJson);
     city.value = json['city'] == null ? null : nativeFromJson<String>(json['city']);
   
@@ -147,6 +189,14 @@ class CreateTeamHubVariables {
     state.value = json['state'] == null ? null : nativeFromJson<String>(json['state']);
   
   
+    street = Optional.optional(nativeFromJson, nativeToJson);
+    street.value = json['street'] == null ? null : nativeFromJson<String>(json['street']);
+  
+  
+    country = Optional.optional(nativeFromJson, nativeToJson);
+    country.value = json['country'] == null ? null : nativeFromJson<String>(json['country']);
+  
+  
     zipCode = Optional.optional(nativeFromJson, nativeToJson);
     zipCode.value = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']);
   
@@ -176,8 +226,13 @@ class CreateTeamHubVariables {
     return teamId == otherTyped.teamId && 
     hubName == otherTyped.hubName && 
     address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    latitude == otherTyped.latitude && 
+    longitude == otherTyped.longitude && 
     city == otherTyped.city && 
     state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     zipCode == otherTyped.zipCode && 
     managerName == otherTyped.managerName && 
     isActive == otherTyped.isActive && 
@@ -185,7 +240,7 @@ class CreateTeamHubVariables {
     
   }
   @override
-  int get hashCode => Object.hashAll([teamId.hashCode, hubName.hashCode, address.hashCode, city.hashCode, state.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode]);
+  int get hashCode => Object.hashAll([teamId.hashCode, hubName.hashCode, address.hashCode, placeId.hashCode, latitude.hashCode, longitude.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -193,12 +248,27 @@ class CreateTeamHubVariables {
     json['teamId'] = nativeToJson<String>(teamId);
     json['hubName'] = nativeToJson<String>(hubName);
     json['address'] = nativeToJson<String>(address);
+    if(placeId.state == OptionalState.set) {
+      json['placeId'] = placeId.toJson();
+    }
+    if(latitude.state == OptionalState.set) {
+      json['latitude'] = latitude.toJson();
+    }
+    if(longitude.state == OptionalState.set) {
+      json['longitude'] = longitude.toJson();
+    }
     if(city.state == OptionalState.set) {
       json['city'] = city.toJson();
     }
     if(state.state == OptionalState.set) {
       json['state'] = state.toJson();
     }
+    if(street.state == OptionalState.set) {
+      json['street'] = street.toJson();
+    }
+    if(country.state == OptionalState.set) {
+      json['country'] = country.toJson();
+    }
     if(zipCode.state == OptionalState.set) {
       json['zipCode'] = zipCode.toJson();
     }
@@ -218,8 +288,13 @@ class CreateTeamHubVariables {
     required this.teamId,
     required this.hubName,
     required this.address,
+    required this.placeId,
+    required this.latitude,
+    required this.longitude,
     required this.city,
     required this.state,
+    required this.street,
+    required this.country,
     required this.zipCode,
     required this.managerName,
     required this.isActive,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/filter_invoices.dart

@@ -371,15 +371,15 @@ class FilterInvoicesInvoicesBusiness {
 @immutable
 class FilterInvoicesInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final FilterInvoicesInvoicesOrderTeamHub teamHub;
   FilterInvoicesInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = FilterInvoicesInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -391,13 +391,13 @@ class FilterInvoicesInvoicesOrder {
 
     final FilterInvoicesInvoicesOrder otherTyped = other as FilterInvoicesInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -405,23 +405,67 @@ class FilterInvoicesInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   FilterInvoicesInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class FilterInvoicesInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  FilterInvoicesInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final FilterInvoicesInvoicesOrderTeamHub otherTyped = other as FilterInvoicesInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  FilterInvoicesInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/filter_shifts.dart

@@ -61,6 +61,11 @@ class FilterShiftsShifts {
   final String? locationAddress;
   final double? latitude;
   final double? longitude;
+  final String? placeId;
+  final String? city;
+  final String? state;
+  final String? street;
+  final String? country;
   final String? description;
   final EnumValue<ShiftStatus>? status;
   final int? workersNeeded;
@@ -86,6 +91,11 @@ class FilterShiftsShifts {
   locationAddress = json['locationAddress'] == null ? null : nativeFromJson<String>(json['locationAddress']),
   latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
   longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
   status = json['status'] == null ? null : shiftStatusDeserializer(json['status']),
   workersNeeded = json['workersNeeded'] == null ? null : nativeFromJson<int>(json['workersNeeded']),
@@ -121,6 +131,11 @@ class FilterShiftsShifts {
     locationAddress == otherTyped.locationAddress && 
     latitude == otherTyped.latitude && 
     longitude == otherTyped.longitude && 
+    placeId == otherTyped.placeId && 
+    city == otherTyped.city && 
+    state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     description == otherTyped.description && 
     status == otherTyped.status && 
     workersNeeded == otherTyped.workersNeeded && 
@@ -135,7 +150,7 @@ class FilterShiftsShifts {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, placeId.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -170,6 +185,21 @@ class FilterShiftsShifts {
     if (longitude != null) {
       json['longitude'] = nativeToJson<double?>(longitude);
     }
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (description != null) {
       json['description'] = nativeToJson<String?>(description);
     }
@@ -219,6 +249,11 @@ class FilterShiftsShifts {
     this.locationAddress,
     this.latitude,
     this.longitude,
+    this.placeId,
+    this.city,
+    this.state,
+    this.street,
+    this.country,
     this.description,
     this.status,
     this.workersNeeded,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/filter_tax_forms.dart

@@ -1,189 +0,0 @@
-part of 'generated.dart';
-
-class FilterTaxFormsVariablesBuilder {
-  Optional<TaxFormType> _formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
-  Optional<TaxFormStatus> _status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
-  Optional<String> _staffId = Optional.optional(nativeFromJson, nativeToJson);
-
-  final FirebaseDataConnect _dataConnect;
-  FilterTaxFormsVariablesBuilder formType(TaxFormType? t) {
-   _formType.value = t;
-   return this;
-  }
-  FilterTaxFormsVariablesBuilder status(TaxFormStatus? t) {
-   _status.value = t;
-   return this;
-  }
-  FilterTaxFormsVariablesBuilder staffId(String? t) {
-   _staffId.value = t;
-   return this;
-  }
-
-  FilterTaxFormsVariablesBuilder(this._dataConnect, );
-  Deserializer<FilterTaxFormsData> dataDeserializer = (dynamic json)  => FilterTaxFormsData.fromJson(jsonDecode(json));
-  Serializer<FilterTaxFormsVariables> varsSerializer = (FilterTaxFormsVariables vars) => jsonEncode(vars.toJson());
-  Future<QueryResult<FilterTaxFormsData, FilterTaxFormsVariables>> execute() {
-    return ref().execute();
-  }
-
-  QueryRef<FilterTaxFormsData, FilterTaxFormsVariables> ref() {
-    FilterTaxFormsVariables vars= FilterTaxFormsVariables(formType: _formType,status: _status,staffId: _staffId,);
-    return _dataConnect.query("filterTaxForms", dataDeserializer, varsSerializer, vars);
-  }
-}
-
-@immutable
-class FilterTaxFormsTaxForms {
-  final String id;
-  final EnumValue<TaxFormType> formType;
-  final String title;
-  final EnumValue<TaxFormStatus> status;
-  final String staffId;
-  FilterTaxFormsTaxForms.fromJson(dynamic json):
-  
-  id = nativeFromJson<String>(json['id']),
-  formType = taxFormTypeDeserializer(json['formType']),
-  title = nativeFromJson<String>(json['title']),
-  status = taxFormStatusDeserializer(json['status']),
-  staffId = nativeFromJson<String>(json['staffId']);
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final FilterTaxFormsTaxForms otherTyped = other as FilterTaxFormsTaxForms;
-    return id == otherTyped.id && 
-    formType == otherTyped.formType && 
-    title == otherTyped.title && 
-    status == otherTyped.status && 
-    staffId == otherTyped.staffId;
-    
-  }
-  @override
-  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, title.hashCode, status.hashCode, staffId.hashCode]);
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['id'] = nativeToJson<String>(id);
-    json['formType'] = 
-    taxFormTypeSerializer(formType)
-    ;
-    json['title'] = nativeToJson<String>(title);
-    json['status'] = 
-    taxFormStatusSerializer(status)
-    ;
-    json['staffId'] = nativeToJson<String>(staffId);
-    return json;
-  }
-
-  FilterTaxFormsTaxForms({
-    required this.id,
-    required this.formType,
-    required this.title,
-    required this.status,
-    required this.staffId,
-  });
-}
-
-@immutable
-class FilterTaxFormsData {
-  final List<FilterTaxFormsTaxForms> taxForms;
-  FilterTaxFormsData.fromJson(dynamic json):
-  
-  taxForms = (json['taxForms'] as List<dynamic>)
-        .map((e) => FilterTaxFormsTaxForms.fromJson(e))
-        .toList();
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final FilterTaxFormsData otherTyped = other as FilterTaxFormsData;
-    return taxForms == otherTyped.taxForms;
-    
-  }
-  @override
-  int get hashCode => taxForms.hashCode;
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['taxForms'] = taxForms.map((e) => e.toJson()).toList();
-    return json;
-  }
-
-  FilterTaxFormsData({
-    required this.taxForms,
-  });
-}
-
-@immutable
-class FilterTaxFormsVariables {
-  late final Optional<TaxFormType>formType;
-  late final Optional<TaxFormStatus>status;
-  late final Optional<String>staffId;
-  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
-  FilterTaxFormsVariables.fromJson(Map<String, dynamic> json) {
-  
-  
-    formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
-    formType.value = json['formType'] == null ? null : TaxFormType.values.byName(json['formType']);
-  
-  
-    status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
-    status.value = json['status'] == null ? null : TaxFormStatus.values.byName(json['status']);
-  
-  
-    staffId = Optional.optional(nativeFromJson, nativeToJson);
-    staffId.value = json['staffId'] == null ? null : nativeFromJson<String>(json['staffId']);
-  
-  }
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final FilterTaxFormsVariables otherTyped = other as FilterTaxFormsVariables;
-    return formType == otherTyped.formType && 
-    status == otherTyped.status && 
-    staffId == otherTyped.staffId;
-    
-  }
-  @override
-  int get hashCode => Object.hashAll([formType.hashCode, status.hashCode, staffId.hashCode]);
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    if(formType.state == OptionalState.set) {
-      json['formType'] = formType.toJson();
-    }
-    if(status.state == OptionalState.set) {
-      json['status'] = status.toJson();
-    }
-    if(staffId.state == OptionalState.set) {
-      json['staffId'] = staffId.toJson();
-    }
-    return json;
-  }
-
-  FilterTaxFormsVariables({
-    required this.formType,
-    required this.status,
-    required this.staffId,
-  });
-}
-

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_application_by_id.dart

@@ -198,14 +198,14 @@ class GetApplicationByIdApplicationShift {
 class GetApplicationByIdApplicationShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final GetApplicationByIdApplicationShiftOrderTeamHub teamHub;
   final GetApplicationByIdApplicationShiftOrderBusiness business;
   final GetApplicationByIdApplicationShiftOrderVendor? vendor;
   GetApplicationByIdApplicationShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = GetApplicationByIdApplicationShiftOrderTeamHub.fromJson(json['teamHub']),
   business = GetApplicationByIdApplicationShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : GetApplicationByIdApplicationShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -220,13 +220,13 @@ class GetApplicationByIdApplicationShiftOrder {
     final GetApplicationByIdApplicationShiftOrder otherTyped = other as GetApplicationByIdApplicationShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -235,9 +235,7 @@ class GetApplicationByIdApplicationShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -248,12 +246,58 @@ class GetApplicationByIdApplicationShiftOrder {
   GetApplicationByIdApplicationShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class GetApplicationByIdApplicationShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetApplicationByIdApplicationShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetApplicationByIdApplicationShiftOrderTeamHub otherTyped = other as GetApplicationByIdApplicationShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetApplicationByIdApplicationShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetApplicationByIdApplicationShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_applications_by_shift_id.dart

@@ -198,14 +198,14 @@ class GetApplicationsByShiftIdApplicationsShift {
 class GetApplicationsByShiftIdApplicationsShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final GetApplicationsByShiftIdApplicationsShiftOrderTeamHub teamHub;
   final GetApplicationsByShiftIdApplicationsShiftOrderBusiness business;
   final GetApplicationsByShiftIdApplicationsShiftOrderVendor? vendor;
   GetApplicationsByShiftIdApplicationsShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = GetApplicationsByShiftIdApplicationsShiftOrderTeamHub.fromJson(json['teamHub']),
   business = GetApplicationsByShiftIdApplicationsShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : GetApplicationsByShiftIdApplicationsShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -220,13 +220,13 @@ class GetApplicationsByShiftIdApplicationsShiftOrder {
     final GetApplicationsByShiftIdApplicationsShiftOrder otherTyped = other as GetApplicationsByShiftIdApplicationsShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -235,9 +235,7 @@ class GetApplicationsByShiftIdApplicationsShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -248,12 +246,58 @@ class GetApplicationsByShiftIdApplicationsShiftOrder {
   GetApplicationsByShiftIdApplicationsShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class GetApplicationsByShiftIdApplicationsShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetApplicationsByShiftIdApplicationsShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetApplicationsByShiftIdApplicationsShiftOrderTeamHub otherTyped = other as GetApplicationsByShiftIdApplicationsShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetApplicationsByShiftIdApplicationsShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetApplicationsByShiftIdApplicationsShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_applications_by_shift_id_and_status.dart

@@ -209,14 +209,14 @@ class GetApplicationsByShiftIdAndStatusApplicationsShift {
 class GetApplicationsByShiftIdAndStatusApplicationsShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub teamHub;
   final GetApplicationsByShiftIdAndStatusApplicationsShiftOrderBusiness business;
   final GetApplicationsByShiftIdAndStatusApplicationsShiftOrderVendor? vendor;
   GetApplicationsByShiftIdAndStatusApplicationsShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub.fromJson(json['teamHub']),
   business = GetApplicationsByShiftIdAndStatusApplicationsShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : GetApplicationsByShiftIdAndStatusApplicationsShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -231,13 +231,13 @@ class GetApplicationsByShiftIdAndStatusApplicationsShiftOrder {
     final GetApplicationsByShiftIdAndStatusApplicationsShiftOrder otherTyped = other as GetApplicationsByShiftIdAndStatusApplicationsShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -246,9 +246,7 @@ class GetApplicationsByShiftIdAndStatusApplicationsShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -259,12 +257,58 @@ class GetApplicationsByShiftIdAndStatusApplicationsShiftOrder {
   GetApplicationsByShiftIdAndStatusApplicationsShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub otherTyped = other as GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetApplicationsByShiftIdAndStatusApplicationsShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetApplicationsByShiftIdAndStatusApplicationsShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_applications_by_staff_id.dart

@@ -208,14 +208,14 @@ class GetApplicationsByStaffIdApplicationsShift {
 class GetApplicationsByStaffIdApplicationsShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final GetApplicationsByStaffIdApplicationsShiftOrderTeamHub teamHub;
   final GetApplicationsByStaffIdApplicationsShiftOrderBusiness business;
   final GetApplicationsByStaffIdApplicationsShiftOrderVendor? vendor;
   GetApplicationsByStaffIdApplicationsShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = GetApplicationsByStaffIdApplicationsShiftOrderTeamHub.fromJson(json['teamHub']),
   business = GetApplicationsByStaffIdApplicationsShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : GetApplicationsByStaffIdApplicationsShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -230,13 +230,13 @@ class GetApplicationsByStaffIdApplicationsShiftOrder {
     final GetApplicationsByStaffIdApplicationsShiftOrder otherTyped = other as GetApplicationsByStaffIdApplicationsShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -245,9 +245,7 @@ class GetApplicationsByStaffIdApplicationsShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -258,12 +256,58 @@ class GetApplicationsByStaffIdApplicationsShiftOrder {
   GetApplicationsByStaffIdApplicationsShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class GetApplicationsByStaffIdApplicationsShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetApplicationsByStaffIdApplicationsShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetApplicationsByStaffIdApplicationsShiftOrderTeamHub otherTyped = other as GetApplicationsByStaffIdApplicationsShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetApplicationsByStaffIdApplicationsShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetApplicationsByStaffIdApplicationsShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_invoice_by_id.dart

@@ -321,15 +321,15 @@ class GetInvoiceByIdInvoiceBusiness {
 @immutable
 class GetInvoiceByIdInvoiceOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final GetInvoiceByIdInvoiceOrderTeamHub teamHub;
   GetInvoiceByIdInvoiceOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = GetInvoiceByIdInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -341,13 +341,13 @@ class GetInvoiceByIdInvoiceOrder {
 
     final GetInvoiceByIdInvoiceOrder otherTyped = other as GetInvoiceByIdInvoiceOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -355,23 +355,67 @@ class GetInvoiceByIdInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   GetInvoiceByIdInvoiceOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class GetInvoiceByIdInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetInvoiceByIdInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetInvoiceByIdInvoiceOrderTeamHub otherTyped = other as GetInvoiceByIdInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetInvoiceByIdInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_order_by_id.dart

@@ -24,7 +24,6 @@ class GetOrderByIdOrder {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -35,7 +34,6 @@ class GetOrderByIdOrder {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -44,6 +42,7 @@ class GetOrderByIdOrder {
   final Timestamp? createdAt;
   final GetOrderByIdOrderBusiness business;
   final GetOrderByIdOrderVendor? vendor;
+  final GetOrderByIdOrderTeamHub teamHub;
   GetOrderByIdOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -51,7 +50,6 @@ class GetOrderByIdOrder {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -62,7 +60,6 @@ class GetOrderByIdOrder {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -70,7 +67,8 @@ class GetOrderByIdOrder {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrderByIdOrderBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrderByIdOrderVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrderByIdOrderVendor.fromJson(json['vendor']),
+  teamHub = GetOrderByIdOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -86,7 +84,6 @@ class GetOrderByIdOrder {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -97,7 +94,6 @@ class GetOrderByIdOrder {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -105,11 +101,12 @@ class GetOrderByIdOrder {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -125,9 +122,6 @@ class GetOrderByIdOrder {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -160,9 +154,6 @@ class GetOrderByIdOrder {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -185,6 +176,7 @@ class GetOrderByIdOrder {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -194,7 +186,6 @@ class GetOrderByIdOrder {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -205,7 +196,6 @@ class GetOrderByIdOrder {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -214,6 +204,7 @@ class GetOrderByIdOrder {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -309,6 +300,52 @@ class GetOrderByIdOrderVendor {
   });
 }
 
+@immutable
+class GetOrderByIdOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrderByIdOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrderByIdOrderTeamHub otherTyped = other as GetOrderByIdOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrderByIdOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrderByIdData {
   final GetOrderByIdOrder? order;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_orders_by_business_id.dart

@@ -34,7 +34,6 @@ class GetOrdersByBusinessIdOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class GetOrdersByBusinessIdOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class GetOrdersByBusinessIdOrders {
   final Timestamp? createdAt;
   final GetOrdersByBusinessIdOrdersBusiness business;
   final GetOrdersByBusinessIdOrdersVendor? vendor;
+  final GetOrdersByBusinessIdOrdersTeamHub teamHub;
   GetOrdersByBusinessIdOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class GetOrdersByBusinessIdOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class GetOrdersByBusinessIdOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class GetOrdersByBusinessIdOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrdersByBusinessIdOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrdersByBusinessIdOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrdersByBusinessIdOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetOrdersByBusinessIdOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class GetOrdersByBusinessIdOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class GetOrdersByBusinessIdOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class GetOrdersByBusinessIdOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class GetOrdersByBusinessIdOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class GetOrdersByBusinessIdOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class GetOrdersByBusinessIdOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class GetOrdersByBusinessIdOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class GetOrdersByBusinessIdOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class GetOrdersByBusinessIdOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class GetOrdersByBusinessIdOrdersVendor {
   });
 }
 
+@immutable
+class GetOrdersByBusinessIdOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrdersByBusinessIdOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrdersByBusinessIdOrdersTeamHub otherTyped = other as GetOrdersByBusinessIdOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrdersByBusinessIdOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrdersByBusinessIdData {
   final List<GetOrdersByBusinessIdOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_orders_by_date_range.dart

@@ -35,7 +35,6 @@ class GetOrdersByDateRangeOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -46,7 +45,6 @@ class GetOrdersByDateRangeOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -55,6 +53,7 @@ class GetOrdersByDateRangeOrders {
   final Timestamp? createdAt;
   final GetOrdersByDateRangeOrdersBusiness business;
   final GetOrdersByDateRangeOrdersVendor? vendor;
+  final GetOrdersByDateRangeOrdersTeamHub teamHub;
   GetOrdersByDateRangeOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -62,7 +61,6 @@ class GetOrdersByDateRangeOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -73,7 +71,6 @@ class GetOrdersByDateRangeOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -81,7 +78,8 @@ class GetOrdersByDateRangeOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrdersByDateRangeOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrdersByDateRangeOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrdersByDateRangeOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetOrdersByDateRangeOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -97,7 +95,6 @@ class GetOrdersByDateRangeOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -108,7 +105,6 @@ class GetOrdersByDateRangeOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -116,11 +112,12 @@ class GetOrdersByDateRangeOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -136,9 +133,6 @@ class GetOrdersByDateRangeOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -171,9 +165,6 @@ class GetOrdersByDateRangeOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -196,6 +187,7 @@ class GetOrdersByDateRangeOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -205,7 +197,6 @@ class GetOrdersByDateRangeOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -216,7 +207,6 @@ class GetOrdersByDateRangeOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -225,6 +215,7 @@ class GetOrdersByDateRangeOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -320,6 +311,52 @@ class GetOrdersByDateRangeOrdersVendor {
   });
 }
 
+@immutable
+class GetOrdersByDateRangeOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrdersByDateRangeOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrdersByDateRangeOrdersTeamHub otherTyped = other as GetOrdersByDateRangeOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrdersByDateRangeOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrdersByDateRangeData {
   final List<GetOrdersByDateRangeOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_orders_by_status.dart

@@ -34,7 +34,6 @@ class GetOrdersByStatusOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class GetOrdersByStatusOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class GetOrdersByStatusOrders {
   final Timestamp? createdAt;
   final GetOrdersByStatusOrdersBusiness business;
   final GetOrdersByStatusOrdersVendor? vendor;
+  final GetOrdersByStatusOrdersTeamHub teamHub;
   GetOrdersByStatusOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class GetOrdersByStatusOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class GetOrdersByStatusOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class GetOrdersByStatusOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrdersByStatusOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrdersByStatusOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrdersByStatusOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetOrdersByStatusOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class GetOrdersByStatusOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class GetOrdersByStatusOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class GetOrdersByStatusOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class GetOrdersByStatusOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class GetOrdersByStatusOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class GetOrdersByStatusOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class GetOrdersByStatusOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class GetOrdersByStatusOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class GetOrdersByStatusOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class GetOrdersByStatusOrdersVendor {
   });
 }
 
+@immutable
+class GetOrdersByStatusOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrdersByStatusOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrdersByStatusOrdersTeamHub otherTyped = other as GetOrdersByStatusOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrdersByStatusOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrdersByStatusData {
   final List<GetOrdersByStatusOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_orders_by_vendor_id.dart

@@ -34,7 +34,6 @@ class GetOrdersByVendorIdOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class GetOrdersByVendorIdOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class GetOrdersByVendorIdOrders {
   final Timestamp? createdAt;
   final GetOrdersByVendorIdOrdersBusiness business;
   final GetOrdersByVendorIdOrdersVendor? vendor;
+  final GetOrdersByVendorIdOrdersTeamHub teamHub;
   GetOrdersByVendorIdOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class GetOrdersByVendorIdOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class GetOrdersByVendorIdOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class GetOrdersByVendorIdOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetOrdersByVendorIdOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetOrdersByVendorIdOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetOrdersByVendorIdOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetOrdersByVendorIdOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class GetOrdersByVendorIdOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class GetOrdersByVendorIdOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class GetOrdersByVendorIdOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class GetOrdersByVendorIdOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class GetOrdersByVendorIdOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class GetOrdersByVendorIdOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class GetOrdersByVendorIdOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class GetOrdersByVendorIdOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class GetOrdersByVendorIdOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class GetOrdersByVendorIdOrdersVendor {
   });
 }
 
+@immutable
+class GetOrdersByVendorIdOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetOrdersByVendorIdOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetOrdersByVendorIdOrdersTeamHub otherTyped = other as GetOrdersByVendorIdOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetOrdersByVendorIdOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetOrdersByVendorIdData {
   final List<GetOrdersByVendorIdOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_rapid_orders.dart

@@ -34,7 +34,6 @@ class GetRapidOrdersOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class GetRapidOrdersOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class GetRapidOrdersOrders {
   final Timestamp? createdAt;
   final GetRapidOrdersOrdersBusiness business;
   final GetRapidOrdersOrdersVendor? vendor;
+  final GetRapidOrdersOrdersTeamHub teamHub;
   GetRapidOrdersOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class GetRapidOrdersOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class GetRapidOrdersOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class GetRapidOrdersOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = GetRapidOrdersOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : GetRapidOrdersOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : GetRapidOrdersOrdersVendor.fromJson(json['vendor']),
+  teamHub = GetRapidOrdersOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class GetRapidOrdersOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class GetRapidOrdersOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class GetRapidOrdersOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class GetRapidOrdersOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class GetRapidOrdersOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class GetRapidOrdersOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class GetRapidOrdersOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class GetRapidOrdersOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class GetRapidOrdersOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class GetRapidOrdersOrdersVendor {
   });
 }
 
+@immutable
+class GetRapidOrdersOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  GetRapidOrdersOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetRapidOrdersOrdersTeamHub otherTyped = other as GetRapidOrdersOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  GetRapidOrdersOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class GetRapidOrdersData {
   final List<GetRapidOrdersOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_shift_by_id.dart

@@ -31,6 +31,11 @@ class GetShiftByIdShift {
   final String? locationAddress;
   final double? latitude;
   final double? longitude;
+  final String? placeId;
+  final String? city;
+  final String? state;
+  final String? street;
+  final String? country;
   final String? description;
   final EnumValue<ShiftStatus>? status;
   final int? workersNeeded;
@@ -56,6 +61,11 @@ class GetShiftByIdShift {
   locationAddress = json['locationAddress'] == null ? null : nativeFromJson<String>(json['locationAddress']),
   latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
   longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
   status = json['status'] == null ? null : shiftStatusDeserializer(json['status']),
   workersNeeded = json['workersNeeded'] == null ? null : nativeFromJson<int>(json['workersNeeded']),
@@ -91,6 +101,11 @@ class GetShiftByIdShift {
     locationAddress == otherTyped.locationAddress && 
     latitude == otherTyped.latitude && 
     longitude == otherTyped.longitude && 
+    placeId == otherTyped.placeId && 
+    city == otherTyped.city && 
+    state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     description == otherTyped.description && 
     status == otherTyped.status && 
     workersNeeded == otherTyped.workersNeeded && 
@@ -105,7 +120,7 @@ class GetShiftByIdShift {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, placeId.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -140,6 +155,21 @@ class GetShiftByIdShift {
     if (longitude != null) {
       json['longitude'] = nativeToJson<double?>(longitude);
     }
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (description != null) {
       json['description'] = nativeToJson<String?>(description);
     }
@@ -189,6 +219,11 @@ class GetShiftByIdShift {
     this.locationAddress,
     this.latitude,
     this.longitude,
+    this.placeId,
+    this.city,
+    this.state,
+    this.street,
+    this.country,
     this.description,
     this.status,
     this.workersNeeded,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_shifts_by_business_id.dart

@@ -51,6 +51,11 @@ class GetShiftsByBusinessIdShifts {
   final String? locationAddress;
   final double? latitude;
   final double? longitude;
+  final String? placeId;
+  final String? city;
+  final String? state;
+  final String? street;
+  final String? country;
   final String? description;
   final EnumValue<ShiftStatus>? status;
   final int? workersNeeded;
@@ -76,6 +81,11 @@ class GetShiftsByBusinessIdShifts {
   locationAddress = json['locationAddress'] == null ? null : nativeFromJson<String>(json['locationAddress']),
   latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
   longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
   status = json['status'] == null ? null : shiftStatusDeserializer(json['status']),
   workersNeeded = json['workersNeeded'] == null ? null : nativeFromJson<int>(json['workersNeeded']),
@@ -111,6 +121,11 @@ class GetShiftsByBusinessIdShifts {
     locationAddress == otherTyped.locationAddress && 
     latitude == otherTyped.latitude && 
     longitude == otherTyped.longitude && 
+    placeId == otherTyped.placeId && 
+    city == otherTyped.city && 
+    state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     description == otherTyped.description && 
     status == otherTyped.status && 
     workersNeeded == otherTyped.workersNeeded && 
@@ -125,7 +140,7 @@ class GetShiftsByBusinessIdShifts {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, placeId.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -160,6 +175,21 @@ class GetShiftsByBusinessIdShifts {
     if (longitude != null) {
       json['longitude'] = nativeToJson<double?>(longitude);
     }
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (description != null) {
       json['description'] = nativeToJson<String?>(description);
     }
@@ -209,6 +239,11 @@ class GetShiftsByBusinessIdShifts {
     this.locationAddress,
     this.latitude,
     this.longitude,
+    this.placeId,
+    this.city,
+    this.state,
+    this.street,
+    this.country,
     this.description,
     this.status,
     this.workersNeeded,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_shifts_by_vendor_id.dart

@@ -51,6 +51,11 @@ class GetShiftsByVendorIdShifts {
   final String? locationAddress;
   final double? latitude;
   final double? longitude;
+  final String? placeId;
+  final String? city;
+  final String? state;
+  final String? street;
+  final String? country;
   final String? description;
   final EnumValue<ShiftStatus>? status;
   final int? workersNeeded;
@@ -76,6 +81,11 @@ class GetShiftsByVendorIdShifts {
   locationAddress = json['locationAddress'] == null ? null : nativeFromJson<String>(json['locationAddress']),
   latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
   longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
   status = json['status'] == null ? null : shiftStatusDeserializer(json['status']),
   workersNeeded = json['workersNeeded'] == null ? null : nativeFromJson<int>(json['workersNeeded']),
@@ -111,6 +121,11 @@ class GetShiftsByVendorIdShifts {
     locationAddress == otherTyped.locationAddress && 
     latitude == otherTyped.latitude && 
     longitude == otherTyped.longitude && 
+    placeId == otherTyped.placeId && 
+    city == otherTyped.city && 
+    state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     description == otherTyped.description && 
     status == otherTyped.status && 
     workersNeeded == otherTyped.workersNeeded && 
@@ -125,7 +140,7 @@ class GetShiftsByVendorIdShifts {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, placeId.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -160,6 +175,21 @@ class GetShiftsByVendorIdShifts {
     if (longitude != null) {
       json['longitude'] = nativeToJson<double?>(longitude);
     }
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (description != null) {
       json['description'] = nativeToJson<String?>(description);
     }
@@ -209,6 +239,11 @@ class GetShiftsByVendorIdShifts {
     this.locationAddress,
     this.latitude,
     this.longitude,
+    this.placeId,
+    this.city,
+    this.state,
+    this.street,
+    this.country,
     this.description,
     this.status,
     this.workersNeeded,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_tax_form_by_id.dart

@@ -21,12 +21,36 @@ class GetTaxFormByIdVariablesBuilder {
 class GetTaxFormByIdTaxForm {
   final String id;
   final EnumValue<TaxFormType> formType;
-  final String title;
+  final String firstName;
-  final String? subtitle;
+  final String lastName;
-  final String? description;
+  final String? mInitial;
+  final String? oLastName;
+  final Timestamp? dob;
+  final int socialSN;
+  final String? email;
+  final String? phone;
+  final String address;
+  final String? city;
+  final String? apt;
+  final String? state;
+  final String? zipCode;
+  final EnumValue<MaritalStatus>? marital;
+  final bool? multipleJob;
+  final int? childrens;
+  final int? otherDeps;
+  final double? totalCredits;
+  final double? otherInconme;
+  final double? deductions;
+  final double? extraWithholding;
+  final EnumValue<CitizenshipStatus>? citizen;
+  final String? uscis;
+  final String? passportNumber;
+  final String? countryIssue;
+  final bool? prepartorOrTranslator;
+  final String? signature;
+  final Timestamp? date;
   final EnumValue<TaxFormStatus> status;
   final String staffId;
-  final AnyValue? formData;
   final Timestamp? createdAt;
   final Timestamp? updatedAt;
   final String? createdBy;
@@ -34,12 +58,36 @@ class GetTaxFormByIdTaxForm {
   
   id = nativeFromJson<String>(json['id']),
   formType = taxFormTypeDeserializer(json['formType']),
-  title = nativeFromJson<String>(json['title']),
+  firstName = nativeFromJson<String>(json['firstName']),
-  subtitle = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']),
+  lastName = nativeFromJson<String>(json['lastName']),
-  description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
+  mInitial = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']),
+  oLastName = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']),
+  dob = json['dob'] == null ? null : Timestamp.fromJson(json['dob']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
+  phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
+  address = nativeFromJson<String>(json['address']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  apt = json['apt'] == null ? null : nativeFromJson<String>(json['apt']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
+  marital = json['marital'] == null ? null : maritalStatusDeserializer(json['marital']),
+  multipleJob = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']),
+  childrens = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']),
+  otherDeps = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']),
+  totalCredits = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']),
+  otherInconme = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']),
+  deductions = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']),
+  extraWithholding = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']),
+  citizen = json['citizen'] == null ? null : citizenshipStatusDeserializer(json['citizen']),
+  uscis = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']),
+  passportNumber = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']),
+  countryIssue = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']),
+  prepartorOrTranslator = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']),
+  signature = json['signature'] == null ? null : nativeFromJson<String>(json['signature']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   status = taxFormStatusDeserializer(json['status']),
   staffId = nativeFromJson<String>(json['staffId']),
-  formData = json['formData'] == null ? null : AnyValue.fromJson(json['formData']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
   createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
@@ -55,19 +103,43 @@ class GetTaxFormByIdTaxForm {
     final GetTaxFormByIdTaxForm otherTyped = other as GetTaxFormByIdTaxForm;
     return id == otherTyped.id && 
     formType == otherTyped.formType && 
-    title == otherTyped.title && 
+    firstName == otherTyped.firstName && 
-    subtitle == otherTyped.subtitle && 
+    lastName == otherTyped.lastName && 
-    description == otherTyped.description && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
     status == otherTyped.status && 
     staffId == otherTyped.staffId && 
-    formData == otherTyped.formData && 
     createdAt == otherTyped.createdAt && 
     updatedAt == otherTyped.updatedAt && 
     createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, title.hashCode, subtitle.hashCode, description.hashCode, status.hashCode, staffId.hashCode, formData.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -76,20 +148,90 @@ class GetTaxFormByIdTaxForm {
     json['formType'] = 
     taxFormTypeSerializer(formType)
     ;
-    json['title'] = nativeToJson<String>(title);
+    json['firstName'] = nativeToJson<String>(firstName);
-    if (subtitle != null) {
+    json['lastName'] = nativeToJson<String>(lastName);
-      json['subtitle'] = nativeToJson<String?>(subtitle);
+    if (mInitial != null) {
+      json['mInitial'] = nativeToJson<String?>(mInitial);
     }
-    if (description != null) {
+    if (oLastName != null) {
-      json['description'] = nativeToJson<String?>(description);
+      json['oLastName'] = nativeToJson<String?>(oLastName);
+    }
+    if (dob != null) {
+      json['dob'] = dob!.toJson();
+    }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if (email != null) {
+      json['email'] = nativeToJson<String?>(email);
+    }
+    if (phone != null) {
+      json['phone'] = nativeToJson<String?>(phone);
+    }
+    json['address'] = nativeToJson<String>(address);
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (apt != null) {
+      json['apt'] = nativeToJson<String?>(apt);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (zipCode != null) {
+      json['zipCode'] = nativeToJson<String?>(zipCode);
+    }
+    if (marital != null) {
+      json['marital'] = 
+    maritalStatusSerializer(marital!)
+    ;
+    }
+    if (multipleJob != null) {
+      json['multipleJob'] = nativeToJson<bool?>(multipleJob);
+    }
+    if (childrens != null) {
+      json['childrens'] = nativeToJson<int?>(childrens);
+    }
+    if (otherDeps != null) {
+      json['otherDeps'] = nativeToJson<int?>(otherDeps);
+    }
+    if (totalCredits != null) {
+      json['totalCredits'] = nativeToJson<double?>(totalCredits);
+    }
+    if (otherInconme != null) {
+      json['otherInconme'] = nativeToJson<double?>(otherInconme);
+    }
+    if (deductions != null) {
+      json['deductions'] = nativeToJson<double?>(deductions);
+    }
+    if (extraWithholding != null) {
+      json['extraWithholding'] = nativeToJson<double?>(extraWithholding);
+    }
+    if (citizen != null) {
+      json['citizen'] = 
+    citizenshipStatusSerializer(citizen!)
+    ;
+    }
+    if (uscis != null) {
+      json['uscis'] = nativeToJson<String?>(uscis);
+    }
+    if (passportNumber != null) {
+      json['passportNumber'] = nativeToJson<String?>(passportNumber);
+    }
+    if (countryIssue != null) {
+      json['countryIssue'] = nativeToJson<String?>(countryIssue);
+    }
+    if (prepartorOrTranslator != null) {
+      json['prepartorOrTranslator'] = nativeToJson<bool?>(prepartorOrTranslator);
+    }
+    if (signature != null) {
+      json['signature'] = nativeToJson<String?>(signature);
+    }
+    if (date != null) {
+      json['date'] = date!.toJson();
     }
     json['status'] = 
     taxFormStatusSerializer(status)
     ;
     json['staffId'] = nativeToJson<String>(staffId);
-    if (formData != null) {
-      json['formData'] = formData!.toJson();
-    }
     if (createdAt != null) {
       json['createdAt'] = createdAt!.toJson();
     }
@@ -105,12 +247,36 @@ class GetTaxFormByIdTaxForm {
   GetTaxFormByIdTaxForm({
     required this.id,
     required this.formType,
-    required this.title,
+    required this.firstName,
-    this.subtitle,
+    required this.lastName,
-    this.description,
+    this.mInitial,
+    this.oLastName,
+    this.dob,
+    required this.socialSN,
+    this.email,
+    this.phone,
+    required this.address,
+    this.city,
+    this.apt,
+    this.state,
+    this.zipCode,
+    this.marital,
+    this.multipleJob,
+    this.childrens,
+    this.otherDeps,
+    this.totalCredits,
+    this.otherInconme,
+    this.deductions,
+    this.extraWithholding,
+    this.citizen,
+    this.uscis,
+    this.passportNumber,
+    this.countryIssue,
+    this.prepartorOrTranslator,
+    this.signature,
+    this.date,
     required this.status,
     required this.staffId,
-    this.formData,
     this.createdAt,
     this.updatedAt,
     this.createdBy,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_tax_forms_by_staff_id.dart

@@ -0,0 +1,389 @@
+part of 'generated.dart';
+
+class GetTaxFormsByStaffIdVariablesBuilder {
+  String staffId;
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
+  final FirebaseDataConnect _dataConnect;  GetTaxFormsByStaffIdVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  GetTaxFormsByStaffIdVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
+
+  GetTaxFormsByStaffIdVariablesBuilder(this._dataConnect, {required  this.staffId,});
+  Deserializer<GetTaxFormsByStaffIdData> dataDeserializer = (dynamic json)  => GetTaxFormsByStaffIdData.fromJson(jsonDecode(json));
+  Serializer<GetTaxFormsByStaffIdVariables> varsSerializer = (GetTaxFormsByStaffIdVariables vars) => jsonEncode(vars.toJson());
+  Future<QueryResult<GetTaxFormsByStaffIdData, GetTaxFormsByStaffIdVariables>> execute() {
+    return ref().execute();
+  }
+
+  QueryRef<GetTaxFormsByStaffIdData, GetTaxFormsByStaffIdVariables> ref() {
+    GetTaxFormsByStaffIdVariables vars= GetTaxFormsByStaffIdVariables(staffId: staffId,offset: _offset,limit: _limit,);
+    return _dataConnect.query("getTaxFormsByStaffId", dataDeserializer, varsSerializer, vars);
+  }
+}
+
+@immutable
+class GetTaxFormsByStaffIdTaxForms {
+  final String id;
+  final EnumValue<TaxFormType> formType;
+  final String firstName;
+  final String lastName;
+  final String? mInitial;
+  final String? oLastName;
+  final Timestamp? dob;
+  final int socialSN;
+  final String? email;
+  final String? phone;
+  final String address;
+  final String? city;
+  final String? apt;
+  final String? state;
+  final String? zipCode;
+  final EnumValue<MaritalStatus>? marital;
+  final bool? multipleJob;
+  final int? childrens;
+  final int? otherDeps;
+  final double? totalCredits;
+  final double? otherInconme;
+  final double? deductions;
+  final double? extraWithholding;
+  final EnumValue<CitizenshipStatus>? citizen;
+  final String? uscis;
+  final String? passportNumber;
+  final String? countryIssue;
+  final bool? prepartorOrTranslator;
+  final String? signature;
+  final Timestamp? date;
+  final EnumValue<TaxFormStatus> status;
+  final String staffId;
+  final Timestamp? createdAt;
+  final Timestamp? updatedAt;
+  final String? createdBy;
+  GetTaxFormsByStaffIdTaxForms.fromJson(dynamic json):
+  
+  id = nativeFromJson<String>(json['id']),
+  formType = taxFormTypeDeserializer(json['formType']),
+  firstName = nativeFromJson<String>(json['firstName']),
+  lastName = nativeFromJson<String>(json['lastName']),
+  mInitial = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']),
+  oLastName = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']),
+  dob = json['dob'] == null ? null : Timestamp.fromJson(json['dob']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
+  phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
+  address = nativeFromJson<String>(json['address']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  apt = json['apt'] == null ? null : nativeFromJson<String>(json['apt']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
+  marital = json['marital'] == null ? null : maritalStatusDeserializer(json['marital']),
+  multipleJob = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']),
+  childrens = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']),
+  otherDeps = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']),
+  totalCredits = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']),
+  otherInconme = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']),
+  deductions = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']),
+  extraWithholding = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']),
+  citizen = json['citizen'] == null ? null : citizenshipStatusDeserializer(json['citizen']),
+  uscis = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']),
+  passportNumber = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']),
+  countryIssue = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']),
+  prepartorOrTranslator = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']),
+  signature = json['signature'] == null ? null : nativeFromJson<String>(json['signature']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
+  status = taxFormStatusDeserializer(json['status']),
+  staffId = nativeFromJson<String>(json['staffId']),
+  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
+  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
+  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetTaxFormsByStaffIdTaxForms otherTyped = other as GetTaxFormsByStaffIdTaxForms;
+    return id == otherTyped.id && 
+    formType == otherTyped.formType && 
+    firstName == otherTyped.firstName && 
+    lastName == otherTyped.lastName && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
+    status == otherTyped.status && 
+    staffId == otherTyped.staffId && 
+    createdAt == otherTyped.createdAt && 
+    updatedAt == otherTyped.updatedAt && 
+    createdBy == otherTyped.createdBy;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['id'] = nativeToJson<String>(id);
+    json['formType'] = 
+    taxFormTypeSerializer(formType)
+    ;
+    json['firstName'] = nativeToJson<String>(firstName);
+    json['lastName'] = nativeToJson<String>(lastName);
+    if (mInitial != null) {
+      json['mInitial'] = nativeToJson<String?>(mInitial);
+    }
+    if (oLastName != null) {
+      json['oLastName'] = nativeToJson<String?>(oLastName);
+    }
+    if (dob != null) {
+      json['dob'] = dob!.toJson();
+    }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if (email != null) {
+      json['email'] = nativeToJson<String?>(email);
+    }
+    if (phone != null) {
+      json['phone'] = nativeToJson<String?>(phone);
+    }
+    json['address'] = nativeToJson<String>(address);
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (apt != null) {
+      json['apt'] = nativeToJson<String?>(apt);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (zipCode != null) {
+      json['zipCode'] = nativeToJson<String?>(zipCode);
+    }
+    if (marital != null) {
+      json['marital'] = 
+    maritalStatusSerializer(marital!)
+    ;
+    }
+    if (multipleJob != null) {
+      json['multipleJob'] = nativeToJson<bool?>(multipleJob);
+    }
+    if (childrens != null) {
+      json['childrens'] = nativeToJson<int?>(childrens);
+    }
+    if (otherDeps != null) {
+      json['otherDeps'] = nativeToJson<int?>(otherDeps);
+    }
+    if (totalCredits != null) {
+      json['totalCredits'] = nativeToJson<double?>(totalCredits);
+    }
+    if (otherInconme != null) {
+      json['otherInconme'] = nativeToJson<double?>(otherInconme);
+    }
+    if (deductions != null) {
+      json['deductions'] = nativeToJson<double?>(deductions);
+    }
+    if (extraWithholding != null) {
+      json['extraWithholding'] = nativeToJson<double?>(extraWithholding);
+    }
+    if (citizen != null) {
+      json['citizen'] = 
+    citizenshipStatusSerializer(citizen!)
+    ;
+    }
+    if (uscis != null) {
+      json['uscis'] = nativeToJson<String?>(uscis);
+    }
+    if (passportNumber != null) {
+      json['passportNumber'] = nativeToJson<String?>(passportNumber);
+    }
+    if (countryIssue != null) {
+      json['countryIssue'] = nativeToJson<String?>(countryIssue);
+    }
+    if (prepartorOrTranslator != null) {
+      json['prepartorOrTranslator'] = nativeToJson<bool?>(prepartorOrTranslator);
+    }
+    if (signature != null) {
+      json['signature'] = nativeToJson<String?>(signature);
+    }
+    if (date != null) {
+      json['date'] = date!.toJson();
+    }
+    json['status'] = 
+    taxFormStatusSerializer(status)
+    ;
+    json['staffId'] = nativeToJson<String>(staffId);
+    if (createdAt != null) {
+      json['createdAt'] = createdAt!.toJson();
+    }
+    if (updatedAt != null) {
+      json['updatedAt'] = updatedAt!.toJson();
+    }
+    if (createdBy != null) {
+      json['createdBy'] = nativeToJson<String?>(createdBy);
+    }
+    return json;
+  }
+
+  GetTaxFormsByStaffIdTaxForms({
+    required this.id,
+    required this.formType,
+    required this.firstName,
+    required this.lastName,
+    this.mInitial,
+    this.oLastName,
+    this.dob,
+    required this.socialSN,
+    this.email,
+    this.phone,
+    required this.address,
+    this.city,
+    this.apt,
+    this.state,
+    this.zipCode,
+    this.marital,
+    this.multipleJob,
+    this.childrens,
+    this.otherDeps,
+    this.totalCredits,
+    this.otherInconme,
+    this.deductions,
+    this.extraWithholding,
+    this.citizen,
+    this.uscis,
+    this.passportNumber,
+    this.countryIssue,
+    this.prepartorOrTranslator,
+    this.signature,
+    this.date,
+    required this.status,
+    required this.staffId,
+    this.createdAt,
+    this.updatedAt,
+    this.createdBy,
+  });
+}
+
+@immutable
+class GetTaxFormsByStaffIdData {
+  final List<GetTaxFormsByStaffIdTaxForms> taxForms;
+  GetTaxFormsByStaffIdData.fromJson(dynamic json):
+  
+  taxForms = (json['taxForms'] as List<dynamic>)
+        .map((e) => GetTaxFormsByStaffIdTaxForms.fromJson(e))
+        .toList();
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetTaxFormsByStaffIdData otherTyped = other as GetTaxFormsByStaffIdData;
+    return taxForms == otherTyped.taxForms;
+    
+  }
+  @override
+  int get hashCode => taxForms.hashCode;
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['taxForms'] = taxForms.map((e) => e.toJson()).toList();
+    return json;
+  }
+
+  GetTaxFormsByStaffIdData({
+    required this.taxForms,
+  });
+}
+
+@immutable
+class GetTaxFormsByStaffIdVariables {
+  final String staffId;
+  late final Optional<int>offset;
+  late final Optional<int>limit;
+  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
+  GetTaxFormsByStaffIdVariables.fromJson(Map<String, dynamic> json):
+  
+  staffId = nativeFromJson<String>(json['staffId']) {
+  
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final GetTaxFormsByStaffIdVariables otherTyped = other as GetTaxFormsByStaffIdVariables;
+    return staffId == otherTyped.staffId && 
+    offset == otherTyped.offset && 
+    limit == otherTyped.limit;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([staffId.hashCode, offset.hashCode, limit.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['staffId'] = nativeToJson<String>(staffId);
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
+    return json;
+  }
+
+  GetTaxFormsByStaffIdVariables({
+    required this.staffId,
+    required this.offset,
+    required this.limit,
+  });
+}
+

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_tax_forms_bystaff_id.dart

@@ -1,190 +0,0 @@
-part of 'generated.dart';
-
-class GetTaxFormsBystaffIdVariablesBuilder {
-  String staffId;
-
-  final FirebaseDataConnect _dataConnect;
-  GetTaxFormsBystaffIdVariablesBuilder(this._dataConnect, {required  this.staffId,});
-  Deserializer<GetTaxFormsBystaffIdData> dataDeserializer = (dynamic json)  => GetTaxFormsBystaffIdData.fromJson(jsonDecode(json));
-  Serializer<GetTaxFormsBystaffIdVariables> varsSerializer = (GetTaxFormsBystaffIdVariables vars) => jsonEncode(vars.toJson());
-  Future<QueryResult<GetTaxFormsBystaffIdData, GetTaxFormsBystaffIdVariables>> execute() {
-    return ref().execute();
-  }
-
-  QueryRef<GetTaxFormsBystaffIdData, GetTaxFormsBystaffIdVariables> ref() {
-    GetTaxFormsBystaffIdVariables vars= GetTaxFormsBystaffIdVariables(staffId: staffId,);
-    return _dataConnect.query("getTaxFormsBystaffId", dataDeserializer, varsSerializer, vars);
-  }
-}
-
-@immutable
-class GetTaxFormsBystaffIdTaxForms {
-  final String id;
-  final EnumValue<TaxFormType> formType;
-  final String title;
-  final String? subtitle;
-  final String? description;
-  final EnumValue<TaxFormStatus> status;
-  final String staffId;
-  final AnyValue? formData;
-  final Timestamp? createdAt;
-  final Timestamp? updatedAt;
-  final String? createdBy;
-  GetTaxFormsBystaffIdTaxForms.fromJson(dynamic json):
-  
-  id = nativeFromJson<String>(json['id']),
-  formType = taxFormTypeDeserializer(json['formType']),
-  title = nativeFromJson<String>(json['title']),
-  subtitle = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']),
-  description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
-  status = taxFormStatusDeserializer(json['status']),
-  staffId = nativeFromJson<String>(json['staffId']),
-  formData = json['formData'] == null ? null : AnyValue.fromJson(json['formData']),
-  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
-  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
-  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final GetTaxFormsBystaffIdTaxForms otherTyped = other as GetTaxFormsBystaffIdTaxForms;
-    return id == otherTyped.id && 
-    formType == otherTyped.formType && 
-    title == otherTyped.title && 
-    subtitle == otherTyped.subtitle && 
-    description == otherTyped.description && 
-    status == otherTyped.status && 
-    staffId == otherTyped.staffId && 
-    formData == otherTyped.formData && 
-    createdAt == otherTyped.createdAt && 
-    updatedAt == otherTyped.updatedAt && 
-    createdBy == otherTyped.createdBy;
-    
-  }
-  @override
-  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, title.hashCode, subtitle.hashCode, description.hashCode, status.hashCode, staffId.hashCode, formData.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['id'] = nativeToJson<String>(id);
-    json['formType'] = 
-    taxFormTypeSerializer(formType)
-    ;
-    json['title'] = nativeToJson<String>(title);
-    if (subtitle != null) {
-      json['subtitle'] = nativeToJson<String?>(subtitle);
-    }
-    if (description != null) {
-      json['description'] = nativeToJson<String?>(description);
-    }
-    json['status'] = 
-    taxFormStatusSerializer(status)
-    ;
-    json['staffId'] = nativeToJson<String>(staffId);
-    if (formData != null) {
-      json['formData'] = formData!.toJson();
-    }
-    if (createdAt != null) {
-      json['createdAt'] = createdAt!.toJson();
-    }
-    if (updatedAt != null) {
-      json['updatedAt'] = updatedAt!.toJson();
-    }
-    if (createdBy != null) {
-      json['createdBy'] = nativeToJson<String?>(createdBy);
-    }
-    return json;
-  }
-
-  GetTaxFormsBystaffIdTaxForms({
-    required this.id,
-    required this.formType,
-    required this.title,
-    this.subtitle,
-    this.description,
-    required this.status,
-    required this.staffId,
-    this.formData,
-    this.createdAt,
-    this.updatedAt,
-    this.createdBy,
-  });
-}
-
-@immutable
-class GetTaxFormsBystaffIdData {
-  final List<GetTaxFormsBystaffIdTaxForms> taxForms;
-  GetTaxFormsBystaffIdData.fromJson(dynamic json):
-  
-  taxForms = (json['taxForms'] as List<dynamic>)
-        .map((e) => GetTaxFormsBystaffIdTaxForms.fromJson(e))
-        .toList();
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final GetTaxFormsBystaffIdData otherTyped = other as GetTaxFormsBystaffIdData;
-    return taxForms == otherTyped.taxForms;
-    
-  }
-  @override
-  int get hashCode => taxForms.hashCode;
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['taxForms'] = taxForms.map((e) => e.toJson()).toList();
-    return json;
-  }
-
-  GetTaxFormsBystaffIdData({
-    required this.taxForms,
-  });
-}
-
-@immutable
-class GetTaxFormsBystaffIdVariables {
-  final String staffId;
-  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
-  GetTaxFormsBystaffIdVariables.fromJson(Map<String, dynamic> json):
-  
-  staffId = nativeFromJson<String>(json['staffId']);
-  @override
-  bool operator ==(Object other) {
-    if(identical(this, other)) {
-      return true;
-    }
-    if(other.runtimeType != runtimeType) {
-      return false;
-    }
-
-    final GetTaxFormsBystaffIdVariables otherTyped = other as GetTaxFormsBystaffIdVariables;
-    return staffId == otherTyped.staffId;
-    
-  }
-  @override
-  int get hashCode => staffId.hashCode;
-  
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> json = {};
-    json['staffId'] = nativeToJson<String>(staffId);
-    return json;
-  }
-
-  GetTaxFormsBystaffIdVariables({
-    required this.staffId,
-  });
-}
-

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_team_hub_by_id.dart

@@ -23,30 +23,34 @@ class GetTeamHubByIdTeamHub {
   final String teamId;
   final String hubName;
   final String address;
+  final String? placeId;
+  final double? latitude;
+  final double? longitude;
   final String? city;
   final String? state;
+  final String? street;
+  final String? country;
   final String? zipCode;
   final String? managerName;
   final bool isActive;
   final AnyValue? departments;
-  final Timestamp? createdAt;
-  final Timestamp? updatedAt;
-  final String? createdBy;
   GetTeamHubByIdTeamHub.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   teamId = nativeFromJson<String>(json['teamId']),
   hubName = nativeFromJson<String>(json['hubName']),
   address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
+  longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
   city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
   state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
   managerName = json['managerName'] == null ? null : nativeFromJson<String>(json['managerName']),
   isActive = nativeFromJson<bool>(json['isActive']),
-  departments = json['departments'] == null ? null : AnyValue.fromJson(json['departments']),
+  departments = json['departments'] == null ? null : AnyValue.fromJson(json['departments']);
-  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
-  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
-  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -61,19 +65,21 @@ class GetTeamHubByIdTeamHub {
     teamId == otherTyped.teamId && 
     hubName == otherTyped.hubName && 
     address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    latitude == otherTyped.latitude && 
+    longitude == otherTyped.longitude && 
     city == otherTyped.city && 
     state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     zipCode == otherTyped.zipCode && 
     managerName == otherTyped.managerName && 
     isActive == otherTyped.isActive && 
-    departments == otherTyped.departments && 
+    departments == otherTyped.departments;
-    createdAt == otherTyped.createdAt && 
-    updatedAt == otherTyped.updatedAt && 
-    createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, city.hashCode, state.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, placeId.hashCode, latitude.hashCode, longitude.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -82,12 +88,27 @@ class GetTeamHubByIdTeamHub {
     json['teamId'] = nativeToJson<String>(teamId);
     json['hubName'] = nativeToJson<String>(hubName);
     json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (latitude != null) {
+      json['latitude'] = nativeToJson<double?>(latitude);
+    }
+    if (longitude != null) {
+      json['longitude'] = nativeToJson<double?>(longitude);
+    }
     if (city != null) {
       json['city'] = nativeToJson<String?>(city);
     }
     if (state != null) {
       json['state'] = nativeToJson<String?>(state);
     }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (zipCode != null) {
       json['zipCode'] = nativeToJson<String?>(zipCode);
     }
@@ -98,15 +119,6 @@ class GetTeamHubByIdTeamHub {
     if (departments != null) {
       json['departments'] = departments!.toJson();
     }
-    if (createdAt != null) {
-      json['createdAt'] = createdAt!.toJson();
-    }
-    if (updatedAt != null) {
-      json['updatedAt'] = updatedAt!.toJson();
-    }
-    if (createdBy != null) {
-      json['createdBy'] = nativeToJson<String?>(createdBy);
-    }
     return json;
   }
 
@@ -115,15 +127,17 @@ class GetTeamHubByIdTeamHub {
     required this.teamId,
     required this.hubName,
     required this.address,
+    this.placeId,
+    this.latitude,
+    this.longitude,
     this.city,
     this.state,
+    this.street,
+    this.country,
     this.zipCode,
     this.managerName,
     required this.isActive,
     this.departments,
-    this.createdAt,
-    this.updatedAt,
-    this.createdBy,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/get_team_hubs_by_team_id.dart

@@ -2,8 +2,18 @@ part of 'generated.dart';
 
 class GetTeamHubsByTeamIdVariablesBuilder {
   String teamId;
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
+  final FirebaseDataConnect _dataConnect;  GetTeamHubsByTeamIdVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  GetTeamHubsByTeamIdVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
 
-  final FirebaseDataConnect _dataConnect;
   GetTeamHubsByTeamIdVariablesBuilder(this._dataConnect, {required  this.teamId,});
   Deserializer<GetTeamHubsByTeamIdData> dataDeserializer = (dynamic json)  => GetTeamHubsByTeamIdData.fromJson(jsonDecode(json));
   Serializer<GetTeamHubsByTeamIdVariables> varsSerializer = (GetTeamHubsByTeamIdVariables vars) => jsonEncode(vars.toJson());
@@ -12,7 +22,7 @@ class GetTeamHubsByTeamIdVariablesBuilder {
   }
 
   QueryRef<GetTeamHubsByTeamIdData, GetTeamHubsByTeamIdVariables> ref() {
-    GetTeamHubsByTeamIdVariables vars= GetTeamHubsByTeamIdVariables(teamId: teamId,);
+    GetTeamHubsByTeamIdVariables vars= GetTeamHubsByTeamIdVariables(teamId: teamId,offset: _offset,limit: _limit,);
     return _dataConnect.query("getTeamHubsByTeamId", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -23,30 +33,34 @@ class GetTeamHubsByTeamIdTeamHubs {
   final String teamId;
   final String hubName;
   final String address;
+  final String? placeId;
+  final double? latitude;
+  final double? longitude;
   final String? city;
   final String? state;
+  final String? street;
+  final String? country;
   final String? zipCode;
   final String? managerName;
   final bool isActive;
   final AnyValue? departments;
-  final Timestamp? createdAt;
-  final Timestamp? updatedAt;
-  final String? createdBy;
   GetTeamHubsByTeamIdTeamHubs.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   teamId = nativeFromJson<String>(json['teamId']),
   hubName = nativeFromJson<String>(json['hubName']),
   address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
+  longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
   city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
   state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
   managerName = json['managerName'] == null ? null : nativeFromJson<String>(json['managerName']),
   isActive = nativeFromJson<bool>(json['isActive']),
-  departments = json['departments'] == null ? null : AnyValue.fromJson(json['departments']),
+  departments = json['departments'] == null ? null : AnyValue.fromJson(json['departments']);
-  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
-  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
-  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -61,19 +75,21 @@ class GetTeamHubsByTeamIdTeamHubs {
     teamId == otherTyped.teamId && 
     hubName == otherTyped.hubName && 
     address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    latitude == otherTyped.latitude && 
+    longitude == otherTyped.longitude && 
     city == otherTyped.city && 
     state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     zipCode == otherTyped.zipCode && 
     managerName == otherTyped.managerName && 
     isActive == otherTyped.isActive && 
-    departments == otherTyped.departments && 
+    departments == otherTyped.departments;
-    createdAt == otherTyped.createdAt && 
-    updatedAt == otherTyped.updatedAt && 
-    createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, city.hashCode, state.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, placeId.hashCode, latitude.hashCode, longitude.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -82,12 +98,27 @@ class GetTeamHubsByTeamIdTeamHubs {
     json['teamId'] = nativeToJson<String>(teamId);
     json['hubName'] = nativeToJson<String>(hubName);
     json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (latitude != null) {
+      json['latitude'] = nativeToJson<double?>(latitude);
+    }
+    if (longitude != null) {
+      json['longitude'] = nativeToJson<double?>(longitude);
+    }
     if (city != null) {
       json['city'] = nativeToJson<String?>(city);
     }
     if (state != null) {
       json['state'] = nativeToJson<String?>(state);
     }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (zipCode != null) {
       json['zipCode'] = nativeToJson<String?>(zipCode);
     }
@@ -98,15 +129,6 @@ class GetTeamHubsByTeamIdTeamHubs {
     if (departments != null) {
       json['departments'] = departments!.toJson();
     }
-    if (createdAt != null) {
-      json['createdAt'] = createdAt!.toJson();
-    }
-    if (updatedAt != null) {
-      json['updatedAt'] = updatedAt!.toJson();
-    }
-    if (createdBy != null) {
-      json['createdBy'] = nativeToJson<String?>(createdBy);
-    }
     return json;
   }
 
@@ -115,15 +137,17 @@ class GetTeamHubsByTeamIdTeamHubs {
     required this.teamId,
     required this.hubName,
     required this.address,
+    this.placeId,
+    this.latitude,
+    this.longitude,
     this.city,
     this.state,
+    this.street,
+    this.country,
     this.zipCode,
     this.managerName,
     required this.isActive,
     this.departments,
-    this.createdAt,
-    this.updatedAt,
-    this.createdBy,
   });
 }
 
@@ -166,10 +190,23 @@ class GetTeamHubsByTeamIdData {
 @immutable
 class GetTeamHubsByTeamIdVariables {
   final String teamId;
+  late final Optional<int>offset;
+  late final Optional<int>limit;
   @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
   GetTeamHubsByTeamIdVariables.fromJson(Map<String, dynamic> json):
   
-  teamId = nativeFromJson<String>(json['teamId']);
+  teamId = nativeFromJson<String>(json['teamId']) {
+  
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -180,21 +217,31 @@ class GetTeamHubsByTeamIdVariables {
     }
 
     final GetTeamHubsByTeamIdVariables otherTyped = other as GetTeamHubsByTeamIdVariables;
-    return teamId == otherTyped.teamId;
+    return teamId == otherTyped.teamId && 
+    offset == otherTyped.offset && 
+    limit == otherTyped.limit;
     
   }
   @override
-  int get hashCode => teamId.hashCode;
+  int get hashCode => Object.hashAll([teamId.hashCode, offset.hashCode, limit.hashCode]);
   
 
   Map<String, dynamic> toJson() {
     Map<String, dynamic> json = {};
     json['teamId'] = nativeToJson<String>(teamId);
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
     return json;
   }
 
   GetTeamHubsByTeamIdVariables({
     required this.teamId,
+    required this.offset,
+    required this.limit,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_accepted_applications_by_business_for_day.dart

@@ -106,13 +106,15 @@ class ListAcceptedApplicationsByBusinessForDayApplicationsStaff {
   final String? email;
   final String? phone;
   final String? photoUrl;
+  final double? averageRating;
   ListAcceptedApplicationsByBusinessForDayApplicationsStaff.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   fullName = nativeFromJson<String>(json['fullName']),
   email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
   phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
-  photoUrl = json['photoUrl'] == null ? null : nativeFromJson<String>(json['photoUrl']);
+  photoUrl = json['photoUrl'] == null ? null : nativeFromJson<String>(json['photoUrl']),
+  averageRating = json['averageRating'] == null ? null : nativeFromJson<double>(json['averageRating']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -127,11 +129,12 @@ class ListAcceptedApplicationsByBusinessForDayApplicationsStaff {
     fullName == otherTyped.fullName && 
     email == otherTyped.email && 
     phone == otherTyped.phone && 
-    photoUrl == otherTyped.photoUrl;
+    photoUrl == otherTyped.photoUrl && 
+    averageRating == otherTyped.averageRating;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, fullName.hashCode, email.hashCode, phone.hashCode, photoUrl.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, fullName.hashCode, email.hashCode, phone.hashCode, photoUrl.hashCode, averageRating.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -147,6 +150,9 @@ class ListAcceptedApplicationsByBusinessForDayApplicationsStaff {
     if (photoUrl != null) {
       json['photoUrl'] = nativeToJson<String?>(photoUrl);
     }
+    if (averageRating != null) {
+      json['averageRating'] = nativeToJson<double?>(averageRating);
+    }
     return json;
   }
 
@@ -156,6 +162,7 @@ class ListAcceptedApplicationsByBusinessForDayApplicationsStaff {
     this.email,
     this.phone,
     this.photoUrl,
+    this.averageRating,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_applications.dart

@@ -197,14 +197,14 @@ class ListApplicationsApplicationsShift {
 class ListApplicationsApplicationsShiftOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListApplicationsApplicationsShiftOrderTeamHub teamHub;
   final ListApplicationsApplicationsShiftOrderBusiness business;
   final ListApplicationsApplicationsShiftOrderVendor? vendor;
   ListApplicationsApplicationsShiftOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
+  teamHub = ListApplicationsApplicationsShiftOrderTeamHub.fromJson(json['teamHub']),
   business = ListApplicationsApplicationsShiftOrderBusiness.fromJson(json['business']),
   vendor = json['vendor'] == null ? null : ListApplicationsApplicationsShiftOrderVendor.fromJson(json['vendor']);
   @override
@@ -219,13 +219,13 @@ class ListApplicationsApplicationsShiftOrder {
     final ListApplicationsApplicationsShiftOrder otherTyped = other as ListApplicationsApplicationsShiftOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location && 
+    teamHub == otherTyped.teamHub && 
     business == otherTyped.business && 
     vendor == otherTyped.vendor;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode, business.hashCode, vendor.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -234,9 +234,7 @@ class ListApplicationsApplicationsShiftOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['business'] = business.toJson();
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
@@ -247,12 +245,58 @@ class ListApplicationsApplicationsShiftOrder {
   ListApplicationsApplicationsShiftOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
     required this.business,
     this.vendor,
   });
 }
 
+@immutable
+class ListApplicationsApplicationsShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListApplicationsApplicationsShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListApplicationsApplicationsShiftOrderTeamHub otherTyped = other as ListApplicationsApplicationsShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListApplicationsApplicationsShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class ListApplicationsApplicationsShiftOrderBusiness {
   final String id;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices.dart

@@ -331,15 +331,15 @@ class ListInvoicesInvoicesBusiness {
 @immutable
 class ListInvoicesInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesInvoicesOrderTeamHub teamHub;
   ListInvoicesInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesInvoicesOrder {
 
     final ListInvoicesInvoicesOrder otherTyped = other as ListInvoicesInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesInvoicesOrderTeamHub otherTyped = other as ListInvoicesInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices_by_business_id.dart

@@ -331,15 +331,15 @@ class ListInvoicesByBusinessIdInvoicesBusiness {
 @immutable
 class ListInvoicesByBusinessIdInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesByBusinessIdInvoicesOrderTeamHub teamHub;
   ListInvoicesByBusinessIdInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesByBusinessIdInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesByBusinessIdInvoicesOrder {
 
     final ListInvoicesByBusinessIdInvoicesOrder otherTyped = other as ListInvoicesByBusinessIdInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesByBusinessIdInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesByBusinessIdInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesByBusinessIdInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesByBusinessIdInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesByBusinessIdInvoicesOrderTeamHub otherTyped = other as ListInvoicesByBusinessIdInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesByBusinessIdInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices_by_order_id.dart

@@ -331,15 +331,15 @@ class ListInvoicesByOrderIdInvoicesBusiness {
 @immutable
 class ListInvoicesByOrderIdInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesByOrderIdInvoicesOrderTeamHub teamHub;
   ListInvoicesByOrderIdInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesByOrderIdInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesByOrderIdInvoicesOrder {
 
     final ListInvoicesByOrderIdInvoicesOrder otherTyped = other as ListInvoicesByOrderIdInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesByOrderIdInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesByOrderIdInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesByOrderIdInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesByOrderIdInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesByOrderIdInvoicesOrderTeamHub otherTyped = other as ListInvoicesByOrderIdInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesByOrderIdInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices_by_status.dart

@@ -331,15 +331,15 @@ class ListInvoicesByStatusInvoicesBusiness {
 @immutable
 class ListInvoicesByStatusInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesByStatusInvoicesOrderTeamHub teamHub;
   ListInvoicesByStatusInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesByStatusInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesByStatusInvoicesOrder {
 
     final ListInvoicesByStatusInvoicesOrder otherTyped = other as ListInvoicesByStatusInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesByStatusInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesByStatusInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesByStatusInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesByStatusInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesByStatusInvoicesOrderTeamHub otherTyped = other as ListInvoicesByStatusInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesByStatusInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_invoices_by_vendor_id.dart

@@ -331,15 +331,15 @@ class ListInvoicesByVendorIdInvoicesBusiness {
 @immutable
 class ListInvoicesByVendorIdInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListInvoicesByVendorIdInvoicesOrderTeamHub teamHub;
   ListInvoicesByVendorIdInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListInvoicesByVendorIdInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListInvoicesByVendorIdInvoicesOrder {
 
     final ListInvoicesByVendorIdInvoicesOrder otherTyped = other as ListInvoicesByVendorIdInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListInvoicesByVendorIdInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListInvoicesByVendorIdInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListInvoicesByVendorIdInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListInvoicesByVendorIdInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListInvoicesByVendorIdInvoicesOrderTeamHub otherTyped = other as ListInvoicesByVendorIdInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListInvoicesByVendorIdInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_orders.dart

@@ -34,7 +34,6 @@ class ListOrdersOrders {
   final String? vendorId;
   final String businessId;
   final EnumValue<OrderType> orderType;
-  final String? location;
   final EnumValue<OrderStatus> status;
   final Timestamp? date;
   final Timestamp? startDate;
@@ -45,7 +44,6 @@ class ListOrdersOrders {
   final AnyValue? assignedStaff;
   final AnyValue? shifts;
   final int? requested;
-  final String? hub;
   final AnyValue? recurringDays;
   final AnyValue? permanentDays;
   final String? poReference;
@@ -54,6 +52,7 @@ class ListOrdersOrders {
   final Timestamp? createdAt;
   final ListOrdersOrdersBusiness business;
   final ListOrdersOrdersVendor? vendor;
+  final ListOrdersOrdersTeamHub teamHub;
   ListOrdersOrders.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
@@ -61,7 +60,6 @@ class ListOrdersOrders {
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
   businessId = nativeFromJson<String>(json['businessId']),
   orderType = orderTypeDeserializer(json['orderType']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']),
   status = orderStatusDeserializer(json['status']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
@@ -72,7 +70,6 @@ class ListOrdersOrders {
   assignedStaff = json['assignedStaff'] == null ? null : AnyValue.fromJson(json['assignedStaff']),
   shifts = json['shifts'] == null ? null : AnyValue.fromJson(json['shifts']),
   requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   recurringDays = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']),
   permanentDays = json['permanentDays'] == null ? null : AnyValue.fromJson(json['permanentDays']),
   poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
@@ -80,7 +77,8 @@ class ListOrdersOrders {
   notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   business = ListOrdersOrdersBusiness.fromJson(json['business']),
-  vendor = json['vendor'] == null ? null : ListOrdersOrdersVendor.fromJson(json['vendor']);
+  vendor = json['vendor'] == null ? null : ListOrdersOrdersVendor.fromJson(json['vendor']),
+  teamHub = ListOrdersOrdersTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -96,7 +94,6 @@ class ListOrdersOrders {
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
     orderType == otherTyped.orderType && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -107,7 +104,6 @@ class ListOrdersOrders {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     poReference == otherTyped.poReference && 
@@ -115,11 +111,12 @@ class ListOrdersOrders {
     notes == otherTyped.notes && 
     createdAt == otherTyped.createdAt && 
     business == otherTyped.business && 
-    vendor == otherTyped.vendor;
+    vendor == otherTyped.vendor && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, vendorId.hashCode, businessId.hashCode, orderType.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, duration.hashCode, lunchBreak.hashCode, total.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, recurringDays.hashCode, permanentDays.hashCode, poReference.hashCode, detectedConflicts.hashCode, notes.hashCode, createdAt.hashCode, business.hashCode, vendor.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -135,9 +132,6 @@ class ListOrdersOrders {
     json['orderType'] = 
     orderTypeSerializer(orderType)
     ;
-    if (location != null) {
-      json['location'] = nativeToJson<String?>(location);
-    }
     json['status'] = 
     orderStatusSerializer(status)
     ;
@@ -170,9 +164,6 @@ class ListOrdersOrders {
     if (requested != null) {
       json['requested'] = nativeToJson<int?>(requested);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (recurringDays != null) {
       json['recurringDays'] = recurringDays!.toJson();
     }
@@ -195,6 +186,7 @@ class ListOrdersOrders {
     if (vendor != null) {
       json['vendor'] = vendor!.toJson();
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
@@ -204,7 +196,6 @@ class ListOrdersOrders {
     this.vendorId,
     required this.businessId,
     required this.orderType,
-    this.location,
     required this.status,
     this.date,
     this.startDate,
@@ -215,7 +206,6 @@ class ListOrdersOrders {
     this.assignedStaff,
     this.shifts,
     this.requested,
-    this.hub,
     this.recurringDays,
     this.permanentDays,
     this.poReference,
@@ -224,6 +214,7 @@ class ListOrdersOrders {
     this.createdAt,
     required this.business,
     this.vendor,
+    required this.teamHub,
   });
 }
 
@@ -319,6 +310,52 @@ class ListOrdersOrdersVendor {
   });
 }
 
+@immutable
+class ListOrdersOrdersTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListOrdersOrdersTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListOrdersOrdersTeamHub otherTyped = other as ListOrdersOrdersTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListOrdersOrdersTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
+  });
+}
+
 @immutable
 class ListOrdersData {
   final List<ListOrdersOrders> orders;

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_orders_by_business_and_team_hub.dart

@@ -0,0 +1,274 @@
+part of 'generated.dart';
+
+class ListOrdersByBusinessAndTeamHubVariablesBuilder {
+  String businessId;
+  String teamHubId;
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
+  final FirebaseDataConnect _dataConnect;  ListOrdersByBusinessAndTeamHubVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  ListOrdersByBusinessAndTeamHubVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
+
+  ListOrdersByBusinessAndTeamHubVariablesBuilder(this._dataConnect, {required  this.businessId,required  this.teamHubId,});
+  Deserializer<ListOrdersByBusinessAndTeamHubData> dataDeserializer = (dynamic json)  => ListOrdersByBusinessAndTeamHubData.fromJson(jsonDecode(json));
+  Serializer<ListOrdersByBusinessAndTeamHubVariables> varsSerializer = (ListOrdersByBusinessAndTeamHubVariables vars) => jsonEncode(vars.toJson());
+  Future<QueryResult<ListOrdersByBusinessAndTeamHubData, ListOrdersByBusinessAndTeamHubVariables>> execute() {
+    return ref().execute();
+  }
+
+  QueryRef<ListOrdersByBusinessAndTeamHubData, ListOrdersByBusinessAndTeamHubVariables> ref() {
+    ListOrdersByBusinessAndTeamHubVariables vars= ListOrdersByBusinessAndTeamHubVariables(businessId: businessId,teamHubId: teamHubId,offset: _offset,limit: _limit,);
+    return _dataConnect.query("listOrdersByBusinessAndTeamHub", dataDeserializer, varsSerializer, vars);
+  }
+}
+
+@immutable
+class ListOrdersByBusinessAndTeamHubOrders {
+  final String id;
+  final String? eventName;
+  final EnumValue<OrderType> orderType;
+  final EnumValue<OrderStatus> status;
+  final EnumValue<OrderDuration>? duration;
+  final String businessId;
+  final String? vendorId;
+  final String teamHubId;
+  final Timestamp? date;
+  final Timestamp? startDate;
+  final Timestamp? endDate;
+  final int? requested;
+  final double? total;
+  final String? notes;
+  final Timestamp? createdAt;
+  final Timestamp? updatedAt;
+  final String? createdBy;
+  ListOrdersByBusinessAndTeamHubOrders.fromJson(dynamic json):
+  
+  id = nativeFromJson<String>(json['id']),
+  eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
+  orderType = orderTypeDeserializer(json['orderType']),
+  status = orderStatusDeserializer(json['status']),
+  duration = json['duration'] == null ? null : orderDurationDeserializer(json['duration']),
+  businessId = nativeFromJson<String>(json['businessId']),
+  vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
+  teamHubId = nativeFromJson<String>(json['teamHubId']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
+  startDate = json['startDate'] == null ? null : Timestamp.fromJson(json['startDate']),
+  endDate = json['endDate'] == null ? null : Timestamp.fromJson(json['endDate']),
+  requested = json['requested'] == null ? null : nativeFromJson<int>(json['requested']),
+  total = json['total'] == null ? null : nativeFromJson<double>(json['total']),
+  notes = json['notes'] == null ? null : nativeFromJson<String>(json['notes']),
+  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
+  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
+  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListOrdersByBusinessAndTeamHubOrders otherTyped = other as ListOrdersByBusinessAndTeamHubOrders;
+    return id == otherTyped.id && 
+    eventName == otherTyped.eventName && 
+    orderType == otherTyped.orderType && 
+    status == otherTyped.status && 
+    duration == otherTyped.duration && 
+    businessId == otherTyped.businessId && 
+    vendorId == otherTyped.vendorId && 
+    teamHubId == otherTyped.teamHubId && 
+    date == otherTyped.date && 
+    startDate == otherTyped.startDate && 
+    endDate == otherTyped.endDate && 
+    requested == otherTyped.requested && 
+    total == otherTyped.total && 
+    notes == otherTyped.notes && 
+    createdAt == otherTyped.createdAt && 
+    updatedAt == otherTyped.updatedAt && 
+    createdBy == otherTyped.createdBy;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, orderType.hashCode, status.hashCode, duration.hashCode, businessId.hashCode, vendorId.hashCode, teamHubId.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, requested.hashCode, total.hashCode, notes.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['id'] = nativeToJson<String>(id);
+    if (eventName != null) {
+      json['eventName'] = nativeToJson<String?>(eventName);
+    }
+    json['orderType'] = 
+    orderTypeSerializer(orderType)
+    ;
+    json['status'] = 
+    orderStatusSerializer(status)
+    ;
+    if (duration != null) {
+      json['duration'] = 
+    orderDurationSerializer(duration!)
+    ;
+    }
+    json['businessId'] = nativeToJson<String>(businessId);
+    if (vendorId != null) {
+      json['vendorId'] = nativeToJson<String?>(vendorId);
+    }
+    json['teamHubId'] = nativeToJson<String>(teamHubId);
+    if (date != null) {
+      json['date'] = date!.toJson();
+    }
+    if (startDate != null) {
+      json['startDate'] = startDate!.toJson();
+    }
+    if (endDate != null) {
+      json['endDate'] = endDate!.toJson();
+    }
+    if (requested != null) {
+      json['requested'] = nativeToJson<int?>(requested);
+    }
+    if (total != null) {
+      json['total'] = nativeToJson<double?>(total);
+    }
+    if (notes != null) {
+      json['notes'] = nativeToJson<String?>(notes);
+    }
+    if (createdAt != null) {
+      json['createdAt'] = createdAt!.toJson();
+    }
+    if (updatedAt != null) {
+      json['updatedAt'] = updatedAt!.toJson();
+    }
+    if (createdBy != null) {
+      json['createdBy'] = nativeToJson<String?>(createdBy);
+    }
+    return json;
+  }
+
+  ListOrdersByBusinessAndTeamHubOrders({
+    required this.id,
+    this.eventName,
+    required this.orderType,
+    required this.status,
+    this.duration,
+    required this.businessId,
+    this.vendorId,
+    required this.teamHubId,
+    this.date,
+    this.startDate,
+    this.endDate,
+    this.requested,
+    this.total,
+    this.notes,
+    this.createdAt,
+    this.updatedAt,
+    this.createdBy,
+  });
+}
+
+@immutable
+class ListOrdersByBusinessAndTeamHubData {
+  final List<ListOrdersByBusinessAndTeamHubOrders> orders;
+  ListOrdersByBusinessAndTeamHubData.fromJson(dynamic json):
+  
+  orders = (json['orders'] as List<dynamic>)
+        .map((e) => ListOrdersByBusinessAndTeamHubOrders.fromJson(e))
+        .toList();
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListOrdersByBusinessAndTeamHubData otherTyped = other as ListOrdersByBusinessAndTeamHubData;
+    return orders == otherTyped.orders;
+    
+  }
+  @override
+  int get hashCode => orders.hashCode;
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['orders'] = orders.map((e) => e.toJson()).toList();
+    return json;
+  }
+
+  ListOrdersByBusinessAndTeamHubData({
+    required this.orders,
+  });
+}
+
+@immutable
+class ListOrdersByBusinessAndTeamHubVariables {
+  final String businessId;
+  final String teamHubId;
+  late final Optional<int>offset;
+  late final Optional<int>limit;
+  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
+  ListOrdersByBusinessAndTeamHubVariables.fromJson(Map<String, dynamic> json):
+  
+  businessId = nativeFromJson<String>(json['businessId']),
+  teamHubId = nativeFromJson<String>(json['teamHubId']) {
+  
+  
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListOrdersByBusinessAndTeamHubVariables otherTyped = other as ListOrdersByBusinessAndTeamHubVariables;
+    return businessId == otherTyped.businessId && 
+    teamHubId == otherTyped.teamHubId && 
+    offset == otherTyped.offset && 
+    limit == otherTyped.limit;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([businessId.hashCode, teamHubId.hashCode, offset.hashCode, limit.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['businessId'] = nativeToJson<String>(businessId);
+    json['teamHubId'] = nativeToJson<String>(teamHubId);
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
+    return json;
+  }
+
+  ListOrdersByBusinessAndTeamHubVariables({
+    required this.businessId,
+    required this.teamHubId,
+    required this.offset,
+    required this.limit,
+  });
+}
+

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_overdue_invoices.dart

@@ -331,15 +331,15 @@ class ListOverdueInvoicesInvoicesBusiness {
 @immutable
 class ListOverdueInvoicesInvoicesOrder {
   final String? eventName;
-  final String? hub;
   final String? deparment;
   final String? poReference;
+  final ListOverdueInvoicesInvoicesOrderTeamHub teamHub;
   ListOverdueInvoicesInvoicesOrder.fromJson(dynamic json):
   
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  hub = json['hub'] == null ? null : nativeFromJson<String>(json['hub']),
   deparment = json['deparment'] == null ? null : nativeFromJson<String>(json['deparment']),
-  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']);
+  poReference = json['poReference'] == null ? null : nativeFromJson<String>(json['poReference']),
+  teamHub = ListOverdueInvoicesInvoicesOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -351,13 +351,13 @@ class ListOverdueInvoicesInvoicesOrder {
 
     final ListOverdueInvoicesInvoicesOrder otherTyped = other as ListOverdueInvoicesInvoicesOrder;
     return eventName == otherTyped.eventName && 
-    hub == otherTyped.hub && 
     deparment == otherTyped.deparment && 
-    poReference == otherTyped.poReference;
+    poReference == otherTyped.poReference && 
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([eventName.hashCode, hub.hashCode, deparment.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([eventName.hashCode, deparment.hashCode, poReference.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -365,23 +365,67 @@ class ListOverdueInvoicesInvoicesOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (hub != null) {
-      json['hub'] = nativeToJson<String?>(hub);
-    }
     if (deparment != null) {
       json['deparment'] = nativeToJson<String?>(deparment);
     }
     if (poReference != null) {
       json['poReference'] = nativeToJson<String?>(poReference);
     }
+    json['teamHub'] = teamHub.toJson();
     return json;
   }
 
   ListOverdueInvoicesInvoicesOrder({
     this.eventName,
-    this.hub,
     this.deparment,
     this.poReference,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListOverdueInvoicesInvoicesOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListOverdueInvoicesInvoicesOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListOverdueInvoicesInvoicesOrderTeamHub otherTyped = other as ListOverdueInvoicesInvoicesOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListOverdueInvoicesInvoicesOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_application_id.dart

@@ -467,12 +467,12 @@ class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -485,11 +485,11 @@ class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -498,16 +498,60 @@ class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByApplicationIdRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_business_id.dart

@@ -517,12 +517,12 @@ class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -535,11 +535,11 @@ class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -548,16 +548,60 @@ class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByBusinessIdRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_invoice_id.dart

@@ -465,12 +465,12 @@ class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -483,11 +483,11 @@ class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -496,16 +496,60 @@ class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByInvoiceIdRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_invoice_ids.dart

@@ -460,12 +460,12 @@ class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -478,11 +478,11 @@ class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -491,16 +491,60 @@ class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByInvoiceIdsRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_staff_id.dart

@@ -491,12 +491,12 @@ class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -509,11 +509,11 @@ class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -522,16 +522,60 @@ class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByStaffIdRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_recent_payments_by_status.dart

@@ -460,12 +460,12 @@ class ListRecentPaymentsByStatusRecentPaymentsInvoiceVendor {
 class ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder {
   final String id;
   final String? eventName;
-  final String? location;
+  final ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub teamHub;
   ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -478,11 +478,11 @@ class ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder {
     final ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder otherTyped = other as ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder;
     return id == otherTyped.id && 
     eventName == otherTyped.eventName && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -491,16 +491,60 @@ class ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder {
     if (eventName != null) {
       json['eventName'] = nativeToJson<String?>(eventName);
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListRecentPaymentsByStatusRecentPaymentsInvoiceOrder({
     required this.id,
     this.eventName,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub otherTyped = other as ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListRecentPaymentsByStatusRecentPaymentsInvoiceOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_shift_roles_by_business_and_date_range.dart

@@ -239,9 +239,11 @@ class ListShiftRolesByBusinessAndDateRangeShiftRolesShift {
 @immutable
 class ListShiftRolesByBusinessAndDateRangeShiftRolesShiftOrder {
   final String id;
+  final String? eventName;
   ListShiftRolesByBusinessAndDateRangeShiftRolesShiftOrder.fromJson(dynamic json):
   
-  id = nativeFromJson<String>(json['id']);
+  id = nativeFromJson<String>(json['id']),
+  eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -252,21 +254,26 @@ class ListShiftRolesByBusinessAndDateRangeShiftRolesShiftOrder {
     }
 
     final ListShiftRolesByBusinessAndDateRangeShiftRolesShiftOrder otherTyped = other as ListShiftRolesByBusinessAndDateRangeShiftRolesShiftOrder;
-    return id == otherTyped.id;
+    return id == otherTyped.id && 
+    eventName == otherTyped.eventName;
     
   }
   @override
-  int get hashCode => id.hashCode;
+  int get hashCode => Object.hashAll([id.hashCode, eventName.hashCode]);
   
 
   Map<String, dynamic> toJson() {
     Map<String, dynamic> json = {};
     json['id'] = nativeToJson<String>(id);
+    if (eventName != null) {
+      json['eventName'] = nativeToJson<String?>(eventName);
+    }
     return json;
   }
 
   ListShiftRolesByBusinessAndDateRangeShiftRolesShiftOrder({
     required this.id,
+    this.eventName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_shift_roles_by_business_and_order.dart

@@ -255,13 +255,15 @@ class ListShiftRolesByBusinessAndOrderShiftRolesShift {
 @immutable
 class ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder {
   final String? vendorId;
+  final String? eventName;
   final Timestamp? date;
-  final String? location;
+  final ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub teamHub;
   ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder.fromJson(dynamic json):
   
   vendorId = json['vendorId'] == null ? null : nativeFromJson<String>(json['vendorId']),
+  eventName = json['eventName'] == null ? null : nativeFromJson<String>(json['eventName']),
   date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
-  location = json['location'] == null ? null : nativeFromJson<String>(json['location']);
+  teamHub = ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub.fromJson(json['teamHub']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -273,12 +275,13 @@ class ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder {
 
     final ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder otherTyped = other as ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder;
     return vendorId == otherTyped.vendorId && 
+    eventName == otherTyped.eventName && 
     date == otherTyped.date && 
-    location == otherTyped.location;
+    teamHub == otherTyped.teamHub;
     
   }
   @override
-  int get hashCode => Object.hashAll([vendorId.hashCode, date.hashCode, location.hashCode]);
+  int get hashCode => Object.hashAll([vendorId.hashCode, eventName.hashCode, date.hashCode, teamHub.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -286,19 +289,67 @@ class ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder {
     if (vendorId != null) {
       json['vendorId'] = nativeToJson<String?>(vendorId);
     }
+    if (eventName != null) {
+      json['eventName'] = nativeToJson<String?>(eventName);
+    }
     if (date != null) {
       json['date'] = date!.toJson();
     }
-    if (location != null) {
+    json['teamHub'] = teamHub.toJson();
-      json['location'] = nativeToJson<String?>(location);
-    }
     return json;
   }
 
   ListShiftRolesByBusinessAndOrderShiftRolesShiftOrder({
     this.vendorId,
+    this.eventName,
     this.date,
-    this.location,
+    required this.teamHub,
+  });
+}
+
+@immutable
+class ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub {
+  final String address;
+  final String? placeId;
+  final String hubName;
+  ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub.fromJson(dynamic json):
+  
+  address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  hubName = nativeFromJson<String>(json['hubName']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub otherTyped = other as ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub;
+    return address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    hubName == otherTyped.hubName;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([address.hashCode, placeId.hashCode, hubName.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    json['hubName'] = nativeToJson<String>(hubName);
+    return json;
+  }
+
+  ListShiftRolesByBusinessAndOrderShiftRolesShiftOrderTeamHub({
+    required this.address,
+    this.placeId,
+    required this.hubName,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_shifts.dart

@@ -41,6 +41,11 @@ class ListShiftsShifts {
   final String? locationAddress;
   final double? latitude;
   final double? longitude;
+  final String? placeId;
+  final String? city;
+  final String? state;
+  final String? street;
+  final String? country;
   final String? description;
   final EnumValue<ShiftStatus>? status;
   final int? workersNeeded;
@@ -66,6 +71,11 @@ class ListShiftsShifts {
   locationAddress = json['locationAddress'] == null ? null : nativeFromJson<String>(json['locationAddress']),
   latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
   longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
   status = json['status'] == null ? null : shiftStatusDeserializer(json['status']),
   workersNeeded = json['workersNeeded'] == null ? null : nativeFromJson<int>(json['workersNeeded']),
@@ -101,6 +111,11 @@ class ListShiftsShifts {
     locationAddress == otherTyped.locationAddress && 
     latitude == otherTyped.latitude && 
     longitude == otherTyped.longitude && 
+    placeId == otherTyped.placeId && 
+    city == otherTyped.city && 
+    state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     description == otherTyped.description && 
     status == otherTyped.status && 
     workersNeeded == otherTyped.workersNeeded && 
@@ -115,7 +130,7 @@ class ListShiftsShifts {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, placeId.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode, order.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -150,6 +165,21 @@ class ListShiftsShifts {
     if (longitude != null) {
       json['longitude'] = nativeToJson<double?>(longitude);
     }
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (description != null) {
       json['description'] = nativeToJson<String?>(description);
     }
@@ -199,6 +229,11 @@ class ListShiftsShifts {
     this.locationAddress,
     this.latitude,
     this.longitude,
+    this.placeId,
+    this.city,
+    this.state,
+    this.street,
+    this.country,
     this.description,
     this.status,
     this.workersNeeded,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_staffs_applications_by_business_for_day.dart

@@ -116,12 +116,14 @@ class ListStaffsApplicationsByBusinessForDayApplicationsShiftRole {
   final ListStaffsApplicationsByBusinessForDayApplicationsShiftRoleShift shift;
   final int count;
   final int? assigned;
+  final double? hours;
   final ListStaffsApplicationsByBusinessForDayApplicationsShiftRoleRole role;
   ListStaffsApplicationsByBusinessForDayApplicationsShiftRole.fromJson(dynamic json):
   
   shift = ListStaffsApplicationsByBusinessForDayApplicationsShiftRoleShift.fromJson(json['shift']),
   count = nativeFromJson<int>(json['count']),
   assigned = json['assigned'] == null ? null : nativeFromJson<int>(json['assigned']),
+  hours = json['hours'] == null ? null : nativeFromJson<double>(json['hours']),
   role = ListStaffsApplicationsByBusinessForDayApplicationsShiftRoleRole.fromJson(json['role']);
   @override
   bool operator ==(Object other) {
@@ -136,11 +138,12 @@ class ListStaffsApplicationsByBusinessForDayApplicationsShiftRole {
     return shift == otherTyped.shift && 
     count == otherTyped.count && 
     assigned == otherTyped.assigned && 
+    hours == otherTyped.hours && 
     role == otherTyped.role;
     
   }
   @override
-  int get hashCode => Object.hashAll([shift.hashCode, count.hashCode, assigned.hashCode, role.hashCode]);
+  int get hashCode => Object.hashAll([shift.hashCode, count.hashCode, assigned.hashCode, hours.hashCode, role.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -150,6 +153,9 @@ class ListStaffsApplicationsByBusinessForDayApplicationsShiftRole {
     if (assigned != null) {
       json['assigned'] = nativeToJson<int?>(assigned);
     }
+    if (hours != null) {
+      json['hours'] = nativeToJson<double?>(hours);
+    }
     json['role'] = role.toJson();
     return json;
   }
@@ -158,6 +164,7 @@ class ListStaffsApplicationsByBusinessForDayApplicationsShiftRole {
     required this.shift,
     required this.count,
     this.assigned,
+    this.hours,
     required this.role,
   });
 }

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_tax_forms.dart

@@ -1,18 +1,29 @@
 part of 'generated.dart';
 
 class ListTaxFormsVariablesBuilder {
-  
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
   final FirebaseDataConnect _dataConnect;
+  ListTaxFormsVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  ListTaxFormsVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
+
   ListTaxFormsVariablesBuilder(this._dataConnect, );
   Deserializer<ListTaxFormsData> dataDeserializer = (dynamic json)  => ListTaxFormsData.fromJson(jsonDecode(json));
-  
+  Serializer<ListTaxFormsVariables> varsSerializer = (ListTaxFormsVariables vars) => jsonEncode(vars.toJson());
-  Future<QueryResult<ListTaxFormsData, void>> execute() {
+  Future<QueryResult<ListTaxFormsData, ListTaxFormsVariables>> execute() {
     return ref().execute();
   }
 
-  QueryRef<ListTaxFormsData, void> ref() {
+  QueryRef<ListTaxFormsData, ListTaxFormsVariables> ref() {
-    
+    ListTaxFormsVariables vars= ListTaxFormsVariables(offset: _offset,limit: _limit,);
-    return _dataConnect.query("listTaxForms", dataDeserializer, emptySerializer, null);
+    return _dataConnect.query("listTaxForms", dataDeserializer, varsSerializer, vars);
   }
 }
 
@@ -20,12 +31,36 @@ class ListTaxFormsVariablesBuilder {
 class ListTaxFormsTaxForms {
   final String id;
   final EnumValue<TaxFormType> formType;
-  final String title;
+  final String firstName;
-  final String? subtitle;
+  final String lastName;
-  final String? description;
+  final String? mInitial;
+  final String? oLastName;
+  final Timestamp? dob;
+  final int socialSN;
+  final String? email;
+  final String? phone;
+  final String address;
+  final String? city;
+  final String? apt;
+  final String? state;
+  final String? zipCode;
+  final EnumValue<MaritalStatus>? marital;
+  final bool? multipleJob;
+  final int? childrens;
+  final int? otherDeps;
+  final double? totalCredits;
+  final double? otherInconme;
+  final double? deductions;
+  final double? extraWithholding;
+  final EnumValue<CitizenshipStatus>? citizen;
+  final String? uscis;
+  final String? passportNumber;
+  final String? countryIssue;
+  final bool? prepartorOrTranslator;
+  final String? signature;
+  final Timestamp? date;
   final EnumValue<TaxFormStatus> status;
   final String staffId;
-  final AnyValue? formData;
   final Timestamp? createdAt;
   final Timestamp? updatedAt;
   final String? createdBy;
@@ -33,12 +68,36 @@ class ListTaxFormsTaxForms {
   
   id = nativeFromJson<String>(json['id']),
   formType = taxFormTypeDeserializer(json['formType']),
-  title = nativeFromJson<String>(json['title']),
+  firstName = nativeFromJson<String>(json['firstName']),
-  subtitle = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']),
+  lastName = nativeFromJson<String>(json['lastName']),
-  description = json['description'] == null ? null : nativeFromJson<String>(json['description']),
+  mInitial = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']),
+  oLastName = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']),
+  dob = json['dob'] == null ? null : Timestamp.fromJson(json['dob']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
+  phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
+  address = nativeFromJson<String>(json['address']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  apt = json['apt'] == null ? null : nativeFromJson<String>(json['apt']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
+  marital = json['marital'] == null ? null : maritalStatusDeserializer(json['marital']),
+  multipleJob = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']),
+  childrens = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']),
+  otherDeps = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']),
+  totalCredits = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']),
+  otherInconme = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']),
+  deductions = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']),
+  extraWithholding = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']),
+  citizen = json['citizen'] == null ? null : citizenshipStatusDeserializer(json['citizen']),
+  uscis = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']),
+  passportNumber = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']),
+  countryIssue = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']),
+  prepartorOrTranslator = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']),
+  signature = json['signature'] == null ? null : nativeFromJson<String>(json['signature']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
   status = taxFormStatusDeserializer(json['status']),
   staffId = nativeFromJson<String>(json['staffId']),
-  formData = json['formData'] == null ? null : AnyValue.fromJson(json['formData']),
   createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
   updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
   createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
@@ -54,19 +113,43 @@ class ListTaxFormsTaxForms {
     final ListTaxFormsTaxForms otherTyped = other as ListTaxFormsTaxForms;
     return id == otherTyped.id && 
     formType == otherTyped.formType && 
-    title == otherTyped.title && 
+    firstName == otherTyped.firstName && 
-    subtitle == otherTyped.subtitle && 
+    lastName == otherTyped.lastName && 
-    description == otherTyped.description && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
     status == otherTyped.status && 
     staffId == otherTyped.staffId && 
-    formData == otherTyped.formData && 
     createdAt == otherTyped.createdAt && 
     updatedAt == otherTyped.updatedAt && 
     createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, title.hashCode, subtitle.hashCode, description.hashCode, status.hashCode, staffId.hashCode, formData.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -75,20 +158,90 @@ class ListTaxFormsTaxForms {
     json['formType'] = 
     taxFormTypeSerializer(formType)
     ;
-    json['title'] = nativeToJson<String>(title);
+    json['firstName'] = nativeToJson<String>(firstName);
-    if (subtitle != null) {
+    json['lastName'] = nativeToJson<String>(lastName);
-      json['subtitle'] = nativeToJson<String?>(subtitle);
+    if (mInitial != null) {
+      json['mInitial'] = nativeToJson<String?>(mInitial);
     }
-    if (description != null) {
+    if (oLastName != null) {
-      json['description'] = nativeToJson<String?>(description);
+      json['oLastName'] = nativeToJson<String?>(oLastName);
+    }
+    if (dob != null) {
+      json['dob'] = dob!.toJson();
+    }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if (email != null) {
+      json['email'] = nativeToJson<String?>(email);
+    }
+    if (phone != null) {
+      json['phone'] = nativeToJson<String?>(phone);
+    }
+    json['address'] = nativeToJson<String>(address);
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (apt != null) {
+      json['apt'] = nativeToJson<String?>(apt);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (zipCode != null) {
+      json['zipCode'] = nativeToJson<String?>(zipCode);
+    }
+    if (marital != null) {
+      json['marital'] = 
+    maritalStatusSerializer(marital!)
+    ;
+    }
+    if (multipleJob != null) {
+      json['multipleJob'] = nativeToJson<bool?>(multipleJob);
+    }
+    if (childrens != null) {
+      json['childrens'] = nativeToJson<int?>(childrens);
+    }
+    if (otherDeps != null) {
+      json['otherDeps'] = nativeToJson<int?>(otherDeps);
+    }
+    if (totalCredits != null) {
+      json['totalCredits'] = nativeToJson<double?>(totalCredits);
+    }
+    if (otherInconme != null) {
+      json['otherInconme'] = nativeToJson<double?>(otherInconme);
+    }
+    if (deductions != null) {
+      json['deductions'] = nativeToJson<double?>(deductions);
+    }
+    if (extraWithholding != null) {
+      json['extraWithholding'] = nativeToJson<double?>(extraWithholding);
+    }
+    if (citizen != null) {
+      json['citizen'] = 
+    citizenshipStatusSerializer(citizen!)
+    ;
+    }
+    if (uscis != null) {
+      json['uscis'] = nativeToJson<String?>(uscis);
+    }
+    if (passportNumber != null) {
+      json['passportNumber'] = nativeToJson<String?>(passportNumber);
+    }
+    if (countryIssue != null) {
+      json['countryIssue'] = nativeToJson<String?>(countryIssue);
+    }
+    if (prepartorOrTranslator != null) {
+      json['prepartorOrTranslator'] = nativeToJson<bool?>(prepartorOrTranslator);
+    }
+    if (signature != null) {
+      json['signature'] = nativeToJson<String?>(signature);
+    }
+    if (date != null) {
+      json['date'] = date!.toJson();
     }
     json['status'] = 
     taxFormStatusSerializer(status)
     ;
     json['staffId'] = nativeToJson<String>(staffId);
-    if (formData != null) {
-      json['formData'] = formData!.toJson();
-    }
     if (createdAt != null) {
       json['createdAt'] = createdAt!.toJson();
     }
@@ -104,12 +257,36 @@ class ListTaxFormsTaxForms {
   ListTaxFormsTaxForms({
     required this.id,
     required this.formType,
-    required this.title,
+    required this.firstName,
-    this.subtitle,
+    required this.lastName,
-    this.description,
+    this.mInitial,
+    this.oLastName,
+    this.dob,
+    required this.socialSN,
+    this.email,
+    this.phone,
+    required this.address,
+    this.city,
+    this.apt,
+    this.state,
+    this.zipCode,
+    this.marital,
+    this.multipleJob,
+    this.childrens,
+    this.otherDeps,
+    this.totalCredits,
+    this.otherInconme,
+    this.deductions,
+    this.extraWithholding,
+    this.citizen,
+    this.uscis,
+    this.passportNumber,
+    this.countryIssue,
+    this.prepartorOrTranslator,
+    this.signature,
+    this.date,
     required this.status,
     required this.staffId,
-    this.formData,
     this.createdAt,
     this.updatedAt,
     this.createdBy,
@@ -152,3 +329,54 @@ class ListTaxFormsData {
   });
 }
 
+@immutable
+class ListTaxFormsVariables {
+  late final Optional<int>offset;
+  late final Optional<int>limit;
+  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
+  ListTaxFormsVariables.fromJson(Map<String, dynamic> json) {
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTaxFormsVariables otherTyped = other as ListTaxFormsVariables;
+    return offset == otherTyped.offset && 
+    limit == otherTyped.limit;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([offset.hashCode, limit.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
+    return json;
+  }
+
+  ListTaxFormsVariables({
+    required this.offset,
+    required this.limit,
+  });
+}
+

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_tax_forms_where.dart

@@ -0,0 +1,427 @@
+part of 'generated.dart';
+
+class ListTaxFormsWhereVariablesBuilder {
+  Optional<TaxFormType> _formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
+  Optional<TaxFormStatus> _status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
+  Optional<String> _staffId = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
+  final FirebaseDataConnect _dataConnect;
+  ListTaxFormsWhereVariablesBuilder formType(TaxFormType? t) {
+   _formType.value = t;
+   return this;
+  }
+  ListTaxFormsWhereVariablesBuilder status(TaxFormStatus? t) {
+   _status.value = t;
+   return this;
+  }
+  ListTaxFormsWhereVariablesBuilder staffId(String? t) {
+   _staffId.value = t;
+   return this;
+  }
+  ListTaxFormsWhereVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  ListTaxFormsWhereVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
+
+  ListTaxFormsWhereVariablesBuilder(this._dataConnect, );
+  Deserializer<ListTaxFormsWhereData> dataDeserializer = (dynamic json)  => ListTaxFormsWhereData.fromJson(jsonDecode(json));
+  Serializer<ListTaxFormsWhereVariables> varsSerializer = (ListTaxFormsWhereVariables vars) => jsonEncode(vars.toJson());
+  Future<QueryResult<ListTaxFormsWhereData, ListTaxFormsWhereVariables>> execute() {
+    return ref().execute();
+  }
+
+  QueryRef<ListTaxFormsWhereData, ListTaxFormsWhereVariables> ref() {
+    ListTaxFormsWhereVariables vars= ListTaxFormsWhereVariables(formType: _formType,status: _status,staffId: _staffId,offset: _offset,limit: _limit,);
+    return _dataConnect.query("listTaxFormsWhere", dataDeserializer, varsSerializer, vars);
+  }
+}
+
+@immutable
+class ListTaxFormsWhereTaxForms {
+  final String id;
+  final EnumValue<TaxFormType> formType;
+  final String firstName;
+  final String lastName;
+  final String? mInitial;
+  final String? oLastName;
+  final Timestamp? dob;
+  final int socialSN;
+  final String? email;
+  final String? phone;
+  final String address;
+  final String? city;
+  final String? apt;
+  final String? state;
+  final String? zipCode;
+  final EnumValue<MaritalStatus>? marital;
+  final bool? multipleJob;
+  final int? childrens;
+  final int? otherDeps;
+  final double? totalCredits;
+  final double? otherInconme;
+  final double? deductions;
+  final double? extraWithholding;
+  final EnumValue<CitizenshipStatus>? citizen;
+  final String? uscis;
+  final String? passportNumber;
+  final String? countryIssue;
+  final bool? prepartorOrTranslator;
+  final String? signature;
+  final Timestamp? date;
+  final EnumValue<TaxFormStatus> status;
+  final String staffId;
+  final Timestamp? createdAt;
+  final Timestamp? updatedAt;
+  final String? createdBy;
+  ListTaxFormsWhereTaxForms.fromJson(dynamic json):
+  
+  id = nativeFromJson<String>(json['id']),
+  formType = taxFormTypeDeserializer(json['formType']),
+  firstName = nativeFromJson<String>(json['firstName']),
+  lastName = nativeFromJson<String>(json['lastName']),
+  mInitial = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']),
+  oLastName = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']),
+  dob = json['dob'] == null ? null : Timestamp.fromJson(json['dob']),
+  socialSN = nativeFromJson<int>(json['socialSN']),
+  email = json['email'] == null ? null : nativeFromJson<String>(json['email']),
+  phone = json['phone'] == null ? null : nativeFromJson<String>(json['phone']),
+  address = nativeFromJson<String>(json['address']),
+  city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
+  apt = json['apt'] == null ? null : nativeFromJson<String>(json['apt']),
+  state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
+  marital = json['marital'] == null ? null : maritalStatusDeserializer(json['marital']),
+  multipleJob = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']),
+  childrens = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']),
+  otherDeps = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']),
+  totalCredits = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']),
+  otherInconme = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']),
+  deductions = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']),
+  extraWithholding = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']),
+  citizen = json['citizen'] == null ? null : citizenshipStatusDeserializer(json['citizen']),
+  uscis = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']),
+  passportNumber = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']),
+  countryIssue = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']),
+  prepartorOrTranslator = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']),
+  signature = json['signature'] == null ? null : nativeFromJson<String>(json['signature']),
+  date = json['date'] == null ? null : Timestamp.fromJson(json['date']),
+  status = taxFormStatusDeserializer(json['status']),
+  staffId = nativeFromJson<String>(json['staffId']),
+  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
+  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
+  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTaxFormsWhereTaxForms otherTyped = other as ListTaxFormsWhereTaxForms;
+    return id == otherTyped.id && 
+    formType == otherTyped.formType && 
+    firstName == otherTyped.firstName && 
+    lastName == otherTyped.lastName && 
+    mInitial == otherTyped.mInitial && 
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
+    status == otherTyped.status && 
+    staffId == otherTyped.staffId && 
+    createdAt == otherTyped.createdAt && 
+    updatedAt == otherTyped.updatedAt && 
+    createdBy == otherTyped.createdBy;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode, staffId.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['id'] = nativeToJson<String>(id);
+    json['formType'] = 
+    taxFormTypeSerializer(formType)
+    ;
+    json['firstName'] = nativeToJson<String>(firstName);
+    json['lastName'] = nativeToJson<String>(lastName);
+    if (mInitial != null) {
+      json['mInitial'] = nativeToJson<String?>(mInitial);
+    }
+    if (oLastName != null) {
+      json['oLastName'] = nativeToJson<String?>(oLastName);
+    }
+    if (dob != null) {
+      json['dob'] = dob!.toJson();
+    }
+    json['socialSN'] = nativeToJson<int>(socialSN);
+    if (email != null) {
+      json['email'] = nativeToJson<String?>(email);
+    }
+    if (phone != null) {
+      json['phone'] = nativeToJson<String?>(phone);
+    }
+    json['address'] = nativeToJson<String>(address);
+    if (city != null) {
+      json['city'] = nativeToJson<String?>(city);
+    }
+    if (apt != null) {
+      json['apt'] = nativeToJson<String?>(apt);
+    }
+    if (state != null) {
+      json['state'] = nativeToJson<String?>(state);
+    }
+    if (zipCode != null) {
+      json['zipCode'] = nativeToJson<String?>(zipCode);
+    }
+    if (marital != null) {
+      json['marital'] = 
+    maritalStatusSerializer(marital!)
+    ;
+    }
+    if (multipleJob != null) {
+      json['multipleJob'] = nativeToJson<bool?>(multipleJob);
+    }
+    if (childrens != null) {
+      json['childrens'] = nativeToJson<int?>(childrens);
+    }
+    if (otherDeps != null) {
+      json['otherDeps'] = nativeToJson<int?>(otherDeps);
+    }
+    if (totalCredits != null) {
+      json['totalCredits'] = nativeToJson<double?>(totalCredits);
+    }
+    if (otherInconme != null) {
+      json['otherInconme'] = nativeToJson<double?>(otherInconme);
+    }
+    if (deductions != null) {
+      json['deductions'] = nativeToJson<double?>(deductions);
+    }
+    if (extraWithholding != null) {
+      json['extraWithholding'] = nativeToJson<double?>(extraWithholding);
+    }
+    if (citizen != null) {
+      json['citizen'] = 
+    citizenshipStatusSerializer(citizen!)
+    ;
+    }
+    if (uscis != null) {
+      json['uscis'] = nativeToJson<String?>(uscis);
+    }
+    if (passportNumber != null) {
+      json['passportNumber'] = nativeToJson<String?>(passportNumber);
+    }
+    if (countryIssue != null) {
+      json['countryIssue'] = nativeToJson<String?>(countryIssue);
+    }
+    if (prepartorOrTranslator != null) {
+      json['prepartorOrTranslator'] = nativeToJson<bool?>(prepartorOrTranslator);
+    }
+    if (signature != null) {
+      json['signature'] = nativeToJson<String?>(signature);
+    }
+    if (date != null) {
+      json['date'] = date!.toJson();
+    }
+    json['status'] = 
+    taxFormStatusSerializer(status)
+    ;
+    json['staffId'] = nativeToJson<String>(staffId);
+    if (createdAt != null) {
+      json['createdAt'] = createdAt!.toJson();
+    }
+    if (updatedAt != null) {
+      json['updatedAt'] = updatedAt!.toJson();
+    }
+    if (createdBy != null) {
+      json['createdBy'] = nativeToJson<String?>(createdBy);
+    }
+    return json;
+  }
+
+  ListTaxFormsWhereTaxForms({
+    required this.id,
+    required this.formType,
+    required this.firstName,
+    required this.lastName,
+    this.mInitial,
+    this.oLastName,
+    this.dob,
+    required this.socialSN,
+    this.email,
+    this.phone,
+    required this.address,
+    this.city,
+    this.apt,
+    this.state,
+    this.zipCode,
+    this.marital,
+    this.multipleJob,
+    this.childrens,
+    this.otherDeps,
+    this.totalCredits,
+    this.otherInconme,
+    this.deductions,
+    this.extraWithholding,
+    this.citizen,
+    this.uscis,
+    this.passportNumber,
+    this.countryIssue,
+    this.prepartorOrTranslator,
+    this.signature,
+    this.date,
+    required this.status,
+    required this.staffId,
+    this.createdAt,
+    this.updatedAt,
+    this.createdBy,
+  });
+}
+
+@immutable
+class ListTaxFormsWhereData {
+  final List<ListTaxFormsWhereTaxForms> taxForms;
+  ListTaxFormsWhereData.fromJson(dynamic json):
+  
+  taxForms = (json['taxForms'] as List<dynamic>)
+        .map((e) => ListTaxFormsWhereTaxForms.fromJson(e))
+        .toList();
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTaxFormsWhereData otherTyped = other as ListTaxFormsWhereData;
+    return taxForms == otherTyped.taxForms;
+    
+  }
+  @override
+  int get hashCode => taxForms.hashCode;
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    json['taxForms'] = taxForms.map((e) => e.toJson()).toList();
+    return json;
+  }
+
+  ListTaxFormsWhereData({
+    required this.taxForms,
+  });
+}
+
+@immutable
+class ListTaxFormsWhereVariables {
+  late final Optional<TaxFormType>formType;
+  late final Optional<TaxFormStatus>status;
+  late final Optional<String>staffId;
+  late final Optional<int>offset;
+  late final Optional<int>limit;
+  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
+  ListTaxFormsWhereVariables.fromJson(Map<String, dynamic> json) {
+  
+  
+    formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
+    formType.value = json['formType'] == null ? null : TaxFormType.values.byName(json['formType']);
+  
+  
+    status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
+    status.value = json['status'] == null ? null : TaxFormStatus.values.byName(json['status']);
+  
+  
+    staffId = Optional.optional(nativeFromJson, nativeToJson);
+    staffId.value = json['staffId'] == null ? null : nativeFromJson<String>(json['staffId']);
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTaxFormsWhereVariables otherTyped = other as ListTaxFormsWhereVariables;
+    return formType == otherTyped.formType && 
+    status == otherTyped.status && 
+    staffId == otherTyped.staffId && 
+    offset == otherTyped.offset && 
+    limit == otherTyped.limit;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([formType.hashCode, status.hashCode, staffId.hashCode, offset.hashCode, limit.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    if(formType.state == OptionalState.set) {
+      json['formType'] = formType.toJson();
+    }
+    if(status.state == OptionalState.set) {
+      json['status'] = status.toJson();
+    }
+    if(staffId.state == OptionalState.set) {
+      json['staffId'] = staffId.toJson();
+    }
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
+    return json;
+  }
+
+  ListTaxFormsWhereVariables({
+    required this.formType,
+    required this.status,
+    required this.staffId,
+    required this.offset,
+    required this.limit,
+  });
+}
+

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_team_hubs.dart

@@ -1,18 +1,29 @@
 part of 'generated.dart';
 
 class ListTeamHubsVariablesBuilder {
-  
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
   final FirebaseDataConnect _dataConnect;
+  ListTeamHubsVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  ListTeamHubsVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
+
   ListTeamHubsVariablesBuilder(this._dataConnect, );
   Deserializer<ListTeamHubsData> dataDeserializer = (dynamic json)  => ListTeamHubsData.fromJson(jsonDecode(json));
-  
+  Serializer<ListTeamHubsVariables> varsSerializer = (ListTeamHubsVariables vars) => jsonEncode(vars.toJson());
-  Future<QueryResult<ListTeamHubsData, void>> execute() {
+  Future<QueryResult<ListTeamHubsData, ListTeamHubsVariables>> execute() {
     return ref().execute();
   }
 
-  QueryRef<ListTeamHubsData, void> ref() {
+  QueryRef<ListTeamHubsData, ListTeamHubsVariables> ref() {
-    
+    ListTeamHubsVariables vars= ListTeamHubsVariables(offset: _offset,limit: _limit,);
-    return _dataConnect.query("listTeamHubs", dataDeserializer, emptySerializer, null);
+    return _dataConnect.query("listTeamHubs", dataDeserializer, varsSerializer, vars);
   }
 }
 
@@ -22,30 +33,34 @@ class ListTeamHubsTeamHubs {
   final String teamId;
   final String hubName;
   final String address;
+  final String? placeId;
+  final double? latitude;
+  final double? longitude;
   final String? city;
   final String? state;
+  final String? street;
+  final String? country;
   final String? zipCode;
   final String? managerName;
   final bool isActive;
   final AnyValue? departments;
-  final Timestamp? createdAt;
-  final Timestamp? updatedAt;
-  final String? createdBy;
   ListTeamHubsTeamHubs.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   teamId = nativeFromJson<String>(json['teamId']),
   hubName = nativeFromJson<String>(json['hubName']),
   address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
+  longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
   city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
   state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
   managerName = json['managerName'] == null ? null : nativeFromJson<String>(json['managerName']),
   isActive = nativeFromJson<bool>(json['isActive']),
-  departments = json['departments'] == null ? null : AnyValue.fromJson(json['departments']),
+  departments = json['departments'] == null ? null : AnyValue.fromJson(json['departments']);
-  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']),
-  updatedAt = json['updatedAt'] == null ? null : Timestamp.fromJson(json['updatedAt']),
-  createdBy = json['createdBy'] == null ? null : nativeFromJson<String>(json['createdBy']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -60,19 +75,21 @@ class ListTeamHubsTeamHubs {
     teamId == otherTyped.teamId && 
     hubName == otherTyped.hubName && 
     address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    latitude == otherTyped.latitude && 
+    longitude == otherTyped.longitude && 
     city == otherTyped.city && 
     state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     zipCode == otherTyped.zipCode && 
     managerName == otherTyped.managerName && 
     isActive == otherTyped.isActive && 
-    departments == otherTyped.departments && 
+    departments == otherTyped.departments;
-    createdAt == otherTyped.createdAt && 
-    updatedAt == otherTyped.updatedAt && 
-    createdBy == otherTyped.createdBy;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, city.hashCode, state.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode, createdAt.hashCode, updatedAt.hashCode, createdBy.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, placeId.hashCode, latitude.hashCode, longitude.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -81,12 +98,27 @@ class ListTeamHubsTeamHubs {
     json['teamId'] = nativeToJson<String>(teamId);
     json['hubName'] = nativeToJson<String>(hubName);
     json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (latitude != null) {
+      json['latitude'] = nativeToJson<double?>(latitude);
+    }
+    if (longitude != null) {
+      json['longitude'] = nativeToJson<double?>(longitude);
+    }
     if (city != null) {
       json['city'] = nativeToJson<String?>(city);
     }
     if (state != null) {
       json['state'] = nativeToJson<String?>(state);
     }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (zipCode != null) {
       json['zipCode'] = nativeToJson<String?>(zipCode);
     }
@@ -97,15 +129,6 @@ class ListTeamHubsTeamHubs {
     if (departments != null) {
       json['departments'] = departments!.toJson();
     }
-    if (createdAt != null) {
-      json['createdAt'] = createdAt!.toJson();
-    }
-    if (updatedAt != null) {
-      json['updatedAt'] = updatedAt!.toJson();
-    }
-    if (createdBy != null) {
-      json['createdBy'] = nativeToJson<String?>(createdBy);
-    }
     return json;
   }
 
@@ -114,15 +137,17 @@ class ListTeamHubsTeamHubs {
     required this.teamId,
     required this.hubName,
     required this.address,
+    this.placeId,
+    this.latitude,
+    this.longitude,
     this.city,
     this.state,
+    this.street,
+    this.country,
     this.zipCode,
     this.managerName,
     required this.isActive,
     this.departments,
-    this.createdAt,
-    this.updatedAt,
-    this.createdBy,
   });
 }
 
@@ -162,3 +187,54 @@ class ListTeamHubsData {
   });
 }
 
+@immutable
+class ListTeamHubsVariables {
+  late final Optional<int>offset;
+  late final Optional<int>limit;
+  @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
+  ListTeamHubsVariables.fromJson(Map<String, dynamic> json) {
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
+  @override
+  bool operator ==(Object other) {
+    if(identical(this, other)) {
+      return true;
+    }
+    if(other.runtimeType != runtimeType) {
+      return false;
+    }
+
+    final ListTeamHubsVariables otherTyped = other as ListTeamHubsVariables;
+    return offset == otherTyped.offset && 
+    limit == otherTyped.limit;
+    
+  }
+  @override
+  int get hashCode => Object.hashAll([offset.hashCode, limit.hashCode]);
+  
+
+  Map<String, dynamic> toJson() {
+    Map<String, dynamic> json = {};
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
+    return json;
+  }
+
+  ListTeamHubsVariables({
+    required this.offset,
+    required this.limit,
+  });
+}
+

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/list_team_hubs_by_owner_id.dart

@@ -2,8 +2,18 @@ part of 'generated.dart';
 
 class ListTeamHubsByOwnerIdVariablesBuilder {
   String ownerId;
+  Optional<int> _offset = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _limit = Optional.optional(nativeFromJson, nativeToJson);
+
+  final FirebaseDataConnect _dataConnect;  ListTeamHubsByOwnerIdVariablesBuilder offset(int? t) {
+   _offset.value = t;
+   return this;
+  }
+  ListTeamHubsByOwnerIdVariablesBuilder limit(int? t) {
+   _limit.value = t;
+   return this;
+  }
 
-  final FirebaseDataConnect _dataConnect;
   ListTeamHubsByOwnerIdVariablesBuilder(this._dataConnect, {required  this.ownerId,});
   Deserializer<ListTeamHubsByOwnerIdData> dataDeserializer = (dynamic json)  => ListTeamHubsByOwnerIdData.fromJson(jsonDecode(json));
   Serializer<ListTeamHubsByOwnerIdVariables> varsSerializer = (ListTeamHubsByOwnerIdVariables vars) => jsonEncode(vars.toJson());
@@ -12,7 +22,7 @@ class ListTeamHubsByOwnerIdVariablesBuilder {
   }
 
   QueryRef<ListTeamHubsByOwnerIdData, ListTeamHubsByOwnerIdVariables> ref() {
-    ListTeamHubsByOwnerIdVariables vars= ListTeamHubsByOwnerIdVariables(ownerId: ownerId,);
+    ListTeamHubsByOwnerIdVariables vars= ListTeamHubsByOwnerIdVariables(ownerId: ownerId,offset: _offset,limit: _limit,);
     return _dataConnect.query("listTeamHubsByOwnerId", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -23,26 +33,34 @@ class ListTeamHubsByOwnerIdTeamHubs {
   final String teamId;
   final String hubName;
   final String address;
+  final String? placeId;
+  final double? latitude;
+  final double? longitude;
   final String? city;
   final String? state;
+  final String? street;
+  final String? country;
   final String? zipCode;
   final String? managerName;
   final bool isActive;
   final AnyValue? departments;
-  final Timestamp? createdAt;
   ListTeamHubsByOwnerIdTeamHubs.fromJson(dynamic json):
   
   id = nativeFromJson<String>(json['id']),
   teamId = nativeFromJson<String>(json['teamId']),
   hubName = nativeFromJson<String>(json['hubName']),
   address = nativeFromJson<String>(json['address']),
+  placeId = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']),
+  latitude = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']),
+  longitude = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']),
   city = json['city'] == null ? null : nativeFromJson<String>(json['city']),
   state = json['state'] == null ? null : nativeFromJson<String>(json['state']),
+  street = json['street'] == null ? null : nativeFromJson<String>(json['street']),
+  country = json['country'] == null ? null : nativeFromJson<String>(json['country']),
   zipCode = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']),
   managerName = json['managerName'] == null ? null : nativeFromJson<String>(json['managerName']),
   isActive = nativeFromJson<bool>(json['isActive']),
-  departments = json['departments'] == null ? null : AnyValue.fromJson(json['departments']),
+  departments = json['departments'] == null ? null : AnyValue.fromJson(json['departments']);
-  createdAt = json['createdAt'] == null ? null : Timestamp.fromJson(json['createdAt']);
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -57,17 +75,21 @@ class ListTeamHubsByOwnerIdTeamHubs {
     teamId == otherTyped.teamId && 
     hubName == otherTyped.hubName && 
     address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    latitude == otherTyped.latitude && 
+    longitude == otherTyped.longitude && 
     city == otherTyped.city && 
     state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     zipCode == otherTyped.zipCode && 
     managerName == otherTyped.managerName && 
     isActive == otherTyped.isActive && 
-    departments == otherTyped.departments && 
+    departments == otherTyped.departments;
-    createdAt == otherTyped.createdAt;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, city.hashCode, state.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode, createdAt.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, placeId.hashCode, latitude.hashCode, longitude.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -76,12 +98,27 @@ class ListTeamHubsByOwnerIdTeamHubs {
     json['teamId'] = nativeToJson<String>(teamId);
     json['hubName'] = nativeToJson<String>(hubName);
     json['address'] = nativeToJson<String>(address);
+    if (placeId != null) {
+      json['placeId'] = nativeToJson<String?>(placeId);
+    }
+    if (latitude != null) {
+      json['latitude'] = nativeToJson<double?>(latitude);
+    }
+    if (longitude != null) {
+      json['longitude'] = nativeToJson<double?>(longitude);
+    }
     if (city != null) {
       json['city'] = nativeToJson<String?>(city);
     }
     if (state != null) {
       json['state'] = nativeToJson<String?>(state);
     }
+    if (street != null) {
+      json['street'] = nativeToJson<String?>(street);
+    }
+    if (country != null) {
+      json['country'] = nativeToJson<String?>(country);
+    }
     if (zipCode != null) {
       json['zipCode'] = nativeToJson<String?>(zipCode);
     }
@@ -92,9 +129,6 @@ class ListTeamHubsByOwnerIdTeamHubs {
     if (departments != null) {
       json['departments'] = departments!.toJson();
     }
-    if (createdAt != null) {
-      json['createdAt'] = createdAt!.toJson();
-    }
     return json;
   }
 
@@ -103,13 +137,17 @@ class ListTeamHubsByOwnerIdTeamHubs {
     required this.teamId,
     required this.hubName,
     required this.address,
+    this.placeId,
+    this.latitude,
+    this.longitude,
     this.city,
     this.state,
+    this.street,
+    this.country,
     this.zipCode,
     this.managerName,
     required this.isActive,
     this.departments,
-    this.createdAt,
   });
 }
 
@@ -152,10 +190,23 @@ class ListTeamHubsByOwnerIdData {
 @immutable
 class ListTeamHubsByOwnerIdVariables {
   final String ownerId;
+  late final Optional<int>offset;
+  late final Optional<int>limit;
   @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
   ListTeamHubsByOwnerIdVariables.fromJson(Map<String, dynamic> json):
   
-  ownerId = nativeFromJson<String>(json['ownerId']);
+  ownerId = nativeFromJson<String>(json['ownerId']) {
+  
+  
+  
+    offset = Optional.optional(nativeFromJson, nativeToJson);
+    offset.value = json['offset'] == null ? null : nativeFromJson<int>(json['offset']);
+  
+  
+    limit = Optional.optional(nativeFromJson, nativeToJson);
+    limit.value = json['limit'] == null ? null : nativeFromJson<int>(json['limit']);
+  
+  }
   @override
   bool operator ==(Object other) {
     if(identical(this, other)) {
@@ -166,21 +217,31 @@ class ListTeamHubsByOwnerIdVariables {
     }
 
     final ListTeamHubsByOwnerIdVariables otherTyped = other as ListTeamHubsByOwnerIdVariables;
-    return ownerId == otherTyped.ownerId;
+    return ownerId == otherTyped.ownerId && 
+    offset == otherTyped.offset && 
+    limit == otherTyped.limit;
     
   }
   @override
-  int get hashCode => ownerId.hashCode;
+  int get hashCode => Object.hashAll([ownerId.hashCode, offset.hashCode, limit.hashCode]);
   
 
   Map<String, dynamic> toJson() {
     Map<String, dynamic> json = {};
     json['ownerId'] = nativeToJson<String>(ownerId);
+    if(offset.state == OptionalState.set) {
+      json['offset'] = offset.toJson();
+    }
+    if(limit.state == OptionalState.set) {
+      json['limit'] = limit.toJson();
+    }
     return json;
   }
 
   ListTeamHubsByOwnerIdVariables({
     required this.ownerId,
+    required this.offset,
+    required this.limit,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/update_order.dart

@@ -4,7 +4,6 @@ class UpdateOrderVariablesBuilder {
   String id;
   Optional<String> _vendorId = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _businessId = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _location = Optional.optional(nativeFromJson, nativeToJson);
   Optional<OrderStatus> _status = Optional.optional((data) => OrderStatus.values.byName(data), enumSerializer);
   Optional<Timestamp> _date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
   Optional<Timestamp> _startDate = Optional.optional((json) => json['startDate'] = Timestamp.fromJson(json['startDate']), defaultSerializer);
@@ -14,7 +13,7 @@ class UpdateOrderVariablesBuilder {
   Optional<AnyValue> _assignedStaff = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<AnyValue> _shifts = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<int> _requested = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _hub = Optional.optional(nativeFromJson, nativeToJson);
+  String teamHubId;
   Optional<AnyValue> _recurringDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<AnyValue> _permanentDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
   Optional<String> _notes = Optional.optional(nativeFromJson, nativeToJson);
@@ -29,10 +28,6 @@ class UpdateOrderVariablesBuilder {
    _businessId.value = t;
    return this;
   }
-  UpdateOrderVariablesBuilder location(String? t) {
-   _location.value = t;
-   return this;
-  }
   UpdateOrderVariablesBuilder status(OrderStatus? t) {
    _status.value = t;
    return this;
@@ -69,10 +64,6 @@ class UpdateOrderVariablesBuilder {
    _requested.value = t;
    return this;
   }
-  UpdateOrderVariablesBuilder hub(String? t) {
-   _hub.value = t;
-   return this;
-  }
   UpdateOrderVariablesBuilder recurringDays(AnyValue? t) {
    _recurringDays.value = t;
    return this;
@@ -94,7 +85,7 @@ class UpdateOrderVariablesBuilder {
    return this;
   }
 
-  UpdateOrderVariablesBuilder(this._dataConnect, {required  this.id,});
+  UpdateOrderVariablesBuilder(this._dataConnect, {required  this.id,required  this.teamHubId,});
   Deserializer<UpdateOrderData> dataDeserializer = (dynamic json)  => UpdateOrderData.fromJson(jsonDecode(json));
   Serializer<UpdateOrderVariables> varsSerializer = (UpdateOrderVariables vars) => jsonEncode(vars.toJson());
   Future<OperationResult<UpdateOrderData, UpdateOrderVariables>> execute() {
@@ -102,7 +93,7 @@ class UpdateOrderVariablesBuilder {
   }
 
   MutationRef<UpdateOrderData, UpdateOrderVariables> ref() {
-    UpdateOrderVariables vars= UpdateOrderVariables(id: id,vendorId: _vendorId,businessId: _businessId,location: _location,status: _status,date: _date,startDate: _startDate,endDate: _endDate,total: _total,eventName: _eventName,assignedStaff: _assignedStaff,shifts: _shifts,requested: _requested,hub: _hub,recurringDays: _recurringDays,permanentDays: _permanentDays,notes: _notes,detectedConflicts: _detectedConflicts,poReference: _poReference,);
+    UpdateOrderVariables vars= UpdateOrderVariables(id: id,vendorId: _vendorId,businessId: _businessId,status: _status,date: _date,startDate: _startDate,endDate: _endDate,total: _total,eventName: _eventName,assignedStaff: _assignedStaff,shifts: _shifts,requested: _requested,teamHubId: teamHubId,recurringDays: _recurringDays,permanentDays: _permanentDays,notes: _notes,detectedConflicts: _detectedConflicts,poReference: _poReference,);
     return _dataConnect.mutation("updateOrder", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -182,7 +173,6 @@ class UpdateOrderVariables {
   final String id;
   late final Optional<String>vendorId;
   late final Optional<String>businessId;
-  late final Optional<String>location;
   late final Optional<OrderStatus>status;
   late final Optional<Timestamp>date;
   late final Optional<Timestamp>startDate;
@@ -192,7 +182,7 @@ class UpdateOrderVariables {
   late final Optional<AnyValue>assignedStaff;
   late final Optional<AnyValue>shifts;
   late final Optional<int>requested;
-  late final Optional<String>hub;
+  final String teamHubId;
   late final Optional<AnyValue>recurringDays;
   late final Optional<AnyValue>permanentDays;
   late final Optional<String>notes;
@@ -201,7 +191,8 @@ class UpdateOrderVariables {
   @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
   UpdateOrderVariables.fromJson(Map<String, dynamic> json):
   
-  id = nativeFromJson<String>(json['id']) {
+  id = nativeFromJson<String>(json['id']),
+  teamHubId = nativeFromJson<String>(json['teamHubId']) {
   
   
   
@@ -213,10 +204,6 @@ class UpdateOrderVariables {
     businessId.value = json['businessId'] == null ? null : nativeFromJson<String>(json['businessId']);
   
   
-    location = Optional.optional(nativeFromJson, nativeToJson);
-    location.value = json['location'] == null ? null : nativeFromJson<String>(json['location']);
-  
-  
     status = Optional.optional((data) => OrderStatus.values.byName(data), enumSerializer);
     status.value = json['status'] == null ? null : OrderStatus.values.byName(json['status']);
   
@@ -253,9 +240,6 @@ class UpdateOrderVariables {
     requested.value = json['requested'] == null ? null : nativeFromJson<int>(json['requested']);
   
   
-    hub = Optional.optional(nativeFromJson, nativeToJson);
-    hub.value = json['hub'] == null ? null : nativeFromJson<String>(json['hub']);
-  
   
     recurringDays = Optional.optional(AnyValue.fromJson, defaultSerializer);
     recurringDays.value = json['recurringDays'] == null ? null : AnyValue.fromJson(json['recurringDays']);
@@ -290,7 +274,6 @@ class UpdateOrderVariables {
     return id == otherTyped.id && 
     vendorId == otherTyped.vendorId && 
     businessId == otherTyped.businessId && 
-    location == otherTyped.location && 
     status == otherTyped.status && 
     date == otherTyped.date && 
     startDate == otherTyped.startDate && 
@@ -300,7 +283,7 @@ class UpdateOrderVariables {
     assignedStaff == otherTyped.assignedStaff && 
     shifts == otherTyped.shifts && 
     requested == otherTyped.requested && 
-    hub == otherTyped.hub && 
+    teamHubId == otherTyped.teamHubId && 
     recurringDays == otherTyped.recurringDays && 
     permanentDays == otherTyped.permanentDays && 
     notes == otherTyped.notes && 
@@ -309,7 +292,7 @@ class UpdateOrderVariables {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, vendorId.hashCode, businessId.hashCode, location.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, total.hashCode, eventName.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, hub.hashCode, recurringDays.hashCode, permanentDays.hashCode, notes.hashCode, detectedConflicts.hashCode, poReference.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, vendorId.hashCode, businessId.hashCode, status.hashCode, date.hashCode, startDate.hashCode, endDate.hashCode, total.hashCode, eventName.hashCode, assignedStaff.hashCode, shifts.hashCode, requested.hashCode, teamHubId.hashCode, recurringDays.hashCode, permanentDays.hashCode, notes.hashCode, detectedConflicts.hashCode, poReference.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -321,9 +304,6 @@ class UpdateOrderVariables {
     if(businessId.state == OptionalState.set) {
       json['businessId'] = businessId.toJson();
     }
-    if(location.state == OptionalState.set) {
-      json['location'] = location.toJson();
-    }
     if(status.state == OptionalState.set) {
       json['status'] = status.toJson();
     }
@@ -351,9 +331,7 @@ class UpdateOrderVariables {
     if(requested.state == OptionalState.set) {
       json['requested'] = requested.toJson();
     }
-    if(hub.state == OptionalState.set) {
+    json['teamHubId'] = nativeToJson<String>(teamHubId);
-      json['hub'] = hub.toJson();
-    }
     if(recurringDays.state == OptionalState.set) {
       json['recurringDays'] = recurringDays.toJson();
     }
@@ -376,7 +354,6 @@ class UpdateOrderVariables {
     required this.id,
     required this.vendorId,
     required this.businessId,
-    required this.location,
     required this.status,
     required this.date,
     required this.startDate,
@@ -386,7 +363,7 @@ class UpdateOrderVariables {
     required this.assignedStaff,
     required this.shifts,
     required this.requested,
-    required this.hub,
+    required this.teamHubId,
     required this.recurringDays,
     required this.permanentDays,
     required this.notes,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/update_shift.dart

@@ -13,6 +13,11 @@ class UpdateShiftVariablesBuilder {
   Optional<String> _locationAddress = Optional.optional(nativeFromJson, nativeToJson);
   Optional<double> _latitude = Optional.optional(nativeFromJson, nativeToJson);
   Optional<double> _longitude = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _placeId = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _city = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _state = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _street = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _country = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _description = Optional.optional(nativeFromJson, nativeToJson);
   Optional<ShiftStatus> _status = Optional.optional((data) => ShiftStatus.values.byName(data), enumSerializer);
   Optional<int> _workersNeeded = Optional.optional(nativeFromJson, nativeToJson);
@@ -65,6 +70,26 @@ class UpdateShiftVariablesBuilder {
    _longitude.value = t;
    return this;
   }
+  UpdateShiftVariablesBuilder placeId(String? t) {
+   _placeId.value = t;
+   return this;
+  }
+  UpdateShiftVariablesBuilder city(String? t) {
+   _city.value = t;
+   return this;
+  }
+  UpdateShiftVariablesBuilder state(String? t) {
+   _state.value = t;
+   return this;
+  }
+  UpdateShiftVariablesBuilder street(String? t) {
+   _street.value = t;
+   return this;
+  }
+  UpdateShiftVariablesBuilder country(String? t) {
+   _country.value = t;
+   return this;
+  }
   UpdateShiftVariablesBuilder description(String? t) {
    _description.value = t;
    return this;
@@ -102,7 +127,7 @@ class UpdateShiftVariablesBuilder {
   }
 
   MutationRef<UpdateShiftData, UpdateShiftVariables> ref() {
-    UpdateShiftVariables vars= UpdateShiftVariables(id: id,title: _title,orderId: _orderId,date: _date,startTime: _startTime,endTime: _endTime,hours: _hours,cost: _cost,location: _location,locationAddress: _locationAddress,latitude: _latitude,longitude: _longitude,description: _description,status: _status,workersNeeded: _workersNeeded,filled: _filled,filledAt: _filledAt,managers: _managers,durationDays: _durationDays,);
+    UpdateShiftVariables vars= UpdateShiftVariables(id: id,title: _title,orderId: _orderId,date: _date,startTime: _startTime,endTime: _endTime,hours: _hours,cost: _cost,location: _location,locationAddress: _locationAddress,latitude: _latitude,longitude: _longitude,placeId: _placeId,city: _city,state: _state,street: _street,country: _country,description: _description,status: _status,workersNeeded: _workersNeeded,filled: _filled,filledAt: _filledAt,managers: _managers,durationDays: _durationDays,);
     return _dataConnect.mutation("updateShift", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -191,6 +216,11 @@ class UpdateShiftVariables {
   late final Optional<String>locationAddress;
   late final Optional<double>latitude;
   late final Optional<double>longitude;
+  late final Optional<String>placeId;
+  late final Optional<String>city;
+  late final Optional<String>state;
+  late final Optional<String>street;
+  late final Optional<String>country;
   late final Optional<String>description;
   late final Optional<ShiftStatus>status;
   late final Optional<int>workersNeeded;
@@ -249,6 +279,26 @@ class UpdateShiftVariables {
     longitude.value = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']);
   
   
+    placeId = Optional.optional(nativeFromJson, nativeToJson);
+    placeId.value = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']);
+  
+  
+    city = Optional.optional(nativeFromJson, nativeToJson);
+    city.value = json['city'] == null ? null : nativeFromJson<String>(json['city']);
+  
+  
+    state = Optional.optional(nativeFromJson, nativeToJson);
+    state.value = json['state'] == null ? null : nativeFromJson<String>(json['state']);
+  
+  
+    street = Optional.optional(nativeFromJson, nativeToJson);
+    street.value = json['street'] == null ? null : nativeFromJson<String>(json['street']);
+  
+  
+    country = Optional.optional(nativeFromJson, nativeToJson);
+    country.value = json['country'] == null ? null : nativeFromJson<String>(json['country']);
+  
+  
     description = Optional.optional(nativeFromJson, nativeToJson);
     description.value = json['description'] == null ? null : nativeFromJson<String>(json['description']);
   
@@ -301,6 +351,11 @@ class UpdateShiftVariables {
     locationAddress == otherTyped.locationAddress && 
     latitude == otherTyped.latitude && 
     longitude == otherTyped.longitude && 
+    placeId == otherTyped.placeId && 
+    city == otherTyped.city && 
+    state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     description == otherTyped.description && 
     status == otherTyped.status && 
     workersNeeded == otherTyped.workersNeeded && 
@@ -311,7 +366,7 @@ class UpdateShiftVariables {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, title.hashCode, orderId.hashCode, date.hashCode, startTime.hashCode, endTime.hashCode, hours.hashCode, cost.hashCode, location.hashCode, locationAddress.hashCode, latitude.hashCode, longitude.hashCode, placeId.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, description.hashCode, status.hashCode, workersNeeded.hashCode, filled.hashCode, filledAt.hashCode, managers.hashCode, durationDays.hashCode]);
   
 
   Map<String, dynamic> toJson() {
@@ -350,6 +405,21 @@ class UpdateShiftVariables {
     if(longitude.state == OptionalState.set) {
       json['longitude'] = longitude.toJson();
     }
+    if(placeId.state == OptionalState.set) {
+      json['placeId'] = placeId.toJson();
+    }
+    if(city.state == OptionalState.set) {
+      json['city'] = city.toJson();
+    }
+    if(state.state == OptionalState.set) {
+      json['state'] = state.toJson();
+    }
+    if(street.state == OptionalState.set) {
+      json['street'] = street.toJson();
+    }
+    if(country.state == OptionalState.set) {
+      json['country'] = country.toJson();
+    }
     if(description.state == OptionalState.set) {
       json['description'] = description.toJson();
     }
@@ -387,6 +457,11 @@ class UpdateShiftVariables {
     required this.locationAddress,
     required this.latitude,
     required this.longitude,
+    required this.placeId,
+    required this.city,
+    required this.state,
+    required this.street,
+    required this.country,
     required this.description,
     required this.status,
     required this.workersNeeded,

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/update_tax_form.dart

@@ -2,32 +2,157 @@ part of 'generated.dart';
 
 class UpdateTaxFormVariablesBuilder {
   String id;
+  Optional<TaxFormType> _formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
+  Optional<String> _firstName = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _lastName = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _mInitial = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _oLastName = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<Timestamp> _dob = Optional.optional((json) => json['dob'] = Timestamp.fromJson(json['dob']), defaultSerializer);
+  Optional<int> _socialSN = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _email = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _phone = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _address = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _city = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _apt = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _state = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _zipCode = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<MaritalStatus> _marital = Optional.optional((data) => MaritalStatus.values.byName(data), enumSerializer);
+  Optional<bool> _multipleJob = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _childrens = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<int> _otherDeps = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _totalCredits = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _otherInconme = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _deductions = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _extraWithholding = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<CitizenshipStatus> _citizen = Optional.optional((data) => CitizenshipStatus.values.byName(data), enumSerializer);
+  Optional<String> _uscis = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _passportNumber = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _countryIssue = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<bool> _prepartorOrTranslator = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _signature = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<Timestamp> _date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
   Optional<TaxFormStatus> _status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
-  Optional<AnyValue> _formData = Optional.optional(AnyValue.fromJson, defaultSerializer);
-  Optional<String> _title = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _subtitle = Optional.optional(nativeFromJson, nativeToJson);
-  Optional<String> _description = Optional.optional(nativeFromJson, nativeToJson);
 
-  final FirebaseDataConnect _dataConnect;  UpdateTaxFormVariablesBuilder status(TaxFormStatus? t) {
+  final FirebaseDataConnect _dataConnect;  UpdateTaxFormVariablesBuilder formType(TaxFormType? t) {
+   _formType.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder firstName(String? t) {
+   _firstName.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder lastName(String? t) {
+   _lastName.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder mInitial(String? t) {
+   _mInitial.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder oLastName(String? t) {
+   _oLastName.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder dob(Timestamp? t) {
+   _dob.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder socialSN(int? t) {
+   _socialSN.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder email(String? t) {
+   _email.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder phone(String? t) {
+   _phone.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder address(String? t) {
+   _address.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder city(String? t) {
+   _city.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder apt(String? t) {
+   _apt.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder state(String? t) {
+   _state.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder zipCode(String? t) {
+   _zipCode.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder marital(MaritalStatus? t) {
+   _marital.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder multipleJob(bool? t) {
+   _multipleJob.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder childrens(int? t) {
+   _childrens.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder otherDeps(int? t) {
+   _otherDeps.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder totalCredits(double? t) {
+   _totalCredits.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder otherInconme(double? t) {
+   _otherInconme.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder deductions(double? t) {
+   _deductions.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder extraWithholding(double? t) {
+   _extraWithholding.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder citizen(CitizenshipStatus? t) {
+   _citizen.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder uscis(String? t) {
+   _uscis.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder passportNumber(String? t) {
+   _passportNumber.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder countryIssue(String? t) {
+   _countryIssue.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder prepartorOrTranslator(bool? t) {
+   _prepartorOrTranslator.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder signature(String? t) {
+   _signature.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder date(Timestamp? t) {
+   _date.value = t;
+   return this;
+  }
+  UpdateTaxFormVariablesBuilder status(TaxFormStatus? t) {
    _status.value = t;
    return this;
   }
-  UpdateTaxFormVariablesBuilder formData(AnyValue? t) {
-   _formData.value = t;
-   return this;
-  }
-  UpdateTaxFormVariablesBuilder title(String? t) {
-   _title.value = t;
-   return this;
-  }
-  UpdateTaxFormVariablesBuilder subtitle(String? t) {
-   _subtitle.value = t;
-   return this;
-  }
-  UpdateTaxFormVariablesBuilder description(String? t) {
-   _description.value = t;
-   return this;
-  }
 
   UpdateTaxFormVariablesBuilder(this._dataConnect, {required  this.id,});
   Deserializer<UpdateTaxFormData> dataDeserializer = (dynamic json)  => UpdateTaxFormData.fromJson(jsonDecode(json));
@@ -37,7 +162,7 @@ class UpdateTaxFormVariablesBuilder {
   }
 
   MutationRef<UpdateTaxFormData, UpdateTaxFormVariables> ref() {
-    UpdateTaxFormVariables vars= UpdateTaxFormVariables(id: id,status: _status,formData: _formData,title: _title,subtitle: _subtitle,description: _description,);
+    UpdateTaxFormVariables vars= UpdateTaxFormVariables(id: id,formType: _formType,firstName: _firstName,lastName: _lastName,mInitial: _mInitial,oLastName: _oLastName,dob: _dob,socialSN: _socialSN,email: _email,phone: _phone,address: _address,city: _city,apt: _apt,state: _state,zipCode: _zipCode,marital: _marital,multipleJob: _multipleJob,childrens: _childrens,otherDeps: _otherDeps,totalCredits: _totalCredits,otherInconme: _otherInconme,deductions: _deductions,extraWithholding: _extraWithholding,citizen: _citizen,uscis: _uscis,passportNumber: _passportNumber,countryIssue: _countryIssue,prepartorOrTranslator: _prepartorOrTranslator,signature: _signature,date: _date,status: _status,);
     return _dataConnect.mutation("updateTaxForm", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -115,11 +240,36 @@ class UpdateTaxFormData {
 @immutable
 class UpdateTaxFormVariables {
   final String id;
+  late final Optional<TaxFormType>formType;
+  late final Optional<String>firstName;
+  late final Optional<String>lastName;
+  late final Optional<String>mInitial;
+  late final Optional<String>oLastName;
+  late final Optional<Timestamp>dob;
+  late final Optional<int>socialSN;
+  late final Optional<String>email;
+  late final Optional<String>phone;
+  late final Optional<String>address;
+  late final Optional<String>city;
+  late final Optional<String>apt;
+  late final Optional<String>state;
+  late final Optional<String>zipCode;
+  late final Optional<MaritalStatus>marital;
+  late final Optional<bool>multipleJob;
+  late final Optional<int>childrens;
+  late final Optional<int>otherDeps;
+  late final Optional<double>totalCredits;
+  late final Optional<double>otherInconme;
+  late final Optional<double>deductions;
+  late final Optional<double>extraWithholding;
+  late final Optional<CitizenshipStatus>citizen;
+  late final Optional<String>uscis;
+  late final Optional<String>passportNumber;
+  late final Optional<String>countryIssue;
+  late final Optional<bool>prepartorOrTranslator;
+  late final Optional<String>signature;
+  late final Optional<Timestamp>date;
   late final Optional<TaxFormStatus>status;
-  late final Optional<AnyValue>formData;
-  late final Optional<String>title;
-  late final Optional<String>subtitle;
-  late final Optional<String>description;
   @Deprecated('fromJson is deprecated for Variable classes as they are no longer required for deserialization.')
   UpdateTaxFormVariables.fromJson(Map<String, dynamic> json):
   
@@ -127,25 +277,125 @@ class UpdateTaxFormVariables {
   
   
   
+    formType = Optional.optional((data) => TaxFormType.values.byName(data), enumSerializer);
+    formType.value = json['formType'] == null ? null : TaxFormType.values.byName(json['formType']);
+  
+  
+    firstName = Optional.optional(nativeFromJson, nativeToJson);
+    firstName.value = json['firstName'] == null ? null : nativeFromJson<String>(json['firstName']);
+  
+  
+    lastName = Optional.optional(nativeFromJson, nativeToJson);
+    lastName.value = json['lastName'] == null ? null : nativeFromJson<String>(json['lastName']);
+  
+  
+    mInitial = Optional.optional(nativeFromJson, nativeToJson);
+    mInitial.value = json['mInitial'] == null ? null : nativeFromJson<String>(json['mInitial']);
+  
+  
+    oLastName = Optional.optional(nativeFromJson, nativeToJson);
+    oLastName.value = json['oLastName'] == null ? null : nativeFromJson<String>(json['oLastName']);
+  
+  
+    dob = Optional.optional((json) => json['dob'] = Timestamp.fromJson(json['dob']), defaultSerializer);
+    dob.value = json['dob'] == null ? null : Timestamp.fromJson(json['dob']);
+  
+  
+    socialSN = Optional.optional(nativeFromJson, nativeToJson);
+    socialSN.value = json['socialSN'] == null ? null : nativeFromJson<int>(json['socialSN']);
+  
+  
+    email = Optional.optional(nativeFromJson, nativeToJson);
+    email.value = json['email'] == null ? null : nativeFromJson<String>(json['email']);
+  
+  
+    phone = Optional.optional(nativeFromJson, nativeToJson);
+    phone.value = json['phone'] == null ? null : nativeFromJson<String>(json['phone']);
+  
+  
+    address = Optional.optional(nativeFromJson, nativeToJson);
+    address.value = json['address'] == null ? null : nativeFromJson<String>(json['address']);
+  
+  
+    city = Optional.optional(nativeFromJson, nativeToJson);
+    city.value = json['city'] == null ? null : nativeFromJson<String>(json['city']);
+  
+  
+    apt = Optional.optional(nativeFromJson, nativeToJson);
+    apt.value = json['apt'] == null ? null : nativeFromJson<String>(json['apt']);
+  
+  
+    state = Optional.optional(nativeFromJson, nativeToJson);
+    state.value = json['state'] == null ? null : nativeFromJson<String>(json['state']);
+  
+  
+    zipCode = Optional.optional(nativeFromJson, nativeToJson);
+    zipCode.value = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']);
+  
+  
+    marital = Optional.optional((data) => MaritalStatus.values.byName(data), enumSerializer);
+    marital.value = json['marital'] == null ? null : MaritalStatus.values.byName(json['marital']);
+  
+  
+    multipleJob = Optional.optional(nativeFromJson, nativeToJson);
+    multipleJob.value = json['multipleJob'] == null ? null : nativeFromJson<bool>(json['multipleJob']);
+  
+  
+    childrens = Optional.optional(nativeFromJson, nativeToJson);
+    childrens.value = json['childrens'] == null ? null : nativeFromJson<int>(json['childrens']);
+  
+  
+    otherDeps = Optional.optional(nativeFromJson, nativeToJson);
+    otherDeps.value = json['otherDeps'] == null ? null : nativeFromJson<int>(json['otherDeps']);
+  
+  
+    totalCredits = Optional.optional(nativeFromJson, nativeToJson);
+    totalCredits.value = json['totalCredits'] == null ? null : nativeFromJson<double>(json['totalCredits']);
+  
+  
+    otherInconme = Optional.optional(nativeFromJson, nativeToJson);
+    otherInconme.value = json['otherInconme'] == null ? null : nativeFromJson<double>(json['otherInconme']);
+  
+  
+    deductions = Optional.optional(nativeFromJson, nativeToJson);
+    deductions.value = json['deductions'] == null ? null : nativeFromJson<double>(json['deductions']);
+  
+  
+    extraWithholding = Optional.optional(nativeFromJson, nativeToJson);
+    extraWithholding.value = json['extraWithholding'] == null ? null : nativeFromJson<double>(json['extraWithholding']);
+  
+  
+    citizen = Optional.optional((data) => CitizenshipStatus.values.byName(data), enumSerializer);
+    citizen.value = json['citizen'] == null ? null : CitizenshipStatus.values.byName(json['citizen']);
+  
+  
+    uscis = Optional.optional(nativeFromJson, nativeToJson);
+    uscis.value = json['uscis'] == null ? null : nativeFromJson<String>(json['uscis']);
+  
+  
+    passportNumber = Optional.optional(nativeFromJson, nativeToJson);
+    passportNumber.value = json['passportNumber'] == null ? null : nativeFromJson<String>(json['passportNumber']);
+  
+  
+    countryIssue = Optional.optional(nativeFromJson, nativeToJson);
+    countryIssue.value = json['countryIssue'] == null ? null : nativeFromJson<String>(json['countryIssue']);
+  
+  
+    prepartorOrTranslator = Optional.optional(nativeFromJson, nativeToJson);
+    prepartorOrTranslator.value = json['prepartorOrTranslator'] == null ? null : nativeFromJson<bool>(json['prepartorOrTranslator']);
+  
+  
+    signature = Optional.optional(nativeFromJson, nativeToJson);
+    signature.value = json['signature'] == null ? null : nativeFromJson<String>(json['signature']);
+  
+  
+    date = Optional.optional((json) => json['date'] = Timestamp.fromJson(json['date']), defaultSerializer);
+    date.value = json['date'] == null ? null : Timestamp.fromJson(json['date']);
+  
+  
     status = Optional.optional((data) => TaxFormStatus.values.byName(data), enumSerializer);
     status.value = json['status'] == null ? null : TaxFormStatus.values.byName(json['status']);
   
-  
-    formData = Optional.optional(AnyValue.fromJson, defaultSerializer);
-    formData.value = json['formData'] == null ? null : AnyValue.fromJson(json['formData']);
-  
-  
-    title = Optional.optional(nativeFromJson, nativeToJson);
-    title.value = json['title'] == null ? null : nativeFromJson<String>(json['title']);
-  
-  
-    subtitle = Optional.optional(nativeFromJson, nativeToJson);
-    subtitle.value = json['subtitle'] == null ? null : nativeFromJson<String>(json['subtitle']);
-  
-  
-    description = Optional.optional(nativeFromJson, nativeToJson);
-    description.value = json['description'] == null ? null : nativeFromJson<String>(json['description']);
-  
   }
   @override
   bool operator ==(Object other) {
@@ -158,45 +408,170 @@ class UpdateTaxFormVariables {
 
     final UpdateTaxFormVariables otherTyped = other as UpdateTaxFormVariables;
     return id == otherTyped.id && 
-    status == otherTyped.status && 
+    formType == otherTyped.formType && 
-    formData == otherTyped.formData && 
+    firstName == otherTyped.firstName && 
-    title == otherTyped.title && 
+    lastName == otherTyped.lastName && 
-    subtitle == otherTyped.subtitle && 
+    mInitial == otherTyped.mInitial && 
-    description == otherTyped.description;
+    oLastName == otherTyped.oLastName && 
+    dob == otherTyped.dob && 
+    socialSN == otherTyped.socialSN && 
+    email == otherTyped.email && 
+    phone == otherTyped.phone && 
+    address == otherTyped.address && 
+    city == otherTyped.city && 
+    apt == otherTyped.apt && 
+    state == otherTyped.state && 
+    zipCode == otherTyped.zipCode && 
+    marital == otherTyped.marital && 
+    multipleJob == otherTyped.multipleJob && 
+    childrens == otherTyped.childrens && 
+    otherDeps == otherTyped.otherDeps && 
+    totalCredits == otherTyped.totalCredits && 
+    otherInconme == otherTyped.otherInconme && 
+    deductions == otherTyped.deductions && 
+    extraWithholding == otherTyped.extraWithholding && 
+    citizen == otherTyped.citizen && 
+    uscis == otherTyped.uscis && 
+    passportNumber == otherTyped.passportNumber && 
+    countryIssue == otherTyped.countryIssue && 
+    prepartorOrTranslator == otherTyped.prepartorOrTranslator && 
+    signature == otherTyped.signature && 
+    date == otherTyped.date && 
+    status == otherTyped.status;
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, status.hashCode, formData.hashCode, title.hashCode, subtitle.hashCode, description.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, formType.hashCode, firstName.hashCode, lastName.hashCode, mInitial.hashCode, oLastName.hashCode, dob.hashCode, socialSN.hashCode, email.hashCode, phone.hashCode, address.hashCode, city.hashCode, apt.hashCode, state.hashCode, zipCode.hashCode, marital.hashCode, multipleJob.hashCode, childrens.hashCode, otherDeps.hashCode, totalCredits.hashCode, otherInconme.hashCode, deductions.hashCode, extraWithholding.hashCode, citizen.hashCode, uscis.hashCode, passportNumber.hashCode, countryIssue.hashCode, prepartorOrTranslator.hashCode, signature.hashCode, date.hashCode, status.hashCode]);
   
 
   Map<String, dynamic> toJson() {
     Map<String, dynamic> json = {};
     json['id'] = nativeToJson<String>(id);
+    if(formType.state == OptionalState.set) {
+      json['formType'] = formType.toJson();
+    }
+    if(firstName.state == OptionalState.set) {
+      json['firstName'] = firstName.toJson();
+    }
+    if(lastName.state == OptionalState.set) {
+      json['lastName'] = lastName.toJson();
+    }
+    if(mInitial.state == OptionalState.set) {
+      json['mInitial'] = mInitial.toJson();
+    }
+    if(oLastName.state == OptionalState.set) {
+      json['oLastName'] = oLastName.toJson();
+    }
+    if(dob.state == OptionalState.set) {
+      json['dob'] = dob.toJson();
+    }
+    if(socialSN.state == OptionalState.set) {
+      json['socialSN'] = socialSN.toJson();
+    }
+    if(email.state == OptionalState.set) {
+      json['email'] = email.toJson();
+    }
+    if(phone.state == OptionalState.set) {
+      json['phone'] = phone.toJson();
+    }
+    if(address.state == OptionalState.set) {
+      json['address'] = address.toJson();
+    }
+    if(city.state == OptionalState.set) {
+      json['city'] = city.toJson();
+    }
+    if(apt.state == OptionalState.set) {
+      json['apt'] = apt.toJson();
+    }
+    if(state.state == OptionalState.set) {
+      json['state'] = state.toJson();
+    }
+    if(zipCode.state == OptionalState.set) {
+      json['zipCode'] = zipCode.toJson();
+    }
+    if(marital.state == OptionalState.set) {
+      json['marital'] = marital.toJson();
+    }
+    if(multipleJob.state == OptionalState.set) {
+      json['multipleJob'] = multipleJob.toJson();
+    }
+    if(childrens.state == OptionalState.set) {
+      json['childrens'] = childrens.toJson();
+    }
+    if(otherDeps.state == OptionalState.set) {
+      json['otherDeps'] = otherDeps.toJson();
+    }
+    if(totalCredits.state == OptionalState.set) {
+      json['totalCredits'] = totalCredits.toJson();
+    }
+    if(otherInconme.state == OptionalState.set) {
+      json['otherInconme'] = otherInconme.toJson();
+    }
+    if(deductions.state == OptionalState.set) {
+      json['deductions'] = deductions.toJson();
+    }
+    if(extraWithholding.state == OptionalState.set) {
+      json['extraWithholding'] = extraWithholding.toJson();
+    }
+    if(citizen.state == OptionalState.set) {
+      json['citizen'] = citizen.toJson();
+    }
+    if(uscis.state == OptionalState.set) {
+      json['uscis'] = uscis.toJson();
+    }
+    if(passportNumber.state == OptionalState.set) {
+      json['passportNumber'] = passportNumber.toJson();
+    }
+    if(countryIssue.state == OptionalState.set) {
+      json['countryIssue'] = countryIssue.toJson();
+    }
+    if(prepartorOrTranslator.state == OptionalState.set) {
+      json['prepartorOrTranslator'] = prepartorOrTranslator.toJson();
+    }
+    if(signature.state == OptionalState.set) {
+      json['signature'] = signature.toJson();
+    }
+    if(date.state == OptionalState.set) {
+      json['date'] = date.toJson();
+    }
     if(status.state == OptionalState.set) {
       json['status'] = status.toJson();
     }
-    if(formData.state == OptionalState.set) {
-      json['formData'] = formData.toJson();
-    }
-    if(title.state == OptionalState.set) {
-      json['title'] = title.toJson();
-    }
-    if(subtitle.state == OptionalState.set) {
-      json['subtitle'] = subtitle.toJson();
-    }
-    if(description.state == OptionalState.set) {
-      json['description'] = description.toJson();
-    }
     return json;
   }
 
   UpdateTaxFormVariables({
     required this.id,
+    required this.formType,
+    required this.firstName,
+    required this.lastName,
+    required this.mInitial,
+    required this.oLastName,
+    required this.dob,
+    required this.socialSN,
+    required this.email,
+    required this.phone,
+    required this.address,
+    required this.city,
+    required this.apt,
+    required this.state,
+    required this.zipCode,
+    required this.marital,
+    required this.multipleJob,
+    required this.childrens,
+    required this.otherDeps,
+    required this.totalCredits,
+    required this.otherInconme,
+    required this.deductions,
+    required this.extraWithholding,
+    required this.citizen,
+    required this.uscis,
+    required this.passportNumber,
+    required this.countryIssue,
+    required this.prepartorOrTranslator,
+    required this.signature,
+    required this.date,
     required this.status,
-    required this.formData,
-    required this.title,
-    required this.subtitle,
-    required this.description,
   });
 }
 

apps/mobile/packages/data_connect/lib/src/dataconnect_generated/update_team_hub.dart

@@ -2,16 +2,26 @@ part of 'generated.dart';
 
 class UpdateTeamHubVariablesBuilder {
   String id;
+  Optional<String> _teamId = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _hubName = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _address = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _placeId = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _latitude = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<double> _longitude = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _city = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _state = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _street = Optional.optional(nativeFromJson, nativeToJson);
+  Optional<String> _country = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _zipCode = Optional.optional(nativeFromJson, nativeToJson);
   Optional<String> _managerName = Optional.optional(nativeFromJson, nativeToJson);
   Optional<bool> _isActive = Optional.optional(nativeFromJson, nativeToJson);
   Optional<AnyValue> _departments = Optional.optional(AnyValue.fromJson, defaultSerializer);
 
-  final FirebaseDataConnect _dataConnect;  UpdateTeamHubVariablesBuilder hubName(String? t) {
+  final FirebaseDataConnect _dataConnect;  UpdateTeamHubVariablesBuilder teamId(String? t) {
+   _teamId.value = t;
+   return this;
+  }
+  UpdateTeamHubVariablesBuilder hubName(String? t) {
    _hubName.value = t;
    return this;
   }
@@ -19,6 +29,18 @@ class UpdateTeamHubVariablesBuilder {
    _address.value = t;
    return this;
   }
+  UpdateTeamHubVariablesBuilder placeId(String? t) {
+   _placeId.value = t;
+   return this;
+  }
+  UpdateTeamHubVariablesBuilder latitude(double? t) {
+   _latitude.value = t;
+   return this;
+  }
+  UpdateTeamHubVariablesBuilder longitude(double? t) {
+   _longitude.value = t;
+   return this;
+  }
   UpdateTeamHubVariablesBuilder city(String? t) {
    _city.value = t;
    return this;
@@ -27,6 +49,14 @@ class UpdateTeamHubVariablesBuilder {
    _state.value = t;
    return this;
   }
+  UpdateTeamHubVariablesBuilder street(String? t) {
+   _street.value = t;
+   return this;
+  }
+  UpdateTeamHubVariablesBuilder country(String? t) {
+   _country.value = t;
+   return this;
+  }
   UpdateTeamHubVariablesBuilder zipCode(String? t) {
    _zipCode.value = t;
    return this;
@@ -52,7 +82,7 @@ class UpdateTeamHubVariablesBuilder {
   }
 
   MutationRef<UpdateTeamHubData, UpdateTeamHubVariables> ref() {
-    UpdateTeamHubVariables vars= UpdateTeamHubVariables(id: id,hubName: _hubName,address: _address,city: _city,state: _state,zipCode: _zipCode,managerName: _managerName,isActive: _isActive,departments: _departments,);
+    UpdateTeamHubVariables vars= UpdateTeamHubVariables(id: id,teamId: _teamId,hubName: _hubName,address: _address,placeId: _placeId,latitude: _latitude,longitude: _longitude,city: _city,state: _state,street: _street,country: _country,zipCode: _zipCode,managerName: _managerName,isActive: _isActive,departments: _departments,);
     return _dataConnect.mutation("updateTeamHub", dataDeserializer, varsSerializer, vars);
   }
 }
@@ -130,10 +160,16 @@ class UpdateTeamHubData {
 @immutable
 class UpdateTeamHubVariables {
   final String id;
+  late final Optional<String>teamId;
   late final Optional<String>hubName;
   late final Optional<String>address;
+  late final Optional<String>placeId;
+  late final Optional<double>latitude;
+  late final Optional<double>longitude;
   late final Optional<String>city;
   late final Optional<String>state;
+  late final Optional<String>street;
+  late final Optional<String>country;
   late final Optional<String>zipCode;
   late final Optional<String>managerName;
   late final Optional<bool>isActive;
@@ -145,6 +181,10 @@ class UpdateTeamHubVariables {
   
   
   
+    teamId = Optional.optional(nativeFromJson, nativeToJson);
+    teamId.value = json['teamId'] == null ? null : nativeFromJson<String>(json['teamId']);
+  
+  
     hubName = Optional.optional(nativeFromJson, nativeToJson);
     hubName.value = json['hubName'] == null ? null : nativeFromJson<String>(json['hubName']);
   
@@ -153,6 +193,18 @@ class UpdateTeamHubVariables {
     address.value = json['address'] == null ? null : nativeFromJson<String>(json['address']);
   
   
+    placeId = Optional.optional(nativeFromJson, nativeToJson);
+    placeId.value = json['placeId'] == null ? null : nativeFromJson<String>(json['placeId']);
+  
+  
+    latitude = Optional.optional(nativeFromJson, nativeToJson);
+    latitude.value = json['latitude'] == null ? null : nativeFromJson<double>(json['latitude']);
+  
+  
+    longitude = Optional.optional(nativeFromJson, nativeToJson);
+    longitude.value = json['longitude'] == null ? null : nativeFromJson<double>(json['longitude']);
+  
+  
     city = Optional.optional(nativeFromJson, nativeToJson);
     city.value = json['city'] == null ? null : nativeFromJson<String>(json['city']);
   
@@ -161,6 +213,14 @@ class UpdateTeamHubVariables {
     state.value = json['state'] == null ? null : nativeFromJson<String>(json['state']);
   
   
+    street = Optional.optional(nativeFromJson, nativeToJson);
+    street.value = json['street'] == null ? null : nativeFromJson<String>(json['street']);
+  
+  
+    country = Optional.optional(nativeFromJson, nativeToJson);
+    country.value = json['country'] == null ? null : nativeFromJson<String>(json['country']);
+  
+  
     zipCode = Optional.optional(nativeFromJson, nativeToJson);
     zipCode.value = json['zipCode'] == null ? null : nativeFromJson<String>(json['zipCode']);
   
@@ -188,10 +248,16 @@ class UpdateTeamHubVariables {
 
     final UpdateTeamHubVariables otherTyped = other as UpdateTeamHubVariables;
     return id == otherTyped.id && 
+    teamId == otherTyped.teamId && 
     hubName == otherTyped.hubName && 
     address == otherTyped.address && 
+    placeId == otherTyped.placeId && 
+    latitude == otherTyped.latitude && 
+    longitude == otherTyped.longitude && 
     city == otherTyped.city && 
     state == otherTyped.state && 
+    street == otherTyped.street && 
+    country == otherTyped.country && 
     zipCode == otherTyped.zipCode && 
     managerName == otherTyped.managerName && 
     isActive == otherTyped.isActive && 
@@ -199,24 +265,42 @@ class UpdateTeamHubVariables {
     
   }
   @override
-  int get hashCode => Object.hashAll([id.hashCode, hubName.hashCode, address.hashCode, city.hashCode, state.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode]);
+  int get hashCode => Object.hashAll([id.hashCode, teamId.hashCode, hubName.hashCode, address.hashCode, placeId.hashCode, latitude.hashCode, longitude.hashCode, city.hashCode, state.hashCode, street.hashCode, country.hashCode, zipCode.hashCode, managerName.hashCode, isActive.hashCode, departments.hashCode]);
   
 
   Map<String, dynamic> toJson() {
     Map<String, dynamic> json = {};
     json['id'] = nativeToJson<String>(id);
+    if(teamId.state == OptionalState.set) {
+      json['teamId'] = teamId.toJson();
+    }
     if(hubName.state == OptionalState.set) {
       json['hubName'] = hubName.toJson();
     }
     if(address.state == OptionalState.set) {
       json['address'] = address.toJson();
     }
+    if(placeId.state == OptionalState.set) {
+      json['placeId'] = placeId.toJson();
+    }
+    if(latitude.state == OptionalState.set) {
+      json['latitude'] = latitude.toJson();
+    }
+    if(longitude.state == OptionalState.set) {
+      json['longitude'] = longitude.toJson();
+    }
     if(city.state == OptionalState.set) {
       json['city'] = city.toJson();
     }
     if(state.state == OptionalState.set) {
       json['state'] = state.toJson();
     }
+    if(street.state == OptionalState.set) {
+      json['street'] = street.toJson();
+    }
+    if(country.state == OptionalState.set) {
+      json['country'] = country.toJson();
+    }
     if(zipCode.state == OptionalState.set) {
       json['zipCode'] = zipCode.toJson();
     }
@@ -234,10 +318,16 @@ class UpdateTeamHubVariables {
 
   UpdateTeamHubVariables({
     required this.id,
+    required this.teamId,
     required this.hubName,
     required this.address,
+    required this.placeId,
+    required this.latitude,
+    required this.longitude,
     required this.city,
     required this.state,
+    required this.street,
+    required this.country,
     required this.zipCode,
     required this.managerName,
     required this.isActive,

apps/mobile/packages/design_system/lib/src/ui_constants.dart

@@ -37,4 +37,7 @@ class UiConstants {
   static const double space12 = 48.0;
   static const double space14 = 56.0;
   static const double space16 = 64.0;
+  static const double space20 = 80.0;
+  static const double space24 = 96.0;
+  static const double space32 = 128.0;
 }

apps/mobile/packages/domain/lib/src/adapters/profile/tax_form_adapter.dart

@@ -15,18 +15,36 @@ class TaxFormAdapter {
     DateTime? createdAt,
     DateTime? updatedAt,
   }) {
-    return TaxForm(
+    final TaxFormType formType = _stringToType(type);
-      id: id,
+    final TaxFormStatus formStatus = _stringToStatus(status);
-      type: _stringToType(type),
+    final Map<String, dynamic> formDetails =
-      title: title,
+        formData is Map ? Map<String, dynamic>.from(formData as Map) : <String, dynamic>{};
-      subtitle: subtitle,
+
-      description: description,
+    if (formType == TaxFormType.i9) {
-      status: _stringToStatus(status),
+      return I9TaxForm(
-      staffId: staffId,
+        id: id,
-      formData: formData is Map ? Map<String, dynamic>.from(formData) : null,
+        title: title,
-      createdAt: createdAt,
+        subtitle: subtitle,
-      updatedAt: updatedAt,
+        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) {

apps/mobile/packages/domain/lib/src/entities/orders/one_time_order.dart

@@ -10,6 +10,8 @@ class OneTimeOrder extends Equatable {
     required this.date,
     required this.location,
     required this.positions,
+    this.hub,
+    this.eventName,
     this.vendorId,
     this.roleRates = const <String, double>{},
   });
@@ -22,6 +24,12 @@ class OneTimeOrder extends Equatable {
   /// The list of positions and headcounts required for this order.
   final List<OneTimeOrderPosition> positions;
 
+  /// Selected hub details for this order.
+  final OneTimeOrderHubDetails? hub;
+
+  /// Optional order name.
+  final String? eventName;
+
   /// Selected vendor id for this order.
   final String? vendorId;
 
@@ -33,7 +41,53 @@ class OneTimeOrder extends Equatable {
     date,
     location,
     positions,
+    hub,
+    eventName,
     vendorId,
     roleRates,
   ];
 }
+
+/// Minimal hub details used during order creation.
+class OneTimeOrderHubDetails extends Equatable {
+  const OneTimeOrderHubDetails({
+    required this.id,
+    required this.name,
+    required this.address,
+    this.placeId,
+    this.latitude,
+    this.longitude,
+    this.city,
+    this.state,
+    this.street,
+    this.country,
+    this.zipCode,
+  });
+
+  final String id;
+  final String name;
+  final String address;
+  final String? placeId;
+  final double? latitude;
+  final double? longitude;
+  final String? city;
+  final String? state;
+  final String? street;
+  final String? country;
+  final String? zipCode;
+
+  @override
+  List<Object?> get props => <Object?>[
+    id,
+    name,
+    address,
+    placeId,
+    latitude,
+    longitude,
+    city,
+    state,
+    street,
+    country,
+    zipCode,
+  ];
+}

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;
+}

apps/mobile/packages/features/client/billing/lib/src/data/repositories_impl/billing_repository_impl.dart

@@ -166,9 +166,10 @@ class BillingRepositoryImpl implements BillingRepository {
   }
 
   fdc.Timestamp _toTimestamp(DateTime dateTime) {
-    final int seconds = dateTime.millisecondsSinceEpoch ~/ 1000;
+    final DateTime utc = dateTime.toUtc();
+    final int seconds = utc.millisecondsSinceEpoch ~/ 1000;
     final int nanoseconds =
-        (dateTime.millisecondsSinceEpoch % 1000) * 1000000;
+        (utc.millisecondsSinceEpoch % 1000) * 1000000;
     return fdc.Timestamp(nanoseconds, seconds);
   }
 

apps/mobile/packages/features/client/billing/lib/src/presentation/pages/billing_page.dart

@@ -2,16 +2,16 @@ import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
+
 import '../blocs/billing_bloc.dart';
 import '../blocs/billing_event.dart';
 import '../blocs/billing_state.dart';
 import '../widgets/billing_header.dart';
-import '../widgets/pending_invoices_section.dart';
-import '../widgets/payment_method_card.dart';
-import '../widgets/spending_breakdown_card.dart';
-import '../widgets/savings_card.dart';
 import '../widgets/invoice_history_section.dart';
-import '../widgets/export_invoices_button.dart';
+import '../widgets/payment_method_card.dart';
+import '../widgets/pending_invoices_section.dart';
+import '../widgets/savings_card.dart';
+import '../widgets/spending_breakdown_card.dart';
 
 /// The entry point page for the client billing feature.
 ///
@@ -43,7 +43,6 @@ class BillingView extends StatelessWidget {
     return BlocBuilder<BillingBloc, BillingState>(
       builder: (BuildContext context, BillingState state) {
         return Scaffold(
-          backgroundColor: UiColors.bgPrimary,
           body: Column(
             children: <Widget>[
               BillingHeader(
@@ -89,9 +88,7 @@ class BillingView extends StatelessWidget {
           SavingsCard(savings: state.savings),
           const SizedBox(height: UiConstants.space6),
           InvoiceHistorySection(invoices: state.invoiceHistory),
-          const SizedBox(height: UiConstants.space6),
+          const SizedBox(height: UiConstants.space24),
-          const ExportInvoicesButton(),
-          const SizedBox(height: UiConstants.space6),
         ],
       ),
     );

apps/mobile/packages/features/client/billing/pubspec.yaml

@@ -1,7 +1,7 @@
 name: billing
 description: Client Billing feature package
 publish_to: 'none'
-version: 1.0.0+1
+version: 0.0.1
 resolution: workspace
 
 environment:

apps/mobile/packages/features/client/client_coverage/lib/src/data/repositories_impl/coverage_repository_impl.dart

@@ -100,9 +100,10 @@ class CoverageRepositoryImpl implements CoverageRepository {
   }
 
   fdc.Timestamp _toTimestamp(DateTime dateTime) {
-    final int seconds = dateTime.millisecondsSinceEpoch ~/ 1000;
+    final DateTime utc = dateTime.toUtc();
+    final int seconds = utc.millisecondsSinceEpoch ~/ 1000;
     final int nanoseconds =
-        (dateTime.millisecondsSinceEpoch % 1000) * 1000000;
+        (utc.millisecondsSinceEpoch % 1000) * 1000000;
     return fdc.Timestamp(nanoseconds, seconds);
   }
 
@@ -195,7 +196,7 @@ class CoverageRepositoryImpl implements CoverageRepository {
     if (timestamp == null) {
       return null;
     }
-    final DateTime date = timestamp.toDateTime();
+    final DateTime date = timestamp.toDateTime().toLocal();
     final String hour = date.hour.toString().padLeft(2, '0');
     final String minute = date.minute.toString().padLeft(2, '0');
     return '$hour:$minute';

apps/mobile/packages/features/client/client_coverage/lib/src/domain/ui_entities/coverage_entities.dart

@@ -39,7 +39,7 @@ class CoverageShift extends Equatable {
 
   /// Calculates the coverage percentage for this shift.
   int get coveragePercent {
-    if (workersNeeded == 0) return 100;
+    if (workersNeeded == 0) return 0;
     return ((workers.length / workersNeeded) * 100).round();
   }
 
@@ -118,7 +118,7 @@ class CoverageStats extends Equatable {
 
   /// Calculates the overall coverage percentage.
   int get coveragePercent {
-    if (totalNeeded == 0) return 100;
+    if (totalNeeded == 0) return 0;
     return ((totalConfirmed / totalNeeded) * 100).round();
   }
 

apps/mobile/packages/features/client/client_coverage/lib/src/presentation/pages/coverage_page.dart

@@ -24,7 +24,6 @@ class CoveragePage extends StatelessWidget {
       create: (BuildContext context) => Modular.get<CoverageBloc>()
         ..add(CoverageLoadRequested(date: DateTime.now())),
       child: Scaffold(
-        backgroundColor: UiColors.background,
         body: BlocBuilder<CoverageBloc, CoverageState>(
           builder: (BuildContext context, CoverageState state) {
             return Column(
@@ -114,13 +113,14 @@ class CoveragePage extends StatelessWidget {
             const SizedBox(height: UiConstants.space5),
           ],
           Text(
-            'Shifts',
+            'Shifts (${state.shifts.length})',
             style: UiTypography.title2b.copyWith(
               color: UiColors.textPrimary,
             ),
           ),
           const SizedBox(height: UiConstants.space3),
           CoverageShiftList(shifts: state.shifts),
+          const SizedBox(height: 100),
         ],
       ),
     );

apps/mobile/packages/features/client/client_coverage/lib/src/presentation/widgets/coverage_shift_list.dart

@@ -35,24 +35,23 @@ class CoverageShiftList extends StatelessWidget {
     if (shifts.isEmpty) {
       return Container(
         padding: const EdgeInsets.all(UiConstants.space8),
+        width: double.infinity,
         decoration: BoxDecoration(
           color: UiColors.bgPopup,
           borderRadius: UiConstants.radiusLg,
           border: Border.all(color: UiColors.border),
         ),
         child: Column(
+          spacing: UiConstants.space4,
           children: <Widget>[
             const Icon(
               UiIcons.users,
               size: UiConstants.space12,
-              color: UiColors.mutedForeground,
+              color: UiColors.textSecondary,
             ),
-            const SizedBox(height: UiConstants.space3),
             Text(
               'No shifts scheduled for this day',
-              style: UiTypography.body2r.copyWith(
+              style: UiTypography.body2r.textSecondary,
-                color: UiColors.mutedForeground,
-              ),
             ),
           ],
         ),
@@ -160,12 +159,15 @@ class _ShiftHeader extends StatelessWidget {
         ),
       ),
       child: Row(
+        spacing: UiConstants.space4,
         children: <Widget>[
           Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
+              spacing: UiConstants.space2,
               children: <Widget>[
                 Row(
+                  spacing: UiConstants.space2,
                   children: <Widget>[
                     Container(
                       width: UiConstants.space2,
@@ -175,42 +177,43 @@ class _ShiftHeader extends StatelessWidget {
                         shape: BoxShape.circle,
                       ),
                     ),
-                    const SizedBox(width: UiConstants.space2),
                     Text(
                       title,
-                      style: UiTypography.body1b.copyWith(
+                      style: UiTypography.body1b.textPrimary,
-                        color: UiColors.textPrimary,
-                      ),
                     ),
                   ],
                 ),
-                const SizedBox(height: UiConstants.space2),
+                Column(
-                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
-                    const Icon(
+                    Row(
-                      UiIcons.mapPin,
+                      spacing: UiConstants.space1,
-                      size: UiConstants.space3,
+                      children: <Widget>[
-                      color: UiColors.mutedForeground,
+                        const Icon(
+                          UiIcons.mapPin,
+                          size: UiConstants.space3,
+                          color: UiColors.iconSecondary,
+                        ),
+                        Expanded(child: Text(
+                          location,
+                          style: UiTypography.body3r.textSecondary,
+                          overflow: TextOverflow.ellipsis,
+                        )),
+                      ],
                     ),
-                    const SizedBox(width: UiConstants.space1),
+                    Row(
-                    Text(
+                      spacing: UiConstants.space1,
-                      location,
+                      children: <Widget>[
-                      style: UiTypography.body3r.copyWith(
+                        const Icon(
-                        color: UiColors.mutedForeground,
+                          UiIcons.clock,
-                      ),
+                          size: UiConstants.space3,
-                    ),
+                          color: UiColors.iconSecondary,
-                    const SizedBox(width: UiConstants.space3),
+                        ),
-                    const Icon(
+                        Text(
-                      UiIcons.clock,
+                          startTime,
-                      size: UiConstants.space3,
+                          style: UiTypography.body3r.textSecondary,
-                      color: UiColors.mutedForeground,
+                        ),
-                    ),
+                      ],
-                    const SizedBox(width: UiConstants.space1),
-                    Text(
-                      startTime,
-                      style: UiTypography.body3r.copyWith(
-                        color: UiColors.mutedForeground,
-                      ),
                     ),
                   ],
                 ),

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"

apps/mobile/packages/features/client/client_coverage/pubspec.yaml

@@ -1,7 +1,8 @@
 name: client_coverage
 description: Client coverage feature for tracking daily shift coverage and worker status
-version: 1.0.0
+version: 0.0.1
 publish_to: none
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
@@ -26,9 +27,10 @@ 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:
     sdk: flutter
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0

apps/mobile/packages/features/client/client_main/lib/src/presentation/pages/client_main_page.dart

@@ -30,7 +30,7 @@ class ClientMainPage extends StatelessWidget {
                 BlocProvider.of<ClientMainCubit>(context).navigateToTab(index);
               },
             );
-          },
+          }, 
         ),
       ),
     );

apps/mobile/packages/features/client/client_main/lib/src/presentation/widgets/client_main_bottom_bar.dart

@@ -99,13 +99,6 @@ class ClientMainBottomBar extends StatelessWidget {
                 activeColor: activeColor,
                 inactiveColor: inactiveColor,
               ),
-              _buildNavItem(
-                index: 4,
-                icon: UiIcons.chart,
-                label: t.client_main.tabs.reports,
-                activeColor: activeColor,
-                inactiveColor: inactiveColor,
-              ),
             ],
           ),
         ),

apps/mobile/packages/features/client/create_order/lib/src/data/repositories_impl/client_create_order_repository_impl.dart

@@ -27,26 +27,28 @@ class ClientCreateOrderRepositoryImpl
   @override
   Future<List<domain.OrderType>> getOrderTypes() {
     return Future.value(const <domain.OrderType>[
-      domain.OrderType(
-        id: 'rapid',
-        titleKey: 'client_create_order.types.rapid',
-        descriptionKey: 'client_create_order.types.rapid_desc',
-      ),
       domain.OrderType(
         id: 'one-time',
         titleKey: 'client_create_order.types.one_time',
         descriptionKey: 'client_create_order.types.one_time_desc',
       ),
-      domain.OrderType(
+
-        id: 'recurring',
+      /// TODO: FEATURE_NOT_YET_IMPLEMENTED
-        titleKey: 'client_create_order.types.recurring',
+      // domain.OrderType(
-        descriptionKey: 'client_create_order.types.recurring_desc',
+      //   id: 'rapid',
-      ),
+      //   titleKey: 'client_create_order.types.rapid',
-      domain.OrderType(
+      //   descriptionKey: 'client_create_order.types.rapid_desc',
-        id: 'permanent',
+      // ),
-        titleKey: 'client_create_order.types.permanent',
+      // domain.OrderType(
-        descriptionKey: 'client_create_order.types.permanent_desc',
+      //   id: 'recurring',
-      ),
+      //   titleKey: 'client_create_order.types.recurring',
+      //   descriptionKey: 'client_create_order.types.recurring_desc',
+      // ),
+      // domain.OrderType(
+      //   id: 'permanent',
+      //   titleKey: 'client_create_order.types.permanent',
+      //   descriptionKey: 'client_create_order.types.permanent_desc',
+      // ),
     ]);
   }
 
@@ -61,12 +63,25 @@ class ClientCreateOrderRepositoryImpl
     if (vendorId == null || vendorId.isEmpty) {
       throw Exception('Vendor is missing.');
     }
+    final domain.OneTimeOrderHubDetails? hub = order.hub;
+    if (hub == null || hub.id.isEmpty) {
+      throw Exception('Hub is missing.');
+    }
 
-    final fdc.Timestamp orderTimestamp = _toTimestamp(order.date);
+    final DateTime orderDateOnly = DateTime(
+      order.date.year,
+      order.date.month,
+      order.date.day,
+    );
+    final fdc.Timestamp orderTimestamp = _toTimestamp(orderDateOnly);
     final fdc.OperationResult<dc.CreateOrderData, dc.CreateOrderVariables> orderResult = await _dataConnect
-        .createOrder(businessId: businessId, orderType: dc.OrderType.ONE_TIME)
+        .createOrder(
+          businessId: businessId,
+          orderType: dc.OrderType.ONE_TIME,
+          teamHubId: hub.id,
+        )
         .vendorId(vendorId)
-        .location(order.location)
+        .eventName(order.eventName)
         .status(dc.OrderStatus.POSTED)
         .date(orderTimestamp)
         .execute();
@@ -86,8 +101,15 @@ class ClientCreateOrderRepositoryImpl
     final fdc.OperationResult<dc.CreateShiftData, dc.CreateShiftVariables> shiftResult = await _dataConnect
         .createShift(title: shiftTitle, orderId: orderId)
         .date(orderTimestamp)
-        .location(order.location)
+        .location(hub.name)
-        .locationAddress(order.location)
+        .locationAddress(hub.address)
+        .latitude(hub.latitude)
+        .longitude(hub.longitude)
+        .placeId(hub.placeId)
+        .city(hub.city)
+        .state(hub.state)
+        .street(hub.street)
+        .country(hub.country)
         .status(dc.ShiftStatus.PENDING)
         .workersNeeded(workersNeeded)
         .filled(0)
@@ -109,6 +131,10 @@ class ClientCreateOrderRepositoryImpl
       final double rate = order.roleRates[position.role] ?? 0;
       final double totalValue = rate * hours * position.count;
 
+      print(
+        'CreateOneTimeOrder shiftRole: start=${start.toIso8601String()} end=${normalizedEnd.toIso8601String()}',
+      );
+
       await _dataConnect
           .createShiftRole(
             shiftId: shiftId,
@@ -124,7 +150,7 @@ class ClientCreateOrderRepositoryImpl
     }
 
     await _dataConnect
-        .updateOrder(id: orderId)
+        .updateOrder(id: orderId, teamHubId: hub.id)
         .shifts(fdc.AnyValue(<String>[shiftId]))
         .execute();
   }

apps/mobile/packages/features/client/create_order/lib/src/presentation/blocs/one_time_order_bloc.dart

@@ -13,14 +13,17 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState> {
     : super(OneTimeOrderState.initial()) {
     on<OneTimeOrderVendorsLoaded>(_onVendorsLoaded);
     on<OneTimeOrderVendorChanged>(_onVendorChanged);
+    on<OneTimeOrderHubsLoaded>(_onHubsLoaded);
+    on<OneTimeOrderHubChanged>(_onHubChanged);
+    on<OneTimeOrderEventNameChanged>(_onEventNameChanged);
     on<OneTimeOrderDateChanged>(_onDateChanged);
-    on<OneTimeOrderLocationChanged>(_onLocationChanged);
     on<OneTimeOrderPositionAdded>(_onPositionAdded);
     on<OneTimeOrderPositionRemoved>(_onPositionRemoved);
     on<OneTimeOrderPositionUpdated>(_onPositionUpdated);
     on<OneTimeOrderSubmitted>(_onSubmitted);
 
     _loadVendors();
+    _loadHubs();
   }
   final CreateOneTimeOrderUseCase _createOneTimeOrderUseCase;
   final dc.ExampleConnector _dataConnect;
@@ -63,6 +66,38 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState> {
     }
   }
 
+  Future<void> _loadHubs() async {
+    try {
+      final String? businessId = dc.ClientSessionStore.instance.session?.business?.id;
+      if (businessId == null || businessId.isEmpty) {
+        add(const OneTimeOrderHubsLoaded(<OneTimeOrderHubOption>[]));
+        return;
+      }
+      final QueryResult<dc.ListTeamHubsByOwnerIdData, dc.ListTeamHubsByOwnerIdVariables>
+      result = await _dataConnect.listTeamHubsByOwnerId(ownerId: businessId).execute();
+      final List<OneTimeOrderHubOption> hubs = result.data.teamHubs
+          .map(
+            (dc.ListTeamHubsByOwnerIdTeamHubs hub) => OneTimeOrderHubOption(
+              id: hub.id,
+              name: hub.hubName,
+              address: hub.address,
+              placeId: hub.placeId,
+              latitude: hub.latitude,
+              longitude: hub.longitude,
+              city: hub.city,
+              state: hub.state,
+              street: hub.street,
+              country: hub.country,
+              zipCode: hub.zipCode,
+            ),
+          )
+          .toList();
+      add(OneTimeOrderHubsLoaded(hubs));
+    } catch (_) {
+      add(const OneTimeOrderHubsLoaded(<OneTimeOrderHubOption>[]));
+    }
+  }
+
   void _onVendorsLoaded(
     OneTimeOrderVendorsLoaded event,
     Emitter<OneTimeOrderState> emit,
@@ -88,6 +123,40 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState> {
     _loadRolesForVendor(event.vendor.id);
   }
 
+  void _onHubsLoaded(
+    OneTimeOrderHubsLoaded event,
+    Emitter<OneTimeOrderState> emit,
+  ) {
+    final OneTimeOrderHubOption? selectedHub =
+        event.hubs.isNotEmpty ? event.hubs.first : null;
+    emit(
+      state.copyWith(
+        hubs: event.hubs,
+        selectedHub: selectedHub,
+        location: selectedHub?.name ?? '',
+      ),
+    );
+  }
+
+  void _onHubChanged(
+    OneTimeOrderHubChanged event,
+    Emitter<OneTimeOrderState> emit,
+  ) {
+    emit(
+      state.copyWith(
+        selectedHub: event.hub,
+        location: event.hub.name,
+      ),
+    );
+  }
+
+  void _onEventNameChanged(
+    OneTimeOrderEventNameChanged event,
+    Emitter<OneTimeOrderState> emit,
+  ) {
+    emit(state.copyWith(eventName: event.eventName));
+  }
+
   void _onDateChanged(
     OneTimeOrderDateChanged event,
     Emitter<OneTimeOrderState> emit,
@@ -95,13 +164,6 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState> {
     emit(state.copyWith(date: event.date));
   }
 
-  void _onLocationChanged(
-    OneTimeOrderLocationChanged event,
-    Emitter<OneTimeOrderState> emit,
-  ) {
-    emit(state.copyWith(location: event.location));
-  }
-
   void _onPositionAdded(
     OneTimeOrderPositionAdded event,
     Emitter<OneTimeOrderState> emit,
@@ -149,10 +211,28 @@ class OneTimeOrderBloc extends Bloc<OneTimeOrderEvent, OneTimeOrderState> {
       final Map<String, double> roleRates = <String, double>{
         for (final OneTimeOrderRoleOption role in state.roles) role.id: role.costPerHour,
       };
+      final OneTimeOrderHubOption? selectedHub = state.selectedHub;
+      if (selectedHub == null) {
+        throw Exception('Hub is missing.');
+      }
       final OneTimeOrder order = OneTimeOrder(
         date: state.date,
-        location: state.location,
+        location: selectedHub.name,
         positions: state.positions,
+        hub: OneTimeOrderHubDetails(
+          id: selectedHub.id,
+          name: selectedHub.name,
+          address: selectedHub.address,
+          placeId: selectedHub.placeId,
+          latitude: selectedHub.latitude,
+          longitude: selectedHub.longitude,
+          city: selectedHub.city,
+          state: selectedHub.state,
+          street: selectedHub.street,
+          country: selectedHub.country,
+          zipCode: selectedHub.zipCode,
+        ),
+        eventName: state.eventName,
         vendorId: state.selectedVendor?.id,
         roleRates: roleRates,
       );

apps/mobile/packages/features/client/create_order/lib/src/presentation/blocs/one_time_order_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:krow_domain/krow_domain.dart';
+import 'one_time_order_state.dart';
 
 abstract class OneTimeOrderEvent extends Equatable {
   const OneTimeOrderEvent();
@@ -24,6 +25,30 @@ class OneTimeOrderVendorChanged extends OneTimeOrderEvent {
   List<Object?> get props => <Object?>[vendor];
 }
 
+class OneTimeOrderHubsLoaded extends OneTimeOrderEvent {
+  const OneTimeOrderHubsLoaded(this.hubs);
+  final List<OneTimeOrderHubOption> hubs;
+
+  @override
+  List<Object?> get props => <Object?>[hubs];
+}
+
+class OneTimeOrderHubChanged extends OneTimeOrderEvent {
+  const OneTimeOrderHubChanged(this.hub);
+  final OneTimeOrderHubOption hub;
+
+  @override
+  List<Object?> get props => <Object?>[hub];
+}
+
+class OneTimeOrderEventNameChanged extends OneTimeOrderEvent {
+  const OneTimeOrderEventNameChanged(this.eventName);
+  final String eventName;
+
+  @override
+  List<Object?> get props => <Object?>[eventName];
+}
+
 class OneTimeOrderDateChanged extends OneTimeOrderEvent {
   const OneTimeOrderDateChanged(this.date);
   final DateTime date;
@@ -32,14 +57,6 @@ class OneTimeOrderDateChanged extends OneTimeOrderEvent {
   List<Object?> get props => <Object?>[date];
 }
 
-class OneTimeOrderLocationChanged extends OneTimeOrderEvent {
-  const OneTimeOrderLocationChanged(this.location);
-  final String location;
-
-  @override
-  List<Object?> get props => <Object?>[location];
-}
-
 class OneTimeOrderPositionAdded extends OneTimeOrderEvent {
   const OneTimeOrderPositionAdded();
 }

apps/mobile/packages/features/client/create_order/lib/src/presentation/blocs/one_time_order_state.dart

@@ -7,11 +7,14 @@ class OneTimeOrderState extends Equatable {
   const OneTimeOrderState({
     required this.date,
     required this.location,
+    required this.eventName,
     required this.positions,
     this.status = OneTimeOrderStatus.initial,
     this.errorMessage,
     this.vendors = const <Vendor>[],
     this.selectedVendor,
+    this.hubs = const <OneTimeOrderHubOption>[],
+    this.selectedHub,
     this.roles = const <OneTimeOrderRoleOption>[],
   });
 
@@ -19,40 +22,51 @@ class OneTimeOrderState extends Equatable {
     return OneTimeOrderState(
       date: DateTime.now(),
       location: '',
+      eventName: '',
       positions: const <OneTimeOrderPosition>[
         OneTimeOrderPosition(role: '', count: 1, startTime: '', endTime: ''),
       ],
       vendors: const <Vendor>[],
+      hubs: const <OneTimeOrderHubOption>[],
       roles: const <OneTimeOrderRoleOption>[],
     );
   }
   final DateTime date;
   final String location;
+  final String eventName;
   final List<OneTimeOrderPosition> positions;
   final OneTimeOrderStatus status;
   final String? errorMessage;
   final List<Vendor> vendors;
   final Vendor? selectedVendor;
+  final List<OneTimeOrderHubOption> hubs;
+  final OneTimeOrderHubOption? selectedHub;
   final List<OneTimeOrderRoleOption> roles;
 
   OneTimeOrderState copyWith({
     DateTime? date,
     String? location,
+    String? eventName,
     List<OneTimeOrderPosition>? positions,
     OneTimeOrderStatus? status,
     String? errorMessage,
     List<Vendor>? vendors,
     Vendor? selectedVendor,
+    List<OneTimeOrderHubOption>? hubs,
+    OneTimeOrderHubOption? selectedHub,
     List<OneTimeOrderRoleOption>? roles,
   }) {
     return OneTimeOrderState(
       date: date ?? this.date,
       location: location ?? this.location,
+      eventName: eventName ?? this.eventName,
       positions: positions ?? this.positions,
       status: status ?? this.status,
       errorMessage: errorMessage ?? this.errorMessage,
       vendors: vendors ?? this.vendors,
       selectedVendor: selectedVendor ?? this.selectedVendor,
+      hubs: hubs ?? this.hubs,
+      selectedHub: selectedHub ?? this.selectedHub,
       roles: roles ?? this.roles,
     );
   }
@@ -61,15 +75,61 @@ class OneTimeOrderState extends Equatable {
   List<Object?> get props => <Object?>[
     date,
     location,
+    eventName,
     positions,
     status,
     errorMessage,
     vendors,
     selectedVendor,
+    hubs,
+    selectedHub,
     roles,
   ];
 }
 
+class OneTimeOrderHubOption extends Equatable {
+  const OneTimeOrderHubOption({
+    required this.id,
+    required this.name,
+    required this.address,
+    this.placeId,
+    this.latitude,
+    this.longitude,
+    this.city,
+    this.state,
+    this.street,
+    this.country,
+    this.zipCode,
+  });
+
+  final String id;
+  final String name;
+  final String address;
+  final String? placeId;
+  final double? latitude;
+  final double? longitude;
+  final String? city;
+  final String? state;
+  final String? street;
+  final String? country;
+  final String? zipCode;
+
+  @override
+  List<Object?> get props => <Object?>[
+    id,
+    name,
+    address,
+    placeId,
+    latitude,
+    longitude,
+    city,
+    state,
+    street,
+    country,
+    zipCode,
+  ];
+}
+
 class OneTimeOrderRoleOption extends Equatable {
   const OneTimeOrderRoleOption({
     required this.id,

apps/mobile/packages/features/client/create_order/lib/src/presentation/widgets/one_time_order/one_time_order_event_name_input.dart

@@ -0,0 +1,56 @@
+import 'package:design_system/design_system.dart';
+import 'package:flutter/material.dart';
+
+/// A text input for the order name in the one-time order form.
+class OneTimeOrderEventNameInput extends StatefulWidget {
+  const OneTimeOrderEventNameInput({
+    required this.label,
+    required this.value,
+    required this.onChanged,
+    super.key,
+  });
+
+  final String label;
+  final String value;
+  final ValueChanged<String> onChanged;
+
+  @override
+  State<OneTimeOrderEventNameInput> createState() =>
+      _OneTimeOrderEventNameInputState();
+}
+
+class _OneTimeOrderEventNameInputState
+    extends State<OneTimeOrderEventNameInput> {
+  late final TextEditingController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = TextEditingController(text: widget.value);
+  }
+
+  @override
+  void didUpdateWidget(OneTimeOrderEventNameInput oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.value != _controller.text) {
+      _controller.text = widget.value;
+    }
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return UiTextField(
+      label: widget.label,
+      controller: _controller,
+      onChanged: widget.onChanged,
+      hintText: 'Order name',
+      prefixIcon: UiIcons.briefcase,
+    );
+  }
+}

apps/mobile/packages/features/client/create_order/lib/src/presentation/widgets/one_time_order/one_time_order_view.dart

@@ -8,8 +8,8 @@ import '../../blocs/one_time_order_bloc.dart';
 import '../../blocs/one_time_order_event.dart';
 import '../../blocs/one_time_order_state.dart';
 import 'one_time_order_date_picker.dart';
+import 'one_time_order_event_name_input.dart';
 import 'one_time_order_header.dart';
-import 'one_time_order_location_input.dart';
 import 'one_time_order_position_card.dart';
 import 'one_time_order_section_header.dart';
 import 'one_time_order_success_view.dart';
@@ -31,7 +31,12 @@ class OneTimeOrderView extends StatelessWidget {
             title: labels.success_title,
             message: labels.success_message,
             buttonLabel: labels.back_to_orders,
-            onDone: () => Modular.to.pop(),
+            onDone: () => Modular.to.navigate(
+              '/client-main/orders/',
+              arguments: <String, dynamic>{
+                'initialDate': state.date.toIso8601String(),
+              },
+            ),
           );
         }
 
@@ -129,6 +134,15 @@ class _OneTimeOrderForm extends StatelessWidget {
         ),
         const SizedBox(height: UiConstants.space4),
 
+        OneTimeOrderEventNameInput(
+          label: 'ORDER NAME',
+          value: state.eventName,
+          onChanged: (String value) => BlocProvider.of<OneTimeOrderBloc>(
+            context,
+          ).add(OneTimeOrderEventNameChanged(value)),
+        ),
+        const SizedBox(height: UiConstants.space4),
+
         // Vendor Selection
         Text('SELECT VENDOR', style: UiTypography.footnote2r.textSecondary),
         const SizedBox(height: 8),
@@ -179,12 +193,43 @@ class _OneTimeOrderForm extends StatelessWidget {
         ),
         const SizedBox(height: UiConstants.space4),
 
-        OneTimeOrderLocationInput(
+        Text('HUB', style: UiTypography.footnote2r.textSecondary),
-          label: labels.location_label,
+        const SizedBox(height: 8),
-          value: state.location,
+        Container(
-          onChanged: (String location) => BlocProvider.of<OneTimeOrderBloc>(
+          padding: const EdgeInsets.symmetric(horizontal: UiConstants.space3),
-            context,
+          height: 48,
-          ).add(OneTimeOrderLocationChanged(location)),
+          decoration: BoxDecoration(
+            color: UiColors.white,
+            borderRadius: UiConstants.radiusMd,
+            border: Border.all(color: UiColors.border),
+          ),
+          child: DropdownButtonHideUnderline(
+            child: DropdownButton<OneTimeOrderHubOption>(
+              isExpanded: true,
+              value: state.selectedHub,
+              icon: const Icon(
+                UiIcons.chevronDown,
+                size: 18,
+                color: UiColors.iconSecondary,
+              ),
+              onChanged: (OneTimeOrderHubOption? hub) {
+                if (hub != null) {
+                  BlocProvider.of<OneTimeOrderBloc>(
+                    context,
+                  ).add(OneTimeOrderHubChanged(hub));
+                }
+              },
+              items: state.hubs.map((OneTimeOrderHubOption hub) {
+                return DropdownMenuItem<OneTimeOrderHubOption>(
+                  value: hub,
+                  child: Text(
+                    hub.name,
+                    style: UiTypography.body2m.textPrimary,
+                  ),
+                );
+              }).toList(),
+            ),
+          ),
         ),
         const SizedBox(height: UiConstants.space6),
 

apps/mobile/packages/features/client/create_order/pubspec.yaml

@@ -25,6 +25,7 @@ dependencies:
   krow_data_connect:
     path: ../../../data_connect
   firebase_data_connect: ^0.2.2+2
+  firebase_auth: ^6.1.4
 
 dev_dependencies:
   flutter_test:

apps/mobile/packages/features/client/home/lib/client_home.dart

@@ -1,5 +1,3 @@
-library client_home;
-
 import 'package:flutter_modular/flutter_modular.dart';
 import 'package:krow_data_connect/krow_data_connect.dart';
 import 'src/data/repositories_impl/home_repository_impl.dart';

apps/mobile/packages/features/client/home/lib/src/data/repositories_impl/home_repository_impl.dart

@@ -89,6 +89,14 @@ class HomeRepositoryImpl implements HomeRepositoryInterface {
               end: _toTimestamp(end),
             )
             .execute();
+    print(
+      'Home coverage: businessId=$businessId '
+      'startLocal=${start.toIso8601String()} '
+      'endLocal=${end.toIso8601String()} '
+      'startUtc=${_toTimestamp(start).toJson()} '
+      'endUtc=${_toTimestamp(end).toJson()} '
+      'shiftRoles=${result.data.shiftRoles.length}',
+    );
 
     int totalNeeded = 0;
     int totalFilled = 0;
@@ -169,7 +177,8 @@ class HomeRepositoryImpl implements HomeRepositoryInterface {
   }
 
   fdc.Timestamp _toTimestamp(DateTime date) {
-    final int millis = date.millisecondsSinceEpoch;
+    final DateTime utc = date.toUtc();
+    final int millis = utc.millisecondsSinceEpoch;
     final int seconds = millis ~/ 1000;
     final int nanos = (millis % 1000) * 1000000;
     return fdc.Timestamp(nanos, seconds);

apps/mobile/packages/features/client/home/lib/src/presentation/blocs/client_home_bloc.dart

@@ -26,6 +26,8 @@ class ClientHomeBloc extends Bloc<ClientHomeEvent, ClientHomeState> {
     on<ClientHomeWidgetVisibilityToggled>(_onWidgetVisibilityToggled);
     on<ClientHomeWidgetReordered>(_onWidgetReordered);
     on<ClientHomeLayoutReset>(_onLayoutReset);
+
+    add(ClientHomeStarted());
   }
 
   Future<void> _onStarted(

apps/mobile/packages/features/client/home/lib/src/presentation/blocs/client_home_state.dart

@@ -35,12 +35,12 @@ class ClientHomeState extends Equatable {
     this.isEditMode = false,
     this.errorMessage,
     this.dashboardData = const HomeDashboardData(
-      weeklySpending: 4250.0,
+      weeklySpending: 0.0,
-      next7DaysSpending: 6100.0,
+      next7DaysSpending: 0.0,
-      weeklyShifts: 12,
+      weeklyShifts: 0,
-      next7DaysScheduled: 18,
+      next7DaysScheduled: 0,
-      totalNeeded: 10,
+      totalNeeded: 0,
-      totalFilled: 8,
+      totalFilled: 0,
     ),
     this.reorderItems = const <ReorderItem>[],
     this.businessName = 'Your Company',