TPIN Set Screen OTP Implemented

lib/api/services/change_password_service.dart

@@ -22,6 +22,23 @@ class ChangePasswordService {
     return response.toString();
   }
 
+    Future getOtpTpin({
+    required String mobileNumber,
+  }) async {
+    final response = await _dio.post(
+      '/api/otp/send',
+      data: {
+        'mobileNumber': mobileNumber,
+        'type': "CHANGE_TPIN"
+      },
+    );
+    if (response.statusCode != 200) {
+      throw Exception("Invalid Mobile Number/Type");
+    }
+    print(response.toString());
+    return response.toString();
+  }
+
  
  Future validateOtp({
     required String otp,

lib/features/fund_transfer/screens/tpin_otp_screen.dart

@@ -1,6 +1,8 @@
 import '../../../l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:kmobile/features/fund_transfer/screens/tpin_set_screen.dart';
+import 'package:kmobile/api/services/change_password_service.dart';
+import 'package:kmobile/di/injection.dart';
 
 class TpinOtpScreen extends StatefulWidget {
   const TpinOtpScreen({super.key});
@@ -10,11 +12,13 @@ class TpinOtpScreen extends StatefulWidget {
 }
 
 class _TpinOtpScreenState extends State<TpinOtpScreen> {
-  final List<FocusNode> _focusNodes = List.generate(4, (_) => FocusNode());
+  final List<FocusNode> _focusNodes = List.generate(6, (_) => FocusNode());
   final List<TextEditingController> _controllers = List.generate(
-    4,
+    6,
     (_) => TextEditingController(),
   );
+   bool _isLoading = false;
+ final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
 
   @override
   void dispose() {
@@ -28,7 +32,7 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
   }
 
   void _onOtpChanged(int idx, String value) {
-    if (value.length == 1 && idx < 3) {
+    if (value.length == 1 && idx <5) {
       _focusNodes[idx + 1].requestFocus();
     }
     if (value.isEmpty && idx > 0) {
@@ -39,17 +43,37 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
 
   String get _enteredOtp => _controllers.map((c) => c.text).join();
 
-  void _verifyOtp() {
-    if (_enteredOtp == '0000') {
+void _verifyOtp() async {
+  setState(() {
+    _isLoading = true;
+  });
+
+  try {
+    // IMPORTANT: You may need to pass the mobile number here as well
+    await _changePasswordService.validateOtp(
+      otp: _enteredOtp,
+      mobileNumber: '8981274001', // Replace with actual mobile number
+    );
+
+    if (mounted) {
       Navigator.pushReplacement(
         context,
-        MaterialPageRoute(builder: (_) => TpinSetScreen()),
+        MaterialPageRoute(builder: (_) => const TpinSetScreen()),
       );
-    } else {
+    }
+  } catch (e) {
+    if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(content: Text(AppLocalizations.of(context).invalidOtp)),
       );
     }
+  } finally {
+    if (mounted) {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
 }
 
   @override
@@ -64,7 +88,6 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
      body: Center(
        child: SingleChildScrollView(
          child: Column(
-            // mainAxisSize: MainAxisSize.min,
            children: [
              Icon(
                Icons.lock_outline,
@@ -90,9 +113,9 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
              const SizedBox(height: 32),
              Row(
                mainAxisAlignment: MainAxisAlignment.center,
-                children: List.generate(4, (i) {
+               children: List.generate(6, (i) {
                  return Container(
-                    width: 48,
+                   width: 32,
                    margin: const EdgeInsets.symmetric(horizontal: 8),
                    child: TextField(
                      controller: _controllers[i],
@@ -101,7 +124,7 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
                      textAlign: TextAlign.center,
                      maxLength: 1,
                      obscureText: true,
-                      obscuringCharacter: '⬤',
+                     obscuringCharacter: '*',
                      decoration: InputDecoration(
                        counterText: '',
                        filled: true,
@@ -128,7 +151,17 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
              ),
              const SizedBox(height: 32),
              ElevatedButton.icon(
-                icon: const Icon(Icons.verified_user_rounded),
+               // Update icon to show a loading indicator
+               icon: _isLoading
+                   ? const SizedBox(
+                       width: 20,
+                       height: 20,
+                       child: CircularProgressIndicator(
+                         color: Colors.white,
+                         strokeWidth: 2,
+                       ),
+                     )
+                   : const Icon(Icons.verified_user_rounded),
                label: Text(
                  AppLocalizations.of(context).verifyOtp,
                  style: const TextStyle(
@@ -144,12 +177,15 @@ class _TpinOtpScreenState extends State<TpinOtpScreen> {
                    borderRadius: BorderRadius.circular(30),
                  ),
                ),
-                onPressed: _enteredOtp.length == 4 ? _verifyOtp : null,
+               // Update onPressed to handle loading state
+               onPressed: (_enteredOtp.length == 6 && !_isLoading)
+                   ? _verifyOtp
+                   : null,
              ),
              const SizedBox(height: 16),
              TextButton(
                onPressed: () {
-                  // Resend OTP logic here
+                 // You can also add a getOtp call here for resending
                  ScaffoldMessenger.of(context).showSnackBar(
                    SnackBar(
                      content: Text(AppLocalizations.of(context).otpResent),

lib/features/fund_transfer/screens/tpin_prompt_screen.dart

@@ -1,10 +1,48 @@
 import '../../../l10n/app_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:kmobile/features/fund_transfer/screens/tpin_otp_screen.dart';
+import 'package:kmobile/api/services/change_password_service.dart'; // <-- Add this import
+import 'package:kmobile/di/injection.dart'; // <-- Add this import
 
-class TpinSetupPromptScreen extends StatelessWidget {
+class TpinSetupPromptScreen extends StatefulWidget {
   const TpinSetupPromptScreen({super.key});
 
+  @override
+  State<TpinSetupPromptScreen> createState() => _TpinSetupPromptScreenState();
+}
+
+ class _TpinSetupPromptScreenState extends State<TpinSetupPromptScreen> {
+   // 3. Add state variables
+   bool _isLoading = false;
+   final ChangePasswordService _changePasswordService = getIt<ChangePasswordService>();
+   Future<void> _getOtp() async {
+  setState(() {
+    _isLoading = true;
+  });
+
+  try {
+    await _changePasswordService.getOtp(mobileNumber: '8981274001');
+    if (mounted) {
+      Navigator.pushReplacement(
+        context,
+        MaterialPageRoute(builder: (_) => const TpinOtpScreen()),
+      );
+    }
+  } catch (e) {
+    if (mounted) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Error: ${e.toString()}')),
+      );
+    }
+  } finally {
+    if (mounted) {
+      setState(() {
+        _isLoading = false;
+      });
+    }
+  }
+}
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -38,11 +76,19 @@ class TpinSetupPromptScreen extends StatelessWidget {
             ),
             const SizedBox(height: 32),
 ElevatedButton.icon(
-              icon: const Icon(Icons.arrow_forward_rounded),
+  icon: _isLoading
+      ? const SizedBox(
+          width: 20,
+          height: 20,
+          child: CircularProgressIndicator(
+            color: Colors.white,
+            strokeWidth: 2,
+          ),
+        )
+      : const Icon(Icons.arrow_forward_rounded),
   label: Text(
     AppLocalizations.of(context).setTpin,
-                style:
-                    const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
+    style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600),
   ),
   style: ElevatedButton.styleFrom(
     backgroundColor: theme.colorScheme.onPrimary,
@@ -54,12 +100,7 @@ class TpinSetupPromptScreen extends StatelessWidget {
       borderRadius: BorderRadius.circular(10),
     ),
   ),
-              onPressed: () {
-                Navigator.pushReplacement(
-                  context,
-                  MaterialPageRoute(builder: (_) => const TpinOtpScreen()),
-                );
-              },
+  onPressed: _isLoading ? null : _getOtp, // <-- Use the new function
 ),
             const SizedBox(height: 18),
             Padding(