From 9c6235f8db335c33fe420f14c2af76fae87bf130 Mon Sep 17 00:00:00 2001
From: apane <agustin.pane@gmail.com>
Date: Tue, 26 Nov 2019 10:37:16 -0300
Subject: [PATCH] Removes redux for cookiesStorage

---
 src/components/CookiesBanner/index.jsx        | 46 +++++++++++++------
 .../store/actions/loadCookiesFromStorage.js   | 26 -----------
 .../store/actions/saveCookiesToStorage.js     | 21 ---------
 .../store/actions/setCookiesPermissions.js    | 12 -----
 src/logic/cookies/store/model/cookie.js       |  9 ----
 src/logic/cookies/store/reducer/cookies.js    | 25 ----------
 src/logic/cookies/store/selectors/index.js    |  5 --
 src/logic/cookies/utils/cookiesStorage.js     |  2 -
 8 files changed, 31 insertions(+), 115 deletions(-)
 delete mode 100644 src/logic/cookies/store/actions/loadCookiesFromStorage.js
 delete mode 100644 src/logic/cookies/store/actions/saveCookiesToStorage.js
 delete mode 100644 src/logic/cookies/store/actions/setCookiesPermissions.js
 delete mode 100644 src/logic/cookies/store/model/cookie.js
 delete mode 100644 src/logic/cookies/store/reducer/cookies.js
 delete mode 100644 src/logic/cookies/store/selectors/index.js
 delete mode 100644 src/logic/cookies/utils/cookiesStorage.js

diff --git a/src/components/CookiesBanner/index.jsx b/src/components/CookiesBanner/index.jsx
index 3bd9d89c..3ba1fb81 100644
--- a/src/components/CookiesBanner/index.jsx
+++ b/src/components/CookiesBanner/index.jsx
@@ -3,16 +3,14 @@ import Checkbox from '@material-ui/core/Checkbox'
 import Close from '@material-ui/icons/Close'
 import FormControlLabel from '@material-ui/core/FormControlLabel'
 import IconButton from '@material-ui/core/IconButton'
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { makeStyles } from '@material-ui/core/styles'
-import { useSelector, useDispatch } from 'react-redux'
 import Link from '~/components/layout/Link'
 import { WELCOME_ADDRESS } from '~/routes/routes'
 import Button from '~/components/layout/Button'
 import { primary, mainFontFamily } from '~/theme/variables'
