card-management

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
+<!-- Modify this file to customize your launch splash screens -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="?android:colorBackground" />
 

android/app/src/main/res/drawable/launch_background.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
+<!-- Modify this file to customize your launch splash screens -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@android:color/white" />
 

android/app/src/main/res/values-night/styles.xml

@@ -2,7 +2,7 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
+        <!-- Show a splash screens on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>

android/app/src/main/res/values/styles.xml

@@ -2,7 +2,7 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
+        <!-- Show a splash screens on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>

lib/api/interceptors/auth_interceptor.dart

@@ -13,7 +13,7 @@ class AuthInterceptor extends Interceptor {
     RequestInterceptorHandler handler,
   ) async {
     // Skip auth header for login and refresh endpoints
-    if (options.path.contains('/auth/login') || 
+    if (options.path.contains('/login') ||
         options.path.contains('/auth/refresh')) {
       return handler.next(options);
     }

lib/api/services/auth_service.dart

@@ -20,7 +20,7 @@ class AuthService {
   Future<AuthToken> login(AuthCredentials credentials) async {
     try {
       final response = await _dio.post(
-        '/auth/login',
+        '/login',
         data: credentials.toJson(),
       );
       
@@ -30,6 +30,9 @@ class AuthService {
         throw AuthException('Login failed');
       }
     } on DioException catch (e) {
+      if (kDebugMode) {
+        print(e.toString());
+      }
       if (e.response?.statusCode == 401) {
         throw AuthException('Invalid credentials');
       }

lib/app.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:kmobile/features/auth/screens/customer_info_screen.dart';
+import 'package:kmobile/features/customer_info/screens/customer_info_screen.dart';
 import 'package:kmobile/security/secure_storage.dart';
 import 'api/services/auth_service.dart';
 import 'config/themes.dart';
@@ -10,9 +10,9 @@ import 'data/repositories/auth_repository.dart';
 import 'di/injection.dart';
 import 'features/auth/controllers/auth_cubit.dart';
 import 'features/auth/controllers/auth_state.dart';
-import 'features/auth/screens/Card_screen.dart';
+import 'features/card/screens/card_management_screen.dart';
 import 'features/auth/screens/login_screen.dart';
-import 'features/auth/screens/service_screen.dart';
+import 'features/service/screens/service_screen.dart';
 import 'features/dashboard/screens/dashboard_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
@@ -75,7 +75,7 @@ class KMobile extends StatelessWidget {
   }
 }
 
-// Simple splash screen component
+// Simple splash screens component
 class _SplashScreen extends StatelessWidget {
   const _SplashScreen();
 
@@ -129,7 +129,7 @@ class _NavigationScaffoldState extends State<NavigationScaffold> {
 
   final List<Widget> _pages = [
     DashboardScreen(),
-    CardScreen(),
+    CardManagementScreen(),
     ServiceScreen(),
     CustomerInfoScreen()
   ];

lib/config/routes.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:kmobile/features/auth/screens/customer_info_screen.dart';
+import 'package:kmobile/features/customer_info/screens/customer_info_screen.dart';
 import 'package:kmobile/features/auth/screens/mpin_screen.dart';
 import '../app.dart';
 import '../features/auth/screens/login_screen.dart';

lib/di/injection.dart

@@ -35,7 +35,7 @@ Future<void> setupDependencies() async {
 Dio _createDioClient() {
   final dio = Dio(
     BaseOptions(
-      baseUrl: 'https://api.yourbank.com/v1',
+      baseUrl: 'http://localhost:3000',
       connectTimeout: const Duration(seconds: 5),
       receiveTimeout: const Duration(seconds: 3),
       headers: {

lib/features/accounts/screens/account_info_screen.dart

@@ -17,8 +17,9 @@ class _AccountInfoScreen extends State<AccountInfoScreen>{
           onPressed: () {
             Navigator.pop(context);
           },),
-        title: const Text('kMobile', style: TextStyle(color: Colors.black,
+        title: const Text('Account Info', style: TextStyle(color: Colors.black,
             fontWeight: FontWeight.w500),),
+        centerTitle: false,
         actions: const [
           Padding(
             padding: EdgeInsets.only(right: 10.0),

lib/features/accounts/screens/account_statement_screen.dart

@@ -0,0 +1,183 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+class AccountStatementScreen extends StatefulWidget {
+  const AccountStatementScreen({super.key});
+
+  @override
+  State<AccountStatementScreen> createState() => _AccountStatementScreen();
+}
+
+class _AccountStatementScreen extends State<AccountStatementScreen>{
+  DateTimeRange? selectedDateRange;
+  final _amountRangeController = TextEditingController(text: "100-500");
+  final transactions = [
+    {"desc": "Transfer From ICICI Bank subsidy", "amount": "+₹133.98", "type": "Cr", "time": "21-02-2024 13:09:30"},
+    {"desc": "Mobile recharge", "amount": "-₹299.00", "type": "Dr", "time": "21-02-2024 13:09:30"},
+    {"desc": "NEFT received from Jaya Saha", "amount": "+₹987.80", "type": "Cr", "time": "21-02-2024 13:09:30"},
+    {"desc": "Transfer From ICICI Bank subsidy", "amount": "+₹100.00", "type": "Cr", "time": "21-02-2024 13:09:30"},
+    {"desc": "Transfer From ICICI Bank subsidy", "amount": "-₹100.00", "type": "Dr", "time": "21-02-2024 13:09:30"},
+    {"desc": "Transfer From ICICI Bank subsidy", "amount": "+₹100.00", "type": "Cr", "time": "21-02-2024 13:09:30"},
+    {"desc": "Transfer From ICICI Bank subsidy", "amount": "+₹100.00", "type": "Cr", "time": "21-02-2024 13:09:30"},
+  ];
+
+  Future<void> _selectDateRange(BuildContext context) async {
+    final DateTime now = DateTime.now();
+
+    final DateTimeRange? picked = await showDateRangePicker(
+      context: context,
+      firstDate: DateTime(2023),
+      lastDate: now, // disables future dates
+      initialDateRange: selectedDateRange ??
+          DateTimeRange(start: now.subtract(const Duration(days: 7)), end: now),
+    );
+
+    if (picked != null) {
+      setState(() {
+        selectedDateRange = picked;
+      });
+    }
+  }
+
+  String _formatDate(DateTime date) {
+    return "${date.day.toString().padLeft(2, '0')}-"
+        "${date.month.toString().padLeft(2, '0')}-"
+        "${date.year}";
+  }
+
+  @override
+  void dispose() {
+    _amountRangeController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },),
+        title: const Text('Account Statement', style: TextStyle(color: Colors.black,
+            fontWeight: FontWeight.w500),),
+        centerTitle: false,
+        actions: const [
+          Padding(
+            padding: EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              radius: 20,
+            ),
+          ),
+        ],
+      ),
+
+      body: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text('Filters', style: TextStyle(fontSize: 17),),
+            const SizedBox(height: 15,),
+            Row(
+              children: [
+                Expanded(child: _buildDateRangeSelector()),
+                const SizedBox(width: 10),
+                Expanded(child: _buildFilterBox("100-500")),
+              ],
+            ),
+            const SizedBox(height: 35),
+            Expanded(
+              child: ListView.builder(
+                itemCount: transactions.length,
+                itemBuilder: (context, index) {
+                  final txn = transactions[index];
+                  return _buildTransactionTile(txn);
+                },
+              ),
+            ),
+          ],
+        ),
+      ),
+
+    );
+  }
+
+  Widget _buildDateRangeSelector() {
+    String label = "Select Date";
+    if (selectedDateRange != null) {
+      final from = _formatDate(selectedDateRange!.start);
+      final to = _formatDate(selectedDateRange!.end);
+      label = "$from - $to";
+    }
+
+    return GestureDetector(
+      onTap: () => _selectDateRange(context),
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
+        decoration: BoxDecoration(
+          border: Border.all(color: Colors.grey),
+          borderRadius: BorderRadius.circular(8),
+        ),
+        child: Row(
+          children: [
+            Expanded(child: Text(label, style: const TextStyle(fontSize: 16))),
+            const Icon(Icons.calendar_today),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFilterBox(String text) {
+    return TextFormField(
+      controller: _amountRangeController,
+      decoration: const InputDecoration(
+        labelText: 'Amount Range',
+        // prefixIcon: Icon(Icons.person),
+        border: OutlineInputBorder(),
+        isDense: true,
+        filled: true,
+        fillColor: Colors.white,
+        enabledBorder: OutlineInputBorder(
+          borderSide: BorderSide(color: Colors.black),
+        ),
+        focusedBorder: OutlineInputBorder(
+          borderSide: BorderSide(color: Colors.black, width: 2),
+        ),
+      ),
+      keyboardType: TextInputType.number,
+      textInputAction: TextInputAction.next,
+      validator: (value) {
+        if (value == null || value.isEmpty) {
+          return 'Please enter amount range';
+        }
+        return null;
+      },
+    );
+  }
+
+  Widget _buildTransactionTile(Map<String, String> txn) {
+    final isCredit = txn['type'] == "Cr";
+    final amountColor = isCredit ? Colors.green : Colors.red;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(txn['time']!, style: const TextStyle(color: Colors.grey)),
+        const SizedBox(height: 4),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Expanded(child: Text(txn['desc']!, style: const TextStyle(fontSize: 16))),
+            Text(
+              "${txn['amount']} ${txn['type']}",
+              style: TextStyle(color: amountColor, fontWeight: FontWeight.bold),
+            ),
+          ],
+        ),
+        const SizedBox(height: 25),
+      ],
+    );
+  }
+}

lib/features/auth/models/auth_credentials.dart

@@ -5,7 +5,7 @@ class AuthCredentials {
   AuthCredentials({required this.username, required this.password});
 
   Map<String, dynamic> toJson() => {
-        'username': username,
+        'customer_no': username,
         'password': password,
       };
 }

lib/features/auth/screens/Card_screen.dart

@@ -1,18 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CardScreen extends StatefulWidget {
-  const CardScreen({super.key});
-
-  @override
-  State<CardScreen> createState() => _CardScreen();
-}
-
-class _CardScreen extends State<CardScreen>{
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-
-    );
-  }
-}
-

lib/features/auth/screens/login_screen.dart

@@ -130,6 +130,7 @@ class LoginScreenState extends State<LoginScreen> {
                         },
                       ),
                     ),
+                    textInputAction: TextInputAction.done,
                     obscureText: _obscurePassword,
                     validator: (value) {
                       if (value == null || value.isEmpty) {

lib/features/beneficiaries/screens/add_beneficiary_screen.dart

@@ -0,0 +1,299 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+class AddBeneficiaryScreen extends StatefulWidget {
+  const AddBeneficiaryScreen({super.key});
+
+  @override
+  State<AddBeneficiaryScreen> createState() => _AddBeneficiaryScreen();
+}
+
+class _AddBeneficiaryScreen extends State<AddBeneficiaryScreen>{
+  final _formKey = GlobalKey<FormState>();
+
+  final TextEditingController accountNumberController = TextEditingController();
+  final TextEditingController nameController = TextEditingController();
+  final TextEditingController bankNameController = TextEditingController();
+  final TextEditingController branchNameController = TextEditingController();
+  final TextEditingController ifscController = TextEditingController();
+  final TextEditingController phoneController = TextEditingController();
+
+  String accountType = 'Savings';
+  void _submitForm() {
+    if (_formKey.currentState!.validate()) {
+      // Handle successful submission
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          backgroundColor: Colors.grey[900],
+          behavior: SnackBarBehavior.floating,
+          margin: const EdgeInsets.all(12),
+          duration: const Duration(seconds: 5),
+          content: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              const Expanded(
+                child: Text(
+                  'Beneficiary added successfully',
+                  style: TextStyle(color: Colors.white),
+                ),
+              ),
+              TextButton(
+                onPressed: () {
+                  // Navigate to Payment Screen or do something
+                },
+                style: TextButton.styleFrom(
+                  foregroundColor: Colors.blue[200],
+                ),
+                child: const Text('Pay Now'),
+              ),
+              IconButton(
+                icon: const Icon(Icons.close, color: Colors.white),
+                onPressed: () {
+                  ScaffoldMessenger.of(context).hideCurrentSnackBar();
+                },
+              ),
+            ],
+          ),
+        ),
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },),
+        title: const Text('Add Beneficiary', style: TextStyle(color: Colors.black,
+            fontWeight: FontWeight.w500),),
+        centerTitle: false,
+        actions: const [
+          Padding(
+            padding: EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              radius: 20,
+            ),
+          ),
+        ],
+      ),
+
+      body: SafeArea(
+        child: Form(
+          key: _formKey,
+          child: Column(
+            children: [
+              Expanded(
+                child: SingleChildScrollView(
+                  physics: const AlwaysScrollableScrollPhysics(),
+                  child: Padding(
+                    padding: const EdgeInsets.all(10.0),
+                    child: Column(
+                      children: [
+                        TextFormField(
+                          controller: accountNumberController,
+                          decoration: const InputDecoration(
+                            labelText: 'Account Number',
+                            // prefixIcon: Icon(Icons.person),
+                            border: OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor: Colors.white,
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          keyboardType: TextInputType.number,
+                          textInputAction: TextInputAction.next,
+                          validator: (value) {
+                            if (value == null || value.length < 10) {
+                              return "Enter a valid account number";
+                            }
+                            return null;
+                          },
+                        ),
+                        const SizedBox(height: 24),
+                        TextFormField(
+                          controller: nameController,
+                          decoration: const InputDecoration(
+                            labelText: 'Name',
+                            // prefixIcon: Icon(Icons.person),
+                            border: OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor: Colors.white,
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          textInputAction: TextInputAction.next,
+                          validator: (value) =>
+                          value == null || value.isEmpty ? "Name is required" : null,
+                        ),
+                        const SizedBox(height: 24),
+                        TextFormField(
+                          controller: bankNameController,
+                          decoration: const InputDecoration(
+                            labelText: 'Beneficiary Bank Name',
+                            // prefixIcon: Icon(Icons.person),
+                            border: OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor: Colors.white,
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          textInputAction: TextInputAction.next,
+                          validator: (value) =>
+                          value == null || value.isEmpty ? "Bank name is required" : null,
+                        ),
+                        const SizedBox(height: 24),
+                        TextFormField(
+                          controller: branchNameController,
+                          decoration: const InputDecoration(
+                            labelText: 'Branch Name',
+                            // prefixIcon: Icon(Icons.person),
+                            border: OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor: Colors.white,
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          textInputAction: TextInputAction.next,
+                          validator: (value) =>
+                          value == null || value.isEmpty ? "Branch name is required" : null,
+                        ),
+                        const SizedBox(height: 24),
+                        Row(
+                          children: [
+                            Expanded(
+                              flex: 2,
+                              child: TextFormField(
+                                controller: ifscController,
+                                decoration: const InputDecoration(
+                                  labelText: 'IFSC Code',
+                                  // prefixIcon: Icon(Icons.person),
+                                  border: OutlineInputBorder(),
+                                  isDense: true,
+                                  filled: true,
+                                  fillColor: Colors.white,
+                                  enabledBorder: OutlineInputBorder(
+                                    borderSide: BorderSide(color: Colors.black),
+                                  ),
+                                  focusedBorder: OutlineInputBorder(
+                                    borderSide: BorderSide(color: Colors.black, width: 2),
+                                  ),
+                                ),
+                                textInputAction: TextInputAction.next,
+                                validator: (value) => value == null || value.length < 5
+                                    ? "Enter a valid IFSC"
+                                    : null,
+                              ),
+                            ),
+                            const SizedBox(width: 16),
+                            Expanded(
+                              flex: 2,
+                              child: DropdownButtonFormField<String>(
+                                value: accountType,
+                                decoration: const InputDecoration(
+                                  labelText: 'Account Type',
+                                  // prefixIcon: Icon(Icons.person),
+                                  border: OutlineInputBorder(),
+                                  isDense: true,
+                                  filled: true,
+                                  fillColor: Colors.white,
+                                  enabledBorder: OutlineInputBorder(
+                                    borderSide: BorderSide(color: Colors.black),
+                                  ),
+                                  focusedBorder: OutlineInputBorder(
+                                    borderSide: BorderSide(color: Colors.black, width: 2),
+                                  ),
+                                ),
+                      
+                                items: ['Savings', 'Current']
+                                    .map((type) => DropdownMenuItem(
+                                  value: type,
+                                  child: Text(type),
+                                ))
+                                    .toList(),
+                                onChanged: (value) {
+                                  setState(() {
+                                    accountType = value!;
+                                  });
+                                },
+                              ),
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 24),
+                        TextFormField(
+                          controller: phoneController,
+                          keyboardType: TextInputType.phone,
+                          decoration: const InputDecoration(
+                            labelText: 'Phone',
+                              prefixIcon: Icon(Icons.phone),
+                            border: OutlineInputBorder(),
+                            isDense: true,
+                            filled: true,
+                            fillColor: Colors.white,
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderSide: BorderSide(color: Colors.black, width: 2),
+                            ),
+                          ),
+                          textInputAction: TextInputAction.done,
+                          validator: (value) =>
+                          value == null || value.length != 10 ? "Enter a valid phone" : null,
+                        ),
+                        const SizedBox(height: 35),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+              
+              Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: SizedBox(
+                    width: 250,
+                    child: ElevatedButton(
+                      onPressed: _submitForm,
+                      style: ElevatedButton.styleFrom(
+                        shape: const StadiumBorder(),
+                        padding: const EdgeInsets.symmetric(vertical: 16),
+                        backgroundColor: Colors.blue[900],
+                        foregroundColor: Colors.white,
+                      ),
+                      child: const Text("Add"),
+                    ),
+                  ),
+              ),
+              
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+}

lib/features/beneficiaries/screens/manage_beneficiaries_screen.dart

@@ -0,0 +1,92 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/features/beneficiaries/screens/add_beneficiary_screen.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+class ManageBeneficiariesScreen extends StatefulWidget {
+  const ManageBeneficiariesScreen({super.key});
+
+  @override
+  State<ManageBeneficiariesScreen> createState() => _ManageBeneficiariesScreen();
+}
+
+class _ManageBeneficiariesScreen extends State<ManageBeneficiariesScreen>{
+  final List<Map<String, String>> beneficiaries = [
+    {
+      'bank': 'State Bank Of India',
+      'name': 'Trina Bakshi',
+    },
+    {
+      'bank': 'State Bank Of India',
+      'name': 'Sheetal Rao',
+    },
+    {
+      'bank': 'Punjab National Bank',
+      'name': 'Manoj Kumar',
+    },
+    {
+      'bank': 'State Bank Of India',
+      'name': 'Rohit Mehra',
+    },
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },),
+        title: const Text('Beneficiaries', style: TextStyle(color: Colors.black,
+            fontWeight: FontWeight.w500),),
+        centerTitle: false,
+        actions: const [
+          Padding(
+            padding: EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              radius: 20,
+            ),
+          ),
+        ],
+      ),
+
+      body: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: ListView.builder(
+          itemCount: beneficiaries.length,
+          itemBuilder: (context, index) {
+            final beneficiary = beneficiaries[index];
+            return ListTile(
+              leading: const CircleAvatar(
+                backgroundColor: Colors.blue,
+                  child: Text('A')),
+              title: Text(beneficiary['name']!),
+              subtitle: Text(beneficiary['bank']!),
+              trailing: IconButton(
+                icon: const Icon(Symbols.delete_forever, color: Colors.red),
+                onPressed: () {
+                  // Delete action
+                },
+              ),
+            );
+          },
+        ),
+      ),
+      floatingActionButton: Padding(
+        padding: const EdgeInsets.only(bottom: 8.0),
+        child: FloatingActionButton(
+          onPressed: () {
+            Navigator.push(context, MaterialPageRoute(
+                builder: (context) => const AddBeneficiaryScreen()));
+          },
+          backgroundColor: Colors.grey[300],
+          foregroundColor: Colors.blue[900],
+          elevation: 5,
+          child: const Icon(Icons.add),
+        ),
+      ),
+    );
+  }
+
+}

lib/features/card/screens/block_card_screen.dart

@@ -0,0 +1,200 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+class BlockCardScreen extends StatefulWidget {
+  const BlockCardScreen({super.key});
+
+  @override
+  State<BlockCardScreen> createState() => _BlockCardScreen();
+}
+
+class _BlockCardScreen extends State<BlockCardScreen>{
+  final _formKey = GlobalKey<FormState>();
+  final _cardController = TextEditingController();
+  final _cvvController = TextEditingController();
+  final _expiryController = TextEditingController();
+  final _phoneController = TextEditingController();
+
+  Future<void> _pickExpiryDate() async {
+    final now = DateTime.now();
+    final selectedDate = await showDatePicker(
+      context: context,
+      initialDate: now,
+      firstDate: now,
+      lastDate: DateTime(now.year + 10),
+    );
+    if (selectedDate != null) {
+      _expiryController.text = DateFormat('dd/MM/yyyy').format(selectedDate);
+    }
+  }
+
+  void _blockCard() {
+    if (_formKey.currentState?.validate() ?? false) {
+      // Call your backend logic here
+
+      final snackBar = SnackBar(
+        content: const Text('Card has been blocked'),
+        action: SnackBarAction(
+          label: 'X',
+          onPressed: () {
+            // Just close the SnackBar
+          },
+          textColor: Colors.white,
+        ),
+        backgroundColor: Colors.black,
+        behavior: SnackBarBehavior.floating,
+      );
+
+      ScaffoldMessenger.of(context).showSnackBar(snackBar);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },),
+        title: const Text('Block Card', style: TextStyle(color: Colors.black,
+            fontWeight: FontWeight.w500),),
+        centerTitle: false,
+        actions: const [
+          Padding(
+            padding: EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              radius: 20,
+            ),
+          ),
+        ],
+      ),
+
+      body: Padding(
+        padding: const EdgeInsets.all(10.0),
+        child: Form(
+          key: _formKey,
+          child: ListView(
+            children: [
+              const SizedBox(height: 10),
+              TextFormField(
+                controller: _cardController,
+                decoration: const InputDecoration(
+                  labelText: 'Card Number',
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                  filled: true,
+                  fillColor: Colors.white,
+                  enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
+                  ),
+                ),
+                keyboardType: TextInputType.number,
+                textInputAction: TextInputAction.next,
+                validator: (value) =>
+                value != null && value.length == 16 ? null : 'Enter valid card number',
+              ),
+              const SizedBox(height: 24),
+              Row(
+                children: [
+                  Expanded(
+                    child: TextFormField(
+                      controller: _cvvController,
+                      decoration: const InputDecoration(
+                        labelText: 'CVV',
+                        border: OutlineInputBorder(),
+                        isDense: true,
+                        filled: true,
+                        fillColor: Colors.white,
+                        enabledBorder: OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black),
+                        ),
+                        focusedBorder: OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
+                        ),
+                      ),
+                      keyboardType: TextInputType.number,
+                      textInputAction: TextInputAction.next,
+                      obscureText: true,
+                      validator: (value) =>
+                      value != null && value.length == 3 ? null : 'CVV must be 3 digits',
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: TextFormField(
+                      controller: _expiryController,
+                      readOnly: true,
+                      onTap: _pickExpiryDate,
+                      decoration: const InputDecoration(
+                        labelText: 'Expiry Date',
+                        suffixIcon: Icon(Icons.calendar_today),
+                        border: OutlineInputBorder(),
+                        isDense: true,
+                        filled: true,
+                        fillColor: Colors.white,
+                        enabledBorder: OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black),
+                        ),
+                        focusedBorder: OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
+                        ),
+                      ),
+                      validator: (value) =>
+                      value != null && value.isNotEmpty ? null : 'Select expiry date',
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 24),
+              TextFormField(
+                controller: _phoneController,
+                decoration: const InputDecoration(
+                  labelText: 'Phone',
+                  prefixIcon: Icon(Icons.phone),
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                  filled: true,
+                  fillColor: Colors.white,
+                  enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
+                  ),
+                ),
+                textInputAction: TextInputAction.done,
+                keyboardType: TextInputType.phone,
+                validator: (value) =>
+                value != null && value.length >= 10 ? null : 'Enter valid phone number',
+              ),
+              const SizedBox(height: 45),
+              Align(
+                alignment: Alignment.center,
+                child: SizedBox(
+                  width: 250,
+                  child: ElevatedButton(
+                    onPressed: _blockCard,
+                    style: ElevatedButton.styleFrom(
+                      shape: const StadiumBorder(),
+                      padding: const EdgeInsets.symmetric(vertical: 16),
+                      backgroundColor: Colors.blue[900],
+                      foregroundColor: Colors.white,
+                    ),
+                    child: const Text('Block'),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+}

lib/features/card/screens/card_management_screen.dart

@@ -0,0 +1,95 @@
+import 'package:flutter/material.dart';
+import 'package:kmobile/features/card/screens/block_card_screen.dart';
+import 'package:kmobile/features/card/screens/card_pin_change_details_screen.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+class CardManagementScreen extends StatefulWidget {
+  const CardManagementScreen({super.key});
+
+  @override
+  State<CardManagementScreen> createState() => _CardManagementScreen();
+}
+
+class _CardManagementScreen extends State<CardManagementScreen>{
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        title: const Text('Card Management', style: TextStyle(color: Colors.black,
+            fontWeight: FontWeight.w500),),
+        centerTitle: false,
+        actions: const [
+          Padding(
+            padding: EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              radius: 20,
+            ),
+          ),
+        ],
+      ),
+
+      body: ListView(
+        children: [
+          CardManagementTile(
+            icon: Symbols.add,
+            label: 'Apply Debit Card',
+            onTap: () {
+
+            },
+          ),
+
+          const Divider(height: 1,),
+
+          CardManagementTile(
+            icon: Symbols.remove_moderator,
+            label: 'Block / Unblock Card',
+            onTap: () {
+              Navigator.push(context, MaterialPageRoute(
+                  builder: (context) => const BlockCardScreen()));
+            },
+          ),
+
+          const Divider(height: 1,),
+
+          CardManagementTile(
+            icon: Symbols.password_2,
+            label: 'Change Card PIN',
+            onTap: () {
+              Navigator.push(context, MaterialPageRoute(
+                  builder: (context) => const CardPinChangeDetailsScreen()));
+            },
+          ),
+
+          const Divider(height: 1,),
+
+        ],
+      ),
+    );
+  }
+}
+
+class CardManagementTile extends StatelessWidget {
+  final IconData icon;
+  final String label;
+  final VoidCallback onTap;
+
+  const CardManagementTile({
+    super.key,
+    required this.icon,
+    required this.label,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: Icon(icon),
+      title: Text(label),
+      trailing: const Icon(Symbols.arrow_right, size: 16),
+      onTap: onTap,
+    );
+  }
+}
+

lib/features/card/screens/card_pin_change_details_screen.dart

@@ -0,0 +1,189 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:kmobile/features/card/screens/card_pin_set_screen.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+class CardPinChangeDetailsScreen extends StatefulWidget {
+  const CardPinChangeDetailsScreen({super.key});
+
+  @override
+  State<CardPinChangeDetailsScreen> createState() => _CardPinChangeDetailsScreen();
+}
+
+class _CardPinChangeDetailsScreen extends State<CardPinChangeDetailsScreen>{
+  final _formKey = GlobalKey<FormState>();
+  final _cardController = TextEditingController();
+  final _cvvController = TextEditingController();
+  final _expiryController = TextEditingController();
+  final _phoneController = TextEditingController();
+
+  Future<void> _pickExpiryDate() async {
+    final now = DateTime.now();
+    final selectedDate = await showDatePicker(
+      context: context,
+      initialDate: now,
+      firstDate: now,
+      lastDate: DateTime(now.year + 10),
+    );
+    if (selectedDate != null) {
+      _expiryController.text = DateFormat('dd/MM/yyyy').format(selectedDate);
+    }
+  }
+
+  void _nextButton() {
+    if (_formKey.currentState?.validate() ?? false) {
+      // Call your backend logic here
+      Navigator.of(context).pushReplacement(
+        MaterialPageRoute(builder: (context) => const CardPinSetScreen()),
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },),
+        title: const Text('Card Details', style: TextStyle(color: Colors.black,
+            fontWeight: FontWeight.w500),),
+        centerTitle: false,
+        actions: const [
+          Padding(
+            padding: EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              radius: 20,
+            ),
+          ),
+        ],
+      ),
+
+      body: Padding(
+        padding: const EdgeInsets.all(10.0),
+        child: Form(
+          key: _formKey,
+          child: ListView(
+            children: [
+              const SizedBox(height: 10),
+              TextFormField(
+                controller: _cardController,
+                decoration: const InputDecoration(
+                  labelText: 'Card Number',
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                  filled: true,
+                  fillColor: Colors.white,
+                  enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
+                  ),
+                ),
+                keyboardType: TextInputType.number,
+                textInputAction: TextInputAction.next,
+                validator: (value) =>
+                value != null && value.length == 16 ? null : 'Enter valid card number',
+              ),
+              const SizedBox(height: 24),
+              Row(
+                children: [
+                  Expanded(
+                    child: TextFormField(
+                      controller: _cvvController,
+                      decoration: const InputDecoration(
+                        labelText: 'CVV',
+                        border: OutlineInputBorder(),
+                        isDense: true,
+                        filled: true,
+                        fillColor: Colors.white,
+                        enabledBorder: OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black),
+                        ),
+                        focusedBorder: OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
+                        ),
+                      ),
+                      keyboardType: TextInputType.number,
+                      textInputAction: TextInputAction.next,
+                      obscureText: true,
+                      validator: (value) =>
+                      value != null && value.length == 3 ? null : 'CVV must be 3 digits',
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    child: TextFormField(
+                      controller: _expiryController,
+                      readOnly: true,
+                      onTap: _pickExpiryDate,
+                      decoration: const InputDecoration(
+                        labelText: 'Expiry Date',
+                        suffixIcon: Icon(Icons.calendar_today),
+                        border: OutlineInputBorder(),
+                        isDense: true,
+                        filled: true,
+                        fillColor: Colors.white,
+                        enabledBorder: OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black),
+                        ),
+                        focusedBorder: OutlineInputBorder(
+                          borderSide: BorderSide(color: Colors.black, width: 2),
+                        ),
+                      ),
+                      validator: (value) =>
+                      value != null && value.isNotEmpty ? null : 'Select expiry date',
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 24),
+              TextFormField(
+                controller: _phoneController,
+                decoration: const InputDecoration(
+                  labelText: 'Phone',
+                  prefixIcon: Icon(Icons.phone),
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                  filled: true,
+                  fillColor: Colors.white,
+                  enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
+                  ),
+                ),
+                textInputAction: TextInputAction.done,
+                keyboardType: TextInputType.phone,
+                validator: (value) =>
+                value != null && value.length >= 10 ? null : 'Enter valid phone number',
+              ),
+              const SizedBox(height: 45),
+              Align(
+                alignment: Alignment.center,
+                child: SizedBox(
+                  width: 250,
+                  child: ElevatedButton(
+                    onPressed: _nextButton,
+                    style: ElevatedButton.styleFrom(
+                      shape: const StadiumBorder(),
+                      padding: const EdgeInsets.symmetric(vertical: 16),
+                      backgroundColor: Colors.blue[900],
+                      foregroundColor: Colors.white,
+                    ),
+                    child: const Text('Next'),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+}

lib/features/card/screens/card_pin_set_screen.dart

@@ -0,0 +1,148 @@
+import 'package:flutter/material.dart';
+import 'package:material_symbols_icons/material_symbols_icons.dart';
+
+class CardPinSetScreen extends StatefulWidget {
+  const CardPinSetScreen({super.key});
+
+  @override
+  State<CardPinSetScreen> createState() => _CardPinSetScreen();
+}
+
+class _CardPinSetScreen extends State<CardPinSetScreen>{
+  final _formKey = GlobalKey<FormState>();
+  final _pinController = TextEditingController();
+  final _confirmPinController = TextEditingController();
+
+  void _submit() {
+    if (_formKey.currentState!.validate()) {
+      // Handle PIN submission logic here
+      final snackBar = SnackBar(
+        content: const Text('PIN set successfully'),
+        action: SnackBarAction(
+          label: 'X',
+          onPressed: () {
+            // Just close the SnackBar
+          },
+          textColor: Colors.white,
+        ),
+        backgroundColor: Colors.black,
+        behavior: SnackBarBehavior.floating,
+      );
+
+      ScaffoldMessenger.of(context).showSnackBar(snackBar);
+    }
+  }
+
+  @override
+  void dispose() {
+    _pinController.dispose();
+    _confirmPinController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(icon: const Icon(Symbols.arrow_back_ios_new),
+          onPressed: () {
+            Navigator.pop(context);
+          },),
+        title: const Text('Card PIN', style: TextStyle(color: Colors.black,
+            fontWeight: FontWeight.w500),),
+        centerTitle: false,
+        actions: const [
+          Padding(
+            padding: EdgeInsets.only(right: 10.0),
+            child: CircleAvatar(
+              backgroundImage: AssetImage('assets/images/avatar.jpg'), // Replace with your image
+              radius: 20,
+            ),
+          ),
+        ],
+      ),
+
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Form(
+          key: _formKey,
+          child: Column(
+            children: [
+              TextFormField(
+                controller: _pinController,
+                obscureText: true,
+                decoration: const InputDecoration(
+                  labelText: 'Enter new PIN',
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                  filled: true,
+                  fillColor: Colors.white,
+                  enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
+                  ),
+                ),
+                keyboardType: TextInputType.number,
+                textInputAction: TextInputAction.next,
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return 'Please enter new PIN';
+                  }
+                  if (value.length < 4) {
+                    return 'PIN must be at least 4 digits';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 24),
+              TextFormField(
+                controller: _confirmPinController,
+                obscureText: true,
+                decoration: const InputDecoration(
+                  labelText: 'Enter Again',
+                  border: OutlineInputBorder(),
+                  isDense: true,
+                  filled: true,
+                  fillColor: Colors.white,
+                  enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(color: Colors.black, width: 2),
+                  ),
+                ),
+                keyboardType: TextInputType.number,
+                textInputAction: TextInputAction.done,
+                validator: (value) {
+                  if (value != _pinController.text) {
+                    return 'PINs do not match';
+                  }
+                  return null;
+                },
+              ),
+              const SizedBox(height: 45),
+              Align(
+                alignment: Alignment.center,
+                child: SizedBox(
+                  width: 250,
+                  child: ElevatedButton(
+                    onPressed: _submit,
+                    style: ElevatedButton.styleFrom(
+                      shape: const StadiumBorder(),
+                      padding: const EdgeInsets.symmetric(vertical: 16),
+                      backgroundColor: Colors.blue[900],
+                      foregroundColor: Colors.white,
+                    ),
+                    child: const Text('Submit'),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/dashboard/screens/dashboard_screen.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:kmobile/features/auth/screens/account_info_screen.dart';
-import 'package:kmobile/features/auth/screens/customer_info_screen.dart';
+import 'package:kmobile/features/accounts/screens/account_info_screen.dart';
+import 'package:kmobile/features/accounts/screens/account_statement_screen.dart';
+import 'package:kmobile/features/customer_info/screens/customer_info_screen.dart';
+import 'package:kmobile/features/beneficiaries/screens/manage_beneficiaries_screen.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 class DashboardScreen extends StatefulWidget {
@@ -106,7 +108,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                 children: [
                   _buildQuickLink(Symbols.id_card, "Customer \n Info", () {
                   Navigator.push(context, MaterialPageRoute(
-                  builder: (context) => const CustomerInfoScreen()));;
+                  builder: (context) => const CustomerInfoScreen()));
                   }),
                   _buildQuickLink(Symbols.currency_rupee, "Quick \n Pay",
                           () => print("")),
@@ -118,11 +120,17 @@ class _DashboardScreenState extends State<DashboardScreen> {
                             builder: (context) => const AccountInfoScreen()));
                       }),
                   _buildQuickLink(Symbols.receipt_long, "Account \n History",
-                          () => print("")),
+                          () {
+                            Navigator.push(context, MaterialPageRoute(
+                                builder: (context) => const AccountStatementScreen()));
+                          }),
                   _buildQuickLink(Symbols.checkbook, "Handle \n Cheque",
                           () => print("")),
                   _buildQuickLink(Icons.group, "Manage \n Beneficiary",
-                          () => print("")),
+                          () {
+                            Navigator.push(context, MaterialPageRoute(
+                                builder: (context) => const ManageBeneficiariesScreen()));
+                          }),
                   _buildQuickLink(Symbols.support_agent, "Contact \n Us",
                           () => print("")),
                 ],