move, copy & cleanup

Author: MaikelStuivenberg

.ruby-version

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

lib/app/app.dart

@@ -16,6 +16,7 @@ import 'package:givt_app/features/family/features/giving_flow/collectgroup_detai
 import 'package:givt_app/features/family/features/impact_groups/cubit/impact_groups_cubit.dart'
     as FamilyImpactGroupsCubit;
 import 'package:givt_app/features/family/features/profiles/cubit/profiles_cubit.dart';
+import 'package:givt_app/features/family/features/registration/bloc/family_registration_bloc.dart';
 import 'package:givt_app/features/family/features/scan_nfc/cubit/scan_nfc_cubit.dart';
 import 'package:givt_app/features/family/features/topup/cubit/topup_cubit.dart';
 import 'package:givt_app/features/impact_groups/cubit/impact_groups_cubit.dart';
@@ -125,6 +126,12 @@ class _AppState extends State<App> {
               registrationRepository: getIt(),
             ),
           ),
+          BlocProvider(
+            create: (context) => FamilyRegistrationBloc(
+              authRepository: getIt(),
+              registrationRepository: getIt(),
+            ),
+          ),
         ],
         child: AppThemeSwitcherWidget(
           key: themeKey,

lib/app/injection/injection.dart

@@ -15,15 +15,14 @@ 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/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';

lib/features/account_details/cubit/edit_stripe_cubit.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';

lib/features/account_details/cubit/edit_stripe_state.dart

@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_stripe/flutter_stripe.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:givt_app/app/injection/injection.dart';
 import 'package:givt_app/core/enums/enums.dart';
-import 'package:givt_app/core/logging/logging_service.dart';
 import 'package:givt_app/features/account_details/bloc/personal_info_edit_bloc.dart';
 import 'package:givt_app/features/account_details/pages/change_address_bottom_sheet.dart';
 import 'package:givt_app/features/account_details/pages/change_bank_details_bottom_sheet.dart';
@@ -13,12 +10,9 @@ import 'package:givt_app/features/account_details/pages/change_phone_number_bott
 import 'package:givt_app/features/auth/cubit/auth_cubit.dart';
 import 'package:givt_app/features/auth/pages/change_password_page.dart';
 import 'package:givt_app/features/family/app/family_pages.dart';
-import 'package:givt_app/features/registration/cubit/stripe_cubit.dart';
 import 'package:givt_app/l10n/l10n.dart';
 import 'package:givt_app/shared/dialogs/dialogs.dart';
 import 'package:givt_app/shared/pages/gift_aid_page.dart';
-import 'package:givt_app/shared/widgets/parent_avatar.dart';
-import 'package:givt_app/utils/stripe_helper.dart';
 import 'package:givt_app/utils/utils.dart';
 import 'package:go_router/go_router.dart';
 
@@ -34,7 +28,6 @@ class PersonalInfoEditPage extends StatelessWidget {
     final locals = context.l10n;
     final user = context.watch<AuthCubit>().state.user;
     final isUkUser = Country.unitedKingdomCodes().contains(user.country);
-    final isUSUser = Country.us.countryCode == user.country;
 
     return Scaffold(
       appBar: AppBar(
@@ -108,40 +101,29 @@ class PersonalInfoEditPage extends StatelessWidget {
               const SizedBox(
                 height: 20,
               ),
-              if (!isUSUser)
-                Column(
-                  children: [
-                    Text(
-                      locals.personalPageHeader,
-                      style: Theme.of(context).textTheme.bodyLarge,
-                    ),
-                    const SizedBox(
-                      height: 20,
-                    ),
-                    Text(
-                      locals.personalPageSubHeader,
-                      style: Theme.of(context).textTheme.bodyLarge,
-                      textAlign: TextAlign.center,
-                    ),
-                    const SizedBox(
-                      height: 20,
-                    ),
-                  ],
-                ),
-              if (isUSUser)
-                Padding(
-                  padding: const EdgeInsets.only(bottom: 20),
-                  child: ParentAvatar(
-                    firstName: user.firstName,
-                    lastName: user.lastName,
-                    pictureURL: user.profilePicture,
+              Column(
+                children: [
+                  Text(
+                    locals.personalPageHeader,
+                    style: Theme.of(context).textTheme.bodyLarge,
                   ),
-                ),
+                  const SizedBox(
+                    height: 20,
+                  ),
+                  Text(
+                    locals.personalPageSubHeader,
+                    style: Theme.of(context).textTheme.bodyLarge,
+                    textAlign: TextAlign.center,
+                  ),
+                  const SizedBox(
+                    height: 20,
+                  ),
+                ],
+              ),
               _buildInfoRow(
                 icon: const Icon(
                   Icons.person,
                 ),
-                visible: !isUSUser,
                 value: '${user.firstName} ${user.lastName}',
               ),
               _buildInfoRow(
@@ -161,7 +143,6 @@ class PersonalInfoEditPage extends StatelessWidget {
                 ),
               ),
               _buildInfoRow(
-                visible: !isUSUser,
                 icon: const Icon(
                   FontAwesomeIcons.house,
                   color: AppTheme.givtLightGreen,
@@ -196,7 +177,6 @@ class PersonalInfoEditPage extends StatelessWidget {
                 ),
               ),
               _buildInfoRow(
-                visible: !isUSUser,
                 icon: const Icon(
                   FontAwesomeIcons.creditCard,
                   color: AppTheme.givtOrange,
@@ -216,45 +196,6 @@ class PersonalInfoEditPage extends StatelessWidget {
                   ),
                 ),
               ),
-              _buildInfoRow(
-                visible: isUSUser,
-                icon: const Icon(
-                  FontAwesomeIcons.creditCard,
-                  color: AppTheme.givtOrange,
-                ),
-                value:
-                    '${user.accountBrand.toUpperCase()} ${user.accountNumber}',
-                onTap: () async {
-                  await AnalyticsHelper.logEvent(
-                    eventName: AmplitudeEvents.editPaymentDetailsClicked,
-                  );
-
-                  if (!context.mounted) return;
-                  await getIt<StripeCubit>().fetchSetupIntent();
-
-                  if (!context.mounted) return;
-
-                  try {
-                    await StripeHelper(context).showPaymentSheet();
-
-                    if (!context.mounted) return;
-                    await context.read<AuthCubit>().refreshUser();
-                  } on StripeException catch (e, stackTrace) {
-                    await AnalyticsHelper.logEvent(
-                      eventName: AmplitudeEvents.editPaymentDetailsCanceled,
-                    );
-
-                    /* Logged as info as stripe is giving exception
-                       when for example people close the bottomsheet. 
-                       So it's not a real error :)
-                    */
-                    LoggingInfo.instance.info(
-                      e.toString(),
-                      methodName: stackTrace.toString(),
-                    );
-                  }
-                },
-              ),
               _buildInfoRow(
                 visible: isUkUser,
                 icon: Image.asset(
@@ -290,15 +231,6 @@ class PersonalInfoEditPage extends StatelessWidget {
               const Divider(
                 height: 0,
               ),
-              if (isUSUser)
-                Padding(
-                  padding: const EdgeInsets.only(left: 70, right: 70, top: 20),
-                  child: Text(
-                    locals.personalPageSubHeader,
-                    style: Theme.of(context).textTheme.bodyLarge,
-                    textAlign: TextAlign.center,
-                  ),
-                ),
             ],
           ),
         ),

lib/features/account_details/pages/change_phone_number_bottom_sheet.dart

@@ -13,12 +13,12 @@ import 'package:givt_app/features/children/add_member/widgets/member_counter.dar
 import 'package:givt_app/features/children/shared/profile_type.dart';
 import 'package:givt_app/features/family/extensions/extensions.dart';
 import 'package:givt_app/features/family/features/avatars/cubit/avatars_cubit.dart';
+import 'package:givt_app/features/family/features/registration/widgets/random_avatar.dart';
 import 'package:givt_app/features/family/shared/design/components/components.dart';
 import 'package:givt_app/features/family/shared/widgets/buttons/givt_back_button_flat.dart';
 import 'package:givt_app/features/family/shared/widgets/loading/custom_progress_indicator.dart';
 import 'package:givt_app/features/family/shared/widgets/texts/label_medium_text.dart';
 import 'package:givt_app/features/registration/widgets/avatar_selection_bottomsheet.dart';
-import 'package:givt_app/features/registration/widgets/random_avatar.dart';
 import 'package:givt_app/shared/models/analytics_event.dart';
 import 'package:givt_app/shared/widgets/fun_scaffold.dart';
 import 'package:givt_app/utils/app_theme.dart';

lib/features/account_details/pages/personal_info_edit_page.dart

@@ -18,9 +18,9 @@ import 'package:givt_app/features/children/overview/pages/models/edit_allowance_
 import 'package:givt_app/features/children/overview/pages/models/top_up_success_uimodel.dart';
 import 'package:givt_app/features/children/overview/pages/top_up_success_page.dart';
 import 'package:givt_app/features/family/app/family_pages.dart';
+import 'package:givt_app/features/family/features/registration/pages/pages.dart';
 import 'package:givt_app/features/family/shared/design/components/components.dart';
 import 'package:givt_app/features/family/shared/widgets/buttons/givt_back_button_flat.dart';
-import 'package:givt_app/features/registration/pages/credit_card_details.dart';
 import 'package:givt_app/shared/widgets/extensions/route_extensions.dart';
 import 'package:givt_app/utils/utils.dart';
 import 'package:go_router/go_router.dart';

lib/features/children/add_member/pages/family_member_form_page.dart

@@ -51,11 +51,11 @@ import 'package:givt_app/features/family/features/recommendation/start_recommend
 import 'package:givt_app/features/family/features/recommendation/tags/cubit/tags_cubit.dart';
 import 'package:givt_app/features/family/features/recommendation/tags/screens/location_selection_screen.dart';
 import 'package:givt_app/features/family/features/reflect/presentation/pages/reflect_intro_screen.dart';
+import 'package:givt_app/features/family/features/registration/pages/us_signup_page.dart';
 import 'package:givt_app/features/family/features/scan_nfc/nfc_scan_screen.dart';
 import 'package:givt_app/features/permit_biometric/cubit/permit_biometric_cubit.dart';
 import 'package:givt_app/features/permit_biometric/models/permit_biometric_request.dart';
 import 'package:givt_app/features/permit_biometric/pages/permit_biometric_page.dart';
-import 'package:givt_app/features/registration/pages/us_signup_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/l10n/l10n.dart';

lib/features/children/details/pages/child_details_page.dart

@@ -15,12 +15,12 @@ import 'package:givt_app/features/account_details/pages/change_phone_number_bott
 import 'package:givt_app/features/family/app/family_pages.dart';
 import 'package:givt_app/features/family/features/auth/bloc/family_auth_cubit.dart';
 import 'package:givt_app/features/family/features/auth/presentation/models/family_auth_state.dart';
+import 'package:givt_app/features/family/features/creditcard_setup/cubit/stripe_cubit.dart';
 import 'package:givt_app/features/family/features/reset_password/presentation/pages/reset_password_sheet.dart';
 import 'package:givt_app/features/family/helpers/logout_helper.dart';
 import 'package:givt_app/features/family/shared/design/components/components.dart';
 import 'package:givt_app/features/family/utils/family_app_theme.dart';
 import 'package:givt_app/features/family/utils/family_auth_utils.dart';
-import 'package:givt_app/features/registration/cubit/stripe_cubit.dart';
 import 'package:givt_app/l10n/l10n.dart';
 import 'package:givt_app/shared/dialogs/dialogs.dart';
 import 'package:givt_app/shared/pages/fingerprint_bottom_sheet.dart';

lib/features/family/app/family_routes.dart

@@ -43,6 +43,11 @@ abstract class FamilyAuthRepository {
   UserExt? getCurrentUser();
 
   void initAuth();
+
+  Future<void> registerUser({
+    required TempUser tempUser,
+    required bool isNewUser,
+  });
 }
 
 class FamilyAuthRepositoryImpl implements FamilyAuthRepository {
@@ -252,7 +257,7 @@ class FamilyAuthRepositoryImpl implements FamilyAuthRepository {
   }
 
   @override
-  Future<UserExt> registerUser({
+  Future<void> registerUser({
     required TempUser tempUser,
     required bool isNewUser,
   }) async {
@@ -284,8 +289,6 @@ class FamilyAuthRepositoryImpl implements FamilyAuthRepository {
     );
 
     await _storeUserExt(userExt);
-
-    return userExt;
   }
 
   @override

lib/features/family/features/account/presentation/pages/us_personal_info_edit_page.dart

@@ -7,14 +7,17 @@ import 'package:givt_app/core/logging/logging_service.dart';
 import 'package:givt_app/features/auth/cubit/auth_cubit.dart';
 import 'package:givt_app/features/family/app/injection.dart';
 import 'package:givt_app/features/family/features/home_screen/cubit/navigation_bar_home_cubit.dart';
+import 'package:givt_app/features/family/features/creditcard_setup/cubit/stripe_cubit.dart';
 import 'package:givt_app/features/family/shared/widgets/errors/retry_error_widget.dart';
 import 'package:givt_app/features/family/shared/widgets/loading/full_screen_loading_widget.dart';
 import 'package:givt_app/features/registration/bloc/registration_bloc.dart';
-import 'package:givt_app/features/registration/cubit/stripe_cubit.dart';
 import 'package:givt_app/utils/analytics_helper.dart';
 import 'package:givt_app/utils/stripe_helper.dart';
 import 'package:go_router/go_router.dart';
 
+/// TODO: This file should be moved to a different location.
+/// It's not used during registration anymore.
+/// It's used in the family app, when bank details are needed
 class CreditCardDetails extends StatefulWidget {
   const CreditCardDetails({
     this.shrink = false,

lib/features/family/features/auth/data/family_auth_repository.dart

@@ -3,11 +3,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:givt_app/core/enums/amplitude_events.dart';
 import 'package:givt_app/features/family/features/auth/bloc/family_auth_cubit.dart';
 import 'package:givt_app/features/family/features/auth/presentation/models/family_auth_state.dart';
+import 'package:givt_app/features/family/features/registration/pages/pages.dart';
 import 'package:givt_app/features/family/shared/design/components/components.dart';
 import 'package:givt_app/features/family/shared/widgets/buttons/givt_back_button_flat.dart';
 import 'package:givt_app/features/family/shared/widgets/texts/shared_texts.dart';
 import 'package:givt_app/features/family/utils/family_auth_utils.dart';
-import 'package:givt_app/features/registration/pages/credit_card_details.dart';
 import 'package:givt_app/shared/models/analytics_event.dart';
 import 'package:givt_app/shared/models/color_combo.dart';
 import 'package:givt_app/shared/widgets/common_icons.dart';