From f258900a8b29bd976686e082ca18a131ad2c1634 Mon Sep 17 00:00:00 2001 From: jjoonleo Date: Mon, 24 Feb 2025 13:10:40 +0900 Subject: [PATCH 1/2] fix: handle empty nextPreparationId in OnboardingPreparationStepState --- .../onboarding/cubit/onboarding/onboarding_state.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/presentation/onboarding/cubit/onboarding/onboarding_state.dart b/lib/presentation/onboarding/cubit/onboarding/onboarding_state.dart index 02d0ddcd..6fa51c00 100644 --- a/lib/presentation/onboarding/cubit/onboarding/onboarding_state.dart +++ b/lib/presentation/onboarding/cubit/onboarding/onboarding_state.dart @@ -65,7 +65,9 @@ class OnboardingPreparationStepState extends Equatable { id: id ?? this.id, preparationName: preparationName ?? this.preparationName, preparationTime: preparationTime ?? this.preparationTime, - nextPreparationId: nextPreparationId ?? this.nextPreparationId, + nextPreparationId: nextPreparationId == '' + ? null + : (nextPreparationId ?? this.nextPreparationId), ); } From 6c3fc36a0dcf4633c0b9cf1e1eb6060a0716e0ce Mon Sep 17 00:00:00 2001 From: jjoonleo Date: Mon, 24 Feb 2025 13:10:50 +0900 Subject: [PATCH 2/2] fix: update nextPreparationId handling in PreparationNameCubit for correct onboarding step flow --- .../preparation_name/preparation_name_cubit.dart | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/presentation/onboarding/preparation_name_select/cubit/preparation_name/preparation_name_cubit.dart b/lib/presentation/onboarding/preparation_name_select/cubit/preparation_name/preparation_name_cubit.dart index 5a8c7975..85b12f14 100644 --- a/lib/presentation/onboarding/preparation_name_select/cubit/preparation_name/preparation_name_cubit.dart +++ b/lib/presentation/onboarding/preparation_name_select/cubit/preparation_name/preparation_name_cubit.dart @@ -115,17 +115,22 @@ class PreparationNameCubit extends Cubit { selectedList[i].preparationId) { j++; } - if (j == onboardingState.preparationStepList.length) { + if (j >= onboardingState.preparationStepList.length) { onboardingPreparationStepStateList.add(OnboardingPreparationStepState( id: selectedList[i].preparationId, preparationName: selectedList[i].preparationName.value, + nextPreparationId: i == selectedList.length - 1 + ? null + : selectedList[i + 1].preparationId, )); continue; } - onboardingPreparationStepStateList - .add(onboardingState.preparationStepList[j].copyWith( - preparationName: selectedList[i].preparationName.value, - )); + onboardingPreparationStepStateList.add( + onboardingState.preparationStepList[j].copyWith( + preparationName: selectedList[i].preparationName.value, + nextPreparationId: i == selectedList.length - 1 + ? '' + : selectedList[i + 1].preparationId)); } onboardingCubit.onboardingFormChanged(onboardingPreparationStepStateList); }