Automated cherry pick of #7101 (#7104)

(cherry picked from commit 0595ff3)

Co-authored-by: Nick Misasi <nick.misasi@mattermost.com>

components/admin_console/billing/payment_info.tsx

@@ -32,6 +32,11 @@ const PaymentInfo: React.FC<Props> = () => {
 
         const expiryYear = customer.payment_method.exp_year;
 
+        // If not expiry year, or its 0, it's not expired (because it probably isn't set)
+        if (!expiryYear) {
+            return false;
+        }
+
         // This works because we store the expiry month as the actual 1-12 base month, but Date uses a 0-11 base month
         // But credit cards expire at the end of their expiry month, so we can just use that number.
         const lastExpiryDate = new Date(expiryYear, customer.payment_method.exp_month, 1);

utils/cloud_utils.ts

@@ -10,6 +10,11 @@ export function isCustomerCardExpired(customer?: CloudCustomer): boolean {
 
     const expiryYear = customer.payment_method.exp_year;
 
+    // If not expiry year, or its 0, it's not expired (because it probably isn't set)
+    if (!expiryYear) {
+        return false;
+    }
+
     // This works because we store the expiry month as the actual 1-12 base month, but Date uses a 0-11 base month
     // But credit cards expire at the end of their expiry month, so we can just use that number.
     const lastExpiryDate = new Date(expiryYear, customer.payment_method.exp_month, 1);