From 9333da2df764cb6d050b8a870dac9a2797b02fa9 Mon Sep 17 00:00:00 2001
From: Adeel Khan <muhammad.adeel@arbisoft.com>
Date: Sun, 31 Jan 2021 00:58:25 +0500
Subject: [PATCH] **) Fix TPA Alert messages **) Fix TPA options incorrect text

VAN-297
---
 src/common-components/ThirdPartyAuthAlert.jsx |  4 ++--
 .../ThirdPartyAuthAlert.test.jsx.snap         |  4 ++--
 src/register/RegistrationPage.jsx             |  4 ++--
 .../RegistrationPage.test.jsx.snap            | 20 -------------------
 4 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/common-components/ThirdPartyAuthAlert.jsx b/src/common-components/ThirdPartyAuthAlert.jsx
index a53a20c0..0504a9f2 100644
--- a/src/common-components/ThirdPartyAuthAlert.jsx
+++ b/src/common-components/ThirdPartyAuthAlert.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { Alert } from '@edx/paragon';
-import { LOGIN_PAGE } from '../data/constants';
+import { LOGIN_PAGE, REGISTER_PAGE } from '../data/constants';
 
 const ThirdPartyAuthAlert = (props) => {
   const { currentProvider, referrer, platformName } = props;
@@ -29,7 +29,7 @@ const ThirdPartyAuthAlert = (props) => {
     );
   }
 
-  return <Alert id="tpa-alert" className="alert-success mt-n2">{ message }</Alert>;
+  return <Alert id="tpa-alert" className={referrer === REGISTER_PAGE ? 'alert-success mt-n2' : 'alert-warning mt-n2'}>{ message }</Alert>;
 };
 
 ThirdPartyAuthAlert.defaultProps = {
diff --git a/src/common-components/tests/__snapshots__/ThirdPartyAuthAlert.test.jsx.snap b/src/common-components/tests/__snapshots__/ThirdPartyAuthAlert.test.jsx.snap
index 736f62b7..5a46fa1d 100644
--- a/src/common-components/tests/__snapshots__/ThirdPartyAuthAlert.test.jsx.snap
+++ b/src/common-components/tests/__snapshots__/ThirdPartyAuthAlert.test.jsx.snap
@@ -2,7 +2,7 @@
 
 exports[`ThirdPartyAuthAlert should match login page third party auth alert message snapshot 1`] = `
 <div
-  className="fade alert-success mt-n2 alert show"
+  className="fade alert-warning mt-n2 alert show"
   id="tpa-alert"
   role="alert"
 >
@@ -14,7 +14,7 @@ exports[`ThirdPartyAuthAlert should match login page third party auth alert mess
 
 exports[`ThirdPartyAuthAlert should match register page third party auth alert message snapshot 1`] = `
 <div
-  className="fade alert-success mt-n2 alert show"
+  className="fade alert-warning mt-n2 alert show"
   id="tpa-alert"
   role="alert"
 >
diff --git a/src/register/RegistrationPage.jsx b/src/register/RegistrationPage.jsx
index 8471f1b5..1848a349 100644
--- a/src/register/RegistrationPage.jsx
+++ b/src/register/RegistrationPage.jsx
@@ -579,7 +579,7 @@ class RegistrationPage extends React.Component {
                 <ThirdPartyAuthAlert
                   currentProvider={currentProvider}
                   platformName={this.props.thirdPartyAuthContext.platformName}
-                  referrer="register"
+                  referrer={REGISTER_PAGE}
                 />
               )}
               <div className="text-left">
@@ -717,7 +717,7 @@ class RegistrationPage extends React.Component {
                         {intl.formatMessage(messages['create.an.account.using'])}
                       </span>
                     </div>
-                  ) : <span className="mt-4 text-left">{intl.formatMessage(messages['create.an.account.using'])}</span>}
+                  ) : null}
                 {this.renderThirdPartyAuth(providers,
                   secondaryProviders,
                   currentProvider,
diff --git a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
index e6b8da4b..3bac877b 100644
--- a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
+++ b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
@@ -200,11 +200,6 @@ exports[`./RegistrationPage.js should display no password field when current pro
             Create Account
           </span>
         </button>
-        <span
-          className="mt-4 text-left"
-        >
-          or create an account using
-        </span>
       </form>
     </div>
   </div>
@@ -696,11 +691,6 @@ exports[`./RegistrationPage.js should match default section snapshot 1`] = `
             Create Account
           </span>
         </button>
-        <span
-          className="mt-4 text-left"
-        >
-          or create an account using
-        </span>
       </form>
     </div>
   </div>
@@ -948,11 +938,6 @@ exports[`./RegistrationPage.js should match pending button state snapshot 1`] =
             Create Account
           </span>
         </button>
-        <span
-          className="mt-4 text-left"
-        >
-          or create an account using
-        </span>
       </form>
     </div>
   </div>
@@ -1201,11 +1186,6 @@ exports[`./RegistrationPage.js should show error message on 409 1`] = `
             Create Account
           </span>
         </button>
-        <span
-          className="mt-4 text-left"
-        >
-          or create an account using
-        </span>
       </form>
     </div>
   </div>