4 changed files with 40 additions and 31 deletions
--- a/src/config/lexics/payment.tsx
+++ b/src/config/lexics/payment.tsx
@ -20,6 +20,7 @@ export const paymentLexics = {
  error_empty_state: 19821,
  error_payment_unsuccessful: 14446,
  if_you_cancel: 18189,
+  is_gpay: 20045,
  next_payment: 18183,
  notify_by_email: 18366,
  order_received: 18365,
--- a/src/features/Matches/hooks.tsx
+++ b/src/features/Matches/hooks.tsx
@ -13,8 +13,6 @@ import { useRequest } from 'hooks'
 import { usePreferencesStore } from 'features/PreferencesPopup'
 import { isMobileDevice } from 'config/userAgent'

-import { checkUrlParams } from 'helpers/parseUrlParams/parseUrlParams'
-
 import { prepareMatches } from './helpers/prepareMatches'

 export type Match = ReturnType<typeof prepareMatches>[number]
@ -68,10 +66,10 @@ export const useMatches = ({ fetch }: Props) => {
    isFetching,
  ])

-  const dateParam = checkUrlParams('date')
-
  useEffect(() => {
-    if (dateParam) {
+    const isDefaultUrl = window.location.href.slice(0, -1) === window.location.origin
+
+    if (!isDefaultUrl) {
      fetchMatches(0).then(setMatches)
      pageRef.current = 1
    }
--- a/src/features/UserAccount/components/CancelSubPopup/index.tsx
+++ b/src/features/UserAccount/components/CancelSubPopup/index.tsx
@ -43,12 +43,13 @@ export const CancelSubPopup = (props: Props) => {

  const {
    access_to,
+    is_gpay,
    lexic,
    option_sys_name,
  } = subscribe

  return (
-    <Modal isOpen={isModalOpen} withCloseButton={false}>
+    <Modal isOpen={isModalOpen} withCloseButton={is_gpay}>
      <Wrapper>
        {isSubCanceled || error ? (
          <ScNotificationPopup>
@ -65,6 +66,12 @@ export const CancelSubPopup = (props: Props) => {
              </HeaderTitle>
            </Header>
            <Body>
+              {is_gpay ? (
+                <Text>
+                  <T9n t='is_gpay' />
+                </Text>
+              ) : (
+                <>
                  <Text>
                    <T9n t='if_you_cancel' />
                  </Text>
@ -91,6 +98,8 @@ export const CancelSubPopup = (props: Props) => {
                      <T9n t='save_sub' />
                    </ScSaveSubBtn>
                  </Footer>
+                </>
+              )}
            </Body>
          </>
        )}
--- a/src/requests/getUserSubscribes.tsx
+++ b/src/requests/getUserSubscribes.tsx
@ -12,6 +12,7 @@ export type Subscribe = {
  dt_next_billing: string | null,
  is_access: boolean,
  is_active: boolean,
+  is_gpay?: boolean,
  iso: string,
  lexic: number,
  lexic1: number,