refactor: improve notification scheduling and debt reminder management for clarity and functionality

Author: CephasTechOrg

mobile/lib/core/services/notifications_service.dart

@@ -226,6 +226,18 @@ class NotificationsService {
     );
   }
 
+  /// Schedules a notification for a future time.
+  ///
+  /// Note: this does NOT record an inbox entry now — a scheduled notification
+  /// hasn't been shown yet. The OS displays it at [whenLocal]; recording it as
+  /// "shown" at schedule time wrongly surfaced it in the in-app inbox instantly.
+  ///
+  /// Exact alarms (`exactAllowWhileIdle`) need the `SCHEDULE_EXACT_ALARM` /
+  /// `USE_EXACT_ALARM` permission on Android 12+, which we don't request (and
+  /// Play restricts to clock/alarm apps). Without it the plugin throws
+  /// `exact_alarms_not_permitted`. So we schedule **inexact** by default
+  /// (fine for debt nudges) and fall back to inexact if an exact request is
+  /// ever rejected — the call never throws for a permission reason.
   Future<void> scheduleAt({
     required int id,
     required AppNotificationType type,
@@ -235,33 +247,41 @@ class NotificationsService {
     required AndroidNotificationDetails android,
     String route = '/home',
     String? entityId,
-    bool exact = true,
+    bool exact = false,
   }) async {
     await _initTimezone();
     final payload = jsonEncode(
       AppNotificationPayload(type: type, route: route, entityId: entityId)
           .toJson(),
     );
-    await _recordShown(
-      notificationId: id,
-      type: type,
-      title: title,
-      body: body,
-      route: route,
-      entityId: entityId,
-      payloadJson: payload,
-    );
     final scheduled = tz.TZDateTime.from(whenLocal, tz.local);
-    await _plugin.zonedSchedule(
-      id,
-      title,
-      body,
-      scheduled,
-      NotificationDetails(android: android),
-      payload: payload,
-      androidScheduleMode:
-          exact ? AndroidScheduleMode.exactAllowWhileIdle : AndroidScheduleMode.inexact,
-    );
+
+    Future<void> schedule(AndroidScheduleMode mode) {
+      return _plugin.zonedSchedule(
+        id,
+        title,
+        body,
+        scheduled,
+        NotificationDetails(android: android),
+        payload: payload,
+        androidScheduleMode: mode,
+      );
+    }
+
+    final preferred = exact
+        ? AndroidScheduleMode.exactAllowWhileIdle
+        : AndroidScheduleMode.inexactAllowWhileIdle;
+    try {
+      await schedule(preferred);
+    } on Exception {
+      // Most commonly `exact_alarms_not_permitted`. Retry inexact so the
+      // reminder is still scheduled and the caller never sees a false error.
+      if (preferred != AndroidScheduleMode.inexactAllowWhileIdle) {
+        await schedule(AndroidScheduleMode.inexactAllowWhileIdle);
+      } else {
+        rethrow;
+      }
+    }
   }
 
   Future<void> scheduleDailyAtTime({

mobile/lib/features/debts/data/debt_reminders_repository.dart

@@ -100,7 +100,9 @@ class DebtRemindersRepository {
     );
   }
 
-  Future<void> cancel({required String reminderId}) async {
+  /// Cancels the pending OS notification (if any) and removes the row entirely
+  /// so cancelled reminders don't linger and clutter the list.
+  Future<void> delete({required String reminderId}) async {
     final db = await _appDb.database;
     final rows = await db.query(
       'local_debt_reminders',
@@ -111,9 +113,8 @@ class DebtRemindersRepository {
     if (rows.isEmpty) return;
     final reminder = LocalDebtReminder.fromRow(rows.first);
     await _notifications.cancel(reminder.notificationId);
-    await db.update(
+    await db.delete(
       'local_debt_reminders',
-      {'status': 'cancelled'},
       where: 'id = ?',
       whereArgs: [reminderId],
     );

mobile/lib/features/debts/presentation/widgets/debt_payment_link_panel.dart

@@ -369,7 +369,24 @@ class _DebtPaymentLinkPanelState extends ConsumerState<DebtPaymentLinkPanel> {
     }
   }
 
+  /// The amount baked into the existing link no longer matches what the
+  /// merchant typed — they edited the field, so the active link is stale and
+  /// the QR/share would collect the wrong amount.
+  bool get _amountChangedFromLink {
+    final entered = DebtsUiUtils.amountToMinor(_amountCtrl.text.trim());
+    if (entered <= 0) return false;
+    final linkAmount = widget.record.paymentAmount;
+    if (linkAmount == null || linkAmount.isEmpty) return false;
+    return entered != DebtsUiUtils.amountToMinor(linkAmount);
+  }
+
   Future<void> _openExistingQr() async {
+    // Regenerate first if the merchant changed the amount, so the QR reflects
+    // what they typed instead of the stale link's baked amount.
+    if (_amountChangedFromLink) {
+      await _generate(openQrAfter: true);
+      return;
+    }
     final link = widget.record.paymentLink;
     if (link == null || link.isEmpty) return;
     if (_linkState.isExpired) {
@@ -390,6 +407,10 @@ class _DebtPaymentLinkPanelState extends ConsumerState<DebtPaymentLinkPanel> {
   }
 
   Future<void> _openExistingShare() async {
+    if (_amountChangedFromLink) {
+      await _generate(openQrAfter: false);
+      return;
+    }
     final link = widget.record.paymentLink;
     if (link == null || link.isEmpty) return;
     if (_linkState.isExpired) {

mobile/lib/features/debts/presentation/widgets/debt_paystack_momo_sheet/debt_paystack_momo_sheet.dart

@@ -463,15 +463,15 @@ class _DebtPaystackMomoSheetState extends ConsumerState<DebtPaystackMomoSheet> {
                     child: Row(
                       children: [
                         const Text(
-                          'Outstanding ',
+                          'To collect ',
                           style: TextStyle(
                             color: DebtsUi.textMuted,
                             fontSize: 13,
                             fontWeight: FontWeight.w600,
                           ),
                         ),
                         Text(
-                          DebtsUiUtils.formatAmount(widget.amountDisplay),
+                          widget.amountDisplay,
                           style: const TextStyle(
                             fontWeight: FontWeight.w800,
                             fontSize: 16,

mobile/lib/features/debts/presentation/widgets/debt_reminder_row.dart

@@ -11,11 +11,11 @@ class DebtReminderRow extends StatelessWidget {
   const DebtReminderRow({
     super.key,
     required this.reminder,
-    required this.onCancel,
+    required this.onRemove,
   });
 
   final LocalDebtReminder reminder;
-  final Future<void> Function() onCancel;
+  final Future<void> Function() onRemove;
 
   @override
   Widget build(BuildContext context) {
@@ -113,20 +113,18 @@ class DebtReminderRow extends StatelessWidget {
               ],
             ),
           ),
-          if (isActive) ...[
-            const SizedBox(width: 8),
-            IconButton(
-              tooltip: 'Cancel reminder',
-              icon: const Icon(
-                Icons.close_rounded,
-                size: 18,
-                color: DebtsUi.textMuted,
-              ),
-              onPressed: () => onCancel(),
-              padding: EdgeInsets.zero,
-              constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
+          const SizedBox(width: 8),
+          IconButton(
+            tooltip: isActive ? 'Cancel & remove reminder' : 'Remove reminder',
+            icon: const Icon(
+              Icons.close_rounded,
+              size: 18,
+              color: DebtsUi.textMuted,
             ),
-          ],
+            onPressed: () => onRemove(),
+            padding: EdgeInsets.zero,
+            constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
+          ),
         ],
       ),
     );

mobile/lib/features/debts/presentation/widgets/debt_reminders_section.dart

@@ -100,7 +100,7 @@ class DebtRemindersSection extends ConsumerWidget {
           if (i > 0) const SizedBox(height: 8),
           DebtReminderRow(
             reminder: reminders[i],
-            onCancel: () => _handleCancel(context, ref, reminders[i]),
+            onRemove: () => _handleDelete(context, ref, reminders[i]),
           ),
         ],
       ],
@@ -116,19 +116,19 @@ class DebtRemindersSection extends ConsumerWidget {
     );
   }
 
-  Future<void> _handleCancel(
+  Future<void> _handleDelete(
     BuildContext context,
     WidgetRef ref,
     LocalDebtReminder reminder,
   ) async {
     final messenger = ScaffoldMessenger.of(context);
     try {
-      await ref.read(debtRemindersControllerProvider).cancel(
+      await ref.read(debtRemindersControllerProvider).delete(
             reminderId: reminder.id,
             receivableId: reminder.receivableId,
           );
       messenger.showSnackBar(
-        const SnackBar(content: Text('Reminder cancelled.')),
+        const SnackBar(content: Text('Reminder removed.')),
       );
     } catch (error) {
       messenger.showSnackBar(

mobile/lib/features/debts/providers/debt_reminders_provider.dart

@@ -48,12 +48,12 @@ class DebtRemindersController {
     return reminder;
   }
 
-  Future<void> cancel({
+  Future<void> delete({
     required String reminderId,
     required String receivableId,
   }) async {
     final repo = _ref.read(debtRemindersRepositoryProvider);
-    await repo.cancel(reminderId: reminderId);
+    await repo.delete(reminderId: reminderId);
     _ref.invalidate(debtRemindersForReceivableProvider(receivableId));
   }
 }