Test APK with Sim Binding and Cheque

2026-01-16 13:53:03 +05:30
parent 1c3a07bd66
commit d89a4f5109
5 changed files with 201 additions and 63 deletions
--- a/lib/api/services/cheque_service.dart
+++ b/lib/api/services/cheque_service.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:dio/dio.dart';

 class Cheque {
@@ -130,9 +128,6 @@ class ChequeService {
        'tpin': tpin,
      },
    );
-    if (response.statusCode != 200) {
-      throw Exception(jsonEncode(response.data));
-    }
    return response.toString();
  }
 }
--- a/lib/features/cheque/screens/stop_multiple_cheques_screen.dart
+++ b/lib/features/cheque/screens/stop_multiple_cheques_screen.dart
@@ -34,9 +34,19 @@ class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
  final _stopIssueDateController = TextEditingController();
  final _stopExpiryDateController = TextEditingController();
  final _stopAmountController = TextEditingController();
-  final _stopCommentController = TextEditingController();
  final _chequeService = getIt<ChequeService>();

+  String? _selectedComment;
+  final _otherCommentController = TextEditingController();
+  bool _showOtherCommentField = false;
+  final List<String> _commentOptions = [
+    'Cheque Lost',
+    'Cheque Stolen',
+    'Cheque Missing',
+    'Cheque Damaged',
+    'Other'
+  ];
+
  String _formatDate(String dateString) {
    if (dateString.length != 8) {
      return dateString; // Return as is if not in expected ddmmyyyy format
@@ -51,6 +61,21 @@ class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
    }
  }

+  Future<void> _selectDate(TextEditingController controller) async {
+    final DateTime? picked = await showDatePicker(
+      context: context,
+      initialDate: DateTime.now(),
+      firstDate: DateTime.now(),
+      lastDate: DateTime(2101),
+    );
+    if (picked != null) {
+      setState(() {
+        controller.text =
+            '${picked.day.toString().padLeft(2, '0')}/${picked.month.toString().padLeft(2, '0')}/${picked.year}';
+      });
+    }
+  }
+
  Future<void> _showResponseDialog(String title, String message) async {
    return showDialog<void>(
      context: context,
@@ -110,6 +135,7 @@ class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).fromChequeNumberHint,
                  border: const OutlineInputBorder(),
+                  errorMaxLines: 2,
                ),
                keyboardType: TextInputType.number,
                validator: (value) {
@@ -139,6 +165,7 @@ class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).toChequeNumberHint,
                  border: const OutlineInputBorder(),
+                  errorMaxLines: 2,
                ),
                keyboardType: TextInputType.number,
                validator: (value) {
@@ -174,18 +201,30 @@ class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
              const SizedBox(height: 16),
              TextFormField(
                controller: _stopIssueDateController,
+                readOnly: true,
+                onTap: () => _selectDate(_stopIssueDateController),
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).stopIssueDateHint,
                  border: const OutlineInputBorder(),
+                  suffixIcon: IconButton(
+                    icon: const Icon(Icons.calendar_today),
+                    onPressed: () => _selectDate(_stopIssueDateController),
+                  ),
                ),
                keyboardType: TextInputType.datetime,
              ),
              const SizedBox(height: 16),
              TextFormField(
                controller: _stopExpiryDateController,
+                readOnly: true,
+                onTap: () => _selectDate(_stopExpiryDateController),
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).stopExpiryDateHint,
                  border: const OutlineInputBorder(),
+                  suffixIcon: IconButton(
+                    icon: const Icon(Icons.calendar_today),
+                    onPressed: () => _selectDate(_stopExpiryDateController),
+                  ),
                ),
                keyboardType: TextInputType.datetime,
              ),
@@ -199,13 +238,39 @@ class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
                keyboardType: TextInputType.number,
              ),
              const SizedBox(height: 16),
-              TextFormField(
-                controller: _stopCommentController,
+              DropdownButtonFormField<String>(
+                value: _selectedComment,
+                items: _commentOptions.map((String value) {
+                  return DropdownMenuItem<String>(
+                    value: value,
+                    child: Text(value),
+                  );
+                }).toList(),
+                onChanged: (newValue) {
+                  setState(() {
+                    _selectedComment = newValue;
+                    _showOtherCommentField = newValue == 'Other';
+                  });
+                },
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).stopCommentHint,
                  border: const OutlineInputBorder(),
                ),
              ),
+              if (_showOtherCommentField)
+                Padding(
+                  padding: const EdgeInsets.only(top: 16.0),
+                  child: TextFormField(
+                    controller: _otherCommentController,
+                    decoration: const InputDecoration(
+                      labelText: "Other Reasons :",
+                      border: OutlineInputBorder(),
+                    ),
+                    validator: (value) {
+                      return null;
+                    },
+                  ),
+                ),
              const SizedBox(height: 16),
              TextFormField(
                initialValue: _formatDate(widget.date),
@@ -236,7 +301,9 @@ class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
                                stopIssueDate: _stopIssueDateController.text,
                                stopExpiryDate: _stopExpiryDateController.text,
                                stopAmount: _stopAmountController.text,
-                                stopComment: _stopCommentController.text,
+                                stopComment: _selectedComment == 'Other'
+                                    ? _otherCommentController.text
+                                    : _selectedComment ?? '',
                                chequeIssueDate: widget.date,
                                tpin: pin,
                              );
@@ -244,15 +311,19 @@ class _StopMultipleChequesScreenState extends State<StopMultipleChequesScreen> {
                              final decodedResponse = jsonDecode(response);
                              final status = decodedResponse['status'];
                              final message = decodedResponse['message'];
+                              final code = decodedResponse['code'];
                              if (status == 'SUCCESS') {
                                _showResponseDialog('Success', message);
-                              } else {
-                                _showResponseDialog('Error', message);
+                              } if (status == 'ERROR') {
+                                String errMessage = "error";
+                                if(code == '0429') {
+                                  errMessage = 'The selected Cheque is already stopped';
+                                } else if(code == '0748') {
+                                  errMessage = 'The selected Cheque is already presented';
+                                }
+                                _showResponseDialog('Error', errMessage);
                              }
                            } on Exception catch (e) {
-                              print('inside catch block');
-                              print(e.toString());
-
                              try {
                                final errorBodyString =
                                    e.toString().split('Exception: ')[1];
--- a/lib/features/cheque/screens/stop_single_cheque_screen.dart
+++ b/lib/features/cheque/screens/stop_single_cheque_screen.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:dio/dio.dart';
 import 'package:kmobile/data/models/user.dart';
 import 'package:kmobile/di/injection.dart';
 import 'package:flutter/material.dart';
@@ -31,9 +32,19 @@ class _StopSingleChequeScreenState extends State<StopSingleChequeScreen> {
  final _stopIssueDateController = TextEditingController();
  final _stopExpiryDateController = TextEditingController();
  final _stopAmountController = TextEditingController();
-  final _stopCommentController = TextEditingController();
  final _chequeService = getIt<ChequeService>();

+  String? _selectedComment;
+  final _otherCommentController = TextEditingController();
+  bool _showOtherCommentField = false;
+  final List<String> _commentOptions = [
+    'Cheque Lost',
+    'Cheque Stolen',
+    'Cheque Missing',
+    'Cheque Damaged',
+    'Other'
+  ];
+
  String _formatDate(String dateString) {
    if (dateString.length != 8) {
      return dateString; // Return as is if not in expected ddmmyyyy format
@@ -48,6 +59,21 @@ class _StopSingleChequeScreenState extends State<StopSingleChequeScreen> {
    }
  }

+  Future<void> _selectDate(TextEditingController controller) async {
+    final DateTime? picked = await showDatePicker(
+      context: context,
+      initialDate: DateTime.now(),
+      firstDate: DateTime.now(),
+      lastDate: DateTime(2101),
+    );
+    if (picked != null) {
+      setState(() {
+        controller.text =
+            '${picked.day.toString().padLeft(2, '0')}/${picked.month.toString().padLeft(2, '0')}/${picked.year}';
+      });
+    }
+  }
+
  Future<void> _showResponseDialog(String title, String message) async {
    return showDialog<void>(
      context: context,
@@ -107,6 +133,7 @@ class _StopSingleChequeScreenState extends State<StopSingleChequeScreen> {
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).chequeNumberLabel,
                  border: OutlineInputBorder(),
+                  errorMaxLines: 2,
                ),
                keyboardType: TextInputType.number,
                validator: (value) {
@@ -142,18 +169,30 @@ class _StopSingleChequeScreenState extends State<StopSingleChequeScreen> {
              const SizedBox(height: 16),
              TextFormField(
                controller: _stopIssueDateController,
+                readOnly: true,
+                onTap: () => _selectDate(_stopIssueDateController),
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).stopIssueDateLabel,
                  border: const OutlineInputBorder(),
+                  suffixIcon: IconButton(
+                    icon: const Icon(Icons.calendar_today),
+                    onPressed: () => _selectDate(_stopIssueDateController),
+                  ),
                ),
                keyboardType: TextInputType.datetime,
              ),
              const SizedBox(height: 16),
              TextFormField(
                controller: _stopExpiryDateController,
+                readOnly: true,
+                onTap: () => _selectDate(_stopExpiryDateController),
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).stopExpiryDateLabel,
                  border: const OutlineInputBorder(),
+                  suffixIcon: IconButton(
+                    icon: const Icon(Icons.calendar_today),
+                    onPressed: () => _selectDate(_stopExpiryDateController),
+                  ),
                ),
                keyboardType: TextInputType.datetime,
              ),
@@ -167,13 +206,39 @@ class _StopSingleChequeScreenState extends State<StopSingleChequeScreen> {
                keyboardType: TextInputType.number,
              ),
              const SizedBox(height: 16),
-              TextFormField(
-                controller: _stopCommentController,
+              DropdownButtonFormField<String>(
+                value: _selectedComment,
+                items: _commentOptions.map((String value) {
+                  return DropdownMenuItem<String>(
+                    value: value,
+                    child: Text(value),
+                  );
+                }).toList(),
+                onChanged: (newValue) {
+                  setState(() {
+                    _selectedComment = newValue;
+                    _showOtherCommentField = newValue == 'Other';
+                  });
+                },
                decoration: InputDecoration(
                  labelText: AppLocalizations.of(context).stopCommentHint,
                  border: const OutlineInputBorder(),
                ),
              ),
+              if (_showOtherCommentField)
+                Padding(
+                  padding: const EdgeInsets.only(top: 16.0),
+                  child: TextFormField(
+                    controller: _otherCommentController,
+                    decoration: const InputDecoration(
+                      labelText: "Other Reasons :",
+                      border: OutlineInputBorder(),
+                    ),
+                    validator: (value) {
+                      return null;
+                    },
+                  ),
+                ),
              const SizedBox(height: 16),
              TextFormField(
                initialValue: _formatDate(widget.date),
@@ -205,23 +270,30 @@ class _StopSingleChequeScreenState extends State<StopSingleChequeScreen> {
                                stopIssueDate: _stopIssueDateController.text,
                                stopExpiryDate: _stopExpiryDateController.text,
                                stopAmount: _stopAmountController.text,
-                                stopComment: _stopCommentController.text,
+                                stopComment: _selectedComment == 'Other'
+                                    ? _otherCommentController.text
+                                    : _selectedComment ?? '',
                                chequeIssueDate: widget.date,
                                tpin: pin,
                              );
                              if (!mounted) return;
                              final decodedResponse = jsonDecode(response);
+
                              final status = decodedResponse['status'];
                              final message = decodedResponse['message'];
+                              final code = decodedResponse['code'];
                              if (status == 'SUCCESS') {
                                _showResponseDialog('Success', message);
-                              } else {
-                                _showResponseDialog('Error', message);
+                              } if (status == 'ERROR') {
+                                String errMessage = "error";
+                                if(code == '0429') {
+                                  errMessage = 'The selected Cheque is already stopped';
+                                } else if(code == '0748') {
+                                  errMessage = 'The selected Cheque is already presented';
+                                }
+                                _showResponseDialog('Error', errMessage);
                              }
-                            } on Exception catch (e) {
-                              print('inside catch block');
-                              print(e.toString());
-
+                            } on DioException catch (e) {
                              try {
                                final errorBodyString =
                                    e.toString().split('Exception: ')[1];
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -15,13 +15,13 @@ void main() async {
  ]);

  // Check for device compromise
-  // final compromisedMessage = await SecurityService.deviceCompromisedMessage;
-  // if (compromisedMessage != null) {
-  //   runApp(MaterialApp(
-  //     home: SecurityErrorScreen(message: compromisedMessage),
-  //   ));
-  //   return;
-  // }
+  final compromisedMessage = await SecurityService.deviceCompromisedMessage;
+  if (compromisedMessage != null) {
+    runApp(MaterialApp(
+      home: SecurityErrorScreen(message: compromisedMessage),
+    ));
+    return;
+  }
  await setupDependencies();
  runApp(const KMobile());
 }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -69,10 +69,10 @@ packages:
    dependency: transitive
    description:
      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
  checked_yaml:
    dependency: transitive
    description:
@@ -93,18 +93,18 @@ packages:
    dependency: transitive
    description:
      name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
  collection:
    dependency: transitive
    description:
      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
      url: "https://pub.dev"
    source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
  confetti:
    dependency: "direct main"
    description:
@@ -189,10 +189,10 @@ packages:
    dependency: transitive
    description:
      name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
  ffi:
    dependency: transitive
    description:
@@ -425,10 +425,10 @@ packages:
    dependency: "direct main"
    description:
      name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
      url: "https://pub.dev"
    source: hosted
-    version: "0.19.0"
+    version: "0.20.2"
  jailbreak_root_detection:
    dependency: "direct main"
    description:
@@ -457,26 +457,26 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.5"
+    version: "11.0.2"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.10"
  leak_tracker_testing:
    dependency: transitive
    description:
      name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  lints:
    dependency: transitive
    description:
@@ -537,10 +537,10 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
  material_color_utilities:
    dependency: transitive
    description:
@@ -561,10 +561,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
      url: "https://pub.dev"
    source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
  mime:
    dependency: transitive
    description:
@@ -609,10 +609,10 @@ packages:
    dependency: transitive
    description:
      name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
  path_parsing:
    dependency: transitive
    description:
@@ -881,7 +881,7 @@ packages:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
  source_span:
    dependency: transitive
    description:
@@ -902,18 +902,18 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
  string_scanner:
    dependency: transitive
    description:
@@ -934,10 +934,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.2"
+    version: "0.7.6"
  timezone:
    dependency: transitive
    description:
@@ -1054,10 +1054,10 @@ packages:
    dependency: transitive
    description:
      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
  vm_service:
    dependency: transitive
    description:
@@ -1115,5 +1115,5 @@ packages:
    source: hosted
    version: "3.1.3"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
  flutter: ">=3.24.0"