fix(#2502): replace code for zendesk and change arrowloader in auth

keep-around/26b6d317dc6c6d8f1791d7858766b6f2a14e40b7
Andrei Dekterev 4 years ago
parent 72d57d0225
commit d41332b763
  1. 5
      public/index.html
  2. 14
      src/features/AuthServiceApp/components/Login/index.tsx
  3. 7
      src/features/AuthServiceApp/styled.tsx

@ -45,10 +45,7 @@
<div id="root"></div>
<!-- Start of tv-instat Zendesk Widget script -->
<% if (process.env.REACT_APP_TYPE === 'ott') { %>
<script
id="ze-snippet"
src="https://static.zdassets.com/ekr/snippet.js?key=2f84e9fe-830c-42bf-afa4-32c90d7c5f7b"
></script>
<script id="ze-snippet" src="https://static.zdassets.com/ekr/snippet.js?key=2f84e9fe-830c-42bf-afa4-32c90d7c5f7b"></script>
<% } %>
<!-- End of tv-instat Zendesk Widget script -->
</body>

@ -20,6 +20,7 @@ import {
Error,
LanguageSelectWrapper,
Wrapper,
ScLoaderWrapper,
} from '../../styled'
import { RegisterButton } from './styled'
import { CompanyInfo } from '../../../CompanyInfo'
@ -95,13 +96,18 @@ const Login = () => {
<T9n t={formError} />
<T9n t={authError} />
</Error>
<ButtonSolid type='submit' disabled={isSubmitDisabled}>
{
isFetching
? <ArrowLoader />
: <T9n t='login' />
}
? (
<ScLoaderWrapper>
<ArrowLoader />
</ScLoaderWrapper>
) : (
<ButtonSolid type='submit' disabled={isSubmitDisabled}>
<T9n t='login' />
</ButtonSolid>
)
}
<RegisterButton to={`${PAGES.registration}${window.location.search}`}>
<T9n t='register' />
</RegisterButton>

@ -142,6 +142,7 @@ export const Container = styled.div`
flex-direction: row;
align-items: center;
`
export const FormText = styled.span`
justify-content: flex-start;
text-align: center;
@ -151,3 +152,9 @@ export const FormText = styled.span`
width: 100%;
cursor: pointer;
`
export const ScLoaderWrapper = styled.span`
width: 100%;
display: flex;
justify-content: center;
align-items: center;
`

Loading…
Cancel
Save