Skip to content
Snippets Groups Projects
Commit 1b0cb948 authored by Yoan VALLET's avatar Yoan VALLET
Browse files

fix: userInstanceSettings with right name

parent f57d26c9
No related branches found
No related tags found
3 merge requests!28Merge fix from dev,!27Dev,!25Features/us150 review of konnectors
...@@ -4,7 +4,6 @@ import { history } from 'components/ContainerComponents/ViewContainer/ViewContai ...@@ -4,7 +4,6 @@ import { history } from 'components/ContainerComponents/ViewContainer/ViewContai
import { withClient, Client } from 'cozy-client' import { withClient, Client } from 'cozy-client'
import { ScreenType } from 'enum/screen.enum' import { ScreenType } from 'enum/screen.enum'
import { AppContext } from 'components/Contexts/AppContextProvider' import { AppContext } from 'components/Contexts/AppContextProvider'
import useInstanceSettings from 'components/Hooks/userInstanceSettings'
import BackArrowIcon from 'assets/icons/ico/back-arrow.svg' import BackArrowIcon from 'assets/icons/ico/back-arrow.svg'
import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton' import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
...@@ -29,7 +28,6 @@ const Header: React.FC<HeaderProps> = ({ ...@@ -29,7 +28,6 @@ const Header: React.FC<HeaderProps> = ({
}: HeaderProps) => { }: HeaderProps) => {
const header = useRef(null) const header = useRef(null)
const { screenType } = useContext(AppContext) const { screenType } = useContext(AppContext)
const { data: instanceSettings } = useInstanceSettings(client)
const cozyBarHeight = 48 const cozyBarHeight = 48
const headerBottomHeight = 8 const headerBottomHeight = 8
......
...@@ -3,7 +3,7 @@ import { withClient, Client } from 'cozy-client' ...@@ -3,7 +3,7 @@ import { withClient, Client } from 'cozy-client'
import Modal from 'components/CommonKit/Modal/Modal' import Modal from 'components/CommonKit/Modal/Modal'
import StyledButton from 'components/CommonKit/Button/StyledButton' import StyledButton from 'components/CommonKit/Button/StyledButton'
import { translate } from 'cozy-ui/react/I18n' import { translate } from 'cozy-ui/react/I18n'
import useInstanceSettings from 'components/Hooks/userInstanceSettings' import userInstanceSettings from 'components/Hooks/userInstanceSettings'
interface WelcomeModalContainerProps { interface WelcomeModalContainerProps {
handleClose: () => void handleClose: () => void
...@@ -16,7 +16,7 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({ ...@@ -16,7 +16,7 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
t, t,
client, client,
}: WelcomeModalContainerProps) => { }: WelcomeModalContainerProps) => {
const { data: instanceSettings } = useInstanceSettings(client) const { data: instanceSettings } = userInstanceSettings(client)
return ( return (
<React.Fragment> <React.Fragment>
......
...@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react' ...@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'
import get from 'lodash/get' import get from 'lodash/get'
import { Client } from 'cozy-client' import { Client } from 'cozy-client'
const useInstanceSettings = (client: Client) => { const userInstanceSettings = (client: Client) => {
const [settings, setSettings] = useState({}) const [settings, setSettings] = useState({})
const [fetchStatus, setFetchStatus] = useState('idle') const [fetchStatus, setFetchStatus] = useState('idle')
...@@ -12,9 +12,6 @@ const useInstanceSettings = (client: Client) => { ...@@ -12,9 +12,6 @@ const useInstanceSettings = (client: Client) => {
const response = await client const response = await client
.getStackClient() .getStackClient()
.fetchJSON('GET', '/settings/instance') .fetchJSON('GET', '/settings/instance')
// const response = await client.query(
// client.all('io.cozy.settings').getById('instance')
// )
setSettings(get(response, 'data.attributes'), {}) setSettings(get(response, 'data.attributes'), {})
setFetchStatus('loaded') setFetchStatus('loaded')
} catch (error) { } catch (error) {
...@@ -30,4 +27,4 @@ const useInstanceSettings = (client: Client) => { ...@@ -30,4 +27,4 @@ const useInstanceSettings = (client: Client) => {
} }
} }
export default useInstanceSettings export default userInstanceSettings
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment