From 8992f348d2657059d3b69537f0d29c60e4339ddb Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Sun, 2 Jan 2022 14:10:16 +0100
Subject: [PATCH] Move ExpiryMonth fieldnames to CC constants

---
 src/services/autofill.service.ts  |  9 +------
 src/services/autofillConstants.ts | 42 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 8ec9983d71..134c105635 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -403,14 +403,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.exp = f;
                     break;
                 } else if (!fillFields.expMonth && this.isFieldMatch(f[attr],
-                    ['exp-month', 'cc-exp-month', 'cc-month', 'card-month', 'cc-mo', 'card-mo', 'exp-mo',
-                        'card-exp-mo', 'cc-exp-mo', 'card-expiration-month', 'expiration-month',
-                        'cc-mm', 'cc-m', 'card-mm', 'card-m', 'card-exp-mm', 'cc-exp-mm', 'exp-mm', 'exp-m',
-                        'expire-month', 'expire-mo', 'expiry-month', 'expiry-mo', 'card-expire-month',
-                        'card-expire-mo', 'card-expiry-month', 'card-expiry-mo', 'mois-validite',
-                        'mois-expiration', 'm-validite', 'm-expiration', 'expiry-date-field-month',
-                        'expiration-date-month', 'expiration-date-mm', 'exp-mon', 'validity-mo',
-                        'exp-date-mo', 'cb-date-mois', 'date-m'])) {
+                    CreditCardAutoFillConstants.ExpiryMonthFieldNames)) {
                     fillFields.expMonth = f;
                     break;
                 } else if (!fillFields.expYear && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index c765b1a0fa..996ab0f654 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -50,6 +50,48 @@ export class CreditCardAutoFillConstants {
     "label-right",
   ];
 
+  static readonly ExpiryMonthFieldNames: string[] = [
+    "exp-month",
+    "cc-exp-month",
+    "cc-month",
+    "card-month",
+    "cc-mo",
+    "card-mo",
+    "exp-mo",
+    "card-exp-mo",
+    "cc-exp-mo",
+    "card-expiration-month",
+    "expiration-month",
+    "cc-mm",
+    "cc-m",
+    "card-mm",
+    "card-m",
+    "card-exp-mm",
+    "cc-exp-mm",
+    "exp-mm",
+    "exp-m",
+    "expire-month",
+    "expire-mo",
+    "expiry-month",
+    "expiry-mo",
+    "card-expire-month",
+    "card-expire-mo",
+    "card-expiry-month",
+    "card-expiry-mo",
+    "mois-validite",
+    "mois-expiration",
+    "m-validite",
+    "m-expiration",
+    "expiry-date-field-month",
+    "expiration-date-month",
+    "expiration-date-mm",
+    "exp-mon",
+    "validity-mo",
+    "exp-date-mo",
+    "cb-date-mois",
+    "date-m",
+  ];
+
   // Each index represents a language. These three arrays should all be the same length.
   // 0: English, 1: Danish, 2: German/Dutch, 3: French/Spanish/Italian, 4: Russian, 5: Portuguese
   static readonly MonthAbbr = ["mm", "mm", "mm", "mm", "mm", "mm"];