fix(#188): fix pr commits

pull/82/head
Rakov Roman 3 years ago committed by Gitea
parent a5757e44fe
commit d0bcb49a29
  1. 13
      src/features/AuthStore/helpers.tsx
  2. 1
      src/features/HomePage/index.tsx
  3. 2
      src/features/ProfileCard/index.tsx
  4. 6
      src/pages/DiwanInsportsTv/index.tsx
  5. 3
      src/pages/DiwanInsportsTv/styled.tsx
  6. 14
      src/pages/FailedPaymeePage/index.tsx

@ -36,15 +36,20 @@ export const getClientNameByRedirectUri = () => {
} }
} }
const clientsForRedirect = {
facr: ClientNames.Facr,
india: ClientNames.India,
lff: ClientNames.Lff,
tunisia: ClientNames.Tunisia,
}
const redirectUrl = () => { const redirectUrl = () => {
const clientName = getClientNameByRedirectUri() const clientName = getClientNameByRedirectUri()
switch (true) { switch (true) {
case ( case (
process.env.NODE_ENV === 'development' process.env.NODE_ENV === 'development'
|| client.name === 'lff' // @ts-ignore
|| client.name === 'facr' || Boolean(clientsForRedirect[client.name])
|| client.name === 'india'
|| client.name === 'tunisia'
): ):
return `${window.origin}/redirect` return `${window.origin}/redirect`
case (ENV === 'staging' || ENV === 'preproduction'): case (ENV === 'staging' || ENV === 'preproduction'):

@ -20,7 +20,6 @@ import { useHomePage } from './hooks'
import { Header } from './components/Header' import { Header } from './components/Header'
import { HeaderMobile } from '../HeaderMobile' import { HeaderMobile } from '../HeaderMobile'
import { HeaderFilters } from './components/HeaderFilters' import { HeaderFilters } from './components/HeaderFilters'
// import { client } from '../../config/clients'
const Home = () => { const Home = () => {
usePageLogger(PAGES.home) usePageLogger(PAGES.home)

@ -9,7 +9,7 @@ import {
ProfileTypes, ProfileTypes,
URL_AWS, URL_AWS,
} from 'config' } from 'config'
import { client, isLffClient } from 'config/clients' import { client } from 'config/clients'
import { ClientNames } from 'config/clients/types' import { ClientNames } from 'config/clients/types'
import { checkPage } from 'helpers/checkPage' import { checkPage } from 'helpers/checkPage'

@ -1,7 +1,5 @@
import { Fragment } from 'react' import { Fragment } from 'react'
import format from 'date-fns/format'
import { isMobileDevice } from 'config' import { isMobileDevice } from 'config'
import { joinMatchLexics } from 'config/lexics/joinMatch' import { joinMatchLexics } from 'config/lexics/joinMatch'
@ -10,6 +8,8 @@ import { useLexicsConfig } from 'features/LexicsStore'
import { useAuthStore } from 'features/AuthStore' import { useAuthStore } from 'features/AuthStore'
import { getCurrentYear } from 'helpers'
import { import {
Wrapper, Wrapper,
TunisiaLogo, TunisiaLogo,
@ -34,7 +34,7 @@ export const DiwanInsportsTv = () => {
useLexicsConfig(joinMatchLexics) useLexicsConfig(joinMatchLexics)
const { login } = useAuthStore() const { login } = useAuthStore()
const currentYear = format(new Date(), 'Y') const currentYear = getCurrentYear()
return ( return (
<Wrapper> <Wrapper>

@ -1,7 +1,6 @@
import styled, { css } from 'styled-components/macro' import styled, { css } from 'styled-components/macro'
import { devices } from 'config' import { devices, isMobileDevice } from 'config'
import { isMobileDevice } from 'config/userAgent'
import { ButtonSolid } from 'features/Common' import { ButtonSolid } from 'features/Common'

@ -4,10 +4,14 @@ import { FailedPaymeeWrapper } from './styled'
// эта страница рассчитана на открытие во фрейме // эта страница рассчитана на открытие во фрейме
// при неудачной оплате paymee // при неудачной оплате paymee
const FailedPaymeePage = () => ( const FailedPaymeePage = () => {
<FailedPaymeeWrapper> const iframeZendesk = document.querySelector('#launcher') as HTMLElement
<T9n t='failed_paymee' /> if (iframeZendesk) iframeZendesk.style.display = 'none'
</FailedPaymeeWrapper>
)
return (
<FailedPaymeeWrapper>
<T9n t='failed_paymee' />
</FailedPaymeeWrapper>
)
}
export default FailedPaymeePage export default FailedPaymeePage

Loading…
Cancel
Save