-import saveCookiesToStorage from '~/logic/cookies/store/actions/saveCookiesToStorage'
-import type { CookiesProps } from '~/logic/cookies/store/model/cookie'
-import { cookiesSelector } from '~/logic/cookies/store/selectors'
+import { loadFromStorage, saveToStorage } from '~/utils/storage'
+import { COOKIES_KEY } from '~/logic/cookies/utils/cookiesStorage'
 
 const useStyles = makeStyles({
   container: {
@@ -68,26 +66,45 @@ const useStyles = makeStyles({
   },
 })
 
+export type CookiesProps = {
+  acceptedNecessary: boolean,
+  acceptedAnalytics: boolean,
+}
 
 const CookiesBanner = () => {
   const classes = useStyles()
-  const cookiesState: CookiesProps = useSelector(cookiesSelector)
-  const dispatch = useDispatch()
-  const { acceptedNecessary } = cookiesState
-  const showBanner = acceptedNecessary === false
+
+  const [showBanner, setShowBanner] = useState(false)
   const [localNecessary, setLocalNecessary] = useState(true)
   const [localAnalytics, setLocalAnalytics] = useState(false)
 
-  const acceptCookiesHandler = (newState: CookiesProps) => {
-    dispatch(saveCookiesToStorage(newState))
+  useEffect(() => {
+    async function fetchCookiesFromStorage() {
+      const cookiesState: CookiesProps = await loadFromStorage(COOKIES_KEY)
+      if (cookiesState) {
+        const { acceptedNecessary, acceptedAnalytics } = cookiesState
+        setLocalAnalytics(acceptedAnalytics)
+        setLocalNecessary(acceptedNecessary)
+        setShowBanner(acceptedNecessary === false)
+      } else {
+        setShowBanner(true)
+      }
+    }
+    fetchCookiesFromStorage()
+  }, [])
+
+  const acceptCookiesHandler = async (newState: CookiesProps) => {
+    await saveToStorage(COOKIES_KEY, newState)
+    setShowBanner(false)
   }
 
-  const closeCookiesBannerHandler = () => {
+  const closeCookiesBannerHandler = async () => {
     const newState = {
       acceptedNecessary: true,
       acceptedAnalytics: false,
     }
-    dispatch(saveCookiesToStorage(newState))
+    await saveToStorage(COOKIES_KEY, newState)
+    setShowBanner(false)
   }
 
 
@@ -114,7 +131,7 @@ We use cookies to give you the best
               onChange={() => setLocalNecessary((prev) => !prev)}
               value={localNecessary}
               control={(
-                <Checkbox />
+                <Checkbox disabled />
               )}
             />
           </div>
@@ -133,7 +150,6 @@ We use cookies to give you the best
             <Button
               color="primary"
               component={Link}
-              disabled={!localNecessary}
               minWidth={180}
               variant="outlined"
               onClick={() => acceptCookiesHandler({
diff --git a/src/logic/cookies/store/actions/loadCookiesFromStorage.js b/src/logic/cookies/store/actions/loadCookiesFromStorage.js
deleted file mode 100644
index 03a95a96..00000000
--- a/src/logic/cookies/store/actions/loadCookiesFromStorage.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// @flow
-import type { Dispatch as ReduxDispatch } from 'redux'
-import type { GlobalState } from '~/store'
-import { loadFromStorage } from '~/utils/storage'
-import { COOKIES_KEY } from '~/logic/cookies/utils/cookiesStorage'
-import type { CookiesProps } from '~/logic/cookies/store/model/cookie'
-import { setCookiesPermissions } from '~/logic/cookies/store/actions/setCookiesPermissions'
-
-const loadCookiesFromStorage = () => async (dispatch: ReduxDispatch<GlobalState>) => {
-  try {
-    const cookies: ?{ [string]: CookiesProps } = await loadFromStorage(COOKIES_KEY)
-
-    if (cookies) {
-      dispatch(setCookiesPermissions(cookies))
-    } else {
-      dispatch(setCookiesPermissions({ acceptedAnalytics: false, acceptedNecessary: false }))
-    }
-  } catch (err) {
-    // eslint-disable-next-line
-    console.error('Error while getting cookies from storage:', err)
-  }
-
-  return Promise.resolve()
-}
-
-export default loadCookiesFromStorage
diff --git a/src/logic/cookies/store/actions/saveCookiesToStorage.js b/src/logic/cookies/store/actions/saveCookiesToStorage.js
deleted file mode 100644
index ba49fa37..00000000
--- a/src/logic/cookies/store/actions/saveCookiesToStorage.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// @flow
-import type { Dispatch as ReduxDispatch } from 'redux'
-import type { GlobalState } from '~/store'
-import type { CookiesProps } from '~/logic/cookies/store/model/cookie'
-import { setCookiesPermissions } from '~/logic/cookies/store/actions/setCookiesPermissions'
-import { saveToStorage } from '~/utils/storage'
-import { COOKIES_KEY } from '~/logic/cookies/utils/cookiesStorage'
-
-const saveCookiesToStorage = (cookies: CookiesProps) => async (dispatch: ReduxDispatch<GlobalState>) => {
-  try {
-    await saveToStorage(COOKIES_KEY, cookies)
-    dispatch(setCookiesPermissions(cookies))
-  } catch (err) {
-    // eslint-disable-next-line
-    console.error('Error saving cookies to the localStorage:', err)
-  }
-
-  return Promise.resolve()
-}
-
-export default saveCookiesToStorage
diff --git a/src/logic/cookies/store/actions/setCookiesPermissions.js b/src/logic/cookies/store/actions/setCookiesPermissions.js
deleted file mode 100644
index ccddfc02..00000000
--- a/src/logic/cookies/store/actions/setCookiesPermissions.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// @flow
-import { Map } from 'immutable'
-import { createAction } from 'redux-actions'
-import type { Cookie, CookiesProps } from '~/logic/cookies/store/model/cookie'
-
-export const SET_COOKIES_PERMISSIONS = 'SET_COOKIES_PERMISSIONS'
-
-// eslint-disable-next-line max-len
-export const setCookiesPermissions = createAction<string, *>(
-  SET_COOKIES_PERMISSIONS,
-  (cookies: Map<string, Cookie>): CookiesProps => cookies,
-)
diff --git a/src/logic/cookies/store/model/cookie.js b/src/logic/cookies/store/model/cookie.js
deleted file mode 100644
index 7435f6bb..00000000
--- a/src/logic/cookies/store/model/cookie.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// @flow
-import type { RecordOf } from 'immutable'
-
-export type CookiesProps = {
-  acceptedNecessary: boolean,
-  acceptedAnalytics: boolean,
-}
-
-export type Cookie = RecordOf<CookiesProps>
diff --git a/src/logic/cookies/store/reducer/cookies.js b/src/logic/cookies/store/reducer/cookies.js
deleted file mode 100644
index 68cfc575..00000000
--- a/src/logic/cookies/store/reducer/cookies.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// @flow
-import { Map } from 'immutable'
-import { handleActions, type ActionType } from 'redux-actions'
-import type { Cookie } from '~/logic/cookies/store/model/cookie'
-import { SET_COOKIES_PERMISSIONS } from '../actions/setCookiesPermissions'
-import type { State } from '~/logic/tokens/store/reducer/tokens'
-
-export const COOKIE_REDUCER_ID = 'cookies'
-
-export type CookieReducerState = Map<string, Map<string, Cookie>>
-
-export default handleActions<State, *>(
-  {
-    [SET_COOKIES_PERMISSIONS]: (state: State, action: ActionType<Function>): State => {
-      const { acceptedNecessary, acceptedAnalytics } = action.payload
-
-      const newState = state.withMutations((mutableState) => {
-        mutableState.set('acceptedNecessary', acceptedNecessary)
-        mutableState.set('acceptedAnalytics', acceptedAnalytics)
-      })
-      return newState
-    },
-  },
-  Map(),
-)
diff --git a/src/logic/cookies/store/selectors/index.js b/src/logic/cookies/store/selectors/index.js
deleted file mode 100644
index f92172e9..00000000
--- a/src/logic/cookies/store/selectors/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-import { type GlobalState } from '~/store'
-import { COOKIE_REDUCER_ID } from '~/logic/cookies/store/reducer/cookies'
-
-export const cookiesSelector = (state: GlobalState) => state[COOKIE_REDUCER_ID].toJS()
diff --git a/src/logic/cookies/utils/cookiesStorage.js b/src/logic/cookies/utils/cookiesStorage.js
deleted file mode 100644
index df64a226..00000000
--- a/src/logic/cookies/utils/cookiesStorage.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// @flow
-export const COOKIES_KEY = 'COOKIES'