Skip to content

Commit

Permalink
feat: Changes after review
Browse files Browse the repository at this point in the history
  • Loading branch information
Lunyachek committed Jul 21, 2023
1 parent bccdba0 commit 670c2c4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/login/LoginPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class LoginPage extends React.Component {
const isInstitutionAuthActive = !!secondaryProviders.length && !currentProvider;
const isSocialAuthActive = !!providers.length && !currentProvider;
const isEnterpriseLoginDisabled = getConfig().DISABLE_ENTERPRISE_LOGIN;
const ThirdPartyAuthPreloader = isSocialAuthActive || (isEnterpriseLoginDisabled && isInstitutionAuthActive);
const isThirdPartyAuthActive = isSocialAuthActive || (isEnterpriseLoginDisabled && isInstitutionAuthActive);

return (
<>
Expand All @@ -185,7 +185,7 @@ class LoginPage extends React.Component {
</Hyperlink>
)}

{thirdPartyAuthApiStatus === PENDING_STATE && ThirdPartyAuthPreloader ? (
{thirdPartyAuthApiStatus === PENDING_STATE && isThirdPartyAuthActive ? (
<Skeleton className="tpa-skeleton mb-3" height={30} count={2} />
) : (
<>
Expand Down
4 changes: 2 additions & 2 deletions src/register/ThirdPartyAuth.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const ThirdPartyAuth = (props) => {
const isInstitutionAuthActive = !!secondaryProviders.length && !currentProvider;
const isSocialAuthActive = !!providers.length && !currentProvider;
const isEnterpriseLoginDisabled = getConfig().DISABLE_ENTERPRISE_LOGIN;
const ThirdPartyAuthPreloader = isSocialAuthActive || (isEnterpriseLoginDisabled && isInstitutionAuthActive);
const isThirdPartyAuthActive = isSocialAuthActive || (isEnterpriseLoginDisabled && isInstitutionAuthActive);

return (
<>
Expand All @@ -34,7 +34,7 @@ const ThirdPartyAuth = (props) => {
</div>
)}

{thirdPartyAuthApiStatus === PENDING_STATE && ThirdPartyAuthPreloader ? (
{thirdPartyAuthApiStatus === PENDING_STATE && isThirdPartyAuthActive ? (
<Skeleton className="tpa-skeleton" height={36} count={2} />
) : (
<>
Expand Down
4 changes: 0 additions & 4 deletions src/sass/_style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,6 @@ select.form-control {
}
}

.content {
width: 100%;
}

.alert {
p:last-child {
margin-bottom: 0;
Expand Down

0 comments on commit 670c2c4

Please sign in to comment.