code review updates

Author: jigar-f

lib/core/services/stripe_service.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_stripe/flutter_stripe.dart';
@@ -17,8 +19,7 @@ StripeIntentMode stripeIntentModeForRenewal(
 
   final now =
       currentTimeSeconds ?? DateTime.now().millisecondsSinceEpoch ~/ 1000;
-  final purchases = userData.purchases.trim();
-  final hasPurchaseHistory = purchases.isNotEmpty && purchases != '[]';
+  final hasPurchaseHistory = _hasPurchaseHistory(userData.purchases);
   final hasActiveOneTimePurchase =
       userData.isPro &&
       userData.expiration > now &&
@@ -31,6 +32,21 @@ StripeIntentMode stripeIntentModeForRenewal(
       : StripeIntentMode.payment;
 }
 
+/// The backend serializes purchases as JSON, so empty history can arrive as
+/// '[]', 'null', '[ ]', or blank text — decode rather than compare raw text.
+bool _hasPurchaseHistory(String purchases) {
+  final trimmed = purchases.trim();
+  if (trimmed.isEmpty || trimmed == 'null') return false;
+  try {
+    final decoded = jsonDecode(trimmed);
+    if (decoded is List) return decoded.isNotEmpty;
+    if (decoded is Map) return decoded.isNotEmpty;
+  } catch (_) {
+    // Not JSON; fall through to the textual check.
+  }
+  return trimmed != '[]';
+}
+
 class StripeService {
   /// Adopts the publishable key advertised by the plans response so the SDK
   /// always confirms intents against the same Stripe account/environment the
@@ -181,7 +197,8 @@ class StripeService {
       appLogger.info(
         'Stripe: subscription created '
         '(subscriptionId: ${options.subscriptionId}, '
-        'secret type: ${options.clientSecret.isNotEmpty ? 'payment' : 'setup'})',
+        'payment secret: ${options.clientSecret.isNotEmpty}, '
+        'setup secret: ${options.setupIntentClientSecret.isNotEmpty})',
       );
       // The client must return the same kind of intent used to initialize the
       // deferred sheet. Active one-time purchases start with a free trial and
@@ -193,6 +210,15 @@ class StripeService {
       };
 
       if (secret.isEmpty) {
+        // The backend chose the other intent type than the sheet was
+        // initialized with. Don't substitute the other secret — the SDK
+        // requires the confirmed intent to match the declared
+        // IntentConfiguration mode.
+        appLogger.error(
+          'Stripe: intent mode mismatch — client selected $intentMode but the '
+          'backend returned no matching secret '
+          '(subscriptionId: ${options.subscriptionId})',
+        );
         throw Exception(
           'Please try again after some time. If the issue persists, contact support.',
         );

lib/features/auth/choose_payment_method.dart

@@ -265,7 +265,15 @@ class ChoosePaymentMethod extends HookConsumerWidget {
       return StripeIntentMode.payment;
     }
 
-    final userData = ref.read(homeProvider).value?.legacyUserData;
+    final home = ref.read(homeProvider);
+    final userData = home.value?.legacyUserData;
+    if (userData == null) {
+      appLogger.error(
+        'Stripe: renewal intent mode selected without user data '
+        '(homeProvider loading: ${home.isLoading}, '
+        'error: ${home.hasError}); defaulting to PaymentIntent',
+      );
+    }
     return stripeIntentModeForRenewal(userData);
   }
 

test/core/services/stripe_service_test.dart

@@ -293,6 +293,21 @@ void main() {
         StripeIntentMode.payment,
       );
     });
+
+    test('treats other empty purchase encodings as no history', () {
+      for (final encoded in ['', '  ', 'null', '[ ]', '[\n]', '{}']) {
+        final user = UserDataModel(
+          userLevel: 'pro',
+          expiration: 2000,
+          purchases: encoded,
+        );
+        expect(
+          stripeIntentModeForRenewal(user, currentTimeSeconds: 1000),
+          StripeIntentMode.payment,
+          reason: 'purchases: "$encoded"',
+        );
+      }
+    });
   });
 }