RegistrationCubit (KIDS-1597)

.ruby-version

@@ -1 +0,0 @@
-2.7.3

lib/app/app.dart

@@ -122,7 +122,6 @@ class _AppState extends State<App> {
             create: (context) => RegistrationBloc(
               authCubit: context.read<AuthCubit>(),
               authRepositoy: getIt(),
-              registrationRepository: getIt(),
             ),
           ),
         ],

lib/app/injection/injection.dart

@@ -15,16 +15,15 @@ import 'package:givt_app/features/children/edit_profile/repositories/edit_parent
 import 'package:givt_app/features/children/family_goal/repositories/create_family_goal_repository.dart';
 import 'package:givt_app/features/children/family_history/repository/family_history_repository.dart';
 import 'package:givt_app/features/children/parental_approval/repositories/parental_approval_repository.dart';
-import 'package:givt_app/features/family/features/avatars/repositories/avatars_repository.dart';
+import 'package:givt_app/features/email_signup/cubit/email_signup_cubit.dart';
+import 'package:givt_app/features/family/features/creditcard_setup/cubit/stripe_cubit.dart';
 import 'package:givt_app/features/give/repositories/beacon_repository.dart';
 import 'package:givt_app/features/give/repositories/campaign_repository.dart';
 import 'package:givt_app/features/impact_groups/repo/impact_groups_repository.dart';
 import 'package:givt_app/features/recurring_donations/cancel/repositories/cancel_recurring_donation_repository.dart';
 import 'package:givt_app/features/recurring_donations/create/repositories/create_recurring_donation_repository.dart';
 import 'package:givt_app/features/recurring_donations/detail/repository/detail_recurring_donation_repository.dart';
 import 'package:givt_app/features/recurring_donations/overview/repositories/recurring_donations_repository.dart';
-import 'package:givt_app/features/registration/cubit/stripe_cubit.dart';
-import 'package:givt_app/features/registration/domain/registration_repository.dart';
 import 'package:givt_app/shared/models/user_ext.dart';
 import 'package:givt_app/shared/repositories/repositories.dart';
 import 'package:givt_app/utils/media_picker_service.dart';
@@ -124,9 +123,6 @@ void initRepositories() {
         getIt(),
       ),
     )
