change password api

lib/data/repositories/api_auth_repository.dart

@@ -33,7 +33,7 @@ class ApiAuthRepository implements AuthRepository {
       body: requestBody,
     );
 
-    if (response.statusCode >= 200 && response.statusCode < 300) {
+    if (response.statusCode >= 200) {
       return _parseUserFromResponse(
         response.body,
         fallbackUsername: username.trim(),
@@ -73,7 +73,7 @@ class ApiAuthRepository implements AuthRepository {
       body: requestBody,
     );
 
-    if (response.statusCode >= 200 && response.statusCode < 300) {
+    if (response.statusCode >= 200) {
       return _parseUserFromResponse(
         response.body,
         fallbackUsername: username,
@@ -99,7 +99,7 @@ class ApiAuthRepository implements AuthRepository {
       body: requestBody,
     );
 
-    if (response.statusCode >= 200 && response.statusCode < 300) {
+    if (response.statusCode >= 200) {
       return;
     }
 
@@ -119,7 +119,7 @@ class ApiAuthRepository implements AuthRepository {
       headers: {'Content-Type': 'application/json', 'x-api-key': apiSecret},
     );
 
-    if (response.statusCode >= 200 && response.statusCode < 300) {
+    if (response.statusCode >= 200) {
       return _extractSuccessMessage(
         response.body,
         fallback: 'Password reset successfully',
@@ -129,6 +129,35 @@ class ApiAuthRepository implements AuthRepository {
     throw Exception(_extractErrorMessage(response.body));
   }
 
+  @override
+  Future<String> changePassword({
+    required String oldPassword,
+    required String newPassword,
+    required String confirmPassword,
+  }) async {
+    final uri = Uri.parse('$baseUrl/user/change-password');
+    final requestBody = jsonEncode({
+      'oldPassword': oldPassword,
+      'newPassword': newPassword,
+      'confirmPassword': confirmPassword,
+    });
+
+    final response = await _client.post(
+      uri,
+      headers: {'Content-Type': 'application/json', 'x-api-key': apiSecret},
+      body: requestBody,
+    );
+
+    if (response.statusCode >= 200) {
+      return _extractSuccessMessage(
+        response.body,
+        fallback: 'Password changed successfully',
+      );
+    }
+
+    throw Exception(_extractErrorMessage(response.body));
+  }
+
   @override
   Future<void> logout({required String refreshToken}) async {
     final uri = Uri.parse('$baseUrl/auth/logout');
@@ -140,7 +169,7 @@ class ApiAuthRepository implements AuthRepository {
       body: requestBody,
     );
 
-    if (response.statusCode >= 200 && response.statusCode < 300) {
+    if (response.statusCode >= 200) {
       return;
     }
 

lib/data/repositories/mock_auth_repository.dart

@@ -71,6 +71,24 @@ class MockAuthRepository implements AuthRepository {
     return 'Password reset successfully';
   }
 
+  @override
+  Future<String> changePassword({
+    required String oldPassword,
+    required String newPassword,
+    required String confirmPassword,
+  }) async {
+    await Future<void>.delayed(const Duration(milliseconds: 500));
+
+    if (oldPassword.isEmpty || newPassword.isEmpty || confirmPassword.isEmpty) {
+      throw Exception('All fields are required');
+    }
+    if (newPassword != confirmPassword) {
+      throw Exception('New passwords do not match');
+    }
+
+    return 'Password changed successfully';
+  }
+
   @override
   Future<void> logout({required String refreshToken}) async {
     await Future<void>.delayed(const Duration(milliseconds: 250));

lib/domain/repositories/auth_repository.dart

@@ -16,5 +16,11 @@ abstract class AuthRepository {
 
   Future<String> resetCashierPassword({required String username});
 
+  Future<String> changePassword({
+    required String oldPassword,
+    required String newPassword,
+    required String confirmPassword,
+  });
+
   Future<void> logout({required String refreshToken});
 }

lib/presentation/change_password/change_password_form_providers.dart

@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+final changePasswordFormKeyProvider =
+    Provider.autoDispose<GlobalKey<FormState>>((ref) {
+      return GlobalKey<FormState>();
+    });
+
+final changeOldPasswordControllerProvider =
+    Provider.autoDispose<TextEditingController>((ref) {
+      final controller = TextEditingController();
+      ref.onDispose(controller.dispose);
+      return controller;
+    });
+
+final changeNewPasswordControllerProvider =
+    Provider.autoDispose<TextEditingController>((ref) {
+      final controller = TextEditingController();
+      ref.onDispose(controller.dispose);
+      return controller;
+    });
+
+final changeConfirmPasswordControllerProvider =
+    Provider.autoDispose<TextEditingController>((ref) {
+      final controller = TextEditingController();
+      ref.onDispose(controller.dispose);
+      return controller;
+    });
+
+final changeOldPasswordFocusNodeProvider = Provider.autoDispose<FocusNode>((
+  ref,
+) {
+  final focusNode = FocusNode();
+  ref.onDispose(focusNode.dispose);
+  return focusNode;
+});
+
+final changeNewPasswordFocusNodeProvider = Provider.autoDispose<FocusNode>((
+  ref,
+) {
+  final focusNode = FocusNode();
+  ref.onDispose(focusNode.dispose);
+  return focusNode;
+});
+
+final changeConfirmPasswordFocusNodeProvider = Provider.autoDispose<FocusNode>((
+  ref,
+) {
+  final focusNode = FocusNode();
+  ref.onDispose(focusNode.dispose);
+  return focusNode;
+});
+
+final changeOldPasswordObscureProvider = StateProvider.autoDispose<bool>(
+  (ref) => true,
+);
+
+final changeNewPasswordObscureProvider = StateProvider.autoDispose<bool>(
+  (ref) => true,
+);
+
+final changeConfirmPasswordObscureProvider = StateProvider.autoDispose<bool>(
+  (ref) => true,
+);
+
+final changePasswordAttemptedSubmitProvider = StateProvider.autoDispose<bool>(
+  (ref) => false,
+);

lib/presentation/change_password/change_password_page.dart

@@ -0,0 +1,372 @@
+import 'package:e_receipt_mobile/presentation/change_password/change_password_form_providers.dart';
+import 'package:e_receipt_mobile/presentation/change_password/change_password_view_model.dart';
+import 'package:e_receipt_mobile/presentation/login/widgets/login_background.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+class ChangePasswordPage extends ConsumerWidget {
+  const ChangePasswordPage({super.key});
+
+  void _submit({
+    required BuildContext context,
+    required WidgetRef ref,
+    required GlobalKey<FormState> formKey,
+    required TextEditingController oldPasswordController,
+    required TextEditingController newPasswordController,
+    required TextEditingController confirmPasswordController,
+    required bool isLoading,
+  }) {
+    if (isLoading) {
+      return;
+    }
+
+    ref.read(changePasswordViewModelProvider.notifier).clearMessages();
+    FocusManager.instance.primaryFocus?.unfocus();
+    ref.read(changePasswordAttemptedSubmitProvider.notifier).state = true;
+
+    if (!(formKey.currentState?.validate() ?? false)) {
+      return;
+    }
+
+    ref
+        .read(changePasswordViewModelProvider.notifier)
+        .changePassword(
+          oldPassword: oldPasswordController.text,
+          newPassword: newPasswordController.text,
+          confirmPassword: confirmPasswordController.text,
+        );
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(changePasswordViewModelProvider);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    ref.listen(changePasswordViewModelProvider, (previous, next) {
+      final error = next.errorMessage;
+      if (error != null && error != previous?.errorMessage) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(error), behavior: SnackBarBehavior.floating),
+        );
+      }
+
+      final success = next.successMessage;
+      if (success != null && success != previous?.successMessage) {
+        Navigator.of(context).pop(success);
+      }
+    });
+
+    final formKey = ref.watch(changePasswordFormKeyProvider);
+    final oldPasswordController = ref.watch(
+      changeOldPasswordControllerProvider,
+    );
+    final newPasswordController = ref.watch(
+      changeNewPasswordControllerProvider,
+    );
+    final confirmPasswordController = ref.watch(
+      changeConfirmPasswordControllerProvider,
+    );
+    final oldPasswordFocusNode = ref.watch(changeOldPasswordFocusNodeProvider);
+    final newPasswordFocusNode = ref.watch(changeNewPasswordFocusNodeProvider);
+    final confirmPasswordFocusNode = ref.watch(
+      changeConfirmPasswordFocusNodeProvider,
+    );
+    final obscureOld = ref.watch(changeOldPasswordObscureProvider);
+    final obscureNew = ref.watch(changeNewPasswordObscureProvider);
+    final obscureConfirm = ref.watch(changeConfirmPasswordObscureProvider);
+    final attemptedSubmit = ref.watch(changePasswordAttemptedSubmitProvider);
+
+    return Scaffold(
+      appBar: AppBar(title: const Text('Change password')),
+      body: AnnotatedRegion<SystemUiOverlayStyle>(
+        value: Theme.of(context).brightness == Brightness.dark
+            ? SystemUiOverlayStyle.light
+            : SystemUiOverlayStyle.dark,
+        child: LoginBackground(
+          child: SafeArea(
+            child: Center(
+              child: SingleChildScrollView(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 20,
+                  vertical: 24,
+                ),
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 440),
+                  child: Card(
+                    elevation: 0,
+                    color: colorScheme.surface.withValues(
+                      alpha: Theme.of(context).brightness == Brightness.dark
+                          ? 0.75
+                          : 0.92,
+                    ),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(28),
+                      side: BorderSide(
+                        color: colorScheme.outlineVariant.withValues(
+                          alpha: 0.35,
+                        ),
+                      ),
+                    ),
+                    child: Padding(
+                      padding: const EdgeInsets.fromLTRB(20, 22, 20, 18),
+                      child: Form(
+                        key: formKey,
+                        autovalidateMode: attemptedSubmit
+                            ? AutovalidateMode.onUserInteraction
+                            : AutovalidateMode.disabled,
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                          children: [
+                            Row(
+                              children: [
+                                Container(
+                                  height: 44,
+                                  width: 44,
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(14),
+                                    gradient: LinearGradient(
+                                      begin: Alignment.topLeft,
+                                      end: Alignment.bottomRight,
+                                      colors: [
+                                        colorScheme.primary,
+                                        colorScheme.tertiary,
+                                      ],
+                                    ),
+                                  ),
+                                  child: const Icon(
+                                    Icons.password_outlined,
+                                    color: Colors.white,
+                                  ),
+                                ),
+                                const SizedBox(width: 12),
+                                Expanded(
+                                  child: Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    children: [
+                                      Text(
+                                        'Change your password',
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .titleLarge
+                                            ?.copyWith(
+                                              fontWeight: FontWeight.w800,
+                                            ),
+                                      ),
+                                      Text(
+                                        'Use your current password to set a new permanent one.',
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodyMedium
+                                            ?.copyWith(
+                                              color:
+                                                  colorScheme.onSurfaceVariant,
+                                            ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ],
+                            ),
+                            const SizedBox(height: 18),
+                            _PasswordField(
+                              controller: oldPasswordController,
+                              focusNode: oldPasswordFocusNode,
+                              enabled: !state.isLoading,
+                              obscureText: obscureOld,
+                              labelText: 'Current password',
+                              hintText: 'Enter your current password',
+                              textInputAction: TextInputAction.next,
+                              onFieldSubmitted: (_) => FocusScope.of(
+                                context,
+                              ).requestFocus(newPasswordFocusNode),
+                              onToggleVisibility: () =>
+                                  ref
+                                          .read(
+                                            changeOldPasswordObscureProvider
+                                                .notifier,
+                                          )
+                                          .state =
+                                      !obscureOld,
+                              validator: (value) {
+                                if ((value ?? '').isEmpty) {
+                                  return 'Current password is required';
+                                }
+                                return null;
+                              },
+                            ),
+                            const SizedBox(height: 12),
+                            _PasswordField(
+                              controller: newPasswordController,
+                              focusNode: newPasswordFocusNode,
+                              enabled: !state.isLoading,
+                              obscureText: obscureNew,
+                              labelText: 'New password',
+                              hintText: 'Enter your new password',
+                              textInputAction: TextInputAction.next,
+                              onFieldSubmitted: (_) => FocusScope.of(
+                                context,
+                              ).requestFocus(confirmPasswordFocusNode),
+                              onToggleVisibility: () =>
+                                  ref
+                                          .read(
+                                            changeNewPasswordObscureProvider
+                                                .notifier,
+                                          )
+                                          .state =
+                                      !obscureNew,
+                              validator: (value) {
+                                if ((value ?? '').isEmpty) {
+                                  return 'New password is required';
+                                }
+                                return null;
+                              },
+                            ),
+                            const SizedBox(height: 12),
+                            _PasswordField(
+                              controller: confirmPasswordController,
+                              focusNode: confirmPasswordFocusNode,
+                              enabled: !state.isLoading,
+                              obscureText: obscureConfirm,
+                              labelText: 'Confirm new password',
+                              hintText: 'Re-enter your new password',
+                              textInputAction: TextInputAction.done,
+                              onFieldSubmitted: (_) => _submit(
+                                context: context,
+                                ref: ref,
+                                formKey: formKey,
+                                oldPasswordController: oldPasswordController,
+                                newPasswordController: newPasswordController,
+                                confirmPasswordController:
+                                    confirmPasswordController,
+                                isLoading: state.isLoading,
+                              ),
+                              onToggleVisibility: () =>
+                                  ref
+                                          .read(
+                                            changeConfirmPasswordObscureProvider
+                                                .notifier,
+                                          )
+                                          .state =
+                                      !obscureConfirm,
+                              validator: (value) {
+                                if ((value ?? '').isEmpty) {
+                                  return 'Confirm password is required';
+                                }
+                                return null;
+                              },
+                            ),
+                            const SizedBox(height: 16),
+                            FilledButton.icon(
+                              onPressed: state.isLoading
+                                  ? null
+                                  : () => _submit(
+                                      context: context,
+                                      ref: ref,
+                                      formKey: formKey,
+                                      oldPasswordController:
+                                          oldPasswordController,
+                                      newPasswordController:
+                                          newPasswordController,
+                                      confirmPasswordController:
+                                          confirmPasswordController,
+                                      isLoading: state.isLoading,
+                                    ),
+                              icon: state.isLoading
+                                  ? const SizedBox(
+                                      height: 18,
+                                      width: 18,
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 2,
+                                      ),
+                                    )
+                                  : const Icon(Icons.check),
+                              label: Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  vertical: 12,
+                                ),
+                                child: Text(
+                                  state.isLoading
+                                      ? 'Updating...'
+                                      : 'Change password',
+                                  style: const TextStyle(
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _PasswordField extends StatelessWidget {
+  const _PasswordField({
+    required this.controller,
+    required this.focusNode,
+    required this.enabled,
+    required this.obscureText,
+    required this.labelText,
+    required this.hintText,
+    required this.textInputAction,
+    required this.onFieldSubmitted,
+    required this.onToggleVisibility,
+    required this.validator,
+  });
+
+  final TextEditingController controller;
+  final FocusNode focusNode;
+  final bool enabled;
+  final bool obscureText;
+  final String labelText;
+  final String hintText;
+  final TextInputAction textInputAction;
+  final ValueChanged<String> onFieldSubmitted;
+  final VoidCallback onToggleVisibility;
+  final FormFieldValidator<String> validator;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return TextFormField(
+      controller: controller,
+      focusNode: focusNode,
+      enabled: enabled,
+      textInputAction: textInputAction,
+      obscureText: obscureText,
+      onFieldSubmitted: onFieldSubmitted,
+      validator: validator,
+      decoration: InputDecoration(
+        labelText: labelText,
+        hintText: hintText,
+        prefixIcon: const Icon(Icons.lock_outline),
+        filled: true,
+        fillColor: colorScheme.surfaceContainerHighest.withValues(
+          alpha: Theme.of(context).brightness == Brightness.dark ? 0.55 : 0.9,
+        ),
+        border: OutlineInputBorder(borderRadius: BorderRadius.circular(18)),
+        suffixIcon: IconButton(
+          tooltip: obscureText ? 'Show password' : 'Hide password',
+          onPressed: enabled ? onToggleVisibility : null,
+          icon: Icon(
+            obscureText
+                ? Icons.visibility_outlined
+                : Icons.visibility_off_outlined,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/presentation/change_password/change_password_state.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/foundation.dart';
+
+@immutable
+class ChangePasswordState {
+  const ChangePasswordState({
+    this.isLoading = false,
+    this.errorMessage,
+    this.successMessage,
+  });
+
+  final bool isLoading;
+  final String? errorMessage;
+  final String? successMessage;
+
+  ChangePasswordState copyWith({
+    bool? isLoading,
+    String? errorMessage,
+    String? successMessage,
+    bool clearError = false,
+    bool clearSuccess = false,
+  }) {
+    return ChangePasswordState(
+      isLoading: isLoading ?? this.isLoading,
+      errorMessage: clearError ? null : errorMessage ?? this.errorMessage,
+      successMessage: clearSuccess
+          ? null
+          : successMessage ?? this.successMessage,
+    );
+  }
+}

lib/presentation/change_password/change_password_view_model.dart

@@ -0,0 +1,60 @@
+import 'package:e_receipt_mobile/domain/repositories/auth_repository.dart';
+import 'package:e_receipt_mobile/presentation/change_password/change_password_state.dart';
+import 'package:e_receipt_mobile/presentation/login/login_view_model.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+final changePasswordViewModelProvider =
+    StateNotifierProvider.autoDispose<
+      ChangePasswordViewModel,
+      ChangePasswordState
+    >((ref) {
+      return ChangePasswordViewModel(
+        ref.watch(authenticatedAuthRepositoryProvider),
+      );
+    });
+
+class ChangePasswordViewModel extends StateNotifier<ChangePasswordState> {
+  ChangePasswordViewModel(this._authRepository)
+    : super(const ChangePasswordState());
+
+  final AuthRepository _authRepository;
+
+  Future<void> changePassword({
+    required String oldPassword,
+    required String newPassword,
+    required String confirmPassword,
+  }) async {
+    if (oldPassword.isEmpty || newPassword.isEmpty || confirmPassword.isEmpty) {
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: 'All fields are required',
+        clearSuccess: true,
+      );
+      return;
+    }
+
+    state = state.copyWith(
+      isLoading: true,
+      clearError: true,
+      clearSuccess: true,
+    );
+
+    try {
+      final responseMessage = await _authRepository.changePassword(
+        oldPassword: oldPassword,
+        newPassword: newPassword,
+        confirmPassword: confirmPassword,
+      );
+      state = state.copyWith(isLoading: false, successMessage: responseMessage);
+    } catch (error) {
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: error.toString().replaceFirst('Exception: ', ''),
+      );
+    }
+  }
+
+  void clearMessages() {
+    state = state.copyWith(clearError: true, clearSuccess: true);
+  }
+}

lib/presentation/home/home_screen.dart

@@ -1,6 +1,7 @@
 import 'package:e_receipt_mobile/domain/entities/login_user.dart';
 import 'package:e_receipt_mobile/presentation/admin_reset_password/admin_reset_password_page.dart';
 import 'package:e_receipt_mobile/presentation/auth/logout_view_model.dart';
+import 'package:e_receipt_mobile/presentation/change_password/change_password_page.dart';
 import 'package:e_receipt_mobile/presentation/home/home_pagination_providers.dart';
 import 'package:e_receipt_mobile/presentation/home/merchant_paging_view_model.dart';
 import 'package:e_receipt_mobile/presentation/home/widgets/home_drawer.dart';
@@ -38,6 +39,22 @@ class HomeScreen extends ConsumerWidget {
       ),
       drawer: HomeDrawer(
         user: user,
+        onChangePassword: () async {
+          Navigator.of(context).pop();
+          final successMessage = await Navigator.of(context).push<String>(
+            MaterialPageRoute<String>(
+              builder: (_) => const ChangePasswordPage(),
+            ),
+          );
+          if (successMessage != null && context.mounted) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(successMessage),
+                behavior: SnackBarBehavior.floating,
+              ),
+            );
+          }
+        },
         onResetCashierPassword: user.isAdmin
             ? () {
                 Navigator.of(context).pop();

lib/presentation/home/widgets/home_drawer.dart

@@ -6,12 +6,14 @@ class HomeDrawer extends StatelessWidget {
   const HomeDrawer({
     required this.user,
     required this.onLogout,
+    this.onChangePassword,
     this.onResetCashierPassword,
     super.key,
   });
 
   final LoginUser user;
   final VoidCallback onLogout;
+  final VoidCallback? onChangePassword;
   final VoidCallback? onResetCashierPassword;
 
   @override
@@ -23,9 +25,17 @@ class HomeDrawer extends StatelessWidget {
         child: Column(
           children: [
             _DrawerHeader(user: user),
-            if (user.isAdmin)
             Padding(
               padding: const EdgeInsets.fromLTRB(8, 12, 8, 0),
+              child: _DrawerItem(
+                icon: Icons.password_outlined,
+                label: 'Change password',
+                onTap: onChangePassword ?? () {},
+              ),
+            ),
+            if (user.isAdmin)
+              Padding(
+                padding: const EdgeInsets.fromLTRB(8, 4, 8, 0),
                 child: _DrawerItem(
                   icon: Icons.lock_reset_outlined,
                   label: 'Reset cashier password',

lib/presentation/terminal/terminal_next_screen.dart

@@ -1,6 +1,7 @@
 import 'package:e_receipt_mobile/domain/entities/terminal.dart';
 import 'package:e_receipt_mobile/presentation/auth/logout_view_model.dart';
 import 'package:e_receipt_mobile/presentation/auth/session_controller.dart';
+import 'package:e_receipt_mobile/presentation/change_password/change_password_page.dart';
 import 'package:e_receipt_mobile/presentation/terminal/transaction_paging_state.dart';
 import 'package:e_receipt_mobile/presentation/terminal/transaction_paging_view_model.dart';
 import 'package:e_receipt_mobile/presentation/terminal/transaction_receipt_screen.dart';
@@ -266,10 +267,19 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
                 subtitle: const Text('Cashier'),
               ),
               const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.password_outlined),
+                title: const Text('Change password'),
+                onTap: () => Navigator.of(
+                  context,
+                ).pop(_CashierMenuAction.changePassword),
+              ),
+              const Divider(height: 1),
               ListTile(
                 leading: const Icon(Icons.logout, color: Colors.redAccent),
                 title: const Text('Logout'),
-                onTap: () => Navigator.of(context).pop(_CashierMenuAction.logout),
+                onTap: () =>
+                    Navigator.of(context).pop(_CashierMenuAction.logout),
               ),
             ],
           ),
@@ -282,12 +292,25 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
     }
 
     switch (action) {
+      case _CashierMenuAction.changePassword:
+        final successMessage = await Navigator.of(this.context).push<String>(
+          MaterialPageRoute<String>(builder: (_) => const ChangePasswordPage()),
+        );
+        if (successMessage != null && mounted) {
+          ScaffoldMessenger.of(this.context).showSnackBar(
+            SnackBar(
+              content: Text(successMessage),
+              behavior: SnackBarBehavior.floating,
+            ),
+          );
+        }
+        break;
       case _CashierMenuAction.logout:
-        await _logout(context);
+        await _logout();
     }
   }
 
-  Future<void> _logout(BuildContext context) async {
+  Future<void> _logout() async {
     final shouldLogout = await showDialog<bool>(
       context: context,
       builder: (context) {
@@ -308,7 +331,7 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
       },
     );
 
-    if (shouldLogout != true || !context.mounted) {
+    if (shouldLogout != true || !mounted) {
       return;
     }
 
@@ -439,8 +462,7 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
                 _first(raw, const ['DE4']) ?? item.amount?.toString() ?? '-';
             final currency = _first(raw, const ['DE49']) ?? 'MMK';
             final status = _statusLabel(
-              _first(raw, const ['DE39']) ??
+              _first(raw, const ['DE39']) ?? item.status,
-                  item.status,
             );
             final type = _first(raw, const ['DE3']) ?? item.type ?? '-';
             final rrn = _first(raw, const ['DE37']) ?? item.rrn ?? '-';
@@ -609,11 +631,10 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
     if (normalized == 'A') {
       return 'SUCCESS';
     }
-    if (normalized == 'E' ) {
+    if (normalized == 'E') {
       return 'FAILED';
     }
     return 'SUCCESS';
-
   }
 
   String? _sanitizeMultiline(String? value) {
@@ -753,4 +774,4 @@ class _StatusChip extends StatelessWidget {
   }
 }
 
-enum _CashierMenuAction { logout }
+enum _CashierMenuAction { changePassword, logout }