[mobile][web] Ignore cancelled subscriptions while computing past-due status

mobile/lib/models/subscription.dart

@@ -30,8 +30,13 @@ class Subscription {
     return expiryTime > DateTime.now().microsecondsSinceEpoch;
   }
 
+  bool isCancelled() {
+    return attributes?.isCancelled ?? false;
+  }
+
   bool isPastDue() {
-    return expiryTime < DateTime.now().microsecondsSinceEpoch &&
+    return !isCancelled() &&
+        expiryTime < DateTime.now().microsecondsSinceEpoch &&
         expiryTime >=
             DateTime.now()
                 .subtract(const Duration(days: 30))

web/apps/photos/src/utils/billing/index.ts

@@ -155,6 +155,7 @@ export function hasExceededStorageQuota(userDetails: UserDetails) {
 export function isSubscriptionPastDue(subscription: Subscription) {
     const currentTime = Date.now() * 1000;
     return (
+        !isSubscriptionCancelled(subscription) &&
         subscription.expiryTime < currentTime &&
         subscription.expiryTime > currentTime - THIRTY_DAYS_IN_MICROSECONDS
     );