From 3acf84bfc21e4b3317242a37d007453fef737572 Mon Sep 17 00:00:00 2001
From: Waheed Ahmed <waheed.ahmed@arbisoft.com>
Date: Mon, 7 Jun 2021 18:27:58 +0500
Subject: [PATCH] fix: rebasing issues with master branch

---
 package-lock.json                            | 7 +++++++
 src/login/tests/LoginPage.test.jsx           | 1 +
 src/register/tests/RegistrationPage.test.jsx | 3 ++-
 src/welcome/WelcomePage.jsx                  | 8 ++++----
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b89eeef4..64be6424 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12678,6 +12678,13 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fast-xml-parser": {
+      "version": "3.19.0",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz",
+      "integrity": "sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg==",
+      "dev": true,
+      "optional": true
+    },
     "fastest-levenshtein": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
diff --git a/src/login/tests/LoginPage.test.jsx b/src/login/tests/LoginPage.test.jsx
index 7b51b5d5..bc51162e 100644
--- a/src/login/tests/LoginPage.test.jsx
+++ b/src/login/tests/LoginPage.test.jsx
@@ -367,6 +367,7 @@ describe('LoginPage', () => {
   });
 
   it('should render tpa button for tpa_hint id matching one of the secondary providers', () => {
+    secondaryProviders.skipHintedLogin = true;
     store = mockStore({
       ...initialState,
       commonComponents: {
diff --git a/src/register/tests/RegistrationPage.test.jsx b/src/register/tests/RegistrationPage.test.jsx
index a1ee43e2..efa12674 100644
--- a/src/register/tests/RegistrationPage.test.jsx
+++ b/src/register/tests/RegistrationPage.test.jsx
@@ -584,6 +584,7 @@ describe('RegistrationPage', () => {
     });
 
     it('should render tpa button for tpa_hint id matching one of the secondary providers', () => {
+      secondaryProviders.skipHintedLogin = true;
       store = mockStore({
         ...initialState,
         commonComponents: {
@@ -597,7 +598,7 @@ describe('RegistrationPage', () => {
       });
 
       delete window.location;
-      window.location = { href: getConfig().BASE_URL.concat('/login'), search: `?next=/dashboard&tpa_hint=${secondaryProviders.id}` };
+      window.location = { href: getConfig().BASE_URL.concat('/register'), search: `?next=/dashboard&tpa_hint=${secondaryProviders.id}` };
       secondaryProviders.iconImage = null;
 
       mount(reduxWrapper(<IntlRegistrationPage {...props} />));
diff --git a/src/welcome/WelcomePage.jsx b/src/welcome/WelcomePage.jsx
index f5760ef7..ee97c2db 100644
--- a/src/welcome/WelcomePage.jsx
+++ b/src/welcome/WelcomePage.jsx
@@ -17,7 +17,7 @@ import {
 import messages from './messages';
 
 import { EDUCATION_LEVELS, GENDER_OPTIONS, YEAR_OF_BIRTH_OPTIONS } from '../register/data/constants';
-import { AuthnValidationFormGroup } from '../common-components';
+import { FormGroup } from '../common-components';
 import { DEFAULT_REDIRECT_URL } from '../data/constants';
 
 const WelcomePage = (props) => {
@@ -117,7 +117,7 @@ const WelcomePage = (props) => {
             </p>
             <hr className="mb-3 border-gray-200" />
             <h1 className="mb-3 h3">{intl.formatMessage(messages['optional.fields.page.heading'])}</h1>
-            <AuthnValidationFormGroup
+            <FormGroup
               label={intl.formatMessage(messages['registration.field.education.levels.label'])}
               for="levelOfEducation"
               name="levelOfEducation"
@@ -129,7 +129,7 @@ const WelcomePage = (props) => {
               selectOptions={getOptions().educationLevelOptions}
               inputFieldStyle="border-gray-600 custom-select-size"
             />
-            <AuthnValidationFormGroup
+            <FormGroup
               label={intl.formatMessage(messages['registration.year.of.birth.label'])}
               for="yearOfBirth"
               name="yearOfBirth"
@@ -141,7 +141,7 @@ const WelcomePage = (props) => {
               selectOptions={getOptions().yearOfBirthOptions}
               inputFieldStyle="border-gray-600 custom-select-size"
             />
-            <AuthnValidationFormGroup
+            <FormGroup
               label={intl.formatMessage(messages['registration.field.gender.options.label'])}
               for="gender"
               name="gender"