From 423ef40aa1073861448aa1278e751a265588c423 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Sun, 2 Jan 2022 14:52:52 +0100 Subject: [PATCH] Move country fieldnames to Identity constants --- src/services/autofill.service.ts | 3 +-- src/services/autofillConstants.ts | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts index 54b55f6746..17db08fce2 100644 --- a/src/services/autofill.service.ts +++ b/src/services/autofill.service.ts @@ -655,8 +655,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.state = f; break; } else if (!fillFields.country && this.isFieldMatch(f[attr], - ['country', 'country-code', 'country-name', 'address-country', 'address-country-name', - 'address-country-code'])) { + IdentityAutoFillConstants.CountryFieldNames)) { fillFields.country = f; break; } else if (!fillFields.phone && this.isFieldMatch(f[attr], diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts index de2f00fa32..c65cf7ffb1 100644 --- a/src/services/autofillConstants.ts +++ b/src/services/autofillConstants.ts @@ -279,6 +279,15 @@ export class IdentityAutoFillConstants { "address-province", ]; + static readonly CountryFieldNames: string[] = [ + "country", + "country-code", + "country-name", + "address-country", + "address-country-name", + "address-country-code", + ]; + static readonly IsoCountries: { [id: string]: string } = { afghanistan: "AF", "aland islands": "AX",