From 1b0cb948a045cd1e6b08b69d6fa7af8a0823765c Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Mon, 1 Jun 2020 18:31:13 +0200
Subject: [PATCH] fix: userInstanceSettings with right name
---
src/components/ContainerComponents/Header/Header.tsx | 2 --
.../WelcomeModalContainer/WelcomeModalContainer.tsx | 4 ++--
src/components/Hooks/userInstanceSettings.tsx | 7 ++-----
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/components/ContainerComponents/Header/Header.tsx b/src/components/ContainerComponents/Header/Header.tsx
index 4a480d809..e0d487f60 100644
--- a/src/components/ContainerComponents/Header/Header.tsx
+++ b/src/components/ContainerComponents/Header/Header.tsx
@@ -4,7 +4,6 @@ import { history } from 'components/ContainerComponents/ViewContainer/ViewContai
import { withClient, Client } from 'cozy-client'
import { ScreenType } from 'enum/screen.enum'
import { AppContext } from 'components/Contexts/AppContextProvider'
-import useInstanceSettings from 'components/Hooks/userInstanceSettings'
import BackArrowIcon from 'assets/icons/ico/back-arrow.svg'
import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
@@ -29,7 +28,6 @@ const Header: React.FC<HeaderProps> = ({
}: HeaderProps) => {
const header = useRef(null)
const { screenType } = useContext(AppContext)
- const { data: instanceSettings } = useInstanceSettings(client)
const cozyBarHeight = 48
const headerBottomHeight = 8
diff --git a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
index 9acb93382..c96bd78ed 100644
--- a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
+++ b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
@@ -3,7 +3,7 @@ import { withClient, Client } from 'cozy-client'
import Modal from 'components/CommonKit/Modal/Modal'
import StyledButton from 'components/CommonKit/Button/StyledButton'
import { translate } from 'cozy-ui/react/I18n'
-import useInstanceSettings from 'components/Hooks/userInstanceSettings'
+import userInstanceSettings from 'components/Hooks/userInstanceSettings'
interface WelcomeModalContainerProps {
handleClose: () => void
@@ -16,7 +16,7 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
t,
client,
}: WelcomeModalContainerProps) => {
- const { data: instanceSettings } = useInstanceSettings(client)
+ const { data: instanceSettings } = userInstanceSettings(client)
return (
<React.Fragment>
diff --git a/src/components/Hooks/userInstanceSettings.tsx b/src/components/Hooks/userInstanceSettings.tsx
index f261ad4a5..eb05ff8b9 100644
--- a/src/components/Hooks/userInstanceSettings.tsx
+++ b/src/components/Hooks/userInstanceSettings.tsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'
import get from 'lodash/get'
import { Client } from 'cozy-client'
-const useInstanceSettings = (client: Client) => {
+const userInstanceSettings = (client: Client) => {
const [settings, setSettings] = useState({})
const [fetchStatus, setFetchStatus] = useState('idle')
@@ -12,9 +12,6 @@ const useInstanceSettings = (client: Client) => {
const response = await client
.getStackClient()
.fetchJSON('GET', '/settings/instance')
- // const response = await client.query(
- // client.all('io.cozy.settings').getById('instance')
- // )
setSettings(get(response, 'data.attributes'), {})
setFetchStatus('loaded')
} catch (error) {
@@ -30,4 +27,4 @@ const useInstanceSettings = (client: Client) => {
}
}
-export default useInstanceSettings
+export default userInstanceSettings
--
GitLab