-    ..registerLazySingleton<RegistrationRepository>(
-      RegistrationRepository.new,
-    )
     ..registerLazySingleton<CollectGroupRepository>(
       () => CollectGroupRepositoryImpl(
         getIt(),
@@ -225,5 +221,8 @@ void initRepositories() {
       () => StripeCubit(
         authRepository: getIt<AuthRepository>(),
       ),
+    )
+    ..registerFactory<EmailSignupCubit>(
+      () => EmailSignupCubit(getIt()),
     );
 }

lib/app/routes/app_router.dart

@@ -10,7 +10,7 @@ import 'package:givt_app/core/enums/enums.dart';
 import 'package:givt_app/features/account_details/bloc/personal_info_edit_bloc.dart';
 import 'package:givt_app/features/account_details/pages/personal_info_edit_page.dart';
 import 'package:givt_app/features/auth/cubit/auth_cubit.dart';
-import 'package:givt_app/features/auth/pages/email_signup_page.dart';
+import 'package:givt_app/features/email_signup/presentation/pages/email_signup_page.dart';
 import 'package:givt_app/features/family/app/family_pages.dart';
 import 'package:givt_app/features/family/app/family_routes.dart';
 import 'package:givt_app/features/give/bloc/bloc.dart';
@@ -39,10 +39,11 @@ import 'package:givt_app/features/recurring_donations/overview/cubit/recurring_d
 import 'package:givt_app/features/recurring_donations/overview/pages/recurring_donations_overview_page.dart';
 import 'package:givt_app/features/registration/bloc/registration_bloc.dart';
 import 'package:givt_app/features/registration/pages/pages.dart';
+import 'package:givt_app/features/splash/pages/splash_page.dart';
 import 'package:givt_app/features/unregister_account/cubit/unregister_cubit.dart';
 import 'package:givt_app/features/unregister_account/unregister_page.dart';
 import 'package:givt_app/shared/bloc/remote_data_source_sync/remote_data_source_sync_bloc.dart';
-import 'package:givt_app/shared/pages/pages.dart';
+import 'package:givt_app/shared/pages/loading_page.dart';
 import 'package:givt_app/shared/pages/redirect_to_browser_page.dart';
 import 'package:givt_app/shared/widgets/extensions/string_extensions.dart';
 import 'package:givt_app/utils/utils.dart';
@@ -139,7 +140,7 @@ class AppRouter {
         builder: (context, routerState) => BlocListener<AuthCubit, AuthState>(
           listener: (context, state) =>
               _checkAndRedirectAuth(state, context, routerState),
-          child: const LoadingPage(),
+          child: const SplashPage(),
         ),
       ),
       GoRoute(
@@ -321,7 +322,6 @@ class AppRouter {
                       create: (context) => RegistrationBloc(
                         authCubit: context.read<AuthCubit>(),
                         authRepositoy: getIt(),
-                        registrationRepository: getIt(),
                       )..add(const RegistrationInit()),
                       child: const GiftAidRequestPage(),
                     ),
@@ -331,7 +331,6 @@ class AppRouter {
                   create: (context) => RegistrationBloc(
                     authCubit: context.read<AuthCubit>(),
                     authRepositoy: getIt(),
-                    registrationRepository: getIt(),
                   )..add(const RegistrationInit()),
                   child: const BacsExplanationPage(),
                 ),
@@ -341,7 +340,6 @@ class AppRouter {
               create: (context) => RegistrationBloc(
                 authCubit: context.read<AuthCubit>(),
                 authRepositoy: getIt(),
-                registrationRepository: getIt(),
               )..add(const RegistrationInit()),
               child: const MandateExplanationPage(),
             ),
@@ -643,11 +641,11 @@ class AppRouter {
     BuildContext context,
     GoRouterState routerState,
   ) async {
+    if (state.user.isUsUser) return;
+
     if (state.status == AuthStatus.biometricCheck) {
       await context.pushNamed(
-        state.user.isUsUser
-            ? FamilyPages.permitUSBiometric.name
-            : Pages.permitBiometric.name,
+        Pages.permitBiometric.name,
         extra: PermitBiometricRequest.login(),
       );
       return;
@@ -661,27 +659,6 @@ class AppRouter {
         return;
       }
 
-      if (state.user.isUsUser) {
-        if (!state.user.personalInfoRegistered) {
-          // Prevent that users will see the profileselection page first when
-          // registration is not finished (yet)
-          context.pushReplacementNamed(
-            FamilyPages.registrationUS.name,
-            queryParameters: {
-              'email': state.user.email,
-            },
-          );
-        } else {
-          context.goNamed(
-            FamilyPages.profileSelection.name,
-            queryParameters: routerState.uri.queryParameters,
-          );
-        }
-
-        // US should not see the original home page
-        return;
-      }
-
       //needs to be after isUsUser check
       if (routerState.name == Pages.home.name) {
         return;

lib/core/network/token_interceptor.dart

@@ -1,12 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
-import 'dart:io';
 
-import 'package:givt_app/app/injection/injection.dart';
 import 'package:givt_app/core/logging/logging.dart';
 import 'package:givt_app/features/auth/models/session.dart';
-import 'package:givt_app/features/auth/repositories/auth_repository.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uuid/uuid.dart';

lib/features/account_details/pages/change_phone_number_bottom_sheet.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:givt_app/core/enums/enums.dart';
 import 'package:givt_app/features/account_details/bloc/personal_info_edit_bloc.dart';
-import 'package:givt_app/features/registration/widgets/us_mobile_number_form_field.dart';
+import 'package:givt_app/features/family/features/registration/widgets/us_mobile_number_form_field.dart';
 import 'package:givt_app/features/registration/widgets/widgets.dart';
 import 'package:givt_app/l10n/l10n.dart';
 import 'package:givt_app/shared/widgets/widgets.dart';