From 79d230d8f1d207660e12e2d788b57fe7e08c5264 Mon Sep 17 00:00:00 2001
From: Armen <35077035+Armen9393@users.noreply.github.com>
Date: Mon, 31 Aug 2020 15:35:58 +0300
Subject: [PATCH] fix(ott-347): changed filter status logic (#116)

---
 .../helpers/isValidMatchStatus/index.tsx      |  2 +-
 .../HeaderFilters/store/hooks/index.tsx       | 19 +++++++++++++++----
 src/requests/getMatches.tsx                   |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/features/HeaderFilters/store/helpers/isValidMatchStatus/index.tsx b/src/features/HeaderFilters/store/helpers/isValidMatchStatus/index.tsx
index 1410ffba..3a11cb65 100644
--- a/src/features/HeaderFilters/store/helpers/isValidMatchStatus/index.tsx
+++ b/src/features/HeaderFilters/store/helpers/isValidMatchStatus/index.tsx
@@ -4,6 +4,6 @@ import values from 'lodash/values'
 
 import { MatchStatuses } from '../../hooks'
 
-export const isValidMatchStatus = (value: number) => (
+export const isValidMatchStatus = (value: number | null) => (
   isNumber(value) && includes(values(MatchStatuses), value)
 )
diff --git a/src/features/HeaderFilters/store/hooks/index.tsx b/src/features/HeaderFilters/store/hooks/index.tsx
index bbf1b7c2..9de28cc6 100644
--- a/src/features/HeaderFilters/store/hooks/index.tsx
+++ b/src/features/HeaderFilters/store/hooks/index.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from 'react'
+import { useMemo, useCallback } from 'react'
 
 import isNumber from 'lodash/isNumber'
 import format from 'date-fns/format'
@@ -30,13 +30,24 @@ export const useFilters = () => {
 
   const [
     selectedMatchStatus,
-    setSelectedMatchStatus,
-  ] = useQueryParamStore({
-    defaultValue: MatchStatuses.Live,
+    setMatchStatus,
+  ] = useQueryParamStore<MatchStatuses | null>({
+    defaultValue: null,
     key: filterKeys.MATCH_STATUS,
     validator: isValidMatchStatus,
   })
 
+  const setSelectedMatchStatus = useCallback((status: MatchStatuses) => {
+    if (status === selectedMatchStatus) {
+      setMatchStatus(null)
+    } else {
+      setMatchStatus(status)
+    }
+  }, [
+    selectedMatchStatus,
+    setMatchStatus,
+  ])
+
   const [
     selectedSportTypeId,
     setSelectedSportTypeId,
diff --git a/src/requests/getMatches.tsx b/src/requests/getMatches.tsx
index dc67070d..550f51f6 100644
--- a/src/requests/getMatches.tsx
+++ b/src/requests/getMatches.tsx
@@ -51,7 +51,7 @@ export type Team = {
 
 type Args = {
   date: string,
-  matchStatus: MatchStatuses,
+  matchStatus: MatchStatuses | null,
   playerId?: number | null,
   sportType: SportTypes | null,
   teamId?: number | null,