fix: preserve local onboarding state

Author: jjoonleo

lib/presentation/my_page/my_page_screen.dart

@@ -97,8 +97,7 @@ class _DetailedNotificationTile extends StatefulWidget {
       _DetailedNotificationTileState();
 }
 
-class _DetailedNotificationTileState
-    extends State<_DetailedNotificationTile> {
+class _DetailedNotificationTileState extends State<_DetailedNotificationTile> {
   bool _enabled = false;
   bool _loading = true;
 
@@ -402,8 +401,8 @@ class _FrameView extends StatelessWidget {
   Widget build(BuildContext context) {
     final textTheme = Theme.of(context).textTheme;
     final colorScheme = Theme.of(context).colorScheme;
-    return Container(
-      decoration: BoxDecoration(color: Theme.of(context).colorScheme.surface),
+    return Material(
+      color: Theme.of(context).colorScheme.surface,
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 19),
         child: Column(

lib/presentation/onboarding/preparation_order/cubit/preparation_order_cubit.dart

@@ -31,21 +31,27 @@ class PreparationOrderCubit extends Cubit<PreparationOrderState> {
   }
 
   void preparationOrderSaved() {
-    final newList = state.toOnboardingState().preparationStepList;
-    final oldList = onboardingCubit.state.preparationStepList;
-
-    assert(newList.length == oldList.length);
-
-    for (int i = 0; i < oldList.length; i++) {
-      for (int j = 0; i < oldList.length; j++) {
-        if (oldList[j].id == newList[i].id) {
-          oldList[j] = oldList[j].copyWith(
-            nextPreparationId: newList[i].nextPreparationId,
+    final orderedList = state.toOnboardingState().preparationStepList;
+    final existingSteps = {
+      for (final step in onboardingCubit.state.preparationStepList)
+        step.id: step,
+    };
+
+    assert(orderedList.length == existingSteps.length);
+
+    final reorderedSteps = orderedList
+        .map((step) {
+          final existingStep = existingSteps[step.id];
+          return OnboardingPreparationStepState(
+            id: step.id,
+            preparationName: step.preparationName,
+            preparationTime:
+                existingStep?.preparationTime ?? step.preparationTime,
+            nextPreparationId: step.nextPreparationId,
           );
-          break;
-        }
-      }
-    }
-    onboardingCubit.onboardingFormChanged(preparationStepList: newList);
+        })
+        .toList(growable: false);
+
+    onboardingCubit.onboardingFormChanged(preparationStepList: reorderedSteps);
   }
 }

test/presentation/onboarding/cubit/onboarding_cubit_test.dart

@@ -4,6 +4,7 @@ import 'package:on_time_front/domain/repositories/preparation_repository.dart';
 import 'package:on_time_front/domain/repositories/user_repository.dart';
 import 'package:on_time_front/domain/use-cases/onboard_use_case.dart';
 import 'package:on_time_front/presentation/onboarding/cubit/onboarding_cubit.dart';
+import 'package:on_time_front/presentation/onboarding/preparation_order/cubit/preparation_order_cubit.dart';
 
 void main() {
   test(
@@ -86,6 +87,57 @@ void main() {
       );
     },
   );
+
+  test(
+    'PreparationOrderCubit reorders immutable steps without losing durations',
+    () {
+      final onboardingCubit = OnboardingCubit(_FakeOnboardUseCase());
+      addTearDown(onboardingCubit.close);
+      onboardingCubit.onboardingFormChanged(
+        preparationStepList: const [
+          OnboardingPreparationStepState(
+            id: 'step-1',
+            preparationName: 'Shower',
+            preparationTime: Duration(minutes: 10),
+            nextPreparationId: 'step-2',
+          ),
+          OnboardingPreparationStepState(
+            id: 'step-2',
+            preparationName: 'Pack',
+            preparationTime: Duration(minutes: 5),
+          ),
+        ],
+      );
+      final orderCubit = PreparationOrderCubit(
+        onboardingCubit: onboardingCubit,
+      );
+      addTearDown(orderCubit.close);
+
+      orderCubit.preparationOrderChanged(0, 2);
+      orderCubit.preparationOrderSaved();
+
+      expect(
+        onboardingCubit.state.preparationStepList
+            .map((step) => step.id)
+            .toList(),
+        ['step-2', 'step-1'],
+      );
+      expect(
+        onboardingCubit.state.preparationStepList
+            .map((step) => step.preparationTime)
+            .toList(),
+        const [Duration(minutes: 5), Duration(minutes: 10)],
+      );
+      expect(
+        onboardingCubit.state.preparationStepList.first.nextPreparationId,
+        'step-1',
+      );
+      expect(
+        onboardingCubit.state.preparationStepList.last.nextPreparationId,
+        isNull,
+      );
+    },
+  );
 }
 
 class _OnboardingSubmission {

test/presentation/onboarding/screens/onboarding_screen_test.dart

@@ -81,7 +81,10 @@ void main() {
       await tester.pumpAndSettle();
 
       expect(
-        find.text('Please select your usual preparation process.'),
+        find.text(
+          'Please select your usual preparation process.',
+          findRichText: true,
+        ),
         findsOneWidget,
       );
       expect(_nextButton(tester).onPressed, isNull);
@@ -92,12 +95,15 @@ void main() {
 
       await tester.tap(find.widgetWithText(ElevatedButton, 'Next'));
       await tester.pumpAndSettle();
-      expect(find.textContaining('order'), findsOneWidget);
+      expect(find.textContaining('order', findRichText: true), findsOneWidget);
 
       await tester.tap(find.widgetWithText(ElevatedButton, 'Next'));
       await tester.pumpAndSettle();
       expect(
-        find.text('Please tell us the time required for each step.'),
+        find.text(
+          'Please tell us the time required for each step.',
+          findRichText: true,
+        ),
         findsOneWidget,
       );
       expect(_nextButton(tester).onPressed, isNull);
@@ -112,7 +118,10 @@ void main() {
 
       await tester.tap(find.widgetWithText(ElevatedButton, 'Next'));
       await tester.pumpAndSettle();
-      expect(find.text('Set your spare time'), findsOneWidget);
+      expect(
+        find.text('Set your spare time', findRichText: true),
+        findsOneWidget,
+      );
 
       await tester.tap(find.widgetWithText(ElevatedButton, 'Next'));
       await tester.pumpAndSettle();